mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 21:57:51 +02:00
Code Issues Releases Wiki Activity

GUI styling fixes. Theme thumbnail preview corrected on missing preview images.

Browse Source
This commit is contained in:
Cameron
2017-02-01 08:54:28 -08:00
parent 1a0907368c
commit 30092ef372
10 changed files with 130 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
e107_admin/db.php
View File

@@ -1428,7 +1428,7 @@ class system_tools
<fieldset id='core-db-pref-edit'> <fieldset id='core-db-pref-edit'>
<legend class='e-hideme'>".DBLAN_20."</legend>"; <legend class='e-hideme'>".DBLAN_20."</legend>";
$text .= "<select class='tbox' name='type_select' onchange='urljump(this.options[selectedIndex].value)' > $text .= "<select class='tbox form-control input-large' name='type_select' onchange='urljump(this.options[selectedIndex].value)' >
<option value='".e_ADMIN."db.php?mode=".$_GET['mode']."&amp;type=core'>Core</option>\n <option value='".e_ADMIN."db.php?mode=".$_GET['mode']."&amp;type=core'>Core</option>\n
<option value='".e_ADMIN."db.php?mode=".$_GET['mode']."&amp;type=search'>Search</option> <option value='".e_ADMIN."db.php?mode=".$_GET['mode']."&amp;type=search'>Search</option>
<option value='".e_ADMIN."db.php?mode=".$_GET['mode']."&amp;type=notify'>Notify</option>\n"; <option value='".e_ADMIN."db.php?mode=".$_GET['mode']."&amp;type=notify'>Notify</option>\n";
@@ -1551,7 +1551,7 @@ class system_tools
{ {
$error_messages = array(0 => DBLAN_31, 1 => LAN_ERROR, 2 => DBLAN_33, 3 => DBLAN_34); $error_messages = array(0 => DBLAN_31, 1 => LAN_ERROR, 2 => DBLAN_33, 3 => DBLAN_34);
// $error_image = array("integrity_pass.png", "integrity_fail.png", "warning.png", "blank.png"); // $error_image = array("integrity_pass.png", "integrity_fail.png", "warning.png", "blank.png");
$error_glyph = array(ADMIN_TRUE_ICON,ADMIN_FALSE_ICON,"<i class='S16 e-warning-16'></i>","<i style='display:inline-block;width:17px;height:16px;'> </i>"); $error_glyph = array(ADMIN_TRUE_ICON,ADMIN_FALSE_ICON,ADMIN_WARNING_ICON,"<i style='display:inline-block;width:17px;height:16px;'> </i>");
$error_type = array('warning'=>2, 'error'=>1); $error_type = array('warning'=>2, 'error'=>1);

4
e107_admin/mailout.php
View File

@@ -1059,7 +1059,7 @@ class mailout_main_ui extends e_admin_ui
<tr> <tr>
<td>".LAN_MAILOUT_110."<br /></td> <td>".LAN_MAILOUT_110."<br /></td>
<td class='form-inline'><div class='input-append'>".$frm->admin_button('testemail', LAN_MAILOUT_112,'other')."&nbsp; <td class='form-inline'><div class='input-append'>".$frm->admin_button('testemail', LAN_MAILOUT_112,'other')."&nbsp;
<input name='testaddress' class='tbox input-xlarge' type='text' size='40' maxlength='80' value=\"".(varset($_POST['testaddress']) ? $_POST['testaddress'] : USEREMAIL)."\" /> <input name='testaddress' class='form-control input-xlarge' type='text' size='40' maxlength='80' value=\"".(varset($_POST['testaddress']) ? $_POST['testaddress'] : USEREMAIL)."\" />
<span style='padding-left:5px'>".$this->mailAdmin->sendStyleSelect(varset($_POST['testtemplate'], 'textonly'), 'testtemplate')."</span> <span style='padding-left:5px'>".$this->mailAdmin->sendStyleSelect(varset($_POST['testtemplate'], 'textonly'), 'testtemplate')."</span>
</div></td> </div></td>
</tr> </tr>
@@ -1198,7 +1198,7 @@ class mailout_main_ui extends e_admin_ui
$autoDisp = ($pref['mail_bounce'] != 'auto') ? "style='display:none;'" : ''; $autoDisp = ($pref['mail_bounce'] != 'auto') ? "style='display:none;'" : '';
$autoMail = ($pref['mail_bounce'] != 'mail') ? "style='display:none;'" : ''; $autoMail = ($pref['mail_bounce'] != 'mail') ? "style='display:none;'" : '';
$bounceOpts = array('none' => LAN_MAILOUT_232, 'auto' => LAN_MAILOUT_233, 'mail' => LAN_MAILOUT_234); $bounceOpts = array('none' => LAN_MAILOUT_232, 'auto' => LAN_MAILOUT_233, 'mail' => LAN_MAILOUT_234);
$text .= "<select name='mail_bounce' class='tbox' onchange='bouncedisp(this.value)'>\n<option value=''>&nbsp;</option>\n"; $text .= "<select name='mail_bounce' class='form-control' onchange='bouncedisp(this.value)'>\n<option value=''>&nbsp;</option>\n";
foreach ($bounceOpts as $k => $v) foreach ($bounceOpts as $k => $v)
{ {
$selected = ($pref['mail_bounce'] == $k) ? " selected='selected'" : ''; $selected = ($pref['mail_bounce'] == $k) ? " selected='selected'" : '';

10
e107_core/templates/admin_icons_template.php
View File

@@ -440,20 +440,20 @@ if (!defined('E_16_FAILEDLOGIN')) {
define("E_32_TRUE", "<i class='S32 e-true-32'></i>"); define("E_32_TRUE", "<i class='S32 e-true-32'></i>");
/*
define("ADMIN_TRUE_ICON", "<i class='fa fa-check text-success'></i>"); define("ADMIN_TRUE_ICON", "<i class='fa fa-check text-success'></i>");
define("ADMIN_FALSE_ICON", "<i class='fa fa-times text-danger'></i>"); define("ADMIN_FALSE_ICON", "<i class='fa fa-times text-danger'></i>");
define("ADMIN_WARNING_ICON", "<i class='fa fa-warning text-warning'></i>"); define("ADMIN_WARNING_ICON", "<i class='fa fa-warning text-warning'></i>");
/*
define("ADMIN_EDIT_ICON", "<i class='fa fa-edit fa-2x fa-fw'></i>"); define("ADMIN_EDIT_ICON", "<i class='fa fa-edit fa-2x fa-fw'></i>");
define("ADMIN_DELETE_ICON", "<i class='fa fa-trash fa-2x fa-fw'></i>"); define("ADMIN_DELETE_ICON", "<i class='fa fa-trash fa-2x fa-fw'></i>");
define("ADMIN_EXECUTE_ICON", "<i class='fa fa-power-off fa-2x fa-fw'></i>"); define("ADMIN_EXECUTE_ICON", "<i class='fa fa-power-off fa-2x fa-fw'></i>");
define("ADMIN_SORT_ICON", "<i class='fa fa-sort fa-2x fa-fw'></i>"); define("ADMIN_SORT_ICON", "<i class='fa fa-sort fa-2x fa-fw'></i>");
*/ */
define("ADMIN_TRUE_ICON", "<i class='S16 e-true-16'></i>"); // define("ADMIN_TRUE_ICON", "<i class='S16 e-true-16'></i>");
define("ADMIN_FALSE_ICON", "<i class='S16 e-false-16'></i>"); // define("ADMIN_FALSE_ICON", "<i class='S16 e-false-16'></i>");
define("ADMIN_WARNING_ICON", "<i class='S16 e-warning-16'></i>"); // define("ADMIN_WARNING_ICON", "<i class='S16 e-warning-16'></i>");
define("ADMIN_EDIT_ICON", "<i class='S32 e-edit-32'></i>"); define("ADMIN_EDIT_ICON", "<i class='S32 e-edit-32'></i>");
define("ADMIN_DELETE_ICON", "<i class='S32 e-delete-32'></i>"); define("ADMIN_DELETE_ICON", "<i class='S32 e-delete-32'></i>");

21
e107_handlers/form_handler.php
View File

@@ -794,10 +794,10 @@ class e_form
function number($name, $value=0, $maxlength = 200, $options = array()) function number($name, $value=0, $maxlength = 200, $options = array())
{ {
if(is_string($options)) parse_str($options, $options); if(is_string($options)) parse_str($options, $options);
if (vartrue($options['maxlength'])) $maxlength = $options['maxlength']; if (empty($options['maxlength'])) $maxlength = $options['maxlength'];
unset($options['maxlength']); unset($options['maxlength']);
if(!vartrue($options['size'])) $options['size'] = 15; if(empty($options['size'])) $options['size'] = 15;
if(!vartrue($options['class'])) $options['class'] = 'tbox number e-spinner input-small form-control'; if(empty($options['class'])) $options['class'] = 'tbox number e-spinner input-small ';
if(!empty($options['size'])) if(!empty($options['size']))
{ {
@@ -805,6 +805,7 @@ class e_form
unset($options['size']); unset($options['size']);
} }
$options['class'] .= " form-control";
$options['type'] ='number'; $options['type'] ='number';
$mlength = vartrue($maxlength) ? "maxlength=".$maxlength : ""; $mlength = vartrue($maxlength) ? "maxlength=".$maxlength : "";
@@ -817,7 +818,7 @@ class e_form
//never allow id in format name-value for text fields //never allow id in format name-value for text fields
if(deftrue('BOOTSTRAP')) if(THEME_LEGACY === false)
{ {
return "<input pattern='[0-9]*' type='number' name='{$name}' value='{$value}' {$mlength} {$min} {$max} ".$this->get_attributes($options, $name)." />"; return "<input pattern='[0-9]*' type='number' name='{$name}' value='{$value}' {$mlength} {$min} {$max} ".$this->get_attributes($options, $name)." />";
} }
@@ -3350,7 +3351,7 @@ class e_form
// 'multiple' => false, - see case 'select' // 'multiple' => false, - see case 'select'
); );
$form_control = (deftrue('BOOTSTRAP') === 3) ? ' form-control' : ''; $form_control = (THEME_LEGACY !== true) ? ' form-control' : '';
switch ($type) { switch ($type) {
case 'hidden': case 'hidden':
@@ -3362,6 +3363,10 @@ class e_form
unset($def_options['selected'], $def_options['checked']); unset($def_options['selected'], $def_options['checked']);
break; break;
case 'number':
$def_options['class'] = 'tbox '.$form_control;
break;
case 'file': case 'file':
$def_options['class'] = 'tbox file'; $def_options['class'] = 'tbox file';
unset($def_options['selected'], $def_options['checked']); unset($def_options['selected'], $def_options['checked']);
@@ -5091,6 +5096,12 @@ class e_form
// Appending needs is performed and customized using function: beforeUpdate($new_data, $old_data, $id) // Appending needs is performed and customized using function: beforeUpdate($new_data, $old_data, $id)
} }
if(empty($parms['size']))
{
$parms['size'] = 'xxlarge';
}
$text .= vartrue($parms['pre']).$this->textarea($key, $value, vartrue($parms['rows'], 5), vartrue($parms['cols'], 40), vartrue($parms['__options'],$parms), varset($parms['counter'], false)).vartrue($parms['post']); $text .= vartrue($parms['pre']).$this->textarea($key, $value, vartrue($parms['rows'], 5), vartrue($parms['cols'], 40), vartrue($parms['__options'],$parms), varset($parms['counter'], false)).vartrue($parms['post']);
$ret = $text; $ret = $text;
break; break;

51
e107_handlers/theme_handler.php
View File

@@ -370,7 +370,7 @@ class e_theme
$vars['path'] = $path; $vars['path'] = $path;
$vars['@attributes']['default'] = (varset($vars['@attributes']['default']) && strtolower($vars['@attributes']['default']) == 'true') ? 1 : 0; $vars['@attributes']['default'] = (varset($vars['@attributes']['default']) && strtolower($vars['@attributes']['default']) == 'true') ? 1 : 0;
$vars['preview'] = varset($vars['screenshots']['image']); $vars['preview'] = varset($vars['screenshots']['image']);
$vars['thumbnail'] = isset($vars['preview'][0]) ? $vars['preview'][0] : ''; $vars['thumbnail'] = isset($vars['preview'][0]) && file_exists(e_THEME.$path.'/'.$vars['preview'][0]) ? $vars['preview'][0] : '';
if(!empty($vars['themePrefs'])) if(!empty($vars['themePrefs']))
@@ -569,6 +569,11 @@ class themeHandler
*/ */
protected $mp; protected $mp;
const RENDER_THUMBNAIL = 0;
const RENDER_SITEPREFS = 1;
const RENDER_ADMINPREFS = 2;
/* constructor */ /* constructor */
function __construct() function __construct()
@@ -1641,7 +1646,7 @@ class themeHandler
mode = 1 :: selected site theme mode = 1 :: selected site theme
mode = 2 :: selected admin theme mode = 2 :: selected admin theme
*/ */
function renderTheme($mode = FALSE, $theme) function renderTheme($mode = 0, $theme)
{ {
$ns = e107::getRender(); $ns = e107::getRender();
$pref = e107::getPref(); $pref = e107::getPref();
@@ -1658,15 +1663,18 @@ class themeHandler
$admin_icon = ($pref['admintheme'] != $theme['path'] ) ? "<button class='btn btn-default btn-small btn-sm btn-inverse' type='submit' name='selectadmin[".$theme['id']."]' alt=\"".TPVLAN_32."\" title=\"".TPVLAN_32."\" >".$tp->toGlyph('fa-gears',array('size'=>'2x'))."</button>" : "<button class='btn btn-small btn-default btn-sm btn-inverse' type='button'>".$tp->toGlyph('fa-check',array('size'=>'2x'))."</button>"; $admin_icon = ($pref['admintheme'] != $theme['path'] ) ? "<button class='btn btn-default btn-small btn-sm btn-inverse' type='submit' name='selectadmin[".$theme['id']."]' alt=\"".TPVLAN_32."\" title=\"".TPVLAN_32."\" >".$tp->toGlyph('fa-gears',array('size'=>'2x'))."</button>" : "<button class='btn btn-small btn-default btn-sm btn-inverse' type='button'>".$tp->toGlyph('fa-check',array('size'=>'2x'))."</button>";
$price = ''; $price = '';
e107::getDebug()->log($mode);
if(substr($theme['thumbnail'],0,4) == 'http') if(substr($theme['thumbnail'],0,4) == 'http')
{ {
$thumbPath = $theme['thumbnail']; $thumbPath = $theme['thumbnail'];
$previewPath = $theme['preview'][0]; $previewPath = $theme['preview'][0];
} }
elseif(!empty($theme['preview'][0])) elseif(!empty($theme['thumbnail']))
{ {
$thumbPath = e_THEME.$theme['path'] ."/".$theme['preview'][0]; $thumbPath = e_THEME.$theme['path'] ."/".$theme['thumbnail'];
$previewPath = e_THEME.$theme['path'] ."/".$theme['preview'][0]; $previewPath = e_THEME.$theme['path'] ."/".$theme['thumbnail'];
} }
else else
{ {
@@ -1762,10 +1770,10 @@ class themeHandler
if(!$mode) if($mode == self::RENDER_THUMBNAIL)
{ {
// styles NEED to be put into style.css // styles NEED to be put into style.css
/*
if($pref['sitetheme'] == $theme['path']) if($pref['sitetheme'] == $theme['path'])
{ {
$borderStyle = "admin-theme-cell-site"; $borderStyle = "admin-theme-cell-site";
@@ -1778,7 +1786,7 @@ class themeHandler
{ {
$borderStyle = "admin-theme-cell-default"; $borderStyle = "admin-theme-cell-default";
} }
*/
$borderStyle = 'well'; $borderStyle = 'well';
@@ -1786,10 +1794,11 @@ class themeHandler
<div class='f-left block-text admin-theme-cell ".$borderStyle."'> <div class='f-left block-text admin-theme-cell ".$borderStyle."'>
<div class='well admin-theme-thumb'>".$thumbnail."</div> <div class='well admin-theme-thumb'>".$thumbnail."</div>
<div id='".$frm->name2id($theme['name'])."' class='admin-theme-options'>".$main_icon.$admin_icon.$info_icon.$preview_icon."</div> <div id='".$frm->name2id($theme['name'])."' class='admin-theme-options'>".$main_icon.$admin_icon.$info_icon.$preview_icon."</div>
<div class='admin-theme-title'><small>".$theme['name']." ".$theme['version']."</small> <div class='admin-theme-title'><small>".strip_tags($theme['name'])." ".$theme['version']."</small>
".$price." ".$price."
</div> </div>
</div>"; </div>";
return $text; return $text;
} }
@@ -1805,7 +1814,7 @@ class themeHandler
<li class='active'><a data-toggle='tab' href='#core-thememanager-configure'>".LAN_CONFIGURE."</a></li>"; <li class='active'><a data-toggle='tab' href='#core-thememanager-configure'>".LAN_CONFIGURE."</a></li>";
if($this->themeConfigObj && call_user_func(array(&$this->themeConfigObj, 'config')) && $mode == 1) if($this->themeConfigObj && call_user_func(array(&$this->themeConfigObj, 'config')) && $mode == self::RENDER_SITEPREFS)
{ {
$text .= "<li><a data-toggle='tab' href='#core-thememanager-customconfig'>".LAN_PREFS."</a></li>\n"; $text .= "<li><a data-toggle='tab' href='#core-thememanager-customconfig'>".LAN_PREFS."</a></li>\n";
} }
@@ -1853,7 +1862,7 @@ class themeHandler
// site theme.. // site theme..
if($mode == 1) if($mode == self::RENDER_SITEPREFS)
{ {
$text .= " $text .= "
@@ -1877,11 +1886,7 @@ class themeHandler
<input type='radio' name='image_preload' value='0'".(!$pref['image_preload'] ? " checked='checked'" : "")." /> ".TPVLAN_29." <input type='radio' name='image_preload' value='0'".(!$pref['image_preload'] ? " checked='checked'" : "")." /> ".TPVLAN_29."
</td> </td>
</tr>";*/ </tr>";*/
}
// New in 0.8 ---- site theme.
if($mode == 1)
{
$itext = "<tr> $itext = "<tr>
<td style='vertical-align:top; width:24%'><b>".TPVLAN_50."</b>:</td> <td style='vertical-align:top; width:24%'><b>".TPVLAN_50."</b>:</td>
@@ -1894,7 +1899,7 @@ class themeHandler
<col class='col-tm-layout-preset' style='width:20%' /> <col class='col-tm-layout-preset' style='width:20%' />
</colgroup> </colgroup>
<tr>"; <tr>";
$itext .= ($mode == 1) ? "<th class='center top'>".TPVLAN_55."</th>" : ""; $itext .= ($mode == self::RENDER_SITEPREFS) ? "<th class='center top'>".TPVLAN_55."</th>" : "";
$itext .= " $itext .= "
<th>".TPVLAN_52."</th> <th>".TPVLAN_52."</th>
<th>".TPVLAN_56."</th> <th>".TPVLAN_56."</th>
@@ -1907,7 +1912,7 @@ class themeHandler
{ {
$itext .= " $itext .= "
<tr>"; <tr>";
if($mode == 1) if($mode == self::RENDER_SITEPREFS)
{ {
if(!$pref['sitetheme_deflayout']) if(!$pref['sitetheme_deflayout'])
{ {
@@ -1999,7 +2004,7 @@ class themeHandler
// $itext .= !$mode ? "<tr><td style='vertical-align:top;width:24%'><b>".TPVLAN_8."</b>:</td><td style='vertical-align:top'>".$previewbutton.$selectmainbutton.$selectadminbutton."</td></tr>" : ""; // $itext .= !$mode ? "<tr><td style='vertical-align:top;width:24%'><b>".TPVLAN_8."</b>:</td><td style='vertical-align:top'>".$previewbutton.$selectmainbutton.$selectadminbutton."</td></tr>" : "";
if($mode == 2) if($mode == self::RENDER_ADMINPREFS)
{ {
$astext = ""; $astext = "";
@@ -2064,7 +2069,7 @@ class themeHandler
switch($mode) switch($mode)
{ {
case 2: // admin mode. case self::RENDER_ADMINPREFS: // admin mode.
$for = $frm->name2id("admincss-".$css['name']); $for = $frm->name2id("admincss-".$css['name']);
$text2 = "<td class='center'>"; $text2 = "<td class='center'>";
$text2 .= $frm->radio('admincss', $css['name'], vartrue($pref['admincss'])== $css['name'], array('id'=>$for)); $text2 .= $frm->radio('admincss', $css['name'], vartrue($pref['admincss'])== $css['name'], array('id'=>$for));
@@ -2073,7 +2078,7 @@ class themeHandler
$text2 .= "<td>".($css['info'] ? $css['info'] : ($css['name'] == "admin_style.css" ? TPVLAN_23 : TPVLAN_24))."</td>\n"; $text2 .= "<td>".($css['info'] ? $css['info'] : ($css['name'] == "admin_style.css" ? TPVLAN_23 : TPVLAN_24))."</td>\n";
break; break;
case 1: // front 'sitetheme' mode. case self::RENDER_SITEPREFS: // front 'sitetheme' mode.
$text2 = " $text2 = "
<td class='center'> <td class='center'>
@@ -2098,7 +2103,7 @@ class themeHandler
<div class='center buttons-bar'>"; <div class='center buttons-bar'>";
if($mode == 2) // admin if($mode == self::RENDER_ADMINPREFS) // admin
{ {
$mainid = "selectmain[".$theme['id']."]"; $mainid = "selectmain[".$theme['id']."]";
$text .= $this->frm->admin_button('submit_adminstyle', TPVLAN_35, 'update'); $text .= $this->frm->admin_button('submit_adminstyle', TPVLAN_35, 'update');
@@ -2133,7 +2138,7 @@ class themeHandler
<div class='center buttons-bar'>"; <div class='center buttons-bar'>";
if($mode == 2) // admin if($mode == self::RENDER_ADMINPREFS) // admin
{ {
$mainid = "selectmain[".$theme['id']."]"; $mainid = "selectmain[".$theme['id']."]";
$text .= $this->frm->admin_button('submit_adminstyle', TPVLAN_35, 'update'); $text .= $this->frm->admin_button('submit_adminstyle', TPVLAN_35, 'update');
@@ -2165,7 +2170,7 @@ class themeHandler
$remove = array(); $remove = array();
$detected = array(); $detected = array();
if($mode == 1) if($mode == self::RENDER_SITEPREFS)
{ {
foreach($theme['css'] as $k=>$v) // check if wildcard is present. foreach($theme['css'] as $k=>$v) // check if wildcard is present.
{ {

2
e107_plugins/download/handlers/download_class.php
View File

@@ -924,7 +924,7 @@ class download
return "Error reading categories<br />"; return "Error reading categories<br />";
exit; exit;
} }
$boxinfo .= "<select name='{$name}' id='download_category' class='tbox'> $boxinfo .= "<select name='{$name}' id='download_category' class='tbox form-control'>
<option value=''>{$blankText}</option>\n"; <option value=''>{$blankText}</option>\n";
// Its a structured display option - need a 2-step process to create a tree // Its a structured display option - need a 2-step process to create a tree
$catlist = array(); $catlist = array();

62
e107_plugins/download/includes/admin.php
View File

@@ -620,12 +620,12 @@ $columnInfo = array(
<td>".$row['limit_id']."</td> <td>".$row['limit_id']."</td>
<td>".r_userclass_name($row['limit_classnum'])."</td> <td>".r_userclass_name($row['limit_classnum'])."</td>
<td> <td>
<input type='text' class='tbox' size='5' name='count_num[{$row['limit_id']}]' value='".($row['limit_count_num'] ? $row['limit_count_num'] : "")."'/> ".DOWLAN_109." <input type='text' class='form-control' size='5' name='count_num[{$row['limit_id']}]' value='".($row['limit_count_num'] ? $row['limit_count_num'] : "")."'/> ".DOWLAN_109."
<input type='text' class='tbox' size='5' name='count_days[{$row['limit_id']}]' value='".($row['limit_count_days'] ? $row['limit_count_days'] : "")."'/> ".DOWLAN_110." <input type='text' class='form-control' size='5' name='count_days[{$row['limit_id']}]' value='".($row['limit_count_days'] ? $row['limit_count_days'] : "")."'/> ".DOWLAN_110."
</td> </td>
<td> <td>
<input type='text' class='tbox' size='5' name='bw_num[{$row['limit_id']}]' value='".($row['limit_bw_num'] ? $row['limit_bw_num'] : "")."'/> ".DOWLAN_111." ".DOWLAN_109." <input type='text' class='form-control' size='5' name='bw_num[{$row['limit_id']}]' value='".($row['limit_bw_num'] ? $row['limit_bw_num'] : "")."'/> ".DOWLAN_111." ".DOWLAN_109."
<input type='text' class='tbox' size='5' name='bw_days[{$row['limit_id']}]' value='".($row['limit_bw_days'] ? $row['limit_bw_days'] : "")."'/> ".DOWLAN_110." <input type='text' class='form-control' size='5' name='bw_days[{$row['limit_id']}]' value='".($row['limit_bw_days'] ? $row['limit_bw_days'] : "")."'/> ".DOWLAN_110."
</td> </td>
</tr> </tr>
"; ";
@@ -644,12 +644,12 @@ $columnInfo = array(
<tr> <tr>
<td colspan='2'>".r_userclass("newlimit_class", 0, "off", "guest, member, admin, classes, language")."</td> <td colspan='2'>".r_userclass("newlimit_class", 0, "off", "guest, member, admin, classes, language")."</td>
<td> <td>
<input type='text' class='tbox' size='5' name='new_count_num' value=''/> ".DOWLAN_109." <input type='text' class='form-control' size='5' name='new_count_num' value=''/> ".DOWLAN_109."
<input type='text' class='tbox' size='5' name='new_count_days' value=''/> ".DOWLAN_110." <input type='text' class='form-control' size='5' name='new_count_days' value=''/> ".DOWLAN_110."
</td> </td>
<td> <td>
<input type='text' class='tbox' size='5' name='new_bw_num' value=''/> ".DOWLAN_111." ".DOWLAN_109." <input type='text' class='form-control' size='5' name='new_bw_num' value=''/> ".DOWLAN_111." ".DOWLAN_109."
<input type='text' class='tbox' size='5' name='new_bw_days' value=''/> ".DOWLAN_110." <input type='text' class='form-control' size='5' name='new_bw_days' value=''/> ".DOWLAN_110."
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -1221,7 +1221,7 @@ $columnInfo = array(
<td style='width:80%'> <td style='width:80%'>
<div>".DOWLAN_131."&nbsp;&nbsp;"; <div>".DOWLAN_131."&nbsp;&nbsp;";
// $text .= "<select name='download_url' class='tbox'> // $text .= "<select name='download_url' class='form-control'>
// <option value=''>&nbsp;</option>\n"; // <option value=''>&nbsp;</option>\n";
@@ -1272,14 +1272,14 @@ $columnInfo = array(
<tr> <tr>
<td>".DOWLAN_149."</td> <td>".DOWLAN_149."</td>
<td style='width:80%;'> <td style='width:80%;'>
<input class='tbox input-xxlarge' type='text' name='download_url_external' size='90' value='{$download_url_external}' maxlength='255'/> <input class='form-control input-xxlarge' type='text' name='download_url_external' size='90' value='{$download_url_external}' maxlength='255'/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td>".DOWLAN_66."</td> <td>".DOWLAN_66."</td>
<td> <td>
<input class='tbox' type='text' name='download_filesize_external' size='8' value='{$download_filesize}' maxlength='10'/> <input class='form-control' type='text' name='download_filesize_external' size='8' value='{$download_filesize}' maxlength='10'/>
<select class='tbox' name='download_filesize_unit'> <select class='form-control' name='download_filesize_unit'>
<option value='B'{$b_sel}>".CORE_LAN_B."</option> <option value='B'{$b_sel}>".CORE_LAN_B."</option>
<option value='KB'{$kb_sel}>".CORE_LAN_KB."</option> <option value='KB'{$kb_sel}>".CORE_LAN_KB."</option>
<option value='MB'>".CORE_LAN_MB."</option> <option value='MB'>".CORE_LAN_MB."</option>
@@ -1311,7 +1311,7 @@ $columnInfo = array(
$opt = ($count==1) ? "id='mirror'" : ""; $opt = ($count==1) ? "id='mirror'" : "";
$text .=" $text .="
<div {$opt}> <div {$opt}>
<select name='download_mirror_name[]' class='tbox'> <select name='download_mirror_name[]' class='form-control'>
<option value=''>&nbsp;</option>"; <option value=''>&nbsp;</option>";
foreach ($mirrorList as $mirror) foreach ($mirrorList as $mirror)
@@ -1321,8 +1321,8 @@ $columnInfo = array(
} }
$text .= "</select> $text .= "</select>
<input class='tbox' type='text' name='download_mirror[]' style='width: 60%;' value=\"".$mirrorArray[($count-1)]['url']."\" maxlength='200'/> <input class='form-control' type='text' name='download_mirror[]' style='width: 60%;' value=\"".$mirrorArray[($count-1)]['url']."\" maxlength='200'/>
<input class='tbox' type='text' name='download_mirror_size[]' style='width: 15%;' value=\"".$mirrorArray[($count-1)]['filesize']."\" maxlength='10'/>"; <input class='form-control' type='text' name='download_mirror_size[]' style='width: 15%;' value=\"".$mirrorArray[($count-1)]['filesize']."\" maxlength='10'/>";
if (DOWNLOAD_DEBUG) if (DOWNLOAD_DEBUG)
{ {
if ($id) if ($id)
@@ -1331,7 +1331,7 @@ $columnInfo = array(
} }
else else
{ {
$text .= "<input class='tbox' type='text' name='download_mirror_requests[]' style='width: 10%;' value=\"".$mirrorArray[($count-1)]['requests']."\" maxlength='10'/>"; $text .= "<input class='form-control' type='text' name='download_mirror_requests[]' style='width: 10%;' value=\"".$mirrorArray[($count-1)]['requests']."\" maxlength='10'/>";
} }
} }
$text .= " </div>"; $text .= " </div>";
@@ -1370,25 +1370,25 @@ $columnInfo = array(
<tr> <tr>
<td >".DOWLAN_12."</td> <td >".DOWLAN_12."</td>
<td style='width:80%'> <td style='width:80%'>
<input class='tbox input-xxlarge' type='text' id='download-name' name='download_name' size='60' value=\"".$tp->toForm($download_name)."\" maxlength='200'/> <input class='form-control input-xxlarge' type='text' id='download-name' name='download_name' size='60' value=\"".$tp->toForm($download_name)."\" maxlength='200'/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style='width:20%'>".DOWLAN_15."</td> <td style='width:20%'>".DOWLAN_15."</td>
<td style='width:80%'> <td style='width:80%'>
<input class='tbox' type='text' name='download_author' size='60' value='$download_author' maxlength='100'/> <input class='form-control' type='text' name='download_author' size='60' value='$download_author' maxlength='100'/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style='width:20%'>".DOWLAN_16."</td> <td style='width:20%'>".DOWLAN_16."</td>
<td style='width:80%'> <td style='width:80%'>
<input class='tbox' type='text' name='download_author_email' size='60' value='$download_author_email' maxlength='100'/> <input class='form-control' type='text' name='download_author_email' size='60' value='$download_author_email' maxlength='100'/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style='width:20%'>".DOWLAN_17."</td> <td style='width:20%'>".DOWLAN_17."</td>
<td style='width:80%'> <td style='width:80%'>
<input class='tbox' type='text' name='download_author_website' size='60' value='$download_author_website' maxlength='100'/> <input class='form-control' type='text' name='download_author_website' size='60' value='$download_author_website' maxlength='100'/>
</td> </td>
</tr> </tr>
<tr> <tr>
@@ -1404,7 +1404,7 @@ $columnInfo = array(
<td style='width:20%'>".DOWLAN_19."</td> <td style='width:20%'>".DOWLAN_19."</td>
<td style='width:80%'>"; <td style='width:80%'>";
/* /*
$text = "<select name='download_image' class='tbox'> $text = "<select name='download_image' class='form-control'>
<option value=''>&nbsp;</option>"; <option value=''>&nbsp;</option>";
foreach($image_array as $img) foreach($image_array as $img)
{ {
@@ -1436,7 +1436,7 @@ $columnInfo = array(
<td style='width:80%'>"; <td style='width:80%'>";
/* /*
$text .= " $text .= "
<select name='download_thumb' class='tbox'> <select name='download_thumb' class='form-control'>
<option value=''>&nbsp;</option>"; <option value=''>&nbsp;</option>";
foreach($thumb_array as $thm){ foreach($thumb_array as $thm){
$tpath = str_replace(e_FILE."downloadthumbs/","",$thm['path'].$thm['fname']); $tpath = str_replace(e_FILE."downloadthumbs/","",$thm['path'].$thm['fname']);
@@ -1493,7 +1493,7 @@ $columnInfo = array(
<tr> <tr>
<td style='width:20%'>".DOWLAN_21."</td> <td style='width:20%'>".DOWLAN_21."</td>
<td style='width:80%'> <td style='width:80%'>
<select name='download_active' class='tbox'>"; <select name='download_active' class='form-control input-xxlarge'>";
foreach($download_status as $key => $val){ foreach($download_status as $key => $val){
$sel = ($download_active == $key) ? " selected = 'selected' " : ""; $sel = ($download_active == $key) ? " selected = 'selected' " : "";
$text .= "<option value='{$key}' {$sel}>{$val}</option>\n"; $text .= "<option value='{$key}' {$sel}>{$val}</option>\n";
@@ -1526,7 +1526,7 @@ $columnInfo = array(
<tr> <tr>
<td style='width:30%'>".DOWLAN_153."</td> <td style='width:30%'>".DOWLAN_153."</td>
<td style='width:70%'> <td style='width:70%'>
<select name='move_file' class='tbox'> <select name='move_file' class='form-control'>
<option value=''>".LAN_NO."</option>"; <option value=''>".LAN_NO."</option>";
$dl_dirlist = $fl->get_dirs(e_DOWNLOAD); $dl_dirlist = $fl->get_dirs(e_DOWNLOAD);
if ($dl_dirlist){ if ($dl_dirlist){
@@ -1954,21 +1954,21 @@ $columnInfo = array(
<tr> <tr>
<td style='width: 30%;'>".DOWLAN_12."</td> <td style='width: 30%;'>".DOWLAN_12."</td>
<td style='width: 70%;'> <td style='width: 70%;'>
<input class='tbox' type='text' name='mirror_name' size='60' value='{$mirror_name}' maxlength='200'/> <input class='form-control input-xxlarge' type='text' name='mirror_name' size='60' value='{$mirror_name}' maxlength='200'/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style='width: 30%;'>".DOWLAN_139."</td> <td style='width: 30%;'>".DOWLAN_139."</td>
<td style='width: 70%;'> <td style='width: 70%;'>
<input class='tbox' type='text' name='mirror_url' size='70' value='{$mirror_url}' maxlength='255'/> <input class='form-control input-xxlarge' type='text' name='mirror_url' size='70' value='{$mirror_url}' maxlength='255'/>
</td> </td>
</tr> </tr>
<tr> <tr>
<td style='width: 30%;'>".DOWLAN_136."</td> <td style='width: 30%;'>".DOWLAN_136."</td>
<td style='width: 70%;'> <td style='width: 70%;'>
<input class='tbox' type='text' id='mirror_image' name='mirror_image' size='60' value='{$mirror_image}' maxlength='200'/> <input class='form-control input-xxlarge' type='text' id='mirror_image' name='mirror_image' size='60' value='{$mirror_image}' maxlength='200'/>
<br /><input class='btn btn-default button' type ='button' style='cursor:pointer' size='30' value='".DOWLAN_42."' onclick='expandit(this)'/> <br /><input class='btn btn-default button' type ='button' style='cursor:pointer' size='30' value='".DOWLAN_42."' onclick='expandit(this)'/>
@@ -1987,7 +1987,7 @@ $columnInfo = array(
<tr> <tr>
<td style='width: 30%;'>".DOWLAN_141."</td> <td style='width: 30%;'>".DOWLAN_141."</td>
<td style='width: 70%;'> <td style='width: 70%;'>
<input class='tbox' type='text' name='mirror_location' size='60' value='$mirror_location' maxlength='200'/> <input class='form-control' type='text' name='mirror_location' size='60' value='$mirror_location' maxlength='200'/>
</td> </td>
</tr> </tr>
@@ -2122,7 +2122,7 @@ $columnInfo = array(
<tr> <tr>
<td>".DOWLAN_160."</td> <td>".DOWLAN_160."</td>
<td> <td>
<select name='mirror_order' class='tbox'>". <select name='mirror_order' class='form-control'>".
($pref['mirror_order'] == "0" ? "<option value='0' selected='selected'>".DOWLAN_161."</option>" : "<option value='0'>".DOWLAN_161."</option>"). ($pref['mirror_order'] == "0" ? "<option value='0' selected='selected'>".DOWLAN_161."</option>" : "<option value='0'>".DOWLAN_161."</option>").
($pref['mirror_order'] == "1" ? "<option value='1' selected='selected'>".LAN_ID."</option>" : "<option value='1'>".LAN_ID."</option>"). ($pref['mirror_order'] == "1" ? "<option value='1' selected='selected'>".LAN_ID."</option>" : "<option value='1'>".LAN_ID."</option>").
($pref['mirror_order'] == "2" ? "<option value='2' selected='selected'>".DOWLAN_163."</option>" : "<option value='2'>".DOWLAN_12."</option>")." ($pref['mirror_order'] == "2" ? "<option value='2' selected='selected'>".DOWLAN_163."</option>" : "<option value='2'>".DOWLAN_12."</option>")."
@@ -2131,7 +2131,7 @@ $columnInfo = array(
</tr> </tr>
<tr> <tr>
<td>".DOWLAN_164."</td> <td>".DOWLAN_164."</td>
<td><input type='text' name='recent_download_days' class='tbox' value='".$pref['recent_download_days']."' size='3' maxlength='3'/> <td><input type='text' name='recent_download_days' class='form-control' value='".$pref['recent_download_days']."' size='3' maxlength='3'/>
</td> </td>
</tr> </tr>
</table> </table>
@@ -2320,7 +2320,7 @@ class download_main_admin_form_ui extends e_admin_form_ui
} }
$types = array("theme","plugin"); $types = array("theme","plugin");
$text = "<select class='tbox' name='release_type' >"; $text = "<select class='form-control' name='release_type' >";
foreach($types as $val) foreach($types as $val)
{ {
$selected = ($curVal == $val) ? "selected='selected'" : ""; $selected = ($curVal == $val) ? "selected='selected'" : "";

4
e107_plugins/poll/poll_class.php
View File

@@ -797,7 +797,7 @@ class poll
<tr> <tr>
<td style='width:30%'><div class='normaltext'>".POLLAN_3.":</div></td> <td style='width:30%'><div class='normaltext'>".POLLAN_3.":</div></td>
<td style='width:70%'> <td style='width:70%'>
<input class='tbox input-xxlarge' type='text' name='poll_title' size='70' value='".$tp->post_toForm(varset($_POST['poll_title']))."' maxlength='200' />"; <input class='tbox input-xxlarge form-control' type='text' name='poll_title' size='70' value='".$tp->post_toForm(varset($_POST['poll_title']))."' maxlength='200' />";
$option_count = (varset($_POST['poll_option']) && count($_POST['poll_option']) ? count($_POST['poll_option']) : 2); $option_count = (varset($_POST['poll_option']) && count($_POST['poll_option']) ? count($_POST['poll_option']) : 2);
@@ -809,7 +809,7 @@ class poll
for($count = 1; $count <= $option_count; $count++) for($count = 1; $count <= $option_count; $count++)
{ {
$opt = ($count==1) ? "id='pollopt'" : ""; $opt = ($count==1) ? "id='pollopt'" : "";
$text .="<span class='form-inline' style='display:inline-block; padding-bottom:5px' {$opt}><input class='tbox input-large' type='text' name='poll_option[]' size='40' value=\"".$tp->post_toForm($_POST['poll_option'][($count-1)])."\" maxlength='200' />"; $text .="<span class='form-inline' style='display:inline-block; padding-bottom:5px' {$opt}><input class='tbox input-large form-control' type='text' name='poll_option[]' size='40' value=\"".$tp->post_toForm($_POST['poll_option'][($count-1)])."\" maxlength='200' />";
$text .= "</span><br />"; $text .= "</span><br />";
} }

4
e107_themes/bootstrap3/admin_dark.css
View File

@@ -63,7 +63,9 @@ select:invalid:focus {
box-shadow: 0px 1px 1px 0px rgba(255, 0, 0, 0.75) inset; box-shadow: 0px 1px 1px 0px rgba(255, 0, 0, 0.75) inset;
} }
.admin-icon-debug i { color: #f89406; margin-right:10px; cursor:help}
td.forumheader { background-image: linear-gradient(#303030,#212121 60%,#171717); filter: none; text-shadow: 1px 1px 1px rgba(0,0,0,.3); }

45
e107_themes/bootstrap3/admin_style.css
View File

@@ -1,9 +1,5 @@
body { padding-top: 75px; body { padding-top: 75px; font-size: 14px; }
font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
font-size: 14px;
}
@media (max-width: 992px) { @media (max-width: 992px) {
body { height: 100vh; overflow-y: auto!important; } body { height: 100vh; overflow-y: auto!important; }
@@ -1303,7 +1299,6 @@ ul.core-update-available li { color: white }
/* BC for old plugins in admin */ /* BC for old plugins in admin */
input[type=checkbox].tbox { margin-right:5px } input[type=checkbox].tbox { margin-right:5px }
td.forumheader3 .form-control { display:inherit } td.forumheader3 .form-control { display:inherit }
td.forumheader { background-image: linear-gradient(#303030,#212121 60%,#171717); filter: none; text-shadow: 1px 1px 1px rgba(0,0,0,.3); }
@@ -1312,7 +1307,43 @@ td.forumheader { background-image: linear-gradient(#303030,#212121 60%,#171717);
form#simplesef h4 { margin: 0 } form#simplesef h4 { margin: 0 }
.adminlist tr > td { min-height:50px; } .adminlist tr > td { min-height:50px; }
.navbar-fixed-top { height: 51px; } .admin-icon-debug i { margin-right:10px; cursor:help}
.navbar-fixed-top { height: 51px;
font-size: 14px;
left: 0px;
line-height: 20px;
margin-bottom: 20px;
min-height: 50px;
position: fixed;
}
.navbar-nav {
font-size: 14px;
line-height: 20px;
list-style-image: none;
list-style-position: outside;
list-style-type: none;
margin-bottom: 0px;
margin-left: 0px;
margin-right: 0px;
margin-top: 0px;
padding-left: 0px;
}
.navbar-nav > li > a { padding-bottom: 15px;
padding-left: 15px;
padding-right: 15px;
padding-top: 15px;
position: relative;
}
.navbar-right.navbar-text { padding-right: 5px;
padding-left: 5px;
margin-left: 0;
margin-right: 0;
padding-top: 6px; }
/* /*