From fd6a2895bd8b8b675e33fcb3e3bdf006d9f2b4a2 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 14 Aug 2015 18:12:19 -0700 Subject: [PATCH] Admin-area styling, including TinyMce. --- e107_admin/includes/infopanel.php | 2 +- e107_admin/newspost.php | 4 ++-- e107_themes/bootstrap/admin_style.css | 5 +++++ e107_themes/bootstrap3/admin_style.css | 2 +- e107_themes/bootstrap3/admin_template.php | 4 ++-- e107_themes/bootstrap3/admin_theme.php | 14 ++++++++++++++ e107_themes/bootstrap3/css/bootstrap-dark.min.css | 11 ++++++----- 7 files changed, 31 insertions(+), 11 deletions(-) diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php index d78a3b0f6..35423fa50 100644 --- a/e107_admin/includes/infopanel.php +++ b/e107_admin/includes/infopanel.php @@ -376,7 +376,7 @@ class adminstyle_infopanel $panelOnline = " - +
diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index aac801f00..fec851c10 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -404,10 +404,10 @@ class news_admin_ui extends e_admin_ui 'news_class' => array('title' => LAN_VISIBILITY, 'type' => 'userclasses','tab'=>2, 'inline'=>true, 'width' => 'auto', 'thclass' => '', 'class' => null, 'batch'=>true, 'filter'=>true), 'news_render_type' => array('title' => LAN_TEMPLATE, 'type' => 'dropdown', 'tab'=>0, 'data'=> 'str', 'inline'=>false, 'width' => 'auto', 'thclass' => 'left', 'class' => 'left', 'nosort' => false, 'batch'=>true, 'filter'=>true), 'news_sticky' => array('title' => LAN_NEWS_28, 'type' => 'boolean', 'tab'=>2, 'data' => 'int' , 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false, 'batch'=>true, 'filter'=>true), - 'news_allow_comments' => array('title' => LAN_COMMENTS, 'type' => 'boolean', 'tab'=>2, 'writeParms'=>'inverse=1', 'data' => 'int', 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false,'batch'=>true, 'filter'=>true,'readParms'=>'reverse=1','writeParms'=>'inverse=1'), + 'news_allow_comments' => array('title' => LAN_COMMENTS, 'type' => 'boolean', 'tab'=>2, 'writeParms'=>'inverse=1', 'data' => 'int', 'width' => 'auto', 'thclass' => 'center', 'class' => 'center', 'nosort' => false,'batch'=>true, 'filter'=>true,'readParms'=>'reverse=1'), 'news_comment_total' => array('title' => LAN_NEWS_60, 'type' => 'number', 'tab'=>2, 'noedit'=>true, 'width' => '10%', 'thclass' => '', 'class' => null, 'nosort' => false), // admin_news_notify - 'news_email_notify' => array('title' => "Email notification", 'type' => 'checkbox', 'tab'=>2, 'data'=>false, 'writeParms'=>array('show'=>1), 'help'=>'Trigger an email notification when you submit this form.'), + 'news_email_notify' => array('title' => "Email notification", 'type' => 'checkbox', 'tab'=>2, 'data'=>false, 'writeParms'=>array('show'=>1, 'tdClassRight'=>'form-inline'), 'help'=>'Trigger an email notification when you submit this form.'), 'submitted_id' => array('title' => LAN_NEWS_68, 'type' => 'hidden', 'tab'=>2, 'data'=>false, 'writeParms'=>'show=0'), 'options' => array('title' => LAN_OPTIONS, 'type' => null, 'width' => '10%', 'thclass' => 'center last', 'class' => 'center', 'nosort' => true, 'forced' => TRUE) diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css index efe650122..6fbbf8792 100644 --- a/e107_themes/bootstrap/admin_style.css +++ b/e107_themes/bootstrap/admin_style.css @@ -58,6 +58,11 @@ a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; } #admin-ui-edit-db-language { margin-bottom: -30px; margin-top:-10px; padding-bottom:5px; padding-right:5px } + + + +#e-online table { width:96%;margin-left:auto; margin-right:auto } + div.bbcode-panel { background-color: rgb(245, 245, 245); diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css index fd4cfdc60..46eb19484 100644 --- a/e107_themes/bootstrap3/admin_style.css +++ b/e107_themes/bootstrap3/admin_style.css @@ -1178,7 +1178,7 @@ li.rssRow > div { .admin-theme-cell-site { background-color: #d9edf7; border: 1px solid #bce8f1; } .admin-theme-cell-admin { background-color:#FFFFD5; border: 1px solid #FFCC00; } - +#e-online table { margin-top:10px; margin-left:auto; margin-right:auto } /* diff --git a/e107_themes/bootstrap3/admin_template.php b/e107_themes/bootstrap3/admin_template.php index 9d8f794d0..224bd3244 100644 --- a/e107_themes/bootstrap3/admin_template.php +++ b/e107_themes/bootstrap3/admin_template.php @@ -52,9 +52,9 @@ $E_ADMIN_NAVIGATION['button_active'] = ' // Leave Admin Area. $E_ADMIN_NAVIGATION['button_home'] = '
  • - + {LINK_IMAGE} {LINK_TEXT} - + {SUB_MENU} diff --git a/e107_themes/bootstrap3/admin_theme.php b/e107_themes/bootstrap3/admin_theme.php index 3764d3ccc..237ddbeea 100644 --- a/e107_themes/bootstrap3/admin_theme.php +++ b/e107_themes/bootstrap3/admin_theme.php @@ -26,6 +26,20 @@ e107::css('theme','admin_style.css'); e107::css('theme','admin_dark.css'); e107::css('theme','ie_all.css',null,'all',""); +e107::css('inline', " +/* TinyMce */ +.mce-menubar .mce-caret { border-top-color: #C6C6C6!important } +.mce-menubar:hover .mce-caret { border-top-color: #FFFFFF!important } +.mce-menubar .mce-btn button { color: #C6C6C6!important; } +.mce-menubar .mce-btn button:hover { color: #FFFFFF!important; } +.mce-menubar.mce-toolbar { background-color: #373737!important; } +.mce-tinymce[role=application] { border-color: #373737!important; } +.mce-menubar .mce-menubtn:hover, +.mce-menubtn:active, +.mce-menubtn:focus { background-color:transparent!important; color: #FFFFFF!important; border-color:transparent!important; } +.mce-menubar .mce-btn.mce-active { color:white!important; border-color:transparent!important; background-color: transparent!important; } + +"); /* $drop = " diff --git a/e107_themes/bootstrap3/css/bootstrap-dark.min.css b/e107_themes/bootstrap3/css/bootstrap-dark.min.css index a1eff1164..f16659ce9 100644 --- a/e107_themes/bootstrap3/css/bootstrap-dark.min.css +++ b/e107_themes/bootstrap3/css/bootstrap-dark.min.css @@ -813,12 +813,12 @@ tbody.collapse.in{display:table-row-group} .dropdown-menu>li>a{display:block;clear:both;font-weight:400;color:#c6c6c6} .dropdown-menu>li>a:focus,.dropdown-menu>li>a:hover{text-decoration:none;color:#fff;background-color:#337ab7} .dropdown-menu>.active>a,.dropdown-menu>.active>a:focus,.dropdown-menu>.active>a:hover{color:#fff;text-decoration:none;outline:0;background-color:transparent} -.dropdown-header,.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover,.nav>li.disabled>a{color:#c6c6c6} +.dropdown-menu>.disabled>a,.dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{color:#c6c6c6} .dropdown-menu>.disabled>a:focus,.dropdown-menu>.disabled>a:hover{text-decoration:none;background-color:transparent;background-image:none;filter:progid:DXImageTransform.Microsoft.gradient(enabled=false);cursor:not-allowed} .open>.dropdown-menu{display:block} .open>a{outline:0} .dropdown-menu-left{left:0;right:auto} -.dropdown-header{display:block;font-size:12px} +.dropdown-header{display:block;font-size:12px;color:#c6c6c6} .dropdown-backdrop{position:fixed;left:0;right:0;bottom:0;top:0;z-index:990} .nav-justified>.dropdown .dropdown-menu,.nav-tabs.nav-justified>.dropdown .dropdown-menu{left:auto;top:auto} .pull-right>.dropdown-menu{right:0;left:auto} @@ -887,9 +887,10 @@ select[multiple].input-group-sm>.form-control,select[multiple].input-group-sm>.i .input-group-btn:last-child>.btn,.input-group-btn:last-child>.btn-group{z-index:2;margin-left:-1px} .nav{margin-bottom:0;padding-left:0;list-style:none} .nav>li>a{padding:10px 15px} -.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#999} +.nav>li>a:focus,.nav>li>a:hover{text-decoration:none;background-color:#212121} +.nav>li.disabled>a{color:#555} .nav>li.disabled>a:focus,.nav>li.disabled>a:hover{color:#c6c6c6;text-decoration:none;background-color:transparent;cursor:not-allowed} -.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#999;border-color:#77acd9} +.nav .open>a,.nav .open>a:focus,.nav .open>a:hover{background-color:#212121;border-color:#77acd9} .nav .nav-divider{height:1px;margin:9px 0;overflow:hidden;background-color:#e5e5e5} .nav>li>a>img{max-width:none} .nav-tabs{border-bottom:1px solid #999} @@ -1493,4 +1494,4 @@ legend{color:#fff} a.thumbnail.active,a.thumbnail:focus,a.thumbnail:hover{border-color:#0f0f0f} .jumbotron{border:1px solid rgba(0,0,0,.6)} .panel-danger .panel-heading,.panel-info .panel-heading,.panel-primary .panel-heading,.panel-success .panel-heading,.panel-warning .panel-heading{border-color:#000} -.btn:focus,.nav-pills>li>a,.nav-tabs>li>a,.navbar-default .navbar-nav>li>a,.navbar-inverse .navbar-nav>li>a,a,a:active,a:hover{outline:0} \ No newline at end of file +.btn:focus,.nav-pills>li>a,.nav-tabs>li>a,.navbar-default .navbar-nav>li>a,.navbar-inverse .navbar-nav>li>a,a,a:active,a:hover{outline:0}