mirror of
https://github.com/e107inc/e107.git
synced 2025-03-14 01:19:44 +01:00
Issue #1138 - Dark style re-created from scratch.
This commit is contained in:
Cameron
parent
83f7b90d0b
commit
dbd25a74ca
@ -1650,14 +1650,14 @@ $text .= "
|
||||
<tr>
|
||||
<td><label for='signup-text'>".PRFLAN_126."</label></td>
|
||||
<td>
|
||||
".$frm->textarea('signup_text', $pref['signup_text'], 2, 1)."
|
||||
".$frm->textarea('signup_text', $pref['signup_text'], 3, 80)."
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td><label for='signup-text-after'>".PRFLAN_140."</label></td>
|
||||
<td>
|
||||
".$frm->textarea('signup_text_after', $pref['signup_text_after'], 2, 1)."
|
||||
".$frm->textarea('signup_text_after', $pref['signup_text_after'], 3, 80)."
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
|
||||
@ -84,7 +84,7 @@ class bbcode_shortcodes extends e_shortcode
|
||||
// $data = "[table]\n[tr]\n\t[td]Cell 1[/td]\n\t[td]Cell 2[/td]\n[/tr]\n[/table]"; // works with jquery, but not onclick.
|
||||
$data = "[table][tr][td]Cell 1[/td][td]Cell 2[/td][/tr][/table]";
|
||||
$event = $this->getEvent('addtext',$data,'Insert a table',1);
|
||||
$text = "<a {$event} class='btn' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' title='Insert a table' data-bbcode='{$data}'>";
|
||||
$text = "<a {$event} class='btn btn-default' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' title='Insert a table' data-bbcode='{$data}'>";
|
||||
// $text .= "<img class='btn btn-small bbcode bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/table.png' alt='' title='Insert a table' />";
|
||||
$text .= $this->button(e_IMAGE_ABS."bbcode/table.png", 'table' );
|
||||
$text .= "</a>";
|
||||
@ -111,7 +111,7 @@ class bbcode_shortcodes extends e_shortcode
|
||||
// $data = "[list]\n[*]Item 1\n[*]Item 2\n[/list]"; // works with jquery, but not onclick.
|
||||
// $event = $this->getEvent($this->var['trigger'],$data,LANHELP_36);
|
||||
$event = $this->getEvent('addtext',$data,LANHELP_36);
|
||||
$text = "<a {$event} class='btn' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' data-bbcode='{$data}' title='".$this->br2nl(LANHELP_36)."'>";
|
||||
$text = "<a {$event} class='btn btn-default' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' data-bbcode='{$data}' title='".$this->br2nl(LANHELP_36)."'>";
|
||||
|
||||
$text .= $this->button(e_IMAGE_ABS."bbcode/list.png", 'list', LANHELP_36);
|
||||
|
||||
|
||||
@ -1504,7 +1504,7 @@ class e_form
|
||||
$selector = 'jstarget:'.$selector;
|
||||
if($id) $id = $this->name2id($id);
|
||||
|
||||
return $this->checkbox($name, $selector, false, array('id' => $id,'class' => 'checkbox toggle-all','label'=>$label));
|
||||
return $this->checkbox($name, $selector, false, array('id' => $id,'class' => 'checkbox checkbox-inline toggle-all','label'=>$label));
|
||||
}
|
||||
|
||||
function uc_checkbox($name, $current_value, $uc_options, $field_options = array())
|
||||
@ -1582,12 +1582,13 @@ class e_form
|
||||
$text = "";
|
||||
|
||||
|
||||
|
||||
|
||||
// return print_a($options,true);
|
||||
if($labelFound) // Bootstrap compatible markup
|
||||
{
|
||||
$defaultClass = (deftrue('BOOTSTRAP') === 3) ? 'radio-inline' : 'radio inline';
|
||||
$dis = (!empty($options['disabled'])) ? " disabled" : "";
|
||||
$text .= "<label class='radio inline{$dis}'>";
|
||||
$text .= "<label class='{$defaultClass}{$dis}'>";
|
||||
|
||||
}
|
||||
|
||||
@ -4502,7 +4503,7 @@ class e_form
|
||||
|
||||
$text .= "
|
||||
<form method='post' action='".$url."' id='{$form['id']}-form' enctype='multipart/form-data' autocomplete='off' >
|
||||
<div>
|
||||
<div id='admin-ui-edit'>
|
||||
".vartrue($form['header'])."
|
||||
".$this->token()."
|
||||
";
|
||||
|
||||
@ -59,11 +59,16 @@ a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; }
|
||||
#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 { }
|
||||
#admin-ui-edit-db-language { margin-bottom: -30px; margin-top:-10px; padding-bottom:5px; padding-right:5px }
|
||||
|
||||
.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;
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -712,6 +717,8 @@ ul.scroll-menu { max-height:350px; overflow:auto; }
|
||||
box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
.navbar-brand { padding: 10px 15px; }
|
||||
|
||||
ul.recent-comments {padding: 0px;
|
||||
margin: 0px;
|
||||
list-style: none outside none;
|
||||
@ -889,7 +896,7 @@ span.tag button.close {
|
||||
vertical-align:middle;
|
||||
}
|
||||
|
||||
h4.caption { margin-bottom:20px; }
|
||||
h4.caption { margin-bottom:30px; }
|
||||
|
||||
.plupload_container {
|
||||
padding:0px;
|
||||
|
||||
@ -191,7 +191,7 @@ $ADMIN_HEADER = '<div class="navbar '.$inverse.' navbar-nav navbar-fixed-top">
|
||||
*/
|
||||
|
||||
|
||||
$ADMIN_HEADER = '<div class="navbar navbar-fixed-top" role="navigation">
|
||||
$ADMIN_HEADER = '<div class="navbar navbar-default navbar-fixed-top" role="navigation">
|
||||
<div class="container" >
|
||||
<div class="navbar-header">
|
||||
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
|
||||
|
||||
@ -9,21 +9,18 @@ e107::js("url", "http://netdna.bootstrapcdn.com/bootstrap/3.3.5/js/bootstrap.m
|
||||
// e107::css('url', 'http://netdna.bootstrapcdn.com/bootstrap/3.3.5/css/bootstrap.min.css');
|
||||
e107::css('url', "http://netdna.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.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::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');
|
||||
// e107::css('url', 'http://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/cyborg/bootstrap.min.css');
|
||||
// e107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/cosmo/bootstrap.min.css");
|
||||
// e107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/darkly/bootstrap.min.css");
|
||||
|
||||
//e107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/cosmo/bootstrap.min.css");
|
||||
// e107::css('url', "https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/darkly/bootstrap.min.css");
|
||||
e107::css('theme','css/bootstrap_dark.css');
|
||||
e107::css('theme','admin_style.css');
|
||||
|
||||
// e107::css('core', 'bootstrap/css/darkstrap.css');
|
||||
e107::css('theme','admin_style.css');
|
||||
// e107::css('theme','admin_dark.css');
|
||||
e107::css('theme','ie_all.css',null,'all',"<!--[if IE]>","<![endif]-->");
|
||||
|
||||
|
||||
@ -67,10 +64,7 @@ class bootstrap3_admintheme
|
||||
global $style;
|
||||
|
||||
$class = '';
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
if(is_string($mode) && $mode == 'admin_help') $class = ' '.str_replace('_', '-', $mode);
|
||||
|
||||
if($mode == 'e_help')
|
||||
@ -100,7 +94,7 @@ class bootstrap3_admintheme
|
||||
|
||||
if($mode == 'personalize')
|
||||
{
|
||||
echo '
|
||||
/*echo '
|
||||
<!-- Mode: '.$mode.' -->
|
||||
<div class="well" style="padding:10px">
|
||||
<div class="nav-header">'.$caption.'</div>
|
||||
@ -109,13 +103,13 @@ class bootstrap3_admintheme
|
||||
<!-- Content End -->
|
||||
</div>
|
||||
<!-- End Mode: '.$mode.' -->
|
||||
';
|
||||
|
||||
return;
|
||||
';*/
|
||||
$style = 'admin_menu';
|
||||
// return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*
|
||||
|
||||
if($style == 'core-infopanel')
|
||||
{
|
||||
@ -136,7 +130,7 @@ class bootstrap3_admintheme
|
||||
';
|
||||
return;
|
||||
}
|
||||
|
||||
*/
|
||||
|
||||
if(deftrue('e_IFRAME'))
|
||||
{
|
||||
@ -155,13 +149,19 @@ class bootstrap3_admintheme
|
||||
{
|
||||
$style = 'no_caption';
|
||||
}
|
||||
|
||||
$panelType = array('core-infopanel'=>'panel-default','admin_menu'=>'panel-primary', 'site_info'=>'panel-default');
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
switch(varset($style, 'admin_content'))
|
||||
{
|
||||
|
||||
case 'core-infopanel' :
|
||||
case 'admin_menu' :
|
||||
echo '<div class="panel panel-default">
|
||||
case 'site_info' :
|
||||
echo '<div class="panel '.$panelType[$style].'">
|
||||
<div class="panel-heading">
|
||||
<h3 class="panel-title">'.$caption.'</h3>
|
||||
</div>
|
||||
@ -180,16 +180,16 @@ class bootstrap3_admintheme
|
||||
**/
|
||||
break;
|
||||
|
||||
case 'site_info' :
|
||||
/*case 'site_info' :
|
||||
echo '
|
||||
<div class="well sidebar-nav" >
|
||||
<div class="nav-header">'.$caption.'</div>
|
||||
<div class="panel panel-primary" >
|
||||
<div class="panel-heading">'.$caption.'</div>
|
||||
<p style="padding:10px">
|
||||
'.$text.'
|
||||
</p>
|
||||
</div>
|
||||
';
|
||||
break;
|
||||
break;*/
|
||||
/*
|
||||
case 'admin_content':
|
||||
echo '
|
||||
|
||||
7206
e107_themes/bootstrap3/css/bootstrap_dark.css
vendored
Normal file
7206
e107_themes/bootstrap3/css/bootstrap_dark.css
vendored
Normal file
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user