From 4f136ff3304eb9d1839311f9811025b4b5903302 Mon Sep 17 00:00:00 2001 From: fen Date: Mon, 21 Oct 2013 11:10:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9IE=E4=B8=8B=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/copyright.php | 2 +- admin/css/style.css | 18 ++- admin/manage-comments.php | 2 + admin/manage-medias.php | 4 +- admin/manage-metas.php | 36 ++--- admin/manage-pages.php | 7 +- admin/manage-posts.php | 142 +++++++++---------- admin/manage-users.php | 6 +- admin/plugins.php | 212 +++++++++++++++-------------- admin/scss/components/_editor.scss | 1 + admin/scss/style.scss | 10 +- admin/themes.php | 68 ++++----- 12 files changed, 266 insertions(+), 242 deletions(-) diff --git a/admin/copyright.php b/admin/copyright.php index d2ab16e5..62623ff0 100644 --- a/admin/copyright.php +++ b/admin/copyright.php @@ -1,7 +1,7 @@
- %s 构建, 版本 %s-%s ', $options->software, $prefixVersion, $suffixVersion); ?> + %s 构建, 版本 %s (%s)', $options->software, $prefixVersion, $suffixVersion); ?>
+
@@ -175,6 +176,7 @@ $isAllComments = ('on' == $request->get('__typecho_all_comments') || 'on' == Typ
+
cid)): ?> diff --git a/admin/manage-medias.php b/admin/manage-medias.php index af21642c..1d48a4da 100644 --- a/admin/manage-medias.php +++ b/admin/manage-medias.php @@ -35,10 +35,11 @@ $stat = Typecho_Widget::widget('Widget_Stat'); +
- + @@ -84,6 +85,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
+
diff --git a/admin/manage-metas.php b/admin/manage-metas.php index 56e4d99c..f483c1a4 100644 --- a/admin/manage-metas.php +++ b/admin/manage-metas.php @@ -18,25 +18,28 @@ include 'menu.php';
type) || 'category' == $request->get('type')): ?> to($categories); ?> +
-
-
- -
- -
    -
    • -
    • -
  • - - -
    • -
-
+
+
+ +
+ +
    +
    • +
    • +
  • + + +
    • +
+
+ +
@@ -80,6 +83,7 @@ include 'menu.php';
+
to($tags); ?> diff --git a/admin/manage-pages.php b/admin/manage-pages.php index 3d8989b4..32be4535 100644 --- a/admin/manage-pages.php +++ b/admin/manage-pages.php @@ -32,11 +32,11 @@ $stat = Typecho_Widget::widget('Widget_Stat');
- +
- + @@ -97,8 +97,9 @@ $stat = Typecho_Widget::widget('Widget_Stat');
+
- +
diff --git a/admin/manage-posts.php b/admin/manage-posts.php index ade73e7a..f36c974d 100644 --- a/admin/manage-posts.php +++ b/admin/manage-posts.php @@ -42,78 +42,80 @@ $stat = Typecho_Widget::widget('Widget_Stat');
- - - - - - - - - - - - - - - - - - - - - to($posts); ?> - have()): ?> - next()): ?> - - - - - - - +
commentsNum(); ?> - title(); ?> - hasSaved || 'post_draft' == $posts->type) { - echo '' . _t('草稿') . ''; - } else if ('waiting' == $posts->status) { - echo '' . _t('待审核') . ''; - } else if ('private' == $posts->status) { - echo '' . _t('私密') . ''; - } else if ($posts->password) { - echo '' . _t('密码保护') . ''; - } - ?> - type): ?> - - - author(); ?>categories; $length = count($categories); ?> - $val): ?> - adminUrl('manage-posts.php?category=' . $val['mid'] - . (isset($request->uid) ? '&uid=' . $request->uid : '') - . (isset($request->status) ? '&status=' . $request->status : '')); - echo '">' . $val['name'] . '' . ($key < $length - 1 ? ', ' : ''); ?> - - - hasSaved): ?> - - modified); ?> - word()); ?> - +
+ + + + + + + + + + + + + + + + + + + + + to($posts); ?> + have()): ?> + next()): ?> + + + + + + + + + - dateWord(); ?> + + + - - - - - - - - - -
commentsNum(); ?> + title(); ?> + hasSaved || 'post_draft' == $posts->type) { + echo '' . _t('草稿') . ''; + } else if ('waiting' == $posts->status) { + echo '' . _t('待审核') . ''; + } else if ('private' == $posts->status) { + echo '' . _t('私密') . ''; + } else if ($posts->password) { + echo '' . _t('密码保护') . ''; + } + ?> + type): ?> + + + author(); ?>categories; $length = count($categories); ?> + $val): ?> + adminUrl('manage-posts.php?category=' . $val['mid'] + . (isset($request->uid) ? '&uid=' . $request->uid : '') + . (isset($request->status) ? '&status=' . $request->status : '')); + echo '">' . $val['name'] . '' . ($key < $length - 1 ? ', ' : ''); ?> + + + hasSaved): ?> + + modified); ?> + word()); ?> + + + dateWord(); ?> + +
+
+
have()): ?> diff --git a/admin/manage-users.php b/admin/manage-users.php index 1b65f148..5d17b82f 100644 --- a/admin/manage-users.php +++ b/admin/manage-users.php @@ -28,12 +28,13 @@ include 'menu.php'; - +
+
- + @@ -83,6 +84,7 @@ include 'menu.php';
+
have()): ?> diff --git a/admin/plugins.php b/admin/plugins.php index b43c4d84..19b3e19d 100644 --- a/admin/plugins.php +++ b/admin/plugins.php @@ -11,118 +11,122 @@ include 'menu.php'; to($activatedPlugins); ?> have() || !empty($activatedPlugins->activatedPlugins)): ?>

- - - - - - - - - - - - - - - - - - - next()): ?> - - - - - - + + + + + + + + activatedPlugins)): ?> + activatedPlugins as $key => $val): ?> + + + + + + + + + +
title(); ?> - dependence): ?> - <?php _e('%s 无法在此版本的typecho下正常工作', $activatedPlugins->title); ?> - - description(); ?>version(); ?>homepage) ? $activatedPlugins->author : '' . $activatedPlugins->author . ''; ?> - activate || $activatedPlugins->deactivate || $activatedPlugins->config || $activatedPlugins->personalConfig): ?> - activated): ?> - config): ?> - - • - - - - - - - +
+ + + + + + + + + + + + + + + + + + + next()): ?> + + - - - - activatedPlugins)): ?> - activatedPlugins as $key => $val): ?> - - - - - - - - - -
title(); ?> + dependence): ?> + <?php _e('%s 无法在此版本的typecho下正常工作', $activatedPlugins->title); ?> -
+
description(); ?>version(); ?>homepage) ? $activatedPlugins->author : '' . $activatedPlugins->author . ''; ?> + activate || $activatedPlugins->deactivate || $activatedPlugins->config || $activatedPlugins->personalConfig): ?> + activated): ?> + config): ?> + + • + + + + + + + + +
+ to($deactivatedPlugins); ?> have() || !$activatedPlugins->have()): ?>

- - - - - - - - - - - - - - - - - - - have()): ?> - next()): ?> - - - - - - + + + + + + + + +
title(); ?>description(); ?>version(); ?>homepage) ? $deactivatedPlugins->author : '' . $deactivatedPlugins->author . ''; ?> - activate || $deactivatedPlugins->deactivate || $deactivatedPlugins->config || $deactivatedPlugins->personalConfig): ?> - activated): ?> - config): ?> - - | +
+ + + + + + + + + + + + + + + + + + + have()): ?> + next()): ?> + + + + + + - - - - - - - - -
title(); ?>description(); ?>version(); ?>homepage) ? $deactivatedPlugins->author : '' . $deactivatedPlugins->author . ''; ?> + activate || $deactivatedPlugins->deactivate || $deactivatedPlugins->config || $deactivatedPlugins->personalConfig): ?> + activated): ?> + config): ?> + + | + + + + - - - - -
+
+ diff --git a/admin/scss/components/_editor.scss b/admin/scss/components/_editor.scss index de015c3d..af191471 100644 --- a/admin/scss/components/_editor.scss +++ b/admin/scss/components/_editor.scss @@ -15,6 +15,7 @@ margin-right: 4px; padding: 3px; cursor: pointer; + @include border-radius(2px); &:hover { background-color: #E9E9E6; } diff --git a/admin/scss/style.scss b/admin/scss/style.scss index 745fb4a6..53dac9ea 100644 --- a/admin/scss/style.scss +++ b/admin/scss/style.scss @@ -385,12 +385,13 @@ a.operate-reply { color: #999; text-align: center; } - -.typecho-list-table { - border: 30px solid #FFF; - width: 100%; +.typecho-table-wrap { + padding: 30px; background: #FFF; } +.typecho-list-table { + width: 100%; +} .typecho-list-table.deactivate { color: #999; @@ -484,7 +485,6 @@ a.operate-reply { * 模板列表 */ .typecho-theme-list { - margin-top: 2em; } .typecho-theme-list .theme-item { diff --git a/admin/themes.php b/admin/themes.php index 3f429f58..ecb480a1 100644 --- a/admin/themes.php +++ b/admin/themes.php @@ -17,40 +17,42 @@ include 'menu.php'; - - - - - - - - - - +
+
截图详情
+ + + + + + + + + - - to($themes); ?> - next()): ?> - - - - - - -
截图详情
<?php $themes->name(); ?> -

title ? $themes->title() : $themes->name(); ?>

- - author): ?>: homepage): ?>author(); ?>homepage): ?>    - version): ?>: version() ?> - -

description); ?>

- theme != $themes->name): ?> -

-   - -

- -
+ + to($themes); ?> + next()): ?> + + <?php $themes->name(); ?> + +

title ? $themes->title() : $themes->name(); ?>

+ + author): ?>: homepage): ?>author(); ?>homepage): ?>    + version): ?>: version() ?> + +

description); ?>

+ theme != $themes->name): ?> +

+   + +

+ + + + + + +