Merge branch 'szzh' into dev_hjq

app/controllers/poll_controller.rb

@@ -2,6 +2,7 @@
 class PollController < ApplicationController
   before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll,:poll_result,:close_poll,:export_poll]
   before_filter :find_container, :only => [:new,:create, :index]
+  before_filter :is_logged, :only => [:index, :show, :poll_result,:new,:create,:edit,:update,:destroy,:publish_poll,:republish_poll,:close_poll,:export_poll,:commit_answer,:commit_poll,:statistics_result]
   before_filter :is_member_of_course, :only => [:index,:show,:poll_result]
   before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll,:republish_poll,:close_poll,:export_poll]
   include PollHelper
@@ -503,6 +504,10 @@ class PollController < ApplicationController
     end
   end
 
+  def is_logged
+    redirect_to signin_path unless User.current.logged?
+  end
+
   def is_member_of_course
     render_403 unless(@course && (User.current.member_of_course?(@course) || User.current.admin?))
   end

app/controllers/praise_tread_controller.rb

@@ -24,7 +24,7 @@ class PraiseTreadController < ApplicationController
         end
         return
       end
-      #@horizontal = params[:horizontal].downcase == "false" ? false:true
+      @horizontal = params[:horizontal].downcase == "false" ? false:true if params[:horizontal]
       if @obj.respond_to?("author_id")
         author_id = @obj.author_id
       elsif @obj.respond_to?("user_id")
@@ -103,30 +103,36 @@ class PraiseTreadController < ApplicationController
   def find_object_by_type_and_id(type,id)
     @obj = nil
     case type
-    when 'User'
-      @obj = User.find_by_id(id)
-    when 'Issue'
-      @obj = Issue.find_by_id(id)
-    when 'Project'
-      @obj = Project.find_by_id(id)
-    when 'Bid'
-      @obj = Bid.find_by_id(id)
-    when 'Contest'
-      @obj = Contest.find_by_id(id)
-    when  'Memo'
-      @obj = Memo.find_by_id(id)
-    when 'Message'
-      @obj = Message.find_by_id(id)
-    when 'HomeworkCommon'
-      @obj = HomeworkCommon.find_by_id(id)
-    when 'JournalsForMessage'
-      @obj = JournalsForMessage.find_by_id(id)
-    when 'News'
-      @obj = News.find_by_id(id)
-    when 'Comment'
-      @obj = Comment.find_by_id(id)
-    when 'Journal'
-      @obj = Journal.find_by_id(id)
+      when  'Memo'
+        @obj = Memo.find_by_id(id)
+      when 'Message'
+        @obj = Message.find_by_id(id)
+      when 'HomeworkCommon'
+        @obj = HomeworkCommon.find_by_id(id)
+      when 'JournalsForMessage'
+        @obj = JournalsForMessage.find_by_id(id)
+      when 'News'
+        @obj = News.find_by_id(id)
+      when 'Comment'
+        @obj = Comment.find_by_id(id)
+      when 'Journal'
+        @obj = Journal.find_by_id(id)
+      when 'BlogComment'
+        @obj = BlogComment.find_by_id(id)
+      when 'OrgDocumentComment'
+        @obj = OrgDocumentComment.find_by_id(id)
+      when 'User'
+        @obj = User.find_by_id(id)
+      when 'Issue'
+        @obj = Issue.find_by_id(id)
+      when 'Project'
+        @obj = Project.find_by_id(id)
+      when 'Bid'
+        @obj = Bid.find_by_id(id)
+      when 'Contest'
+        @obj = Contest.find_by_id(id)
+      else
+        @obj = nil
     end
     return @obj
   end
@@ -143,7 +149,8 @@ class PraiseTreadController < ApplicationController
       # end
 
       #再创建或更新praise_tread_cache表
-      @ptc = PraiseTreadCache.find_by_object_id_and_object_type(id,type)
+      #@ptc = PraiseTreadCache.find_by_object_id_and_object_type(id,type)
+      @ptc = PraiseTreadCache.where("object_id = ? and object_type = ?",id.to_i,type).first
       @ptc = @ptc.nil? ? PraiseTreadCache.new : @ptc
       @ptc.object_id = id.to_i
       @ptc.object_type = type

app/controllers/users_controller.rb

@@ -746,14 +746,34 @@ class UsersController < ApplicationController
       end
     end
     # end
-    jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+    @page = params[:page] ? params[:page].to_i + 1 : 0
+    if params[:type].present?
+      case params[:type]
+        when "public"
+          jours = @user.journals_for_messages.where('m_parent_id IS NULL and private = 0').order('created_on DESC')
+          @jour_count = jours.count
+          @jour = jours.limit(10).offset(@page * 10)
+        when "private"
+          jours = @user.journals_for_messages.where('m_parent_id IS NULL and private = 1').order('created_on DESC')
+          @jour_count = jours.count
+          @jour = jours.limit(10).offset(@page * 10)
+        else
+          jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+          @jour_count = jours.count
+          @jour = jours.limit(10).offset(@page * 10)
+      end
+    else
+      jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+      @jour_count = jours.count
+      @jour = jours.limit(10).offset(@page * 10)
+    end
+    @type = params[:type]
     if User.current == @user
       jours.update_all(:is_readed => true, :status => false)
       jours.each do |journal|
         fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
       end
     end
-    @jour = paginateHelper jours,10
     @state = false
     render :layout=>'new_base_user'
   end

app/controllers/words_controller.rb

@@ -225,11 +225,11 @@ class WordsController < ApplicationController
   def leave_user_message
     if User.current.logged?
       @user = User.find(params[:id])
-      if params[:new_form][:user_message].size>0 && User.current.logged? && @user
+      if params[:new_form][:content].size>0 && User.current.logged? && @user
         if params[:private] && params[:private] == '1'
-          @user.journals_for_messages << JournalsForMessage.new(:user_id => User.current.id, :notes => params[:new_form][:user_message], :reply_id => 0, :status => true, :is_readed => false, :private => 1)
+          @user.journals_for_messages << JournalsForMessage.new(:user_id => User.current.id, :notes => params[:new_form][:content], :reply_id => 0, :status => true, :is_readed => false, :private => 1)
         else
-          @user.add_jour(User.current, params[:new_form][:user_message])
+          @user.add_jour(User.current, params[:new_form][:content])
         end
       end
       redirect_to feedback_path(@user)

app/helpers/application_helper.rb

@@ -2789,13 +2789,6 @@ int main(int argc, char** argv){
     ss.html_safe
   end
 
-  #代码提交数量
-  def changesets_num project
-    g = Gitlab.client
-    project.gpid.nil? ? 0 : g.project(project.gpid).commit_count
-    # project.changesets.count
-end
-
   #课程动态的更新
   def update_course_activity type, id
     course_activity = CourseActivity.where("course_act_type=? and course_act_id =?", type.to_s, id).first
@@ -2836,4 +2829,13 @@ end
       principal_activity.save
     end
   end
+
+  #项目按更新时间排序
+  def project_sort_update projects
+    unless projects.empty?
+      project_ids = '('+projects.map{|pro|pro.project_id}.join(',')+')'
+      sort_projects = ForgeActivity.find_by_sql("SELECT MAX(updated_at) AS updated_at,user_id, project_id FROM forge_activities WHERE project_id IN #{project_ids} GROUP BY project_id ORDER BY MAX(updated_at) DESC")
+      return sort_projects
+    end
+  end
 end

app/models/course.rb

@@ -1,7 +1,6 @@
 require 'elasticsearch/model'
 class Course < ActiveRecord::Base
   include Redmine::SafeAttributes
-  include ApplicationHelper
 
   STATUS_ACTIVE     = 1
   STATUS_CLOSED     = 5
@@ -71,7 +70,7 @@ class Course < ActiveRecord::Base
   validates_length_of :description, :maximum => 10000
   before_save :self_validate
   # 公开课程变成私有课程，所有资源都变成私有
-  after_update :update_files_public,:update_course_ealasticsearch_index,:update_activity
+  after_update :update_files_public,:update_course_ealasticsearch_index
   after_create :create_board_sync, :act_as_course_activity, :act_as_course_message,:create_course_ealasticsearch_index
   before_destroy :delete_all_members,:delete_course_ealasticsearch_index
 
@@ -429,12 +428,6 @@ class Course < ActiveRecord::Base
     end
   end
 end
-#动态的更新
-def update_activity
-  update_course_activity(self.class, self.id)
-  update_user_activity(self.class, self.id)
-  update_org_activity(self.class, self.id)
-end
 
 # Delete the previous articles index in Elasticsearch
 # Course.__elasticsearch__.client.indices.delete index: Course.index_name rescue nil

app/views/attachments/_activity_attach.html.erb

@@ -3,7 +3,7 @@
         <div class="break_word">
           <span class="fl">
           <span title="<%= attachment.filename %>" id="attachment_<%=attachment.id %>">
-            <%= link_to_short_attachment attachment,:length=> 58, :class => 'mw400 hidden link_file_a fl newsBlue', :download => true -%>
+            <%= link_to_short_attachment attachment,:length=> 58, :class => 'hidden link_file_a fl newsBlue mw400', :download => true -%>
           </span>
           </span>
           <span class="postAttSize">(

app/views/bids/_homework.html.erb

@@ -28,7 +28,7 @@
                     $('#ajax-modal').siblings().remove();
                     $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
                             "<a href='javascript:' onclick='hiddent_alert_model();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-                    $('#ajax-modal').parent().css("top","").css("left","").css("width","511");
+                    $('#ajax-modal').parent().css("top","").css("left","").css("width","511").css("border","3px solid #269ac9");
                     $('#ajax-modal').parent().addClass("alert_praise");
                 <% end %>
 

app/views/bids/alert_anonymous_comment.js.erb

@@ -1,8 +1,8 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'alert_anonyoms', locals: { bid: @bid, totle_size:@totle_size, cur_size:@cur_size, percent:@percent}) %>');
-showModal('ajax-modal', '500px');
-//$('#ajax-modal').css('height','180px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-        "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'alert_anonyoms', locals: { bid: @bid, totle_size:@totle_size, cur_size:@cur_size, percent:@percent}) %>');
+showModal('ajax-modal', '500px');
+//$('#ajax-modal').css('height','180px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("anonymos");

app/views/blog_comments/show.html.erb

@@ -116,9 +116,18 @@
       <% count=@article.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <% unless count == 0  %>
+    <%# unless count == 0  %>
         <div class="homepagePostReplyBanner">
-          <div class="homepagePostReplyBannerCount">回复（<%=count %>）</div>
+          <div class="homepagePostReplyBannerCount">回复
+            <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+            <span id="praise_count_<%=@article.id %>">
+            <% if @article.author == User.current %>
+                <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(@article) > 0 ? "（#{get_praise_num(@article)}）" : "" %></span></span>
+            <% else %>
+                <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@article, :user_activity_id=>@article.id,:type=>"activity"}%>
+            <% end %>
+            </span>
+          </div>
           <div class="homepagePostReplyBannerTime"></div>
           <!-- <div class="homepagePostReplyBannerMore">
         <%# if @reply_count > 2%>
@@ -150,7 +159,14 @@
                   </div>
                   <div style="margin-top: -7px; margin-bottom: 5px">
                     <%= format_time(reply.created_on) %>
-                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+                    <span id="reply_praise_count_<%=reply.id %>">
+                          <% if reply.author == User.current %>
+                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
+                          <% else %>
+                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+                          <% end %>
+                      </span>
+                    <div class="fr mr10" id="reply_edit_menu_<%= reply.id%>" style="display: none">
                       <%= link_to(
                                   l(:button_reply),
                                   {:controller => 'blog_comments',:action => 'quote',:user_id=>reply.author_id,:blog_id=>reply.blog_id, :id => reply.id},
@@ -175,7 +191,7 @@
           <% end %>
         </div>
 
-    <% end %>
+    <%# end %>
     <div class="cl"></div>
     <% if !@article.locked? && User.current.logged?%>
         <div class="talkWrapMsg" nhname="about_talk_reply">

app/views/blogs/_article.html.erb

@@ -123,11 +123,17 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="topBorder" style="display: <%= count<=0 && !activity.locked ? '': 'none' %>"></div>
-    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
-      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复(
-        <%= count %>
-        )</div>
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+          <% if activity.author == User.current %>
+            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+          <% end %>
+        </span>
+      </div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <%if count > 3 %>
           <div class="homepagePostReplyBannerMore">
@@ -162,6 +168,13 @@
                           <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(reply.created_on) %>
+                      <span id="reply_praise_count_<%=reply.id %>">
+                          <% if reply.author == User.current %>
+                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
+                          <% else %>
+                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+                          <% end %>
+                      </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
                       <%= reply.content.html_safe %>
@@ -201,5 +214,13 @@
   </div>
 </div>
 <script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
+    $("#moreProject_<%=user_activity_id %>").click(function(){
+        $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
+        $("#relatePWrap_<%=user_activity_id %>").css("height","auto");
+        $(this).hide();
+    });
+    $("#hideProject_<%=user_activity_id %>").click(function(){
+        $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
+        $("#moreProject_<%=user_activity_id %>").show();
+    });
 </script>

app/views/courses/join_private_courses.js.erb

@@ -7,5 +7,5 @@ $('#ajax-modal').siblings().hide();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
         "<a href='javascript:' 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().css("top","").css("left","").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("alert_box");

app/views/courses/new_join.js.erb

@@ -1,8 +1,8 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/new_join', locals: { :course => @course}) %>');
-showModal('ajax-modal', '500px');
-$('#ajax-modal').css('height','100px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-"<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","").css("left","");
-$('#ajax-modal').parent().addClass("anonymos");
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/new_join', locals: { :course => @course}) %>');
+showModal('ajax-modal', '500px');
+$('#ajax-modal').css('height','100px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+"<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("anonymos");

app/views/courses/settings.html.erb

@@ -135,7 +135,7 @@
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
                 "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
         $('#ajax-modal').parent().addClass("anonymos");
     }
     $("#time_selected").click(select);

app/views/courses/show_member_score.js.erb

@@ -9,5 +9,5 @@ $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<span>" +
 "<a href='javascript:void(0)' onclick='hidden_homework_score_form();'><img src='/images/bid/close.png' width='26px' height='26px' style='margin-left: 375px;' /></a></span>");
 //$('#ajax-modal').parent().removeClass();
-$('#ajax-modal').parent().css("top","30%").css("left","40%").css("position","fixed");
+$('#ajax-modal').parent().css("top","30%").css("left","40%").css("position","fixed").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("new-watcher");

app/views/exercise/_exercise_submit.html.erb

@@ -1,37 +1,37 @@
-<%= form_for('',
-             :html => { :multipart => true },
-             :url => {:controller => 'exercise',
-                      :action => 'commit_exercise',
-                      :id => exercise.id
-             },:remote=>true ) do |f| %>
-<div class="ur_buttons">
-  <a class="ur_button_submit" onclick="poll_submit();"> 提交 </a>
-  <div class="polls_cha">
-    <%= f.check_box 'show_result', :value => exercise.show_result%>
-    <%= label_tag '_show_result', '允许学生查看测验结果' %>
-    <!--<input name="exercise[show_result]" value="<%#exercise.show_result %>" type="checkbox" checked="true">
-    <label for="">允许学生查看测验结果</label>-->
-  </div>
-</div>
-<% end %>
-
-<script type="text/javascript">
-    function poll_submit() {
-        var question_form = $("form.new_exercise_question");
-        if($("#polls_head_edit").is(":visible")){
-            alert("请先保存测验标题及测验基本信息。");
-        } else if(question_form.length > 0) {
-            alert("请先保存正在编辑的题目。");
-        } else{
-            $('#ajax-modal').html('<%= escape_javascript(render :partial => 'exercise_submit_info', locals: { :exercise => exercise}) %>');
-            showModal('ajax-modal', '400px');
-            //$('#ajax-modal').css('height','120px');
-            $('#ajax-modal').siblings().remove();
-            $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-                    "<a href='javascript:' onclick='clickCanel();'><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("popbox_polls");
-        }
-    }
+<%= form_for('',
+             :html => { :multipart => true },
+             :url => {:controller => 'exercise',
+                      :action => 'commit_exercise',
+                      :id => exercise.id
+             },:remote=>true ) do |f| %>
+<div class="ur_buttons">
+  <a class="ur_button_submit" onclick="poll_submit();"> 提交 </a>
+  <div class="polls_cha">
+    <%= f.check_box 'show_result', :value => exercise.show_result%>
+    <%= label_tag '_show_result', '允许学生查看测验结果' %>
+    <!--<input name="exercise[show_result]" value="<%#exercise.show_result %>" type="checkbox" checked="true">
+    <label for="">允许学生查看测验结果</label>-->
+  </div>
+</div>
+<% end %>
+
+<script type="text/javascript">
+    function poll_submit() {
+        var question_form = $("form.new_exercise_question");
+        if($("#polls_head_edit").is(":visible")){
+            alert("请先保存测验标题及测验基本信息。");
+        } else if(question_form.length > 0) {
+            alert("请先保存正在编辑的题目。");
+        } else{
+            $('#ajax-modal').html('<%= escape_javascript(render :partial => 'exercise_submit_info', locals: { :exercise => exercise}) %>');
+            showModal('ajax-modal', '400px');
+            //$('#ajax-modal').css('height','120px');
+            $('#ajax-modal').siblings().remove();
+            $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+                    "<a href='javascript:' onclick='clickCanel();'><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","").css("border","3px solid #269ac9");
+            $('#ajax-modal').parent().addClass("popbox_polls");
+        }
+    }
 </script>

app/views/exercise/commit_exercise.js.erb

@@ -1,8 +1,8 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status,:exercise =>@exercise}) %>');
-showModal('ajax-modal', '270px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-        "<a href='javascript:' onclick='hidden_atert_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').html('<%= escape_javascript(render :partial => 'commit_alert',:locals => {:status => @status,:exercise =>@exercise}) %>');
+showModal('ajax-modal', '270px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='hidden_atert_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","").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("alert_box");

app/views/exercise/index.html.erb

@@ -25,7 +25,7 @@
         $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
                 "<a onclick='clickCanel();'><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().css("top","").css("left","").css("border","3px solid #269ac9");
         $('#ajax-modal').parent().addClass("popbox_polls");
     }
 
@@ -57,7 +57,7 @@
             $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
                     "<a href='javascript:' onclick='clickCanel();'><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().css("top","").css("left","").css("border","3px solid #269ac9");
             $('#ajax-modal').parent().addClass("popbox_polls");
         }
     }

app/views/exercise/publish_exercise.js.erb

@@ -1,10 +1,10 @@
-$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index =>@index}) %>");
-$('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_memo_create_succ)}) %>");
-showModal('ajax-modal', '250px');
-//$('#ajax-modal').css('height','111px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-        "<a href='javascript:' onclick='close_alert_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","");
+$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index =>@index}) %>");
+$('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_memo_create_succ)}) %>");
+showModal('ajax-modal', '250px');
+//$('#ajax-modal').css('height','111px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='close_alert_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","").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("poll_alert_form");

app/views/exercise/republish_exercise.js.erb

@@ -1,10 +1,10 @@
-$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index => @index}) %>");
-$('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_poll_republish_success)}) %>");
-showModal('ajax-modal', '250px');
-//$('#ajax-modal').css('height','80px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-        "<a href='javascript:' onclick='close_alert_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","");
+$("#exercises_<%= @exercise.id %>").html("<%= escape_javascript(render :partial => 'exercise',:locals => {:exercise => @exercise,:index => @index}) %>");
+$('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_poll_republish_success)}) %>");
+showModal('ajax-modal', '250px');
+//$('#ajax-modal').css('height','80px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='close_alert_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","").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("poll_alert_form");

app/views/files/_course_file.html.erb

@@ -40,7 +40,7 @@
         showModal('ajax-modal', '513px');
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-        $('#ajax-modal').parent().css("top","").css("left","");
+        $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
         $('#ajax-modal').parent().addClass("popbox_polls");
     }
 

app/views/files/_project_file_new.html.erb

@@ -6,7 +6,7 @@
         showModal('ajax-modal', '513px');
         $('#ajax-modal').siblings().remove();
         $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-        $('#ajax-modal').parent().css("top","40%").css("left","36%");
+        $('#ajax-modal').parent().css("top","40%").css("left","36%").css("border","3px solid #269ac9");
         $('#ajax-modal').parent().addClass("popbox_polls");
     }
 

app/views/files/quote_resource_show.js.erb

@@ -7,5 +7,5 @@
 showModal('ajax-modal', '513px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("popbox_polls");

app/views/files/quote_resource_show_org_subfield.js.erb

@@ -1,11 +1,11 @@
-<% if @can_quote %>
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'show_quote_resource_org_subfield',:locals => {:org_subfield => @org_subfield,:file => @file,:error => ''}) %>');
-<% else %>
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'show_quote_resource_org_subfield',:locals => {:org_subfield => @org_subfield,:file => @file,:error => '403'}) %>');
-<% end %>
-
-showModal('ajax-modal', '513px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-$('#ajax-modal').parent().css("top","").css("left","");
+<% if @can_quote %>
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'show_quote_resource_org_subfield',:locals => {:org_subfield => @org_subfield,:file => @file,:error => ''}) %>');
+<% else %>
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'show_quote_resource_org_subfield',:locals => {:org_subfield => @org_subfield,:file => @file,:error => '403'}) %>');
+<% end %>
+
+showModal('ajax-modal', '513px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
+$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("popbox_polls");

app/views/files/quote_resource_show_project.js.erb

@@ -7,5 +7,5 @@
 showModal('ajax-modal', '513px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal()' style='margin-left: 480px;'><img src='/images/bid/close.png' width='26px' height='26px' /></a>");
-$('#ajax-modal').parent().css("top","30%").css("left","35%");
+$('#ajax-modal').parent().css("top","30%").css("left","35%").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("popbox_polls");