mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 03:40:37 +02:00
Code Issues Releases Wiki Activity

Issue #1138 - x-editable interface now working correctly. Some admin-ui fixes, but plenty more to do.

Browse Source
This commit is contained in:
Cameron
2015-07-13 19:49:25 -07:00
parent 6499ff72f7
commit f567e5b395
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_handlers/admin_ui.php
View File

@@ -6098,14 +6098,14 @@ class e_admin_form_ui extends e_form
// XXX Quick Fix for styling - correct. // XXX Quick Fix for styling - correct.
$text = " $text = "
<div class='navbar navbar-inner left' style='padding-left:15px; padding-top:8px;'> <div class='navbar navbar-inner left' style='padding-left:15px; padding-top:8px;'>
<div class='span6'>"; <div class='span6 col-md-6'>";
if(!$this->getController()->getTreeModel()->isEmpty()) if(!$this->getController()->getTreeModel()->isEmpty())
{ {
$text .= " $text .= "
<div class='input-append'> <div class='input-group input-group-btn input-append'>
<img src='".e_IMAGE_ABS."generic/branchbottom.gif' alt='' class='icon action' style='padding-top:5px' /> <img src='".e_IMAGE_ABS."generic/branchbottom.gif' alt='' class='icon action' style='padding-top:5px' />
".$this->select_open('etrigger_batch', array('class' => 'tbox select batch e-autosubmit reset', 'id' => false))." ".$this->select_open('etrigger_batch', array('class' => 'tbox form-control select batch e-autosubmit reset', 'id' => false))."
".$this->option(LAN_BATCH_LABEL_SELECTED, '', false)." ".$this->option(LAN_BATCH_LABEL_SELECTED, '', false)."
".($allow_copy ? $this->option(LAN_COPY, 'copy', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')." ".($allow_copy ? $this->option(LAN_COPY, 'copy', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')."
".($allow_delete ? $this->option(LAN_DELETE, 'delete', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')." ".($allow_delete ? $this->option(LAN_DELETE, 'delete', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')."
@@ -6133,7 +6133,7 @@ class e_admin_form_ui extends e_form
$text .= " $text .= "
</div> </div>
<div class='span6 right' style='padding-top:5px'><span>".e107::getParser()->lanVars(LAN_UI_TOTAL_RECORDS,number_format($this->listTotal))."</span></div> <div class='span6 col-md-6 right' style='padding-top:5px'><span>".e107::getParser()->lanVars(LAN_UI_TOTAL_RECORDS,number_format($this->listTotal))."</span></div>
</div> </div>
"; ";

5
e107_themes/bootstrap3/admin_theme.php
View File

@@ -12,11 +12,8 @@ e107::css('url', "http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-a
// be107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css"); // be107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css");
e107::css('url', "http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/css/bootstrap-editable.css"); e107::css('url', "http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/css/bootstrap-editable.css");
e107::css('url', "http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/js/bootstrap-editable.min.js"); e107::js('url', "http://cdnjs.cloudflare.com/ajax/libs/x-editable/1.5.0/bootstrap3-editable/js/bootstrap-editable.min.js");
e107::css('url', 'http://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css'); e107::css('url', 'http://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/slate/bootstrap.min.css');