diff --git a/admin/css/style.css b/admin/css/style.css
index d5b4d0f2..bd36b7c9 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -569,7 +569,8 @@ margin-top: 25px;
* 后台分页
*/
.typecho-pager {
- margin-top: 30px;
+ padding-top: 30px;
+ border-top: 1px solid #F0F0EC;
font-size: 1.14286em;
text-align: center;
}
@@ -1037,6 +1038,11 @@ a.operate-reply {
text-align: center;
}
+.typecho-list-wrap {
+ padding: 30px;
+ background: #FFF;
+}
+
.typecho-list-table {
width: 100%;
background: #FFF;
@@ -1842,8 +1848,9 @@ ul.autocompleter-choices span.autocompleter-queried {
* 标签列表
*/
.typecho-page-main ul.tag-list {
- padding: 5px 10px;
- background: #EFF5D9;
+ list-style: none;
+ margin: 0;
+ padding: 0;
}
.typecho-page-main ul.tag-list li {
diff --git a/admin/manage-comments.php b/admin/manage-comments.php
index 990ef1d4..a6a1bf5b 100644
--- a/admin/manage-comments.php
+++ b/admin/manage-comments.php
@@ -75,104 +75,104 @@ $comments = Typecho_Widget::widget('Widget_Comments_Admin');
</div>
</form>
</div>
+ <div class="typecho-list-wrap">
+ <form method="post" name="manage_comments" class="operate-form">
+ <table class="typecho-list-table">
+ <colgroup>
+ <col width="20"/>
+ <col width="50" />
+ <col width="20%"/>
+ <col width=""/>
+ </colgroup>
+ <thead>
+ <tr>
+ <th> </th>
+ <th><?php _e('作者'); ?></th>
+ <th> </th>
+ <th><?php _e('内容'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php if($comments->have()): ?>
+ <?php while($comments->next()): ?>
+ <tr id="<?php $comments->theId(); ?>">
+ <td valign="top">
+ <input type="checkbox" value="<?php $comments->coid(); ?>" name="coid[]"/>
+ </td>
+ <td valign="top">
+ <div class="comment-avatar">
+ <?php $comments->gravatar(40); ?>
+ </div>
+ </td>
+ <td valign="top" class="comment-head">
+ <div class="comment-meta">
+ <span class="<?php $comments->type(); ?>"></span>
+ <strong class="comment-author"><?php $comments->author(true); ?></strong>
+ <?php if($comments->mail): ?>
+ <br><span><a href="mailto:<?php $comments->mail(); ?>"><?php $comments->mail(); ?></a></span>
+ <?php endif; ?>
+ <?php if($comments->ip): ?>
+ <br><span><?php $comments->ip(); ?></span>
+ <?php endif; ?>
+ </div>
+ </td>
+ <td valign="top" class="comment-body">
+ <div class="comment-date"><?php $comments->dateWord(); ?> 于 <a href="<?php $comments->permalink(); ?>"><?php $comments->title(); ?></a></div>
+ <div class="comment-content">
+ <?php $comments->content(); ?>
+ </div>
+ <div class="comment-action hidden-by-mouse">
+ <?php if('approved' == $comments->status): ?>
+ <span class="weak"><?php _e('通过'); ?></span>
+ <?php else: ?>
+ <a href="<?php $options->index('/action/comments-edit?do=approved&coid=' . $comments->coid); ?>" class="ajax"><?php _e('通过'); ?></a>
+ <?php endif; ?>
+
+ <?php if('waiting' == $comments->status): ?>
+ <span class="weak"><?php _e('待审核'); ?></span>
+ <?php else: ?>
+ <a href="<?php $options->index('/action/comments-edit?do=waiting&coid=' . $comments->coid); ?>" class="ajax"><?php _e('待审核'); ?></a>
+ <?php endif; ?>
+
+ <?php if('spam' == $comments->status): ?>
+ <span class="weak"><?php _e('垃圾'); ?></span>
+ <?php else: ?>
+ <a href="<?php $options->index('/action/comments-edit?do=spam&coid=' . $comments->coid); ?>" class="ajax"><?php _e('垃圾'); ?></a>
+ <?php endif; ?>
+
+ <a href="#<?php $comments->theId(); ?>" rel="<?php $options->index('/action/comments-edit?do=get&coid=' . $comments->coid); ?>" class="ajax operate-edit"><?php _e('编辑'); ?></a>
- <form method="post" name="manage_comments" class="operate-form">
- <table class="typecho-list-table">
- <colgroup>
- <col width="20"/>
- <col width="50" />
- <col width="20%"/>
- <col width=""/>
- </colgroup>
- <thead>
- <tr>
- <th> </th>
- <th><?php _e('作者'); ?></th>
- <th> </th>
- <th><?php _e('内容'); ?></th>
+ <?php if('approved' == $comments->status && 'comment' == $comments->type): ?>
+ <a href="#<?php $comments->theId(); ?>" rel="<?php $options->index('/action/comments-edit?do=reply&coid=' . $comments->coid); ?>" class="ajax operate-reply"><?php _e('回复'); ?></a>
+ <?php endif; ?>
+
+ <a lang="<?php _e('你确认要删除%s的评论吗?', htmlspecialchars($comments->author)); ?>" href="<?php $options->index('/action/comments-edit?do=delete&coid=' . $comments->coid); ?>" class="ajax operate-delete"><?php _e('删除'); ?></a>
+ </div>
+ </td>
</tr>
- </thead>
- <tbody>
- <?php if($comments->have()): ?>
- <?php while($comments->next()): ?>
- <tr id="<?php $comments->theId(); ?>">
- <td valign="top">
- <input type="checkbox" value="<?php $comments->coid(); ?>" name="coid[]"/>
- </td>
- <td valign="top">
- <div class="comment-avatar">
- <?php $comments->gravatar(40); ?>
- </div>
- </td>
- <td valign="top" class="comment-head">
- <div class="comment-meta">
- <span class="<?php $comments->type(); ?>"></span>
- <strong class="comment-author"><?php $comments->author(true); ?></strong>
- <?php if($comments->mail): ?>
- <br><span><a href="mailto:<?php $comments->mail(); ?>"><?php $comments->mail(); ?></a></span>
- <?php endif; ?>
- <?php if($comments->ip): ?>
- <br><span><?php $comments->ip(); ?></span>
- <?php endif; ?>
- </div>
- </td>
- <td valign="top" class="comment-body">
- <div class="comment-date"><?php $comments->dateWord(); ?> 于 <a href="<?php $comments->permalink(); ?>"><?php $comments->title(); ?></a></div>
- <div class="comment-content">
- <?php $comments->content(); ?>
- </div>
- <div class="comment-action hidden-by-mouse">
- <?php if('approved' == $comments->status): ?>
- <span class="weak"><?php _e('通过'); ?></span>
- <?php else: ?>
- <a href="<?php $options->index('/action/comments-edit?do=approved&coid=' . $comments->coid); ?>" class="ajax"><?php _e('通过'); ?></a>
- <?php endif; ?>
-
- <?php if('waiting' == $comments->status): ?>
- <span class="weak"><?php _e('待审核'); ?></span>
- <?php else: ?>
- <a href="<?php $options->index('/action/comments-edit?do=waiting&coid=' . $comments->coid); ?>" class="ajax"><?php _e('待审核'); ?></a>
- <?php endif; ?>
-
- <?php if('spam' == $comments->status): ?>
- <span class="weak"><?php _e('垃圾'); ?></span>
- <?php else: ?>
- <a href="<?php $options->index('/action/comments-edit?do=spam&coid=' . $comments->coid); ?>" class="ajax"><?php _e('垃圾'); ?></a>
- <?php endif; ?>
-
- <a href="#<?php $comments->theId(); ?>" rel="<?php $options->index('/action/comments-edit?do=get&coid=' . $comments->coid); ?>" class="ajax operate-edit"><?php _e('编辑'); ?></a>
-
- <?php if('approved' == $comments->status && 'comment' == $comments->type): ?>
- <a href="#<?php $comments->theId(); ?>" rel="<?php $options->index('/action/comments-edit?do=reply&coid=' . $comments->coid); ?>" class="ajax operate-reply"><?php _e('回复'); ?></a>
- <?php endif; ?>
-
- <a lang="<?php _e('你确认要删除%s的评论吗?', htmlspecialchars($comments->author)); ?>" href="<?php $options->index('/action/comments-edit?do=delete&coid=' . $comments->coid); ?>" class="ajax operate-delete"><?php _e('删除'); ?></a>
- </div>
- </td>
- </tr>
- <?php endwhile; ?>
- <?php else: ?>
- <tr class="even">
- <h6 class="typecho-list-table-title"><?php _e('没有评论') ?></h6>
- </tr>
+ <?php endwhile; ?>
+ <?php else: ?>
+ <tr class="even">
+ <h6 class="typecho-list-table-title"><?php _e('没有评论') ?></h6>
+ </tr>
+ <?php endif; ?>
+ </tbody>
+ </table>
+ <?php if(isset($request->cid)): ?>
+ <input type="hidden" value="<?php echo htmlspecialchars($request->get('cid')); ?>" name="cid" />
<?php endif; ?>
- </tbody>
- </table>
- <?php if(isset($request->cid)): ?>
- <input type="hidden" value="<?php echo htmlspecialchars($request->get('cid')); ?>" name="cid" />
- <?php endif; ?>
- </form>
-
- <?php if($comments->have()): ?>
- <div class="typecho-pager">
- <div class="typecho-pager-content">
- <ul>
- <?php $comments->pageNav(); ?>
- </ul>
- </div>
- </div>
- <?php endif; ?>
-
+
+ <?php if($comments->have()): ?>
+ <div class="typecho-pager">
+ <div class="typecho-pager-content">
+ <ul>
+ <?php $comments->pageNav(); ?>
+ </ul>
+ </div>
+ </div>
+ <?php endif; ?>
+ </form>
+ </div><!-- end .typecho-list-wrap -->
</div>
</div>
</div>
diff --git a/admin/manage-medias.php b/admin/manage-medias.php
index 2a45880a..97e7c746 100644
--- a/admin/manage-medias.php
+++ b/admin/manage-medias.php
@@ -34,71 +34,73 @@ $stat = Typecho_Widget::widget('Widget_Stat');
</form>
</div>
- <form method="post" name="manage_medias" class="operate-form">
- <table class="typecho-list-table draggable">
- <colgroup>
- <col width="20"/>
- <col width="5%"/>
- <col width="20"/>
- <col width="30%"/>
- <col width="20"/>
- <col width="10%"/>
- <col width="30%"/>
- <col width="18%"/>
- </colgroup>
- <thead>
- <tr>
- <th> </th>
- <th> </th>
- <th> </th>
- <th><?php _e('文件名'); ?></th>
- <th> </th>
- <th><?php _e('上传者'); ?></th>
- <th><?php _e('所属文章'); ?></th>
- <th><?php _e('发布日期'); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php if($attachments->have()): ?>
- <?php while($attachments->next()): ?>
- <?php $mime = Typecho_Common::mimeIconType($attachments->attachment->mime); ?>
- <tr id="<?php $attachments->theId(); ?>">
- <td><input type="checkbox" value="<?php $attachments->cid(); ?>" name="cid[]"/></td>
- <td><a href="<?php $options->adminUrl('manage-comments.php?cid=' . $attachments->cid); ?>" class="balloon-button size-<?php echo Typecho_Common::splitByCount($attachments->commentsNum, 1, 10, 20, 50, 100); ?>"><?php $attachments->commentsNum(); ?></a></td>
- <td><span class="typecho-mime typecho-mime-<?php echo $mime; ?>"></span></td>
- <td><a href="<?php $options->adminUrl('media.php?cid=' . $attachments->cid); ?>"><?php $attachments->title(); ?></a></td>
- <td>
- <a class="right hidden-by-mouse" href="<?php $attachments->permalink(); ?>"><img src="<?php $options->adminUrl('images/link.png'); ?>" title="<?php _e('浏览 %s', $attachments->title); ?>" width="16" height="16" alt="view" /></a>
- </td>
- <td><?php $attachments->author(); ?></td>
- <td>
- <?php if ($attachments->parentPost->cid): ?>
- <a href="<?php $options->adminUrl('write-' . $attachments->parentPost->type . '.php?cid=' . $attachments->parentPost->cid); ?>"><?php $attachments->parentPost->title(); ?></a>
- <?php else: ?>
- <span class="description"><?php _e('未归档'); ?></span>
- <?php endif; ?>
- </td>
- <td><?php $attachments->dateWord(); ?></td>
- </tr>
- <?php endwhile; ?>
- <?php else: ?>
- <tr class="even">
- <td colspan="8"><h6 class="typecho-list-table-title"><?php _e('没有任何附件'); ?></h6></td>
- </tr>
+ <div class="typecho-list-wrap">
+ <form method="post" name="manage_medias" class="operate-form">
+ <table class="typecho-list-table draggable">
+ <colgroup>
+ <col width="20"/>
+ <col width="5%"/>
+ <col width="20"/>
+ <col width="30%"/>
+ <col width="20"/>
+ <col width="10%"/>
+ <col width="30%"/>
+ <col width="18%"/>
+ </colgroup>
+ <thead>
+ <tr>
+ <th> </th>
+ <th> </th>
+ <th> </th>
+ <th><?php _e('文件名'); ?></th>
+ <th> </th>
+ <th><?php _e('上传者'); ?></th>
+ <th><?php _e('所属文章'); ?></th>
+ <th><?php _e('发布日期'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php if($attachments->have()): ?>
+ <?php while($attachments->next()): ?>
+ <?php $mime = Typecho_Common::mimeIconType($attachments->attachment->mime); ?>
+ <tr id="<?php $attachments->theId(); ?>">
+ <td><input type="checkbox" value="<?php $attachments->cid(); ?>" name="cid[]"/></td>
+ <td><a href="<?php $options->adminUrl('manage-comments.php?cid=' . $attachments->cid); ?>" class="balloon-button size-<?php echo Typecho_Common::splitByCount($attachments->commentsNum, 1, 10, 20, 50, 100); ?>"><?php $attachments->commentsNum(); ?></a></td>
+ <td><span class="typecho-mime typecho-mime-<?php echo $mime; ?>"></span></td>
+ <td><a href="<?php $options->adminUrl('media.php?cid=' . $attachments->cid); ?>"><?php $attachments->title(); ?></a></td>
+ <td>
+ <a class="right hidden-by-mouse" href="<?php $attachments->permalink(); ?>"><img src="<?php $options->adminUrl('images/link.png'); ?>" title="<?php _e('浏览 %s', $attachments->title); ?>" width="16" height="16" alt="view" /></a>
+ </td>
+ <td><?php $attachments->author(); ?></td>
+ <td>
+ <?php if ($attachments->parentPost->cid): ?>
+ <a href="<?php $options->adminUrl('write-' . $attachments->parentPost->type . '.php?cid=' . $attachments->parentPost->cid); ?>"><?php $attachments->parentPost->title(); ?></a>
+ <?php else: ?>
+ <span class="description"><?php _e('未归档'); ?></span>
+ <?php endif; ?>
+ </td>
+ <td><?php $attachments->dateWord(); ?></td>
+ </tr>
+ <?php endwhile; ?>
+ <?php else: ?>
+ <tr class="even">
+ <td colspan="8"><h6 class="typecho-list-table-title"><?php _e('没有任何附件'); ?></h6></td>
+ </tr>
+ <?php endif; ?>
+ </tbody>
+ </table>
+
+ <?php if($attachments->have()): ?>
+ <div class="typecho-pager">
+ <div class="typecho-pager-content">
+ <ul>
+ <?php $attachments->pageNav(); ?>
+ </ul>
+ </div>
+ </div>
<?php endif; ?>
- </tbody>
- </table>
- </form>
-
- <?php if($attachments->have()): ?>
- <div class="typecho-pager">
- <div class="typecho-pager-content">
- <ul>
- <?php $attachments->pageNav(); ?>
- </ul>
- </div>
- </div>
- <?php endif; ?>
+ </form>
+ </div><!-- end .typecho-list-wrap -->
</div>
</div>
diff --git a/admin/manage-metas.php b/admin/manage-metas.php
index 4a3992ac..978124aa 100644
--- a/admin/manage-metas.php
+++ b/admin/manage-metas.php
@@ -19,69 +19,70 @@ include 'menu.php';
<?php if(!isset($request->type) || 'category' == $request->get('type')): ?>
<?php Typecho_Widget::widget('Widget_Metas_Category_List')->to($categories); ?>
<form method="post" name="manage_categories" class="operate-form">
- <div class="typecho-list-operate clearfix">
- <div class="operate">
- <input type="checkbox" class="typecho-table-select-all" />
- <div class="btn-group btn-drop">
- <button class="dropdown-toggle" type="button" href="">选中项 <i class="icon-caret-down"></i></button>
- <ul class="dropdown-menu">
- <li><a lang="<?php _e('此分类下的所有内容将被删除, 你确认要删除这些分类吗?'); ?>" href="<?php $options->index('/action/metas-category-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
- <li><a lang="<?php _e('刷新分类可能需要等待较长时间, 你确认要刷新这些分类吗?'); ?>" href="<?php $options->index('/action/metas-category-edit?do=refresh'); ?>"><?php _e('刷新'); ?></a></li>
- <li><p><button type="button" class="merge" rel="<?php $options->index('/action/metas-category-edit?do=merge'); ?>"><?php _e('合并到'); ?></button>
- <select name="merge">
- <?php $categories->parse('<option value="{mid}">{name}</option>'); ?>
- </select></p></li>
- </ul>
+ <div class="typecho-list-operate clearfix">
+ <div class="operate">
+ <input type="checkbox" class="typecho-table-select-all" />
+ <div class="btn-group btn-drop">
+ <button class="dropdown-toggle" type="button" href="">选中项 <i class="icon-caret-down"></i></button>
+ <ul class="dropdown-menu">
+ <li><a lang="<?php _e('此分类下的所有内容将被删除, 你确认要删除这些分类吗?'); ?>" href="<?php $options->index('/action/metas-category-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
+ <li><a lang="<?php _e('刷新分类可能需要等待较长时间, 你确认要刷新这些分类吗?'); ?>" href="<?php $options->index('/action/metas-category-edit?do=refresh'); ?>"><?php _e('刷新'); ?></a></li>
+ <li><p><button type="button" class="merge" rel="<?php $options->index('/action/metas-category-edit?do=merge'); ?>"><?php _e('合并到'); ?></button>
+ <select name="merge">
+ <?php $categories->parse('<option value="{mid}">{name}</option>'); ?>
+ </select></p></li>
+ </ul>
+ </div>
+ </div>
</div>
+ <div class="typecho-list-wrap">
+ <table class="typecho-list-table">
+ <colgroup>
+ <col width="20"/>
+ <col width="30%"/>
+ <col width="20"/>
+ <col width="30%"/>
+ <col width=""/>
+ <col width="15%"/>
+ </colgroup>
+ <thead>
+ <tr>
+ <th> </th>
+ <th><?php _e('名称'); ?></th>
+ <th> </th>
+ <th><?php _e('缩略名'); ?></th>
+ <th> </th>
+ <th><?php _e('文章数'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php if($categories->have()): ?>
+ <?php while ($categories->next()): ?>
+ <tr id="mid-<?php $categories->theId(); ?>">
+ <td><input type="checkbox" value="<?php $categories->mid(); ?>" name="mid[]"/></td>
+ <td><a href="<?php echo $request->makeUriByRequest('mid=' . $categories->mid); ?>"><?php $categories->name(); ?></a></td>
+ <td>
+ <a class="right hidden-by-mouse" href="<?php $categories->permalink(); ?>"><img src="<?php $options->adminUrl('images/link.png'); ?>" title="<?php _e('浏览 %s', $categories->name); ?>" width="16" height="16" alt="view" /></a>
+ </td>
+ <td><?php $categories->slug(); ?></td>
+ <td>
+ <?php if ($options->defaultCategory == $categories->mid): ?>
+ <span class="balloon right"><?php _e('默认'); ?></span>
+ <?php else: ?>
+ <a class="hidden-by-mouse" href="<?php $options->index('/action/metas-category-edit?do=default&mid=' . $categories->mid); ?>" title="<?php _e('设为默认'); ?>"><?php _e('默认'); ?></a>
+ <?php endif; ?>
+ </td>
+ <td><a class="balloon-button left size-<?php echo Typecho_Common::splitByCount($categories->count, 1, 10, 20, 50, 100); ?>" href="<?php $options->adminUrl('manage-posts.php?category=' . $categories->mid); ?>"><?php $categories->count(); ?></a></td>
+ </tr>
+ <?php endwhile; ?>
+ <?php else: ?>
+ <tr class="even">
+ <td colspan="6"><h6 class="typecho-list-table-title"><?php _e('没有任何分类'); ?></h6></td>
+ </tr>
+ <?php endif; ?>
+ </tbody>
+ </table>
</div>
- </div>
-
- <table class="typecho-list-table">
- <colgroup>
- <col width="20"/>
- <col width="30%"/>
- <col width="20"/>
- <col width="30%"/>
- <col width=""/>
- <col width="15%"/>
- </colgroup>
- <thead>
- <tr>
- <th> </th>
- <th><?php _e('名称'); ?></th>
- <th> </th>
- <th><?php _e('缩略名'); ?></th>
- <th> </th>
- <th><?php _e('文章数'); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php if($categories->have()): ?>
- <?php while ($categories->next()): ?>
- <tr id="mid-<?php $categories->theId(); ?>">
- <td><input type="checkbox" value="<?php $categories->mid(); ?>" name="mid[]"/></td>
- <td><a href="<?php echo $request->makeUriByRequest('mid=' . $categories->mid); ?>"><?php $categories->name(); ?></a></td>
- <td>
- <a class="right hidden-by-mouse" href="<?php $categories->permalink(); ?>"><img src="<?php $options->adminUrl('images/link.png'); ?>" title="<?php _e('浏览 %s', $categories->name); ?>" width="16" height="16" alt="view" /></a>
- </td>
- <td><?php $categories->slug(); ?></td>
- <td>
- <?php if ($options->defaultCategory == $categories->mid): ?>
- <span class="balloon right"><?php _e('默认'); ?></span>
- <?php else: ?>
- <a class="hidden-by-mouse" href="<?php $options->index('/action/metas-category-edit?do=default&mid=' . $categories->mid); ?>" title="<?php _e('设为默认'); ?>"><?php _e('默认'); ?></a>
- <?php endif; ?>
- </td>
- <td><a class="balloon-button left size-<?php echo Typecho_Common::splitByCount($categories->count, 1, 10, 20, 50, 100); ?>" href="<?php $options->adminUrl('manage-posts.php?category=' . $categories->mid); ?>"><?php $categories->count(); ?></a></td>
- </tr>
- <?php endwhile; ?>
- <?php else: ?>
- <tr class="even">
- <td colspan="6"><h6 class="typecho-list-table-title"><?php _e('没有任何分类'); ?></h6></td>
- </tr>
- <?php endif; ?>
- </tbody>
- </table>
</form>
<?php else: ?>
<?php Typecho_Widget::widget('Widget_Metas_Tag_Cloud', 'sort=mid&desc=0')->to($tags); ?>
@@ -101,18 +102,20 @@ include 'menu.php';
</div>
</div>
- <ul class="typecho-list-notable tag-list clearfix">
- <?php if($tags->have()): ?>
- <?php while ($tags->next()): ?>
- <li class="size-<?php $tags->split(5, 10, 20, 30); ?>" id="<?php $tags->theId(); ?>">
- <input type="checkbox" value="<?php $tags->mid(); ?>" name="mid[]"/>
- <span rel="<?php echo $request->makeUriByRequest('mid=' . $tags->mid); ?>"><?php $tags->name(); ?></span>
- </li>
- <?php endwhile; ?>
- <?php else: ?>
- <h6 class="typecho-list-table-title"><?php _e('没有任何标签'); ?></h6>
- <?php endif; ?>
- </ul>
+ <div class="typecho-list-wrap">
+ <ul class="typecho-list-notable tag-list clearfix">
+ <?php if($tags->have()): ?>
+ <?php while ($tags->next()): ?>
+ <li class="size-<?php $tags->split(5, 10, 20, 30); ?>" id="<?php $tags->theId(); ?>">
+ <input type="checkbox" value="<?php $tags->mid(); ?>" name="mid[]"/>
+ <span rel="<?php echo $request->makeUriByRequest('mid=' . $tags->mid); ?>"><?php $tags->name(); ?></span>
+ </li>
+ <?php endwhile; ?>
+ <?php else: ?>
+ <h6 class="typecho-list-table-title"><?php _e('没有任何标签'); ?></h6>
+ <?php endif; ?>
+ </ul>
+ </div><!-- end .typecho-list-wrap -->
<input type="hidden" name="do" value="delete" />
</form>
<?php endif; ?>
diff --git a/admin/manage-pages.php b/admin/manage-pages.php
index b88d8127..0f860570 100644
--- a/admin/manage-pages.php
+++ b/admin/manage-pages.php
@@ -31,71 +31,74 @@ $stat = Typecho_Widget::widget('Widget_Stat');
</form>
</div>
- <form method="post" name="manage_pages" class="operate-form">
- <table class="typecho-list-table">
- <colgroup>
- <col width="20"/>
- <col width="5%"/>
- <col width="35%"/>
- <col width=""/>
- <col width="20"/>
- <col width="20%"/>
- <col width="15%"/>
- <col width="18%"/>
- </colgroup>
- <thead>
- <tr>
- <th> </th>
- <th> </th>
- <th><?php _e('标题'); ?></th>
- <th> </th>
- <th> </th>
- <th><?php _e('缩略名'); ?></th>
- <th><?php _e('作者'); ?></th>
- <th><?php _e('日期'); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php Typecho_Widget::widget('Widget_Contents_Page_Admin')->to($pages); ?>
- <?php if($pages->have()): ?>
- <?php while($pages->next()): ?>
- <tr id="<?php $pages->theId(); ?>">
- <td><input type="checkbox" value="<?php $pages->cid(); ?>" name="cid[]"/></td>
- <td><a href="<?php $options->adminUrl('manage-comments.php?cid=' . $pages->cid); ?>" class="balloon-button size-<?php echo Typecho_Common::splitByCount($pages->commentsNum, 1, 10, 20, 50, 100); ?>"><?php $pages->commentsNum(); ?></a></td>
- <td<?php if ('draft' != $pages->status): ?> colspan="2"<?php endif; ?>><a href="<?php $options->adminUrl('write-page.php?cid=' . $pages->cid); ?>"><?php $pages->title(); ?></a>
- <?php if ('draft' == $pages->status): ?>
- </td>
- <td class="right">
- <span><?php _e('草稿'); ?></span>
- <?php endif; ?></td>
- </td>
- <td>
- <?php if ('publish' == $pages->status): ?>
- <a class="right hidden-by-mouse" href="<?php $pages->permalink(); ?>"><img src="<?php $options->adminUrl('images/link.png'); ?>" title="<?php _e('浏览 %s', $pages->title); ?>" width="16" height="16" alt="view" /></a>
- <?php endif; ?>
- </td>
- <td><?php $pages->slug(); ?></td>
- <td><?php $pages->author(); ?></td>
- <td>
- <?php if ($pages->hasSaved): ?>
- <span class="description">
- <?php $modifyDate = new Typecho_Date($pages->modified); ?>
- <?php _e('保存于 %s', $modifyDate->word()); ?>
- </span>
- <?php else: ?>
- <?php $pages->dateWord(); ?>
- <?php endif; ?>
- </td>
- </tr>
- <?php endwhile; ?>
- <?php else: ?>
- <tr class="even">
- <td colspan="8"><h6 class="typecho-list-table-title"><?php _e('没有任何页面'); ?></h6></td>
- </tr>
- <?php endif; ?>
- </tbody>
- </table>
- </form>
+ <div class="typecho-list-wrap">
+ <form method="post" name="manage_pages" class="operate-form">
+
+ <table class="typecho-list-table">
+ <colgroup>
+ <col width="20"/>
+ <col width="5%"/>
+ <col width="35%"/>
+ <col width=""/>
+ <col width="20"/>
+ <col width="20%"/>
+ <col width="15%"/>
+ <col width="18%"/>
+ </colgroup>
+ <thead>
+ <tr>
+ <th> </th>
+ <th> </th>
+ <th><?php _e('标题'); ?></th>
+ <th> </th>
+ <th> </th>
+ <th><?php _e('缩略名'); ?></th>
+ <th><?php _e('作者'); ?></th>
+ <th><?php _e('日期'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php Typecho_Widget::widget('Widget_Contents_Page_Admin')->to($pages); ?>
+ <?php if($pages->have()): ?>
+ <?php while($pages->next()): ?>
+ <tr id="<?php $pages->theId(); ?>">
+ <td><input type="checkbox" value="<?php $pages->cid(); ?>" name="cid[]"/></td>
+ <td><a href="<?php $options->adminUrl('manage-comments.php?cid=' . $pages->cid); ?>" class="balloon-button size-<?php echo Typecho_Common::splitByCount($pages->commentsNum, 1, 10, 20, 50, 100); ?>"><?php $pages->commentsNum(); ?></a></td>
+ <td<?php if ('draft' != $pages->status): ?> colspan="2"<?php endif; ?>><a href="<?php $options->adminUrl('write-page.php?cid=' . $pages->cid); ?>"><?php $pages->title(); ?></a>
+ <?php if ('draft' == $pages->status): ?>
+ </td>
+ <td class="right">
+ <span><?php _e('草稿'); ?></span>
+ <?php endif; ?></td>
+ </td>
+ <td>
+ <?php if ('publish' == $pages->status): ?>
+ <a class="right hidden-by-mouse" href="<?php $pages->permalink(); ?>"><img src="<?php $options->adminUrl('images/link.png'); ?>" title="<?php _e('浏览 %s', $pages->title); ?>" width="16" height="16" alt="view" /></a>
+ <?php endif; ?>
+ </td>
+ <td><?php $pages->slug(); ?></td>
+ <td><?php $pages->author(); ?></td>
+ <td>
+ <?php if ($pages->hasSaved): ?>
+ <span class="description">
+ <?php $modifyDate = new Typecho_Date($pages->modified); ?>
+ <?php _e('保存于 %s', $modifyDate->word()); ?>
+ </span>
+ <?php else: ?>
+ <?php $pages->dateWord(); ?>
+ <?php endif; ?>
+ </td>
+ </tr>
+ <?php endwhile; ?>
+ <?php else: ?>
+ <tr class="even">
+ <td colspan="8"><h6 class="typecho-list-table-title"><?php _e('没有任何页面'); ?></h6></td>
+ </tr>
+ <?php endif; ?>
+ </tbody>
+ </table>
+ </form>
+ </div><!-- end .typecho-list-wrap -->
</div>
</div>
diff --git a/admin/manage-posts.php b/admin/manage-posts.php
index 0bf8957d..dd0f9eab 100644
--- a/admin/manage-posts.php
+++ b/admin/manage-posts.php
@@ -11,119 +11,124 @@ $stat = Typecho_Widget::widget('Widget_Stat');
<div class="col-group typecho-page-main">
<div class="col-mb-12 typecho-list">
<div class="typecho-list-operate clearfix">
- <form method="get">
- <div class="operate">
- <input type="checkbox" class="typecho-table-select-all" />
- <div class="btn-group btn-drop">
- <button class="dropdown-toggle" type="button" href="">选中项 <i class="icon-caret-down"></i></button>
- <ul class="dropdown-menu">
- <li><a lang="<?php _e('你确认要删除这些文章吗?'); ?>" href="<?php $options->index('/action/contents-post-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
- </ul>
- </div>
- </div>
- <div class="search">
- <?php if ('' != $request->keywords || '' != $request->category): ?>
- <a href="<?php $options->adminUrl('manage-posts.php' . (isset($request->uid) ? '?uid=' . htmlspecialchars($request->get('uid')) : '')); ?>"><?php _e('« 取消筛选'); ?></a>
- <?php endif; ?>
- <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>" value="<?php echo htmlspecialchars($request->keywords); ?>" name="keywords" />
- <select name="category">
- <option value=""><?php _e('所有分类'); ?></option>
- <?php Typecho_Widget::widget('Widget_Metas_Category_List')->to($category); ?>
- <?php while($category->next()): ?>
- <option value="<?php $category->mid(); ?>"<?php if($request->get('category') == $category->mid): ?> selected="true"<?php endif; ?>><?php $category->name(); ?></option>
- <?php endwhile; ?>
- </select>
- <button type="submit"><?php _e('筛选'); ?></button>
- <?php if(isset($request->uid)): ?>
- <input type="hidden" value="<?php echo htmlspecialchars($request->get('uid')); ?>" name="uid" />
- <?php endif; ?>
- </div>
- </form>
- </div>
-
- <form method="post" name="manage_posts" class="operate-form">
- <table class="typecho-list-table">
- <colgroup>
- <col width="20"/>
- <col width="5%"/>
- <col width="35%"/>
- <col width=""/>
- <col width="20"/>
- <col width="10%"/>
- <col width="15%"/>
- <col width="18%"/>
- </colgroup>
- <thead>
- <tr>
- <th> </th>
- <th> </th>
- <th><?php _e('标题'); ?></th>
- <th> </th>
- <th> </th>
- <th><?php _e('作者'); ?></th>
- <th><?php _e('分类'); ?></th>
- <th><?php _e('日期'); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php Typecho_Widget::widget('Widget_Contents_Post_Admin')->to($posts); ?>
- <?php if($posts->have()): ?>
- <?php while($posts->next()): ?>
- <tr id="<?php $posts->theId(); ?>">
- <td><input type="checkbox" value="<?php $posts->cid(); ?>" name="cid[]"/></td>
- <td><a href="<?php $options->adminUrl('manage-comments.php?cid=' . $posts->cid); ?>" class="balloon-button size-<?php echo Typecho_Common::splitByCount($posts->commentsNum, 1, 10, 20, 50, 100); ?>"><?php $posts->commentsNum(); ?></a></td>
- <td<?php if ('draft' != $posts->status && 'waiting' != $posts->status && 'private' != $posts->status && !$posts->password): ?> colspan="2"<?php endif; ?>>
- <a href="<?php $options->adminUrl('write-post.php?cid=' . $posts->cid); ?>"><?php $posts->title(); ?></a>
- <?php if ('draft' == $posts->status || 'waiting' == $posts->status || 'private' == $posts->status || $posts->password): ?>
- </td>
- <td class="right">
- <span><?php 'draft' == $posts->status ? _e('草稿') : ('waiting' == $posts->status ? _e('待审核') : ('private' == $posts->status ? _e('私密') : _e(''))); ?> <?php $posts->password ? _e('密码') : _e(''); ?></span>
- <?php endif; ?></td>
- <td>
- <?php if ('publish' == $posts->status): ?>
- <a class="right hidden-by-mouse" href="<?php $posts->permalink(); ?>"><img src="<?php $options->adminUrl('images/link.png'); ?>" title="<?php _e('浏览 %s', htmlspecialchars($posts->title)); ?>" width="16" height="16" alt="view" /></a>
- <?php endif; ?>
- </td>
- <td><a href="<?php $options->adminUrl('manage-posts.php?uid=' . $posts->author->uid); ?>"><?php $posts->author(); ?></a></td>
- <td><?php $categories = $posts->categories; $length = count($categories); ?>
- <?php foreach ($categories as $key => $val): ?>
- <?php echo '<a href="';
- $options->adminUrl('manage-posts.php?category=' . $val['mid']
- . (isset($request->uid) ? '&uid=' . $request->uid : '')
- . (isset($request->status) ? '&status=' . $request->status : ''));
- echo '">' . $val['name'] . '</a>' . ($key < $length - 1 ? ', ' : ''); ?>
- <?php endforeach; ?>
- </td>
- <td>
- <?php if ($posts->hasSaved): ?>
- <span class="description">
- <?php $modifyDate = new Typecho_Date($posts->modified); ?>
- <?php _e('保存于 %s', $modifyDate->word()); ?>
- </span>
- <?php else: ?>
- <?php $posts->dateWord(); ?>
- <?php endif; ?>
- </td>
- </tr>
- <?php endwhile; ?>
- <?php else: ?>
- <tr class="even">
- <td colspan="8"><h6 class="typecho-list-table-title"><?php _e('没有任何文章'); ?></h6></td>
- </tr>
+ <form method="get">
+ <div class="operate">
+ <input type="checkbox" class="typecho-table-select-all" />
+ <div class="btn-group btn-drop">
+ <button class="dropdown-toggle" type="button" href="">选中项 <i class="icon-caret-down"></i></button>
+ <ul class="dropdown-menu">
+ <li><a lang="<?php _e('你确认要删除这些文章吗?'); ?>" href="<?php $options->index('/action/contents-post-edit?do=delete'); ?>"><?php _e('删除'); ?></a></li>
+ </ul>
+ </div>
+ </div>
+ <div class="search">
+ <?php if ('' != $request->keywords || '' != $request->category): ?>
+ <a href="<?php $options->adminUrl('manage-posts.php' . (isset($request->uid) ? '?uid=' . htmlspecialchars($request->get('uid')) : '')); ?>"><?php _e('« 取消筛选'); ?></a>
<?php endif; ?>
- </tbody>
- </table>
- </form>
-
- <?php if($posts->have()): ?>
- <div class="typecho-pager">
- <div class="typecho-pager-content">
- <ul>
- <?php $posts->pageNav(); ?>
- </ul>
+ <input type="text" class="text-s" placeholder="<?php _e('请输入关键字'); ?>" value="<?php echo htmlspecialchars($request->keywords); ?>" name="keywords" />
+ <select name="category">
+ <option value=""><?php _e('所有分类'); ?></option>
+ <?php Typecho_Widget::widget('Widget_Metas_Category_List')->to($category); ?>
+ <?php while($category->next()): ?>
+ <option value="<?php $category->mid(); ?>"<?php if($request->get('category') == $category->mid): ?> selected="true"<?php endif; ?>><?php $category->name(); ?></option>
+ <?php endwhile; ?>
+ </select>
+ <button type="submit"><?php _e('筛选'); ?></button>
+ <?php if(isset($request->uid)): ?>
+ <input type="hidden" value="<?php echo htmlspecialchars($request->get('uid')); ?>" name="uid" />
+ <?php endif; ?>
+ </div>
+ </form>
</div>
- </div>
- <?php endif; ?>
+
+ <div class="typecho-list-wrap">
+ <form method="post" name="manage_posts" class="operate-form">
+
+ <table class="typecho-list-table">
+ <colgroup>
+ <col width="20"/>
+ <col width="5%"/>
+ <col width="35%"/>
+ <col width=""/>
+ <col width="20"/>
+ <col width="10%"/>
+ <col width="15%"/>
+ <col width="18%"/>
+ </colgroup>
+ <thead>
+ <tr>
+ <th> </th>
+ <th> </th>
+ <th><?php _e('标题'); ?></th>
+ <th> </th>
+ <th> </th>
+ <th><?php _e('作者'); ?></th>
+ <th><?php _e('分类'); ?></th>
+ <th><?php _e('日期'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php Typecho_Widget::widget('Widget_Contents_Post_Admin')->to($posts); ?>
+ <?php if($posts->have()): ?>
+ <?php while($posts->next()): ?>
+ <tr id="<?php $posts->theId(); ?>">
+ <td><input type="checkbox" value="<?php $posts->cid(); ?>" name="cid[]"/></td>
+ <td><a href="<?php $options->adminUrl('manage-comments.php?cid=' . $posts->cid); ?>" class="balloon-button size-<?php echo Typecho_Common::splitByCount($posts->commentsNum, 1, 10, 20, 50, 100); ?>"><?php $posts->commentsNum(); ?></a></td>
+ <td<?php if ('draft' != $posts->status && 'waiting' != $posts->status && 'private' != $posts->status && !$posts->password): ?> colspan="2"<?php endif; ?>>
+ <a href="<?php $options->adminUrl('write-post.php?cid=' . $posts->cid); ?>"><?php $posts->title(); ?></a>
+ <?php if ('draft' == $posts->status || 'waiting' == $posts->status || 'private' == $posts->status || $posts->password): ?>
+ </td>
+ <td class="right">
+ <span><?php 'draft' == $posts->status ? _e('草稿') : ('waiting' == $posts->status ? _e('待审核') : ('private' == $posts->status ? _e('私密') : _e(''))); ?> <?php $posts->password ? _e('密码') : _e(''); ?></span>
+ <?php endif; ?></td>
+ <td>
+ <?php if ('publish' == $posts->status): ?>
+ <a class="right hidden-by-mouse" href="<?php $posts->permalink(); ?>"><img src="<?php $options->adminUrl('images/link.png'); ?>" title="<?php _e('浏览 %s', htmlspecialchars($posts->title)); ?>" width="16" height="16" alt="view" /></a>
+ <?php endif; ?>
+ </td>
+ <td><a href="<?php $options->adminUrl('manage-posts.php?uid=' . $posts->author->uid); ?>"><?php $posts->author(); ?></a></td>
+ <td><?php $categories = $posts->categories; $length = count($categories); ?>
+ <?php foreach ($categories as $key => $val): ?>
+ <?php echo '<a href="';
+ $options->adminUrl('manage-posts.php?category=' . $val['mid']
+ . (isset($request->uid) ? '&uid=' . $request->uid : '')
+ . (isset($request->status) ? '&status=' . $request->status : ''));
+ echo '">' . $val['name'] . '</a>' . ($key < $length - 1 ? ', ' : ''); ?>
+ <?php endforeach; ?>
+ </td>
+ <td>
+ <?php if ($posts->hasSaved): ?>
+ <span class="description">
+ <?php $modifyDate = new Typecho_Date($posts->modified); ?>
+ <?php _e('保存于 %s', $modifyDate->word()); ?>
+ </span>
+ <?php else: ?>
+ <?php $posts->dateWord(); ?>
+ <?php endif; ?>
+ </td>
+ </tr>
+ <?php endwhile; ?>
+ <?php else: ?>
+ <tr class="even">
+ <td colspan="8"><h6 class="typecho-list-table-title"><?php _e('没有任何文章'); ?></h6></td>
+ </tr>
+ <?php endif; ?>
+ </tbody>
+ </table>
+
+ <?php if($posts->have()): ?>
+ <div class="typecho-pager">
+ <div class="typecho-pager-content">
+ <ul>
+ <?php $posts->pageNav(); ?>
+ </ul>
+ </div>
+ </div>
+ <?php endif; ?>
+ </form>
+ </div><!-- end .typecho-list-wrap -->
+
+
</div>
</div>
diff --git a/admin/manage-users.php b/admin/manage-users.php
index 4ab0d484..8d341cb8 100644
--- a/admin/manage-users.php
+++ b/admin/manage-users.php
@@ -29,74 +29,76 @@ include 'menu.php';
</form>
</div>
- <form method="post" name="manage_users" class="operate-form">
- <table class="typecho-list-table">
- <colgroup>
- <col width="20"/>
- <col width="20%"/>
- <col width="20%"/>
- <col width="20"/>
- <col width="30%"/>
- <col width=""/>
- <col width="10%"/>
- </colgroup>
- <thead>
- <tr>
- <th> </th>
- <th><?php _e('用户名'); ?></th>
- <th><?php _e('昵称'); ?></th>
- <th> </th>
- <th><?php _e('电子邮件'); ?></th>
- <th><?php _e('用户组'); ?></th>
- <th><?php _e('文章'); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php Typecho_Widget::widget('Widget_Users_Admin')->to($users); ?>
- <?php while($users->next()): ?>
- <tr id="user-<?php $users->uid(); ?>">
- <td><input type="checkbox" value="<?php $users->uid(); ?>" name="uid[]"/></td>
- <td><a href="<?php $options->adminUrl('user.php?uid=' . $users->uid); ?>"><?php $users->name(); ?></a></td>
- <td><?php $users->screenName(); ?></td>
- <td>
- <a class="right hidden-by-mouse" href="<?php $users->permalink(); ?>"><img src="<?php $options->adminUrl('images/link.png'); ?>" title="<?php _e('浏览 %s', $users->screenName); ?>" width="16" height="16" alt="view" /></a>
- </td>
- <td><?php if($users->mail): ?><a href="mailto:<?php $users->mail(); ?>"><?php $users->mail(); ?></a><?php else: _e('暂无'); endif; ?></td>
- <td><?php switch ($users->group) {
- case 'administrator':
- _e('管理员');
- break;
- case 'editor':
- _e('编辑');
- break;
- case 'contributor':
- _e('贡献者');
- break;
- case 'subscriber':
- _e('关注者');
- break;
- case 'visitor':
- _e('访问者');
- break;
- default:
- break;
- } ?></td>
- <td><a href="<?php $options->adminUrl('manage-posts.php?uid=' . $users->uid); ?>" class="balloon-button left size-<?php echo Typecho_Common::splitByCount($users->postsNum, 1, 10, 20, 50, 100); ?>"><?php $users->postsNum(); ?></a></td>
- </tr>
- <?php endwhile; ?>
- </tbody>
- </table>
- </form>
+ <div class="typecho-list-wrap">
+ <form method="post" name="manage_users" class="operate-form">
+ <table class="typecho-list-table">
+ <colgroup>
+ <col width="20"/>
+ <col width="20%"/>
+ <col width="20%"/>
+ <col width="20"/>
+ <col width="30%"/>
+ <col width=""/>
+ <col width="10%"/>
+ </colgroup>
+ <thead>
+ <tr>
+ <th> </th>
+ <th><?php _e('用户名'); ?></th>
+ <th><?php _e('昵称'); ?></th>
+ <th> </th>
+ <th><?php _e('电子邮件'); ?></th>
+ <th><?php _e('用户组'); ?></th>
+ <th><?php _e('文章'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php Typecho_Widget::widget('Widget_Users_Admin')->to($users); ?>
+ <?php while($users->next()): ?>
+ <tr id="user-<?php $users->uid(); ?>">
+ <td><input type="checkbox" value="<?php $users->uid(); ?>" name="uid[]"/></td>
+ <td><a href="<?php $options->adminUrl('user.php?uid=' . $users->uid); ?>"><?php $users->name(); ?></a></td>
+ <td><?php $users->screenName(); ?></td>
+ <td>
+ <a class="right hidden-by-mouse" href="<?php $users->permalink(); ?>"><img src="<?php $options->adminUrl('images/link.png'); ?>" title="<?php _e('浏览 %s', $users->screenName); ?>" width="16" height="16" alt="view" /></a>
+ </td>
+ <td><?php if($users->mail): ?><a href="mailto:<?php $users->mail(); ?>"><?php $users->mail(); ?></a><?php else: _e('暂无'); endif; ?></td>
+ <td><?php switch ($users->group) {
+ case 'administrator':
+ _e('管理员');
+ break;
+ case 'editor':
+ _e('编辑');
+ break;
+ case 'contributor':
+ _e('贡献者');
+ break;
+ case 'subscriber':
+ _e('关注者');
+ break;
+ case 'visitor':
+ _e('访问者');
+ break;
+ default:
+ break;
+ } ?></td>
+ <td><a href="<?php $options->adminUrl('manage-posts.php?uid=' . $users->uid); ?>" class="balloon-button left size-<?php echo Typecho_Common::splitByCount($users->postsNum, 1, 10, 20, 50, 100); ?>"><?php $users->postsNum(); ?></a></td>
+ </tr>
+ <?php endwhile; ?>
+ </tbody>
+ </table>
+ </form>
- <?php if($users->have()): ?>
- <div class="typecho-pager">
- <div class="typecho-pager-content">
- <ul>
- <?php $users->pageNav(); ?>
- </ul>
- </div>
- </div>
- <?php endif; ?>
+ <?php if($users->have()): ?>
+ <div class="typecho-pager">
+ <div class="typecho-pager-content">
+ <ul>
+ <?php $users->pageNav(); ?>
+ </ul>
+ </div>
+ </div>
+ <?php endif; ?>
+ </div><!-- end .typecho-list-wrap -->
</div>
</div>
diff --git a/admin/plugins.php b/admin/plugins.php
index 9ea55ac3..068f9b6b 100644
--- a/admin/plugins.php
+++ b/admin/plugins.php
@@ -11,118 +11,122 @@ include 'menu.php';
<?php Typecho_Widget::widget('Widget_Plugins_List_Activated')->to($activatedPlugins); ?>
<?php if ($activatedPlugins->have()): ?>
<!--<h4 class="typecho-list-table-title"><?php _e('启用的插件'); ?></h4>-->
- <table class="typecho-list-table">
- <colgroup>
- <col width="25%"/>
- <col width="45%"/>
- <col width="8%"/>
- <col width="10%"/>
- <col width=""/>
- </colgroup>
- <thead>
- <tr>
- <th><?php _e('名称'); ?></th>
- <th><?php _e('描述'); ?></th>
- <th><?php _e('版本'); ?></th>
- <th><?php _e('作者'); ?></th>
- <th><?php _e('操作'); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php while ($activatedPlugins->next()): ?>
- <tr id="plugin-<?php $activatedPlugins->name(); ?>">
- <td><?php $activatedPlugins->title(); ?>
- <?php if (!$activatedPlugins->dependence): ?>
- <img src="<?php $options->adminUrl('images/notice.gif'); ?>" title="<?php _e('%s 无法在此版本的typecho下正常工作', $activatedPlugins->title); ?>" alt="<?php _e('%s 无法在此版本的typecho下正常工作', $activatedPlugins->title); ?>" class="tiny" />
- <?php endif; ?>
- </td>
- <td><?php $activatedPlugins->description(); ?></td>
- <td><?php $activatedPlugins->version(); ?></td>
- <td><?php echo empty($activatedPlugins->homepage) ? $activatedPlugins->author : '<a href="' . $activatedPlugins->homepage
- . '">' . $activatedPlugins->author . '</a>'; ?></td>
- <td>
- <?php if ($activatedPlugins->activate || $activatedPlugins->deactivate || $activatedPlugins->config || $activatedPlugins->personalConfig): ?>
- <?php if ($activatedPlugins->activated): ?>
- <?php if ($activatedPlugins->config): ?>
- <a href="<?php $options->adminUrl('options-plugin.php?config=' . $activatedPlugins->name); ?>"><?php _e('设置'); ?></a>
- •
- <?php endif; ?>
- <a lang="<?php _e('你确认要禁用插件 %s 吗?', $activatedPlugins->name); ?>" href="<?php $options->index('/action/plugins-edit?deactivate=' . $activatedPlugins->name); ?>"><?php _e('禁用'); ?></a>
- <?php else: ?>
- <a href="<?php $options->index('/action/plugins-edit?activate=' . $activatedPlugins->name); ?>"><?php _e('启用'); ?></a>
- <?php endif; ?>
- <?php else: ?>
- <span class="important"><?php _e('即插即用'); ?></span>
+ <div class="typecho-list-wrap">
+ <table class="typecho-list-table">
+ <colgroup>
+ <col width="25%"/>
+ <col width="45%"/>
+ <col width="8%"/>
+ <col width="10%"/>
+ <col width=""/>
+ </colgroup>
+ <thead>
+ <tr>
+ <th><?php _e('名称'); ?></th>
+ <th><?php _e('描述'); ?></th>
+ <th><?php _e('版本'); ?></th>
+ <th><?php _e('作者'); ?></th>
+ <th><?php _e('操作'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php while ($activatedPlugins->next()): ?>
+ <tr id="plugin-<?php $activatedPlugins->name(); ?>">
+ <td><?php $activatedPlugins->title(); ?>
+ <?php if (!$activatedPlugins->dependence): ?>
+ <img src="<?php $options->adminUrl('images/notice.gif'); ?>" title="<?php _e('%s 无法在此版本的typecho下正常工作', $activatedPlugins->title); ?>" alt="<?php _e('%s 无法在此版本的typecho下正常工作', $activatedPlugins->title); ?>" class="tiny" />
<?php endif; ?>
- </td>
- </tr>
- <?php endwhile; ?>
-
- <?php if (!empty($activatedPlugins->activatedPlugins)): ?>
- <?php foreach ($activatedPlugins->activatedPlugins as $key => $val): ?>
- <tr>
- <td><?php echo $key; ?></td>
- <td colspan="3"><span class="warning"><?php _e('此插件文件已经损坏或者被不安全移除, 强烈建议你禁用它'); ?></span></td>
- <td><a lang="<?php _e('你确认要禁用插件 %s 吗?', $key); ?>" href="<?php $options->index('/action/plugins-edit?deactivate=' . $key); ?>"><?php _e('禁用'); ?></a></td>
- </tr>
- <?php endforeach; ?>
- <?php endif; ?>
-
- </tbody>
- </table>
+ </td>
+ <td><?php $activatedPlugins->description(); ?></td>
+ <td><?php $activatedPlugins->version(); ?></td>
+ <td><?php echo empty($activatedPlugins->homepage) ? $activatedPlugins->author : '<a href="' . $activatedPlugins->homepage
+ . '">' . $activatedPlugins->author . '</a>'; ?></td>
+ <td>
+ <?php if ($activatedPlugins->activate || $activatedPlugins->deactivate || $activatedPlugins->config || $activatedPlugins->personalConfig): ?>
+ <?php if ($activatedPlugins->activated): ?>
+ <?php if ($activatedPlugins->config): ?>
+ <a href="<?php $options->adminUrl('options-plugin.php?config=' . $activatedPlugins->name); ?>"><?php _e('设置'); ?></a>
+ •
+ <?php endif; ?>
+ <a lang="<?php _e('你确认要禁用插件 %s 吗?', $activatedPlugins->name); ?>" href="<?php $options->index('/action/plugins-edit?deactivate=' . $activatedPlugins->name); ?>"><?php _e('禁用'); ?></a>
+ <?php else: ?>
+ <a href="<?php $options->index('/action/plugins-edit?activate=' . $activatedPlugins->name); ?>"><?php _e('启用'); ?></a>
+ <?php endif; ?>
+ <?php else: ?>
+ <span class="important"><?php _e('即插即用'); ?></span>
+ <?php endif; ?>
+ </td>
+ </tr>
+ <?php endwhile; ?>
+
+ <?php if (!empty($activatedPlugins->activatedPlugins)): ?>
+ <?php foreach ($activatedPlugins->activatedPlugins as $key => $val): ?>
+ <tr>
+ <td><?php echo $key; ?></td>
+ <td colspan="3"><span class="warning"><?php _e('此插件文件已经损坏或者被不安全移除, 强烈建议你禁用它'); ?></span></td>
+ <td><a lang="<?php _e('你确认要禁用插件 %s 吗?', $key); ?>" href="<?php $options->index('/action/plugins-edit?deactivate=' . $key); ?>"><?php _e('禁用'); ?></a></td>
+ </tr>
+ <?php endforeach; ?>
+ <?php endif; ?>
+
+ </tbody>
+ </table>
+ </div>
<?php endif; ?>
<?php Typecho_Widget::widget('Widget_Plugins_List_Deactivated')->to($deactivatedPlugins); ?>
<?php if ($deactivatedPlugins->have() || !$activatedPlugins->have()): ?>
<h4 class="typecho-list-table-title"><?php _e('禁用的插件'); ?></h4>
- <table class="typecho-list-table deactivate">
- <colgroup>
- <col width="25%"/>
- <col width="45%"/>
- <col width="8%"/>
- <col width="10%"/>
- <col width=""/>
- </colgroup>
- <thead>
- <tr>
- <th><?php _e('名称'); ?></th>
- <th><?php _e('描述'); ?></th>
- <th><?php _e('版本'); ?></th>
- <th><?php _e('作者'); ?></th>
- <th class="typecho-radius-topright"><?php _e('操作'); ?></th>
- </tr>
- </thead>
- <tbody>
- <?php if ($deactivatedPlugins->have()): ?>
- <?php while ($deactivatedPlugins->next()): ?>
- <tr id="plugin-<?php $deactivatedPlugins->name(); ?>">
- <td><?php $deactivatedPlugins->title(); ?></td>
- <td><?php $deactivatedPlugins->description(); ?></td>
- <td><?php $deactivatedPlugins->version(); ?></td>
- <td><?php echo empty($deactivatedPlugins->homepage) ? $deactivatedPlugins->author : '<a href="' . $deactivatedPlugins->homepage
- . '">' . $deactivatedPlugins->author . '</a>'; ?></td>
- <td>
- <?php if ($deactivatedPlugins->activate || $deactivatedPlugins->deactivate || $deactivatedPlugins->config || $deactivatedPlugins->personalConfig): ?>
- <?php if ($deactivatedPlugins->activated): ?>
- <?php if ($deactivatedPlugins->config): ?>
- <a href="<?php $options->adminUrl('options-plugin.php?config=' . $deactivatedPlugins->name); ?>"><?php _e('设置'); ?></a>
- |
+ <div class="typecho-list-wrap">
+ <table class="typecho-list-table deactivate">
+ <colgroup>
+ <col width="25%"/>
+ <col width="45%"/>
+ <col width="8%"/>
+ <col width="10%"/>
+ <col width=""/>
+ </colgroup>
+ <thead>
+ <tr>
+ <th><?php _e('名称'); ?></th>
+ <th><?php _e('描述'); ?></th>
+ <th><?php _e('版本'); ?></th>
+ <th><?php _e('作者'); ?></th>
+ <th class="typecho-radius-topright"><?php _e('操作'); ?></th>
+ </tr>
+ </thead>
+ <tbody>
+ <?php if ($deactivatedPlugins->have()): ?>
+ <?php while ($deactivatedPlugins->next()): ?>
+ <tr id="plugin-<?php $deactivatedPlugins->name(); ?>">
+ <td><?php $deactivatedPlugins->title(); ?></td>
+ <td><?php $deactivatedPlugins->description(); ?></td>
+ <td><?php $deactivatedPlugins->version(); ?></td>
+ <td><?php echo empty($deactivatedPlugins->homepage) ? $deactivatedPlugins->author : '<a href="' . $deactivatedPlugins->homepage
+ . '">' . $deactivatedPlugins->author . '</a>'; ?></td>
+ <td>
+ <?php if ($deactivatedPlugins->activate || $deactivatedPlugins->deactivate || $deactivatedPlugins->config || $deactivatedPlugins->personalConfig): ?>
+ <?php if ($deactivatedPlugins->activated): ?>
+ <?php if ($deactivatedPlugins->config): ?>
+ <a href="<?php $options->adminUrl('options-plugin.php?config=' . $deactivatedPlugins->name); ?>"><?php _e('设置'); ?></a>
+ |
+ <?php endif; ?>
+ <a href="<?php $options->index('/action/plugins-edit?deactivate=' . $deactivatedPlugins->name); ?>"><?php _e('禁用'); ?></a>
+ <?php else: ?>
+ <a href="<?php $options->index('/action/plugins-edit?activate=' . $deactivatedPlugins->name); ?>"><?php _e('启用'); ?></a>
<?php endif; ?>
- <a href="<?php $options->index('/action/plugins-edit?deactivate=' . $deactivatedPlugins->name); ?>"><?php _e('禁用'); ?></a>
- <?php else: ?>
- <a href="<?php $options->index('/action/plugins-edit?activate=' . $deactivatedPlugins->name); ?>"><?php _e('启用'); ?></a>
<?php endif; ?>
- <?php endif; ?>
- </td>
- </tr>
- <?php endwhile; ?>
- <?php else: ?>
- <tr class="even">
- <td colspan="5"><?php _e('没有安装插件'); ?></td>
- </tr>
- <?php endif; ?>
- </tbody>
- </table>
+ </td>
+ </tr>
+ <?php endwhile; ?>
+ <?php else: ?>
+ <tr class="even">
+ <td colspan="5"><?php _e('没有安装插件'); ?></td>
+ </tr>
+ <?php endif; ?>
+ </tbody>
+ </table>
+ </div>
<?php endif; ?>
</div>
diff --git a/admin/themes.php b/admin/themes.php
index f9454d53..e9aae956 100644
--- a/admin/themes.php
+++ b/admin/themes.php
@@ -16,41 +16,42 @@ include 'menu.php';
<li><a href="<?php $options->adminUrl('options-theme.php'); ?>"><?php _e('设置外观'); ?></a></li>
<?php endif; ?>
</ul>
-
- <table class="typecho-list-table typecho-theme-list" cellspacing="0" cellpadding="0">
- <colgroup>
- <col width="35%" />
- <col />
- </colgroup>
-
- <thead>
- <th>截图</th>
- <th>详情</th>
- </thead>
+ <div class="typecho-list-wrap">
+ <table class="typecho-list-table typecho-theme-list">
+ <colgroup>
+ <col width="35%" />
+ <col />
+ </colgroup>
+
+ <thead>
+ <th>截图</th>
+ <th>详情</th>
+ </thead>
- <tbody>
- <?php Typecho_Widget::widget('Widget_Themes_List')->to($themes); ?>
- <?php while($themes->next()): ?>
- <tr id="theme-<?php $themes->name(); ?>" class="<?php if($themes->activated): ?>current<?php endif; ?>">
- <td valign="top"><img src="<?php $themes->screen(); ?>" alt="<?php $themes->name(); ?>" /></td>
- <td valign="top">
- <h3><?php '' != $themes->title ? $themes->title() : $themes->name(); ?></h3>
- <cite>
- <?php if($themes->author): ?><?php _e('作者'); ?>: <?php if($themes->homepage): ?><a href="<?php $themes->homepage() ?>"><?php endif; ?><?php $themes->author(); ?><?php if($themes->homepage): ?></a><?php endif; ?> <?php endif; ?>
- <?php if($themes->version): ?><?php _e('版本'); ?>: <?php $themes->version() ?><?php endif; ?>
- </cite>
- <p><?php echo nl2br($themes->description); ?></p>
- <?php if($options->theme != $themes->name): ?>
- <p>
- <a class="edit" href="<?php $options->adminUrl('theme-editor.php?theme=' . $themes->name); ?>"><?php _e('编辑'); ?></a>
- <a class="activate" href="<?php $options->index('/action/themes-edit?change=' . $themes->name); ?>"><?php _e('启用'); ?></a>
- </p>
- <?php endif; ?>
- </td>
- </tr>
- <?php endwhile; ?>
- </tbody>
- </table>
+ <tbody>
+ <?php Typecho_Widget::widget('Widget_Themes_List')->to($themes); ?>
+ <?php while($themes->next()): ?>
+ <tr id="theme-<?php $themes->name(); ?>" class="<?php if($themes->activated): ?>current<?php endif; ?>">
+ <td valign="top"><img src="<?php $themes->screen(); ?>" alt="<?php $themes->name(); ?>" /></td>
+ <td valign="top">
+ <h3><?php '' != $themes->title ? $themes->title() : $themes->name(); ?></h3>
+ <cite>
+ <?php if($themes->author): ?><?php _e('作者'); ?>: <?php if($themes->homepage): ?><a href="<?php $themes->homepage() ?>"><?php endif; ?><?php $themes->author(); ?><?php if($themes->homepage): ?></a><?php endif; ?> <?php endif; ?>
+ <?php if($themes->version): ?><?php _e('版本'); ?>: <?php $themes->version() ?><?php endif; ?>
+ </cite>
+ <p><?php echo nl2br($themes->description); ?></p>
+ <?php if($options->theme != $themes->name): ?>
+ <p>
+ <a class="edit" href="<?php $options->adminUrl('theme-editor.php?theme=' . $themes->name); ?>"><?php _e('编辑'); ?></a>
+ <a class="activate" href="<?php $options->index('/action/themes-edit?change=' . $themes->name); ?>"><?php _e('启用'); ?></a>
+ </p>
+ <?php endif; ?>
+ </td>
+ </tr>
+ <?php endwhile; ?>
+ </tbody>
+ </table>
+ </div><!-- end .typecho-list-wrap -->
</div>
</div>
</div>