From a0683d4900b9c2118df962a825f33ca9c3fcf287 Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Tue, 27 Oct 2015 15:17:40 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E5=85=A5=E8=AF=BE=E7=A8=8B?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E8=BE=93=E5=85=A5=E6=A1=86=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=AF=B9=E9=BD=90=20=E5=8D=9A=E5=AE=A2=E5=85=B3=E6=B3=A8?=
 =?UTF-8?q?=E7=B2=89=E4=B8=9D=E6=96=87=E5=AD=97=E4=B9=9F=E8=A6=81=E5=8A=A0?=
 =?UTF-8?q?=E8=B6=85=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_join_private_course.html.erb |  4 ++--
 app/views/layouts/new_base_user.html.erb        | 15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb
index 5748d981e..d37feeb57 100644
--- a/app/views/courses/_join_private_course.html.erb
+++ b/app/views/courses/_join_private_course.html.erb
@@ -62,13 +62,13 @@
             <li>
               <input type="text" style="display: none"/> <!--阻止表单自动填充 -->
               <input type="password" style="display: none"/> <!--阻止表单自动填充 -->
-              <span class="tips" style="width: 72px; display: inline-block;">课&nbsp;程&nbsp;ID：</span>
+              <span class="tips" style="width: 68px; display: inline-block;">课&nbsp;程&nbsp;ID：</span>
               <input class=" width190" name="object_id" id="object_id" type="text" value="" >
               <input type="text" style="display: none"/>
             </li>
             <li class="mB5">课程ID是所在课程网址中显示的序号</li>
             <li>
-              <span class="tips">密&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;码：</span>
+              <span class="tips" style="width: 68px; display: inline-block;">密&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;码：</span>
               <input class=" width190" type="password" name="course_password" id="course_password" value="" >
             </li>
             <li style="margin-top: 30px;">
diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb
index f5a8c2169..7b951f152 100644
--- a/app/views/layouts/new_base_user.html.erb
+++ b/app/views/layouts/new_base_user.html.erb
@@ -76,21 +76,30 @@
               <%= link_to(@user.blog.blog_comments.where("#{BlogComment.table_name}.parent_id is null").count,
                           {:controller => 'blogs', :action => 'index', :user_id => @user.id }, :class => 'homepageImageNumber',:id => 'user_score') %>
             </div>
-            <div class="homepageImageText">博客</div>
+            <div class="homepageImageText">
+
+              <%= link_to('博客',
+                          {:controller => 'blogs', :action => 'index', :user_id => @user.id }, :class => 'homepageImageNumber',:id => 'user_score') %>
+            </div>
           </div>
           <div class="homepageVerDiv"></div>
           <div class="homepageImageBlock">
             <div id="watch_user_number_div">
               <%= link_to User.watched_by(@user.id).count.to_s, {:controller=>"users", :action=>"user_watchlist",:id=>@user.id},:class=>"homepageImageNumber" %>
             </div>
-            <div class="homepageImageText">关注</div>
+            <div class="homepageImageText">
+              <%= link_to '关注', {:controller=>"users", :action=>"user_watchlist",:id=>@user.id},:class=>"homepageImageNumber" %>
+            </div>
           </div>
           <div class="homepageVerDiv"></div>
           <div class="homepageImageBlock">
             <div id="fans_user_number_div">
               <%= link_to @user.watcher_users.count.to_s, {:controller=>"users", :action=>"user_fanslist",:id=>@user.id},:class=>"homepageImageNumber", :id => "user_fans_number"%>
             </div>
-            <div class="homepageImageText">粉丝</div>
+            <div class="homepageImageText">
+
+              <%= link_to '粉丝', {:controller=>"users", :action=>"user_fanslist",:id=>@user.id},:class=>"homepageImageNumber", :id => "user_fans_number"%>
+            </div>
           </div>
 
 

From 8e38fa65aa886945367a23ad2d68faab9c534490 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 27 Oct 2015 15:32:38 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E2=80=9C=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E8=AF=BE=E7=A8=8B--=E5=8A=A0=E5=85=A5=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=EF=BC=9A=E8=BE=93=E5=85=A5=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AF=86=E7=A0=81=EF=BC=8C=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=8C=89=E9=92=AE=E6=97=A0=E5=8F=8D=E5=BA=94?=
 =?UTF-8?q?=E2=80=9D=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_new_join.html.erb | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/views/projects/_new_join.html.erb b/app/views/projects/_new_join.html.erb
index c823f5ed0..c406ac2e6 100644
--- a/app/views/projects/_new_join.html.erb
+++ b/app/views/projects/_new_join.html.erb
@@ -18,6 +18,13 @@
 
   <script type="text/javascript">
       function clickCanel(){hideModal("#popbox02");}
+      function clickSure()
+      {
+          if ($('#new_join_course').submit())
+          {
+              hideModal("#popbox02");
+          }
+      }
   </script>
 </head>
 
@@ -33,7 +40,7 @@
         <label>请输入课程密码:</label>
         <%= text_field_tag 'course_password', nil, :style=>'width:300px;'%>
         <div class="ni_btn">
-          <a href="javascript:" class="tijiao" onclick="$('#new_join_course').submit();" >
+          <a href="javascript:" class="tijiao" onclick="clickSure();" >
             确&nbsp;&nbsp;定
           </a>
           <a href="javascript:" class="tijiao" onclick="clickCanel();">