';
+echo ''.html::escapeHTML($core->blog->name).' › '.''.__('Entries').' › '.$page_title;
if ($post_id) {
switch ($post_status) {
@@ -352,8 +352,5 @@
$img_status = '';
}
- $edit_entry_str = __('Edit entry “%s”');
- echo sprintf($edit_entry_str, html::escapeHTML($post_title)).' '.$img_status;
-} else {
- echo $page_title;
+ echo ' “'.$post_title.'”'.' '.$img_status;
}
echo '
';
Index: admin/style/default.css
===================================================================
--- admin/style/default.css (revision 1235)
+++ admin/style/default.css (revision 1291)
@@ -46,5 +46,10 @@
color: #666;
font-size: 1.8rem;
- padding: 0 0 .6rem;
+ padding: 0 0 2em;
+ font-weight: normal;
+}
+h2 a:link, h2 a:visited {
+ color: #666;
+ border-color: #000;
}
.page-title {
@@ -52,6 +57,6 @@
}
h3 {
- color: #333;
- font-size: 1.2rem;
+ color: #575859;
+ font-size: 1.4rem;
}
p, div.p {
@@ -86,27 +91,33 @@
#header {
background: #575859;
- height: 3.2rem;
+ height: 3.6rem;
position: relative;
+ border-bottom: 4px solid #A2CBE9;
}
#prelude {
- background: transparent;
line-height: 2;
margin: 0;
- padding: 0 1rem 0;
+ padding: 0;
overflow: hidden;
position: absolute;
- top: 3.2rem;
+ top: 3.6rem;
left: 0;
}
#prelude li {
list-style-type: none;
- margin: 0 1em 0 0;
+ margin: 0;
background:transparent;
- display: inline;
- }
+}
+#prelude li a {
+ padding: .5rem 1rem .4rem 1.5rem;
+ background: #A2CBE9;
+ color: #000;
+ border-bottom-right-radius: .6rem;
+ border-bottom-color: #A2CBE9;
+}
#top {
margin: 0;
padding: 0;
- width: 13em;
+ width: 14em;
float: left;
}
@@ -114,7 +125,7 @@
padding: 0;
margin: 0;
- height: 3.2rem;
+ height: 3.6rem;
text-indent: -1000px;
- background: transparent url(dc_logo.png) no-repeat 0 50%;
+ background: #575859 url(dc_logo.png) no-repeat 0 50%;
}
#top h1 a {
@@ -122,9 +133,11 @@
top: 3px;
left: 0;
- width: 130px;
- height: 60px;
+ width: 14rem;
+ height: 3.2rem;
border: none;
- outline: none;
color: #fff;
+}
+#top h1 a:hover, #top h1 a:focus {
+ background: transparent url(dc_logo_hover.png) no-repeat 0 55%;
}
#info-boxes {
@@ -141,5 +154,5 @@
}
#info-box2 {
- margin: .1em 0 0 0;
+ margin-top: .3rem;
padding: .5em 1.3em 4px 0;
color: #fff;
@@ -182,5 +195,5 @@
}
#info-box2 span {
- color: #575859;
+ color: #999;
}
/* prelude */
@@ -191,12 +204,12 @@
width: 100%;
float: right;
- margin-left: -13em;
+ margin-left: -14em;
margin-top: 0;
background: #fff url(dc_bg.png);
}
#content {
- margin: 0 0 0 13em;
- padding: 1.8rem;
- background: #fff;
+ margin: 0 0 0 14em;
+ padding: .9rem 1.8rem 1.8rem;
+ background: #fff url(dc_bg_title.png) repeat-x center top;
}
/* Micro clearfix thx to Nicolas Gallagher */
@@ -239,6 +252,6 @@
/* -------------------------------------------------------------- layout - onglets */
.part-tabs ul {
- padding: .3em 0 1px 1em;
- border-bottom: 1px solid #999;
+ padding: .5em 0 .3em 1.2rem;
+ border-bottom: 1px solid #ccc;
}
.part-tabs li {
@@ -248,13 +261,15 @@
}
.part-tabs li a {
- padding: .3em 0.5em;
+ padding: .5em 0.5em;
margin-right: .5em;
- border: 1px solid #999;
+ border: 1px solid #ccc;
border-bottom: none;
background: #dfdfdf;
text-decoration: none;
- border-top-left-radius: .3em;
- border-top-right-radius: .3em;
color: #000;
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #dfdfdf), color-stop(1, #fafafa) );
+ background:-moz-linear-gradient( center top, #dfdfdf 5%, #fafafa 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#dfdfdf', endColorstr='#fafafa');
+ background-color:#ededed;
}
.part-tabs li.part-tabs-link a {
@@ -268,13 +283,14 @@
.part-tabs li.part-tabs-active a {
background: #fff;
- border-bottom: 1px solid #fff;
- color: #000;
+ border: 1px solid #d30e60;
+ color: #d30e60;
font-weight: bold;
+ border-bottom-color: #fff;
}
/* ------------------------------------------------------------------ main-menu */
#main-menu {
- width: 13em;
- float: left;
- margin-top: 2rem;
+ width: 14em;
+ float: left;
+ margin-top: 4.2rem;
padding-bottom: 1rem;
background: #f7f7f7;
@@ -282,6 +298,6 @@
#main-menu h3 {
margin: 0 0 1.2rem;
- padding: 0 0 0 .5em;
- text-transform: uppercase;
+ padding: 0 0 0 2.2rem;
+ text-indent: -1.6rem;
color: #666;
font-size: 1.4rem;
@@ -295,8 +311,8 @@
#main-menu li {
display: block;
- margin: 0.6rem 0 0;
- padding: .2em 0 0 32px;
+ margin: 0.5em 0 0;
+ padding: .3rem 0 0 30px;
background-repeat: no-repeat;
- background-position: 12px .4em;
+ background-position: 8px .3em;
}
#main-menu a {
@@ -309,6 +325,5 @@
#main-menu .active {
background-color: #fff;
- padding: .4em 0 .1em 32px;
- background-position: 12px .4em;
+ background-position: 12px .4rem;
border-top: 1px solid #ddd;
border-bottom: 1px solid #ddd;
@@ -402,5 +417,5 @@
width: 210px;
text-align: center;
- margin: 2em 0 0 0;
+ margin: 2em 0;
display:inline-block;
}
@@ -479,5 +494,6 @@
}
#entry-content {
- margin-right: 18em;
+ margin-right: 19em;
+ margin-left: 1.2rem;
}
#entry-sidebar {
@@ -784,14 +800,16 @@
}
#help-button {
- position: fixed;
- top: 5.6rem;
+ background: transparent url(../images/page_help.png) no-repeat .6rem center;
+ position: absolute;
+ top: 3.6rem;
right: 0px;
+ padding: 0 2rem 0 3rem;
cursor: pointer;
- background: #FFD478 url(../images/page_help.png) no-repeat .6rem center;
- border: 1px solid #dde;
- border-right: none;
- padding: .3rem 1rem .3rem 3rem;
- border-radius: 1rem 0 0 1rem;
- color: #000;
+ color: #2373A8;
+ line-height: 4rem;
+}
+#help-button span {
+ padding: .6rem 0 .1rem 0;
+ border-bottom: 1px solid #2373A8;
}
.help-box {
@@ -803,13 +821,21 @@
}
#content.with-help #help-button {
- right: 282px;
+ right: 28.2rem;
+ background-color: #f5f5f5;
+ position: fixed;
+ border-top: 2px solid #FFD478;
+ border-left: 2px solid #FFD478;
+ border-bottom: 2px solid #FFD478;
+ border-bottom-left-radius: 1rem;
+ border-top-left-radius: 1rem;
}
#content.with-help #help {
display: block;
position: absolute;
- top: 4rem;
+ top: 3.6rem;
right: 0;
- width: 280px;
+ width: 28rem;
border-left: 2px solid #FFD478;
+ border-top: 2px solid #FFD478;
margin-top: 0;
padding: 10px 0 0 0;
@@ -875,4 +901,11 @@
color: #fff;
}
+/* ------------------------------------------------------------------ navigation */
+.anchor-nav {
+ background: #575859;
+ color: #fff;
+ padding: .4rem 1.2rem;
+ float: right;
+}
/* ------------------------------------------------------------------ debug */
#debug {
@@ -905,5 +938,5 @@
p.top-add {
text-align: right;
- margin: 0;
+ margin: 2rem 0 0;
}
p.top-add a {
@@ -1136,12 +1169,9 @@
margin-right: .3em;
}
-input[type=checkbox], input[type=radio] {
- border: none;
-}
textarea {
padding: 2px 0;
}
-
-input[type=checkbox], input[type=radio] {
+input[type=checkbox], input[type=radio], input[type=file] {
+ border: none;
margin: 0;
padding: 0;
@@ -1257,5 +1287,5 @@
text-align: center;
text-decoration: none;
- padding: .1em .5em 0 .5em;
+ padding: .1em .5em;
text-shadow: 0 1px 1px rgba(0,0,0,.3);
border-radius: .2em;
@@ -1339,14 +1369,30 @@
content: "\ab\a0";
}
-a.button.add {
- border-radius: .5em;
- margin-bottom: .1em;
- background: #AAce21 url(../images/add.png) no-repeat 6px center;
- padding: .4rem 16px .4rem 30px;
- border: 1px solid #ccc;
+.button.add {
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #9dce2c), color-stop(1, #8cb82b) );
+ background:-moz-linear-gradient( center top, #9dce2c 5%, #8cb82b 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#9dce2c', endColorstr='#8cb82b');
+ background-color:#9dce2c;
+ border:1px solid #83c41a;
+ padding:.6rem 1.8rem;
+ text-shadow:1px 1px 0 #689324;
color: #000;
-}
-a.button.add:hover, a.button.add:focus {
- background-color: #fff;
+ text-shadow: 1px 1px 0 #BBDB58;
+ font-weight: normal;
+ font-size: 1.4rem;
+}
+.button.add:hover, .button.add:focus {
+ background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #8cb82b), color-stop(1, #9dce2c) );
+ background:-moz-linear-gradient( center top, #8cb82b 5%, #9dce2c 100% );
+ filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#8cb82b', endColorstr='#9dce2c');
+ background-color:#8cb82b;
+ border:1px solid #83c41a;
+}
+.button-add:focus {
+ outline: dotted 1px;
+}
+.button.add:active {
+ position:relative;
+ top:1px;
}
Index: admin/update.php
===================================================================
--- admin/update.php (revision 1290)
+++ admin/update.php (revision 1179)
@@ -54,5 +54,5 @@
}
if (!empty($archives)) {
- usort($archives,"version_compare");
+ $archives = array_reverse($archives);
} else {
$default_tab = 'update';
@@ -208,4 +208,5 @@
echo '';
+ '';
# Remove tag
if (!$posts->isEmpty() && $core->auth->check('contentadmin',$core->blog->id)) {
echo
'';
+ '';
}
- echo '';
+ echo '';
}