From 0e86a91c9d1153bb7872531d0ea04c14df217496 Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Sat, 12 Oct 2013 21:32:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/css/style.css | 11 +++++++++--
 admin/media.php     |  4 ++--
 admin/profile.php   | 40 ++++++++++++++++++++++++----------------
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/admin/css/style.css b/admin/css/style.css
index 01d18e9e..4941e199 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -332,6 +332,10 @@ button.primary:active, button.primary.active {
     margin-bottom: .5em;
     font-weight: bold;
 }
+.typecho-option label.required:after {
+    content: " *";
+    color: #B94A48;
+}
 .typecho-option label.typecho-label+input {
 }
 
@@ -808,6 +812,9 @@ margin-top: 25px;
 .typecho-page-title {
     margin-top: 1em;
 }
+.typecho-page-title h2 {
+    font-size: 1.28571em;
+}
 
 
 /**
@@ -1002,7 +1009,7 @@ margin-top: 25px;
 }
 
 .typecho-list-operate span.operate-delete, a.operate-delete {
-    color: #CC0000;
+    color: #B94A48;
 }
 
 a.operate-edit {
@@ -1014,7 +1021,7 @@ a.operate-reply {
 }
 
 .typecho-list-operate span.operate-button-delete, a.operate-button-delete {
-    background: #CC0000;
+    background: #B94A48;
 }
 
 .typecho-list-operate a:hover {
diff --git a/admin/media.php b/admin/media.php
index def86f93..5d3c0a56 100644
--- a/admin/media.php
+++ b/admin/media.php
@@ -10,7 +10,7 @@ Typecho_Widget::widget('Widget_Contents_Attachment_Edit')->to($attachment);
     <div class="body container">
         <?php include 'page-title.php'; ?>
         <div class="col-group typecho-page-main">
-            <div class="col-mb-8">
+            <div class="col-mb-12 col-tb-8">
                 <div class="typecho-attachment-photo-box">
                     <?php if ($attachment->attachment->isImage): ?>
                     <img src="<?php $attachment->attachment->url(); ?>" alt="<?php $attachment->attachment->name(); ?>" />
@@ -27,7 +27,7 @@ Typecho_Widget::widget('Widget_Contents_Attachment_Edit')->to($attachment);
                     </div>
                 </div>
             </div>
-            <div class="col-mb-4 typecho-mini-panel typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
+            <div class="col-mb-12 col-tb-4 typecho-mini-panel typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
                 <?php $attachment->form()->render(); ?>
             </div>
         </div>
diff --git a/admin/profile.php b/admin/profile.php
index 58077872..e9fdee49 100644
--- a/admin/profile.php
+++ b/admin/profile.php
@@ -10,12 +10,30 @@ $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-7 typecho-content-panel">
-                <h4>
-                <?php echo '<img class="avatar" src="http://www.gravatar.com/avatar/' . md5($user->mail) . '?s=50&r=X' .
-                '&d=" alt="' . $user->screenName . '" width="50" height="50" />'; ?>
-                <?php $user->name(); ?><cite>(<?php $user->screenName(); ?>)</cite>
-                </h4>
+            <div class="col-mb-12 col-tb-9 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">
+                <?php echo '<img class="avatar" src="http://www.gravatar.com/avatar/' . md5($user->mail) . '?s=128&r=X' .
+                '&d=" alt="' . $user->screenName . '" />'; ?>
+                <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>
                 <p><?php
@@ -23,16 +41,6 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                     _e('最后登录: %s', Typecho_I18n::dateWord($user->logged  + $options->timezone, $options->gmtTime + $options->timezone));
                 }
                 ?></p>
-                <?php if($user->pass('contributor', true)): ?>
-                <h3 id="writing-option"><?php _e('撰写设置'); ?></h3>
-                <?php Typecho_Widget::widget('Widget_Users_Profile')->optionsForm()->render(); ?>
-                <?php endif; ?>
-                <?php Typecho_Widget::widget('Widget_Users_Profile')->personalFormList(); ?>
-                <h3 id="change-password"><?php _e('设置密码'); ?></h3>
-                <?php Typecho_Widget::widget('Widget_Users_Profile')->passwordForm()->render(); ?>
-            </div>
-            <div class="col-mb-12 col-tb-5 typecho-mini-panel typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
-                <?php Typecho_Widget::widget('Widget_Users_Profile')->profileForm()->render(); ?>
             </div>
         </div>
     </div>