From e907f5e3e49990c46f1940d21dd4d924d3b43dd6 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 9 Apr 2015 19:18:04 +0800 Subject: [PATCH] =?UTF-8?q?1.=E8=A7=A3=E5=86=B3=E7=BC=BA=E9=99=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=9B=BE=E7=89=87=E4=B8=8D=E6=98=BE=E7=A4=BA=202?= =?UTF-8?q?=E3=80=81=E9=A1=B9=E7=9B=AE=E7=A7=8D=E7=B1=BB=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=B1=80=E9=83=A8=E5=88=B7=E6=96=B0=203=E3=80=81=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E6=A0=8F=E8=B0=83=E6=95=B4=204.=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=EF=BC=88=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E7=A7=8D=E7=B1=BB=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 4 + app/helpers/projects_helper.rb | 1 + app/views/files/_project_file_new.html.erb | 2 +- .../layouts/_base_development_group.html.erb | 54 ++++++++++ app/views/layouts/_base_friend_group.html.erb | 31 ++++++ .../layouts/_base_research_team.html.erb | 42 ++++++++ app/views/layouts/_join_exit_project.html.erb | 7 +- app/views/layouts/base_projects.html.erb | 93 ++++++++---------- app/views/projects/_tools_expand.html.erb | 25 ++--- app/views/projects/show.html.erb | 5 +- config/locales/projects/zh.yml | 5 +- ...9092151_add_project_new_type_to_project.rb | 5 + db/schema.rb | 67 ++++++++----- public/images/leftside.png | Bin 717 -> 1170 bytes public/images/public_icon.png | Bin 2949 -> 3811 bytes public/javascripts/course.js | 5 - public/javascripts/header.js | 5 + public/javascripts/project.js | 17 +++- public/stylesheets/pleft.css | 5 +- public/stylesheets/public.css | 3 + 20 files changed, 269 insertions(+), 107 deletions(-) create mode 100644 app/views/layouts/_base_development_group.html.erb create mode 100644 app/views/layouts/_base_friend_group.html.erb create mode 100644 app/views/layouts/_base_research_team.html.erb create mode 100644 db/migrate/20150409092151_add_project_new_type_to_project.rb diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 823db4729..ebd7ab064 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1724,6 +1724,10 @@ module ApplicationHelper candown end + def project_type_link text + link_to "#{text}".html_safe,"javascript:void(0)" ,:onClick => "show_window();", :class => "pr_join_a",:id => "setting_project_type" + end + private def wiki_helper diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 4a790790e..fc2afe0f7 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -386,4 +386,5 @@ module ProjectsHelper end type end + end diff --git a/app/views/files/_project_file_new.html.erb b/app/views/files/_project_file_new.html.erb index 89088a295..0ec274ee8 100644 --- a/app/views/files/_project_file_new.html.erb +++ b/app/views/files/_project_file_new.html.erb @@ -46,7 +46,7 @@
<%= form_tag( search_project_project_files_path(@project), method: 'get',:class => "re_search f_l",:remote=>true) do %> <%= text_field_tag 'name', params[:name], name: "name", :class => 're_schbox',:style=>"padding: 0px"%> - <%= submit_tag "课内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onmouseover => "presscss('incourse')",:onmouseout =>"buttoncss()" %> + <%= submit_tag "站内搜索", :class => "re_schbtn b_lblue",:name => "incourse",:id => "incourse", :onmouseover => "presscss('incourse')",:onmouseout =>"buttoncss()" %> <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %> <% end %> <% manage_allowed = User.current.allowed_to?(:manage_files, @project) %> diff --git a/app/views/layouts/_base_development_group.html.erb b/app/views/layouts/_base_development_group.html.erb new file mode 100644 index 000000000..f8e27a570 --- /dev/null +++ b/app/views/layouts/_base_development_group.html.erb @@ -0,0 +1,54 @@ +<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %> +
+
+ <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> + <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> + (<%= ForgeActivity.where("project_id = ?", @project.id).count %>) + <% end %> +
+ <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %> +
+ <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %> + <% unless @project.issues.count == 0 %> + (<%= @project.issues.count %>) + <% end %> + <% if User.current.member_of?(@project) %> + <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %> + <% end %> +
+ <% end %> + <% unless @project.enabled_modules.where("name = 'boards'").empty? %> +
+ <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %> + <% unless @project.boards.first.topics.count == 0 %> + (<%= @project.boards.first.topics.count %>) + <% end %> + <% if User.current.member_of?(@project) %> + <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> + <% end %> +
+ <% end%> + <% unless @project.enabled_modules.where("name = 'files'").empty? %> +
+ <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %> + <% unless attaments_num == 0 %> + (<%= attaments_num %>) + <% end %> + <% if User.current.member_of?(@project) %> + <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> + <% end %> +
+ <% end%> + <% unless @project.enabled_modules.where("name = 'repository'").empty? || @project.repositories.count == 0 %> +
+ <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> + (<%= @project.repositories.count %>) +
+ <% end %> + + +
<%= l(:label_project_more) %>
+
    + <%= render 'projects/tools_expand' %> +
+
\ No newline at end of file diff --git a/app/views/layouts/_base_friend_group.html.erb b/app/views/layouts/_base_friend_group.html.erb new file mode 100644 index 000000000..c367882e5 --- /dev/null +++ b/app/views/layouts/_base_friend_group.html.erb @@ -0,0 +1,31 @@ +<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %> +
+
+ <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> + <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> + (<%= ForgeActivity.where("project_id = ?", @project.id).count %>) + <% end %> +
+ <% unless @project.enabled_modules.where("name = 'boards'").empty? %> +
+ <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %> + <% unless @project.boards.first.topics.count == 0 %> + (<%= @project.boards.first.topics.count %>) + <% end %> + <% if User.current.member_of?(@project) %> + <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> + <% end %> +
+ <% end%> + <% unless @project.enabled_modules.where("name = 'files'").empty? %> +
+ <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %> + <% unless attaments_num == 0 %> + (<%= attaments_num %>) + <% end %> + <% if User.current.member_of?(@project) %> + <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> + <% end %> +
+ <% end %> +
\ No newline at end of file diff --git a/app/views/layouts/_base_research_team.html.erb b/app/views/layouts/_base_research_team.html.erb new file mode 100644 index 000000000..811a58961 --- /dev/null +++ b/app/views/layouts/_base_research_team.html.erb @@ -0,0 +1,42 @@ +<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %> +
+
+ <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> + <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> + (<%= ForgeActivity.where("project_id = ?", @project.id).count %>) + <% end %> +
+ <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %> +
+ <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %> + <% unless @project.issues.count == 0 %> + (<%= @project.issues.count %>) + <% end %> + <% if User.current.member_of?(@project) %> + <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %> + <% end %> +
+ <% end %> + <% unless @project.enabled_modules.where("name = 'boards'").empty? %> +
+ <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %> + <% unless @project.boards.first.topics.count == 0 %> + (<%= @project.boards.first.topics.count %>) + <% end %> + <% if User.current.member_of?(@project) %> + <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> + <% end %> +
+ <% end%> + <% unless @project.enabled_modules.where("name = 'files'").empty? %> +
+ <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %> + <% unless attaments_num == 0 %> + (<%= attaments_num %>) + <% end %> + <% if User.current.member_of?(@project) %> + <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> + <% end %> +
+ <% end%> +
\ No newline at end of file diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb index a5269d422..5d7c9210e 100644 --- a/app/views/layouts/_join_exit_project.html.erb +++ b/app/views/layouts/_join_exit_project.html.erb @@ -8,9 +8,8 @@ <%= join_in_project_link(@project, User.current) %> <% end %> - <% if ((User.current.member_of? @project) && - User.current.login? && - Member.where(:user_id => User.current.id, :project_id=>@project.id).first.roles.first.to_s != "Manager") %> - <%= exit_project_link(@project) %> + <% if ((User.current.member_of? @project) && User.current.login? && User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) %> + <%= link_to "#{l(:button_configure)}".html_safe, settings_project_path(@project), :class => "pr_join_a" %> + <%= link_to "#{l(:label_friend_organization)}".html_safe,"javascript:void(0)" ,:onClick => "show_window();", :class => "pr_join_a",:id => "setting_project_type"%> <% end %>
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 79847fab9..467be2758 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -17,6 +17,26 @@ <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> + + + @@ -90,6 +110,7 @@ }, :class => "c_orange f14" ) %> <% end %> +
<%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue' %>） @@ -102,6 +123,7 @@
+
<% if User.current.member_of?(@project) %> @@ -111,59 +133,11 @@
  • <%= link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %>
    • <% end %> - -
    - <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> - <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %> - (<%= ForgeActivity.where("project_id = ?", @project.id).count %>) - <% end %> -
    - <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %> -
    - <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %> - <% unless @project.issues.count == 0 %> - (<%= @project.issues.count %>) - <% end %> - <% if User.current.member_of?(@project) %> - <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %> - <% end %> -
    - <% end %> - <% unless @project.enabled_modules.where("name = 'boards'").empty? %> -
    - <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %> - <% unless @project.boards.first.topics.count == 0 %> - (<%= @project.boards.first.topics.count %>) - <% end %> - <% if User.current.member_of?(@project) %> - <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %> - <% end %> -
    - <% end%> - <% unless @project.enabled_modules.where("name = 'files'").empty? %> -
    - <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %> - <% unless attaments_num == 0 %> - (<%= attaments_num %>) - <% end %> - <% if User.current.member_of?(@project) %> - <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %> - <% end %> -
    - <% end%> - <% unless @project.enabled_modules.where("name = 'repository'").empty? || @project.repositories.count == 0 %> -
    - <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %> - (<%= @project.repositories.count %>) -
    - <% end %> - -
    <%= l(:label_project_more) %>
    - + + <%= render :partial => 'layouts/base_development_group', :locals => {:project => @project}%>
    +
    @@ -179,6 +153,7 @@
    +

    <%= l(:label_tag)%>:

    @@ -203,6 +178,22 @@ <%= render :partial => 'layouts/new_footer'%>
    +
    + + +
    +
    +

    请选择项目类型：

    +
      +
      • +
      • +
      • +
    + 确定 + +
    +
    +
    123
    diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb index f62b0822a..570ba3426 100644 --- a/app/views/projects/_tools_expand.html.erb +++ b/app/views/projects/_tools_expand.html.erb @@ -1,8 +1,3 @@ -
  • - <% if User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project) %> - <%= link_to l(:label_settings), settings_project_path(@project) %> - <% end %> -
  • <% unless @project.enabled_modules.where("name = 'news'").empty? %> <%= link_to l(:project_module_news), project_news_index_path(@project) %> @@ -18,16 +13,16 @@ <%= link_to l(:project_module_code_review), {controller: 'code_review', action: 'index', id: @project.id} %> <% end %>
    • -
  • - <% unless @project.enabled_modules.where("name = 'calendar'").empty? %> - <%= link_to l(:project_module_calendar),project_calendar_path(@project) %> - <% end %> -
    • -
  • - <% unless @project.enabled_modules.where("name = 'gantt'").empty? %> - <%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %> - <% end %> -
    • + + + + + + + + + +
  • <% unless @project.enabled_modules.where("name = 'documents'").empty? %> <%= link_to l(:project_module_documents), project_documents_path(@project) %> diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index b3ddf6a26..d32d7baa6 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -48,10 +48,7 @@
    <%= h(e.project) if @project.nil? || @project.id != e.project_id %> - <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %> - <%= l(:label_new_activity) %> ： - - <%= link_to(l(:label_activity_project)+act.issue.project.name, project_path(act.issue.project.id), :class => "problem_tit fl fb") %> + <%= link_to h(e.user), user_path(e.user_id), :class => "problem_name c_orange fl" %> <%= l(:label_new_activity) %> ： <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.project_issues_index}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"}, :class => "problem_tit fl fb" %>
    diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index ecc9fe7c3..99f8bafca 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -53,7 +53,10 @@ zh: label_exit_project: 退出项目 label_apply_project_waiting: 已处理申请，请等待管理员审核 label_unapply_project: 取消申请 - lable_sure_exit_project: 是否确认退出该项目 + lable_sure_exit_project: 是否确认退出该项目 + label_friend_organization: 朋友圈 + label_research_group: 科研组 + label_development_team: 开发组 label_member: 成员 project_module_attachments: 资源 diff --git a/db/migrate/20150409092151_add_project_new_type_to_project.rb b/db/migrate/20150409092151_add_project_new_type_to_project.rb new file mode 100644 index 000000000..68f22b5ad --- /dev/null +++ b/db/migrate/20150409092151_add_project_new_type_to_project.rb @@ -0,0 +1,5 @@ +class AddProjectNewTypeToProject < ActiveRecord::Migration + def change + add_column :projects, :project_new_type, :integer + end +end diff --git a/db/schema.rb b/db/schema.rb index b149a870b..f9ade5aa4 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20150309090143) do +ActiveRecord::Schema.define(:version => 20150409092151) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -422,6 +422,22 @@ ActiveRecord::Schema.define(:version => 20150309090143) do add_index "custom_values", ["custom_field_id"], :name => "index_custom_values_on_custom_field_id" add_index "custom_values", ["customized_type", "customized_id"], :name => "custom_values_customized" + create_table "delayed_jobs", :force => true do |t| + t.integer "priority", :default => 0, :null => false + t.integer "attempts", :default => 0, :null => false + t.text "handler", :null => false + t.text "last_error" + t.datetime "run_at" + t.datetime "locked_at" + t.datetime "failed_at" + t.string "locked_by" + t.string "queue" + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "delayed_jobs", ["priority", "run_at"], :name => "delayed_jobs_priority" + create_table "discuss_demos", :force => true do |t| t.string "title" t.text "body" @@ -638,16 +654,6 @@ ActiveRecord::Schema.define(:version => 20150309090143) do add_index "journal_details", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_details_copy", :force => true do |t| - t.integer "journal_id", :default => 0, :null => false - t.string "property", :limit => 30, :default => "", :null => false - t.string "prop_key", :limit => 30, :default => "", :null => false - t.text "old_value" - t.text "value" - end - - add_index "journal_details_copy", ["journal_id"], :name => "journal_details_journal_id" - create_table "journal_replies", :id => false, :force => true do |t| t.integer "journal_id" t.integer "user_id" @@ -963,25 +969,26 @@ ActiveRecord::Schema.define(:version => 20150309090143) do end create_table "projects", :force => true do |t| - t.string "name", :default => "", :null => false + t.string "name", :default => "", :null => false t.text "description" - t.string "homepage", :default => "" - t.boolean "is_public", :default => true, :null => false + t.string "homepage", :default => "" + t.boolean "is_public", :default => true, :null => false t.integer "parent_id" t.datetime "created_on" t.datetime "updated_on" t.string "identifier" - t.integer "status", :default => 1, :null => false + t.integer "status", :default => 1, :null => false t.integer "lft" t.integer "rgt" - t.boolean "inherit_members", :default => false, :null => false + t.boolean "inherit_members", :default => false, :null => false t.integer "project_type" - t.boolean "hidden_repo", :default => false, :null => false - t.integer "attachmenttype", :default => 1 + t.boolean "hidden_repo", :default => false, :null => false + t.integer "attachmenttype", :default => 1 t.integer "user_id" - t.integer "dts_test", :default => 0 + t.integer "dts_test", :default => 0 t.string "enterprise_name" t.integer "organization_id" + t.integer "project_new_type" end add_index "projects", ["lft"], :name => "index_projects_on_lft" @@ -1069,12 +1076,12 @@ ActiveRecord::Schema.define(:version => 20150309090143) do end create_table "roles", :force => true do |t| - t.string "name", :limit => 90 - t.integer "position" - t.boolean "assignable" - t.integer "builtin" + t.string "name", :limit => 30, :default => "", :null => false + t.integer "position", :default => 1 + t.boolean "assignable", :default => true + t.integer "builtin", :default => 0, :null => false t.text "permissions" - t.string "issues_visibility", :limit => 90 + t.string "issues_visibility", :limit => 30, :default => "default", :null => false end create_table "schools", :force => true do |t| @@ -1445,4 +1452,16 @@ ActiveRecord::Schema.define(:version => 20150309090143) do t.datetime "updated_at", :null => false end + create_table "zip_packs", :force => true do |t| + t.integer "user_id" + t.integer "homework_id" + t.string "file_digest" + t.string "file_path" + t.integer "pack_times", :default => 1 + t.integer "pack_size", :default => 0 + t.string "file_digests" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + end diff --git a/public/images/leftside.png b/public/images/leftside.png index c927f9eb593801c55594f1f5e31facbff695c1ec..0b144f3302d0d98d277171abf3f3a49d739b39f3 100644 GIT binary patch delta 1099 zcmV-R1ho6j1(FGn7YfJ-1^@s6H#@sVks(8W1Q{@MvRa+Q-PLsnBli@H7 zharY2B_d)d!!UG}ONoe>OrlI;e)TINBFZq=%_Jg9Kdy6i#pzG|DU;HeloDkqr8LTn zN$sZ}=h^kP&RTo#Idw^`#pbNN*0Vm|eb%#|_kA}=!gH-8xiirA<+7D-lAB1bAz34T z`Htie$ui0HdEh$z?WF&}t{0Im2fGd`K%d|6cdE~5u(HHENxml8o;ULv ziSj;icJ9oO5AmAh6O!B2`HohzJS>xkPfZz@B%1_-s&OF)CRtP2Obfzf66jVg=6}<^Sdvvvxd^5xh9C zq{Kk0GnWBeE;2x9+3iIJC?!cU>6v+ze$NBgRw|YJ(byzOm~+h~Nixvtd2R>L+v?2w zi^R7<5=oL&ivaV$`xg^gx8UI-1Q=;3f`1oqMd8YEg}BB6bQckEeR4#9>m+;RS5Zl? zb8-#6G}Hm$h=fcBfUN-jFfqSf0FH*V=PskOP8->@)-1a-wCv|v;swv4uPT7J%5_H5 z9}CJwwFg*ZKo04sZ_nE#+D>?Ex)VSRz%l?Ye2;1#z*QM*7|qe;eG2FP>)Z1(Wr@y9 z{nh0T&zOYQfh_i1p*_`q)cL%O^fDB2^|5C^8p*8+8VRterWkKjfDs(Q#lhVG>Huy6 zSdT_dy1%INJ!%gBgaU^Yhvmx0Hb=l(37Na>`_AtkH1bwAiY&WLT(%&^Kdk`bm}n}< zVM7WY(u696_W(1hiK@sk&Yw!GHcKPr!|llJg$zZ zXd6)iBnY&;eMt0L7UfPE8*G*xa;Y~BvRqLL>abQ&E#iEqz^b;AmZ!b}Y~_gdT{TbO zqB2G!N`iU8o$7Qp!s(C>aMAhbtO;Dnhz|_<+9PjAa0Ewi1V?ZL|9s%j0{{)E5|L@* RRp9^t002ovPDHLkV1jZ83%URR delta 642 zcmV-|0)73G3C#tN7Ybwu1^@s6S>M4`5i6~K)D4QLdU1htU zUe46@+k1b%-%Lev50^Rj-tRrWkOP4(vxi~-bpV#Yl}b|c<0R>iMj2|vbW)UZtX${+yORh z!&kG~03Lb3%lW|hZrmg;AApHiz;;O5tGIlZRLf6}dy6+D-IMf5(xRj(Ne?C6k<_w? zN2BeJd5d)6KP&?@s*LG3B!Lt79|n(q7p$EMR{k|yLD`ygHU$Mh#M&1EdfqI$cX(Qz=tJ$TNWj(|y@D`Y} z&Ckr6xw6)1&|BTMLso$67K22Y6F7lKWq?iNp?yhjO3}GAyJ`iYTh_r=C2@b}nKPhQ z;h9f_Vvtd-lpHWlzAf6hVQHl1bmTQvkRyiQ%cD>30 znRBieu)N=XZ%R6rWm)(();UMX*l^CZN6qKDq{&e&FI2hT79i(bvkI^byfDnox(}YO cQUHGp0G?Zt(~q^H*Z=?k07*qoM6N<$f-a#ySO5S3 diff --git a/public/images/public_icon.png b/public/images/public_icon.png index 7134ded4218dec8f9b259eadb7d6b0369fbd5a56..a815691f83da828d9712fa7ac611887c8084dda9 100644 GIT binary patch literal 3811 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 O6)-X|)yH0PN%|MZdohRr literal 2949 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 diff --git a/public/javascripts/course.js b/public/javascripts/course.js index 2628ce1b5..91b4f41da 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -401,11 +401,6 @@ $(function(){ } }); -//将右侧的最小高度设置成左侧高度，美化界面 -$(document).ready(function () { - $("#RSide").css("min-height",$("#LSide").height()-30); -}); - // 日历选择日期后关闭 function regexDeadLine() { diff --git a/public/javascripts/header.js b/public/javascripts/header.js index e5363f8d5..e27f758d3 100644 --- a/public/javascripts/header.js +++ b/public/javascripts/header.js @@ -38,4 +38,9 @@ $(document).ready(function () { addSlipMenu(); addProjectSlipMenu (); addCourseSlipMenu(); +}); + +//将右侧的最小高度设置成左侧高度，美化界面 +$(document).ready(function () { + $("#RSide").css("min-height",$("#LSide").height()-30); }); \ No newline at end of file diff --git a/public/javascripts/project.js b/public/javascripts/project.js index 6dc772f1e..52d96f2d7 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -130,6 +130,7 @@ function submitFocus(obj) //当项目描述长度小于112px时，不显示更多按钮 $(function(){ +// alert($("#course_description_content").height()); if($("#course_description_content").height()>112) { $("#lg-foot").show(); @@ -144,4 +145,18 @@ function course_setting(id) $('#tbc_0'+id).removeClass().addClass("dis"); $('#tb_'+(3-id)).removeClass().addClass("hwork_normaltab"); $('#tbc_0'+(3-id)).removeClass().addClass("undis"); -} \ No newline at end of file +} + +//项目类型 +function show_window () { + $('#light').css('display','block'); + $('#fade').css('display','block'); +} + +function close_window(type){ + $('#light').css('display','none'); + $('#fade').css('display','none'); + + $("#" + type).attr("checked","checked"); +} +//弹框l \ No newline at end of file diff --git a/public/stylesheets/pleft.css b/public/stylesheets/pleft.css index f20a123c9..7a87c3c77 100644 --- a/public/stylesheets/pleft.css +++ b/public/stylesheets/pleft.css @@ -16,6 +16,9 @@ a:hover.pr_join_a{ background:#41a8c8;} .pr_close{ display:block; background:url(../images/leftside.png) -1px -49px no-repeat; width:11px; height:11px; margin-top:3px; float:left; } .pr_add{display:block; background:url(../images/leftside.png) 0px -71px no-repeat; width:11px; height:11px; margin-top:3px; float:left; } .pr_arrow{display:block; background:url(../images/leftside.png) 0px -90px no-repeat; width:11px; height:11px; margin-top:3px; float:left; } +.pr_friend{display:block; background:url(../images/leftside.png) 0px -112px no-repeat; width:12px; height:11px; margin-top:4px; float:left; } +.pr_keyan{display:block; background:url(../images/leftside.png) 0px -135px no-repeat; width:12px; height:11px; margin-top:4px; float:left; } +.pr_kafa{display:block; background:url(../images/leftside.png) 0px -156px no-repeat; width:12px; height:11px; margin-top:4px; float:left; } .pr_info_name{ color:#3e4040; font-size:14px; line-height:1.5;} .pr_info_name:hover{ color:#3ca5c6;} .pr_info_score{ font-size:14px; color:#3e4040; } @@ -47,7 +50,7 @@ a:hover.subnav_green{ background:#14ad5a;} .project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d; line-height:1.9;} .course_description{max-height: 112px;overflow:hidden; word-break: break-all;word-wrap: break-word;} .course_description_none{max-height: none;} -.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;} +.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;display: none;} .lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;} /****标签(和资源库的tag样式一致)***/ .project_Label{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; margin-bottom:10px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 77d4db195..b01c2a7e0 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -126,6 +126,8 @@ a:hover.grey_btn{ background:#717171; color:#fff;} .blue_btn{ background:#64bdd9; color:#fff; font-size:14px; font-weight:normal;padding:2px 10px; text-align:center;} a.blue_btn{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center;} a:hover.blue_btn{ background:#329cbd;} +a.orange_btn{ background:#ff5722;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center; } +a:hover.orange_btn{ background:#d63502;} .nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;} .more_btn{-moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF; border-radius:3px; padding:0px 3px;} .upbtn{ margin:42px 0 0 10px; border:none;} @@ -362,3 +364,4 @@ div.flash.warning, .conflict { .floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;} a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;} a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} +.white_content02{display:none;position:fixed;top:15%;left:30%;width:200px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;}