Merge branch 'sw_new_course' into dev_hjq

app/controllers/account_controller.rb

@@ -36,6 +36,10 @@ class AccountController < ApplicationController
     end
   end
 
+  def agreement
+    render :layout => 'users_base'
+  end
+
   # Log out current user and redirect to welcome page
   def logout
     if User.current.anonymous?

app/views/account/agreement.html.erb

@@ -0,0 +1,51 @@
+<%= stylesheet_link_tag 'new_user'%>
+<div class="homepageContentContainer " style="margin-top:20px;">
+  <div class="homepageContent BgBox">
+  	<h2 class="BgBox_h2">Trustie服务协议</h2>
+   	<div class="AgreementBox">
+    	<p>尊敬的用户，您好！<br />
+欢迎使用Trustie平台，在您使用Trustie平台前，请您认真阅读并遵守《Trustie服务协议》（以下简称"本协议"），请您务必审慎阅读、充分理解协议的各条款内容。<br />
+当您在注册过程中点击查看"看过并同意本服务协议"，按照注册流程成功注册为Trustie平台的用户即表示您已充分阅读、理解并完全接受本协议中的全部条款。您承诺接受并遵守本协议的约定，届时您不应以未阅读本协议的内容等理由，主张本协议无效或本协议中的某些条款无效，或要求撤销本协议。</p>
+		<h4 class="Agreementh4">一、Trustie平台权利和义务</h4>
+        <p>1、尊重用户隐私：尊重用户隐私，保障用户隐私安全是Trustie平台的一项基本政策；<br />
+2、管理平台用户：Trustie平台依据国家法律、地方法律和国际法律等的标准以及本行业的规则来管理平台注册用户；<br />
+3、处理用户反馈：Trustie平台的相关人员会及时处理用户反馈的问题并给予及时回复。</p>
+		<h4 class="Agreementh4">二、用户权利和义务</h4>
+        <p>用户在使用Trustie平台的过程中，必须遵守如下原则：<br />
+1、遵守中国的有关法律和法规；<br />
+2、使用网络服务不作非法用途；<br />
+3、不干扰和混乱网络服务；<br />
+4、遵守所有使用网络服务的网络协议、规定、程序和惯例；<br />
+5、不传输任何非法的、骚扰性的、中伤他人的、辱骂性的、恐吓性的、伤害性的、庸俗的，淫秽等信息资料；<br />
+6、不传输任何教唆他人构成犯罪行为的资料；<br />
+7、用户不得故意或者过失损害Trustie平台合法权利和利益。及时回复。</p>
+		<h4 class="Agreementh4">三、关于责任</h4>
+        <p>鉴于网络服务的特殊性，用户同意Trustie团队有权在事先通知的情况下，变更、中断、升级部分网络服务。Trustie团队不担保网络服务不会中断，但承诺在用户可承受的时间内快速恢复服务，同时确保用户数据的安全性和可靠性。</p>
+        <h4 class="Agreementh4">四、服务条款的修改</h4>
+        <p>Trustie团队保留在必要时对本协议修改的权利，一旦发生变动，这些条款可由Trustie团队及时更新，且毋须另行通知，修改后的条款一旦在网页上公布即有效代替原来的服务条款。您可随时查阅最新版服务条款。</p>
+        <p class=" mt15 fb">本协议最终解释权归Trustie团队所有。</p>
+    </div>
+    
+    
+  </div><!---BgBox end--->
+</div><!---homepageContentContainer end--->
+<script>
+$(".resourcesList").mousedown(function(e) {  
+if (3 == e.which) {  
+         document.oncontextmenu = function() {return false;}  
+         $("#contextMenu").hide();  
+         $("#contextMenu").attr("style","display: block; position: fixed; top:"  
+         + e.pageY  
+         + "px; left:"  
+         + e.pageX  
+         + "px; width: 80px;");  
+         $("#contextMenu").show();  
+         }
+		 
+});
+$(".resourcesList").click(function(e) {  
+		 $("#contextMenu").hide();
+		 document.oncontextmenu = function() {return true;}
+}); 
+</script>
+

app/views/account/login.html.erb

@@ -246,7 +246,7 @@
                 <div class="fl mt3 mr5">
                   <input type="checkbox" id="read_and_confirm"/>
                 </div>
-                我已阅读并接受<a href="javascript:void(0);" class="newsBlue"><u>Trustie服务协议</u></a>条款</div>
+                我已阅读并接受<a href="<%= agreement_path %>" class="newsBlue"><u>Trustie服务协议</u></a>条款</div>
           <div class="loginUpButton">
             <a href="javascript:void(0);" class="c_white db" onclick="register();">注册</a>
 

app/views/users/user_messages.html.erb

@@ -10,7 +10,7 @@
             <li><%= link_to "作业消息",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'homework'}, :class => "resourcesGrey" %></li>
             <li><%= link_to "课程讨论区",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_message'}, :class => "resourcesGrey"  %></li>
             <li><%= link_to "课程通知",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news'}, :class => "resourcesGrey"  %></li>
-            <li><%= link_to "通知回复",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news_reply', :class => "resourcesGrey" } %></li>
+            <li><%= link_to "通知回复",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'course_news_reply'}, :class => "resourcesGrey" %></li>
             <li><%= link_to "课程问卷",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'poll'}, :class => "resourcesGrey"  %></a></li>
             <li><%= link_to "作品评阅",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reviewers'}, :class => "resourcesGrey"  %></li>
             <li><%= link_to "作品讨论",{:controller=> 'users', :action => 'user_messages', id: User.current.id, host: Setting.host_user, :type => 'works_reply'}, :class => "resourcesGrey"  %></li>

config/routes.rb

@@ -262,6 +262,7 @@ RedmineApp::Application.routes.draw do
   match 'account/heartbeat', to: 'account#heartbeat', :via => :get
   match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post]
   match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post]
+  match 'agreement',:to => 'account#agreement',:as => 'agreement',:via=>[:get]
   match 'account/register', :via => [:get, :post], :as => 'register'
   match 'account/lost_password',  :via => [:get, :post], :as => 'lost_password'
   match 'account/activate',  :via => :get

public/stylesheets/new_user.css

@@ -633,6 +633,19 @@ ul.list_watch{
 .feedBack {width:728px; background-color:#ffffff; padding:10px; border:1px solid #dddddd;float: right}
 
 
+
+/*20150826忘记密码 LB*/
+.BgBox{ width:968px; border:1px solid #dddddd; background:#fff; padding:15px; padding-top:10px;}
+.BgBox_h2{ font-size:16px; color:#484848;  width:968px;border-bottom:1px solid #e3e3e3; padding-bottom:5px;}
+.NomalInput{width:308px; height:38px;  border:1px solid #98a1a6; outline:none; color:#888888; font-size:14px;}
+.BgBoxCon{ width:310px; margin:80px auto;}
+.BgBoxConP{ font-size:14px; color:#484848;}
+.LoginButton {width:315px; height:40px; background-color:#269ac9; font-size:14px; text-align:center; line-height:40px; vertical-align:middle;}
+.LoginButton:hover {background-color:#297fb8;}
+/*20150826协议 LB*/
+.AgreementBox{ margin:20px 0; color:#666666; font-size:14px; line-height:1.9;}
+.Agreementh4{ color:#2980b9; font-weight:bold; font-size:14px; margin-top:30px;}
+
 /*底部*/
 #Footer{background-color:#ffffff; margin-bottom:10px; padding-bottom:15px; color:#666666;}
 .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}