From ef48fec26b68149aea37eb106e71d4a44d8925d2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 17 Oct 2014 17:00:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=8A=A0=E5=85=A5=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=BC=B9=E5=87=BA=E6=A1=86=E6=98=BE=E7=A4=BA=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/_join_private_course.html.erb     | 125 ++++++++++--------
 app/views/courses/join_private_courses.js.erb |   5 +-
 public/stylesheets/welcome.css                |   6 +
 3 files changed, 79 insertions(+), 57 deletions(-)
diff --git a/app/views/courses/_join_private_course.html.erb b/app/views/courses/_join_private_course.html.erb
index 60223922f..2d36e2ece 100644
--- a/app/views/courses/_join_private_course.html.erb
+++ b/app/views/courses/_join_private_course.html.erb
@@ -1,60 +1,75 @@
-<!-- added by fq -->
-<style>
-    input[type="submit"].bid_btn {
-        vertical-align: middle;
-        width: 60px;/*modified by ming*/
-        height: 25px;
-        line-height: 19px;
-        font-size: 14px;
-        color: rgb(0, 0, 0);
-        background: buttonface;/*url("/images/button/bg103.jpg") no-repeat scroll left top transparent;*/
-        padding: 0px 0px 4px 0px;
-        border-radius: 2px;
-        border: 1px solid rgb(148, 148, 148);
-        box-shadow: none;
-        text-shadow: none;
-        /*margin-top: -10px;*/
-        /*margin-right: -4px;*/
-    }
-    input[type="button"].bid_btn {
-        width: 60px;/*modified by ming*/
-        height: 25px;
-        line-height: 19px;
-        font-size: 14px;
-        color: rgb(0, 0, 0);
-        background: buttonface;/*url("/images/button/bg103.jpg") no-repeat scroll left top transparent;*/
-        padding: 0px 0px 4px 0px;
-        border-radius: 2px;
-        border: 1px solid rgb(148, 148, 148);
-        box-shadow: none;
-        text-shadow: none;
-        /*margin-top: -10px;*/
-        margin-right: -2px;
-    }
-    textarea:focus {
-        border: #d5dee9 1px solid;
-    }
-</style>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>快速进入课程通道</title>
+  <style>
+      body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+      div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
+      div,img,tr,td{ border:0;}
+      table,tr,td{border:0; cellspacing:0; cellpadding:0;}
+      ul,li{ list-style-type:none}
+      .cl{ clear:both; overflow:hidden; }
+      a{ text-decoration:none; }
+      a:hover{ }
 
-<h3 class="title">加入公开课程或私有课程</h3>
 
-<%= form_tag({:controller => 'courses',
-              :action => 'join'},
-             :remote => true,
-             :method => :post,
-             :id => 'new-watcher-form') do %>
-    <div>
-      <span>课程ID：</span>
-      <%= text_field_tag 'object_id', nil, :style=>'width:80%'%>
-      <span style="padding-left: 55px;color: red;">(课程ID是课程的网址中出现的序号)</span>
+      #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; }
+      .C_top h2{ color:#1c1d1d; font-size:24px; font-style:normal; font-weight:normal;}
+      .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.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;}
+      .C_form a:hover{ text-decoration:underline;}
+      .C_form a.btn{ display:block; width:100px; height:36px; padding-top:4px; text-align: center; background:#15bccf; color:#fff; font-size:14px; margin:20px 20px 0 95px;}
+      .C_form a.btn:hover{ background:#ff821d;}
+  </style>
+  <script type="text/javascript">
+    function submit_form(obj)
+    {
+        hideModal(obj);
+        $("#new-watcher-form").submit();
+    }
+  </script>
+</head>
+
+<body>
+<div id="popbox">
+  <div class="C"  >
+    <div class="C_top">
+      <h2>快速进入课程通道</h2>
+      <p>只要持有课程ID和密码，就课快速加入所在课程。课程页面搜索不到的私有课程只能从此通道进入哦！</p>
     </div>
-    <div>
-      <span>密码&nbsp;&nbsp;&nbsp;：</span>
-      <%= text_field_tag 'course_password', nil, :style=>'width:80%'%>
+    <div class="C_form">
+      <%= form_tag({:controller => 'courses',
+                    :action => 'join'},
+                   :remote => true,
+                   :method => :post,
+                   :id => 'new-watcher-form') do %>
+        <ul>
+          <li>
+            <span class="tips">课&nbsp;程&nbsp;ID：</span>
+            <input class=" width190" name="object_id" id="object_id" type="text" value="" >
+          </li>
+          <li class="mB5">课程ID是所在课程网址中显示的序号</li>
+          <li>
+            <span class="tips">密&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;码：</span>
+            <input class=" width190" type="password" name="course_password" id="course_password" value="" >
+          </li>
+          <li>
+            <a href="#" class="btn" onclick="submit_form(this);"><%= l(:label_new_join)  %></a>
+            <a href="#" onclick="hideModal(this);"><%= l(:button_cancel)%></a>
+          </li>
+        </ul>
+      <% end%>
     </div>
+  </div><!---- C end---->
+</div>
+</body>
+</html>
 
-    <p class="buttons" style="padding-top: 10px; padding-bottom: 1px; margin-bottom: 1px">
-      <%= submit_tag l(:label_new_join), :name => nil, :class => "bid_btn", :onclick => "hideModal(this);" %>
-      <%= submit_tag l(:button_cancel), :name => nil, :class => "bid_btn", :onclick => "hideModal(this);", :type => 'button' %>
-    </p>
-<% end %>
diff --git a/app/views/courses/join_private_courses.js.erb b/app/views/courses/join_private_courses.js.erb
index 71c7e62b7..14a161907 100644
--- a/app/views/courses/join_private_courses.js.erb
+++ b/app/views/courses/join_private_courses.js.erb
@@ -1,3 +1,4 @@
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'join_private_course') %>');
-showModal('ajax-modal', '400px');
-$('#ajax-modal').addClass('new-watcher');
\ No newline at end of file
+showModal('ajax-modal', '510px');
+$('#ajax-modal').addClass('new-watcher');
+$('#ajax-modal').css('height','330px');
\ No newline at end of file
diff --git a/public/stylesheets/welcome.css b/public/stylesheets/welcome.css
index 3e333d231..227cc6870 100644
--- a/public/stylesheets/welcome.css
+++ b/public/stylesheets/welcome.css
@@ -467,6 +467,12 @@ a.attachments_list_color {
     font-size: 10pt;
 }
 
+.new-watcher{
+    -webkit-border-radius: 5px;
+    border-radius: 5px;
+    box-shadow: 0px 0px 8px #194a81;
+}
+
  /************************** 贴吧动态 结束 ****************************/
  /************************** 学校课程 开始 ****************************/
      .course{
