Merge branch 'szzh' into gitlab_guange

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;">

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>
 
 

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();">