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

app/api/mobile/apis/blog_comments.rb

@@ -6,10 +6,17 @@ module Mobile
       resources :blog_comments do
 
         desc "get special topic"
-        get ':id' do
+        post ':id' do
           user = current_user
+
+          #0一级回复的更多  1 二级回复的更多
+          type =  params[:type] || 0
+          page =  params[:page] || 0
+
           blog = BlogComment.find params[:id]
-          present :data, blog, with: Mobile::Entities::BlogComment,user: user
+          present :data, blog, with: Mobile::Entities::BlogComment,user: user,type: type,page: page
+          present :type, type
+          present :page, page
           present :status, 0
         end
       end

app/api/mobile/apis/courses.rb

@@ -200,8 +200,13 @@ module Mobile
             # course = Course.find(params[:id])
             cs = CoursesService.new
             course = cs.show_course(params,current_user)
-            present :data, course, with: Mobile::Entities::Course,user: current_user
+
-           { status: 0}
+            if course[:course][:is_delete] == 1
+              {status:-1, message: '该班级不存在或已被删除啦' }
+            else
+              present :data, course, with: Mobile::Entities::Course,user: current_user
+              present :status, 0
+            end
           end
         end
 
@@ -212,7 +217,7 @@ module Mobile
         get "homeworks/:id" do
           cs = CoursesService.new
           homeworks = cs.homework_list params,current_user
-          present :data, homeworks, with: Mobile::Entities::Homework
+          present :data, homeworks, with: Mobile::Entities::Homework,user: current_user
           present :status, 0
         end
 
@@ -259,7 +264,7 @@ module Mobile
         post ":course_id/attachments" do
           cs = CoursesService.new
           count = cs.course_attachments params
-          present :data, count, with: Mobile::Entities::Attachment
+          present :data, count, with: Mobile::Entities::Attachment,user: current_user
           present :status, 0
         end
 
@@ -392,8 +397,8 @@ module Mobile
           authenticate!
 
           course = Course.find(params[:course_id])
-          exercises = course.exercises.where("exercise_status <> 1").order("created_at desc")
+          exercises = course.exercises.where("exercise_status <> 1").reorder("created_at desc")
-          present :data,exercises,with:Mobile::Entities::Exercise
+          present :data,exercises,with:Mobile::Entities::Exercise,user: current_user
           present :status,0
         end
 

app/api/mobile/apis/issues.rb

@@ -7,11 +7,17 @@ module Mobile
         include IssuesHelper
 
         desc "get special issuse"
-        get ':id' do
+        post ':id' do
           authenticate!
           user = current_user
+
+          #0一级回复的更多  1 二级回复的更多
+          type =  params[:type] || 0
+          page =  params[:page] || 0
           issue = Issue.find params[:id]
-          present :data, issue, with: Mobile::Entities::Issue,user: user
+          present :data, issue, with: Mobile::Entities::Issue,user: user,type: type,page: page
+          present :type, type
+          present :page, page
           present :status, 0
         end
       end

app/api/mobile/apis/journal_for_messages.rb

@@ -6,11 +6,18 @@ module Mobile
       resources :journal_for_messages do
 
         desc "get special journal"
-        get ':id' do
+        post ':id' do
           authenticate!
           user = current_user
+
+          #0一级回复的更多  1 二级回复的更多
+          type =  params[:type] || 0
+          page =  params[:page] || 0
+
           jour = JournalsForMessage.find params[:id]
-          present :data, jour, with: Mobile::Entities::Jours,user: user
+          present :data, jour, with: Mobile::Entities::Jours,user: user,type: type,page: page
+          present :type, type
+          present :page, page
           present :status, 0
         end
       end

app/api/mobile/apis/messages.rb

@@ -6,11 +6,17 @@ module Mobile
       resources :messages do
 
         desc "get special topic"
-        get ':id' do
+        post ':id' do
           authenticate!
           user = current_user
+
+          #0一级回复的更多  1 二级回复的更多
+          type =  params[:type] || 0
+          page =  params[:page] || 0
           message = Message.find params[:id]
-          present :data, message, with: Mobile::Entities::Message,user: user
+          present :data, message, with: Mobile::Entities::Message,user: user,type: type,page: page
+          present :type, type
+          present :page, page
           present :status, 0
         end
       end

app/api/mobile/apis/newss.rb

@@ -6,11 +6,17 @@ module Mobile
       resources :newss do
 
         desc "get special news"
-        get ':id' do
+        post ':id' do
           authenticate!
           user = current_user
+
+          #0一级回复的更多  1 二级回复的更多
+          type =  params[:type] || 0
+          page =  params[:page] || 0
           news = News.find params[:id]
-          present :data, news, with: Mobile::Entities::News,user: user
+          present :data, news, with: Mobile::Entities::News,user: user,type: type,page: page
+          present :type, type
+          present :page, page
           present :status, 0
         end
       end

app/api/mobile/apis/resources.rb

@@ -85,12 +85,26 @@ module Mobile
           requires :token, type: String
           requires :course_ids, type: Array[Integer]
           requires :send_id, type: Integer
+          requires :send_type, type: Integer
         end
         post 'send' do
           authenticate!
 
           rs = ResourcesService.new
-          ori, flag, save_message = rs.send_resource_to_course(current_user,params)
+
+          ori = nil
+          flag = false
+          save_message = nil
+
+          case params[:send_type]
+            when 1
+              ori, flag, save_message = rs.send_resource_to_course(current_user,params)
+            when 2
+              ori, flag, save_message = rs.send_homework_to_course(current_user,params)
+            when 3
+              ori, flag, save_message = rs.send_exercise_to_course(current_user,params)
+          end
+
           if flag
             present :status, 0
           else

app/api/mobile/apis/whomeworks.rb

@@ -6,11 +6,17 @@ module Mobile
       resources :whomeworks do
 
         desc "get one homework"
-        get ':id' do
+        post ':id' do
           authenticate!
           user = current_user
+
+          #0一级回复的更多  1 二级回复的更多
+          type =  params[:type] || 0
+          page =  params[:page] || 0
           homework = HomeworkCommon.find params[:id]
-          present :data, homework, with: Mobile::Entities::Whomework,user: user
+          present :data, homework, with: Mobile::Entities::Whomework,user: user,type: type,page: page
+          present :type, type
+          present :page, page
           present :status, 0
         end
       end

app/api/mobile/entities/activity.rb

@@ -25,10 +25,12 @@ module Mobile
                   elsif ac.act_type == "News"
                     ac.nil? || ac.act.nil? ? 0 : ac.act.comments.count
                   elsif ac.act_type == "Message" || ac.act_type == "BlogComment" || ac.act_type == "JournalsForMessage"
-                    ac.nil? || ac.act.nil? ? 0 : ac.act.children.count
+                    all_comments = []
+                    ac.nil? || ac.act.nil? ? 0 : get_all_children(all_comments, ac.act).count
                   elsif ac.act_type == "Issue"
                     ac.nil? || ac.act.nil? ? 0 : ac.act.journals.where("notes is not null and notes != ''").count
                   end
+
                 when :subject
                   if ac.act_type == "HomeworkCommon"
                     ac.act.name unless ac.nil? || ac.act.nil?

app/api/mobile/entities/attachment.rb

@@ -3,6 +3,7 @@ module Mobile
     class Attachment  < Grape::Entity
       include Redmine::I18n
       include ActionView::Helpers::NumberHelper
+      include ApplicationHelper
       def self.attachment_expose(field)
         expose field do |f,opt|
           if f.is_a?(Hash) && f.key?(field)
@@ -22,6 +23,7 @@ module Mobile
                   (number_to_human_size(f.filesize)).gsub("ytes", "").to_s
                 when :coursename
                   f.course.nil? ? "" : f.course.name
+
               end
             end
           end
@@ -36,6 +38,12 @@ module Mobile
       attachment_expose :file_dir
       attachment_expose :attafile_size
       attachment_expose :coursename   #所属班级名
+      expose :current_user_is_teacher, if: lambda { |instance, options| options[:user] } do |instance, options|
+        current_user = options[:user]
+        current_user_is_teacher = false
+        current_user_is_teacher = is_course_teacher(current_user,instance.course)
+        current_user_is_teacher
+      end
     end
   end
 end

app/api/mobile/entities/blog_comment.rb

@@ -25,7 +25,9 @@ module Mobile
                 when :act_id
                   u.id
                 when :comment_count
-                  u.children.count
+                  # u.children.count
+                  all_comments = []
+                  get_all_children(all_comments, u).count
               end
             end
           end
@@ -51,7 +53,18 @@ module Mobile
       blog_comment_expose :praise_count
       expose :blog_comment_children, using:Mobile::Entities::BlogComment do |c,opt|
         if c.is_a? (::BlogComment)
-          c.children.reverse
+          ##自己的父回复为空  才有子回复
+          if !opt[:children]
+            if c.parent.nil? && opt[:type] == 0
+              opt[:children] = true
+              all_comments = []
+              tStart = opt[:page]*5
+              tEnd = (opt[:page]+1)*5 - 1
+
+              all_comments = get_all_children(all_comments, c)[tStart..tEnd]
+              all_comments
+            end
+          end
         end
       end
       expose :has_praise, if: lambda { |instance, options| options[:user] } do |instance, options|
@@ -61,6 +74,63 @@ module Mobile
         has_praise = obj.empty? ? false : true
         has_praise
       end
+
+      expose :parents_count, if: lambda { |instance, options| options[:user] } do |instance, options|
+        parents_reply = []
+        parents_reply = get_reply_parents_no_root(parents_reply, instance)
+        parents_reply.count
+      end
+
+      expose :parents_reply_bottom, using:Mobile::Entities::BlogComment do |c,opt|
+        if c.is_a? (::BlogComment)
+          #取二级回复的底楼层
+          parents_reply = []
+          parents_reply = get_reply_parents_no_root(parents_reply, c)
+          if parents_reply.count > 0 && !opt[:bottom]
+            if opt[:type] == 1
+              # opt[:bottom] = true
+              # parents_reply[opt[:page]..opt[:page]]
+            else
+              opt[:bottom] = true
+              parents_reply[0..0]
+            end
+          else
+            []
+          end
+        end
+      end
+
+      expose :parents_reply_top, using:Mobile::Entities::BlogComment do |c,opt|
+        if c.is_a? (::BlogComment)
+          #取二级回复的顶楼层
+          parents_reply = []
+          parents_reply = get_reply_parents_no_root(parents_reply, c)
+          if parents_reply.count > 0 && !opt[:top]
+            if opt[:type] == 1
+              opt[:bottom] = true
+              tStart = (opt[:page]-1)*5+2
+              tEnd = (opt[:page])*5+2 - 1
+
+              if tEnd >= parents_reply.count - 1
+                tEnd = parents_reply.count - 2
+              end
+
+              if tStart <= parents_reply.count - 2
+                parents_reply = parents_reply.reverse[tStart..tEnd]
+                parents_reply.reverse
+              else
+                []
+              end
+            else
+              opt[:top] = true
+              parents_reply = parents_reply.reverse[0..1]
+              parents_reply.reverse
+            end
+          else
+            []
+          end
+        end
+      end
     end
   end
 end

app/api/mobile/entities/exercise.rb

@@ -27,6 +27,14 @@ module Mobile
       expose :exercise_name
       expose :exercise_description
       exercise_expose :coursename #所属班级名
+
+      expose :current_user_is_teacher, if: lambda { |instance, options| options[:user] } do |instance, options|
+        current_user = options[:user]
+        current_user_is_teacher = false
+        current_user_is_teacher = is_course_teacher(current_user,instance.course)
+        current_user_is_teacher
+      end
+
     end
   end
 end

app/api/mobile/entities/homework.rb

@@ -98,6 +98,14 @@ module Mobile
 
       homework_expose :coursename #所属班级名
 
+      expose :current_user_is_teacher, if: lambda { |instance, options| options[:user] } do |instance, options|
+        if instance[:current_user_is_teacher].nil?
+          current_user = options[:user]
+          current_user_is_teacher = false
+          current_user_is_teacher = is_course_teacher(current_user,instance.course)
+          current_user_is_teacher
+        end
+      end
     end
   end
 end

app/api/mobile/entities/issue.rb

@@ -23,7 +23,9 @@ module Mobile
                 when :issue_status
                   IssueStatus.find(issue.status_id).name
                 when :journals_count
-                  issue.journals.where("notes is not null and notes != ''").count
+                  # issue.journals.where("notes is not null and notes != ''").count
+                  all_comments = []
+                  get_all_children(all_comments, f).count
                 when :project_name
                   issue.project.name
                 when :praise_count

app/api/mobile/entities/jours.rb

@@ -18,7 +18,9 @@ module Mobile
               when :lasted_comment
                 time_from_now f.created_on
               when :reply_count
-                f.children.count
+                # f.children.count
+                all_comments = []
+                get_all_children(all_comments, f).count
               when :praise_count
                 get_activity_praise_num(f)
               when :act_type

app/api/mobile/entities/message.rb

@@ -30,6 +30,9 @@ module Mobile
                   'Message'
                 when :act_id
                   u.id
+                when :replies_count
+                  all_comments = []
+                  get_all_children(all_comments, u).count
               end
             end
           end

app/api/mobile/entities/news.rb

@@ -24,6 +24,9 @@ module Mobile
                   'News'
                 when :act_id
                   f.id
+                when :comments_count
+                  all_comments = []
+                  get_all_children(all_comments, f).count
               end
             end
           elsif f.is_a?(Hash) && !f.key?(field)

app/controllers/wechats_controller.rb

@@ -78,12 +78,7 @@ class WechatsController < ActionController::Base
   end
   # When user view URL in the menu button
   on :view, with: 'http://wechat.somewhere.com/view_url' do |request, view|
-    uw = user_binded?(request[:FromUserName])
+    request.reply.text "#{request[:FromUserName]} view #{view}"
-    unless uw
-      sendBind(request)
-    else
-      request.reply.text "#{request[:FromUserName]} view #{view}"
-    end
   end
 
   # When user sent the imsage
@@ -147,6 +142,14 @@ class WechatsController < ActionController::Base
     default_msg(request)
   end
 
+  on :click, with: 'PROJECT' do |request, key|
+    request.reply.text "此功能正在开发中，很快就会上线，谢谢！"
+  end
+
+  on :click, with: 'JOIN_PROJECT' do |request, key|
+    request.reply.text "此功能正在开发中，很快就会上线，谢谢！"
+  end
+
   on :click, with: 'JOIN_CLASS' do |request, key|
     uw = user_binded?(request[:FromUserName])
       unless uw
@@ -218,8 +221,8 @@ class WechatsController < ActionController::Base
       raise CoursesService::JoinCourseError.message(status[:state])
     end
 
-    news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级,开始学习吧!',
+    news = (1..1).each_with_object([]) { |n, memo| memo << { title: '恭喜您成功加入班级，开始学习吧！',
-                                                             content: "课程名称: #{course.name}\n班级名称: #{course.name}\n任课老师: #{course.teacher.show_name}\n进入班级,和小伙伴愉快的学习吧!"} }
+                                                             content: "课程名称：#{course.name}\n班级名称：#{course.name}\n任课老师：#{course.teacher.show_name}\n进入班级，和小伙伴愉快的学习吧！"} }
     return request.reply.news(news) do |article, n, index| # article is return object
       url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=#{Wechat.config.appid}&redirect_uri=#{ROOT_URL+'/wechat/user_activities#/class?id='+course.id.to_s}&response_type=code&scope=snsapi_base&state=myclass#wechat_redirect"
       pic_url = "#{ROOT_URL}/images/wechat/class.jpg"
@@ -274,7 +277,7 @@ class WechatsController < ActionController::Base
             user: user
         )
         ws = WechatService.new
-        ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台", user.login, format_time(Time.now))
+        ws.binding_succ_notice(user.id, "您已成功绑定Trustie平台！", user.login, format_time(Time.now))
         render :json => {status:0, msg: "绑定成功"}
       rescue Exception=>e
         render :json => {status: -1, msg: e.message}

app/helpers/wechats_helper.rb

@@ -0,0 +1,20 @@
+#coding=utf-8
+#
+
+module WechatsHelper
+  def include_wechat_jsfile
+    if Rails.env.production?
+       javascript_include_tag '/javascripts/wechat/build/app.min.js'
+    else
+       wechat_path = File.join(Rails.root, "public", "javascripts", "wechat")
+       srcs = Rails.application.config.wechat_srcs
+       paths = []
+       srcs.each do |src|
+         Dir.glob(wechat_path+ "/#{src}"  ) do |path|
+           paths << path[File.join(Rails.root, "public").to_s.size, path.size]
+         end
+       end
+       javascript_include_tag *paths
+    end
+  end
+end

app/services/courses_service.rb

@@ -335,6 +335,7 @@ class CoursesService
         8, '您已经是该班级的教师了',
         9, '您已经是该班级的教辅了',
         10, '您已经是该班级的管理员了',
+        11, '该班级不存在或已被删除啦',
         '未知错误，请稍后再试'
     ]
   end
@@ -348,6 +349,8 @@ class CoursesService
     if course
       if course_endTime_timeout? course
         @state = 2
+      elsif course[:is_delete] == 1
+        @state = 11
       else
         if current_user.member_of_course?(course) #如果已经是成员
           member = course.members.where("user_id=#{current_user.id} and course_id=#{course.id}")[0]
@@ -392,7 +395,7 @@ class CoursesService
   def homework_list params,current_user
     course = Course.find(params[:id])
     if course.is_public != 0 || current_user.member_of_course?(course)
-      bids = course.homework_commons.where("publish_time <= ?",Time.now.strftime("%Y-%m-%d")).page(params[:page] || 1).per(20).order('created_at DESC')
+      bids = course.homework_commons.where("publish_time <= ?",Time.now.strftime("%Y-%m-%d")).page(params[:page] || 1).per(20).reorder('created_at DESC')
       bids = bids.like(params[:name]) if params[:name].present?
       homeworks = []
       bids.each do |bid|
@@ -495,7 +498,7 @@ class CoursesService
   def course_attachments params
     result = []
     course = Course.find(params[:course_id])
-    attachments = course.attachments.where("is_publish = 1").order("created_on desc")
+    attachments = course.attachments.where("is_publish = 1").reorder("created_on desc")
     if !params[:name].nil? && params[:name] != ""
       attachments.each do |atta|
         result << atta if atta.filename.include?(params[:name])
@@ -632,7 +635,7 @@ class CoursesService
      :homework_submit_num => bid.student_works.count,
      :homework_status_student => get_homework_status( bid),:homework_status_teacher =>  homework_status_desc( bid),
      :student_evaluation_part => get_evaluation_part( bid ,3),
-     :ta_evaluation_part => get_evaluation_part( bid ,2),:homework_anony_type => bid.homework_type == 1 && !bid.homework_detail_manual.nil?}
+     :ta_evaluation_part => get_evaluation_part( bid ,2),:homework_anony_type => bid.homework_type == 1 && !bid.homework_detail_manual.nil?,:current_user_is_teacher => is_course_teacher}
 
   end
 

app/services/resources_service.rb

@@ -49,6 +49,125 @@ class ResourcesService
     [@ori, @flag, @save_message]
   end
 
+  def send_homework_to_course user,params
+    homework = HomeworkCommon.find params[:send_id].to_i
+    @ori = homework
+    course_ids = params[:course_ids]
+    @flag = false
+    unless course_ids.nil?
+      course_ids.each do |course_id|
+        course = Course.find course_id.to_i
+        new_homework = HomeworkCommon.new
+        new_homework.name = homework.name
+        new_homework.user_id = user.id
+        new_homework.description = homework.description
+        new_homework.homework_type = homework.homework_type
+        new_homework.late_penalty = homework.late_penalty
+        new_homework.course_id = course.id
+        new_homework.teacher_priority = homework.teacher_priority
+        new_homework.anonymous_comment = homework.anonymous_comment
+        new_homework.quotes = 0
+        new_homework.is_open = homework.is_open
+        homework.attachments.each do |attachment|
+          att = attachment.copy
+          att.container_id = nil
+          att.container_type = nil
+          att.copy_from = attachment.id
+          att.save
+          new_homework.attachments << att
+        end
+        homework_detail_manual = homework.homework_detail_manual
+        homework_detail_programing = homework.homework_detail_programing
+        homework_detail_group = homework.homework_detail_group
+        if homework_detail_manual
+          new_homework.homework_detail_manual = HomeworkDetailManual.new
+          new_homework_detail_manual =  new_homework.homework_detail_manual
+          new_homework_detail_manual.ta_proportion = homework_detail_manual.ta_proportion
+          new_homework_detail_manual.comment_status = 0
+          new_homework_detail_manual.evaluation_num = homework_detail_manual.evaluation_num
+          new_homework_detail_manual.absence_penalty = homework_detail_manual.absence_penalty
+        end
+        if homework_detail_programing
+          new_homework.homework_detail_programing = HomeworkDetailPrograming.new
+          new_homework.homework_detail_programing.ta_proportion = homework_detail_programing.ta_proportion
+          new_homework.homework_detail_programing.language = homework_detail_programing.language
+          homework.homework_tests.each_with_index do |homework_test|
+            new_homework.homework_tests << HomeworkTest.new(
+                input: homework_test.input,
+                output: homework_test.output
+            )
+          end
+        end
+
+        if homework_detail_group
+          new_homework.homework_detail_group = HomeworkDetailGroup.new
+          new_homework.homework_detail_group.min_num = homework_detail_group.min_num
+          new_homework.homework_detail_group.max_num = homework_detail_group.max_num
+          new_homework.homework_detail_group.base_on_project = homework_detail_group.base_on_project
+        end
+        if new_homework.save
+          new_homework_detail_manual.save if new_homework_detail_manual
+          new_homework.homework_detail_programing.save if new_homework.homework_detail_programing
+          new_homework.homework_detail_group.save if new_homework.homework_detail_group
+          @flag = true
+        else
+          @flag = false
+          @save_message = new_homework.errors.full_messages
+          break
+        end
+        homework.update_column(:quotes, homework.quotes+1)
+      end
+    end
+    [@ori, @flag, @save_message]
+  end
+
+  def send_exercise_to_course user,params
+    # send_id  = params[:send_id]
+    # @ori = Attachment.find_by_id(send_id)
+    # course_ids = params[:course_ids]
+    # @flag = false
+    # unless course_ids.nil?
+    #   course_ids.each do |id|
+    #     next if @ori.blank?
+    #     @exist = false
+    #     Course.find(id).attachments.each do |att|  #如果课程中包含该资源
+    #       if att.id == @ori.id || (!att.copy_from.nil? && !@ori.copy_from.nil? && att.copy_from == @ori.copy_from) || att.copy_from == @ori.id || att.id == @ori.copy_from
+    #         att.created_on = Time.now
+    #         att.save
+    #         @exist = true
+    #         @flag = true
+    #         break
+    #       end
+    #     end
+    #     next if @exist
+    #     attach_copied_obj = @ori.copy
+    #     attach_copied_obj.tag_list.add(@ori.tag_list) # tag关联
+    #     attach_copied_obj.container = Course.find(id)
+    #     attach_copied_obj.created_on = Time.now
+    #     attach_copied_obj.author_id = user.id
+    #     attach_copied_obj.is_public = 0
+    #     attach_copied_obj.copy_from = @ori.copy_from.nil? ? @ori.id : @ori.copy_from #发送要添加copy_from
+    #     if attach_copied_obj.attachtype == nil
+    #       attach_copied_obj.attachtype = 4
+    #     end
+    #     if attach_copied_obj.save
+    #       # 更新引用次数
+    #       quotes = @ori.quotes.to_i + 1
+    #       @ori.update_attribute(:quotes, quotes) unless @ori.nil?
+    #       @ori.forwards << Forward.new(:to_type => attach_copied_obj.class.name, :to_id => attach_copied_obj.id,:created_at => Time.now)
+    #       @flag = true
+    #     else
+    #       @flag = false
+    #       @save_message = attach_copied_obj.errors.full_messages
+    #       break
+    #     end
+    #
+    #   end
+    # end
+
+    [@ori, @flag, @save_message]
+  end
+
   # 我的资源-课件 已发布的
   def all_course_attachments user
 

app/services/syllabuses_service.rb

@@ -71,8 +71,8 @@ class SyllabusesService
     count = ShieldWechatMessage.where("container_type='User' and container_id=#{user.id} and shield_type='Course' and shield_id=#{course.id}").count
     if count == 0
       ws = WechatService.new
-      title = "恭喜您创建班级成功"
+      title = "恭喜您创建班级成功。"
-      ws.create_class_notice user.id, "create_course_notice", course.id,title, course.name, user.show_name, 0, "点击查看班级详情"
+      ws.create_class_notice user.id, "create_course_notice", course.id,title, course.name, user.show_name, 0, "点击查看班级详情。"
     end
   end
 

app/services/wechat_service.rb

@@ -229,7 +229,7 @@ class WechatService
                   color:"#707070"
               },
               remark:{
-                  value:"绑定成功后可使用微信查看Trustie平台最新动态",
+                  value:"绑定成功后可使用微信查看Trustie平台最新动态。",
                   color:"#707070"
               }
           }

app/views/account/about_us.html.erb

@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag 'new_user'%>
+<%= stylesheet_link_tag 'css/public'%>
 <div class="homepageContent BgBox">
   <h2 class="BgBox_h2">关于我们</h2>
   <div class="AgreementBox">

app/views/account/agreement.html.erb

@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag 'new_user'%>
+<%= stylesheet_link_tag 'css/public'%>
 <!--<div class="homepageContentContainer mb20" >-->
   <div class="homepageContent BgBox mt10">
   	<h2 class="BgBox_h2">Trustie服务协议</h2>
@@ -28,24 +28,5 @@
     
     
   </div><!---BgBox end--->
-<!--</div>&lt;!&ndash;-homepageContentContainer end-&ndash;&gt;-->
+<!--</div>-->
-<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

@@ -1,5 +1,5 @@
-<%= stylesheet_link_tag 'new_user'%>
+<%= stylesheet_link_tag 'css/common'%>
-<%= stylesheet_link_tag 'leftside'%>
+<%= stylesheet_link_tag 'css/public'%>
 
 <script type="text/javascript">
     $(document).ready(function(){

app/views/account/lost_password.html.erb

@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag 'new_user'%>
+<%= stylesheet_link_tag 'css/public'%>
 
 <div class="homepageContentContainer ">
   <div class="homepageContent BgBox">

app/views/attachments/_issue_reply.html.erb

@@ -9,7 +9,7 @@
 </span>
 <span class="add_attachment">
   <% id ="file#{container.id}"%>
-  <a href="javascript:void(0);" class="AnnexBtn fl" style= "<%= ie8? ? 'display:none' : ''%>" onclick="$('#'+'<%= id %>').click();">上传附件</a>
+  <a href="javascript:void(0);" class="AnnexBtn fl mr10" style= "<%= ie8? ? 'display:none' : ''%>" onclick="$('#'+'<%= id %>').click();">上传附件</a>
   <%= file_field_tag 'attachments[dummy][file]',
                      :id => "file#{container.id}",
                      :class => 'file_selector',

app/views/attachments/_show_attachment_history.html.erb

@@ -16,7 +16,7 @@
         <span class="attachment">
           <%= link_to truncate(history.filename,length: 35, omission: '...'),
                       download_history_attachment_path(history.id, history.filename),
-                      :title => history.filename+"\n"+history.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f_14 f_b link_file_a2 fl"  %>
+                      :title => history.filename+"\n"+history.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis; max-width:300px;",:class => "linkBlue f_14 f_b upload_filename fl"  %>
           <span class="fr">版本号：<%= history.version %></span>
           <div class="cl"></div>
         </span>

app/views/bids/_new_homework_form.html.erb

@@ -46,7 +46,7 @@
     </li>
     <li class=" ml90" >
       <a class="blue_btn fl c_white" onclick="submit_new_bid('<%= bid_id%>');" href="javascript:void(0)"><%= l(:button_create)%></a>
-      <%= link_to l(:button_cancel), homework_course_path(@course), :class => "blue_btn grey_btn fl c_white"%>
+      <%= link_to l(:button_cancel), homework_course_path(@course), :class => "grey_btn fl c_white ml10"%>
       <div class="cl"></div>
     </li>
   </ul>

app/views/boards/_edit.html.erb

@@ -13,7 +13,7 @@
             <%= render :partial => 'form_project',
                      :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
             <div class="ml55 fl" nhname="toolbar_container"></div>
-            <a href="javascript:void(0)" nhname='cancelbtn' class="blue_btn grey_btn fr c_white ml10"><%= l(:button_cancel) %></a>
+            <a href="javascript:void(0)" nhname='cancelbtn' class="grey_btn fr c_white ml10"><%= l(:button_cancel) %></a>
             <a href="javascript:void(0)" nhname='submitbtn' class="blue_btn fr c_white" ><%= l(:button_submit)%></a>
           <%#= link_to l(:button_cancel), board_message_url(topic.board, topic.root, :r => (topic.parent_id && topic.id)), :class => "blue_btn grey_btn fl c_white"  %>
         </ul>
@@ -33,7 +33,7 @@
               <%= render :partial => 'form_course',
                          :locals => {:f => f, :replying => !topic.parent.nil?, :topic => topic} %>
               <div class="ml55 fl" nhname="toolbar_container"></div>
-              <a href="javascript:void(0)"  nhname='cancelbtn' class="blue_btn grey_btn fr c_white ml10"><%= l(:button_cancel) %></a>
+              <a href="javascript:void(0)"  nhname='cancelbtn' class="grey_btn fr c_white ml10"><%= l(:button_cancel) %></a>
               <a href="javascript:void(0)"  nhname='submitbtn' class="blue_btn fr c_white"><%= l(:button_submit)%></a>
 
         <% end %>

app/views/courses/_courses_jours.html.erb

@@ -35,8 +35,8 @@
             <div nhname='toolbar_container_' ></div>
             <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_' name="new_form[course_message]"></textarea>
             <p nhname='contentmsg_'></p>
-            <a id="new_message_cancel_btn_" href="javascript:void(0)" class="grey_btn fr mt10">取消</a>
+            <a id="new_message_cancel_btn_" href="javascript:void(0)" class="grey_btn fr mt10 ml10 mb10">取消</a>
-            <a href="javascript:void(0);" class="blue_btn fr ml10 mt10" id="new_message_submit_btn_" >留言</a>
+            <a href="javascript:void(0);" class="blue_btn fr mt10" id="new_message_submit_btn_" >留言</a>
         <% end %>
       </div>
   <% end %>

app/views/courses/new.html.erb

@@ -75,7 +75,7 @@
         </li>
         <li class=" ml90" >
           <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_course();" >提交</a>
-          <%= link_to "取消",user_activities_path(User.current.id),:class => "blue_btn grey_btn fl c_white"%>
+          <%= link_to "取消",user_activities_path(User.current.id),:class => "grey_btn fl c_white ml10"%>
           <div class="cl"></div>
         </li>
     <% end%>

app/views/courses/settings.html.erb

@@ -92,7 +92,7 @@
           </li>
           <li class=" ml90" >
             <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_edit_course(<%= @course.id%>);" >提交</a>
-            <%= link_to l(:button_cancel), course_path(@course), :class => "blue_btn grey_btn fl c_white" %>
+            <%= link_to l(:button_cancel), course_path(@course), :class => "grey_btn fl c_white ml10" %>
             <div class="cl"></div>
           </li>
       <% end %>

app/views/courses/settings/_join_org.html.erb

@@ -5,7 +5,7 @@
 
 <!--</div>-->
 <!--</div>-->
-<%= stylesheet_link_tag 'org' %>
+<%= stylesheet_link_tag 'css/org' %>
 
 <div>
   <div class="relateOrg fl">

app/views/courses/show.html.erb

@@ -12,7 +12,7 @@
   <div class="NewsBannerName">班级动态</div>
   <ul class="resourcesSelect">
     <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-      <ul class="homepagePostType">
+      <ul class="homepagePostType" style="width:90px; left:-80px;">
         <li>
           <ul class="homepagePostTypeHomework fl">
             <li><%= link_to "全部动态", {:controller => "courses", :action => "show", :type => nil}, :class =>"homepagePostTypeAll postTypeGrey"%></li>

app/views/exercise/_edit_MC.html.erb

@@ -34,7 +34,7 @@
           <div id="poll_answers_<%=exercise_question.id%>">
               <% exercise_question.exercise_choices.reorder("choice_position").each_with_index do |exercise_choice,index| %>
                   <li class="ur_item">
-                    <label name='select_items' class='w56'>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+                    <label name='select_items' class='w60'>选项<%=convert_to_char (index+1).to_s %><span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
                     <input maxlength="200" type='text' name='question_answer[<%=exercise_choice.id %>]' placeholder='输入选项内容' value="<%=exercise_choice.choice_text %>">
                     <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
                     <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>

app/views/exercise/_new_MC.html.erb

@@ -18,28 +18,28 @@
       <div class="cl"></div>
       <div>
           <li class="ur_item">
-            <label name='select_items' class='w56'>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='select_items' class='w60'>选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[0]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>
           <div class="cl"></div>
           <li class="ur_item">
-            <label name='select_items' class='w56'>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='select_items' class='w60'>选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[1]' placeholder='输入选项内容'>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>
           <div class="cl"></div>
           <li class="ur_item">
-            <label name='select_items' class='w56'>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='select_items' class='w60'>选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[2]' placeholder='输入选项内容'/>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>
           </li>
           <div class="cl"></div>
           <li class="ur_item">
-            <label name='select_items' class='w56'>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
+            <label name='select_items' class='w60'>选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>
             <input maxlength="200" type='text' name='question_answer[3]' placeholder='输入选项内容'/>
             <a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>
             <a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>

app/views/exercise/_show_MC.html.erb

@@ -55,28 +55,28 @@
                                 '<input value="<%=score %>" id="question_score" type="text" name="question_score" style="width:40px; text-align:center; padding-left:0px;"/>分'+
                                 '</li><div>'+
                                 '<li class="ur_item">'+
-                                '<label name="select_items" class="w56">选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="select_items" class="w60">选项A<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[0]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
-                                '<label name="select_items" class="w56">选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="select_items" class="w60">选项B<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[1]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove"  title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
-                                '<label name="select_items" class="w56">选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="select_items" class="w60">选项C<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[2]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+
                                 '</li>'+
                                 '<div class="cl"></div>'+
                                 '<li class="ur_item">'+
-                                '<label name="select_items" class="w56">选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
+                                '<label name="select_items" class="w60">选项D<span class="ur_index"></span>：&nbsp;&nbsp;&nbsp;</label>'+
                                 '<input maxlength="200" type="text" name="question_answer[3]" placeholder="输入选项内容"/>'+
                                 '<a class="icon_add" title="向下插入选项" onclick="add_single_answer($(this));"></a>'+
                                 '<a class="icon_remove" title="删除" onclick="remove_single_answer($(this))"></a>'+

app/views/files/_show_quote_resource.html.erb

@@ -14,7 +14,7 @@
                        id: "relation_file_form" do %>
               <%= hidden_field_tag(:file_id, file.id) %>
               <%= content_tag('div', courses_check_box_tags('courses[course][]', User.current.courses,course,file), :id => 'courses')%>
-              <a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_quote();">引&nbsp;&nbsp;用</a><a href="javascript:void(0)" class="blue_btn grey_btn fl c_white" onclick="closeModal();">取&nbsp;&nbsp;消</a>
+              <a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_quote();">引&nbsp;&nbsp;用</a><a href="javascript:void(0)" class="grey_btn fl c_white ml10" onclick="closeModal();">取&nbsp;&nbsp;消</a>
           <% end -%>
         </div>
     <% end %>

app/views/files/_show_quote_resource_org_subfield.html.erb

@@ -14,7 +14,7 @@
                        id: "relation_file_form" do %>
               <%= hidden_field_tag(:file_id, file.id) %>
               <%= content_tag('div', org_subfields_check_box_tags('org_subfields[org_subfield][]',org_subfield.organization.org_subfields.where("field_type='Resource'"),file), :id => 'org_subfields')%>
-              <a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_quote();">引&nbsp;&nbsp;用</a><a href="javascript:void(0)" class="blue_btn grey_btn fl c_white" onclick="closeModal();">取&nbsp;&nbsp;消</a>
+              <a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_quote();">引&nbsp;&nbsp;用</a><a href="javascript:void(0)" class="grey_btn fl c_white ml10" onclick="closeModal();">取&nbsp;&nbsp;消</a>
           <% end -%>
         </div>
     <% end %>

app/views/files/_show_quote_resource_project.html.erb

@@ -14,7 +14,7 @@
                        id: "relation_file_form" do %>
               <%= hidden_field_tag(:file_id, file.id) %>
               <%= content_tag('div', projects_check_box_tags('projects[project][]', User.current.projects,project,file), :id => 'projects', :class => "hidden")%>
-              <a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_quote();">引&nbsp;&nbsp;用</a><a href="javascript:void(0)" class="blue_btn grey_btn fl c_white" onclick="closeModal();">取&nbsp;&nbsp;消</a>
+              <a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_quote();">引&nbsp;&nbsp;用</a><a href="javascript:void(0)" class="grey_btn fl c_white ml10" onclick="closeModal();">取&nbsp;&nbsp;消</a>
           <% end -%>
         </div>
     <% end %>

app/views/files/_subfield_files.html.erb

@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag 'courses'%>
+<%= stylesheet_link_tag 'css/courses'%>
 <script>
     function searchone4reload(fileid){
         var url = "<%= searchone4reload_org_subfield_files_path(@org_subfield)%>";

app/views/files/_upload_org_new_files.html.erb

@@ -8,7 +8,7 @@
           <!--<input type="hidden" name="org_subfield_attachment_type" value="<%#= org_subfield_attachment_type%>">-->
           <%= render :partial => 'files/org_upload_attachment_list', :locals => {:container => org}%>
           <div class="cl"></div>
-          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a href="javascript:void(0);" class="fr grey_btn mr40 ml10" onclick="hideModal();"><%= l(:button_cancel)%></a>
           <a id="submit_org_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
       <% end %>
     </div>

app/views/files/_upload_org_new_files_banner.html.erb

@@ -8,7 +8,7 @@
           <!--<input type="hidden" name="org_subfield_attachment_type" value="<%#= org_subfield_attachment_type%>">-->
           <%= render :partial => 'files/org_upload_attachment_list_banner', :locals => {:container => org}%>
           <div class="cl"></div>
-          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a href="javascript:void(0);" class="fr grey_btn mr40 ml10" onclick="hideModal();"><%= l(:button_cancel)%></a>
           <a id="submit_org_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
       <% end %>
     </div>

app/views/files/_upload_project_files.erb

@@ -30,7 +30,7 @@
             <div class="cl"></div>
           </div>
 
-          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a href="javascript:void(0);" class="fr grey_btn mr40 f14 ml10" onclick="hideModal();"><%= l(:button_cancel)%></a>
           <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
           <%= submit_tag '确定',:onclick=>'submit_resource();', :onfocus=>'this.blur()', :id=>'submit_resource', :class=>'sendSourceText fr' %>
       <% end %>

app/views/files/_upload_show.html.erb

@@ -10,7 +10,7 @@
           <input type="hidden" name="course_attachment_type" value="<%= course_attachment_type%>">
           <%= render :partial => 'attachement_list',:locals => {:course => course} %>
           <div class="cl"></div>
-          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%= l(:button_cancel)%></a>
+          <a href="javascript:void(0);" class="fr grey_btn mr40 f14 fl" onclick="closeModal();"><%= l(:button_cancel)%></a>
           <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
           <%= submit_tag '确定',:onclick=>'submit_resource();',:onfocus=>'this.blur()',:id=>'submit_resource',:class=>'sendSourceText fr' %>
       <% end %>

app/views/files/_upload_show_project.html.erb

@@ -10,7 +10,7 @@
           <input type="hidden" name="course_attachment_type" value="<%= project_attachment_type %>">
           <%= render :partial => 'attachement_list',:locals => {:project => project} %>
           <div class="cl"></div>
-          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="closeModal();"><%= l(:button_cancel)%></a>
+          <a href="javascript:void(0);" class="fr grey_btn mr40 f14 ml10" onclick="closeModal();"><%= l(:button_cancel)%></a>
           <!--<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%#= l(:button_confirm)%></a>-->
           <%= submit_tag '确定',:onclick=>'submit_resource();',:onfocus=>'this.blur()',:id=>'submit_resource',:class=>'sendSourceText fr' %>
       <% end %>

app/views/files/_upload_subfield_file.html.erb

@@ -23,7 +23,7 @@
             </div>
             <div class="cl"></div>
           </div>
-          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a href="javascript:void(0);" class="fr grey_btn mr40 ml10" onclick="hideModal();"><%= l(:button_cancel)%></a>
           <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
       <% end %>
     </div>

app/views/forums/_show_topics.html.erb

@@ -19,7 +19,7 @@
               <div class="postDetailReply fr">
                 <a href="<%= forum_memo_path(topic.forum, topic)%>" class="postReplyIcon mr5" target="_blank"></a>
                 <%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic),:target =>'_blank',:class=>'linkGrey2' %>
-                <a href="javascript:void(0);" class="linkGrey2 disablePostLikeIcon ml10 mt20" style="cursor: default" title="点赞人数" >   <%= get_praise_num(topic)%></a>
+                <a href="javascript:void(0);" class="linkGrey2 disablePostLikeIcon ml10" style="cursor: default" title="点赞人数" >   <%= get_praise_num(topic)%></a>
               </div>
 
               <div class="postDetailDes" id = "postDetailDes_<%= topic.id %>"><%= topic.content.html_safe%>

app/views/forums/index.html.erb

@@ -1,5 +1,5 @@
 <%= javascript_include_tag 'new_user' %>
-<%= stylesheet_link_tag 'public'%>
+<%= stylesheet_link_tag 'css/common','css/public'%>
 <script>
   function add_class(id){
       if($("#"+id).hasClass("sortArrowActiveD")){

app/views/issues/_attributes.html.erb

@@ -46,7 +46,7 @@
                               :method => 'get',
                               :title => l(:label_version_new),
                               :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
-                <%= link_to "", new_project_version_path(@issue.project), :class => "pic_add mt5 ml5 ", :target => "_blank" %>
+                <%= link_to "", new_project_version_path(@issue.project), :class => "pic_add mt5 ml5 fl", :target => "_blank" %>
                 <!--<a href="javascript:viod(0)" class="pic_add mt5 ml5"></a>-->
             <% end %>
           </li>

app/views/issues/_form.html.erb

@@ -79,4 +79,4 @@
     <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %>
 <% end %>
 <a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="blue_btn fl ml80"> 确定</a>
-<a href="javascript:void(0);" onclick="issueDetailShow();" class="grey_btn fl mr50" > 取消 </a>
+<a href="javascript:void(0);" onclick="issueDetailShow();" class="grey_btn fl mr50 ml10" > 取消 </a>

app/views/issues/index.html.erb

@@ -57,7 +57,7 @@
               <div class="problem_search fr" >
                 <input class="problem_search_input fl" id="v_subject" type="text" name="subject" placeholder="请输入问题名称" onkeypress="EnterPress(event)" onkeydown="EnterPress()">
                 <a href="javascript:void(0)" class="problem_search_btn fl" onclick="remote_function();" >搜索</a>
-                <a href="javascript:void(0)" class="grey_btn fl ml10" onclick="nh_reset_form();" >清空</a>
+                <a href="javascript:void(0)" class="grey_btn fl ml10 f14" onclick="nh_reset_form();" >清空</a>
               </div><!--problem_search end-->
               <%#= link_to '新建问题', new_project_issue_path(@project) , :class => "green_u_btn fr ml10" %>
               <p class="problem_p fl" ><%= l(:label_issues_sum) %>：<a href="javascript:void(0)" class="c_red"><%= @project.project_score.issue_num %></a>
@@ -96,13 +96,13 @@
                 <div class="fl">&nbsp;</div>
                 <div>
                   <input name="issue_create_date_start" nhname="date_val" type="hidden"/>
-                  <%= text_field_tag 'issue_create_date_start_show', '创建日期起始',:readonly=>true, :size=>15, :nhname=>'date_show',:style=>'float:left;'%>
+                  <%= text_field_tag 'issue_create_date_start_show', '创建日期起始',:readonly=>true, :size=>13, :nhname=>'date_show',:style=>'float:left;'%>
                   <%= calendar_for('issue_create_date_start_show') %>
                 </div>
                 <div style="float:left;">&nbsp;-&nbsp;</div>
                 <div>
                   <input name="issue_create_date_end" nhname="date_val" type="hidden"/>
-                  <%= text_field_tag 'issue_create_date_end_show', '创建日期结束',:readonly=>true, :size=>15, :nhname=>'date_show',:style=>'float:left;'%>
+                  <%= text_field_tag 'issue_create_date_end_show', '创建日期结束',:readonly=>true, :size=>13, :nhname=>'date_show',:style=>'float:left;'%>
                   <%= calendar_for('issue_create_date_end_show') %>
                 </div>
               </div>

app/views/layouts/_logined_header.html.erb

@@ -58,7 +58,7 @@
   <div class="navHomepageProfile" id="navHomepageProfile">
     <ul>
       <li class="homepageProfileMenuIcon" id="homepageProfileMenuIcon">
-        <%= link_to "<div class='mt5 mb8' id='user_avatar'>#{image_tag(url_to_avatar(User.current),:width =>"40",:height => "40",:class => "portraitRadius",:alt=>"头像", :id => "nh_user_logo")}</div>".html_safe,user_activities_path(User.current.id)%>
+        <%= link_to "<div class='mt5 mb8' id='user_avatar'>#{image_tag(url_to_avatar(User.current),:width =>"40",:height => "40",:class => "portraitRadius",:alt=>"头像",:style=>"display:block;", :id => "nh_user_logo")}</div>".html_safe,user_activities_path(User.current.id)%>
         <ul class="topnav_login_list none" id="topnav_login_list">
           <li>
             <%= link_to "修改资料", my_account_path, :class => "menuGrey"%>

app/views/layouts/base.html.erb

@@ -17,7 +17,7 @@
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
 <%= yield :header_tags -%>
-  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">

app/views/layouts/base_courses.html.erb

@@ -17,7 +17,7 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag  'header','jquery/jquery-ui-1.9.2','public', 'leftside','prettify', 'courses','share'%>
+  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common','css/public', 'css/structure','prettify', 'css/courses','css/popup'%>
   <%= javascript_include_tag "course","header","attachments",'prettify' %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>

app/views/layouts/base_forums.html.erb

@@ -7,7 +7,7 @@
 		<meta name="keywords" content="issue,bug,tracker" />
 		<%= csrf_meta_tag %>
 		<%= favicon %>
-		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application','prettify', 'nyan','leftside', :media => 'all' %>
+		<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application','prettify', 'nyan', :media => 'all' %>
 		<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 		<%= javascript_include_tag('jquery-1.8.3-ui-1.9.2-ujs-2.0.3', 'application', 'jquery.colorbox-min') %>
 
@@ -18,7 +18,7 @@
 
 		<%= call_hook :view_layouts_base_html_head %>
 		<%= yield :header_tags -%>
-      <%= stylesheet_link_tag 'base','header','new_user', :media => 'all'%>
+      <%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%>
       <!-- MathJax的配置 -->
       <script type="text/javascript"
               src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">

app/views/layouts/base_memos.html.erb

@@ -15,7 +15,7 @@
 	<%= javascript_include_tag "ckeditor/ckeditor.js",'prettify' %>
 	<!-- page specific tags -->
 	<%= yield :header_tags -%>
-  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">

app/views/layouts/base_org.html.erb

@@ -12,7 +12,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','courses','org', 'share' %>
+  <%= stylesheet_link_tag  'prettify','jquery/jquery-ui-1.9.2','css/common','css/structure','css/public','repository','css/courses','css/org','css/project', 'css/popup' %>
   <%= javascript_include_tag 'cookie','project', 'organization','header','prettify','select_list_move','org'%>
   <%= javascript_include_tag 'attachments' %>
   <%= call_hook :view_layouts_base_html_head %>

app/views/layouts/base_organization.html.erb

@@ -1,6 +1,6 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
-<%= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
+<%= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','css/structure','css/public','repository','org' %>
 <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','org'%>
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
@@ -104,10 +104,10 @@
 <div id="Footer">
   <div class="footerAboutContainer">
     <ul class="footerAbout">
-      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">关于我们</a>|</li>
+      <li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">关于我们</a>|</li>
-      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
+      <li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
-      <li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
+      <li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
-      <li class="fl"><a href="javascript:void:(0);" class=" f_grey mw20" target="_blank">贴吧交流</a></li>
+      <li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">贴吧交流</a></li>
     </ul>
   </div>
   <div class="cl"></div>

app/views/layouts/base_projects.html.erb

@@ -12,7 +12,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag 'header','scm','public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','repository','share' %>
+  <%= stylesheet_link_tag  'jquery/jquery-ui-1.9.2','css/common','css/structure','scm','css/public', 'css/project','css/popup','prettify','repository' %>
   <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
 
   <%= call_hook :view_layouts_base_html_head %>

app/views/layouts/base_syllabus.html.erb

@@ -7,7 +7,7 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'syllabus','new_user','prettify','share',:media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'syllabus','css/common','css/public','css/structure','css/courses','css/popup','prettify',:media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
   <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus'%>

app/views/layouts/base_tags.html.erb

@@ -20,7 +20,7 @@
 <%= call_hook :view_layouts_base_html_head %>
 <!-- page specific tags -->
 <%= yield :header_tags -%>
-  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">

app/views/layouts/base_users_new.html.erb

@@ -14,7 +14,7 @@
 <meta name="keywords" content="issue,bug,tracker" />
 <%= csrf_meta_tag %>
 <%= favicon %>
-<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'public_new', 'leftside_new','prettify','users', :media => 'all' %>
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/common', 'css/structure','prettify','css/public', :media => 'all' %>
 <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
 <%= javascript_heads %>
 <%= javascript_include_tag "avatars",'prettify'%>

app/views/layouts/base_welcome.html.erb

@@ -5,7 +5,7 @@
   <title><%=h html_title %></title>
   <meta name="description" content="<%= Redmine::Info.app_name %>" />
   <meta name="keywords" content="issue,bug,tracker" />
-  <%= stylesheet_link_tag 'public', 'pleft', 'project', :media => 'all' %>
+  <%= stylesheet_link_tag 'css/common', 'css/structure', 'css/public','css/project', :media => 'all' %>
 
   <%= javascript_include_tag "jquery.leanModal.min" %>
 

app/views/layouts/course_base.html.erb

@@ -21,7 +21,7 @@
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
-  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">

app/views/layouts/login.html.erb

@@ -7,7 +7,7 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'new_user', 'user_leftside', :media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'css/common', 'css/structure', :media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
   <%= javascript_include_tag "bootstrap","avatars","new_user"%>

app/views/layouts/new_base.html.erb

@@ -13,7 +13,7 @@
   <%= javascript_heads %>
   <%= heads_for_theme %>
   <%= call_hook :view_layouts_base_html_head %>
-  <%= stylesheet_link_tag 'public', 'leftside', 'courses','header','prettify', 'org', 'syllabus'%>
+  <%= stylesheet_link_tag 'css/common','css/structure', 'css/public', 'css/courses','prettify', 'css/org', 'syllabus'%>
   <%= javascript_include_tag "course","header",'prettify' %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>

app/views/layouts/new_base_user.html.erb

@@ -7,7 +7,7 @@
   <meta name="keywords" content="issue,bug,tracker" />
   <%= csrf_meta_tag %>
   <%= favicon %>
-  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'share','new_user', 'user_leftside','prettify','users','syllabus',:media => 'all' %>
+  <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','syllabus',:media => 'all' %>
   <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
   <%= javascript_heads %>
   <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>

app/views/layouts/static_base.html.erb

@@ -16,7 +16,7 @@
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
-  <%= stylesheet_link_tag 'base','header', :media => 'all'%>
+  <%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">

app/views/layouts/users_base.html.erb

@@ -16,7 +16,7 @@
   <%= call_hook :view_layouts_base_html_head %>
   <!-- page specific tags -->
   <%= yield :header_tags -%>
-  <%= stylesheet_link_tag 'base','header','new_user' ,:media => 'all'%>
+  <%= stylesheet_link_tag 'css/common','css/structure','css/public' ,:media => 'all'%>
   <!-- MathJax的配置 -->
   <script type="text/javascript"
           src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">

app/views/messages/_course_new.html.erb

@@ -8,7 +8,7 @@
       <%= render :partial => 'form_course', :locals => {:f => f,:is_new => true} %>
         <a href="javascript:void(0)" onclick="submitCoursesBoard();"class="blue_btn fl c_white"><%= l(:button_submit)%></a>
         <%#= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form' ,target='preview',{:class => 'blue_btn grey_btn fl c_white'} )%>
-        <%= link_to l(:button_cancel), course_boards_path(@course), :class => "blue_btn grey_btn fl c_white"%>
+        <%= link_to l(:button_cancel), course_boards_path(@course), :class => "grey_btn fl c_white ml10"%>
     <% end %>
   </ul>
 </div>

app/views/messages/_course_show.html.erb

@@ -163,7 +163,7 @@
           <div class="talkConIpt ml5 mb10" id="reply<%= @topic.id %>">
             <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
                 <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
-                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %>
+                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "grey_btn fr c_white mt10 mr5 ml10" %>
                 <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'course_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %>
             <% end %>
             <div class="cl"></div>

app/views/messages/_course_show_old.html.erb

@@ -105,7 +105,7 @@
       <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
           <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
           <%= link_to l(:button_submit),"javascript:void(0)",:onclick => 'course_board_submit_message_replay();' ,:class => "blue_btn fl c_white" ,:style=>"margin-left: 50px;"%>
-          <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fl c_white"  %>
+          <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "grey_btn fl c_white ml10"  %>
       <% end %>
     </div>
 <% end %>

app/views/messages/_org_subfield_show.html.erb

@@ -197,7 +197,7 @@
           <div class="talkConIpt ml5 mb10" id="reply<%= @topic.id %>">
             <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
                 <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
-                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %>
+                <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "grey_btn fr c_white mt10 mr5 ml10" %>
                 <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'course_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %>
             <% end %>
             <div class="cl"></div>

app/views/messages/_project_show.html.erb

@@ -223,7 +223,7 @@
             <div class="talkConIpt ml5 mb10" id="reply<%= @topic.id %>">
               <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
                   <%= render :partial => 'form_project', :locals => {:f => f, :replying => true} %>
-                  <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'project_board_cancel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %>
+                  <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'project_board_cancel_message_replay();', :class => "grey_btn fr c_white mt10 mr5 ml10" %>
                   <%= link_to l(:button_submit), "javascript:void(0)", :onclick => 'project_board_submit_message_replay();', :class => "blue_btn fr c_white mt10", :style => "margin-left: 50px;" %>
               <% end %>
               <div class="cl"></div>

app/views/my/account.html.erb

@@ -1,5 +1,5 @@
-<div class="fl">
+
-  <div id="RSide">
+  <div id="RSide" style="margin-left:0px; margin-bottom:0px; width:728px;">
     <div id="users_tb_" class="users_tb_">
       <ul>
         <li id="users_tb_1" class="users_hovertab" onclick="x:HoverLi(1);">基本资料</li>
@@ -197,12 +197,10 @@
       <% end %>
     </div><!--ctt end-->
 
-
+<!--users_setting end-->
-  </div><!--users_setting end-->
 
 </div>
-<div id="search_school_result_list"
+<div id="search_school_result_list" style="width: 205px;line-height: 1.5;min-height:20px; max-height: 200px; height: auto !important;display: none;background: white;overflow: scroll;border: solid 1px #cccccc; overflow-x: hidden; overflow-y: auto;">
-     style="width: 205px;line-height: 1.5;min-height:20px; max-height: 200px; height: auto!; !important;display: none;background: white;overflow: scroll;border: solid 1px #cccccc; overflow-x: hidden; overflow-y: auto;">
 </div>
 <div id="WOpenWindow">
   <a class="modal_close" href="#"></a>

app/views/news/_course_form.html.erb

@@ -37,10 +37,10 @@
   <li class="ml40" >
     <% if is_new %>
       <%= link_to l(:button_create), "javascript:void(0)", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fl c_white' %>
-      <%= link_to l(:button_cancel), course_news_index_path(@course), :onclick => '$("#add-news").hide()', :class => 'blue_btn grey_btn fl c_white' %>
+      <%= link_to l(:button_cancel), course_news_index_path(@course), :onclick => '$("#add-news").hide()', :class => 'grey_btn fl c_white ml10' %>
     <% else %>
         <%= link_to l(:button_save), "javascript:void(0)", :onclick => "submitNews();",:onmouseover => 'this.focus()',:class => 'blue_btn fl c_white' %>
-        <%= link_to l(:button_cancel), news_path(@news), :class => 'blue_btn grey_btn fl c_white' %>
+        <%= link_to l(:button_cancel), news_path(@news), :class => 'grey_btn fl c_white ml10' %>
     <% end %>
     <div class="cl"></div>
   </li>

app/views/news/_project_form.html.erb

@@ -30,10 +30,10 @@
 <li class="ml40" >
   <% if is_new %>
       <%= link_to l(:button_create), "javascript:void(0)", :onclick => 'submitNews();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fl c_white' %>
-      <%= link_to l(:button_cancel), project_news_index_path(@project), :onclick => '$("#add-news").hide()', :class => 'blue_btn grey_btn fl c_white' %>
+      <%= link_to l(:button_cancel), project_news_index_path(@project), :onclick => '$("#add-news").hide()', :class => 'grey_btn fl c_white ml10' %>
   <% else %>
       <%= link_to l(:button_save), "javascript:void(0)", :onclick => "submitNews();",:onmouseover => 'this.focus()',:class => 'blue_btn fl c_white'%>
-      <%= link_to l(:button_cancel), news_path(@news), :class => 'blue_btn grey_btn fl c_white' %>
+      <%= link_to l(:button_cancel), news_path(@news), :class => 'grey_btn fl c_white ml10' %>
   <% end %>
   <div class="cl"></div>
 </li>

app/views/organizations/_org_members.html.erb

@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag  'courses' %>
+<%= stylesheet_link_tag  'css/courses' %>
 <div class="resources">
     <div class="project_r_h" style="width: 720px;">
       <h2 class="project_h2"> 组织成员</h2>

app/views/organizations/new.html.erb

@@ -49,8 +49,8 @@
           <div class="cl"></div>
         </li>
         <li class=" ml125" >
-          <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_organization();" >创建</a>
+          <a href="javascript:void(0)" class="blue_btn fl c_white mr10 f14" onclick="submit_new_organization();" >创建</a>
-          <%= link_to "取消",user_activities_path(User.current.id),:class => "blue_btn grey_btn fl c_white"%>
+          <%= link_to "取消",user_activities_path(User.current.id),:class => "grey_btn fl c_white f14"%>
           <div class="cl"></div>
         </li>
     <% end%>

app/views/poll/_other_poll.html.erb

@@ -10,7 +10,7 @@
               <input type="hidden" name="course_id" value="<%= polls_group_id%>" />
               <%= content_tag('div', poll_check_box_tags('polls[]', polls,polls_group_id), :id => 'courses',:style=> 'width: 300px;')%>
               <a id="submit_quote" href="javascript:void(0)" class="blue_btn fl c_white" style="margin-left: 0px !important;" onclick="submit_quote();">导&nbsp;&nbsp;入</a>
-              <a href="javascript:void(0)" class="blue_btn grey_btn fl c_white "  onclick="closeModal();">取&nbsp;&nbsp;消</a>
+              <a href="javascript:void(0)" class="grey_btn fl c_white ml10"  onclick="closeModal();">取&nbsp;&nbsp;消</a>
           <% end -%>
         </div>
 

app/views/projects/_upload_project_files_on_navbar.html.erb

@@ -11,7 +11,7 @@
           <input type="hidden" name="in_project_toolbar" value="Y">
           <%= render :partial => 'projects/upload_project_files_list',:locals => {:container => container} %>
           <div class="cl"></div>
-          <a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
+          <a href="javascript:void(0);" class="fr grey_btn mr40 ml10" onclick="hideModal();"><%= l(:button_cancel)%></a>
           <a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
       <% end %>
     </div>

app/views/projects/new.html.erb

@@ -53,7 +53,7 @@
         </li>
         <li class=" ml90" >
           <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_project();" >提交</a>
-          <%= link_to "取消",user_activities_path(User.current.id),:class => "blue_btn grey_btn fl c_white"%>
+          <%= link_to "取消",user_activities_path(User.current.id),:class => "grey_btn fl c_white ml10"%>
           <div class="cl"></div>
         </li>
     <% end%>

app/views/projects/settings/_join_org.html.erb

@@ -5,7 +5,7 @@
 
   <!--</div>-->
 <!--</div>-->
-<%= stylesheet_link_tag 'org' %>
+<%= stylesheet_link_tag 'css/org' %>
 
   <div>
     <div class="relateOrg fl">
@@ -16,7 +16,7 @@
       <div id="search_orgs_result_list" class="ml20"></div>
       <ul id="paginator" class="wlist ml20" style="float:none;"></ul>
         <a href="javascript:void(0);" class="saveBtn db fl ml20 mr15 mb5" onclick="join_org(<%= @project.id %>);">关联</a>
-      <a href="javascript:void(0);" class="cancelBtn db fl" onclick="cancel_join_orgs();">取消</a>
+      <a href="javascript:void(0);" class="grey_btn db fl" onclick="cancel_join_orgs();">取消</a>
       <% end %>
     </div>
     <div class="relatedList fr">

app/views/projects/settings/_new_versions.html.erb

@@ -22,8 +22,8 @@
     <td class="tl">
       <a class="c_blue02"><%= 'shared' if version.project != @project %> <%= link_to_version version %></a>
     </td>
-    <td class="description"><%= format_date(version.effective_date) %></td>
+    <td class=""><%= format_date(version.effective_date) %></td>
-    <td class="description tl" style="word-break:break-all;"><%=h version.description %></td>
+    <td class="tl" style="word-break:break-all;"><%=h version.description %></td>
     <td class="status"><%= l("version_status_#{version.status}") %></td>
     <!--<td class="sharing"><%#=h format_version_sharing(version.sharing) %></td>-->
     <!--<td class="tl" style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;"  title="">-->

app/views/projects/show.html.erb

@@ -11,7 +11,7 @@
     <div class="NewsBannerName">项目动态</div>
     <ul class="resourcesSelect" class="resourcesSelect">
       <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-        <ul class="homepagePostType">
+        <ul class="homepagePostType2">
           <li>
             <ul class="homepagePostTypeHomework fl">
               <li><%= link_to "全部动态", {:controller => "projects", :action => "show", :type => nil}, :class => "homepagePostTypeAll postTypeGrey" %></li>

app/views/student_work/_set_score_rule_detail.html.erb

@@ -2,7 +2,7 @@
   <span class="uploadText">评分设置</span>
   <div class="mt15">
     <span class="f14 fontGrey3 mr10">迟交扣分</span>
-    <input type="text" name="late_penalty" id="late_penalty_num" placeholder="0-50" class=" markInput"  value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
+    <input type="text" name="late_penalty" id="late_penalty_num" placeholder="0-50" class="markInput"  value="<%= homework.late_penalty%>" onkeyup="check_late_penalty('late_penalty_num')"/>
     <span class="f12 c_red ml10">请输入0-50数值</span>
   </div>
   <% if homework.anonymous_comment == 0 %>

app/views/syllabuses/new.html.erb

@@ -18,7 +18,7 @@
         <div class="cl"></div>
         <li class=" ml90" >
           <a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_syllabus();" >提交</a>
-          <%= link_to "取消",user_activities_path(User.current.id),:class => "blue_btn grey_btn fl c_white"%>
+          <%= link_to "取消",user_activities_path(User.current.id),:class => "grey_btn fl c_white ml10"%>
           <div class="cl"></div>
         </li>
     <% end%>

app/views/users/_homework_ref_resources_list.html.erb

@@ -9,14 +9,14 @@
           <li class="resourcesListCheckbox fl">
             <input name="checkbox1[]" type="checkbox" onclick="store_seleted_resource($(this));" <%=seleted_resources.include?(attach.id.to_s) ? 'checked':''  %> value="<%= attach.id%>" class="resourcesCheckbox" />
           </li>
-          <li class="resourcesListName fl">
+          <li class="resourcesListName fl hidden">
             <!--<a href="javascript:void(0);" class="resourcesBlack"><%#=truncate(attach.filename,:length=>18)%></a>-->
             <%= link_to truncate(attach.filename,:length=>30), download_named_attachment_path(attach.id, attach.filename),
                         :title => attach.filename,:class=>'resourcesBlack'%>
           </li>
           <li class="resourcesListSize fl"><%= number_to_human_size(attach.filesize) %></li>
           <li class="resourcesListType fl"><%= get_resource_type(attach.container_type)%></li>
-          <li class="resourcesListUploader fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
+          <li class="resourcesListUploader fl hidden"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
           <li style="display: none"><%= attach.author_id %></li>
           <li class="resourcesListTime fl"><%= format_date(attach.created_on) %></li>
           <li style="display: none"><%= attach.id %></li>

app/views/users/_homework_repository.html.erb

@@ -1,3 +1,4 @@
+<%= stylesheet_link_tag 'css/popup'%>
 <script type="text/javascript">
     function show_homework_detail(url){
         $.get(

app/views/users/_show_user_org.html.erb

@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag  'pleft','header','new_user','repository','org', 'project' %>
+<%= stylesheet_link_tag  'css/common','css/structure','css/public','css/org','css/project','repository' %>
 <%#= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
 <div class="homepageContentContainer">
   <div class="homepageContent">

app/views/users/_user_resource_info.html.erb

@@ -1,4 +1,4 @@
-<div id="users_setting">
+<div>
   <div id="upload_private_resource">
     <%= render :partial => "show_new_upload", :locals => {:type => @type, :status => @status} %>
   </div>

app/views/users/user_fanslist.html.erb

@@ -7,7 +7,7 @@
 
     }
 </script>
-  <div class="courses_box" id="RSide">
+  <div class="courses_box" id="RSide" style="margin-left:0; margin-bottom:0; width:728px;">
     <div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>">
       <% if @action == 'fans' %>
         <h2 class="courses_h2 fl">粉丝</h2>

app/views/users/user_homeworks.html.erb

@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag  'pleft','header','new_user','repository','org', 'public' %>
+<%= stylesheet_link_tag  'css/common','css/structure','css/public','css/org','repository' %>
 <script>
     $(document).ready(function(){
         $(".resource-switch").click(function(){

app/views/users/user_organizations.html.erb

@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag  'pleft','header','new_user','repository','org', 'project' %>
+<%= stylesheet_link_tag  'css/common','css/structure','css/public','css/org','repository' %>
 <%#= stylesheet_link_tag  'pleft','prettify','jquery/jquery-ui-1.9.2','header','new_user','repository','org' %>
 <div class="homepageContentContainer">
   <div class="homepageContent">

app/views/users/user_resource.html.erb

@@ -1,6 +1,7 @@
 <%= javascript_include_tag 'bootstrap' %>
-<%= stylesheet_link_tag 'project' %>
+<%= stylesheet_link_tag 'css/project' %>
-<%= stylesheet_link_tag 'leftside' %>
+<%= stylesheet_link_tag 'css/structure' %>
+<%= stylesheet_link_tag 'css/popup' %>
 <%= javascript_include_tag 'attachments' %>
 
 <script>

app/views/versions/index.html.erb

@@ -20,7 +20,7 @@
   </fieldset>
 
   <% if @versions.empty? %>
-      <p class="nodata"><%= l(:label_no_data) %></p>
+      <p class="nodata mt10"><%= l(:label_no_data) %></p>
   <% else %>
       <% @versions.each do |version| %>
 

app/views/wechats/user_activities.html.erb

@@ -10,7 +10,7 @@
   <meta content='True' name='HandheldFriendly' />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
   <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weui.min.css" />
-  <link type="text/css" rel="stylesheet" href="/stylesheets/weui/weixin.css" />
+  <%= stylesheet_link_tag '/stylesheets/weui/weixin.css' %>
 
   <script type="text/javascript">
     window.g_debug = false; //调试标志,如果在本地请置为true
@@ -28,31 +28,7 @@
 
 <!--<script src="https://dn-demotest.qbox.me/angular.all.min.js"></script>-->
 <script src="/javascripts/wechat/build/angular.all.min.js"></script>
-<script src="/javascripts/wechat/build/app.min.js?version=20160715-1953"></script>
+<%=  include_wechat_jsfile %>
-  <!-- <script src ="/javascripts/wechat/app.js"></script> -->
-  <!-- <script src="/javascripts/wechat/others/factory.js"></script> -->
-  <!-- <script src="/javascripts/wechat/others/filter.js"></script> -->
-  <!-- <script src="/javascripts/wechat/directives/alert.js"></script> -->
-  <!-- <script src="/javascripts/wechat/directives/form_validate.js"></script> -->
-  <!-- <script src="/javascripts/wechat/directives/input_auto.js"></script> -->
-  <!-- <script src="/javascripts/wechat/directives/loading_spinner.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/reg.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/invite_code.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/login.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/activity.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/new_class.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/edit_class.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/blog.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/course_notice.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/discussion.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/homework.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/issue.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/journals.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/class.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/class_list.js"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/myresource.js?version=20160715&#45;1737"></script> -->
-  <!-- <script src="/javascripts/wechat/controllers/send_class_list.js"></script> -->
-  <!-- <script src="/javascripts/wechat/others/routes.js"></script> -->
 </body>
 
 </html>