From ba94ea7b7f3fdf1d2c1e4b3dce0d0ca7a134fcf1 Mon Sep 17 00:00:00 2001
From: Li Heng <shayupi@qq.com>
Date: Thu, 26 Dec 2013 09:07:29 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=88=86=E7=AB=99=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E6=97=B6=E8=B7=B3=E8=BD=AC=E6=80=BB=E7=AB=99=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E3=80=82=20=E9=9C=80=E8=A6=81=E6=80=BB=E7=AB=99?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8C=89=E7=99=BB=E5=BD=95=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=88=86=E7=AB=99URL=E6=B3=A8=E5=86=8C?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E5=90=8E=E8=BD=AC=E5=9B=9E=E5=88=86=E7=AB=99?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=9A=84=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/views/scripts/account/login.phtml | 27 ++++++++++++++++---
 .../default/views/scripts/header.phtml        |  3 ++-
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/application/default/views/scripts/account/login.phtml b/application/default/views/scripts/account/login.phtml
index 94aa5599..2d8e590a 100755
--- a/application/default/views/scripts/account/login.phtml
+++ b/application/default/views/scripts/account/login.phtml
@@ -39,16 +39,20 @@
         </div>
     </div>
     <div class="control-group">
-        <label class="control-label" for="password">密码</label>
+        <label class="control-label" for="password">密&nbsp;&nbsp;&nbsp;码</label>
         <div class="controls">
             <input id="password" type="password" value="" name="password" />
         </div>
+        
     </div>
 
     <div class="control-group">
-
-
-    </div>
+        <label class="control-label" for="captcha">验证码</label>
+        <div class="controls">
+            <input id="captcha" type="text" value="" name="captcha" />
+            <img id="captcha_img" src="<?php echo $this->captcha ?>" style="cursor:pointer"  />
+            <a href="javascript:void(0);" onclick="changecaptcha()">看不清？</a>
+        </div>
     <div class="control-group">
         <div class="controls">
             <input type="hidden" name="submit" value="1" />
@@ -62,3 +66,18 @@
     </div>
 </form>
 </div>
+
+<script>
+$('#captcha_img').click(function(e) {
+    changecaptcha();
+});
+function changecaptcha(){
+	$.ajax({
+		url:"/account/captcha",
+		data:"<?= time() ?>",
+		success: function(src){
+			document.getElementById('captcha_img').src = src;
+		}
+	});
+}
+</script>
diff --git a/application/default/views/scripts/header.phtml b/application/default/views/scripts/header.phtml
index d69d3b5a..c926f63a 100755
--- a/application/default/views/scripts/header.phtml
+++ b/application/default/views/scripts/header.phtml
@@ -38,7 +38,8 @@
                             if ($user->usertype=="administrator") echo '<a href="/admin"><i class="icon-cog"></i>后台</a> ';
                             echo '<a href="/data/order"><i class="icon-shopping-cart"></i>数据篮</a> <a href="/account/logout">注销</a>'; 
                  } else { 
-                      echo '<a href="/account/login"><i class="icon-user"></i>登录</a> <a href="/account/register">注册</a>';
+#	 			 	echo $_SERVER['SERVER_NAME'] ;
+                      echo '<a href="/account/login"><i class="icon-user"></i>登录</a> <a href="http://www.sanjiangyuan.org.cn/account/register/">注册</a>';
                  } ?>
                 </p>
                 </div>