From c58ef2b6b71c2d7127dcb19cb53db37549edbbb0 Mon Sep 17 00:00:00 2001
From: fen <fen1211@gmail.com>
Date: Wed, 16 Oct 2013 15:22:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=99=BB=E5=BD=95=E3=80=81?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/css/style.css |  68 ++++++---------------------
 admin/login.php     |  84 ++++++++++++++++-----------------
 admin/register.php  | 110 +++++++++++++++++++++-----------------------
 3 files changed, 107 insertions(+), 155 deletions(-)

diff --git a/admin/css/style.css b/admin/css/style.css
index 534623d0..83e04f7a 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -142,6 +142,10 @@ textarea {
 input[type="radio"], input[type="checkbox"] { margin-right: 3px; }
 
 input.text-s { padding: 5px; }
+input.text-l {
+    padding: 10px;
+    font-size: 1.14286em;
+}
 
 .w-10 { width: 10%; }
 .w-20 { width: 20%; }
@@ -177,9 +181,8 @@ button {
     background-image: linear-gradient(#fcfcfc, #eeeeee); 
 }
 
-.btn-s {
-    height: 28px;
-}
+.btn-s { height: 28px; }
+.btn-l { height: 40px; font-size: 1.14286em; font-weight: bold; }
 
 button.primary {
     border-color: #8ABAD7;
@@ -614,61 +617,18 @@ margin-top: 25px;
  * 登录框
  */
 .typecho-login {
-    position: relative;
-    margin: 15% auto;
-}
-
-.typecho-login form {
-    background: #e5ead1;
-    margin: 0 10px;
-    padding: 25px 20px;
-    font-size: 13px;
-}
-
-.typecho-login legend {
-    display: none;
-}
-
-.typecho-login label {
-}
-
-.typecho-login input.text {
-}
-
-.typecho-login form p {
-    margin-bottom:15px;
-}
-
-.typecho-login form p.submit {
-    margin: 5px 0px 0px 0px;
-    position: relative;
-}
-
-.typecho-login form p.submit button {
-    position: absolute;
-    right: 0px;
-	top: 0px;
+    margin: 150px auto 0;
+    width: 280px;
+    height: 100%;
+    text-align: center;
 }
 
 .typecho-login .more-link {
-    font-size: 13px;
-    margin: 10px auto;
-    padding: 0 10px;
-    clear: both;
-    overflow: hidden;
+    margin-top: 2em;
+    color: #CCC;
 }
+.typecho-login .more-link a { margin: 0 3px; }
 
-.typecho-login .more-link .back-to-site {
-    float: left;
-	width: 120px;
-	text-align: left;
-}
-
-.typecho-login .more-link .forgot-password {
-    float: right;
-	width: 120px;
-	text-align: right;
-}
 
 
 /**
@@ -811,7 +771,7 @@ margin-top: 25px;
 }
 
 .typecho-foot .resource a {
-    margin: 0 2px;
+    margin: 0 3px;
     color: #999;
 }
 
diff --git a/admin/login.php b/admin/login.php
index bed95f62..893b6846 100644
--- a/admin/login.php
+++ b/admin/login.php
@@ -5,51 +5,47 @@ include 'header.php';
 $rememberName = Typecho_Cookie::get('__typecho_remember_name');
 Typecho_Cookie::delete('__typecho_remember_name');
 ?>
-<div class="body container">
-    <div class="col-group">
-        <div class="col-3 start-09 typecho-login">
-            <h2 class="logo-dark">typecho</h2>
-            <form action="<?php $options->loginAction(); ?>" method="post" name="login">
-                <fieldset>
-                    <?php if(!$user->hasLogin()): ?>
-                    <?php if($notice->have() && in_array($notice->noticeType, array('success', 'notice', 'error'))): ?>
-                    <div class="message <?php $notice->noticeType(); ?> typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
-                    <ul>
-                        <?php $notice->lists(); ?>
-                    </ul>
-                    </div>
-                    <?php endif; ?>
-                    <p><label for="name"><?php _e('用户名'); ?>:</label> <input type="text" id="name" name="name" value="<?php echo $rememberName; ?>" class="text" /></p>
-                    <p><label for="password"><?php _e('密码'); ?>:</label> <input type="password" id="password" name="password" class="text" /></p>
-                    <p class="submit">
-                    <label for="remember"><input type="checkbox" name="remember" class="checkbox" value="1" id="remember" /> <?php _e('记住我'); ?></label>
-                    <button type="submit"><?php _e('登录'); ?></button>
-                    <input type="hidden" name="referer" value="<?php echo htmlspecialchars($request->get('referer')); ?>" />
-                    </p>
-                    <?php else: ?>
-                    <div class="message notice typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
-                        <ul>
-                            <li><?php _e('您已经登录到%s', $options->title); ?></li>
-                        </ul>
-                    </div>
-                    <?php endif; ?>
-                </fieldset>
-            </form>
-            
-            <div class="more-link">
-                <p class="back-to-site">
-                <a href="<?php $options->siteUrl(); ?>" class="important"><?php _e('&laquo; 返回%s', $options->title); ?></a>
-                </p>
-                <p class="forgot-password">
-                <?php if($user->hasLogin()): ?>
-                <a href="<?php $options->adminUrl(); ?>"><?php _e('进入后台 &raquo;'); ?></a>
-                <?php elseif($options->allowRegister): ?>
-                <a href="<?php $options->registerUrl(); ?>"><?php _e('注册 &raquo;'); ?></a>
-                <?php endif; ?>
-                </p>
-            </div>
-        </div>
+
+<?php if(!$user->hasLogin()): ?>
+    <?php if($notice->have() && in_array($notice->noticeType, array('success', 'notice', 'error'))): ?>
+    <div class="message <?php $notice->noticeType(); ?> popup">
+        <ul>
+            <?php $notice->lists(); ?>
+        </ul>
     </div>
+    <?php endif; ?>
+<?php else: ?>
+    <div class="message notice popup">
+        <ul>
+            <li><?php _e('您已经登录到%s', $options->title); ?></li>
+        </ul>
+    </div>
+<?php endif; ?>
+
+<div class="typecho-login">
+    <h1>Typecho</h1>
+    <form action="<?php $options->loginAction(); ?>" method="post" name="login">
+        <p><input type="text" id="name" name="name" value="<?php echo $rememberName; ?>" placeholder="<?php _e('用户名'); ?>" class="text-l w-100" required /></p>
+        <p><input type="password" id="password" name="password" class="text-l w-100" placeholder="<?php _e('密码'); ?>" required /></p>
+        <p class="submit">
+            <!-- <label for="remember"><input type="checkbox" name="remember" class="checkbox" value="1" id="remember" /> <?php _e('记住我'); ?></label> -->
+            <button type="submit" class="btn-l w-100"><?php _e('登录'); ?></button>
+            <input type="hidden" name="referer" value="<?php echo htmlspecialchars($request->get('referer')); ?>" />
+        </p>
+    </form>
+    
+    <p class="more-link">
+        <a href="<?php $options->siteUrl(); ?>"><?php _e('返回首页'); ?></a>
+        <?php if($user->hasLogin()): ?>
+        <!-- &bull;
+        <a href=""><?php _e('忘记密码'); ?></a> -->
+        &bull;
+        <a href="<?php $options->adminUrl(); ?>"><?php _e('后台管理'); ?></a>
+        <?php elseif($options->allowRegister): ?>
+        &bull;
+        <a href="<?php $options->registerUrl(); ?>"><?php _e('用户注册'); ?></a>
+        <?php endif; ?>
+    </p>
 </div>
 <script type="text/javascript">
 (function () {
diff --git a/admin/register.php b/admin/register.php
index 92c45228..cf36c402 100644
--- a/admin/register.php
+++ b/admin/register.php
@@ -7,64 +7,60 @@ $rememberMail = Typecho_Cookie::get('__typecho_remember_mail');
 Typecho_Cookie::delete('__typecho_remember_name');
 Typecho_Cookie::delete('__typecho_remember_mail');
 ?>
-<div class="body container">
-    <div class="col-group">
-        <div class="col-3 start-09 typecho-login">
-            <h2 class="logo-dark">typecho</h2>
-            <form action="<?php $options->registerAction(); ?>" method="post" name="register">
-                <fieldset>
-                    <?php if(!$user->hasLogin() && $options->allowRegister): ?>
-                    <?php if($notice->have() && in_array($notice->noticeType, array('success', 'notice', 'error'))): ?>
-                    <div class="message <?php $notice->noticeType(); ?> typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
-                    <ul>
-                        <?php $notice->lists(); ?>
-                    </ul>
-                    </div>
-                    <?php endif; ?>
-                    <p><label for="name"><?php _e('用户名'); ?>:</label> <input type="text" id="name" name="name" value="<?php echo $rememberName; ?>" class="text" /></p>
-                    <p><label for="mail"><?php _e('电子邮件'); ?>:</label> <input type="text" id="mail" name="mail" value="<?php echo $rememberMail; ?>" class="text" /></p>
-                    <p class="submit">
-                    <label for="remember"><input type="checkbox" name="remember" class="checkbox" value="1" id="remember" /> <?php _e('记住我'); ?></label>
-                    <button type="submit"><?php _e('注册'); ?></button>
-                    </p>
-                    <?php elseif (!$options->allowRegister): ?>
-                    <div class="message error typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
-                        <ul>
-                            <li><?php _e('网站注册已关闭'); ?></li>
-                        </ul>
-                    </div>
-                    <?php else: ?>
-                    <?php if($notice->have() && in_array($notice->noticeType, array('success', 'notice', 'error'))): ?>
-                    <div class="message <?php $notice->noticeType(); ?> typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
-                    <ul>
-                        <?php $notice->lists(); ?>
-                    </ul>
-                    </div>
-                    <?php else: ?>
-                    <div class="message notice typecho-radius-topleft typecho-radius-topright typecho-radius-bottomleft typecho-radius-bottomright">
-                        <ul>
-                            <li><?php _e('您已经登录到%s', $options->title); ?></li>
-                        </ul>
-                    </div>
-                    <?php endif; ?>
-                    <?php endif; ?>
-                </fieldset>
-            </form>
-            
-            <div class="more-link">
-                <p class="back-to-site">
-                <a href="<?php $options->siteUrl(); ?>" class="important"><?php _e('&laquo; 返回%s', $options->title); ?></a>
-                </p>
-                <p class="forgot-password">
-                <?php if($user->hasLogin()): ?>
-                <a href="<?php $options->adminUrl(); ?>"><?php _e('进入后台 &raquo;'); ?></a>
-                <?php else: ?>
-                <a href="<?php $options->adminUrl('login.php'); ?>"><?php _e('登录 &raquo;'); ?></a>
-                <?php endif; ?>
-                </p>
-            </div>
-        </div>
+
+<?php if(!$user->hasLogin() && $options->allowRegister): ?>
+    <?php if($notice->have() && in_array($notice->noticeType, array('success', 'notice', 'error'))): ?>
+    <div class="message <?php $notice->noticeType(); ?> popup">
+        <ul>
+            <?php $notice->lists(); ?>
+        </ul>
     </div>
+    <?php endif; ?>
+<?php elseif (!$options->allowRegister): ?>
+    <div class="message error popup">
+        <ul>
+            <li><?php _e('网站注册已关闭'); ?></li>
+        </ul>
+    </div>
+<?php else: ?>
+    <?php if($notice->have() && in_array($notice->noticeType, array('success', 'notice', 'error'))): ?>
+    <div class="message <?php $notice->noticeType(); ?> popup">
+    <ul>
+        <?php $notice->lists(); ?>
+    </ul>
+    </div>
+    <?php else: ?>
+    <div class="message notice popup">
+        <ul>
+            <li><?php _e('您已经登录到 %s', $options->title); ?></li>
+        </ul>
+    </div>
+    <?php endif; ?>
+<?php endif; ?>
+
+<div class="typecho-login">
+    <h1>Typecho</h2>
+    <form action="<?php $options->registerAction(); ?>" method="post" name="register">
+        <p><input type="text" id="name" name="name" placeholder="<?php _e('用户名'); ?>" value="<?php echo $rememberName; ?>" class="text-l w-100" /></p>
+        <p><input type="email" id="mail" name="mail" placeholder="<?php _e('电子邮件'); ?>" value="<?php echo $rememberMail; ?>" class="text-l w-100" /></p>
+        <p class="submit">
+        <!-- <label for="remember"><input type="checkbox" name="remember" class="checkbox" value="1" id="remember" /> <?php _e('记住我'); ?></label> -->
+            <button type="submit" class="btn-l w-100"><?php _e('注册'); ?></button>
+        </p>
+    </form>
+    
+    <p class="more-link">
+        <a href="<?php $options->siteUrl(); ?>"><?php _e('返回首页'); ?></a>
+        <!-- &bull;
+        <a href=""><?php _e('忘记密码'); ?></a> -->
+        <?php if($user->hasLogin()): ?>
+        &bull;
+        <a href="<?php $options->adminUrl(); ?>"><?php _e('后台管理'); ?></a>
+        <?php else: ?>
+        &bull;
+        <a href="<?php $options->adminUrl('login.php'); ?>"><?php _e('用户登录'); ?></a>
+        <?php endif; ?>
+    </p>
 </div>
 <script type="text/javascript">
 (function () {