mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Issue #1138 - AdminUI fixes between bootstrap versions.

Browse Source
This commit is contained in:
Cameron
2015-07-14 11:45:34 -07:00
parent cb920d5d48
commit e5015c5999
3 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/admin_ui.php
View File

@@ -5900,7 +5900,7 @@ class e_admin_form_ui extends e_form
<fieldset id='admin-ui-list-filter' class='e-filter'> <fieldset id='admin-ui-list-filter' class='e-filter'>
<legend class='e-hideme'>".LAN_LABEL_LABEL_SELECTED."</legend> <legend class='e-hideme'>".LAN_LABEL_LABEL_SELECTED."</legend>
".$filter_pre." ".$filter_pre."
<div class='row-fluid'> <div class='row-fluid'>
<div class='left form-inline span8 col-md-8' > <div class='left form-inline span8 col-md-8' >
".$this->text('searchquery', $current_query[0], 50, $input_options)."<i class='fa fa-search searchquery'></i> ".$this->text('searchquery', $current_query[0], 50, $input_options)."<i class='fa fa-search searchquery'></i>
".$this->select_open('filter_options', array('class' => 'form-control e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))." ".$this->select_open('filter_options', array('class' => 'form-control e-tip tbox select filter', 'id' => false, 'title'=>'Filter the results below'))."

11
e107_handlers/form_handler.php
View File

@@ -2574,13 +2574,14 @@ class e_form
{ {
$columnsArray = array_filter($columnsArray); $columnsArray = array_filter($columnsArray);
// navbar-header nav-header
// navbar-header nav-header
$text = '<div class="col-selection dropdown e-tip pull-right" data-placement="left"> $text = '<div class="col-selection dropdown e-tip pull-right" data-placement="left">
<a class="dropdown-toggle" title="Select columns to display" data-toggle="dropdown" href="#"><b class="caret"></b></a> <a class="dropdown-toggle" title="Select columns to display" data-toggle="dropdown" href="#"><b class="caret"></b></a>
<ul class="dropdown-menu col-selection e-noclick" role="menu" aria-labelledby="dLabel"> <ul class="list-group dropdown-menu col-selection e-noclick" role="menu" aria-labelledby="dLabel">
<li class="navbar-header nav-header">Display Columns</li> <li class="list-group-item "><h5 class="list-group-item-heading">Display Columns</h5></li>
<li> <li class="list-group-item">
<ul class="nav scroll-menu" >'; <ul class="nav scroll-menu" >';
unset($columnsArray['options'], $columnsArray['checkboxes']); unset($columnsArray['options'], $columnsArray['checkboxes']);
@@ -2610,7 +2611,7 @@ class e_form
$text .= " $text .= "
</ul> </ul>
</li> </li>
<li class='navbar-header nav-header'> <li class='list-group-item'>
<div id='{$id}-button' class='right'> <div id='{$id}-button' class='right'>
".$this->admin_button('etrigger_ecolumns', LAN_SAVE, 'btn btn-primary btn-small')." ".$this->admin_button('etrigger_ecolumns', LAN_SAVE, 'btn btn-primary btn-small')."
</div> </div>

32
e107_themes/bootstrap3/admin_style.css
View File

@@ -49,6 +49,27 @@ body { padding-top: 75px; }
a.core-mainpanel-link-icon { height:80px; width: 120px; padding-top:20px; } a.core-mainpanel-link-icon { height:80px; width: 120px; padding-top:20px; }
a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; } a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; }
#admin-ui-list-batch { padding-left:15px; padding-top:8px; }
#admin-ui-list-batch img { padding-top:5px }
#admin-ui-list-filter { margin-bottom: 15px }
#admin-ui-list-filter i.searchquery { z-index:100; position:relative; left:-160px; top:3px }
#admin-ui-list-filter #searchquery { padding-left:22px; margin-right:-12px; }
#admin-ui-list-db-language { padding-top:20px ; padding-right:30px }
#admin-ui-list-total-records { padding-top:5px }
#admin-ui-list-filter .row-fluid { margin-left: -15px; margin-right: -15px }
#admin-ui-edit-db-language { margin-bottom: -30px; margin-top:-10px; padding-bottom:5px; padding-right:5px }
div.bbcode-panel { div.bbcode-panel {
background-color: rgb(245, 245, 245); background-color: rgb(245, 245, 245);
@@ -739,16 +760,9 @@ i.e-breadcrumb {
footer { padding-top:150px; padding-bottom:20px; color: rgb(153, 153, 153); } footer { padding-top:150px; padding-bottom:20px; color: rgb(153, 153, 153); }
#searchquery {
padding-left:22px;
margin-right:-12px;
}
i.searchquery {
z-index:100;
position:relative;
left:-215px;
}
.nav-header { .nav-header {