diff --git a/admin/css/style.css b/admin/css/style.css index 11d4d0b0..807687d8 100644 --- a/admin/css/style.css +++ b/admin/css/style.css @@ -725,7 +725,8 @@ margin-top: 25px; position: absolute; top: 36px; margin: 0; - width: 160px; + min-width: 160px; + max-width: 240px; background: #202328; overflow: hidden; z-index: 250; @@ -997,7 +998,8 @@ margin-top: 25px; .typecho-list-operate span.operate-button { } -.typecho-list-operate span.operate-delete, a.operate-delete { +.typecho-list-operate span.operate-delete, a.operate-delete, +.typecho-list-operate span.operate-button-delete, a.operate-button-delete { color: #B94A48; } @@ -1009,10 +1011,6 @@ a.operate-reply { color: #545c30; } -.typecho-list-operate span.operate-button-delete, a.operate-button-delete { - background: #B94A48; -} - .typecho-list-operate a:hover { text-decoration: none; } @@ -1556,8 +1554,8 @@ ul.typecho-list-notable li .loading { * 编写页面 */ -.typecho-post-area { -} +.typecho-post-area .edit-draft-notice { color: #999; } +.typecho-post-area .edit-draft-notice a { color: #B94A48; } .typecho-post-area .typecho-label { display: block; @@ -1715,7 +1713,8 @@ ul.typecho-list-notable li .loading { .typecho-post-area textarea#trackback { } -.typecho-post-area br { +.typecho-post-area #advance-panel-btn { + color: #999; } .typecho-post-area #advance-panel { @@ -2032,6 +2031,7 @@ ul.typecho-list-notable li .loading { */ #ui-datepicker-div { display: none; + margin-top: -1px; padding: 10px; border: 1px solid #D9D9D6; background: #FFF; diff --git a/admin/manage-posts.php b/admin/manage-posts.php index 4eecb03d..4c731dca 100644 --- a/admin/manage-posts.php +++ b/admin/manage-posts.php @@ -44,12 +44,12 @@ $stat = Typecho_Widget::widget('Widget_Stat');
- + - + - - + + diff --git a/admin/profile.php b/admin/profile.php index c766cffd..af0b290e 100644 --- a/admin/profile.php +++ b/admin/profile.php @@ -10,29 +10,9 @@ $stat = Typecho_Widget::widget('Widget_Stat');
-
-
- - profileForm()->render(); ?> -
- - pass('contributor', true)): ?> -
- - optionsForm()->render(); ?> -
- - -
- - personalFormList(); ?> - passwordForm()->render(); ?> -
- -
-
- mail) . '?s=128&r=X' . - '&d=" alt="' . $user->screenName . '" />'; ?> +
+

mail) . '?s=128&r=X' . + '&d=" alt="' . $user->screenName . '" />'; ?>

screenName(); ?>
name(); ?>

%s 篇 Blog,并有 %s 条关于你的评论在已设定的 %s 个分类中.', $stat->myPublishedPostsNum, $stat->myPublishedCommentsNum, $stat->categoriesNum); ?>

@@ -42,6 +22,29 @@ $stat = Typecho_Widget::widget('Widget_Stat'); } ?>

+ +
+
+

+ profileForm()->render(); ?> +
+ + pass('contributor', true)): ?> +
+
+

+ optionsForm()->render(); ?> +
+ + +
+ +
+

+ personalFormList(); ?> + passwordForm()->render(); ?> +
+
diff --git a/admin/write-js.php b/admin/write-js.php index 1cbae631..6a579b81 100644 --- a/admin/write-js.php +++ b/admin/write-js.php @@ -19,7 +19,7 @@ $(document).ready(function() { '', '', ''], dayNamesMin : ['', '', '', '', '', '', ''], - closeText : '', + closeText : '', timeOnlyTitle : '', timeText : '', hourText : '', diff --git a/admin/write-post.php b/admin/write-post.php index f55b801d..ce3a965d 100644 --- a/admin/write-post.php +++ b/admin/write-post.php @@ -12,9 +12,10 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
draft && $post->draft['cid'] != $post->cid): ?> draft['modified']); ?> - 删除它', $postModifyDate->word(), + 删除它', $postModifyDate->word(), Typecho_Common::url('/action/contents-post-edit?do=deleteDraft&cid=' . $post->cid, $options->index)); ?> +

http://xxxxxxxxxxxx.com/2011/08/29//

diff --git a/var/Widget/Options/Discussion.php b/var/Widget/Options/Discussion.php index 2fdfb7ca..278d6b92 100644 --- a/var/Widget/Options/Discussion.php +++ b/var/Widget/Options/Discussion.php @@ -35,7 +35,7 @@ class Widget_Options_Discussion extends Widget_Abstract_Options implements Widge /** 评论日期格式 */ $commentDateFormat = new Typecho_Widget_Helper_Form_Element_Text('commentDateFormat', NULL, $this->options->commentDateFormat, _t('评论日期格式'), _t('这是一个默认的格式,当你在模板中调用显示评论日期方法时, 如果没有指定日期格式, 将按照此格式输出.
- 具体写法请参考PHP日期格式写法.')); + 具体写法请参考PHP日期格式写法.')); $form->addInput($commentDateFormat); /** 评论列表数目 */ diff --git a/var/Widget/Options/Reading.php b/var/Widget/Options/Reading.php index 40d4a13c..781fb019 100644 --- a/var/Widget/Options/Reading.php +++ b/var/Widget/Options/Reading.php @@ -36,7 +36,7 @@ class Widget_Options_Reading extends Widget_Abstract_Options implements Widget_I $postDateFormat = new Typecho_Widget_Helper_Form_Element_Text('postDateFormat', NULL, $this->options->postDateFormat, _t('文章日期格式'), _t('此格式用于指定显示在文章归档中的日期默认显示格式.
在某些主题中这个格式可能不会生效, 因为主题作者可以自定义日期格式.
- 请参考PHP日期格式写法.')); + 请参考PHP日期格式写法.')); $form->addInput($postDateFormat); //首页显示 diff --git a/var/Widget/Users/Edit.php b/var/Widget/Users/Edit.php index 28982b97..d564dcef 100644 --- a/var/Widget/Users/Edit.php +++ b/var/Widget/Users/Edit.php @@ -94,12 +94,12 @@ class Widget_Users_Edit extends Widget_Abstract_Users implements Widget_Interfac Typecho_Widget_Helper_Form::POST_METHOD); /** 用户名称 */ - $name = new Typecho_Widget_Helper_Form_Element_Text('name', NULL, NULL, _t('用户名*'), _t('此用户名将作为用户登录时所用的名称.
+ $name = new Typecho_Widget_Helper_Form_Element_Text('name', NULL, NULL, _t('用户名 *'), _t('此用户名将作为用户登录时所用的名称.
请不要与系统中现有的用户名重复.')); $form->addInput($name); /** 电子邮箱地址 */ - $mail = new Typecho_Widget_Helper_Form_Element_Text('mail', NULL, NULL, _t('电子邮箱地址*'), _t('电子邮箱地址将作为此用户的主要联系方式.
+ $mail = new Typecho_Widget_Helper_Form_Element_Text('mail', NULL, NULL, _t('电子邮箱地址 *'), _t('电子邮箱地址将作为此用户的主要联系方式.
请不要与系统中现有的电子邮箱地址重复.')); $form->addInput($mail); @@ -175,8 +175,8 @@ class Widget_Users_Edit extends Widget_Abstract_Users implements Widget_Interfac $name->addRule('required', _t('必须填写用户名称')); $name->addRule('xssCheck', _t('请不要在用户名中使用特殊字符')); $name->addRule(array($this, 'nameExists'), _t('用户名已经存在')); - $password->label(_t('用户密码*')); - $confirm->label(_t('用户密码确认*')); + $password->label(_t('用户密码 *')); + $confirm->label(_t('用户密码确认 *')); $password->addRule('required', _t('必须填写密码')); } diff --git a/var/Widget/Users/Profile.php b/var/Widget/Users/Profile.php index dc4028a4..8cef0e4a 100644 --- a/var/Widget/Users/Profile.php +++ b/var/Widget/Users/Profile.php @@ -54,7 +54,7 @@ class Widget_Users_Profile extends Widget_Users_Edit implements Widget_Interface $form->addInput($url); /** 电子邮箱地址 */ - $mail = new Typecho_Widget_Helper_Form_Element_Text('mail', NULL, NULL, _t('电子邮箱地址*'), _t('电子邮箱地址将作为此用户的主要联系方式.
+ $mail = new Typecho_Widget_Helper_Form_Element_Text('mail', NULL, NULL, _t('电子邮箱地址 *'), _t('电子邮箱地址将作为此用户的主要联系方式.
请不要与系统中现有的电子邮箱地址重复.')); $form->addInput($mail);