Merge branch 'yuanke_org' into develop

Conflicts:
	db/schema.rb

Gemfile

@@ -9,11 +9,10 @@ unless RUBY_PLATFORM =~ /w32/
     gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel
   end
   gem 'certified'
-end
-
   gem 'net-ssh', '2.9.1'
   gem 'jenkins_api_client'
   gem 'nokogiri'
+end
 
 gem 'wechat',path: 'lib/wechat'
 gem 'grack', path:'lib/grack'

app/controllers/account_controller.rb

@@ -239,14 +239,22 @@ class AccountController < ApplicationController
 
   end
   def resendmail
+    status = 1
     user = User.find(params[:user]) if params[:user]
     token = Token.new(:user => user, :action => "register")
     if token.save
-      Mailer.run.register(token)
-
+      # Mailer.run.register(token)
+      Mailer.register(token).deliver
     else
       yield if block_given?
+      status = 0
     end
+    render :json => status
+  end
+
+  def email_activation
+
+
   end
   private
 
@@ -264,6 +272,7 @@ class AccountController < ApplicationController
     if user.nil?
       invalid_credentials
     elsif user.status == 2
+      @user = user
       invalid_credentials_new
     elsif user.new_record?
       onthefly_creation_failed(user, {:login => user.login, :auth_source_id => user.auth_source_id })
@@ -375,8 +384,9 @@ class AccountController < ApplicationController
   
   def invalid_credentials_new
     logger.warn "Failed login for '#{params[:username]}' from #{request.remote_ip} at #{Time.now.utc}"
-    flash[:error] = l(:notice_account_invalid_creditentials_new)
-    render signin_path(:login=>true)
+    # flash[:error] = l(:notice_account_invalid_creditentials_new)
+    # render signin_path(:login=>true)
+    render :action => 'email_activation'
   end
 
   # Register a user for email activation.

app/controllers/my_controller.rb

@@ -127,12 +127,14 @@ class MyController < ApplicationController
         end
 
         @user.safe_attributes = params[:user]
+        @user.lastname = params[:lastname]
+        @user.firstname = ""
         @user.pref.attributes = params[:pref]
         @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
         #@user.login = params[:login]
         unless @user.user_extensions.nil?
           if @user.user_extensions.identity == 2
-            @user.firstname = params[:enterprise_name]
+            # @user.firstname = params[:enterprise_name]
           end
         end
 
@@ -144,7 +146,7 @@ class MyController < ApplicationController
         # end
         @se.school_id = params[:occupation]
 
-        @se.gender = params[:gender]
+        @se.gender = params[:sex]
         @se.location = params[:province] if params[:province]
         @se.location_city = params[:city] if params[:city]
         @se.identity = params[:identity].to_i if params[:identity]

app/controllers/school_controller.rb

@@ -150,4 +150,55 @@ class SchoolController < ApplicationController
       format.js
     end
   end
+
+  #申请高校(单位) name:名称 province:省 city:市 address:地址 remarks:备注
+  def apply_add_school
+
+    data = {result:0,name:params[:name],school_id:0}
+    #0 成功 1参数错误 2名称已存在
+    data[:result] = 0
+
+    #检验参数
+    if params[:name] == "" || params[:province] == "" || params[:city] == "" || params[:address] == ""
+      data[:result] = 1
+    else
+      school_id = School.find_by_sql("select id from schools where name='#{params[:name]}'").first
+      if school_id
+        data[:result] = 2
+      else
+        school = School.new
+        school.name = params[:name].strip
+        school.pinyin = Pinyin.t(params[:name].strip, splitter: '')
+        school.save
+
+        #status  0未处理 1通过 2拒绝
+        applyschool = ApplyAddSchools.new
+        applyschool.school_id = school.id
+        applyschool.name = school.name
+        applyschool.province = params[:province]
+        applyschool.city = params[:city]
+        applyschool.address = params[:address]
+        applyschool.remarks = params[:remarks]
+        applyschool.save
+
+        data[:school_id] = school.id
+      end
+    end
+    render :json =>data
+  end
+
+  def search_repeat_schoolname
+    status = 0
+    name = params[:name]
+
+    if name
+      school_id = School.find_by_sql("select id from schools where name='#{name}'").first
+
+      if school_id
+        status = 1
+      end
+    end
+
+    render :json =>status
+  end
 end

app/controllers/users_controller.rb

@@ -1248,6 +1248,12 @@ class UsersController < ApplicationController
     render :layout=>'new_base_user'
   end
 
+  #给某人留言
+  def feedBackTo
+
+
+  end
+
   def user_comments
 
   end

app/controllers/words_controller.rb

@@ -338,6 +338,27 @@ class WordsController < ApplicationController
     redirect_to user_url(user.id)
   end
 
+  #邮箱激活问题留言 留言成功给出提示框
+  def leave_email_activation_message
+    status = 1 #成功
+    me = User.find(params[:user])
+    if me
+      #课程使者id=1
+      @user = User.find(1)
+      if params[:text].size>0 && @user
+          # @user.add_jour(me, params[:text])
+          #私信
+          message = "<span style='color:red;'>【未收到激活邮件的用户反馈，用户邮箱："+me.mail+"】</span><br>"+params[:text]
+          @user.journals_for_messages << JournalsForMessage.new(:user_id => me.id, :notes => message, :reply_id => 0, :status => true, :is_readed => false, :private => 1)
+      else
+          status = 0
+      end
+      render :json => status
+    else
+      render_403
+    end
+  end
+  
   private
 
   def find_user

app/models/apply_add_schools.rb

@@ -0,0 +1,3 @@
+class ApplyAddSchools < ActiveRecord::Base
+  attr_accessible :address, :city, :name, :province, :remarks, :school_id, :status
+end

app/views/account/email_activation.html.erb

@@ -0,0 +1,52 @@
+<div class="new_content">
+  <div class="email_verify">
+    <p class="email_verify_prompt"><span class="icons_email_prompt"></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">
+      <p class="email_prompt_p">如果您尚未收到激活邮件，请按照以下步骤操作：</p>
+      <li>检查邮箱的“订阅邮件”、“垃圾邮件”，可能会发现激活邮件。 </li>
+      <li>如果激活邮件已无效，请点击重新发送激活邮件按钮。</li>
+      <li>如果您无法收到激活邮件，请您直接给我们管理员留言：</li>
+      <div class="  mt10">
+        <textarea style="resize: none;" class="email_prompt_mes" placeholder="请管理员尽快帮我解决邮箱激活问题"></textarea>
+        <button class="email_sub_btn fr" onclick="leave_email_activation_message('<%= leave_email_activation_message_path(1)%>','<%= @user.id %>');">确定</button>
+        <div class="cl"></div>
+      </div>
+    </ul>
+  </div>
+</div>
+<script type="text/javascript">
+  function resendMail(url,id)
+  {
+      $.get(
+              url,
+              {user: id },
+              function (data) {
+                  console.log("1111111111");
+                  console.log(data);
+                  $(".email_verify_btn").replaceWith("<p class='email_verify_p mt30 ml30'>激活邮件已发送至您的注册邮箱，请及时登录邮箱进行验证。</p>");
+              }
+      );
+  }
+  function leave_email_activation_message(url,user)
+  {
+      if ($(".email_prompt_mes").val().length == 0){
+        //弹框请他输入文字
+          var htmlvalue = "</br><div style='width:550px;text-align:center'>您的留言不能为空</div></br><div style='width:67px; margin:0 auto; text-align:center'><a href='javascript:void(0);' class='Blue-btn' onclick='hideModal()'>确定</a></div>";
+          pop_up_box(htmlvalue,580,30,50);
+          return;
+      }
+      $.get(
+              url,
+              {user:user,text:$(".email_prompt_mes").val() },
+              function (data) {
+                  console.log("2222222");
+                  console.log(data);
+                  var htmlvalue = "<div class='email_tancon'><h2 class='email_tan_title'>您的留言已发送</h2><p class='email_tan_p'>我们将尽快处理好，并通过邮件通知您。感谢您的反馈！</p></div>"
+                  pop_up_box(htmlvalue,580,30,50);
+                  $(".email_prompt_mes").val("");
+              }
+      );
+  }
+</script>

app/views/account/register.html.erb

@@ -1,127 +0,0 @@
-<% @nav_dispaly_home_path_label = 1
-   @nav_dispaly_main_course_label = 1
-   @nav_dispaly_main_project_label = 1
-   @nav_dispaly_main_contest_label = 1 %>
-<% @nav_dispaly_forum_label = 1%>
-
-
-
-
-<!-- end -->
-
-<h3><%= l(:label_register) %> <%= link_to l(:label_login_with_open_id_option), signin_url if Setting.openid? %></h3>
-
-<%= labelled_form_for @user, :url => register_path do |f| %>
-    <%= error_messages_for 'user' %>
-    <div class="box tabular">
-
-      <% if @user.auth_source_id.nil? %>
-          <p><%= f.text_field :login, :size => 25, :required => true %><span id="valid_user_login"></span>
-            <em class="info" style="color: #acaeb1"><%= l(:label_max_number) %></em>
-          </p>
-          <p><%= f.password_field :password, :size => 25, :required => true %><span id="valid_user_password"></span>
-            <em class="info" style="color: #acaeb1"><%= l(:text_caracters_minimum, :count => Setting.password_min_length) %></em>
-          </p>
-          <p><%= f.password_field :password_confirmation, :size => 25, :required => true %><span id="valid_password" style="padding-left: 10px;"></span></p>
-      <% end %>
-
-      <p>
-        <%= f.text_field :mail,:size => 25, :required => true %>
-        <span id="valid_user_mail" ></span>
-      </p>
-      <p>
-        <em class="info" style="color: #acaeb1">
-          <p><%= "#{l(:label_mail_attention)} " %></p>
-          <p><%= "#{l(:label_mail_attention1)} " %></p>
-        </em>
-      </p>
-
-
-
-      <!-- end -->
-    </div>
-
-    <p>
-    <table>
-      <tr>
-        <td><%= submit_tag l(:button_submit) %></td>
-      </tr>
-    </table>
-    </p>
-<% end %>
-<% if Setting.openid? %>
-    <p><%= f.text_field :identity_url %></p>
-<% end %>
-<% @user.custom_field_values.select { |v| v.editable? || v.required? }.each do |value| %>
-    <p><%= custom_field_tag_with_label :user, value %></p>
-<% end %>
-</div>
-<% password_min_length = Setting.password_min_length %>
-<script type="text/javascript">
-    jQuery(document).ready(function () {
-        var $login = $('#user_login')
-        var $mail = $('#user_mail')
-        var $password = $('#user_password')
-        var $password_confirmation = $('#user_password_confirmation')
-        $login.blur(function (event) {
-            if ($(this).is('#user_login')) {
-                $.get(
-                        '<%=account_valid_ajax_path%>',
-                        { valid: "login",
-                            value: this.value },
-                        function (data) {
-                            if (data.valid) {
-                                $('#valid_user_login').html('<span class="green">' + data.message + "</span>");
-                            } else {
-                                $('#valid_user_login').html('<span class="red">' + data.message + "</span>");
-                            }
-                        });
-            }
-            ;
-        });
-
-        $mail.blur(function (event) {
-            if ($(this).is('#user_mail')) {
-                $.get('<%=account_valid_ajax_path%>',
-                        { valid: "mail",
-                            value: this.value },
-                        function (data) {
-                            if (data.valid) {
-                                $('#valid_user_mail').html('<span class="green">' + data.message + "</span>");
-                            } else {
-                                $('#valid_user_mail').html('<span class="red">' + data.message + "</span>");
-                            }
-                        });
-            }
-            ;
-        });
-        $password.blur(function () {
-            var pas1 = document.getElementById("user_password").value;
-            var password_min_length = <%= password_min_length %>
-            if (pas1.length >= password_min_length) {
-
-                $('#valid_user_password').html('<span class="green">'+ "</span>");
-            }
-            else {
-                $('#valid_user_password').html('<span class="red">' +  "<%= l(:setting_password_min_length_limit, :count => password_min_length) %>" + "</span>");
-            }
-
-
-
-        });
-        $password_confirmation.blur(function () {
-            var password_min_length = <%= password_min_length %>
-            var pas1 = document.getElementById("user_password").value;
-            var pas2 = document.getElementById("user_password_confirmation").value;
-            if (pas1.length >= password_min_length && pas1 == pas2 ) {
-                $('#valid_password').html('<span class="green">' + "<%= l(:setting_password_success) %>"+ "</span>");
-            }
-            else {
-                 $('#valid_password').html('<span class="red">' +  "<%= l(:setting_password_error) %>" + "</span>");
-            }
-
-
-
-        });
-    });
-</script>

app/views/blog_comments/show.html.erb

@@ -91,9 +91,10 @@
       </div>
       <div class="postDetailDate mb5"><%= format_time( @article.created_on)%></div>
       <div class="cl"></div>
-      <div class="homepagePostIntro memo-content upload_img break_word" id="message_description_<%= @article.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
-        <%= @article.content.html_safe%>
-      </div>
+      <!--<div class="homepagePostIntro memo-content upload_img break_word" id="message_description_<%= @article.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >-->
+        <!--<%#= @article.content.html_safe%>-->
+      <!--</div>-->
+      <%=render :partial =>"users/intro_content", :locals=>{:user_activity_id =>@article.id, :content=>@article.content} %>
       <div class="cl"></div>
       <div class=" fl" style="width: 600px">
         <%#= link_to_attachments_course @topic, :author => false %>
@@ -192,12 +193,12 @@
 </div>
 <script type="text/javascript">
   $(function(){
-      var postContent = $("#message_description_<%= @article.id %>").html();
-      postContent = postContent.replace(/&nbsp;/g," ");
-      postContent= postContent.replace(/ {2}/g,"&nbsp; ");
-      postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
-      postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
-      $("#message_description_<%= @article.id %>").html(postContent);
-      autoUrl('message_description_<%= @article.id %>');
+//      var postContent = $("#message_description_<%#= @article.id %>").html();
+//      postContent = postContent.replace(/&nbsp;/g," ");
+//      postContent= postContent.replace(/ {2}/g,"&nbsp; ");
+//      postContent=postContent.replace(/&nbsp; &nbsp;/g,"&nbsp;&nbsp;&nbsp;");
+//      postContent=postContent.replace(/&nbsp;  /g,"&nbsp;&nbsp; ");
+//      $("#message_description_<%#= @article.id %>").html(postContent);
+//      autoUrl('message_description_<%#= @article.id %>');
   });
 </script>

app/views/layouts/_new_feedback.html.erb

@@ -16,7 +16,7 @@
               <%= f.text_area :subject, :id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %>
               <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %>
               <label class="c_grey">您还能输入<span id="textCount" class="c_orange">50</span>个字符</label>
-              <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;" id="" onclick="f_submit();">
+              <a href="javascript:void(0);" class="opnionButton" style=" color:#fff;height:21px" id="" onclick="f_submit();">
                 <%= l(:label_submit)%>
               </a>
           <% end %>
@@ -25,7 +25,9 @@
           <!--<a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">-->
             <%#= l(:label_technical_support) %>
           <!--白&nbsp;&nbsp;&nbsp;羽</a> http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad-->
-           <p style="text-align: center"> 请加入师姐师兄答疑群</p>  <p style="text-align: center">QQ群号：173184401</p>
+           <!--<p style="text-align: center"> 请加入师姐师兄答疑群</p>  <p style="text-align: center"></p>-->
+           <!--<a href="mqqapi://card/show_pslcard?src_type=internal&version=1&uin=173184401&card_type=group&source=qrcode">QQ群号：173184401</a>-->
+          <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=fb938b1f6f991fc100f3d32b6ef38b7888dd4097c71d0eb8b239eaa8749a6afd"><img border="0" src="http://pub.idqqimg.com/wpa/images/group.png" alt="Trustie师姐师兄答疑群" title="Trustie师姐师兄答疑群"></a>
         </div>
       </div>
       <div class="side_bottom"></div>

app/views/mailer/register.html.erb

@@ -1,2 +1,6 @@
 <p><%= l(:mail_body_register) %><br />
 <%= link_to h(@url), @url %></p>
+<p>如果点击链接无效请复制该链接到浏览器中打开</p>
+<br>
+<p>感谢您的使用！</p>
+<p>Trustie团队</p><p></p>

app/views/my/account.html.erb

@@ -15,14 +15,13 @@
           <%= error_messages_for 'user',@user.user_extensions %>
         <% end %>
         <ul class="setting_left">
-          <li>登录名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li>邮箱&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li>身份&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">姓(Last Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">名(First Name)&nbsp;:&nbsp;<span style="color:red;">*</span></li>
+          <li><span style="color:red;">*</span>&nbsp;&nbsp;登录名&nbsp;:&nbsp;</li>
+          <li><span style="color:red;">*</span>&nbsp;&nbsp;邮箱&nbsp;:&nbsp;</li>
+          <li><span style="color:red;">*</span>&nbsp;&nbsp;职业&nbsp;:&nbsp;</li>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><span style="color:red;">*</span>&nbsp;&nbsp;姓名&nbsp;:&nbsp;</li>
           <li nhname="tag" nh_tag_2="true" style="display:none;">组织名&nbsp;:&nbsp;<span style="color:red;">*</span></li>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">性别&nbsp;:&nbsp;</li>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">工作单位&nbsp;:&nbsp;</li>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><span style="color:red;">*</span>&nbsp;&nbsp;性别&nbsp;:&nbsp;</li>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;" ><span style="color:red;">*</span>&nbsp;&nbsp;单位名称&nbsp;:&nbsp;</li>
           <li>地区&nbsp;:&nbsp;</li>
           <li>邮件通知&nbsp;:&nbsp;</li>
           <!--<li>个人签名&nbsp;:&nbsp;</li>-->
@@ -65,33 +64,49 @@
             <span id="identity_hint" style="display: none"></span>
           </li>
 
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= f.text_field :lastname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
-          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= f.text_field :firstname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
-          <li nhname="tag" nh_tag_2="true" style="display:none;"><%= text_field_tag :enterprise_name,@user.firstname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
+          <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;"><%= text_field_tag :lastname,@user.lastname+@user.firstname,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210" %>
+
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">
-            <select class="w70" style="height:28px;margin-left:2px;" id="gender" name="gender"><option value="0">男</option><option value="1">女</option></select>
+            <% if User.current.user_extensions && User.current.user_extensions.gender && User.current.user_extensions.gender == 1 %>
+                <input type="radio" id="sex" value="0" name="sex"  class="fl "><label class="fl mr10">男</label> <input type="radio" id="sex" value="1" name="sex" checked="checked"  class="fl "><label class="fl ">女</label>
+            <% else %>
+                <input type="radio" id="sex" value="0" name="sex" checked="checked" class="fl "><label class="fl mr10">男</label> <input type="radio" id="sex" value="1" name="sex" class="fl "><label class="fl ">女</label>
+            <% end %>
+            <select style = "display: none;" class="w70" style="height:28px;margin-left:2px;" id="gender" name="gender"><option value="0">男</option><option value="1">女</option></select>
           </li>
 
           <li nhname="tag" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" style="display:none;">
             <% if User.current.user_extensions.nil? %>
-              <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" id="province" name="province" style="display: none;" class="w210" type="text"  >
-              <input nhname="tag" nh_tag_3="true" id="occupation" name="occupation" style="display: none;" class="w210" type="text" value="" />
+                <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
+                <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210" type="text" value="" placeholder="     --请选择您所属的单位--"/>
+                <p class="fl ml10">
+                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
                   <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
+                </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
             <% elsif User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %>
-              <input nhname="tag" autocomplete="off"   maxlength="36" nh_tag_0="true" nh_tag_1="true" id="province" name="province" style="display: none;" class="w210" type="text"   >
-              <input nhname="tag" nh_tag_3="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.occupation %>" />
+                <input nhname="tag" autocomplete="off"   maxlength="36" nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
+                <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" value="<%= @user.user_extensions.occupation %>" />
+                <p class="fl ml10">
+                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
                   <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
+                </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
             <% elsif User.current.user_extensions.school.nil? %>
-              <input nhname="tag" autocomplete="off" maxlength="36"   nh_tag_0="true" nh_tag_1="true" id="province" name="province" style="display: none;" class="w210" type="text"  >
-              <input nhname="tag" nh_tag_3="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text"  />
+                <input nhname="tag" autocomplete="off" maxlength="36"   nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" placeholder="--请搜索您所在的高校（单位）--" >
+                <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" style="display: none;" class="w210"  type="text" placeholder="     --请选择您所属的单位--" />
+                <p class="fl ml10">
+                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
                   <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
+                </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text" style="display: none;width:117px;" readonly/>-->
             <% else %>
-              <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" id="province" name="province" style="display: none;" class="w210" type="text" value="<%= User.current.user_extensions.school %>" />
-              <input nhname="tag" nh_tag_3="true" id="occupation" name="occupation" type="text"  style="display: none;" class="w210" value="<%= User.current.user_extensions.school.id %>"/>
+                <input nhname="tag" autocomplete="off"  maxlength="36"  nh_tag_0="true" nh_tag_1="true" nh_tag_3="true" id="province" name="province" style="display: none;" class="w210 fl" type="text" value="<%= User.current.user_extensions.school %>" />
+                <input nhname="tag" nh_tag_4="true" id="occupation" name="occupation" type="text"  style="display: none;" class="w210" value="<%= User.current.user_extensions.school.id %>"/>
+                <p class="fl ml10">
+                  <span id="errortip" class="icons_warning fl mt5" style="display: none;"></span>
                   <span id="hint" style="color: #7f7f7f;display: none">平台找到了<a id="school_num" href="javascript:void(0)" style="color: red"  >0</a>个包含<a id="search_condition" href="javascript:void(0)">"国防"</a>的高校</span>
+                </p>
                 <!--<input nhname="tag" nh_tag_0="true" nh_tag_1="true" id="occupation_name" type="text"  style="display: none;width:117px;" value="<%#= User.current.user_extensions.school.name %>" readonly="true" style="background-color: #E2E2E2;"/>-->
             <% end %>
           </li>
@@ -140,13 +155,13 @@
 
           <li>
             <%= select_tag( 'user[mail_notification]', options_for_select( user_mail_notification_options(@user), @user.mail_notification) ) %>
-            <label>不要发送对我自己提交的修改的通知<%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified],:style=>"height:14px;" %></label>
+            <label class="ml10"><%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified],:style=>"height:14px;" %>不要发送对我自己提交的修改的通知</label>
           </li>
           <!--<li><input name="brief_introduction" class="w450" type="text" maxlength="255" value="<%#= (@user.user_extensions.nil?) ? '' : @user.user_extensions.brief_introduction %>"></li>-->
           <li style="height:auto;"><textarea name="description" class="w450 h200" maxlength="255" style="resize:none;"><%= (@user.user_extensions.nil?) ? '' : @user.user_extensions.description %></textarea></li>
           <li style="display:none;"><%= f.select :language, :Chinese => :zh, :English => :en %></li>
           <li class="ml2">
-            <a href="javascript:void(0);" id="my_account_form_link" class="blue_btn fl">确认</a>
+            <a href="javascript:void(0);" id="my_account_form_link" class="blue_btn fl" style="background: #3b94d6; padding: 0 25px;">确定</a>
             <input type="submit" id="my_account_form_btn" style="display:none;"/>
             <!--<a href="javascript:void(0);" class="grey_btn ml10 fl">取消</a>-->
           </li>
@@ -429,6 +444,7 @@
       $("*[nh_required='1']",$(this)).attr("required",true);
       $(this).show()
     });
+    $("#identity_hint").hide();
   }
   function init_identity_and_title(pField, identity, cField, title, language) {
     for (var i = 0; i < pField.options.length; i++) {
@@ -533,6 +549,14 @@
      $("input[name='occupation']").val(data);
      $("#search_school_result_list").hide();
       $("#hint").hide();
+      $("#errortip").hide();
+
+  }
+
+  function apply_add_school(){
+      var htmlvalue = "<%= escape_javascript( render :partial => 'my/apply_add_school' )%>";
+      pop_up_box(htmlvalue,580,20,48);
+
   }
   function add_school(name){
       $.ajax({
@@ -619,16 +643,19 @@
                       $("#search_school_result_list").show();
                       if($(e.target).val().trim() != '') {
                           str = e.target.value.length > 8 ?  e.target.value.substr(0, 6)+"..." : e.target.value;
-                          $("#hint").html('找到了' + count + '个包含"' + str + '"的高校');
+                          $("#hint").html('找到了' + count + '个包含"' + str + '"的高校（单位）');
                           $("#hint").show();
+                          $("#errortip").hide();
                       }else{
                           $("#hint").hide();
+                          $("#errortip").hide();
                       }
                   }else{
                       $("#search_school_result_list").html('');
                       str = e.target.value.length > 4 ?  e.target.value.substr(0, 4)+"..." : e.target.value;
-                      $("#hint").html('没有找到包含"'+str+'"的高校，<a style="color:#64bdd9" onclick="add_school(\''+ e.target.value+'\');" href="javascript:void(0);">创建高校</a>');
+                      $("#hint").html('您输入的名称尚不存在，<a style="color:#64bdd9" onclick="apply_add_school();" href="javascript:void(0);">申请添加</a>');
                       $("#hint").show();
+                      $("#errortip").show();
                   }
               }
           });
@@ -638,6 +665,7 @@
           {
               $("#search_school_result_list").hide();
               $("#hint").hide();
+              $("#errortip").hide();
           }
       });
       $("input[name='province']").on('focus', function (e) {
@@ -665,16 +693,19 @@
                       $("#search_school_result_list").show();
                       if($(e.target).val().trim() != '') {
                           str = e.target.value.length > 8 ?  e.target.value.substr(0, 6)+"..." : e.target.value;
-                          $("#hint").html('找到了' + count + '个包含"' + str + '"的高校');
+                          $("#hint").html('找到了' + count + '个包含"' + str + '"的高校（单位）');
                           $("#hint").show();
+                          $("#errortip").hide();
                       }else{
                           $("#hint").hide();
+                          $("#errortip").hide();
                       }
                   }else{
                       $("#search_school_result_list").html('');
                       str = e.target.value.length > 4 ?  e.target.value.substr(0, 4)+"..." : e.target.value;
-                      $("#hint").html('没有找到包含"'+str+'"的高校，<a style="color:#64bdd9" onclick="add_school(\''+ e.target.value+'\');" href="javascript:void(0);">创建高校</a>');
+                      $("#hint").html('您输入的名称尚不存在，<a style="color:#64bdd9" onclick="apply_add_school();" href="javascript:void(0);">申请添加</a>');
                       $("#hint").show();
+                      $("#errortip").show();
                   }
               }
           });
@@ -702,19 +733,41 @@
     <% if( !@act.nil? && @act == 'password') %>
     $("#users_tb_2").click();
     <% end %>
-    $('#my_account_form_link').click(function(e){
+
+    $('#my_account_form_link').on("click",(function(e){
+    //$('#my_account_form_link').click(function(e){
         if($("#userIdentity").val() == -1 ) {
             $("#identity_hint").html('<span style="color:red">请选择身份</span>').show();
             e.stopImmediatePropagation();
             return;
         }
         if( $("input[name='province']").val().trim() != '' && $("input[name='occupation']").val().trim() == ''){  //学校名字和id不对的话
-            $("#hint").html('<span style="color:red">学校必须是从下拉列表中选择的,不能手动修改</span>').show();
+            $("#hint").html('<span style="color:red">单位名称必须是从下拉列表中选择的,不能手动修改</span>').show();
+            e.stopImmediatePropagation();
+            return;
+        }
+
+        //姓名不能为空
+        if( $("#lastname").val() == '' ){
+            $("#lastname").focus();
+            e.stopImmediatePropagation();
+            return;
+        }
+
+        if( $("input[name='province']").val().trim() == '' ){  //学校名字必须填写
+            $("#hint").html('<span style="color:red">高校（单位）名称不能为空</span>').show();
             e.stopImmediatePropagation();
             return;
         }
+
+        if($("#no").is(":visible")  == true && $("#no").val() == ""){
+            $("#no").focus();
+            e.stopImmediatePropagation();
+            return;
+        }
+
       $('#my_account_form_btn').click();
-    });
+    }));
     $('#my_password_form_link').click(function(){
       $('#my_password_form_btn').click();
     });

config/locales/my/zh.yml

@@ -28,7 +28,7 @@ zh:
   label_account_identity_choose: --请选择身份--
   label_account_identity_teacher: 教师
   label_account_identity_student: 学生
-  label_account_identity_developer: 开发者
+  label_account_identity_developer: 从业者
   label_account_identity_enterprise: 组织
   label_account_identity_studentID: 请输入学号
 

config/locales/zh.yml

@@ -1665,7 +1665,7 @@ zh:
   #add by men
   label_account_identity_teacher: 教师
   label_account_identity_student: 学生
-  label_account_identity_developer: 开发者
+  label_account_identity_developer: 从业者
   label_account_identity_enterprise: 组织
 
   label_teaching_course: 我执教的课程

config/routes.rb

@@ -213,7 +213,8 @@ RedmineApp::Application.routes.draw do
 
   resources :school, :except => [:show] do
     collection do
-
+      get 'apply_add_school'
+      get 'search_repeat_schoolname'
     end
 
     member do
@@ -485,15 +486,18 @@ RedmineApp::Application.routes.draw do
   match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post]
   match 'agreement',:to => 'account#agreement',:as => 'agreement',:via=>[:get]
   match 'about_us',:to=>'account#about_us',:as=>'about_us',:via=>[:get]
-  match 'account/register', :via => [:get, :post], :as => 'register'
+  match 'account/register',:to=>'account#register', :via => [:get, :post], :as => 'register'
   match 'account/lost_password',  :via => [:get, :post], :as => 'lost_password'
   match 'account/activate',  :via => :get
   match 'account/valid_ajax',  :via => :get
   match 'account/email_valid', :to => 'account#email_valid', :via => :get
-  match 'account/resendmail', :to => 'account#resendmail', :via=> :get
+  match 'account/resendmail', :to => 'account#resendmail', :via=> :get, :as => 'resendmail'
   match 'projects/:id/wiki', :to => 'wikis#edit', :via => :post
   match 'projects/:id/wiki/destroy', :to => 'wikis#destroy', :via => [:get, :post]
 
+  #激活邮箱反馈问题
+  match 'users/:id/leave_email_activation_message', :to => 'words#leave_email_activation_message',  :via => :get, :as => "leave_email_activation_message"
+
   # boards
   match 'boards/:board_id/topics/new', :to => 'messages#new', :via => [:get, :post], :as => 'new_board_message'
   match 'boards/:id/join_to_org_subfields', :to => 'boards#join_to_org_subfields'

db/migrate/20160629030320_add_school_type_to_schools.rb

@@ -0,0 +1,5 @@
+class AddSchoolTypeToSchools < ActiveRecord::Migration
+  def change
+    add_column :schools, :school_type, :integer, :default => false
+  end
+end

db/migrate/20160629081520_create_apply_add_schools.rb

@@ -0,0 +1,15 @@
+class CreateApplyAddSchools < ActiveRecord::Migration
+  def change
+    create_table :apply_add_schools do |t|
+      t.string :name
+      t.string :province
+      t.string :city
+      t.string :address
+      t.string :remarks
+      t.integer :school_id
+      t.integer :status, :default => false
+
+      t.timestamps
+    end
+  end
+end

public/stylesheets/courses.css

@@ -152,6 +152,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
+.homepagePostIntro p{line-height: 1;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}

public/stylesheets/header.css

@@ -117,3 +117,179 @@ a.f_grey:hover {color:#000000 !important;}
 #loginInButton {height:54px; padding-left:10px; padding-right:10px; text-align:center; line-height:54px; vertical-align:middle; color:#ffffff; font-size:16px;}
 #loginSignButton:hover {background-color:#297fb8;}
 #loginInButton:hover {background-color:#297fb8;}
+
+/* 邮箱验证 */
+.email_verify body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
+.mt30{ margin-top:30px;}
+.ml30{ margin-left:30px;}
+.new_content{
+    width:1000px;
+    margin:10px auto;
+    padding:30px 0;
+    background-color:#fff;
+}
+.email_verify{
+    width:720px;
+    margin:0px auto;
+}
+.email_verify_prompt{
+    border:2px solid #dd0000;
+    background:#ffe3e3 url(../images/icons_prompt.png) 25px 10px no-repeat;;
+    height:35px;
+    line-height:35px;
+    padding-left:45px;
+    color:#8b0000;
+    font-size:14px;
+}
+.email_verify_btn{
+    border-style:none;
+    height:35px;
+    padding:0 15px;
+    line-height:35px;
+    color:#fff;
+    background:#3a95d7;
+    text-align:center;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    font-size:14px;
+}
+.email_verify_btn:hover{
+    background:#017bd3;
+}
+.email_sub_btn{
+    border-style:none;
+    height:30px;
+    padding:0 25px;
+    line-height:30px;
+    color:#fff;
+    background:#3a95d7;
+    text-align:center;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    font-size:14px;
+}
+.email_sub_btn:hover{
+    background:#017bd3;
+}
+.email_prompt_p{
+    font-size:14px;
+    color:#000;
+    margin-bottom:10px;
+}
+.email_prompt_txt{ width:480px;}
+.email_prompt_txt li{
+    margin-left:15px;
+    list-style-type: disc;
+    color:#777;
+    line-height:1.9;
+    font-size:14px;
+}
+.email_prompt_mes{
+    border:1px solid #ccc;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    width:468px;
+    height:60px;
+    background:#fff;
+    padding:5px;
+    margin-bottom: 5px;
+}
+.email_tanbox{
+    border:2px solid #3a95d7;
+    background:#fff;
+    width:480px;
+
+}
+.email_tancon{
+    width:420px;
+    margin:0 auto;
+    text-align:center;
+    padding:20px 30px;
+    background:#fff;
+}
+.email_tan_title{
+    font-size:18px;
+    color:#3a95d7;
+    font-weight:normal;
+    margin-bottom:5px;
+}
+.email_tan_p{
+    font-size:14px;
+    color:#4c4c4c;
+
+}
+.email_verify_p{
+    font-size:14px;
+    color:#3a95d7;
+}
+
+/***** Ajax indicator ******/
+/*-------resendmail---------*/
+#ajax-indicator {
+    position: absolute; /* fixed not supported by IE */
+    background-color:#eee;
+    border: 1px solid #bbb;
+    top:35%;
+    left:40%;
+    width:20%;
+    font-weight:bold;
+    text-align:center;
+    padding:0.6em;
+    z-index:100000;
+    opacity: 0.5;
+}
+
+html>body #ajax-indicator { position: fixed; }
+
+#ajax-indicator span {
+    background-position: 0% 40%;
+    background-repeat: no-repeat;
+    background-image: url(../images/loading.gif);
+    padding-left: 26px;
+    vertical-align: bottom;
+}
+
+div.modal {
+    border-radius: 5px;
+    background: #fff;
+    z-index: 50;
+    padding: 4px;
+}
+.ui-widget-content {
+    border: 1px solid #ddd;
+    color: #333;
+}
+.ui-widget {
+    font-family: Verdana, sans-serif;
+    font-size: 1.1em;
+}
+.ui-dialog .ui-dialog-content {
+    position: relative;
+    border: 0;
+    padding: .5em 1em;
+    background: none;
+    overflow: auto;
+    zoom: 1;
+}
+.ui-widget-overlay {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+}
+.ui-widget-overlay {
+    background: #666 url(http://forge.trustie.net/stylesheets/jquery/images/xui-bg_diagonals-thick_20_666666_40x40.png.pagespeed.ic.9mfuw_R0z1.png) 50% 50% repeat;
+    opacity: .5;
+    filter: Alpha(Opacity=50);
+}
+.resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;}
+a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle;  text-align:center; border:1px solid #3598db; color:#3598db;  -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px;}
+a:hover.Blue-btn{ background:#3598db; color:#fff;}
+/***** end Ajax indicator ******/

public/stylesheets/new_user.css

@@ -683,6 +683,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
+.homepagePostIntro p{line-height: 1;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
 .borderBottomNone {border-bottom:none !important;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
@@ -1803,3 +1804,98 @@ input.new_loggin_input{
 .W420 {width:420px;}
 .W300 {width:300px !important;}
 .W600{ width:600px;}
+
+/* 个人资料修改弹框 */
+.winbox{
+    background-color: #fff;
+    padding: 20px;
+    width:480px;
+    -webkit-border-radius:5px;
+    -moz-border-radius:5px;
+    -o-border-radius:5px;
+    border-radius:5px;
+    border:none;
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%,-50%);
+}
+.winbox_h2{
+    font-size: 14px;
+    font-weight: normal;
+    color: #333;
+    border-bottom: 1px solid #ccc;
+    height: 28px;
+}
+.winbox_edit_new{
+    /*width: 425px;*/
+    margin: 28px 0;
+}
+.winbox_edit_new li{
+    height: 45px;
+    line-height: 30px;
+    font-size: 14px;
+}
+.winbox_edit_new label{
+    width: 80px;
+    text-align: right;
+    display: block;
+}
+.winbox_input{
+    width: 330px;
+    height: 28px;
+    border: 1px solid #ccc;
+    padding: 0 5px;
+    color: #888;
+}
+.winbox_select{
+    height: 28px;
+    border: 1px solid #ccc;
+    color: #888;
+}
+.winbox_textarea{
+    width: 330px;
+    height: 50px;
+    border: 1px solid #ccc;
+    padding: 5px;
+    color: #888;
+}
+.winbox_btn_blue{
+    padding: 5px 25px;
+    color: #fff;
+    text-align: center;
+    background-color: #3b94d6;
+    border: none;
+}
+.winbox_btn_blue:hover{
+    background-color: #2e83c2;
+}
+.icons_warning{
+    display: block;
+    width:20px;
+    height:20px;
+    background:url(../images/icons_ziliao.png) 0 2px no-repeat;
+}
+.icons_right{
+    display: block;
+    width:20px;
+    height:20px;
+    background:url(../images/icons_ziliao.png) 0 -25px no-repeat;
+}
+.icons_error{
+    display: block;
+    width:20px;
+    height:20px;
+    background:url(../images/icons_ziliao.png) 0 -52px no-repeat;
+}
+a.winbox_btn_close{
+    color: #3b94d6;
+    font-size: 18px;
+    font-weight: bold;
+}
+.winbox_p{
+    font-size: 14px;
+    text-align: center;
+
+
+}

public/stylesheets/project.css

@@ -969,6 +969,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
     color: #484848;
     overflow: hidden;
 }
+.homepagePostIntro p{line-height: 1;}
 .homepagePostReply {
     width: 710px;
     margin: 10px auto 0px;

public/stylesheets/public.css

@@ -633,6 +633,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
+.homepagePostIntro p{line-height: 1;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}