mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-20 06:21:20 +02:00
Code Issues Releases Wiki Activity

More UI fixes and jquery-ui for bootstrap added.

Browse Source
This commit is contained in:
Cameron
2012-11-28 15:00:05 -08:00
parent 23e43dabf3
commit b45aaf0597
7 changed files with 1491 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_admin/cpage.php
View File

@@ -678,7 +678,7 @@ class page_admin_ui extends e_admin_ui
</fieldset> </fieldset>
<fieldset id='core-cpage-create-hooks'> <fieldset id='core-cpage-create-hooks'>
<legend>".LAN_HOOKS."</legend> <legend>".LAN_HOOKS."</legend>
<table class='adminedit options'> <table class='adminform options'>
<colgroup> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />

2
e107_admin/includes/tabbed.php
View File

@@ -35,7 +35,7 @@ foreach ($admin_cat['id'] as $cat_key => $cat_id)
{ {
$text_check = FALSE; $text_check = FALSE;
$text_cat = "<div class='adminedit' id='core-main_".$cat_key."'> $text_cat = "<div class='adminform' id='core-main_".$cat_key."'>
<div style='border:1px solid silver;margin:10px'> <div style='border:1px solid silver;margin:10px'>
<div class='main_caption bevel'><b>".$admin_cat['title'][$cat_key]."</b></div> <div class='main_caption bevel'><b>".$admin_cat['title'][$cat_key]."</b></div>
<table style='width:100%'>"; <table style='width:100%'>";

12
e107_admin/newspost.php
View File

@@ -1899,7 +1899,7 @@ class admin_newspost
<form method='post' action='".e_SELF."?".e_QUERY."' id='core-newspost-create-form' ".(FILE_UPLOADS ? "enctype='multipart/form-data'" : "")." > <form method='post' action='".e_SELF."?".e_QUERY."' id='core-newspost-create-form' ".(FILE_UPLOADS ? "enctype='multipart/form-data'" : "")." >
<fieldset id='core-newspost-create'> <fieldset id='core-newspost-create'>
<legend>".LAN_NEWS_52."</legend> <legend>".LAN_NEWS_52."</legend>
<table class='adminedit'> <table class='table adminform'>
<colgroup> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
@@ -2034,9 +2034,9 @@ class admin_newspost
</ul>"; </ul>";
$val = (strstr($tp->post_toForm($_POST['news_body']), "[img]http") ? $tp->post_toForm($_POST['news_body']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_body']))); $val = (strstr($tp->post_toForm($_POST['news_body']), "[img]http") ? $tp->post_toForm($_POST['news_body']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_body'])));
$text .= "<div id='news-body-container'>"; $text .= "<div id='news-body-container' class='e-tab'>";
$text .= $frm->bbarea('news_body', $val, 'news', 'news'); $text .= $frm->bbarea('news_body', $val, 'news', 'news');
$text .= "</div><div id='news-extended-container'>"; $text .= "</div><div id='news-extended-container' class='t-container'>";
$val = (strstr($tp->post_toForm($_POST['news_extended']), "[img]http") ? $tp->post_toForm($_POST['news_extended']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_extended']))); $val = (strstr($tp->post_toForm($_POST['news_extended']), "[img]http") ? $tp->post_toForm($_POST['news_extended']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_extended'])));
@@ -2114,7 +2114,7 @@ class admin_newspost
$text .= " $text .= "
<fieldset id='core-newspost-seo'> <fieldset id='core-newspost-seo'>
<legend>SEO</legend> <legend>SEO</legend>
<table class='adminedit'> <table class='table adminform'>
<colgroup> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
@@ -2151,7 +2151,7 @@ class admin_newspost
$text .= " $text .= "
<fieldset id='core-newspost-edit-options'> <fieldset id='core-newspost-edit-options'>
<legend>".LAN_NEWS_53."</legend> <legend>".LAN_NEWS_53."</legend>
<table class='adminedit'> <table class='table adminform'>
<colgroup> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />
@@ -2856,7 +2856,7 @@ class admin_newspost
<form action='".e_SELF."?sn' method='post'> <form action='".e_SELF."?sn' method='post'>
<fieldset id='core-newspost-sn-list'> <fieldset id='core-newspost-sn-list'>
<legend class='e-hideme'>".NWSLAN_47."</legend> <legend class='e-hideme'>".NWSLAN_47."</legend>
<tableclass='table adminlist'> <table class='table adminlist'>
<colgroup> <colgroup>
<col style='width: 2%' /> <col style='width: 2%' />
<col style='width: 5%' /> <col style='width: 5%' />

2
e107_handlers/form_handler.php
View File

@@ -2587,7 +2587,7 @@ class e_form
<fieldset id='{$id}'> <fieldset id='{$id}'>
<legend>".vartrue($fdata['legend'])."</legend> <legend>".vartrue($fdata['legend'])."</legend>
".vartrue($fdata['table_pre'])." ".vartrue($fdata['table_pre'])."
<table class='table adminedit'> <table class='table adminform'>
<colgroup> <colgroup>
<col class='col-label' /> <col class='col-label' />
<col class='col-control' /> <col class='col-control' />

197
e107_themes/bootstrap/admin_style.css
View File

@@ -1,168 +1,135 @@
body { padding-top: 75px; padding-bottom: 40px; } body { padding-top: 75px; padding-bottom: 40px; }
.well { padding:10px; } .well { padding:10px; }
.navbar { background-color: #081D28; } .navbar { background-color: #081D28; }
#core-infopanel_mye107 a {
}
.tipsy-inner { padding:10px; font-size:15px; }
.tooltip { font-size: 13px; }
.tooltip-inner { box-shadow: 0 2px 5px #808080; -webkit-box-shadow: 0 2px 5px #808080; -moz-box-shadow: 0 2px 5px #808080; }
#core-infopanel_mye107 a {}
.tipsy-inner { padding:10px; font-size:15px; } /* deprecated */
.tooltip { font-size: 13px; }
.tooltip-inner { box-shadow: 0 2px 5px #808080; -webkit-box-shadow: 0 2px 5px #808080; -moz-box-shadow: 0 2px 5px #808080; }
/* Core Formatting */ /* Core Formatting */
.left { text-align: left } .left { text-align: left }
.right { text-align: right } .right { text-align: right }
.center { text-align: center } .center { text-align: center }
.f-left { float: left } .f-left { float: left }
.f-right { float: right } .f-right { float: right }
.top { vertical-align: top } .top { vertical-align: top }
.middle { vertical-align: middle } .middle { vertical-align: middle }
.bottom { vertical-align: bottom } .bottom { vertical-align: bottom }
.clear { clear: both } .clear { clear: both }
.clear-l { clear: right } .clear-l { clear: right }
.clear-r { clear: left } .clear-r { clear: left }
.smalltext { font-size: 11px; } .smalltext { font-size: 11px; }
.nowrap { white-space:nowrap; } .nowrap { white-space:nowrap; }
.e-tabs { padding:0px }
.core-mainpanel-block { text-align:center; width:100px; float:left; height:48px; display:block;margin:15px; } #tab-container fieldset { padding:0px ; padding-left:3px; border-top:0px;}
.core-mainpanel-link-text { font-weight:bold; text-decoration: none; padding:3px } #tab-container table { border-top:0px;}
#tab-container td { border-top:0px; border-bottom:1px solid rgb(221, 221, 221) }
td.center, th.center { text-align:center } .core-mainpanel-block { text-align:center; width:100px; float:left; height:48px; display:block;margin:15px; }
.core-mainpanel-link-text { font-weight:bold; text-decoration: none; padding:3px }
.col-label { width:30%; } td.center, th.center { text-align:center }
.sidebar-nav { padding: 9px 0; font-size:11px; min-width:150px; } .col-label { width:30%; }
.sidebar-nav { padding: 9px 0; font-size:11px; min-width:150px; }
/* /*
a.brand:hover img { a.brand:hover img {
filter: blur(13px); filter: blur(13px);
-webkit-filter: blur(13px); -webkit-filter: blur(13px);
-moz-filter: blur(13px); -moz-filter: blur(13px);
-o-filter: blur(13px); -o-filter: blur(13px);
-ms-filter: blur(13px); -ms-filter: blur(13px);
} }
*/ */
@media (min-width: 1300px) { @media (min-width: 1300px) {
.sidebar-nav { font-size:12px; } .sidebar-nav { font-size:12px; }
} }
.modal { .modal { min-width:800px; }
min-width:800px;
}
@media (min-width: 1500px) { @media (min-width: 1500px) {
.sidebar-nav { font-size:15px; } .sidebar-nav { font-size:15px; }
} }
.nav-collapse { margin-top:8px; } .nav-collapse { margin-top:8px; }
.dropdown-menu img { padding: 0px 0px; margin-right: 10px; } .dropdown-menu img { padding: 0px 0px; margin-right: 10px; }
.dropdown-menu a { .dropdown-menu a {
filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale"); /* Firefox 10+, Firefox on Android */ filter: url("data:image/svg+xml;utf8,<svg xmlns=\'http://www.w3.org/2000/svg\'><filter id=\'grayscale\'><feColorMatrix type=\'matrix\' values=\'0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0\'/></filter></svg>#grayscale"); /* Firefox 10+, Firefox on Android */
filter: gray; /* IE6-9 */ filter: gray; /* IE6-9 */
-webkit-filter: grayscale(100%); /* Chrome 19+, Safari 6+, Safari 6+ iOS */ -webkit-filter: grayscale(100%); /* Chrome 19+, Safari 6+, Safari 6+ iOS */
}
}
.dropdown-menu a:hover { .dropdown-menu a:hover { filter: none; -webkit-filter: grayscale(0%); }
filter: none;
-webkit-filter: grayscale(0%);
}
legend { display:none } legend { display:none }
.btn { .btn { vertical-align: top; }
vertical-align: top;
}
input[type='radio'] { input[type='radio'] { vertical-align:top; }
vertical-align:top;
}
label { label { margin-left:5px; margin-right:10px; display: inline; vertical-align:bottom; }
margin-left:5px;
margin-right:10px;
display: inline;
vertical-align:bottom;
}
/* Core Icons & Image Buttons */ /* Core Icons & Image Buttons */
img.icon { border: 0px; vertical-align: middle; } img.icon { border: 0px; vertical-align: middle; }
img.icon.list, img.icon.list,
input.action { margin: 0px 3px } input.action { margin: 0px 3px }
img.icon.action, img.icon.action,
input.action { } input.action { }
img.S16 { width: 16px; height: 16px } img.S16 { width: 16px; height: 16px }
img.S32 { width: 32px; height: 32px } img.S32 { width: 32px; height: 32px }
img.S64 { width: 64px; height: 64px } img.S64 { width: 64px; height: 64px }
img.S128 { width: 128px; height: 128px } img.S128 { width: 128px; height: 128px }
img.edit, img.edit,
img.delete, img.delete,
input.delete { } input.delete { }
.buttons-bar { padding: 10px 0px; } .buttons-bar { padding: 10px 0px; }
i.icon-chevron-right { i.icon-chevron-right { float:right; opacity: 0.3 }
float:right;
opacity: 0.3
}
a.link-active i { a.link-active i { opacity: 1.0; }
opacity: 1.0;
}
a.dropdown-toggle i { a.dropdown-toggle i { transition: opacity .20s ease-in-out; -moz-transition: opacity .20s ease-in-out; -webkit-transition: opacity .20s ease-in-out;
transition: opacity .20s ease-in-out; opacity: 0.4
-moz-transition: opacity .20s ease-in-out; }
-webkit-transition: opacity .20s ease-in-out;
opacity: 0.4 a.dropdown-toggle:hover i { opacity: 1.0 }
}
a.dropdown-toggle:hover i { a.dropdown-toggle {
opacity: 1.0 -webkit-transition:color .20s ease-in-out;
} -moz-transition:color .20s ease-in-out;
-o-transition:color .20s ease-in-out;
transition:color .20s ease-in-out;
}
a.dropdown-toggle { img.S32 {}
-webkit-transition:color .20s ease-in-out; img.S32:hover {}
-moz-transition:color .20s ease-in-out;
-o-transition:color .20s ease-in-out;
transition:color .20s ease-in-out;
}
img.S32 {
}
img.S32:hover {
}
/*******************************************************************************************************************/ /*******************************************************************************************************************/
/* Admin List Table */ /* Admin List Table */
.adminlist, .adminform { width:100%; border:1px solid #ddd;} .adminlist, .adminform { width:100%; border:1px solid #ddd;}
.adminlist th { border-bottom:1px solid #ddd; } .adminlist th { border-bottom:1px solid #ddd; }
.adminlist td { border-bottom:1px solid #ddd; border-right: 1px solid #ddd; } .adminlist td { border-bottom:1px solid #ddd; border-right: 1px solid #ddd; }
.adminlist th.last, .adminlist th.last,
.adminlist td.last { border-right: 0px solid;} .adminlist td.last { border-right: 0px solid;}
.adminlist tr.last td{ border-bottom: 0px solid;} .adminlist tr.last td { border-bottom: 0px solid;}
.adminlist thead { background-color:#f2f2f2; } .adminlist thead { background-color:#f2f2f2; }
.adminlist tr.even { background-color:#f6f6f6; } .adminlist tr.even { background-color:#f6f6f6; }
.adminlist .col-selection-cont { position: relative; float:right; } .adminlist .col-selection-cont { position: relative; float:right; }
.col-selection-cont .col-selection { text-align:left; background-color: #FCFDFF; border: 1px outset black; width:200px; margin-right:0px; overflow:visible; position: absolute; z-index:101; right:0px;} .col-selection-cont .col-selection { text-align:left; background-color: #FCFDFF; border: 1px outset black; width:200px; margin-right:0px; overflow:visible; position: absolute; z-index:101; right:0px;}

3
e107_themes/bootstrap/admin_theme.php
View File

@@ -8,6 +8,9 @@ e107::lan('theme');
e107::js('core','bootstrap/js/bootstrap.min.js'); e107::js('core','bootstrap/js/bootstrap.min.js');
e107::css('core','bootstrap/css/bootstrap.min.css'); e107::css('core','bootstrap/css/bootstrap.min.css');
e107::css('core','bootstrap/css/bootstrap-responsive.min.css'); e107::css('core','bootstrap/css/bootstrap-responsive.min.css');
e107::css('core','bootstrap/css/jquery-ui.custom.css');
//e107::css('core','bootstrap/css/demo.css');
e107::css('theme','ie_all.css',null,'all',"<!--[if IE]>","<![endif]-->"); e107::css('theme','ie_all.css',null,'all',"<!--[if IE]>","<![endif]-->");
/* /*
$drop = " $drop = "

1396
e107_web/js/bootstrap/css/jquery-ui.custom.css vendored Normal file
View File

File diff suppressed because it is too large Load Diff