1
0
mirror of https://github.com/e107inc/e107.git synced 2025-01-17 12:48:24 +01:00

Issue #1138 - Bootstrap3 UI fixes.

This commit is contained in:
Cameron 2015-07-15 19:33:15 -07:00
parent 35f225aa79
commit a26de7bc84
26 changed files with 156 additions and 125 deletions

View File

@ -328,7 +328,7 @@ class banlist_ui extends e_admin_ui
<div class='field-help'>".$ipAdministrator->getBanTypeString($bt, TRUE)."</div>
</td>
<td class='left'>
".$frm->textarea('ban_text_'.($i), $pref['ban_messages'][$bt], 4, 15)."
".$frm->textarea('ban_text_'.($i), $pref['ban_messages'][$bt], 4, 120)."
</td>
<td class='center'>".ban_time_dropdown('', BANLAN_32, $pref['ban_durations'][$bt], 'ban_time_'.($i))."</td>
</tr>
@ -411,7 +411,7 @@ class banlist_form_ui extends e_admin_form_ui
}
elseif($this->getController()->getAction() == 'create')
{
return $this->hidden('banlist_bantype',eIPHandler::BAN_TYPE_MANUAL)."<span class='label label-important'>".BANLAN_121."</span>";
return $this->hidden('banlist_bantype',eIPHandler::BAN_TYPE_MANUAL)."<span class='label label-important label-danger'>".BANLAN_121."</span>";
}

View File

@ -515,7 +515,7 @@ class adminstyle_infopanel
$text .= '
</ul>
<div class="right">
<a class="btn btn-mini btn-primary text-right" href="'.e_ADMIN.'comment.php?searchquery=&filter_options=comment_blocked__2">View all</a>
<a class="btn btn-xs btn-mini btn-primary text-right" href="'.e_ADMIN.'comment.php?searchquery=&filter_options=comment_blocked__2">View all</a>
</div>
';
// $text .= "<small class='text-center text-warning'>Note: Not fully functional at the moment.</small>";
@ -860,7 +860,7 @@ class adminstyle_infopanel
if($type == 'demo')
{
$text .= "<div class='center'><small>These stats are for demonstration purposes only. <a class='btn btn-mini' href='".e_ADMIN."plugin.php?avail'>Install Site Stats Plugin</a></small></div>";
$text .= "<div class='center'><small>These stats are for demonstration purposes only. <a class='btn btn-xs btn-mini' href='".e_ADMIN."plugin.php?avail'>Install Site Stats Plugin</a></small></div>";
}
else
{

View File

@ -1472,7 +1472,7 @@ class lanDeveloper
if($disabled)
{
$text .= ADMIN_WARNING_ICON;
$label = " <span class='label label-important'>Must be re-enabled</span>";
$label = " <span class='label label-important label-danger'>Must be re-enabled</span>";
$this->errors++;
// $text .= "blabla";
// $class = 'alert alert-warning';
@ -1519,7 +1519,7 @@ class lanDeveloper
// $color = "background-color:yellow";
$value = "<a href='#' title=\"Missing\">".ADMIN_WARNING_ICON."</a>";
$this->errors++;
$label = "<span class='label label-important label-error'>".LANG_LAN_131."</span>";
$label = "<span class='label label-important label-danger'>".LANG_LAN_131."</span>";
// $class = "alert alert-warning";
}
@ -1528,7 +1528,7 @@ class lanDeveloper
{
// $color = "background-color:pink";
$class = ' ';
$label = " <span class='label label-important'>Unused</span>";
$label = " <span class='label label-important label-danger'>Unused</span>";
$text .= "-";
$this->errors++;
}
@ -1547,7 +1547,7 @@ class lanDeveloper
{
//$color = "background-color:yellow";
// $class = "alert alert-warning";
$label .= "<div class='label label-important'><i>".$common."</i> ".LANG_LAN_132."<br />(".LANG_LAN_133." <b>".$def."</b> ".LANG_LAN_134.")</div>";
$label .= "<div class='label label-important label-danger'><i>".$common."</i> ".LANG_LAN_132."<br />(".LANG_LAN_133." <b>".$def."</b> ".LANG_LAN_134.")</div>";
// return "<tr><td style='width:25%;'>".$needle .$disabled. "</td><td></td></tr>";
}

View File

@ -280,9 +280,9 @@ class mailout_main_ui extends e_admin_ui
protected $batchDelete = true;
protected $batchCopy = true;
protected $tabs = array(''.LAN_BASIC.'',''.LAN_ADVANCED.'');
protected $tabs = array(LAN_BASIC,LAN_ADVANCED);
protected $fields = array(
protected $fields = array(
'checkboxes' => array('title'=> '', 'type' => null, 'width' =>'5%', 'forced'=> TRUE, 'thclass'=>'center', 'class'=>'center'),
'mail_source_id' => array('title' => LAN_MAILOUT_137, 'width' =>'5%', 'thclass' => 'center', 'class'=>'center', 'forced' => TRUE),
@ -1023,7 +1023,7 @@ class mailout_main_ui extends e_admin_ui
$lastload = e107::getCache()->retrieve('emailLastBounce',FALSE,TRUE,TRUE);
$lastBounce = round((time() - $lastload) / 60);
$lastBounceText = ($lastBounce > 1256474) ? "<span class='label label-important'>Never</span>" : "<span class='label label-success'>".$lastBounce . " minutes ago.</span>";
$lastBounceText = ($lastBounce > 1256474) ? "<span class='label label-important label-danger'>Never</span>" : "<span class='label label-success'>".$lastBounce . " minutes ago.</span>";
$text = "
<form method='post' action='".e_SELF."?".e_QUERY."' id='mailsettingsform'>
@ -1617,10 +1617,12 @@ class mailout_admin_form_ui extends e_admin_form_ui
$link = e_SELF."?mode=main&action=send&id=".$id;
$preview = e_SELF."?mode=main&action=preview&id=".$id;
$text .= "<a href='".$link."' class='btn' title='Send Mail'>".E_32_MAIL."</a>";
$text .= "<span class='btn-group'>";
$text .= "<a href='".$link."' class='btn btn-default' title='Send Mail'>".E_32_MAIL."</a>";
$text .= "<a rel='external' class='btn btn-default e-modal' data-modal-caption='Email preview' href='".$preview."' title='Preview'>".E_32_SEARCH."</a>";
$text .= $this->renderValue('options',$value,$att,$id);
return $text;
}
@ -1630,11 +1632,13 @@ class mailout_admin_form_ui extends e_admin_form_ui
$link = e_SELF."?searchquery=&filter_options=mail_detail_id__".$id."&mode=recipients&action=list&iframe=1";
$preview = e_SELF."?mode=main&action=preview&id=".$id.'&user='.$user;
$text = "<a href='".$link."' class='btn btn-default e-modal' data-modal-caption='Recipients for Mail #".$id."' title='Recipients'>".E_32_USER."</a>";
$text = "<span class='btn-group'>";
$text .= "<a href='".$link."' class='btn btn-default e-modal' data-modal-caption='Recipients for Mail #".$id."' title='Recipients'>".E_32_USER."</a>";
$text .= "<a rel='external' class='btn btn-default e-modal' data-modal-caption='Email preview' href='".$preview."' title='Preview'>".E_32_SEARCH."</a>";
$att['readParms']['editClass'] = e_UC_NOBODY;
$text .= $this->renderValue('options',$value,$att,$id);
$text .= "</span>";
return $text;
}
@ -1798,7 +1802,9 @@ class mailout_recipients_form_ui extends e_admin_form_ui
$eid = $this->getController()->getListModel()->get('mail_detail_id');
$preview = e_SELF."?mode=main&action=preview&id=".$eid.'&user='.$user;
$text = "<a rel='external' class='btn btn-default e-modal' data-modal-caption='Email preview' href='".$preview."' class='btn' title='Preview'>".E_32_SEARCH."</a>";
$text = "<span class='btn-group'>";
$text .= "<a rel='external' class='btn btn-default e-modal' data-modal-caption='Email preview' href='".$preview."' class='btn' title='Preview'>".E_32_SEARCH."</a>";
@ -1812,6 +1818,7 @@ class mailout_recipients_form_ui extends e_admin_form_ui
}
$text .= $this->renderValue('options',$value,$att,$id);
$text .= "</span>";
return $text;

View File

@ -659,7 +659,7 @@ class news_admin_ui extends e_admin_ui
$this->fields['news_email_notify']['writeParms']['post'] = "<span class='radio inline'><a class='e-modal btn btn-mini btn-primary' data-modal-caption='".ADLAN_149."' href='notify.php?iframe=1&type=admin_news_notify#/tab-news-events'>".LAN_CONFIGURE."</a></span>";
$this->fields['news_email_notify']['writeParms']['post'] = "<span class='radio inline'><a class='e-modal btn btn-xs btn-mini btn-primary' data-modal-caption='".ADLAN_149."' href='notify.php?iframe=1&type=admin_news_notify#/tab-news-events'>".LAN_CONFIGURE."</a></span>";
// e107::getMessage()->addDebug(print_a($_POST,true));

View File

@ -113,7 +113,7 @@ class pluginmanager_form extends e_form
$conf_file = e_PLUGIN. $this->plug['plugin_path'].'/'.$this->plug_vars['administration']['configFile'];
$conf_title = LAN_CONFIGURE.' '.$tp->toHtml($this->plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable");
$plugin_icon = "<a title='{$conf_title}' href='{$conf_file}' >".$plugin_icon."</a>";
$plugin_config_icon = "<a class='btn' title='{$conf_title}' href='{$conf_file}' >".ADMIN_CONFIGURE_ICON."</a>";
$plugin_config_icon = "<a class='btn btn-default' title='{$conf_title}' href='{$conf_file}' >".ADMIN_CONFIGURE_ICON."</a>";
}
$text = "<div class='btn-group'>";
@ -125,7 +125,7 @@ class pluginmanager_form extends e_form
if ($this->plug['plugin_installflag'])
{
$text .= ($this->plug['plugin_installflag'] ? "<a class='btn' href=\"".e_SELF."?uninstall.{$this->plug['plugin_id']}\" title='".EPL_ADLAN_1."' >".ADMIN_UNINSTALLPLUGIN_ICON."</a>" : "<a class='btn' href=\"".e_SELF."?install.{$this->plug['plugin_id']}\" title='".EPL_ADLAN_0."' >".ADMIN_INSTALLPLUGIN_ICON."</a>");
$text .= ($this->plug['plugin_installflag'] ? "<a class='btn btn-default' href=\"".e_SELF."?uninstall.{$this->plug['plugin_id']}\" title='".EPL_ADLAN_1."' >".ADMIN_UNINSTALLPLUGIN_ICON."</a>" : "<a class='btn' href=\"".e_SELF."?install.{$this->plug['plugin_id']}\" title='".EPL_ADLAN_0."' >".ADMIN_INSTALLPLUGIN_ICON."</a>");
// $text .= ($this->plug['plugin_installflag'] ? "<button type='button' class='delete' value='no-value' onclick=\"location.href='".e_SELF."?uninstall.{$this->plug['plugin_id']}'\"><span>".EPL_ADLAN_1."</span></button>" : "<button type='button' class='update' value='no-value' onclick=\"location.href='".e_SELF."?install.{$this->plug['plugin_id']}'\"><span>".EPL_ADLAN_0."</span></button>");
if (PLUGIN_SHOW_REFRESH && !vartrue($this->plug_vars['plugin_php']))
{
@ -136,7 +136,7 @@ class pluginmanager_form extends e_form
{
// $text .= "<input type='button' class='btn' onclick=\"location.href='".e_SELF."?install.{$this->plug['plugin_id']}'\" title='".EPL_ADLAN_0."' value='".EPL_ADLAN_0."' />";
// $text .= "<button type='button' class='update' value='no-value' onclick=\"location.href='".e_SELF."?install.{$this->plug['plugin_id']}'\"><span>".EPL_ADLAN_0."</span></button>";
$text .= "<a class='btn' href=\"".e_SELF."?install.{$this->plug['plugin_id']}\" title='".EPL_ADLAN_0."' >".ADMIN_INSTALLPLUGIN_ICON."</a>";
$text .= "<a class='btn btn-default' href=\"".e_SELF."?install.{$this->plug['plugin_id']}\" title='".EPL_ADLAN_0."' >".ADMIN_INSTALLPLUGIN_ICON."</a>";
}
}
@ -159,7 +159,7 @@ class pluginmanager_form extends e_form
if ($this->plug['plugin_version'] != $this->plug_vars['@attributes']['version'] && $this->plug['plugin_installflag'])
{
// $text .= "<br /><input type='button' class='btn' onclick=\"location.href='".e_SELF."?upgrade.{$this->plug['plugin_id']}'\" title='".EPL_UPGRADE." to v".$this->plug_vars['@attributes']['version']."' value='".EPL_UPGRADE."' />";
$text .= "<a class='btn' href='".e_SELF."?upgrade.{$this->plug['plugin_id']}' title=\"".EPL_UPGRADE." to v".$this->plug_vars['@attributes']['version']."\" >".ADMIN_UPGRADEPLUGIN_ICON."</a>";
$text .= "<a class='btn btn-default' href='".e_SELF."?upgrade.{$this->plug['plugin_id']}' title=\"".EPL_UPGRADE." to v".$this->plug_vars['@attributes']['version']."\" >".ADMIN_UPGRADEPLUGIN_ICON."</a>";
}
$text .="</div> ";
@ -182,7 +182,7 @@ function e_help()
$help_text = str_replace('[x]', (PLUGIN_SCAN_INTERVAL ? PLUGIN_SCAN_INTERVAL / 60 : 0), EPL_ADLAN_228);
return array(
'caption' => EPL_ADLAN_227,
'text' => $help_text."<p><a class='btn btn-mini btn-primary' href='".e_SELF."?refresh'>".EPL_ADLAN_229."</a></p>"
'text' => $help_text."<p><a class='btn btn-xs btn-mini btn-primary' href='".e_SELF."?refresh'>".EPL_ADLAN_229."</a></p>"
);
}
@ -515,8 +515,8 @@ class pluginManager{
unset($fieldList['checkboxes']);
$text = "
<form class='form-search' action='".e_SELF."?".e_QUERY."' id='core-plugin-list-form' method='get'>
<div class='e-search'>".$frm->search('srch', $srch, 'go', $filterName, $filterArray, $filterVal).$frm->hidden('mode','online')."
<form class='form-search form-inline' action='".e_SELF."?".e_QUERY."' id='core-plugin-list-form' method='get'>
<div id='admin-ui-list-filter' class='e-search '>".$frm->search('srch', $srch, 'go', $filterName, $filterArray, $filterVal).$frm->hidden('mode','online')."
</div>
</form>
@ -1274,7 +1274,7 @@ class pluginManager{
$conf_file = e_PLUGIN.$plug['plugin_path'].'/'.$plug_vars['administration']['configFile'];
$conf_title = LAN_CONFIGURE.' '.$tp->toHtml($plug_vars['@attributes']['name'], "", "defs,emotes_off, no_make_clickable");
// $plugin_icon = "<a title='{$conf_title}' href='{$conf_file}' >".$plugin_icon."</a>";
$plugin_config_icon = "<a class='btn' title='{$conf_title}' href='{$conf_file}' >".ADMIN_CONFIGURE_ICON."</a>";
$plugin_config_icon = "<a class='btn btn-default' title='{$conf_title}' href='{$conf_file}' >".ADMIN_CONFIGURE_ICON."</a>";
}
$plugEmail = varset($plug_vars['author']['@attributes']['email'],'');
@ -1882,7 +1882,7 @@ class pluginLanguage
return "<span class='label label-warning'>".$diz[$mode][$val]."</span>";
}
return "<span class='label label-important'>".$diz[$mode][$val]."</span>";
return "<span class='label label-important label-danger'>".$diz[$mode][$val]."</span>";
}
function shortPath($path,$mode='lan')
@ -2237,12 +2237,12 @@ class pluginBuilder
</colgroup>
<tr>
<td>".EPL_ADLAN_107."</td>
<td><div class='input-append'>".$frm->open('createPlugin','get',e_SELF."?mode=create").$frm->select("newplugin",$newDir).$frm->admin_button('step', 2,'other','Go')."</div> ".$frm->checkbox('createFiles',1,1,'Create Files').$frm->close()."</td>
<td><div class='input-append form-inline'>".$frm->open('createPlugin','get',e_SELF."?mode=create").$frm->select("newplugin",$newDir).$frm->admin_button('step', 2,'other','Go')."</div> ".$frm->checkbox('createFiles',1,1,'Create Files').$frm->close()."</td>
</tr>
<tr>
<td>".EPL_ADLAN_108."</td>
<td><div class='input-append'>".$frm->open('checkPluginLangs','get',e_SELF."?mode=lans").$frm->select("newplugin",$lanDir).$frm->admin_button('step', 2,'other','Go')."</div> ".$frm->close()."</td>
<td><div class='input-append form-inline'>".$frm->open('checkPluginLangs','get',e_SELF."?mode=lans").$frm->select("newplugin",$lanDir).$frm->admin_button('step', 2,'other','Go')."</div> ".$frm->close()."</td>
</tr>";

View File

@ -343,7 +343,7 @@ include_lan(e_LANGUAGEDIR.e_LANGUAGE.'/admin/lan_'.e_PAGE);
$mes->addInfo(UCSLAN_49);
$text = "<div style='text-align:center'>
$text = "<div>
<form method='post' action='".e_SELF."?mode=main&action=initial' id='initialForm'>
<table class='table table-bordered adminform'>
<tr><td>".UCSLAN_43."</td><td>";

View File

@ -2320,9 +2320,9 @@ class users_admin_form_ui extends e_admin_form_ui
{
$bo = array(
'<span class="label label-success">Active</span>',
"<span class='label label-important'>".LAN_BANNED."</span>",
"<span class='label'>".LAN_NOTVERIFIED."</span>",
"<span class='label label-inverse'>".LAN_BOUNCED."</span>"
"<span class='label label-important label-danger'>".LAN_BANNED."</span>",
"<span class='label label-default'>".LAN_NOTVERIFIED."</span>",
"<span class='label label-info'>".LAN_BOUNCED."</span>"
);
if($mode == 'filter' || $mode == 'batch')

View File

@ -930,8 +930,8 @@ class users_ext
</td>
<td class='center' style='width:10%;white-space:nowrap'>
<a class='btn' style='text-decoration:none' href='".e_SELF."?editext.".$id."'>".ADMIN_EDIT_ICON."</a>
".$frm->submit_image('eudel['.$name.']',$id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn'.$delcls));
<a class='btn btn-default' style='text-decoration:none' href='".e_SELF."?editext.".$id."'>".ADMIN_EDIT_ICON."</a>
".$frm->submit_image('eudel['.$name.']',$id, 'delete', LAN_DELETE.' [ ID: '.$id.' ]', array('class' => 'action delete btn btn-default'.$delcls));
// ."<input class='btn btn-large' type='image' title='".LAN_DELETE."' name='eudel[".$name."]' src='".ADMIN_DELETE_ICON_PATH."' value='".$id."' onclick='return confirm(\"".EXTLAN_27."\")' />
$text .= "</td>

View File

@ -6103,9 +6103,10 @@ class e_admin_form_ui extends e_form
if(!$this->getController()->getTreeModel()->isEmpty())
{
$text .= "
<div class='input-group input-group-btn input-append'>
<div class='form-inline'>
<img src='".e_IMAGE_ABS."generic/branchbottom.gif' alt='' class='icon action' />
".$this->select_open('etrigger_batch', array('class' => 'tbox form-control select batch e-autosubmit reset', 'id' => false))."
<div class='input-group'>
".$this->select_open('etrigger_batch', array('class' => 'tbox form-control input-large select batch e-autosubmit reset', 'id' => 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_delete ? $this->option(LAN_DELETE, 'delete', false, array('class' => 'ui-batch-option class', 'other' => 'style="padding-left: 15px"')) : '')."
@ -6125,8 +6126,9 @@ class e_admin_form_ui extends e_form
$text .= "
".$this->renderBatchFilter('batch')."
".$this->select_close()."
<div class='input-group-btn'>
".$this->admin_button('e__execute_batch', 'e__execute_batch', 'batch e-hide-if-js', LAN_GO, array('id' => false))."
</div>
</div></div></div>
";
}

View File

@ -1153,7 +1153,7 @@ class e_form
if(vartrue($options['strength']))
{
$addon .= "<div style='margin-top:4px'><div id='pwdColor' class='progress' style='float:left;display:inline-block;width:218px'><div class='bar' id='pwdMeter' style='width:0%' ></div></div> <div id='pwdStatus' class='smalltext' style='float:left;display:inline-block;width:150px;margin-left:5px'></span></div>";
$addon .= "<div style='margin-top:4px'><div class='progress' style='float:left;display:inline-block;width:218px'><div class='progress-bar bar' id='pwdMeter' style='width:0%' ></div></div> <div id='pwdStatus' class='smalltext' style='float:left;display:inline-block;width:150px;margin-left:5px'></span></div>";
}
$options['pattern'] = vartrue($options['pattern'],'[\S]{4,}');
@ -1883,9 +1883,9 @@ class e_form
{
$tp = e107::getParser();
$text = '<span class="input-append e-search">
'.$this->text($name, $searchVal,20,'class=search-query&placeholder='.LAN_SEARCH).'
<button class="btn btn-primary" name="'.$submitName.'" type="submit">'.$tp->toGlyph('fa-search',' ').'</button>
$text = '<span class="input-append input-group e-search">
'.$this->text($name, $searchVal,20,'class=search-query&placeholder=Search&hellip;').'
<span class="input-group-btn"><button class="btn btn-primary" name="'.$submitName.'" type="submit">'.$tp->toGlyph('fa-search',' ').'</button></span>
</span>';
@ -2244,7 +2244,7 @@ class e_form
break;
case 'checkall':
$options['class'] .= 'btn-mini';
$options['class'] .= 'btn-default btn-mini btn-xs';
break;
case 'cancel':
@ -3384,8 +3384,8 @@ class e_form
$ttl = vartrue($parms['expand']);
if($ttl == 1)
{
$ttl = $expand."<button class='btn btn-default btn-mini pull-right'>More..</button>";
$ttl1 = "<button class='btn btn-default btn-mini pull-right'>..Less</button>";
$ttl = $expand."<button class='btn btn-default btn-xs btn-mini pull-right'>More..</button>";
$ttl1 = "<button class='btn btn-default btn-xs btn-mini pull-right'>..Less</button>";
}
else
{
@ -3739,7 +3739,7 @@ class e_form
}
else
{
return "<span class='label label-important'>Missing: ".$method."()</span>";
return "<span class='label label-important label-danger'>Missing: ".$method."()</span>";
}
// print_a($attributes);
// Inline Editing.
@ -3881,7 +3881,7 @@ class e_form
if(!empty($attributes['multilan']))
{
$value = is_array($value) ? varset($value[e_LANGUAGE],'') : $value;
$parms['post'] = "<small class='e-tip admin-multilanguage-field' style='cursor:help; padding-left:10px' title='Multi-language field'>".$tp->toGlyph('fa-language')."</small>";
$parms['post'] = "<small class='e-tip admin-multilanguage-field input-group-addon' style='cursor:help; padding-left:10px' title='Multi-language field'>".$tp->toGlyph('fa-language')."</small>";
}
if(empty($value) && !empty($parms['default'])) // Allow writeParms to set default value.
@ -3982,15 +3982,20 @@ class e_form
$maxlength = vartrue($parms['maxlength'], 255);
unset($parms['maxlength']);
if(!empty($parms['password'])) // password mechanism without the md5 storage.
{
$ret = vartrue($parms['pre']).$this->password($key, $value, $maxlength, $parms).vartrue($parms['post']);
$ret = vartrue($parms['pre']).$this->password($key, $value, $maxlength, $parms).vartrue($parms['post']);
}
else
{
$ret = vartrue($parms['pre']).$this->text($key, $value, $maxlength, $parms).vartrue($parms['post']); // vartrue($parms['__options']) is limited. See 'required'=>true
}
if(!empty($attributes['multilan']))
{
$ret = "<span class='input-group input-xxlarge'>".$ret."</span>";
}
break;
@ -4296,7 +4301,7 @@ class e_form
break;
default:// No LAN necessary, debug only.
$ret = (ADMIN) ? "<span class='alert alert-error'>".LAN_ERROR." Unknown 'type' : ".$attributes['type'] ."</span>" : $value;
$ret = (ADMIN) ? "<span class='alert alert-error alert-danger'>".LAN_ERROR." Unknown 'type' : ".$attributes['type'] ."</span>" : $value;
break;
}
@ -4401,7 +4406,7 @@ class e_form
</tbody>
</table>";
$text .= "<div class='alert alert-block alert-info center middle'>".LAN_NO_RECORDS_FOUND."</div>"; // not prone to column-count issues.
$text .= "<div id='admin-ui-list-no-records-found' class=' alert alert-block alert-info center middle'>".LAN_NO_RECORDS_FOUND."</div>"; // not prone to column-count issues.
}
else
{

View File

@ -1316,7 +1316,7 @@ class themeHandler
}
else
{
$custompage_diz = "<a href='#element-to-be-shown-{$key}' title='Set pages which should automatically use this layout. One per line.' class='e-tip btn btn-mini e-expandit'>None</a> ";
$custompage_diz = "<a href='#element-to-be-shown-{$key}' title='Set pages which should automatically use this layout. One per line.' class='e-tip btn btn-xs btn-default btn-mini e-expandit'>None</a> ";
}

View File

@ -104,7 +104,7 @@ define("LAN_VERSION", "Version");
define("LAN_DOWNLOAD", "Download");
define("LAN_COMMENTS", "Comments");
define("LAN_LOCATION", "Location");
define("LAN_NO_RECORDS_FOUND","No Records Found.");
define("LAN_NO_RECORDS_FOUND","No Records Found");
define("LAN_RATING", "Rating");
define("LAN_IMAGE","Image");
define("LAN_ABOUT", "About");

View File

@ -15,7 +15,7 @@ $text = "This page provides you with an overview of site activity.<br /><br />";
if(e107::getPref('admincss')=='admin_dark.css')
{
$text .= "<small>Theme too dark? <a class='btn btn-mini btn-inverse' href='".e_ADMIN."theme.php?mode=admin'>Change it here</a></small>";
$text .= "<small>Theme too dark? <a class='btn btn-default btn-xs btn-mini btn-inverse' href='".e_ADMIN."theme.php?mode=admin'>Change it here</a></small>";
}

View File

@ -26,7 +26,8 @@ if (!getperms("P") || !e107::isInstalled('download'))
e107::lan('download','download'); // e_PLUGIN.'download/languages/'.e_LANGUAGE.'/download.php'
e107::lan('download','admin_download'); // e_PLUGIN.'download/languages/'.e_LANGUAGE.'/admin_download.php'
e107::lan('download', 'admin', true); // e_PLUGIN.'download/languages/'.e_LANGUAGE.'/admin_download.php'
// require_once(e_PLUGIN.'download/handlers/adminDownload_class.php');

View File

@ -1187,7 +1187,7 @@ $columnInfo = array(
<div class='tab-pane active' id='download-create'>
<table class='table adminform'>
<table class='table adminform' style='margin:0'>
<tr>
<td>".DOWLAN_13."</td>
<td style='width:80%'>
@ -1240,7 +1240,7 @@ $columnInfo = array(
</table>
</div>
<div class='tab-pane' id='download-edit-external'>
<table class='table adminform'>
<table class='table adminform' style='margin:0'>
<tr>
<td>".DOWLAN_149."</td>
<td style='width:80%;'>
@ -1328,7 +1328,7 @@ $columnInfo = array(
</div>
</div>
<fieldset id='download-edit-therest'>
<table class='table adminform'>
<table class='table adminform' >
<tr>
<td style='width:20%'>".DOWLAN_11."</td>
<td style='width:80%'>";

View File

@ -236,7 +236,7 @@ if(!deftrue('OLD_FORUMADMIN'))
if(e107::isInstalled('poll') == false)
{
$this->prefs['poll']['writeParms']['post'] = " <span class='label label-important'>Not installed</span>";
$this->prefs['poll']['writeParms']['post'] = " <span class='label label-important label-danger'>Not installed</span>";
}

View File

@ -279,7 +279,7 @@ class forum_post_handler
}
else
{
$text = "<div class='alert alert-block alert-error'><h4>".LAN_FORUM_2021 . "</h4><a href='{$url}'>".LAN_FORUM_2022.'</a></div>';
$text = "<div class='alert alert-block alert-error alert-danger'><h4>".LAN_FORUM_2021 . "</h4><a href='{$url}'>".LAN_FORUM_2022.'</a></div>';
}
$link = "{e_PLUGIN}forum/forum_admin.php?mode=post&action=list&id=".intval($result);

View File

@ -92,7 +92,7 @@ class gallery_shortcodes extends e_shortcode
elseif(isset($parms['imageurl'])) return $tp->replaceConstants($this->var['media_url'], 'full');
$caption = $tp->toAttribute($this->var['media_caption']) ;
$description = ($this->downloadable) ? " <a class='btn btn-mini e-tip' title='Right-click > Save Link As' href='".$srcFull."'>Download</a>" : "";
$description = ($this->downloadable) ? " <a class='btn btn-xs btn-default btn-mini e-tip' title='Right-click > Save Link As' href='".$srcFull."'>Download</a>" : "";
$description .= $tp->toAttribute($this->var['media_description']);

View File

@ -40,7 +40,7 @@ class social_adminarea extends e_admin_dispatcher
'main/edit' => 'main/list'
);
protected $menuTitle = 'social';
protected $menuTitle = 'Social';
}

View File

@ -53,6 +53,8 @@ tr.highlight-even, .table-striped > tbody > tr.highlight-even { background-colo
background-image: none;
}
#admin-ui-nav-menu a.link-active { color: #fff }
/*
.bootstrap-select, bootstrap-select button
{

View File

@ -78,30 +78,36 @@ table input.form-control, table textarea.form-control, table select.form-contro
width:530px
}
table textarea.input-block-level, input.input-block-level, select.input-block-level { width: 100% }
table textarea.input-block-level,
input.input-block-level,
select.input-block-level { width: 100% }
table label.checkbox { margin-left: 20px }
#admin-ui-nav-menu i.fa-chevron-right { margin-left: -10px }
#admin-ui-list-batch { padding: 10px 15px }
#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-list-no-records-found { margin-bottom: 0 }
#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 }
.panel-default:hover { transition: color .50s ease-in-out; -moz-transition: color .50s ease-in-out; -webkit-transition: color .50s ease-in-out; color: #fff }
#admin-ui-edit { }
#admin-ui-edit-db-language { margin-bottom: -30px; margin-top:-10px; padding-bottom:5px; padding-right:5px }
#admin-ui-edit { }
#admin-ui-edit-db-language { margin-bottom: -30px; margin-top:-10px; padding-bottom:5px; padding-right:5px }
td.options .btn-group { display: flex; }
td.options .btn-group { display: flex; }
.table .nav-tabs a, .table th a, .table td a { text-decoration: none }
.table .nav-tabs a,
.table th a, .table td a { text-decoration: none }
.label, .badge {
text-shadow: 1px 1px 0px #000;
box-shadow: 1px 1px 0px #000;
}
.table > thead > tr > th { padding: 15px 10px; font-weight:bold; font-variant: small-caps; }
.label, .badge { text-shadow: 1px 1px 0px #000; box-shadow: 1px 1px 0px #000; }

View File

@ -240,6 +240,7 @@ $ADMIN_HEADER .= '<div class="container-fluid">
{ADMIN_PWORD}
{SETSTYLE=site_info}
{ADMINUI_HELP}
{ADMIN_HELP}
{ADMIN_SITEINFO=creditsonly}
{SETSTYLE=admin_menu}
@ -253,7 +254,7 @@ $ADMIN_HEADER .= '<div class="container-fluid">
{SETSTYLE=none}
{SETSTYLE=default}
</div>
<div class="col-lg-10" id="right-panel" >
@ -364,18 +365,18 @@ $ADMIN_FOOTER = "
* see function e107::getNav()->admin() in e107_admin/header.php
*/
$E_ADMIN_MENU['start'] = '
<ul class="plugin-navigation nav nav-list">
<ul id="admin-ui-nav-menu" class="plugin-navigation nav nav-list">
';
$E_ADMIN_MENU['button'] = '
<li>
<a class="link{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}><i class="icon-chevron-right"></i>&nbsp;{LINK_TEXT}</a>
<a class="link{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}>&nbsp;{LINK_TEXT}</a>
{SUB_MENU}
</li>
';
$E_ADMIN_MENU['button_active'] = '
<li class="active">
<a class="link-active{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}><i class="icon-chevron-right"></i>&nbsp;{LINK_TEXT}</a>
<a class="link-active{LINK_CLASS}" href="{LINK_URL}"{ID}{ONCLICK}><i class="fa fa-chevron-right"></i>&nbsp;{LINK_TEXT}</a>
{SUB_MENU}
</li>
';

View File

@ -1,7 +1,7 @@
<?php
if ( ! defined('e107_INIT')) { exit(); }
define("SEP"," <span class='glyphicon glyphicon-icon-play e-breadcrumb'></span> ");
define("SEP"," <span class='fa fa-play e-breadcrumb'></span> ");
define("BOOTSTRAP", 3);
define('FONTAWESOME', 4);

View File

@ -1372,11 +1372,11 @@ a.bg-primary:focus {
background-color: #285f8f;
}
.bg-success {
background-color: #62c462;
background-color: #51a351;
}
a.bg-success:hover,
a.bg-success:focus {
background-color: #42b142;
background-color: #408140;
}
.bg-info {
background-color: #5bc0de;
@ -2357,14 +2357,14 @@ table th[class*="col-"] {
.table > thead > tr.success > th,
.table > tbody > tr.success > th,
.table > tfoot > tr.success > th {
background-color: #62c462;
background-color: #51a351;
}
.table-hover > tbody > tr > td.success:hover,
.table-hover > tbody > tr > th.success:hover,
.table-hover > tbody > tr.success:hover > td,
.table-hover > tbody > tr:hover > .success,
.table-hover > tbody > tr.success:hover > th {
background-color: #4fbd4f;
background-color: #499249;
}
.table > thead > tr > td.info,
.table > tbody > tr > td.info,
@ -2822,7 +2822,7 @@ select[multiple].input-lg {
.has-success .input-group-addon {
color: #ffffff;
border-color: #ffffff;
background-color: #62c462;
background-color: #51a351;
}
.has-success .form-control-feedback {
color: #ffffff;
@ -3177,26 +3177,26 @@ fieldset[disabled] .btn-primary.active {
}
.btn-success {
color: #ffffff;
background-color: #62c462;
border-color: #62c462;
background-color: #51a351;
border-color: #51a351;
}
.btn-success:focus,
.btn-success.focus {
color: #ffffff;
background-color: #42b142;
border-color: #2d792d;
background-color: #408140;
border-color: #274e27;
}
.btn-success:hover {
color: #ffffff;
background-color: #42b142;
border-color: #40a940;
background-color: #408140;
border-color: #3d7a3d;
}
.btn-success:active,
.btn-success.active,
.open > .dropdown-toggle.btn-success {
color: #ffffff;
background-color: #42b142;
border-color: #40a940;
background-color: #408140;
border-color: #3d7a3d;
}
.btn-success:active:hover,
.btn-success.active:hover,
@ -3208,8 +3208,8 @@ fieldset[disabled] .btn-primary.active {
.btn-success.active.focus,
.open > .dropdown-toggle.btn-success.focus {
color: #ffffff;
background-color: #399739;
border-color: #2d792d;
background-color: #346934;
border-color: #274e27;
}
.btn-success:active,
.btn-success.active,
@ -3234,11 +3234,11 @@ fieldset[disabled] .btn-success:active,
.btn-success.disabled.active,
.btn-success[disabled].active,
fieldset[disabled] .btn-success.active {
background-color: #62c462;
border-color: #62c462;
background-color: #51a351;
border-color: #51a351;
}
.btn-success .badge {
color: #62c462;
color: #51a351;
background-color: #ffffff;
}
.btn-info {
@ -4911,11 +4911,11 @@ a.label:focus {
background-color: #285f8f;
}
.label-success {
background-color: #62c462;
background-color: #51a351;
}
.label-success[href]:hover,
.label-success[href]:focus {
background-color: #42b142;
background-color: #408140;
}
.label-info {
background-color: #5bc0de;
@ -5083,29 +5083,29 @@ a.thumbnail.active {
color: inherit;
}
.alert-success {
background-color: #62c462;
border-color: #62bd4f;
background-color: #51a351;
border-color: #559249;
color: #ffffff;
}
.alert-success hr {
border-top-color: #55b142;
border-top-color: #4b8140;
}
.alert-success .alert-link {
color: #e6e6e6;
}
.alert-info {
background-color: #5bc0de;
border-color: #3dced8;
background-color: #337ab7;
border-color: #4f93ce;
color: #ffffff;
}
.alert-info hr {
border-top-color: #2ac7d2;
border-top-color: #3b87c8;
}
.alert-info .alert-link {
color: #e6e6e6;
}
.alert-warning {
background-color: #f89406;
background-color: #df8505;
border-color: #e96506;
color: #ffffff;
}
@ -5180,7 +5180,7 @@ a.thumbnail.active {
animation: progress-bar-stripes 2s linear infinite;
}
.progress-bar-success {
background-color: #62c462;
background-color: #51a351;
}
.progress-striped .progress-bar-success {
background-image: -webkit-linear-gradient(45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);
@ -5343,7 +5343,7 @@ button.list-group-item {
}
.list-group-item-success {
color: #ffffff;
background-color: #62c462;
background-color: #51a351;
}
a.list-group-item-success,
button.list-group-item-success {
@ -5358,7 +5358,7 @@ button.list-group-item-success:hover,
a.list-group-item-success:focus,
button.list-group-item-success:focus {
color: #ffffff;
background-color: #4fbd4f;
background-color: #499249;
}
a.list-group-item-success.active,
button.list-group-item-success.active,
@ -5741,14 +5741,14 @@ button.list-group-item-danger.active:focus {
}
.panel-success > .panel-heading {
color: #ffffff;
background-color: #62c462;
background-color: #51a351;
border-color: rgba(0, 0, 0, 0.6);
}
.panel-success > .panel-heading + .panel-collapse > .panel-body {
border-top-color: rgba(0, 0, 0, 0.6);
}
.panel-success > .panel-heading .badge {
color: #62c462;
color: #51a351;
background-color: #ffffff;
}
.panel-success > .panel-footer + .panel-collapse > .panel-body {
@ -6848,19 +6848,19 @@ button.close {
filter: none;
}
.btn-success {
background-image: -webkit-linear-gradient(#78cc78, #62c462 60%, #53be53);
background-image: -o-linear-gradient(#78cc78, #62c462 60%, #53be53);
background-image: linear-gradient(#78cc78, #62c462 60%, #53be53);
background-image: -webkit-linear-gradient(#62b162, #51a351 60%, #4a954a);
background-image: -o-linear-gradient(#62b162, #51a351 60%, #4a954a);
background-image: linear-gradient(#62b162, #51a351 60%, #4a954a);
background-repeat: no-repeat;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff78cc78', endColorstr='#ff53be53', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff62b162', endColorstr='#ff4a954a', GradientType=0);
filter: none;
}
.btn-success:hover {
background-image: -webkit-linear-gradient(#2f7d2f, #379337 40%, #3da23d);
background-image: -o-linear-gradient(#2f7d2f, #379337 40%, #3da23d);
background-image: linear-gradient(#2f7d2f, #379337 40%, #3da23d);
background-image: -webkit-linear-gradient(#285128, #336633 40%, #397339);
background-image: -o-linear-gradient(#285128, #336633 40%, #397339);
background-image: linear-gradient(#285128, #336633 40%, #397339);
background-repeat: no-repeat;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff2f7d2f', endColorstr='#ff3da23d', GradientType=0);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff285128', endColorstr='#ff397339', GradientType=0);
filter: none;
}
.btn-info {
@ -6929,7 +6929,7 @@ h6 {
}
.text-success,
.text-success:hover {
color: #62c462;
color: #51a351;
}
.text-danger,
.text-danger:hover {
@ -7016,11 +7016,11 @@ select {
.has-success .help-block,
.has-success .control-label,
.has-success .form-control-feedback {
color: #62c462;
color: #51a351;
}
.has-success .form-control,
.has-success .form-control:focus {
border-color: #62c462;
border-color: #51a351;
}
legend {
color: #fff;

View File

@ -63,37 +63,44 @@ jQuery.fn.pwdMeter = function(options){
$('#pwdColor').removeClass();
$('#pwdColor').addClass('progress');
$('#pwdMeter').css("width",'1%');
$('#pwdMeter').removeClass("progress-bar-danger progress-bar-warning progress-bar-success");
// $('#pwdMeter').removeStyle();
switch(passwordStrength){
case 1:
$('#pwdColor').addClass('progress-danger');
$('#pwdMeter').addClass('progress-bar-danger'); //BS3
$('#pwdMeter').css("width",'10%');
$('#pwdStatus').text('Very Weak');
break;
case 2:
$('#pwdColor').addClass('progress-danger');
$('#pwdMeter').addClass('progress-bar-danger'); //BS3
$('#pwdMeter').css("width",'25%');
$('#pwdStatus').text('Weak');
break;
case 3:
$('#pwdColor').addClass('progress-warning');
$('#pwdMeter').addClass('progress-bar-warning'); //BS3
$('#pwdMeter').css("width",'30%');
$('#pwdStatus').text('Medium');
break;
case 4:
$('#pwdColor').addClass('progress-warning');
$('#pwdMeter').addClass('progress-bar-warning'); //BS3
$('#pwdMeter').css("width",'50%');
$('#pwdStatus').text('Medium');
break;
case 5:
$('#pwdColor').addClass('progress-success');
$('#pwdMeter').addClass('progress-bar-success'); //BS3
$('#pwdMeter').css("width",'75%');
$('#pwdStatus').text('Strong');
break;
case 6:
$('#pwdColor').addClass('progress-success');
$('#pwdMeter').addClass('progress-bar-success'); //BS3
$('#pwdMeter').css("width",'100%');
$('#pwdStatus').text('Very Strong');
break;