Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/controllers/attachments_controller.rb

@@ -124,7 +124,12 @@ class AttachmentsController < ApplicationController
     end
 
     respond_to do |format|
-      format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum,@attachment.container) }
+      if @project.nil?
+        format.html { redirect_to_referer_or forum_memo_path(@attachment.container.forum,@attachment.container) }
+      else
+        format.html { redirect_to_referer_or project_path(@project)}
+      end
+
       format.js
     end
   end
@@ -204,7 +209,12 @@ private
   end
 
   def read_authorize
-    @attachment.visible? ? true : deny_access
+    if @attachment.container_type == "HomeworkAttach"
+     true
+      #User.current.allowed_to?(:view_homework_attaches, @attachment.project) ? true : deny_access
+    else
+      @attachment.visible? ? true : deny_access
+    end
   end
 
   def delete_authorize

app/controllers/contests_controller.rb

@@ -5,7 +5,7 @@ class ContestsController < ApplicationController
   menu_item :project, :only => :show_project
   menu_item :application, :only => :show_softapplication
   menu_item :attendingcontest, :only => :show_attendingcontest
-  before_filter :find_contest, :only => [:show_contest, :show_project, :show_softapplication, :show_attendingcontest, :create,:destroy,:more,:back,:add,:add_softapplication,:new,:show_results, :set_reward,
+  before_filter :find_contest, :only => [:show_contest, :show_project, :show_softapplication, :show_attendingcontest, :set_reward_project, :set_reward_softapplication, :create,:destroy,:more,:back,:add,:add_softapplication,:new,:show_results, :set_reward,
                 :show_contest_project, :show_contest_user, :join_in_contest, :unjoin_in_contest, :new_join,:show_participator, :settings]
               
   # added by fq
@@ -335,7 +335,12 @@ class ContestsController < ApplicationController
     end
 ##取出参赛应用   
     @softapplication = Softapplication.all 
-    @contesting_softapplication = @contest.contesting_softapplications.reverse
+    @contesting_softapplication = @contest.contesting_softapplications.
+      joins("LEFT JOIN softapplications ON contesting_softapplications.softapplication_id=softapplications.id").
+      joins("LEFT JOIN (
+        SELECT * FROM seems_rateable_cached_ratings WHERE cacheable_type='Softapplication' AND DIMENSION = 'quality') AS cached
+      ON cached.cacheable_id=softapplications.id").
+      order("cached.avg").reverse_order
     @contesting_softapplication = paginateHelper  @contesting_softapplication, 10
     
     
@@ -350,6 +355,44 @@ class ContestsController < ApplicationController
  end
  
  ###end
+ 
+  def set_reward_project
+    @c_p = nil
+    @contesting_project_id = nil
+
+    if params[:set_reward_project][:reward]&&((User.current.id==@contest.author_id)||User.current.admin)
+      # @bid_id = params[:id]
+      @contesting_project_id = params[:set_reward_project][:c_id]
+      @c_p = ContestingProject.find_by_id(@contesting_project_id)
+
+      # 把字段存进表中
+      @c_p.update_reward(params[:set_reward_project][:reward].to_s)
+    end
+
+    respond_to do |format|
+      format.js
+    end
+  end
+ 
+  def set_reward_softapplication
+    @c_sa = nil
+    @contesting_softapplication_id = nil
+
+    if params[:set_reward_softapplication][:reward]&&((User.current.id==@contest.author_id)||User.current.admin)
+      # @bid_id = params[:id]
+      @contesting_softapplication_id = params[:set_reward_softapplication][:c_id]
+      @c_sa = ContestingSoftapplication.find_by_id(@contesting_softapplication_id)
+
+      # 把字段存进表中
+      @c_sa.update_reward(params[:set_reward_softapplication][:reward].to_s)
+    end
+
+    respond_to do |format|
+      format.js
+    end
+  end 
+ 
+ 
   ###添加已创建的参赛项目
   def add
     project = Project.find(params[:contest])

app/controllers/files_controller.rb

@@ -52,16 +52,59 @@ class FilesController < ApplicationController
   end
 
   def create
-    container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
-    attachments = Attachment.attach_filesex(container, params[:attachments],params[:attachment_type])
-    render_attachment_warning_if_needed(container)
+    if params[:tag_name]
+      tag_saveEx
+      render :text =>"success"
+    else
+      @addTag=false
+      container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
+      attachments = Attachment.attach_filesex(container, params[:attachments],params[:attachment_type])
+      render_attachment_warning_if_needed(container)
 
-    if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
-      Mailer.attachments_added(attachments[:files]).deliver
+      if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added')
+        Mailer.attachments_added(attachments[:files]).deliver
+      end
+      redirect_to project_files_path(@project)
     end
-    redirect_to project_files_path(@project)
   end
 
+  def tag_saveEx
+    @tags = params[:tag_name][:name]
+    @obj_id = params[:object_id]
+    @obj_flag = params[:object_flag]
+
+    case @obj_flag
+      when '1' then
+        @obj = User.find_by_id(@obj_id)
+      when '2' then
+        @obj = Project.find_by_id(@obj_id)
+      when '3' then
+        @obj = Issue.find_by_id(@obj_id)
+      when '4' then
+        @obj = Bid.find_by_id(@obj_id)
+      when '5' then
+        @obj = Forum.find_by_id(@obj_id)
+      when '6'
+        @obj = Attachment.find_by_id(@obj_id)
+      when '7' then
+        @obj = Contest.find_by_id(@obj_id)
+      when '8'
+        @obj = OpenSourceProject.find_by_id(@obj_id)
+      else
+        @obj = nil
+    end
+    unless @obj.nil?
+      @obj.tag_list.add(@tags.split(","))
+    else
+      return
+    end
+    if @obj.save
+      ## 执行成功的操作。
+    else
+      #捕获异常
+    end
+   end
+
   # 返回制定资源类型的资源列表
   def getattachtype
     sort_init 'created_on', 'desc' 

app/controllers/projects_controller.rb

@@ -33,12 +33,12 @@ class ProjectsController < ApplicationController
   menu_item l(:label_course_news), :only => :index
   
 
-  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise]
+  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches]
   # before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, 
   #               :statistics, :feedback, :course, :enterprise_course, :course_enterprise, :project_respond, :share,
   #               :show_projects_score, :issue_score_index, :news_score_index, :file_score_index, :code_submit_score_index, :projects_topic_score_index]
-  before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen]
-  before_filter :authorize_global, :only => [:new, :create]
+  before_filter :authorize, :only => [:show, :settings, :edit, :sort_project_members, :update, :modules, :close, :reopen,:view_homework_attaches]
+  before_filter :authorize_global, :only => [:new, :create,:view_homework_attaches]
   before_filter :require_admin, :only => [ :copy, :archive, :unarchive, :destroy, :calendar]
   before_filter :file, :statistics, :watcherlist
 

app/controllers/softapplications_controller.rb

@@ -100,14 +100,34 @@ class SoftapplicationsController < ApplicationController
 
   # POST /softapplications
   # POST /softapplications.json
+  # def create
+    # @softapplication = Softapplication.new(params[:softapplication])
+    # @softapplication.user = User.current
+    # @softapplication.save_attachments(params[:attachments])
+    # respond_to do |format|
+      # if @softapplication.save
+        # format.js 
+        # format.html { redirect_to @softapplication, notice: 'Softapplication was successfully created.' }
+        # # format.json { render json: @softapplication, status: :created, location: @softapplication }
+      # else
+        # format.js { render status: 406 }
+        # format.html { render action: "new" }
+        # # format.json { render json: @softapplication.errors, status: :unprocessable_entity }
+      # end
+    # end
+  # end
+
+
+#new changed created function
   def create
     @softapplication = Softapplication.new(params[:softapplication])
     @softapplication.user = User.current
     @softapplication.save_attachments(params[:attachments])
     respond_to do |format|
       if @softapplication.save
+        ContestingSoftapplication.create(:contest_id => params[:contest_id], :softapplication_id => @softapplication.id)
         format.js 
-        format.html { redirect_to @softapplication, notice: 'Softapplication was successfully created.' }
+        format.html { redirect_to show_attendingcontest_contest_path(:id => params[:contest_id]) }
         # format.json { render json: @softapplication, status: :created, location: @softapplication }
       else
         format.js { render status: 406 }
@@ -115,8 +135,13 @@ class SoftapplicationsController < ApplicationController
         # format.json { render json: @softapplication.errors, status: :unprocessable_entity }
       end
     end
+    #关联新建的参赛作品
+  
+    # @contesting_softapplication = paginateHelper @contest.contesting_softapplications
+    
+    
+    
   end
-
   # PUT /softapplications/1
   # PUT /softapplications/1.json
   def update

app/controllers/users_controller.rb

@@ -30,7 +30,7 @@ class UsersController < ApplicationController
   #Ended by young
 
  
-  before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :user_projects, :user_newfeedback, :user_comments, :watch_bids, :watch_contests, :info, 
+  before_filter :require_admin, :except => [:show, :index, :search, :tag_save, :tag_saveEx,:user_projects, :user_newfeedback, :user_comments, :watch_bids, :watch_contests, :info,
     :user_watchlist, :user_fanslist,:update, :user_courses, :user_homeworks, :watch_projects, :show_score, :topic_score_index, :project_score_index,
     :activity_score_index, :influence_score_index, :score_index] 
   #edit has been deleted by huang, 2013-9-23
@@ -39,10 +39,10 @@ class UsersController < ApplicationController
                                   :watch_bids, :watch_contests, :info, :watch_projects, :show_score, :topic_score_index, :project_score_index, 
                                   :activity_score_index, :influence_score_index, :score_index]
   before_filter :auth_user_extension, only: :show
-  accept_api_auth :index, :show, :create, :update, :destroy,:tag_save
+  accept_api_auth :index, :show, :create, :update, :destroy,:tag_save  , :tag_saveEx
   
   #william
-  before_filter :require_login, :only => :tag_save
+  before_filter :require_login, :only => [:tag_save,:tag_saveEx]
 
 
   helper :sort
@@ -209,6 +209,8 @@ class UsersController < ApplicationController
     ## 判断课程是否过期 [需封装]
     @memberships_doing = []
     @memberships_done  = []
+    @OwningCouses =[]
+    @JoinCouses=[]
     now_time = Time.now.year
     @memberships.map { |e|
       end_time = e.project.course_extra.get_time.year
@@ -218,6 +220,12 @@ class UsersController < ApplicationController
       else
         @memberships_doing.push e
       end
+
+      if  e.project.course_extra.tea_id == User.current.id
+        @OwningCouses.push e
+      else
+        @JoinCouses.push e
+      end
     }
     # respond_to do |format|
       # format.html
@@ -683,11 +691,51 @@ class UsersController < ApplicationController
     #捕获异常
     end
     respond_to do |format|
+      format.js
       format.html
+    end
+  end
+
+  def tag_saveEx
+    @tags = params[:tag_name][:name]
+    @obj_id = params[:obj_id]
+    @obj_flag = params[:obj_flag]
+
+    case @obj_flag
+      when '1' then
+        @obj = User.find_by_id(@obj_id)
+      when '2' then
+        @obj = Project.find_by_id(@obj_id)
+      when '3' then
+        @obj = Issue.find_by_id(@obj_id)
+      when '4' then
+        @obj = Bid.find_by_id(@obj_id)
+      when '5' then
+        @obj = Forum.find_by_id(@obj_id)
+      when '6'
+        @obj = Attachment.find_by_id(@obj_id)
+      when '7' then
+        @obj = Contest.find_by_id(@obj_id)
+      when '8'
+        @obj = OpenSourceProject.find_by_id(@obj_id)
+      else
+        @obj = nil
+    end
+    unless @obj.nil?
+      @obj.tag_list.add(@tags.split(","))
+    else
+      return
+    end
+    if @obj.save
+      ## 执行成功的操作。
+    else
+      #捕获异常
+    end
+    respond_to do |format|
       format.js
-    end   
+      format.html
+    end
   end
-  
   ###add by huang
   def user_watchlist  
   end

app/helpers/application_helper.rb

@@ -182,11 +182,27 @@ module ApplicationHelper
   end
 
   def thumbnail_tag(attachment)
-    link_to image_tag(thumbnail_path(attachment)),
-      named_attachment_path(attachment, attachment.filename),
+    imagepath = named_attachment_path(attachment, attachment.filename)
+    link_to image_tag(imagepath),
+            imagepath ,
       :title => attachment.filename
   end
 
+  # 图片缩略图链接
+  def thumbnail_small_tag(attachment)
+    imagesize = attachment.thumbnail(:size => "200*200")
+    imagepath = named_attachment_path(attachment, attachment.filename)
+    if imagesize
+      link_to image_tag(imagesize),
+              imagepath,
+              :title => attachment.filename
+    else
+      link_to image_tag(imagepath , height: '200', width: '250'),
+              imagepath,
+              :title => attachment.filename
+    end
+  end
+
   def toggle_link(name, id, options={})
     onclick = "$('##{id}').toggle(); "
     onclick << (options[:focus] ? "$('##{options[:focus]}').focus(); " : "this.blur(); ")

app/helpers/contests_helper.rb

@@ -91,6 +91,10 @@ module ContestsHelper
   def get_prize(c_project)
      c_project.get_reward 
   end
+
+  def get_prize(c_softapplication)
+      c_softapplication.get_reward
+  end
   
   def count_contest_project
     contests = Contest.find(:id)

app/helpers/open_source_projects_helper.rb

@@ -34,4 +34,8 @@ module OpenSourceProjectsHelper
   def get_open_source_projects_by_tag(tag_name)
     OpenSourceProject.tagged_with(tag_name).order('created_at desc')
   end
+  
+  def show_origin(url)
+    
+  end
 end

app/models/attachment.rb

@@ -228,7 +228,6 @@ class Attachment < ActiveRecord::Base
       end
       size = 100 unless size > 0
       target = File.join(self.class.thumbnails_storage_path, "#{id}_#{digest}_#{size}.thumb")
-
       begin
         Redmine::Thumbnail.generate(self.diskfile, target, size)
       rescue => e

app/models/contesting_softapplication.rb

@@ -11,5 +11,18 @@ class ContestingSoftapplication < ActiveRecord::Base
     self.create(:user_id => User.current.id, :contest_id => contest_id,
                     :softapplication_id => softapplication_id, :description => description)
   end  
+  
+  def self.create_work_contesting(contest_id, softapplication_id)
+    self.create(:user_id => User.current.id, :contest_id => contest_id,
+                    :softapplication_id => softapplication_id)
+  end  
+  
+  def update_reward(which)
+    self.update_attribute(:reward,which)
+  end
+  
+  def get_reward
+    self.reward
+  end  
 
 end

app/models/course.rb

@@ -2,7 +2,7 @@ class Course < ActiveRecord::Base
   include Redmine::SafeAttributes
   
   attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password
-  belongs_to :project, :class_name => 'Project', :foreign_key => :extra # 定义一个project方法， 该方法通过extra来调用project表
+  belongs_to :project, :class_name => 'Project', :foreign_key => :extra, primary_key: :identifier
   belongs_to :teacher, :class_name => 'User', :foreign_key => :tea_id  # 定义一个方法teacher，该方法通过tea_id来调用User表
   belongs_to :school, :class_name => 'School', :foreign_key => :school_id #定义一个方法school，该方法通过school_id来调用School表
   has_many :bid

app/models/homework_attach.rb

@@ -29,6 +29,13 @@ class HomeworkAttach < ActiveRecord::Base
     result
   end
 
+  def project
+    work = HomeworkForCourse.find_by_bid_id(self.bid_id)
+    if work
+        work.project
+    end
+  end
+
   def add_jours options
     jfm = self.journals_for_messages.build(options)
     jfm.save

app/models/softapplication.rb

@@ -1,5 +1,5 @@
 class Softapplication < ActiveRecord::Base
-  attr_accessible :android_min_version_available, :app_type_id, :app_type_name, :description, :name, :user_id, :contest_id, :application_developers
+  attr_accessible :android_min_version_available, :app_type_id, :app_type_name, :description, :name, :user_id, :contest_id, :application_developers, :deposit_project_url
   acts_as_attachable
   seems_rateable :allow_update => true, :dimensions => :quality
 

app/models/user.rb

@@ -18,6 +18,11 @@
 require "digest/sha1"
 
 class User < Principal
+  TEACHER = 0
+  STUDENT = 1
+  ENTERPRISE = 2
+  DEVELOPER = 3
+  
   include Redmine::SafeAttributes
 
   # Different ways of displaying/sorting users

app/views/attachments/_links.html.erb

@@ -33,7 +33,7 @@
   <% if images.any? %>
   <div class="thumbnails">
     <% images.each do |attachment| %>
-      <div><%= thumbnail_tag(attachment) %></div>
+      <div><%= thumbnail_small_tag(attachment) %></div>
     <% end %>
   </div>
   <% end %>

app/views/attachments/upload.js.erb

@@ -12,5 +12,6 @@ fileSpan.find('a.remove-upload')
   })
   .off('click');
 var divattach = fileSpan.find('div.div_attachments');
-divattach.html('<%= j(render :partial => 'tags/tag', :locals => {:obj => @attachment, :object_flag => "6"})%>');
+divattach.html('<%#= j(render :partial => 'tags/tagEx', :locals => {:obj => @attachment, :object_flag => "6"})%>');
+
 <% end %>

app/views/contests/set_reward_project.js.erb

@@ -1,15 +1,14 @@
 $('#reward_result_<%= @contesting_project_id %>').html('<%= j(
 
-if get_prize(@b_p).nil? or get_prize(@b_p) == ""
+if get_prize(@c_p).nil? or get_prize(@c_p) == ""
 	if  @contest.deadline < Date.today 
 		puts '未评奖'
 	end 
 else 
 
-		case get_prize(@b_p)
+	case get_prize(@c_p)
 		when '-1'
 			image_tag("/images/bid/special_reward.png")
-		when '1'
 		when '0'
 			image_tag("/images/bid/first_reward.png")
 		when '1'
@@ -22,7 +21,7 @@ else
 			image_tag("/images/bid/fifth_reward.png")
 		when '5' 
 			image_tag("/images/bid/qualified.png")                              
-		end
+	end
 
 end
 )

app/views/contests/set_reward_softapplication.js.erb

@@ -0,0 +1,30 @@
+$('#reward_result_<%= @contesting_softapplication_id %>').html('<%= j(
+
+if get_prize(@c_sa).nil? or get_prize(@c_sa) == ""
+	if  @contest.deadline < Date.today 
+		puts '未评奖'
+	end 
+else 
+
+	case get_prize(@c_sa)
+		when '-1'
+			image_tag("/images/bid/special_reward.png")
+		when '0'
+			image_tag("/images/bid/first_reward.png")
+		when '1'
+			image_tag("/images/bid/second_reward.png")
+		when '2'
+			image_tag("/images/bid/third_reward.png")
+		when '3'
+			image_tag("/images/bid/forth_reward.png")
+		when '4'
+			image_tag("/images/bid/fifth_reward.png")
+		when '5' 
+			image_tag("/images/bid/qualified.png")                              
+	end
+
+end
+)
+%>')
+
+$('#<%= @contesting_softapplication_id %>').hide()

app/views/files/_new.html.erb

@@ -2,9 +2,8 @@
 <% versions = project.versions.sort %>
 <% attachmenttypes = project.attachmenttypes %>
 <%= error_messages_for 'attachment' %>
-<%= form_tag(project_files_path(project), :multipart => true, :class => "tabular") do %>
+<%= form_tag(project_files_path(project), :multipart => true,:name=>"upload_form", :class => "tabular") do %>
 <div class="box">
-
   <p>
   <table>
     <tr>
@@ -34,4 +33,26 @@
 </div>
 <%= submit_tag l(:button_add) %>
 <% end %>
-<div class="line_under" style="margin:20px 0px;"></div>
+<div class="line_under" style="margin:20px 0px;"></div>
+
+<script type='text/javascript'>
+    function tagAddClick(id,objId,objTag)
+    {
+        alert("OK");
+        $.ajax({
+            type :"POST",
+            url :'<%= users_tag_saveEx_path%>',
+            data: {
+                tagname: $('tag_name').value,
+                obj_id: encodeURIComponent(objId),
+                obj_flag:encodeURIComponent(objTag)
+            },
+            success: function(data, textStatus){
+                alert("OK");
+                $(id).empty();
+                $(id).html('123');
+                $("#" +  id + " #name").val("");
+            }
+        })
+    }
+</script>

app/views/files/_show_all_attachment.html.erb

@@ -20,7 +20,6 @@
     <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope => "col", :id => "vzebra-contenttype") %>
     <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
     <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
-    <%= sort_header_tag('tags', :caption => l(:label_tag), :id => "vzebra-tag") %>
     <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
   </tr>
   </thead>
@@ -52,14 +51,15 @@
               <%= link_to(image_tag('delete.png'), attachment_path(file),
                           :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
             </td>
-            <td class='filename'  style="font-size: 13px; ">
+          </tr>
+          <tr>
+            <td class='description' colspan="6">
               <div class="tags_area">
                 <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
                 <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
                 <div class="tags_gradint"></div>
               </div>
-              <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
-              </div>
+              <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a></div>
             </td>
           </tr>
       <% end -%>

app/views/files/_sort_by_attachtypel.html.erb

@@ -20,7 +20,6 @@
     <%= sort_header_tag('content_type', :caption => l(:attachment_sufix_browse), :default_order => 'desc', :scope =>"col", :id=> "vzebra-contenttype")%>
     <%= sort_header_tag('downloads', :caption => l(:field_downloads), :default_order => 'desc', :scope => "col", :id => "vzebra-action") %>
     <%= sort_header_tag('operation', :caption => "", :scope => "col", :id => "vzebra-children") %>
-    <%= sort_header_tag('tags', :caption => l(:label_tag), :id => "vzebra-tag") %>
     <!-- <%= sort_header_tag('description', :caption => l(:field_description)) %> -->
   </tr>
 </thead>
@@ -48,15 +47,17 @@
         <%= link_to(image_tag('delete.png'), attachment_path(file),
         :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %>
       </td>
-    <td class='filename'  style="font-size: 13px; ">
-      <div class="tags_area">
-        <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
-        <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
-        <div class="tags_gradint"></div>
-      </div>
-      <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
-      </div>
-    </td>
+    </tr>
+    <tr>
+      <td class='description' colspan="6">
+        <div class="tags_area">
+          <%# @preTags = %w|预设A 预设B 预设C 预设D 预设E 预设Z | %>
+          <%= render :partial => 'tags/tag', :locals => {:obj => file, :object_flag => "6"} %>
+          <div class="tags_gradint"></div>
+        </div>
+        <div class="read-more hidden"><a href="javascript:void(0);" onclick="readmore(this);"> 更多 </a>
+        </div>
+      </td>
     </tr>
     <% end -%>
     <% end -%>

app/views/files/index.html.erb

@@ -25,9 +25,10 @@
                        :onchange => "attachment_contenttypes_searchex(this.value)" %>
     <% end %>
 
-    <div id="upload_file_div" class="relation_file_div hidden">
-      <%= render :partial => 'new', locals: {project: @project} %>
-    </div>
+        <div id="upload_file_div" class="relation_file_div hidden">
+          <%= render :partial => 'new', locals: {project: @project} %>
+        </div>
+
     <div id="relation_file_div" class="relation_file_div hidden">
       <fieldset>
         <legend>搜索</legend>
@@ -185,4 +186,27 @@
                     }
                 });
     }
-</script>
+</script>
+
+
+<script type='text/javascript'>
+    function tagAddClick(divid,objId,objTag)
+    {
+        alert("OK");
+        $.ajax({
+            type :"POST",
+            url :'/users/tag_saveEx',
+            data: {
+                tagname: $('tag_name').value,
+                obj_id: encodeURIComponent(objId),
+                obj_flag:encodeURIComponent(objTag)
+            },
+            success: function(data, textStatus){
+                alert("OK");
+                $(divid).empty();
+                $(divid).html('123');
+                $("#" +  divid + " #name").val("");
+            }
+        })
+    }
+</script>

app/views/layouts/base_courses.html.erb

@@ -140,7 +140,7 @@
     <!--info-->
 
     <div class="inf_user_context">
-      <table style="font-family:微软雅黑">
+      <table>
 
         <!-- addedby bai 教师姓名加超链接、加入开课时间、结课时间与课时 -->
         <tr>
@@ -266,5 +266,7 @@
 </div>
 </div>
 <%= call_hook :view_layouts_base_body_bottom %>
+</div>
 </body>
+
 </html>