diff --git a/app/controllers/boards_controller.rb b/app/controllers/boards_controller.rb index bdbbb8e37..a301d270d 100644 --- a/app/controllers/boards_controller.rb +++ b/app/controllers/boards_controller.rb @@ -42,12 +42,19 @@ class BoardsController < ApplicationController elsif @course if (User.current.admin? || @course.is_public == 1 || (@course.is_public == 0 && User.current.member_of_course?(@course))) @boards = @course.boards.includes(:last_message => :author).all - @boards = [] << @boards[0] if @boards.any? - if @boards.size == 1 - @board = @boards.first - show and return + if @course.boards.empty? + @board = @course.boards.build + @board.name = " #{l(:label_borad_course) }" + @board.description = @course.name.to_s + @board.project_id = -1 + if @board.save + @boards = @course.boards.includes(:last_message => :author).all + end end - render :layout => 'base_courses' + if @boards.size == 1 + @board = @course.boards.first + end + show and return else render_403 end @@ -65,7 +72,7 @@ class BoardsController < ApplicationController 'replies' => "#{Message.table_name}.replies_count", 'updated_on' => "COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on)" - @topic_count = @board.topics.count + @topic_count = @board ? @board.topics.count : 0 if @project @topic_pages = Paginator.new @topic_count, per_page_option, params['page'] @topics = @board.topics. @@ -77,14 +84,13 @@ class BoardsController < ApplicationController preload(:author, {:last_reply => :author}). all elsif @course - board_topics = @board.topics. - reorder("#{Message.table_name}.sticky DESC"). + board_topics = @board ? @board.topics.reorder("#{Message.table_name}.sticky DESC"). includes(:last_reply). # limit(@topic_pages.per_page). # offset(@topic_pages.offset). order(sort_clause). preload(:author, {:last_reply => :author}). - all + all : [] @topics = paginateHelper board_topics,10 end diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 5e67e0a2c..845f32dab 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -243,8 +243,10 @@ class ProjectsController < ApplicationController # Author lizanle # Description 项目动态展示方法，删除了不必要的代码 def show - - # 试图跳转到请求的按钮 + # params[:login]为邮箱邀请用户加入，主要功能： + # 1、自动注册 + # 2、加入项目、创建角色 + # 3、用户得分 if params[:login] login = params[:login] login = login.sub(/%40/,'@') @@ -252,6 +254,7 @@ class ProjectsController < ApplicationController password = params[:password] us = UsersService.new user = us.register_auto(login,mail, password) + Member.create(:role_ids => [4], :user_id => user.id,:project_id => @project.id) UserGrade.create(:user_id => user.id, :project_id => @project.id) User.current = user unless User.current.nil? diff --git a/app/controllers/words_controller.rb b/app/controllers/words_controller.rb index 680a13963..3d6772ea8 100644 --- a/app/controllers/words_controller.rb +++ b/app/controllers/words_controller.rb @@ -81,9 +81,10 @@ class WordsController < ApplicationController @journal_destroyed = JournalsForMessage.delete_message(params[:object_id]) if @journal_destroyed.jour_type == "Bid" @bid = Bid.find(@journal_destroyed.jour_id) - end - if @bid @jours_count = @bid.journals_for_messages.where('m_parent_id IS NULL').count + elsif @journal_destroyed.jour_type == "Course" + @course = Course.find @journal_destroyed.jour_id + @jours_count = @course.journals_for_messages.where('m_parent_id IS NULL').count end respond_to do |format| format.js diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 20175dc57..484a3189c 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -633,7 +633,7 @@ module ApplicationHelper def principals_check_box_tags_li(name, principals) s = '' principals.each do |principal| - s << "
  • #{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id), :class => "c_blue" }
    • \n" + s << "
  • #{ check_box_tag name, principal.id, false, :id => nil } #{h link_to principal.userInfo, user_path( principal.id) }
    • \n" end s.html_safe end diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index 34c6dad15..06b154d36 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -32,7 +32,7 @@ module MembersHelper #获取项目可邀请的成员列表 def render_project_members project - if params[:q] && params[:q] != "" + if params[:q] && params[:q].lstrip.rstrip != "" scope = Principal.active.sorted.not_member_of(project).like(params[:q]) else scope = [] @@ -48,7 +48,7 @@ module MembersHelper # add by nwb # 课程可添加的成员列表 def render_principals_for_new_course_members(course) - if params[:q] && params[:q] != "" + if params[:q] && params[:q].lstrip.rstrip != "" scope = Principal.active.sorted.not_member_of_course(course).like(params[:q]) else scope = [] @@ -63,19 +63,6 @@ module MembersHelper s + content_tag('ul', links,:class => 'wlist',:id => "course_member_pagination_links") end - # 项目配置中添加成员列表 - def render_principals_for_new_project_members(project) - scope = Principal.active.sorted.not_member_of(project).like(params[:q]) - principals = paginateHelper scope,10 - s = content_tag('ul', project_member_check_box_tags_ex('membership[user_ids][]', principals), :class => 'mb5', :id => 'principals') - - links = pagination_links_full(@obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true) {|text, parameters, options| - link_to text, appliedproject_project_memberships_path(project, parameters.merge(:q => params[:q], :format => 'js')), :remote => true - } - - s + content_tag('ul', links,:class => 'wlist',:id => "course_member_pagination_links") - end - # 新申请加入项目成员列表 def render_principals_for_applied_members_new project scope = project.applied_projects.map(&:user) diff --git a/app/models/mailer.rb b/app/models/mailer.rb index ce3924119..acc268275 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -53,7 +53,8 @@ class Mailer < ActionMailer::Base @subject = "#{invitor.name} #{l(:label_invite_project)} #{project.name} " @password = newpass(6) @project_url = url_for(:controller => 'projects', :action => 'show', :id => project.id, - :password => @password, :login => email) + :password => @password, + :login => email) mail :to => email, :subject => @subject end diff --git a/app/services/users_service.rb b/app/services/users_service.rb index c1f716fd1..3a92bf8f1 100644 --- a/app/services/users_service.rb +++ b/app/services/users_service.rb @@ -44,12 +44,14 @@ class UsersService #location = get_user_location @user #{:id => @user.id, :img_url => img_url, :nickname => @user.login, :gender => gender, :work_unit => work_unit, :mail => @user.mail, :location => location, :brief_introduction => @user.user_extensions.brief_introduction} end + + # 自动注册功能 FOR：邮件邀请 def register_auto(login,mail,password) @user = User.new @user.admin = false @user.register @user.login = login - @user.mail =mail + @user.mail = mail password_confirmation = password should_confirmation_password = true if !password.blank? && !password_confirmation.blank? && should_confirmation_password @@ -59,9 +61,7 @@ class UsersService else @user.password = "" end - @user = automatically_register(@user) - if @user.id != nil ue = @user.user_extensions ||= UserExtensions.new ue.user_id = @user.id @@ -69,6 +69,7 @@ class UsersService end @user end + #显示用户 #id用户id def show_user(params) diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb index 9a65556d8..0135ee239 100644 --- a/app/views/attachments/_project_file_links.html.erb +++ b/app/views/attachments/_project_file_links.html.erb @@ -64,7 +64,7 @@ <% images = attachments.select(&:thumbnailable?) %> <% if images.any? %> <% images.each do |attachment| %> -
    <%= thumbnail_issue_tag(attachment) %>
    +
    <%= thumbnail_issue_tag(attachment) %>
    <% end %> <% end %> <% end %> diff --git a/app/views/avatar/_avatar_form.html.erb b/app/views/avatar/_avatar_form.html.erb index fef9f7bdb..56f1f130e 100644 --- a/app/views/avatar/_avatar_form.html.erb +++ b/app/views/avatar/_avatar_form.html.erb @@ -47,7 +47,6 @@ <%= l(:button_upload_photo) %> - (个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像) <%= file_field_tag 'avatar[image]', @@ -69,6 +68,7 @@ :source_id => source.id.to_s } %> + <% content_for :header_tags do %> <%= javascript_include_tag 'avatars' %> diff --git a/app/views/avatar/_new_avatar_form.html.erb b/app/views/avatar/_new_avatar_form.html.erb index 8b81ebf66..e341bc83a 100644 --- a/app/views/avatar/_new_avatar_form.html.erb +++ b/app/views/avatar/_new_avatar_form.html.erb @@ -3,10 +3,9 @@ <%#= link_to l(:button_delete_file),{:controller => :avatar,:action => :delete_image,:remote=>true,:source_type=> source.class,:source_id=>source.id},:confirm => l(:text_are_you_sure), :method => :post, :class => "upbtn fl" %> <%= l(:button_upload_photo) %> -(个人头像建议90*90大小，课程和项目logo建议60*60大小，或者等比图像) <%= file_field_tag 'avatar[image]', :id => nil, - :class => 'upload_file ', + :class => 'upload_file', :size => "1", :multiple => false, :onchange => 'addInputAvatar(this);', diff --git a/app/views/contests/_form_contest.html.erb b/app/views/contests/_form_contest.html.erb index ec993fae8..344d69571 100644 --- a/app/views/contests/_form_contest.html.erb +++ b/app/views/contests/_form_contest.html.erb @@ -67,7 +67,7 @@ <%= f.text_field :deadline, :required => true, :size => 60, - :style => "width:150px;", + :style => "width:150px;float:left;", :readonly => true, :placeholder => "#{l(:label_deadline)}" %> diff --git a/app/views/courses/_searchmembers.html.erb b/app/views/courses/_searchmembers.html.erb index c6b577c8d..1956f34c4 100644 --- a/app/views/courses/_searchmembers.html.erb +++ b/app/views/courses/_searchmembers.html.erb @@ -1,5 +1,5 @@ <%= form_tag( searchmembers_course_path(@course), method: 'get',:class => "f_l",:remote=>true,:id => "search_student") do %> - <%= text_field_tag 'name', params[:name], name: "name", :class => 'st_search_input', :placeholder => '输入学生姓名、学号进行搜索'%> + <%= text_field_tag 'name', params[:name], name: "name", :class => 'st_search_input', :placeholder => '输入学生昵称、姓名、学号进行搜索'%> <% if @group %> <%= hidden_field "search_group_id", params[:search_group_id],:value => "#{@group.id}", name: 'search_group_id' %> diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 2f4ec56a0..c105dc2b8 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -17,11 +17,12 @@

    (<%= l(:label_memos_max_length) %>)

    -

    +

    <%= l(:label_attachment_plural) %>
    <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>

    +
    <%= f.submit :value => l(:label_memo_create) %> <%= link_to l(:button_cancel), "#", :onclick => '$("#add-memo").hide(); return false;' %> diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 1266f4611..e4c1290aa 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -5,12 +5,14 @@ <% if @edit_allowed || !@allowed_statuses.empty? %> + <% end %> -
    + <% if @journals.present? %> diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index ac5a46bfe..3fb604f06 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -16,6 +16,13 @@ }); } + function EnterPress(e){ + var e = e || window.event; + if(e.keyCode == 13){ + remote_function(); + } + } + @@ -24,10 +31,10 @@
    <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %> - <%= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get,:id=>"issue_query_form", :class => 'query_form') do %> + <%#= form_tag({:controller => 'issues', :action => 'index', :project_id => @project}, :method => :get,:id=>"issue_query_form", :class => 'query_form') do %> <%= hidden_field_tag 'set_filter', '1' %>
    - + 搜索
    @@ -58,7 +65,7 @@ %>
    - <% end %> + <%# end %>

    <%= l(:label_issues_sum) %>：<%= @project.issues.count %> <%= l(:lable_issues_undo) %>：<%= @project.issues.where('status_id in (1,2,4,6)').count %>

    diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index 7105aff47..89faf39e3 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -1,11 +1,4 @@ - - - - - -<%= l(:label_feedback) %> - - - + +
    @@ -184,17 +161,4 @@ function cookieget(n)
    <%= l(:label_submit)%>
    - - - - \ No newline at end of file diff --git a/app/views/layouts/_new_header.html.erb b/app/views/layouts/_new_header.html.erb index a430a8e8f..489612c9a 100644 --- a/app/views/layouts/_new_header.html.erb +++ b/app/views/layouts/_new_header.html.erb @@ -18,8 +18,8 @@ <% if User.current.logged? -%>
  • - <%= link_to_user_header(User.current,false,:class =>'parent')%> -
    • <%= link_to l(:label_course_board), course_boards_path(@course), :class => "f14 c_blue02" %> - <%= link_to "(#{@course.boards[0].topics.count})", course_boards_path(@course), :class => "subnav_num c_orange" %> - <%= link_to( "+#{l(:label_message_new)}", new_board_message_path(@course.boards[0]), :class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) %> + <%= link_to "(#{@course.boards.first ? @course.boards.first.topics.count : 0})", course_boards_path(@course), :class => "subnav_num c_orange" %> + <%= link_to( "+#{l(:label_message_new)}", new_board_message_path(@course.boards.first), :class => 'subnav_green ml95 c_white') if User.current.member_of_course?(@course) && @course.boards.first %>
    <%= link_to l(:label_course_feedback), course_feedback_path(@course), :class => "f14 c_blue02" %> - <%= link_to "(#{course_feedback_count})", course_feedback_path(@course), :class => "subnav_num c_orange" %> + <%= link_to "(#{course_feedback_count})", course_feedback_path(@course), :class => "subnav_num c_orange", :id => "course_jour_count"%>
    <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id), :class => " f14 c_blue02"%> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 8890e88a4..096dadf8b 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -228,9 +228,9 @@

    请选择项目类型：

    确定 diff --git a/app/views/memos/_reply_box.html.erb b/app/views/memos/_reply_box.html.erb index 1ee94dd3e..d86f35bc9 100644 --- a/app/views/memos/_reply_box.html.erb +++ b/app/views/memos/_reply_box.html.erb @@ -9,10 +9,12 @@ <%= f.kindeditor :content, :cols => 80, :rows => 15, :value => @content %> -

    +

    +

    <%= l(:label_attachment_plural) %>
    <%= render :partial => 'attachments/form' %>

    +
    <%= f.submit value: l(:label_reply_plural), class: "replies" %> <% end %> \ No newline at end of file diff --git a/app/views/memos/_topic_form.html.erb b/app/views/memos/_topic_form.html.erb index ec16fbc5c..a18402acf 100644 --- a/app/views/memos/_topic_form.html.erb +++ b/app/views/memos/_topic_form.html.erb @@ -7,10 +7,10 @@
    -

    +

    <%= l(:label_attachment_plural) %>
    <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>

    - <%= f.submit :value => l(:label_memo_create) %> <%= link_to l(:button_back), forum_path(@forum) %> + <%= f.submit :value => l(:label_memo_create), :style => "margin-left: 100px;"%> <%= link_to l(:button_back), forum_path(@forum) %>
    <% end %> \ No newline at end of file diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index 00ce81933..b7aa08abd 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -43,12 +43,13 @@ <%= f.kindeditor :content, :required => true, :size => 80,:owner_id => @memo.id,:owner_type => 1 %>

    -

    +

    <%= l(:label_attachment_plural) %>
    <%= render :partial => 'attachments/form', :locals => {:container => @memo} %>


    +
    <%= f.submit :value => l(:button_change) %>  <%= link_to l(:button_back), back_url ,:class => "button-canel",:style => "color: #ffffff;"%>
    <% end %> diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb index 50a97d9ba..018783fbd 100644 --- a/app/views/messages/_course_show.html.erb +++ b/app/views/messages/_course_show.html.erb @@ -3,13 +3,24 @@ <%= l(:label_board) %> + +
    +

    + <%= l(:label_user_location) %> : + <%= link_to l(:label_borad_course), course_boards_path(@course) %> + > + <%= link_to @topic.subject, course_board_path(@course, @board) %> +

    +
    +
    +
    <%= link_to image_tag(url_to_avatar(@topic.author),:width => '46',:height => '46'), user_path(@topic.author) %>
    -

    - <%= link_to @topic.subject, course_boards_path(@topic.course),title: @topic.subject.to_s %> +

    + <%= @topic.subject %>


    @@ -51,7 +62,7 @@ <% unless @replies.empty? %> <% reply_count = 0 %> <% @replies.each do |message| %> -

    "> +
    ">
    <%= link_to image_tag(url_to_avatar(message.author), :width => '46',:height => '46'), user_path(message.author) %>
    diff --git a/app/views/projects/settings/_new_members.html.erb b/app/views/projects/settings/_new_members.html.erb index faccfbeeb..5e2c9f603 100644 --- a/app/views/projects/settings/_new_members.html.erb +++ b/app/views/projects/settings/_new_members.html.erb @@ -12,19 +12,19 @@
    <% if members.any? %>
      -
    • <%= l(:label_user) %><%= l(:label_role_plural) %>
      • +
    • <%= l(:label_user) %><%= l(:label_role_plural) %>
      • <%= call_hook(:view_projects_settings_members_table_header, :project => @project) %> <% members.each do |member| %>
    • - <%= link_to_user_header member.principal,false,:class => "w90 c_orange fl" %> - + <%= link_to_user_header member.principal,false,:class => "w140_h c_setting_blue fl" %> + <%= h member.roles.sort.collect(&:to_s).join(', ') %> <%= form_for(member, {:as => :membership, :remote => true, :url => membership_path(member), :method => :put, :html => {:id => "member-#{member.id}-roles-form", :class => 'hol'}} ) do |f| %> <% roles.each do |role| %> -
        +
          <%= check_box_tag 'membership[role_ids][]', role.id, member.roles.include?(role), :disabled => member.member_roles.detect { |mr| mr.role_id == role.id && !mr.inherited_from.nil? } %> @@ -32,7 +32,7 @@ <% end %> <%= hidden_field_tag 'membership[role_ids][]', '' %> -
          +
          <%= l(:button_change)%> @@ -43,10 +43,10 @@ <% end %> <% unless member.user_id == @project.user_id %> - 编辑 + 编辑 <%= delete_link membership_path(member), :remote => true, - :class => "c_dblue ml30 fl", + :class => "c_setting_blue ml15 fl", :data => (!User.current.admin? && member.include?(User.current) ? {:confirm => l(:text_own_membership_for_project_confirmation)} : {confirm: l(:label_delete_confirm)}) if member.deletable? %> <% end%> diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index a5f476079..e6a0ac296 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -19,13 +19,13 @@ <% @project.repositories.sort.each do |repository| %> - + - <%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?), :class =>"c_blue" %> + <%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %> <%= checked_image repository.is_default? %> <%=h repository.scm_name %> <%if repository.scm_name=="Git"%> - <%=truncate( 'http://' << repository.login.to_s << '_'<< repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>20)%> <%else %> <%=h truncate(repository.url,:length=>10) %> @@ -33,8 +33,8 @@ <% if repository.scm_name=="Git"%> <%if User.current.allowed_to?(:manage_repository, @project) %> - <%= link_to(l(:label_user_plural), committers_repository_path(repository), - :class => 'c_blue') %> + <%= link_to(l(:label_user_plural), committers_repository_path(repository) + ) %> <% end %> <% end %> diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb index e52984d15..feb08bac5 100644 --- a/app/views/projects/settings/_new_versions.html.erb +++ b/app/views/projects/settings/_new_versions.html.erb @@ -18,15 +18,15 @@ <% for version in @project.shared_versions.sort %> - - + + <%= 'shared' if version.project != @project %> <%= link_to_version version %> <%= format_date(version.effective_date) %> - <%=h version.description %> + <%=h version.description %> <%= l("version_status_#{version.status}") %> <%=h format_version_sharing(version.sharing) %> - + <%= link_to_if_authorized(h(truncate(version.wiki_page_title,:length=>20)), {:controller => 'wiki', :action => 'show', :project_id => version.project, diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb index 2ca875681..5b0f27953 100644 --- a/app/views/projects/settings/_versions.html.erb +++ b/app/views/projects/settings/_versions.html.erb @@ -42,9 +42,9 @@ <%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', - :action => 'show', - :project_id => version.project, - :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> + :action => 'show', + :project_id => version.project, + :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> <% if version.project == @project && User.current.allowed_to?(:manage_versions, @project) %> diff --git a/app/views/wiki/_content.html.erb b/app/views/wiki/_content.html.erb index 1f32f58d2..b37e4f970 100644 --- a/app/views/wiki/_content.html.erb +++ b/app/views/wiki/_content.html.erb @@ -1,5 +1,6 @@ <%= textAreailizable content, :text, :attachments => content.page.attachments, - :edit_section_links => (@sections_editable && {:controller => 'wiki', :action => 'edit', :project_id => @page.project, :id => @page.title}) %> + :edit_section_links => (@sections_editable && {:controller => 'wiki', :action => 'edit', :project_id => @page.project, :id => @page.title, :class =>"break_word_firefox"}) + %> <%#= content.text.html_safe %> diff --git a/app/views/words/destroy.js.erb b/app/views/words/destroy.js.erb index d00db0695..c3d339685 100644 --- a/app/views/words/destroy.js.erb +++ b/app/views/words/destroy.js.erb @@ -1,8 +1,10 @@ <% if @journal_destroyed.nil? %> alert('<%=l(:notice_failed_delete)%>'); <% elsif (['Principal','Project','Course', 'Bid', 'Contest', 'Softapplication'].include? @journal_destroyed.jour_type)%> - <% if @jours_count %> + <% if @bid && @@jours_count %> $('#jours_count').html("<%= @jours_count %>"); + <% elsif @course && @jours_count%> + $('#course_jour_count').html("(<%= @jours_count %>)"); <% end %> var destroyedItem = $('#word_li_<%=@journal_destroyed.id%>') destroyedItem.fadeOut(600,function(){ diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index b506ce14b..366841e37 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -354,7 +354,7 @@ zh: label_feedback_tips: "有什么想说的，尽管来咆哮吧~~" label_technical_support: "技术支持：" label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！" - label_feedback_value: "用户意见反馈" + label_feedback_value: "用户反馈" diff --git a/public/javascripts/feedback.js b/public/javascripts/feedback.js index a3707b312..dfd3e10b2 100644 --- a/public/javascripts/feedback.js +++ b/public/javascripts/feedback.js @@ -5,17 +5,18 @@ minStatue : true, skin : 'blue', durationTime : 1000 - }; + } var options = $.extend(defaults, options); this.each(function(){ + //??????? var thisBox = $(this), closeBtn = thisBox.find('.close_btn' ), show_btn = thisBox.find('.show_btn' ), sideContent = thisBox.find('.side_content'), sideList = thisBox.find('.side_list') ; - var defaultTop = thisBox.offset().top; + var defaultTop = thisBox.offset().top; //????????top thisBox.css(options.float, 0); if(options.minStatue == "true"){ @@ -24,34 +25,59 @@ show_btn.css('width', 25); } + //close closeBtn.bind("click",function(){ sideContent.animate({width: '0px'},"fast"); show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast"); - cookiesave('minStatue','false','','',''); + cookiesave('minStatue','true','','',''); }); + //show show_btn.bind("click",function() { $(this).animate({width: '0px'},"fast"); sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast"); - cookiesave('minStatue','true','','',''); + cookiesave('minStatue','false','','',''); }); - }); + + + + }); //end this.each }; })(jQuery); + +$(function(){ + $("#button1").click(function(){ + myTips("<%= l(:label_feedback_success) %>","success"); + }); + +}); + +function f_submit() +{ + var subject = $("#memo_subject").val(); + var content = $("#memo_content_1").val(); + $("#memo_subject").val(subject+"："+ content.substr(0,18)); + $("#new_memo").submit(); +} + function cookiesave(n, v, mins, dn, path) { if(n) { + if(!mins) mins = 365 * 24 * 60; if(!path) path = "/"; var date = new Date(); + date.setTime(date.getTime() + (mins * 60 * 1000)); + var expires = "; expires=" + date.toGMTString(); + if(dn) dn = "domain=" + dn + "; "; document.cookie = n + "=" + v + expires + "; " + dn + "path=" + path; + } } - function cookieget(n) { var name = n + "="; @@ -61,18 +87,11 @@ function cookieget(n) while (c.charAt(0)==' ') c = c.substring(1,c.length); if (c.indexOf(name) == 0){ return c.substring(name.length,c.length);} + } return false; } -$(function() { - $("#scrollsidebar").fix({ - float : 'right', //default.left or right - minStatue : cookieget('minStatue'), - skin : 'green', //default.gray or blue - durationTime : 600 - }); -}); $(function(){ $("#button1").click(function(){ @@ -86,4 +105,16 @@ function f_submit() var content = $("#memo_content").val(); $("#memo_subject").val(subject+"："+ content.substr(0,18)); $("#new_memo").submit(); -} \ No newline at end of file +} + + +$(document).ready(function () { + $(function () { + $("#scrollsidebar").fix({ + float: 'right', //default.left or right + minStatue: cookieget('minStatue'), + skin: 'green', //default.gray or blue + durationTime: 600 + }); + }); +}); \ No newline at end of file diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 3e88bb30a..d00ad37e7 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -3152,6 +3152,18 @@ input[class~='m3p10'], .m3p10 { .break_word{word-break: break-all;word-wrap: break-word;} .break_word_firefox{white-space: pre-wrap;word-break: break-all;} +/*日历选择图*/ +img.ui-datepicker-trigger { + display:block; + background:url(/images/public_icon.png) -31px 0 no-repeat; + cursor: pointer; + vertical-align: middle; + margin-left: 5px; + margin-top: 5px; + width:16px; + height:15px; + float:left; +} /*lizanle 日誌搜索結果樣式*/ .search_results { diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 1fed23fc1..b8e23f4be 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -331,6 +331,7 @@ a:hover.st_add{ color:#ff8e15;} .upbtn{ margin:40px 0 0 15px; display:block; padding:2px 5px; border:1px solid #eaeaea;} .upbtn:hover{border:1px solid #64bdd9; color:#64bdd9;cursor: pointer;} .upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer} + /* 功能倒计时*/ .w_img{ float:left; margin:10px 10px 15px 0px;} .w_p{ float:left; color:#15bccf; font-size:16px; font-weight:bold; margin-top:70px; } diff --git a/public/stylesheets/nyan.css b/public/stylesheets/nyan.css index de4dcb65c..a6dfe3f90 100644 --- a/public/stylesheets/nyan.css +++ b/public/stylesheets/nyan.css @@ -734,7 +734,7 @@ div.actions input[type="text"] { .replies { overflow: hidden; max-width: 100%; - float: right; + float: left; /*max-width: 90%;*/ } diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 2f6a4babe..6894e3382 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -55,6 +55,9 @@ a:hover.btn_free{ background:#d63502;} a.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;} a:hover.invi_search_btn{ background:#0da1b2; border:1px solid #0da1b2;} .rolebox{ margin:10px 0;} +.w180_h{ width:180px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; text-align:left;} +.w140_h{ width:119px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;text-align:left; padding-left:5px;} + /*问题跟踪*/ .problem_top{ margin:10px 0 ;} .problem_search_input{ border:1px solid #64bdd9; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:5px;} @@ -368,6 +371,7 @@ blockquote { } /*上传项目图片*/ .upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer} + /*配置*/ .pro_st_ttl{ height:24px;} .pro_st_ctt{height:auto; clear:both;} @@ -390,14 +394,14 @@ blockquote { .box ul li{ line-height:1.9;} .members_left{ float:left; width:410px; margin-right:20px; text-align:center;} .members_left{} -.members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4; width:410px; padding-top:10px; } -.members_left ul li a{ float:left; text-align:center;} -.members_left ul li span{ float:left; text-align:center; color:#484747;} +.members_left ul li{ height:22px; border-bottom:1px solid #E4E4E4; width:410px; padding-top:5px; } +.members_left ul li a{ float:left; text-align:left;} +.members_left ul li span{ float:left; text-align:center; color:#484747;text-align:left;} .w150{ text-align:center; width:150px;} .f_b{ font-weight: bold;} .members_right{ float:left; width:240px;} .members_right label{ margin-left:15px;} -.members_jion{ background:#f0fbff; padding:10px; height:200px; margin-bottom:10px;} +.members_jion{ background:#f0f0f0; padding:10px; height:200px; margin-bottom:10px;} .members_add{ padding-left:10px; } .member_search_input{ border:1px solid #15bccf; background:#fff; width:170px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;} .member_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;} @@ -471,6 +475,7 @@ img.ui-datepicker-trigger { .wiki_con_tit{ font-size:14px; color:#09658c; font-weight:bold;width:630px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; margin-bottom:10px;} .wiki_con_box{ line-height:1.9; color:#2d2d2d;} .wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px;} +.wiki_page p{word-break: break-all;word-wrap: break-word;} #wiki_new_box{ display:none;} /*wiki显示附加*/ .wiki-page {font-size: 14px;color: #09658C !important; font-weight: bold;width: 630px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-bottom: 10px;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 2f45bbd69..e07efadd5 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -105,6 +105,7 @@ a:hover.c_orange{color: #d33503;} a.c_lorange{color:#ff9900;} a:hover.c_lorange{color:#fff;} a.c_blue{ color:#15bccf;} +a.c_setting_blue{color: #0781B4} a.c_dblue{ color:#09658c;} a:hover.c_dblue{ color:#15bccf;} a.c_white{ color:#fff;} @@ -131,6 +132,7 @@ a.c_green{ color:#28be6c;} .c_blue{ color:#15bccf;} .c_red{ color:#F00;} .c_green{ color:#28be6c;} +.c_grey{color:#999;} .c_dblue{ color:#09658c;} .b_blue{background:#64bdd9;} .b_green{background:#28be6c;} @@ -213,14 +215,15 @@ div#menu {height:41px; font-size:14px; font-weight:bold; } div#menu ul {float: left;} div#menu ul.menu { padding-left: 30px; } div#menu li {position: relative; z-index: 9; margin: 0; display: block; float: left; } -div#menu li:hover>ul { left: -2px;} +/*div#menu li:hover>ul { right: 5px;}*/ div#menu a {position: relative;z-index: 10; height: 41px; display: block; float: left;line-height: 41px; text-decoration: none; font-size:14px; } div#menu a:hover, div#menu a:hover span { color: #a1ebff; } div#menu li.current a {} div#menu {display: block; cursor: pointer; background-repeat: no-repeat;background-position: 95% 0;padding-right: 15px; _padding-right: 20px;} -div#menu ul a.parent {background: url(../images/item.png) -20px -30px no-repeat; width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} -div#menu ul a.parent:hover {background: url(../images/item.png) -20px -60px no-repeat;} -div#menu ul ul a.parent {background: url(../images/item.png) -20px 6px no-repeat;} +div#menu ul a.user_name { width:170px; text-align:right; margin:0; } +.pic_triangle{background: url(../images/item.png) -90px -48px no-repeat; float:right; display:block; width:10px; height:10px; margin-top:12px; margin-left:7px;} +.pic_triangle:hover{background: url(../images/item.png) -90px -78px no-repeat; } +div#menu ul ul a.parent {background: url(../images/item.png) -20px 6px no-repeat;width:60px;} div#menu ul ul a.parent:hover {background: url(../images/item.png) -20px -11px no-repeat;} /* menu::level1 */ div#menu a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;} @@ -228,13 +231,13 @@ div#menu a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;} div#menu li.last { background: none; } /* menu::level2 */ div#menu ul ul li { background: none; } -div#menu ul ul { position: absolute;top: 38px; left: -999em; width: 90px; padding: 5px 0 0 0; background:#fff; border:1px solid #15bccf; margin-top:1px;} +div#menu ul ul { position: absolute;top: 38px; width: 90px; padding: 5px 0 0 0; background:#fff; border:1px solid #15bccf; margin-top:1px;} div#menu ul ul a {padding: 0 0 0 15px; height: auto; float: none;display: block; line-height: 24px; font-size:12px; font-weight:normal;color:#15bccf;} div#menu ul ul a:hover { color:#ff9900;} div#menu ul ul li.last { margin-left:15px; } div#menu ul ul li {width: 100%;} /* menu::level3 */ -div#menu ul ul ul {padding: 0;margin: -38px 0 0 92px !important; width:200px; } +div#menu ul ul ul {padding: 0;margin: -38px 0 0 90px !important; width:200px; } div#menu ul ul ul li a{ width:185px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf;} /*主类容*/ @@ -288,6 +291,7 @@ a.close_btn {background-position:-44px 0;} a:hover.close_btn {background-position:-66px 0;} .show_btn {background-position:-119px 0;} .msgserver a {color:#15bccf; } +.msgserver a:hover { text-decoration:underline; } .hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} @@ -404,8 +408,10 @@ div.flash.warning, .conflict { /*弹出框*/ .black_overlay{display:none;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.8;opacity:.80;filter:alpha(opacity=80);} .white_content{display:none;position:fixed;top:15%;left:30%;width:420px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;} -.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;} +.white_content02{display:none;position:fixed;top:15%;left:30%;width:310px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;} .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;} +/*文本左对齐*/ +.tl{text-align: left;}