Merge branch 'dev_raining' of https://git.trustie.net/jacknudt/trustieforge into dev_raining

app/views/account/email_activation.html.erb

@@ -3,17 +3,20 @@
     <p class="email_verify_prompt"><span class="icons_email_prompt"></span>您的账号尚未激活，请先进入您的注册邮箱（<span class="c_red" id="user_email_show"><%= @user.mail %></span>），激活您的账号。</p>
     <button class="email_verify_btn mt30 ml30" onclick = "resendMail('<%= resendmail_path(@user) %>','<%= @user.id %>');">重新发送激活邮件</button>
     <%#= link_to l(:label_mail_resend), { :controller => 'account', :action => 'resendmail',:user => @user}, :class=>"email_verify_btn mt30 ml30", :remote => true, :method => 'get' %>
-    <ul class="email_prompt_txt ml30 mt30" style="width:580px">
+    <ul class="email_prompt_txt ml30 mt30" style="width:580px;margin-bottom: 20px">
       <p class="email_prompt_p">如果您尚未收到激活邮件，请按照以下步骤操作：</p>
       <li>检查邮箱的“订阅邮件”、“垃圾邮件”，可能会发现激活邮件。 </li>
       <li>如果激活邮件已无效，请点击重新发送激活邮件按钮。</li>
       <li>如果重发注册验证邮箱邮件仍然没有收到，请<a href="javascript:void(0);" class="link-blue" onclick="change_user_email()">更换邮箱地址</a>，重新发送激活邮件</li>
       <li>如果您始终无法收到激活邮件，请直接给我们留言：</li>
       <div class="mt10">
-        <textarea style="resize: none;width: 570px;" class="email_prompt_mes" placeholder="请管理员尽快帮我解决邮箱激活问题"></textarea>
+        <% get_memo %>
-        <div class="c1"></div>
+        <%= form_for(@new_memo, :url => mail_feedback_forum_path(@public_forum, :user_id => @user.id), :remote => true) do |f|  %>
-        <button class="email_sub_btn fr" onclick="leave_email_activation_message('<%= leave_email_activation_message_path(1)%>','<%= @user.id %>');">确定</button>
+            <%= f.text_area :subject, :id => "subject", :class => "email_prompt_mes", :style => "width: 568px;", :placeholder => l(:label_email_feedback_tips) %>
-        <div class="cl"></div>
+            <%= f.hidden_field :content, :id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
+            <span class="c_red fl" id="mail_valid_feedback_tip" style="display: none;">内容不能为空</span>
+            <a href="javascript:void(0);" class="btn btn-blue fr" onclick="f_submit();">确定</a>
+        <% end %>
       </div>
     </ul>
   </div>
@@ -61,4 +64,26 @@
           }
       });
   }
+    function regex_mv_name()
+    {
+        var name = $.trim($("#subject").val());
+        if(name.length == 0)
+        {
+            $("#mail_valid_feedback_tip").show();
+            return false;
+        }
+        else
+        {
+            $("#mail_valid_feedback_tip").hide();
+            return true;
+        }
+    }
+
+    function f_submit()
+    {
+        if(regex_mv_name()){
+            $("#new_memo").submit();
+        }
+    }
+
 </script>

app/views/projects/_act_training_tasks.html.erb

@@ -54,6 +54,11 @@
             <div class="cl"></div>
           </div>
           <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id => user_activity_id, :content => activity.description} %>
+
+          <a href="#" class="task-display-span bBlue mt10">提交测评。</a>
+          <span class="task-display-span alert-blue mt10">当前任务正在后台测评中，稍后将显示您的任务完成情况......</span>
+          <span class="task-display-span b_dgrey mt10">本任务已通过测评，处于关闭状态。</span>
+
           <div id="intro_content_show_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[展开]</a></div>
           <div id="intro_content_hide_<%= user_activity_id %>" class="fr" style="display:none;"><a href="javascript:void(0);" class="linkBlue">[收起]</a></div>
           <div class="cl"></div>

public/stylesheets/css/common.css

@@ -144,7 +144,7 @@ a.c_blue{ color:#3b94d6;}
 a.c_eblue{color: #3784D3}
 a.c_setting_blue{color: #0781B4}
 a.c_dblue{ color:#09658c;}
-a:hover.c_dblue{ color:#297fb8;}
+a:hover.c_dblue{ color:#2788d0;}
 a.c_white{ color:#fff;}
 input.c_white { color:#fff}
 a.c_dorange{ color:#fd6e2a;}
@@ -201,7 +201,7 @@ a:hover.c_grey{ color:#333;}
 .fontBlue {color:#3498db;}
 span.newsBlack {color:#4b4b4b; font-size:13px; font-weight:bold}
 a.underline {text-decoration:underline;}
-a.fontBlue {color:#297fb8;}
+a.fontBlue {color:#2788d0;}
 .fontBlue2 {color:#3b94d6 !important;}
 a.fontGrey {color:#cecece;}
 a.fontGrey2 {color:#888888;}
@@ -211,11 +211,11 @@ a.link-black:hover {color:#3b94d6;}
 a.link-blue {color:#3b94d6;}
 a.linkOrange {color:#ff7143;}
 a.linkBlue {color:#3b94d6;}
-a.linkBlue:hover {color:#297fb8;}
+a.linkBlue:hover {color:#2788d0;}
 a.linkBlue2 {color:#3498db;}
-a.linkBlue2:hover {color:#297fb8;}
+a.linkBlue2:hover {color:#2788d0;}
 a.buttonBlue {background-color:#3b94d6;}
-a.buttonBlue:hover {background-color:#297fb8;}
+a.buttonBlue:hover {background-color:#2788d0;}
 a.linkGrey {color:#484848;}
 a.linkGrey:hover {color:#3b94d6;}
 a.linkGrey2 {color:#888888;}
@@ -223,7 +223,7 @@ a.linkGrey2:hover {color:#484848;}
 a.linkGrey3 {color:#484848;}
 a.linkGrey3:hover {color:#000000;}
 a.linkGrey4 {color:#484848;}
-a.linkGrey4:hover {color:#297fb8;}
+a.linkGrey4:hover {color:#2788d0;}
 a.linkGrey5 {color:#484848;}
 a.linkGrey5:hover {color:#3498db !important;}
 a.linkGrey6 {color:#484848 !important;}
@@ -231,7 +231,7 @@ a.linkGrey6:hover {color:#ffffff !important;}
 a.linkGrey7 {color:#888888;}
 a.linkGrey7:hover {color:#3b94d6;}
 a.bBlue {background-color:#3498db;}
-a.bBlue:hover {background-color:#297fb8;}
+a.bBlue:hover {background-color:#2788d0;}
 a.bGreen {background-color:#60b25e;}
 a.bGreen:hover {background-color:#51a74f;}
 a.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;}
@@ -240,7 +240,7 @@ a.link_file_a{ background:url(/images/pic_file.png) 0 2px no-repeat; padding-lef
 a:hover.link_file_a{ background:url(/images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;}
 a.link_file_a2{ background:url(/images/pic_file.png) 0 -15px no-repeat; padding-left: 20px;}
 a.submit_btn2 {background-color: #3b94d6; padding: 3px 5px; color: #ffffff;}
-a.submit_btn2:hover {background-color:  #297fb8;}
+a.submit_btn2:hover {background-color:  #2788d0;}
 /****翻页***/
 .wlist{float:right;}
 .wlist li{float:left;}
@@ -437,4 +437,19 @@ input.radio-width90{ width: 90px; }
 #muban_popup_box label.pop_box_label_l {width: 100px; text-align: left; display: inline-block;}
 .sy_popup_con{  margin:30px auto 0;font-size:14px; width:330px;}
 .sy_popup_add li{ line-height:40px;}
-.sy_popup_add label{ display:block;  float:left; width:85px;  text-align:right;  line-height:40px;}
+.sy_popup_add label{ display:block;  float:left; width:85px;  text-align:right;  line-height:40px;}
+.email_prompt_mes{ border:1px solid #ccc;  border-radius:5px;  width:468px; height:60px;  background:#fff;padding:5px; margin-bottom: 5px;}
+a.btn{display: inline-block;border:none; padding:0 10px;color: #333;background: #e1e1e1; text-align:center;font-size: 12px;  height: 30px;line-height: 30px;-webkit-border-radius: 3px;-moz-border-radius: 3px; -o-border-radius: 3px; border-radius: 3px; }
+a:hover.btn{background: #c3c3c3; color: #333;}
+a.btn-green{background: #60b25e; color: #fff;}
+a:hover.btn-green{background: #51a74f; color: #fff;}
+a.btn-blue{background: #3b94d6; color: #fff;}
+a:hover.btn-blue{background: #2788d0; color: #fff;}
+.sy_popup_top{ background:#3b94d6;  height:40px; -webkit-border-radius: 5px 5px 0px 0px;  -moz-border-radius: 5px 5px 0px 0px; -o-border-radius: 5px 5px 0px 0px;  border-radius: 5px 5px 0px 0px;}
+.sy_popup_top h3{ font-size:18px; color:#fff;  font-weight:normal; line-height:40px;  padding-left:10px;}
+.sy_popup_top_tishi{ background:#ededed; }
+.sy_popup_top_tishi h3{color:#616161; font-size:16px;}
+.sy_popup_con02{ margin:30px auto 0; font-size:14px; text-align:center; width:360px;}
+.sy_popup_con02 ul li p{ margin-bottom:15px;   text-align:center; font-size:14px; color:#616161;}
+.sy_popup_con02 a{ margin:0 auto;}
+#sy_popup_box{  width:460px; background:#fff;  padding-bottom:30px; border-radius:5px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}

public/stylesheets/css/project.css

@@ -672,3 +672,5 @@ a:hover.pro-fenzhi-a{color:#3b94d6;}
 span.task-linebtn-green{color:#59af48; border: 1px solid #59af48;font-size: 12px; padding: 0 5px; border-radius: 3px;line-height: 14px;}
 .issues-table select.select-w50{ width: 50px;}
 span.task-step{ color:#ee4a20;font-style: italic; font-weight:bold; font-size:14px;}
+.task-display-span,a.task-display-span{ display:inline-block; border-radius:3px; width: 100%; text-align: center; color: #fff; padding: 5px 0; }
+.task-bgrey{background:#ccc;}