1.#1742 首次加载课程实践平台主页时，点击“加入课程”快捷通道，课程ID默认是当前登录用户名，口令默认为当前登录用户密码

2.修改加入课程弹出框样式

app/views/courses/_join_private_course.html.erb

@@ -13,7 +13,7 @@
       a{ text-decoration:none; }
       a:hover{ }
 
-
+      .alert_box {width:488px;height:550px;position:fixed;z-index:1002;left:50%;top:40%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81; padding:5px; overflow:auto; }
       #popbox{width:488px;height:308px;}
       .alert .C{width:476px;height:296px;position:absolute;left:5px;top:5px;  }
       .C_top{ margin-top:20px; width:368px; height:100px; background:#e9e9e9; padding:0px 60px; }
@@ -21,7 +21,7 @@
       .C_top p{ color:#a9aaaa; line-height:22px;}
       .C_form{ margin:20px 0 0 60px;}
       .C_form ul li{ font-size:14px; color:#3f3a39; line-height:30px; }
-      .C_form ul li input{ margin-left:30px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;  }
+      .C_form ul li input{ margin-left:20px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; padding: 0 !important; }
       .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:90px;}
       .width190{ width:190px; height:26px; border-color:#e1e1e1;}
       .C_form a{ font-size:12px; color:#15bccf; float:left; display:block; height:40px; width:200px;  margin-top:25px;}
@@ -35,6 +35,11 @@
           hideModal(obj);
           $("#new-watcher-form").submit();
       }
+
+      function hidden_join_course_form()
+      {
+          hideModal($("#popbox"));
+      }
   </script>
 </head>
 
@@ -55,6 +60,7 @@
             <li>
               <span class="tips">课&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>
@@ -62,8 +68,12 @@
               <input class=" width190" type="password" name="course_password" id="course_password" value="" >
             </li>
             <li>
-              <a href="#" class="btn" style="margin-left: 50px;" onclick="submit_form(this);"><%= l(:label_new_join)  %></a>
+              <a href="#" class="btn" style="margin-left: 50px;" onclick="submit_form(this);">
-              <a href="#" class="btn" style="margin-left: 20px;" onclick="hideModal(this);"><%= l(:button_cancel)%></a>
+                <%= l(:label_new_join)  %>
+              </a>
+              <a href="#" class="btn" style="margin-left: 20px;" onclick="hideModal(this);">
+                <%= l(:button_cancel)%>
+              </a>
             </li>
           </ul>
       <% end%>

app/views/courses/join_private_courses.js.erb

@@ -1,3 +1,9 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_private_course') %>');
 showModal('ajax-modal', '510px');
-$('#ajax-modal').css('height','330px');
+$('#ajax-modal').css('height','330px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
+        "<a href='#' onclick='hidden_join_course_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().removeClass("alert_praise");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("alert_box");

app/views/welcome/course.html.erb

@@ -55,13 +55,19 @@
         <% end %>
         </span>
       <% unless @course_page.nil? %>
-          <span class="font_welcome_trustie"><%= @course_page.title %> </span>
+          <span class="font_welcome_trustie">
+            <%= @course_page.title %>
+          </span>
 
           <% if @school_id.nil? and (User.current.user_extensions.nil? || User.current.user_extensions.school.nil?) %>
-              <span class="font_welcome_tdescription">, <%= @course_page.description %></span>
+              <span class="font_welcome_tdescription">,
+                <%= @course_page.description %>
+              </span>
           <% else %>
               <% if @school_id == "0" %>
-                  <span class="font_welcome_tdescription">, <%= @course_page.description %></span>
+                  <span class="font_welcome_tdescription">,
+                    <%= @course_page.description %>
+                  </span>
               <% end %>
           <% end %>
       <% end %>
@@ -77,7 +83,11 @@
 
 
 <div id="J_Slide" class="d-p-index-box d-p-index-hot">
-  <h3><strong><%= l(:lable_hot_course)%></strong></h3>
+  <h3>
+    <strong>
+      <%= l(:lable_hot_course)%>
+    </strong>
+  </h3>
 
   <% month_now = Time.now.strftime("%m").to_i %>
   <% year_now = Time.new.strftime("%Y") %>
@@ -86,7 +96,9 @@
   <% @school_id.nil? ? cur_school_course = [] : cur_school_course = find_miracle_course(10,7,@school_id, year_now, course_term) %>
 
   <% if cur_school_course.count == 0 %>
-      <span><%= render :partial =>  'more_course', :locals => {:school_id => nil}%></span>
+      <span>
+        <%= render :partial =>  'more_course', :locals => {:school_id => nil}%>
+      </span>
       <div class="d-p-projectlist-box">
         <ul class="d-p-projectlist">
           <% if User.current.logged? %>