mirror_php/typecho
1
0
Fork 0
mirror of https://github.com/typecho/typecho.git synced 2025-03-20 01:49:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/typecho/typecho-replica

Browse Source
This commit is contained in:
joyqi 2013-10-15 16:56:28 +08:00
commit 563ccf9edf
9 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
admin/css/style.css
View File

@ -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 {
@ -2027,6 +2026,7 @@ ul.typecho-list-notable li .loading {
*/
#ui-datepicker-div {
display: none;
margin-top: -1px;
padding: 10px;
border: 1px solid #D9D9D6;
background: #FFF;

8
admin/manage-posts.php
View File

@ -44,12 +44,12 @@ $stat = Typecho_Widget::widget('Widget_Stat');
<form method="post" name="manage_posts" class="operate-form">
<table class="typecho-list-table">
<colgroup>
<col width="3%"/>
<col width="20"/>
<col width="5%"/>
<col width="47%"/>
<col width=""/>
<col width="10%"/>
<col width="20%"/>
<col width="15%"/>
<col width="18%"/>
<col width="18%"/>
</colgroup>
<thead>
<tr>

49
admin/profile.php
View File

@ -10,29 +10,9 @@ $stat = Typecho_Widget::widget('Widget_Stat');
<div class="body container">
<?php include 'page-title.php'; ?>
<div class="col-group typecho-page-main">
<div class="col-mb-12 col-tb-8 typecho-content-panel">
<fieldset>
<legend><?php _e('个人资料'); ?></legend>
<?php Typecho_Widget::widget('Widget_Users_Profile')->profileForm()->render(); ?>
</fieldset>
<?php if($user->pass('contributor', true)): ?>
<fieldset id="writing-option">
<legend><?php _e('撰写设置'); ?></legend>
<?php Typecho_Widget::widget('Widget_Users_Profile')->optionsForm()->render(); ?>
</fieldset>
<?php endif; ?>
<fieldset id="change-password">
<legend><?php _e('密码修改'); ?></legend>
<?php Typecho_Widget::widget('Widget_Users_Profile')->personalFormList(); ?>
<?php Typecho_Widget::widget('Widget_Users_Profile')->passwordForm()->render(); ?>
</fieldset>
</div>
<div class="col-tb-3 col-tb-offset-1">
<?php echo '<img class="avatar" src="http://www.gravatar.com/avatar/' . md5($user->mail) . '?s=128&r=X' .
'&d=" alt="' . $user->screenName . '" />'; ?>
<div class="col-mb-12 col-tb-3">
<p><?php echo '<img class="avatar" src="http://www.gravatar.com/avatar/' . md5($user->mail) . '?s=128&r=X' .
'&d=" alt="' . $user->screenName . '" />'; ?></p>
<h2><?php $user->screenName(); ?><br><small><?php $user->name(); ?></small></h2>
<p><?php _e('目前有 <em>%s</em> 篇 Blog,并有 <em>%s</em> 条关于你的评论在已设定的 <em>%s</em> 个分类中.',
$stat->myPublishedPostsNum, $stat->myPublishedCommentsNum, $stat->categoriesNum); ?></p>
@ -42,6 +22,29 @@ $stat = Typecho_Widget::widget('Widget_Stat');
}
?></p>
</div>
<div class="col-mb-12 col-tb-7 col-tb-offset-1 typecho-content-panel">
<section>
<h3><?php _e('个人资料'); ?></h3>
<?php Typecho_Widget::widget('Widget_Users_Profile')->profileForm()->render(); ?>
</section>
<?php if($user->pass('contributor', true)): ?>
<br>
<section id="writing-option">
<h3><?php _e('撰写设置'); ?></h3>
<?php Typecho_Widget::widget('Widget_Users_Profile')->optionsForm()->render(); ?>
</section>
<?php endif; ?>
<br>
<section id="change-password">
<h3><?php _e('密码修改'); ?></h3>
<?php Typecho_Widget::widget('Widget_Users_Profile')->personalFormList(); ?>
<?php Typecho_Widget::widget('Widget_Users_Profile')->passwordForm()->render(); ?>
</section>
</div>
</div>
</div>
</div>

2
admin/write-js.php
View File

@ -19,7 +19,7 @@ $(document).ready(function() {
'<?php _e('周四'); ?>', '<?php _e('周五'); ?>', '<?php _e('周六'); ?>'],
dayNamesMin : ['<?php _e('日'); ?>', '<?php _e('一'); ?>', '<?php _e('二'); ?>', '<?php _e('三'); ?>',
'<?php _e('四'); ?>', '<?php _e('五'); ?>', '<?php _e('六'); ?>'],
closeText : '<?php _e('关闭'); ?>',
closeText : '<?php _e('完成'); ?>',
timeOnlyTitle : '<?php _e('选择时间'); ?>',
timeText : '<?php _e('时间'); ?>',
hourText : '<?php _e('时'); ?>',

3
admin/write-post.php
View File

@ -12,9 +12,10 @@ Typecho_Widget::widget('Widget_Contents_Post_Edit')->to($post);
<div class="col-mb-12 col-tb-9">
<?php if ($post->draft && $post->draft['cid'] != $post->cid): ?>
<?php $postModifyDate = new Typecho_Date($post->draft['modified']); ?>
<cite><?php _e('当前正在编辑的是保存于%s的草稿, 你可以<a href="%s">删除它</a>', $postModifyDate->word(),
<cite class="edit-draft-notice"><?php _e('你正在编辑的是保存于 %s 的草稿, 你也可以 <a href="%s">删除它</a>', $postModifyDate->word(),
Typecho_Common::url('/action/contents-post-edit?do=deleteDraft&cid=' . $post->cid, $options->index)); ?></cite>
<?php endif; ?>
<p class="title"><input type="text" id="title" name="title" value="<?php echo htmlspecialchars($post->title); ?>" placeholder="<?php _e('标题'); ?>" class="w-100 text title" /></p>
<?php $permalink = Typecho_Common::url($options->routingTable['post']['url'], $options->index);
list ($scheme, $permalink) = explode(':', $permalink, 2);

2
var/Widget/Options/Discussion.php
View File

@ -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('这是一个默认的格式,当你在模板中调用显示评论日期方法时, 如果没有指定日期格式, 将按照此格式输出.<br />
具体写法请参考<a href="http://cn.php.net/manual/zh/function.date.php">PHP日期格式写法</a>.'));
具体写法请参考<a href="http://www.php.net/manual/zh/function.date.php">PHP日期格式写法</a>.'));
$form->addInput($commentDateFormat);
/** 评论列表数目 */

2
var/Widget/Options/Reading.php
View File

@ -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('此格式用于指定显示在文章归档中的日期默认显示格式.<br />
在某些主题中这个格式可能不会生效, 因为主题作者可以自定义日期格式.<br />
请参考<a href="http://cn.php.net/manual/zh/function.date.php">PHP日期格式写法</a>.'));
请参考<a href="http://www.php.net/manual/zh/function.date.php">PHP日期格式写法</a>.'));
$form->addInput($postDateFormat);
//首页显示

8
var/Widget/Users/Edit.php
View File

@ -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('此用户名将作为用户登录时所用的名称.<br />
$name = new Typecho_Widget_Helper_Form_Element_Text('name', NULL, NULL, _t('用户名 *'), _t('此用户名将作为用户登录时所用的名称.<br />
请不要与系统中现有的用户名重复.'));
$form->addInput($name);
/** 电子邮箱地址 */
$mail = new Typecho_Widget_Helper_Form_Element_Text('mail', NULL, NULL, _t('电子邮箱地址*'), _t('电子邮箱地址将作为此用户的主要联系方式.<br />
$mail = new Typecho_Widget_Helper_Form_Element_Text('mail', NULL, NULL, _t('电子邮箱地址 *'), _t('电子邮箱地址将作为此用户的主要联系方式.<br />
请不要与系统中现有的电子邮箱地址重复.'));
$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('必须填写密码'));
}

2
var/Widget/Users/Profile.php
View File

@ -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('电子邮箱地址将作为此用户的主要联系方式.<br />
$mail = new Typecho_Widget_Helper_Form_Element_Text('mail', NULL, NULL, _t('电子邮箱地址 *'), _t('电子邮箱地址将作为此用户的主要联系方式.<br />
请不要与系统中现有的电子邮箱地址重复.'));
$form->addInput($mail);