From 9443c139f0815aa8d436ff174377c8d87eb44fd8 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 18 Sep 2015 17:44:16 +0800 Subject: [PATCH 01/79] update forum --- app/controllers/forums_controller.rb | 85 ++++- app/controllers/memos_controller.rb | 10 +- app/views/forums/_file_form.html.erb | 79 +++++ app/views/forums/_forum_form.html.erb | 15 + app/views/forums/_forum_list.html.erb | 87 ++--- app/views/forums/_forum_tag_list.html.erb | 5 + app/views/forums/_show_topics.html.erb | 64 ++-- app/views/forums/create.js.erb | 1 + app/views/forums/delete_forum_tag.js.erb | 2 + app/views/forums/index.html.erb | 164 +++++++--- app/views/forums/index.js.erb | 1 + app/views/forums/show.html.erb | 144 ++++++--- app/views/forums/show.js.erb | 1 + app/views/layouts/base_forums.html.erb | 178 ++++++----- app/views/layouts/users_base.html.erb | 28 +- app/views/memos/_attachments_links.html.erb | 71 +++++ app/views/memos/_praise_tread.html.erb | 36 +++ app/views/memos/show.html.erb | 297 +++++++----------- app/views/praise_tread/praise_plus.js.erb | 13 +- config/routes.rb | 4 +- public/images/post_portrait.jpg | Bin 0 -> 2360 bytes public/javascripts/forum.js | 101 ++++++ public/stylesheets/images/homepage_icon2.png | Bin 0 -> 11280 bytes public/stylesheets/images/post_image_list.png | Bin 0 -> 3091 bytes public/stylesheets/new_user.css | 72 ++++- .../stylesheets/application.css | 114 +++---- 26 files changed, 1042 insertions(+), 530 deletions(-) create mode 100644 app/views/forums/_file_form.html.erb create mode 100644 app/views/forums/_forum_form.html.erb create mode 100644 app/views/forums/_forum_tag_list.html.erb create mode 100644 app/views/forums/create.js.erb create mode 100644 app/views/forums/delete_forum_tag.js.erb create mode 100644 app/views/forums/index.js.erb create mode 100644 app/views/forums/show.js.erb create mode 100644 app/views/memos/_attachments_links.html.erb create mode 100644 app/views/memos/_praise_tread.html.erb create mode 100644 public/images/post_portrait.jpg create mode 100644 public/javascripts/forum.js create mode 100644 public/stylesheets/images/homepage_icon2.png create mode 100644 public/stylesheets/images/post_image_list.png diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb index 2b44d51de..112550918 100644 --- a/app/controllers/forums_controller.rb +++ b/app/controllers/forums_controller.rb @@ -7,7 +7,7 @@ class ForumsController < ApplicationController before_filter :find_forum_if_available before_filter :authenticate_user_edit, :only => [:edit, :update] before_filter :authenticate_user_destroy, :only => [:destroy] - before_filter :require_login, :only => [:new, :create] + before_filter :require_login, :only => [:new, :create,:show,:destroy,:update,:edit] helper :sort include SortHelper @@ -97,7 +97,15 @@ class ForumsController < ApplicationController def index @offset, @limit = api_offset_and_limit({:limit => 10}) - @forums_all = Forum.reorder("sticky DESC") + if(params[:reorder_complex]) + @forums_all = Forum.reorder("topic_count #{params[:reorder_complex]},updated_at #{params[:reorder_complex]}") + elsif(params[:reorder_popu]) + @forums_all = Forum.reorder("topic_count #{params[:reorder_popu]}") + elsif(params[:reorder_time]) + @forums_all = Forum.reorder("updated_at #{params[:reorder_time]}") + else + @forums_all = Forum.reorder("topic_count desc,updated_at desc") + end @forums_count = @forums_all.count @forums_pages = Paginator.new @forums_count, @limit, params['page'] @@ -106,6 +114,7 @@ class ForumsController < ApplicationController #@forums = Forum.all respond_to do |format| format.html # index.html.erb + format.js format.json { render json: @forums } end end @@ -113,23 +122,34 @@ class ForumsController < ApplicationController # GET /forums/1 # GET /forums/1.json def show - sort_init 'updated_at', 'desc' - sort_update 'created_at' => "#{Memo.table_name}.created_at", - 'replies' => "#{Memo.table_name}.replies_count", - 'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)" - + # sort_init 'updated_at', 'desc' + # sort_update 'created_at' => "#{Memo.table_name}.created_at", + # 'replies' => "#{Memo.table_name}.replies_count", + # 'updated_at' => "COALESCE (last_replies_memos.created_at, #{Memo.table_name}.created_at)" + order = "" + if(params[:reorder_complex]) + order = " last_replies_memos.created_at #{params[:reorder_complex]}, #{Memo.table_name}.created_at #{params[:reorder_complex]}" + elsif(params[:reorder_popu]) + order = "replies_count #{params[:reorder_popu]}" + elsif(params[:reorder_time]) + order = "#{Memo.table_name}.updated_at #{params[:reorder_time]}" + else + order = "last_replies_memos.created_at desc, #{Memo.table_name}.created_at desc" + end @memo = Memo.new(:forum => @forum) @topic_count = @forum.topics.count @topic_pages = Paginator.new @topic_count, per_page_option, params['page'] @memos = @forum.topics. # reorder("#{Memo.table_name}.sticky DESC"). - includes(:last_reply). + includes(:last_reply).where("last_replies_memos.parent_id is null and #{Memo.table_name}.parent_id is null"). limit(@topic_pages.per_page). offset(@topic_pages.offset). - order(sort_clause). + reorder(order). preload(:author, {:last_reply => :author}). all @memos + @my_topic_count = Memo.where("forum_id = #{@forum.id} and author_id = #{User.current.id} and parent_id is null").count + @my_replies_count = Memo.where("forum_id = #{@forum.id} and author_id = #{User.current.id} and parent_id is not null").count # @offset, @limit = api_offset_and_limit({:limit => 10}) # @forum = Forum.find(params[:id]) # @memos_all = @forum.topics @@ -139,6 +159,7 @@ class ForumsController < ApplicationController # @offset ||= @topic_pages.offset # @memos = @memos_all.offset(@offset).limit(@limit).all respond_to do |format| + format.js format.html { render :layout => 'base_forums' }# show.html.erb @@ -178,7 +199,7 @@ class ForumsController < ApplicationController end #end respond_to do |format| - + format.js format.html { redirect_to @forum, notice: l(:label_forum_create_succ) } format.json { render json: @forum, status: :created, location: @forum } end @@ -186,6 +207,7 @@ class ForumsController < ApplicationController else respond_to do |format| flash.now[:error] = "#{l :label_forum_create_fail}: #{@forum.errors.full_messages[0]}" + format.js format.html { render action: "new" } format.json { render json: @forum.errors, status: :unprocessable_entity } end @@ -199,10 +221,12 @@ class ForumsController < ApplicationController respond_to do |format| if @forum.update_attributes(params[:forum]) + format.js {render :text=> true} format.html { redirect_to @forum, notice: l(:label_forum_update_succ) } format.json { head :no_content } else flash.now[:error] = "#{l :label_forum_update_fail}: #{@forum.errors.full_messages[0]}" + format.js { render :text=> false} format.html { render action: "edit" } format.json { render json: @forum.errors, status: :unprocessable_entity } end @@ -261,6 +285,47 @@ class ForumsController < ApplicationController end end + #检查forum的名字 + def check_forum_name + forum_name_exist = Forum.where("name = '#{params[:forum_name]}'").count >= 1 ? true : false + render :text => forum_name_exist + end + + #添加论坛tag + def add_forum_tag + @forum = Forum.find(params[:id]) + unless @forum.nil? + @forum.tag_list.add(params[:tag_str].split(',')) + @forum.save + end + respond_to do |format| + format.js {render :delete_forum_tag} + end + end + + #删除forum的tag + def delete_forum_tag + @tag_id = (ActsAsTaggableOn::Tag.find_by_name(params[:tag_name])).id + #forum的taggable_type = 5 + @taggings = ActsAsTaggableOn::Tagging.find_by_tag_id_and_taggable_id_and_taggable_type(@tag_id,params[:id],'Forum') + + unless @taggings.nil? + @taggings.delete + end + + # 是否还有其他记录 引用了 tag_id + @tagging = ActsAsTaggableOn::Tagging.find_by_tag_id(@tag_id) + # 如果taggings表中记录已经不存在 ,那么检查tags表 作删除动作 + if @tagging.nil? + @tag = ActsAsTaggableOn::Tag.find_by_id(@tag_id) + @tag.delete unless @tag.nil? + end + @forum = Forum.find(params[:id]) + respond_to do |format| + format.js + end + end + private def find_forum_if_available diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index 27e0d472f..e354a3293 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -11,7 +11,7 @@ class MemosController < ApplicationController include AttachmentsHelper include ApplicationHelper - layout 'base_memos' + # layout 'base_memos' def quote @subject = @memo.subject @@ -103,7 +103,7 @@ class MemosController < ApplicationController offset(@reply_pages.offset). all if @memo.new_record? - format.html { render :new,:layout=>'base'} + format.html { render :new,:layout=>'base_forums'} else format.html { render action: :show } format.json { render json: @memo.errors, status: :unprocessable_entity } @@ -115,6 +115,7 @@ class MemosController < ApplicationController REPLIES_PER_PAGE = 20 unless const_defined?(:REPLIES_PER_PAGE) def show + # 更新贴吧帖子留言对应的memo_messages的viewed字段 unless @memo.children.blank? @memo.children.each do |child| @@ -154,14 +155,15 @@ class MemosController < ApplicationController @memo_new = Memo.new - + @my_topic_count = Memo.where("forum_id = #{@memo.forum_id} and author_id = #{User.current.id} and parent_id is null").count + @my_replies_count = Memo.where("forum_id = #{@memo.forum_id} and author_id = #{User.current.id} and parent_id is not null").count # @memo = Memo.find_by_id(params[:id]) # @forum = Forum.find(params[:forum_id]) # @replies = @memo.replies # @mome_new = Memo.new respond_to do |format| - format.html # show.html.erb + format.html {render :layout=> 'base_forums'}#:layout=> 'base_forums', format.json { render json: @memo } format.xml { render xml: @memo } end diff --git a/app/views/forums/_file_form.html.erb b/app/views/forums/_file_form.html.erb new file mode 100644 index 000000000..28bb3fa83 --- /dev/null +++ b/app/views/forums/_file_form.html.erb @@ -0,0 +1,79 @@ + +
+ +<% if defined?(container) && container && container.saved_attachments %> + <% container.attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %><%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %><%= l(:field_is_public) %>: + <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %> + <%= if attachment.id.nil? + #待补充代码 + else + link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') + end + %> + <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %> + + <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> + +
+ <% end %> + <% container.saved_attachments.each_with_index do |attachment, i| %> + + <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %> + <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %> + <%= l(:field_is_public) %>: + <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %> + <%= if attachment.id.nil? + #待补充代码 + else + link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') + end + %> + <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %> + + <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> + +
+ <% end %> +<% end %> +
+ <% project = project %> +
+ + <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %> + + <%#= button_tag "文件浏览", :type=>"button", :onclick=>"$('#_file').click();",:onmouseover => 'this.focus()',:class => 'AnnexBtn fl mt3' %> + + <%= file_field_tag 'attachments[dummy][file]', + :id => '_file', + :class => 'file_selector', + :multiple => true, + :onchange => 'addInputFiles(this);', + :style => ie8? ? '' : 'display:none', + :data => { + :max_file_size => Setting.attachment_max_size.to_i.kilobytes, + :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), + :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, + :upload_path => uploads_path(:format => 'js', :project => project), + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :delete_all_files => l(:text_are_you_sure_all) + } %> + + + + + <%#= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %> + + + + <% content_for :header_tags do %> + <%= javascript_include_tag 'attachments' %> + <% end %> +
\ No newline at end of file diff --git a/app/views/forums/_forum_form.html.erb b/app/views/forums/_forum_form.html.erb new file mode 100644 index 000000000..9888b674e --- /dev/null +++ b/app/views/forums/_forum_form.html.erb @@ -0,0 +1,15 @@ +
贴吧图片 + 上传图片 +
+
+
+ +
+
+ +
+
+
确定
+
取消
+
+
\ No newline at end of file diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb index ac27235eb..9c39c436e 100644 --- a/app/views/forums/_forum_list.html.erb +++ b/app/views/forums/_forum_list.html.erb @@ -1,57 +1,38 @@ - -
+ <% if forums.any? %> <% forums.each do |forum| %> -
-
- <%= forum.creator.nil? ? (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar")) : (link_to image_tag(url_to_avatar(forum.creator), :class => "avatar"), user_path(forum.creator)) %> -
-
- - - - - - - - - - -
-

- <%= link_to h(forum.name), forum_path(forum) %> -

-
-

- <%= textAreailizable forum.description%> -

-
-

- <%= authoring forum.created_at, forum.creator %> -

-
-
-
- - - - - - - - - -
- <%= link_to (forum.memo_count), forum_path(forum) %> - - <%= link_to (forum.topic_count), forum_path(forum) %> -
回答帖子
-
-
+
+ + +
+
+ + <%= link_to (forum.memo_count), forum_path(forum),:class=>"linkGrey5 fb" %> +
+
帖子
+
+
+
+
+ + <%= link_to (forum.topic_count), forum_path(forum),:class=>"linkGrey5 fb" %> +
+
回答
+
+
+
<% end %> - + <% else %> -<% end %> -
\ No newline at end of file + <%= render :partial => "layouts/no_content" %> +<% end %> \ No newline at end of file diff --git a/app/views/forums/_forum_tag_list.html.erb b/app/views/forums/_forum_tag_list.html.erb new file mode 100644 index 000000000..156bcc895 --- /dev/null +++ b/app/views/forums/_forum_tag_list.html.erb @@ -0,0 +1,5 @@ +<% forum.tag_list.each do |tag|%> + + <%= tag %> + × +<% end %> \ No newline at end of file diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb index f8679cefa..0457bde55 100644 --- a/app/views/forums/_show_topics.html.erb +++ b/app/views/forums/_show_topics.html.erb @@ -1,47 +1,31 @@ - -
共有 <%=link_to @forum.memos.count %> 个贴子
<% if memos.any? %> <% memos.each do |topic| %> - - - - - -
- <%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) if topic.author%> - - - - - - - - - - - - -
<%= link_to h(topic.subject), forum_memo_path(topic.forum, topic) %> - - - - - - - -
<%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic) %>
回答
<%= authoring topic.created_at, topic.author %> - - <% author = topic.last_reply.try(:author)%> - <% if author%> - 最后回复:<%=link_to_user author %> - <% end%> - -
-
-
+
+
+ + <%= link_to image_tag(url_to_avatar(topic.author), :width => 50,:height => 50,:alt => '贴吧图片'), user_path(topic.author) if topic.author%> +
+
+ +
<%= topic.content.html_safe%> + +
+ <% author = topic.last_reply.try(:author)%> + <% if author%> +
最后回复:<%= author.name%>
+
<%= format_date(topic.last_reply.created_at)%>
+ <% end%> + +
+
+ + <%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic),:target =>'_blank',:class=>'linkGrey2' %> +
+
+
<% end %> - + <% else %>

<%= l(:label_no_data) %>

<% end %> diff --git a/app/views/forums/create.js.erb b/app/views/forums/create.js.erb new file mode 100644 index 000000000..a120008b6 --- /dev/null +++ b/app/views/forums/create.js.erb @@ -0,0 +1 @@ +$('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle(); \ No newline at end of file diff --git a/app/views/forums/delete_forum_tag.js.erb b/app/views/forums/delete_forum_tag.js.erb new file mode 100644 index 000000000..5080b3bdd --- /dev/null +++ b/app/views/forums/delete_forum_tag.js.erb @@ -0,0 +1,2 @@ +$("#forum_tag_list").html("<%= escape_javascript( render :partial=>'forum_tag_list',:locals=>{:forum=>@forum}) %>"); +$('#add_tag01').hide(); \ No newline at end of file diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb index 85cab957a..6e1a26407 100644 --- a/app/views/forums/index.html.erb +++ b/app/views/forums/index.html.erb @@ -1,48 +1,118 @@ -<% @nav_dispaly_home_path_label = 1 - @nav_dispaly_main_course_label = 1 - @nav_dispaly_main_project_label = 1 - @nav_dispaly_main_contest_label = 1 %> - -
- - - - - - - - - - - -
公共贴吧 - - <%= l(:label_user_location) %> : - - - <% if User.current.logged? %> - <%= link_to( l(:label_forum_new), new_forum_path, :class => 'icon icon-add') %> - <% end %> - - -
- - <%= link_to request.host()+"/forums", forums_path %> - - - <%= link_to l(:field_homepage), home_path %> > - <%= link_to "公共贴吧", forums_path %> -
-
-<% if @forums.size > 0 %> - <%= render :partial => 'forums/forum_list', :locals => {:forums => @forums} %> -<% else %> - <%= render :partial => "layouts/no_content" %> -<% end %> + + +
+
+
+ + +
+ <%= render :partial => 'forum_list',:locals => {:forums=>@forums}%> +
+ + +
+
+
+
diff --git a/app/views/forums/index.js.erb b/app/views/forums/index.js.erb new file mode 100644 index 000000000..f8f7f45b8 --- /dev/null +++ b/app/views/forums/index.js.erb @@ -0,0 +1 @@ +$("#forum_list").html("<%= escape_javascript(render :partial => 'forum_list',:locals => {:forums=>@forums}) %>"); \ No newline at end of file diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 24aa74c23..d72d15df0 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -1,42 +1,104 @@ - -
-

- <%=l(:label_memo_new)%> -

- <% if User.current.logged? %> - <%= labelled_form_for(@memo, :url => create_memo_forum_path(@forum), :html => {:multipart => true} ) do |f| %> -
- <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> -

- <%= f.text_field :subject, :required => true, :maxlength => 50%> -

-

- <%= f.kindeditor :content, :required => true %> -

- -

- (<%= 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;' %> -
- <% end %> - <% end %> + +
+ + +
+ <%= render :partial => 'show_topics',:locals => {:memos=>@memos}%> +
+ + + + + + + + + + + +
- - - <%= link_to(image_tag('edit.png')+l(:label_forum_edit),{:action => 'edit', :id => @forum}, :method => 'get', :title => l(:button_edit)) if @forum.editable_by?(User.current) %> - <%= link_to(image_tag('delete.png')+'删除讨论区', {:action => 'destroy', :id => @forum}, :method => :delete, :data => {:confirm => l(:text_are_you_sure)}, :title => l(:button_delete) - ) if @forum.destroyable_by?(User.current) %> - - - <%= link_to l(:label_memo_new_from_forum), new_forum_memo_path(@forum), :class => 'icon icon-add', - :onclick => 'showAndScrollTo("add-memo", "memo_subject"); return false;' if User.current.logged? %> - -<%= render :partial => 'forums/show_topics', :locals => {:memos => @memos} %> +
\ No newline at end of file diff --git a/app/views/forums/show.js.erb b/app/views/forums/show.js.erb new file mode 100644 index 000000000..2cd380aca --- /dev/null +++ b/app/views/forums/show.js.erb @@ -0,0 +1 @@ +$("#topics_list").html("<%= escape_javascript(render :partial => 'show_topics',:locals => {:memos=>@memos})%>") \ No newline at end of file diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index c68e917f5..3646ae019 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -7,7 +7,7 @@ <%= csrf_meta_tag %> <%= favicon %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application','prettify', 'nyan','leftside', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' ,'prettify' %> @@ -15,7 +15,56 @@ <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> - <%= stylesheet_link_tag 'base','header', :media => 'all'%> + <%= stylesheet_link_tag 'base','header','new_user', :media => 'all'%> + @@ -28,82 +77,65 @@ <% end%>
+
+
+
+
+
<%= link_to image_tag(url_to_avatar(@forum.creator),:width=>75,:height => 75,:alt=>'贴吧图像' ),user_path( @forum.creator) %> + +
+ +
+ +
+
+ <%= render :partial=>'forums/forum_tag_list',:locals=>{:forum=>@forum}%> +
+ + 添加标签 +
+
+
+
+
<%= link_to image_tag(url_to_avatar(User.current),:width=>50,:height => 50,:alt=>'贴吧图像' ),user_path( User.current) %>
+
我在贴吧
+
+
+ +
+
+ +
发帖
+
-
-
-
-
-
- - - - - - - - - - -
<%= l(:label_projects_community)%><%= l(:label_user_location) %> : - -
<%= link_to request.host()+"/forums", forums_path %>

<%=link_to l(:label_home),home_path %> > <%=link_to '公共贴吧', :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name, forum_path(@forum) %>

-
- -
+
+
+
+
+ + <%= yield %> + <%#= call_hook :view_layouts_base_content %> +
+
+
- <%= render_flash_messages %> - <%= yield %> - <%= call_hook :view_layouts_base_content %> -
- -
- <%#= render :partial => 'layouts/base_footer'%> -
- - -
-
-
<%= render :partial => 'layouts/footer' %>
- <%= call_hook :view_layouts_base_body_bottom %> + <%#= call_hook :view_layouts_base_body_bottom %> diff --git a/app/views/layouts/users_base.html.erb b/app/views/layouts/users_base.html.erb index 0caa5e39b..6c1edbd1b 100644 --- a/app/views/layouts/users_base.html.erb +++ b/app/views/layouts/users_base.html.erb @@ -7,16 +7,16 @@ <%= csrf_meta_tag %> <%= favicon %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify', :media => 'all' %> + <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application', 'nyan','prettify', :media => 'all' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= javascript_heads %> - <%= javascript_include_tag "jquery.leanModal.min" ,'prettify'%> + <%= javascript_include_tag "jquery.leanModal.min" ,'prettify','avatars'%> <%= javascript_include_tag 'seems_rateable/jRating', 'seems_rateable/rateable'%> <%= heads_for_theme %> <%= call_hook :view_layouts_base_html_head %> <%= yield :header_tags -%> - <%= stylesheet_link_tag 'base','header', :media => 'all'%> + <%= stylesheet_link_tag 'base','header','new_user' ,:media => 'all'%>
@@ -29,27 +29,27 @@
-
-
-
- <%#=render :partial => 'layouts/base_header'%> -
-
+ + + + + + <%= render_flash_messages %> <%= yield %> <%= call_hook :view_layouts_base_content %>
-
+ -
-
+ + -
-
+ +
<%= render :partial => 'layouts/footer' %> diff --git a/app/views/memos/_attachments_links.html.erb b/app/views/memos/_attachments_links.html.erb new file mode 100644 index 000000000..7da30aad0 --- /dev/null +++ b/app/views/memos/_attachments_links.html.erb @@ -0,0 +1,71 @@ +
+ <% for attachment in attachments %> + + + + <% if options[:length] %> + + <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true,:length => options[:length] -%> + (<%= number_to_human_size attachment.filesize , :precision => 0 %>) + <% if options[:deletable] %> + <%#= link_to image_tag('delete.png'), attachment_path(attachment), + :data => {:confirm => l(:text_are_you_sure)}, + :method => :delete, + :class => 'delete', + #:remote => true, + #:id => "attachments_" + attachment.id.to_s, + :title => l(:button_delete) %> + + <% end %> +
+ <% else %> + + <%= link_to_short_attachment attachment, :class => 'fl FilesName02', :download => true, :length => 32 -%> + (<%= number_to_human_size attachment.filesize , :precision => 0 %>) + <% if options[:deletable] %> + <%#= link_to image_tag('delete.png'), attachment_path(attachment), + :data => {:confirm => l(:text_are_you_sure)}, + :method => :delete, + :class => 'delete', + #:remote => true, + #:id => "attachments_" + attachment.id.to_s, + :title => l(:button_delete) %> + + <% end %> +
+ <% end %> + + <% if attachment.is_text? %> + <%= link_to image_tag('magnifier.png'), + :controller => 'attachments', + :action => 'show', + :id => attachment, + :filename => attachment.filename%> + <% end %> + + + + + + + + + + + <%#= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author) %> + + + + + <% end %> + <% if defined?(thumbnails) && thumbnails %> + <% images = attachments.select(&:thumbnailable?) %> + <% if images.any? %> +
+ <% images.each do |attachment| %> +
<%= thumbnail_tag(attachment) %>
+ <% end %> +
+ <% end %> + <% end %> +
diff --git a/app/views/memos/_praise_tread.html.erb b/app/views/memos/_praise_tread.html.erb new file mode 100644 index 000000000..17af4b090 --- /dev/null +++ b/app/views/memos/_praise_tread.html.erb @@ -0,0 +1,36 @@ + + <% if User.current.logged? %> + <% if horizontal %> + +
+ <% @is_valuate = is_praise_or_tread(obj,user_id)%> + <% if @is_valuate.size > 0 %> + <% @flag = @is_valuate.first.praise_or_tread %> + <% if @flag == 1 %> + <%= get_praise_num(obj)%> + <% end %> + <% else %> + <% if user_id == obj.author_id %> + + + <%= get_praise_num(obj)%> + + <% else %> + + <%# if OptionNumber.get_user_option_number(user_id).nil? || OptionNumber.get_user_option_number(user_id).total_score < 2 %> + + <%#= link_to image_tag("/images/praise_tread/praise_true.png",weight:"22px", height:"22px",:title => l(:label_issue_praise)), + :controller=>"praise_tread",:action=>"praise_plus",:remote=>true,:obj_id => obj.id,:obj_type => obj.class,:horizontal => horizontal %> + <%= get_praise_num(obj)%> + + + + + + + + <% end %> + <% end %> +
+ <% end %> + <% end %> diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 586279504..109964182 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -1,188 +1,115 @@ +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor","forum" %> -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> -
- - - <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> - -
-
- <%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %> -
-

- <%=link_to @memo.author.name, user_path(@memo.author) %> -

-
-
-
- - <%= link_to( - l(:button_quote), - {:action => 'quote', :id => @memo}, - :remote => true, - :method => 'get', - :title => l(:button_quote) - )if !@memo.locked? && User.current.logged? %> - - <%= link_to( - #image_tag('edit.png'), - l(:button_edit), - {:action => 'edit', :id => @memo}, - :method => 'get', - :title => l(:button_edit) - ) if @memo.editable_by?(User.current) %> - - <%= link_to( - l(:button_delete), - {:action => 'destroy', :id => @memo}, - :method => :delete, - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete) - ) if @memo.destroyable_by?(User.current) %> -
- -
 
- -
- <%= label_tag l(:field_subject) %>: - <%=h @memo.subject %> -
-
- <%= @memo.content.html_safe %> -

- <% if @memo.attachments.any?%> - <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %> - <%= render :partial => 'attachments/links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %> - <% end %> -

-
-
-
- <%= authoring @memo.created_at, @memo.author %> -
- -
-
-
-
-

<%= l(:label_reply_plural) %> (<%= @replies.nil? ? 0 : @replies.size %>)

- <% pages_count = @reply_pages.offset %> - <% @replies.each do |reply| %> -
"> -

-
- - <%= link_to( - l(:button_quote), - {:action => 'quote', :id => reply}, - :remote => true, - :method => 'get', - :title => l(:button_quote) - )if !@memo.locked? && User.current.logged? %> - - <%= link_to( - #image_tag('edit.png'), - l(:button_edit), - {:action => 'edit', :id => reply}, - :title => l(:button_edit) - ) if reply.editable_by?(User.current) %> - - <%= link_to( - l(:button_delete), - {:action => 'destroy', :id => reply}, - :method => :delete, - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete) - ) if reply.destroyable_by?(User.current) %> - -
-
- - - - - - - - -
- <%= link_to image_tag(url_to_avatar(reply.author), :class => "avatar"), user_path(reply.author) %> - -
- <%=h sanitize(reply.content.html_safe) %> -
-

- <% if reply.attachments.any?%> - <% options = {:author => true, :deletable => reply.deleted_attach_able_by?(User.current) } %> - <%= render :partial => 'attachments/links', :locals => {:attachments => reply.attachments, :options => options, :is_float => true} %> - <% end %> -

-
- <%= authoring reply.created_at, reply.author %> -
-
- <% end %> - -
- -<% if User.current.login? %> -
- <%= render :partial => 'reply_box' %> -
-<% else %> -
- <%= l(:label_user_login_tips) %> - <%= link_to l(:label_user_login_new), signin_path %> -
-
-<% end %> - - - +
+
+
+ <%= link_to image_tag(url_to_avatar(@memo.author),:width=>50,:height => 50,:alt=>'贴吧图像' ),user_path(@memo.author) %> +
+
+ + +
<%= format_date( @memo.created_at)%>
+ + <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> + +
+
+ <%= @memo.content.html_safe%> +
+
+
+ <% if @memo.attachments.any?%> + <% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %> + <%= render :partial => 'attachments_links', :locals => {:attachments => @memo.attachments, :options => options, :is_float => true} %> + <% end %> +
+
+
+
+
+
+
+ <%= form_for(@memo_new, url: forum_memos_path, :html => {:multipart => true}) do |f|%> + <%= f.hidden_field :subject, :required => true, value: @memo.subject %> + <%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %> + <%= f.hidden_field :parent_id, :required => true, value: @memo.id %> + +

+
+ 取消 + 留言 + <% end%> +
+
+ <% @replies.each do |reply| %> +
+
+ + <%= link_to image_tag(url_to_avatar(reply.author), :width => 45,:height => 45), user_path(reply.author) %> +
+
+
<%= reply.author.name%> + <% if reply.parent && reply.parent.id != @memo.id%> + 回复<%= reply.parent.author.name%> + <% end %> + + <%= format_date(reply.created_at)%> + + <%= link_to( + l(:button_delete), + {:action => 'destroy', :id => reply}, + :method => :delete, + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete),:class=>'replyGrey fr ml10' + ) if reply.destroyable_by?(User.current) %> + 回复
+
<%= reply.content.html_safe%>
+ +
+
+
+
+ <% end %> + + + + + + + + + + + +
+ +
\ No newline at end of file diff --git a/app/views/praise_tread/praise_plus.js.erb b/app/views/praise_tread/praise_plus.js.erb index d56ff0e68..30a53723e 100644 --- a/app/views/praise_tread/praise_plus.js.erb +++ b/app/views/praise_tread/praise_plus.js.erb @@ -1,4 +1,9 @@ - -$('#praise_tread_<%= @obj.id %>').html('<%= j( -render :partial => "/praise_tread/praise_tread",:locals => {:obj => @obj,:user_id => User.current.id,:horizontal => @horizontal} -)%>'); +<% if @obj_type == 'Memo'%> + $('#praise_tread_<%= @obj.id %>').html('<%= j( + render :partial => "/memos/praise_tread",:locals => {:obj => @obj,:user_id => User.current.id,:horizontal => @horizontal} + )%>'); +<% else %> + $('#praise_tread_<%= @obj.id %>').html('<%= j( + render :partial => "/praise_tread/praise_tread",:locals => {:obj => @obj,:user_id => User.current.id,:horizontal => @horizontal} + )%>'); +<% end %> diff --git a/config/routes.rb b/config/routes.rb index 1d2393764..2c6ab37ce 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -220,12 +220,14 @@ RedmineApp::Application.routes.draw do resources :forums do collection do match 'search_forum', :via => [:get, :post] - + match 'check_forum_name',:via => [:get] end member do post 'create_memo' post 'create_feedback' match 'search_memo', :via => [:get, :post] + match 'delete_forum_tag',:via =>[:get] + match 'add_forum_tag',:via=>[:get] end resources :memos do collection do diff --git a/public/images/post_portrait.jpg b/public/images/post_portrait.jpg new file mode 100644 index 0000000000000000000000000000000000000000..91ea6214690d8fa94bcc7f874be009f88102ac72 GIT binary patch literal 2360 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

vMs`ZP~o}rEe&*x?P&W7 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 literal 0 HcmV?d00001 diff --git a/public/stylesheets/images/post_image_list.png b/public/stylesheets/images/post_image_list.png new file mode 100644 index 0000000000000000000000000000000000000000..86aab4c79da00af1cc7655a2d53013c233b13ae4 GIT binary patch literal 3091 zcmaJ@dpy%^8=qs&r2{5q4NuZW8wzNarm_t~U3ONp?L=q}lkwXYi z2O@`(Lr4xGkHZ`~Nb-26r+VH$-rnEm_xs(~ec#{j_qy)uy8gJ&JJ{PQ%Bjl%002eY zUMxX0qC_80Mq2cDn+Vw>8h{*YSI$9(ABRh1kpUJYh7TEpqY;mi31lKE_(UVw6abI_ zQ=MEnu6R3?FN3B}T*c@I(U>AO0AOk!#3cIqlQ|$C@=+=s4W6m01%s$0H24q#zYEW_ zB2%b)Ls;a4A@)wbA^yHd64=}fWEzAL3DC$KA}EMI0mPj}pYitSs$;C2!188JA=O>r+FW2I?+|^c~F-4xSWEM4$OtN7yXrS*$Mp1ts z%kJOm{os;*AB)Lvxdx(O3|0&KUxog;BMcgiF9xU;kRiZC=mf9<~V?tSt*+<`RUCWvlc#Wp3-b^9m4l%5=EyirC4##@ak zD|_nPemf5z(%4$?B_Lj-!A_&$#72cp>Gqk#ym5!ye9LJ+)g1zXLs9L(^aBGZZHU$p zN}oypHlN8BRv9cT)UazlWX@b!Qg~%_W`5p1R9Y_a2&Ae#Q8HH`Xgj%LzGfsQwn-Zb zgDE4(n9zY>z?D6lC#jc zNdaYh9Ajc)hT9!;q(>$e&Et}9_+?JpYxll+qmf?rRQ-B*?Lgfd)l7-Qs%Q5dJ(_>U zb+SxtM}}DI&5o|FKb8~CUSevdg=r@&j5LXFDnKaqm|cCV%Tz`I1!l8h6GYtZ$pe?> z$qlOe>GUE;M@Qn_?G+gXQ1)0eP!p@Hr2a0lz}Tx>D?{d`4x`YBrajfVglZ|({MMBl zc*lC_>ryjbla@A7cHm4#K({iPPWezNKZWkyaU$$$#(V zjc_Otc3g2JwCc8G`5mv}q&S@(lSNF@<<&eMZrzf;%^Q=xrnFp9D`{`@LT-M(ZMkA8 zsEPJCEiJ8L=3PR2(8#$fQ!~3u$1CG|j7_`SBPN{M7eZT~-6RkQ;8%J0l=^xbDurU= z@7ed4&JfM2|J)yyv;u3Ale078a}{-n`Py#urMhi2?;;PcG+U14#v9%Bl%*KR>Q(PFxUJvuGxyN}-&%`Yk{s_^NrIQJ+dO(z)Jl2%<^ zeQ&xlyw=gpO?@HkbJ@0tD~5snLLq%JDhj8fqSBt@25FwASrz$+M?qC(BnvmnRUJEc zaKm|}2T4_}6^E;46Z)d16RsL>LFb;nFL<3_JQ{5Ah{J8(JJsIWc@Eo`-6-Hj_3vx|t6&^i$ZAhfXe6l#X(n zZgT}nM@OJ#)Qd|>u2)eMBzo%Kk(HZE!(1~?=z%Zt+I7I~da3gd4;XB9Oc+O|2VBAM z%F(g)dRg49MpfW`p*`35Wa#Va^093_pGLFpmr$B7+nGMAAg*YwM|N(vP1ubbU0g)H zD^%`HzjaSN%lh&5(3Ve~n{RA8*>S6_DPzbiwrnBXmtGL;s-z((nfR;5XmPG%lYQ{t zs|d8y>Htm%m}O6C~0LcyHa+coi=%(Rz;^bq`IZ~dGn^) zq22MB->|%6H~3vvXd_ zd)k(Trbs18$qXh6d-2VQYk;qmDI?;{Sh3}J=H1kf%vM*<#D`J+dgvm zQy@c6KCNjH$^Q6U9L^l*{(KLTRoNjY7JMppa^kc4V)at?x7vIcH?7Qe4WLP2$)`sR zxnQG#{oG1=$lSRQEILP2vjW==tqJ9TRLQO)&z)LlPDK-E5kpzSy(;5M9So~Qdw#5A zxa#N~-H5WVrNA(#99Z6BB)}VZh+g+WcLuYRu3H;9zmLBXKfjhEtW1x5b{W(jGp|_Z z=Z%>4AADb@?%^KUHi8j!r;dvc24pK|cZN%ZZI;ccX1{oUQ7cS|bZC6gfD|hEiwDWy&A-byrSPZcIc^W&QEPRb#mdL`wu9v?Yoq*nm%|5vyv=%Vy1XPK&nPT7ygdtlc;a@e#j++Z zotHlzgoz`1u6r%>O;M7&ld*K6%K}~3y&#lO4jk$Pm3b@!8eY^(taX3cbu;wu?)~1O z|CTWWTj%hlHUGM2NimO?D&-`9VyFDGPr4Ga^^MT()>pkb^3Fot3@OP#fQw3EEC90t z0nO&g4caz~i|^-Y)NMJ80f}~_$zl&E-AUu4a3;LHN&Hsl^Mb>eb8io0tmhq(Q27GL zF|wE#x`bDEyXj>i!I#w`Qc0b!><~T|7f2Zy5GL*x8?yG9m+=-fyMSGqY0BH0!B;VY%aP^vwv$n?; IS$aqQ2l)VA5&!@I literal 0 HcmV?d00001 diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 51bd52547..ce1af9cd0 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -177,6 +177,25 @@ a.buttonBlue:hover {background-color:#297fb8;} a.linkGrey {color:#484848;} a.linkGrey:hover {color:#269ac9;} +a.bBlue {background-color:#3498db;} +a.bBlue:hover {background-color:#297fb8;} +.fontGrey {color:#cecece;} +.fontGrey2 {color:#888888;} +a.linkBlue2 {color:#3498db;} +a.linkBlue2:hover {color:#297fb8;} +a.linkOrange {color:#ff7143;} +a.linkGrey2 {color:#888888;} +a.linkGrey2:hover {color:#484848;} +a.linkGrey4 {color:#484848;} +a.linkGrey5 {color:#484848;} +a.linkGrey5:hover {color:#3498db;} +a.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;} +a.submit_btn:hover {background-color:#3498db; color:#ffffff;} +input.submit_btn {border:1px solid #3498db; padding:3px 10px; border-radius:3px; color:#3498db;} +input.submit_btn:hover {background-color:#3498db; color:#ffffff;} +a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} + + /* commonBtn */ .grey_btn{ background:#d9d9d9; color:#656565; font-weight:normal; text-align:center;padding:2px 10px;} a.grey_btn{ background:#d9d9d9; color:#656565; font-weight:normal; text-align:center;padding:2px 10px;} @@ -485,7 +504,7 @@ a:hover.UsersApBtn{border:1px solid #888888; } .homepageSignatureTextarea {width:207px; height:80px; max-width:207px; max-height:80px; border:1px solid #d9d9d9; outline:none; margin:0px 0px 12px 0px;} .homepageSignature {font-size:12px; color:#888888; margin:10px 0; width:208px;} .homepageImageBlock {margin:0 auto; width:68px; float:left; text-align:center; display:inline-block;} -a.homepageImageNumber {font-size:12px; color:#484848; font-weight: bold;} +a.homepageImageNumber {font-size:12px; font-weight: bold;} /*color:#484848;*/ a.homepageImageNumber:hover {color:#269ac9;} .homepageImageText {font-size:12px; color:#888888;} .homepageVerDiv {height:28px; vertical-align:middle; width:1px; float:left; display:inline-block; background-color:#d1d1d1; margin-top:3px;} @@ -683,6 +702,57 @@ a.referenceTypeBlock {color:#888888; display:inline-block; padding:0px 20px;} .AgreementTxt{text-indent: 2em; margin-bottom: 15px;} .AgreementImg{margin: 0px auto; width: 820px;} + +/*创建贴吧样式*/ +.postContainer {width:968px; border:1px solid #dddddd; padding:15px; background-color:#ffffff; margin-top:15px;} +.postBanner {height:30px; width:970px; border-bottom:1px solid #efefef;} +.postSort {width:40px; float:left; margin-top:5px; padding-left:5px;} +a.sortArrowDown {background:url(images/post_image_list.png) 0px 0px no-repeat; width:7px; height:9px; float:left; margin-left:5px; margin-top:5px;} +a.sortArrowUp {background:url(images/post_image_list.png) -17px 0px no-repeat; width:7px; height:9px; float:left; margin-left:5px; margin-top:5px;} +a.sortArrowActiveD {background:url(images/post_image_list.png) -0px -20px no-repeat; width:7px; height:9px; float:left; margin-left:5px; margin-top:5px;} +a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-repeat; width:7px; height:9px; float:left; margin-left:5px; margin-top:5px;} +.creatPost {width:80px; height:25px; border-radius:3px; color:#ffffff; text-align:center; float:right; line-height:25px; vertical-align:middle; margin-top:2px;} +.creatPostIcon {background:url(images/post_image_list.png) -40px -54px no-repeat; width:70px; height:25px; padding-left:10px; border-radius:3px;} +.postRow {width:970px; border-bottom:1px solid #efefef; padding:15px 0;} +.postPortrait {width:75px; height:75px; float:left; margin-right:15px;} +.postWrap {width:690px; float:left; margin-right:95px;} +.postTitle {width:690px; max-width:690px; margin-bottom:5px;} +.postDes {width:690px; max-width:690px; margin-bottom:6px; color:#484848;} +.postCreater {color:#888888; font-size:12px; float:left; margin-right:40px;} +.postDate {color:#888888; font-size:12px;} +.postStatics { margin-top:28px; color:#888888; float:right;} +.slice {width:1px; height:25px; background-color:#d1d1d1; float:right; margin-top:35px; margin-right:20px;} +.pageRoll {float:right; border-left:1px solid #dddddd; margin-top:15px;} +.pageCell {border:1px solid #dddddd; border-width:1px 1px 1px 0px; padding:5px 12px; float:left; border-spacing:0px;} +.pageCellActive {background-color:#3498db;} +.postCreateInput {width:963px; height:28px; border:1px solid #d9d9d9 !important; outline:none;} +.upImg {padding:1px 6px; border: 1px solid #dddddd; margin-top:53px;} + +/*贴吧内部样式*/ +.postDetailContainer {padding:15px; border:1px solid #dddddd; background-color:#ffffff;} +.postlabel {background-color:#edf1f2; color:#888888; padding:2px 5px; float:left; margin-bottom:5px;} +.postRightContainer {width:718px; border:1px solid #dddddd; padding:15px; background-color:#ffffff; float:left;} /* margin-top:15px;*/ +.postDetailBanner {height:30px; width:720px; border-bottom:1px solid #efefef;} +.postDetailRow {width:720px; border-bottom:1px solid #efefef; padding:15px 0;} +.postDetailPortrait {width:50px; height:50px; float:left; margin-right:15px;} +.postDetailWrap {width:580px; float:left;} +.postDetailTitle {width:580px; max-width:580px; margin-bottom:5px;} +.postDetailDes {width:580px; max-width:580px; margin-bottom:6px; color:#888888;display:block;overflow:hidden;word-break:keep-all;white-space:nowrap;text-overflow:ellipsis;} +.postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;} +.postDetailDate {color:#888888; font-size:12px; float:left;} +.postDetailReply { margin-top:28px; color:#888888; float:right;} +a.postReplyIcon {background:url(images/post_image_list.png) -40px 2px no-repeat; width:18px; height:18px; float:left;} +a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no-repeat;} +.postDetailInput {width:713px; height:28px; border:1px solid #d9d9d9; outline:none !important;} +.postAttIcon {background:url(images/post_image_list.png) 0px -91px no-repeat; width:16px; height:16px; padding-left:20px;} +.postAttIcon:hover {background:url(images/post_image_list.png) 0px -113px no-repeat;} +.postThemeContainer {width:720px;} +.postThemeWrap {width:655px; float:left;} +.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px;} +.postLikeIcon:hover {background:url(images/post_image_list.png) 0px -64px no-repeat ;} +a.AnnexBtn{ background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} +a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db;} + /*底部*/ #Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 93ad4c008..5a9ea3830 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -848,16 +848,16 @@ p.breadcrumb text-indent:15px } -input[type="text"],input[type="password"],textarea,select -{ - padding:2px; - border:1px solid #039ea0 -} +/*input[type="text"],input[type="password"],textarea,select*/ +/*{*/ + /*padding:2px;*/ + /*border:1px solid #039ea0*/ +/*}*/ -input[type="text"],input[type="password"] -{ - padding:3px -} +/*input[type="text"],input[type="password"]*/ +/*{*/ + /*padding:3px*/ +/*}*/ input[type="text"]:focus,input[type="password"]:focus,textarea:focus,select:focus { @@ -1719,57 +1719,57 @@ a.enterprise { cursor: pointer; } -input.enterprise[type="button"] { - padding-bottom: 5px; - width: 55px; - height: 25px; - font-family: '微软雅黑',Arial,Helvetica,sans-serif; - font-size: 12px; - color: #fff; - padding: 0px; - background: #15bccf; - border: 1px solid #15bccf; -} -input.enterprise[type="submit"] { - padding-bottom: 5px; - width: 55px; - height: 25px; - font-family: '微软雅黑',Arial,Helvetica,sans-serif; - font-size: 12px; - color: #fff; - padding: 0px; - background: #15bccf; - border: 1px solid #15bccf; +/*input.enterprise[type="button"] {*/ + /*padding-bottom: 5px;*/ + /*width: 55px;*/ + /*height: 25px;*/ + /*font-family: '微软雅黑',Arial,Helvetica,sans-serif;*/ + /*font-size: 12px;*/ + /*color: #fff;*/ + /*padding: 0px;*/ + /*background: #15bccf;*/ + /*border: 1px solid #15bccf;*/ +/*}*/ +/*input.enterprise[type="submit"] {*/ + /*padding-bottom: 5px;*/ + /*width: 55px;*/ + /*height: 25px;*/ + /*font-family: '微软雅黑',Arial,Helvetica,sans-serif;*/ + /*font-size: 12px;*/ + /*color: #fff;*/ + /*padding: 0px;*/ + /*background: #15bccf;*/ + /*border: 1px solid #15bccf;*/ -} +/*}*/ /*end*/ -input[type="submit"] { - width: auto; - font-family: '微软雅黑',Arial,Helvetica,sans-serif; - font-size: 12px; - color: rgb(5, 5, 5); - padding: 0px; - background: -moz-linear-gradient(center top , rgb(255, 255, 255) 0%, rgb(235, 235, 235) 50%, rgb(219, 219, 219) 50%, rgb(181, 181, 181)) repeat scroll 0% 0% transparent; - border-radius: 4px; - border: 1px solid rgb(148, 148, 148); - box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset; - text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255); - cursor: pointer; -} +/*input[type="submit"] {*/ + /*width: auto;*/ + /*font-family: '微软雅黑',Arial,Helvetica,sans-serif;*/ + /*font-size: 12px;*/ + /*color: rgb(5, 5, 5);*/ + /*padding: 0px;*/ + /*background: -moz-linear-gradient(center top , rgb(255, 255, 255) 0%, rgb(235, 235, 235) 50%, rgb(219, 219, 219) 50%, rgb(181, 181, 181)) repeat scroll 0% 0% transparent;*/ + /*border-radius: 4px;*/ + /*border: 1px solid rgb(148, 148, 148);*/ + /*box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;*/ + /*text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);*/ + /*cursor: pointer;*/ +/*}*/ -input[type="button"] { - width: auto; - font-family: '微软雅黑',Arial,Helvetica,sans-serif; - font-size: 12px; - color: rgb(5, 5, 5); - padding: 0px; - background: -moz-linear-gradient(center top , rgb(255, 255, 255) 0%, rgb(235, 235, 235) 50%, rgb(219, 219, 219) 50%, rgb(181, 181, 181)) repeat scroll 0% 0% transparent; - border-radius: 4px; - border: 1px solid rgb(148, 148, 148); - box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset; - text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255); - cursor: pointer; -} +/*input[type="button"] {*/ + /*width: auto;*/ + /*font-family: '微软雅黑',Arial,Helvetica,sans-serif;*/ + /*font-size: 12px;*/ + /*color: rgb(5, 5, 5);*/ + /*padding: 0px;*/ + /*background: -moz-linear-gradient(center top , rgb(255, 255, 255) 0%, rgb(235, 235, 235) 50%, rgb(219, 219, 219) 50%, rgb(181, 181, 181)) repeat scroll 0% 0% transparent;*/ + /*border-radius: 4px;*/ + /*border: 1px solid rgb(148, 148, 148);*/ + /*box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;*/ + /*text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);*/ + /*cursor: pointer;*/ +/*}*/ /*by fanqiang*/ img.avatar3 { width: 50px; From da2b027f0409d45178cec11c327668dc4c2d4436 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 19 Sep 2015 09:24:36 +0800 Subject: [PATCH 02/79] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/show.html.erb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 109964182..b03127247 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -51,7 +51,7 @@

取消 留言 - <% end%> + <% end %>
<% @replies.each do |reply| %> @@ -80,9 +80,9 @@
- + <%= link_to (topic.replies_count), forum_memo_path(topic.forum, topic),:target =>'_blank',:class=>'linkGrey2' %>
diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index d72d15df0..f56006db9 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -79,7 +79,7 @@ <% end %>
- + From b621449406fd5578a90f0145f83de1a36a3ca041 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 19 Sep 2015 10:00:46 +0800 Subject: [PATCH 05/79] =?UTF-8?q?=E5=B8=96=E5=AD=90=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/memos_controller.rb | 2 +- app/views/memos/show.html.erb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index e354a3293..9922aabbe 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -229,7 +229,7 @@ class MemosController < ApplicationController end def back_memo_url - forum_memo_path(@forum, (@memo.parent_id.nil? ? @memo : @memo.parent_id)) + forum_memo_path(@forum, (@memo.root.nil? ? @memo : @memo.root)) end def back_memo_or_forum_url diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index b03127247..a733da7c5 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -80,9 +80,9 @@ -
- - - - -
+
+ <%= render :partial => 'post_banner' ,:locals => {:order_type=>@type,:order_str=>@str}%> + + + + + +
<%= render :partial => 'forum_list',:locals => {:forums=>@forums}%>
- diff --git a/app/views/forums/index.js.erb b/app/views/forums/index.js.erb index f8f7f45b8..642c3c20a 100644 --- a/app/views/forums/index.js.erb +++ b/app/views/forums/index.js.erb @@ -1 +1,4 @@ -$("#forum_list").html("<%= escape_javascript(render :partial => 'forum_list',:locals => {:forums=>@forums}) %>"); \ No newline at end of file +//$("#postBanner").html("<%#= render :partial => 'post_banner' ,:locals => {:order_type=>@type,:order_str=>@str }%>"); +$("#forum_list").html("<%= escape_javascript(render :partial => 'forum_list',:locals => {:forums=>@forums}) %>"); +//这里出现一个问题竟然是单双引号引起的。注意!! +$("#pages").html('<%= pagination_links_full @forums_pages, @forums_count,:per_page_links => false,:remote =>true,:flag=>true%>'); \ No newline at end of file diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index f56006db9..ee3679241 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -88,7 +88,7 @@
<%= render :partial => 'show_topics',:locals => {:memos=>@memos}%>
- + diff --git a/app/views/forums/show.js.erb b/app/views/forums/show.js.erb index 2cd380aca..9e36215ac 100644 --- a/app/views/forums/show.js.erb +++ b/app/views/forums/show.js.erb @@ -1 +1,2 @@ -$("#topics_list").html("<%= escape_javascript(render :partial => 'show_topics',:locals => {:memos=>@memos})%>") \ No newline at end of file +$("#topics_list").html("<%= escape_javascript(render :partial => 'show_topics',:locals => {:memos=>@memos})%>") +$("#pages").html('<%= pagination_links_full @topic_pages, @topic_count,:per_page_links => false,:remote =>true%>'); \ No newline at end of file diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 812873045..752853c60 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -5,7 +5,7 @@
  • 服务协议|
  • <%= l(:label_surpport_group)%>|
  • -
  • <%= l(:label_forums)%>
  • +
  • <%= l(:label_forums)%>
  • From acbbd0d7beed6b0ec846fc2a4959da601e04543c Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 19 Sep 2015 12:40:07 +0800 Subject: [PATCH 12/79] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E6=8F=8F=E8=BF=B02=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/_forum_list.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/forums/_forum_list.html.erb b/app/views/forums/_forum_list.html.erb index 9c39c436e..a17314173 100644 --- a/app/views/forums/_forum_list.html.erb +++ b/app/views/forums/_forum_list.html.erb @@ -10,7 +10,7 @@ <%= link_to forum.name, forum_path(forum),:class=>"f16 linkBlue" %>
    -
    描述<%= textAreailizable forum.description%>
    +
    <%= textAreailizable forum.description%>
    From 604e7ca56d99c94fe568eaab1c92680291b9d23d Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 19 Sep 2015 12:49:25 +0800 Subject: [PATCH 13/79] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=88=90=E5=8A=9F=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=20=E4=B9=9F=E6=B2=A1=E6=9C=89=E7=BB=99=E5=87=BA=E4=BB=BB?= =?UTF-8?q?=E4=BD=95=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/index.html.erb | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb index 6c718b102..75d6db2c8 100644 --- a/app/views/forums/index.html.erb +++ b/app/views/forums/index.html.erb @@ -50,14 +50,18 @@ }); function check_and_submit(doc){ $("#error").hide(); - if( $("input[name='forum[name]']").val().trim == "" || $("input[name='forum[description]']").val().trim == ""){ + if( check_pass == false){ + $("#error").html("贴吧名称已经存在").show(); + return; + } + if( $("input[name='forum[name]']").val().trim == "" || $("input[name='forum[description]']").val().trim == "" || check_pass == false){ $("#error").html("名称和描述未填写正确").show(); return; }else{ doc.parent().parent().submit(); } } - + var check_pass = true; function check_forum_name(){ name = $("input[name='forum[name]']").val().trim(); if( name != ""){ @@ -68,6 +72,7 @@ if( data == 'true'){ $("#error").html("贴吧名称已经存在").show(); + check_pass = false; } } ); From cddb3deb3569d0d6a6b2cc697ac9a4590e198004 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 19 Sep 2015 13:43:59 +0800 Subject: [PATCH 14/79] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=88=90=E5=8A=9F=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=20=E4=B9=9F=E6=B2=A1=E6=9C=89=E7=BB=99=E5=87=BA=E4=BB=BB?= =?UTF-8?q?=E4=BD=95=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/index.html.erb | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb index 75d6db2c8..e42334286 100644 --- a/app/views/forums/index.html.erb +++ b/app/views/forums/index.html.erb @@ -49,12 +49,9 @@ }); }); function check_and_submit(doc){ - $("#error").hide(); - if( check_pass == false){ - $("#error").html("贴吧名称已经存在").show(); - return; - } - if( $("input[name='forum[name]']").val().trim == "" || $("input[name='forum[description]']").val().trim == "" || check_pass == false){ + $("#error").html('').hide(); + check_forum_name(); + if( $("input[name='forum[name]']").val().trim() == "" || $("input[name='forum[description]']").val().trim() == "" ){ $("#error").html("名称和描述未填写正确").show(); return; }else{ @@ -63,6 +60,7 @@ } var check_pass = true; function check_forum_name(){ + check_pass = true; name = $("input[name='forum[name]']").val().trim(); if( name != ""){ $.get( From 11714868b7b155adf963f13f868e2a307b526446 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 19 Sep 2015 13:47:00 +0800 Subject: [PATCH 15/79] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=88=90=E5=8A=9F=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=20=E4=B9=9F=E6=B2=A1=E6=9C=89=E7=BB=99=E5=87=BA=E4=BB=BB?= =?UTF-8?q?=E4=BD=95=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/forums_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb index 82754810c..415321655 100644 --- a/app/controllers/forums_controller.rb +++ b/app/controllers/forums_controller.rb @@ -207,6 +207,7 @@ class ForumsController < ApplicationController # Author lizanle # Description after save后需要进行资源记录的更新 # owner_type = 2 对应的是 forum + @save_flag=true if params[:asset_id] ids = params[:asset_id].split(',') update_kindeditor_assets_owner ids ,@forum.id,OwnerTypeHelper::FORUM @@ -219,6 +220,7 @@ class ForumsController < ApplicationController end else + @save_flag=false respond_to do |format| flash.now[:error] = "#{l :label_forum_create_fail}: #{@forum.errors.full_messages[0]}" format.js From 67fe8de89758f366274c428389d824f1966e6c41 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Sat, 19 Sep 2015 13:47:27 +0800 Subject: [PATCH 16/79] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E6=88=90=E5=8A=9F=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=20=E4=B9=9F=E6=B2=A1=E6=9C=89=E7=BB=99=E5=87=BA=E4=BB=BB?= =?UTF-8?q?=E4=BD=95=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/create.js.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/forums/create.js.erb b/app/views/forums/create.js.erb index 45179a4b3..0b6033441 100644 --- a/app/views/forums/create.js.erb +++ b/app/views/forums/create.js.erb @@ -1,2 +1,5 @@ +<%if @save_flag%> $('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle(); -$('#reorder_time').click(); \ No newline at end of file +$('#reorder_time').click(); +<%else%> +<%end %> \ No newline at end of file From 52b4cba582462a39451a209f18ea3a47267b1cdc Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 21 Sep 2015 09:59:41 +0800 Subject: [PATCH 17/79] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E5=90=8D=E7=A7=B0=20?= =?UTF-8?q?=E5=92=8C=E6=8F=8F=E8=BF=B0=E8=BE=93=E5=85=A5=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E8=87=AA=E9=80=82=E5=BA=94=E9=AB=98=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/index.html.erb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb index e42334286..87fa0657f 100644 --- a/app/views/forums/index.html.erb +++ b/app/views/forums/index.html.erb @@ -1,3 +1,4 @@ +<%= javascript_include_tag 'new_user' %>
    - + +
    From a958a879ad357cd7297476a10d9676f8c4c26f9c Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 21 Sep 2015 10:04:41 +0800 Subject: [PATCH 18/79] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=B8=8D=E6=88=90=E5=8A=9F=E7=9A=84=E6=97=B6=E5=80=99=E5=BA=94?= =?UTF-8?q?=E8=AF=A5=E7=BB=99=E4=B8=AA=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/create.js.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/forums/create.js.erb b/app/views/forums/create.js.erb index 0b6033441..be99d724a 100644 --- a/app/views/forums/create.js.erb +++ b/app/views/forums/create.js.erb @@ -2,4 +2,5 @@ $('#new_forum_div').slideToggle();$('#create_btn').parent().slideToggle(); $('#reorder_time').click(); <%else%> + $("#error").html("<%= @forum.errors.full_messages[0]%>").show(); <%end %> \ No newline at end of file From a24ca05157a58c6afab59a814db95ba6b83ba44b Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 21 Sep 2015 10:31:15 +0800 Subject: [PATCH 19/79] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E7=9A=84=E6=8F=8F?= =?UTF-8?q?=E8=BF=B0=E4=BF=AE=E6=94=B9=E7=9A=84=E5=9B=BE=E6=A0=87=20?= =?UTF-8?q?=E5=92=8C=20=E5=88=A0=E9=99=A4=E6=A0=87=E7=AD=BE=E7=9A=84?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E7=9A=84=E6=98=BE=E7=A4=BA=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/_forum_tag_list.html.erb | 2 ++ app/views/layouts/base_forums.html.erb | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/views/forums/_forum_tag_list.html.erb b/app/views/forums/_forum_tag_list.html.erb index 156bcc895..c0efbe4b9 100644 --- a/app/views/forums/_forum_tag_list.html.erb +++ b/app/views/forums/_forum_tag_list.html.erb @@ -1,5 +1,7 @@ <% forum.tag_list.each do |tag|%> + <% end %> <% end %> \ No newline at end of file diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index ce5062fce..a03a23e7f 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -94,10 +94,13 @@
    -
    <%= @forum.description%> - - <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%> - +
    <%= @forum.description%> + <%if @forum.creator.id == User.current.id%> + + + <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%> + + <%end%>
    From 70357683f763afd806bd45f495583adf3efd3de8 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Sep 2015 14:51:06 +0800 Subject: [PATCH 20/79] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE=E9=82=AE=E4=BB=B6=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/mailer/applied_project.html.erb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/views/mailer/applied_project.html.erb b/app/views/mailer/applied_project.html.erb index 4f266e6ce..eb49c35b9 100644 --- a/app/views/mailer/applied_project.html.erb +++ b/app/views/mailer/applied_project.html.erb @@ -1,5 +1,11 @@ -<%= l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name) %> -
    - -

    <%= link_to(h(@project.name), @applied_url) %>

    +
    +
      +
    • <%= l(:mail_issue_content)%> + +

      <%=link_to @user.show_name, user_url(@user) %> 申请加入项目:<%=link_to @project.name, @applied_url %>

      +
      +
    • +
    +
    +
    From b70104cee819082d2dda69ff7b88c4e8bc3ebf5d Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Sep 2015 14:54:03 +0800 Subject: [PATCH 21/79] =?UTF-8?q?=E5=AE=8C=E6=95=B4mail.text?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/mailer/applied_project.text.erb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/mailer/applied_project.text.erb b/app/views/mailer/applied_project.text.erb index 7af8c2018..0dd3f308d 100644 --- a/app/views/mailer/applied_project.text.erb +++ b/app/views/mailer/applied_project.text.erb @@ -1,4 +1,7 @@ -<%= l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name) %> +<%= l(:mail_issue_content)%> +<%=link_to @user.show_name, user_url(@user) %> +<%=link_to @project.name, @applied_url %> + + -

    <%= link_to(h(@project.name), @applied_url) %>

    From 6e9db8b9226c7d48ff3829a0fd29ca5ce76126cb Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Sep 2015 15:08:40 +0800 Subject: [PATCH 22/79] =?UTF-8?q?=E5=B0=81=E8=A3=85=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 40 +++++++++++++++++------------ 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0783d1805..c00f7ec17 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -101,22 +101,10 @@ class UsersController < ApplicationController elsif @user != User.current && !User.current.admin? return render_403 end - # 记录当前点击按钮的时间 - # 考虑到用户未退出刷新消息页面 - message_time = OnclickTime.where("user_id =?", User.current).first - if message_time.nil? - message_new_time = OnclickTime.new - message_new_time.user_id = User.current.id - message_new_time.onclick_time = Time.now - message_new_time.save - else - # 24小时内显示 - contrast_time = Time.now - 86400 - message_time.update_attributes(:onclick_time => Time.now) - end - @user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc") - # 当前用户查看消息,则设置消息为已读 - # DO 待优化,只需查出符合条件的再更新 + # 初始化/更新 点击按钮时间 + # 24小时内显示系统消息 + update_onclick_time + # 全部设为已读 if params[:viewed] == "all" course_querys = @user.course_messages forge_querys = @user.forge_messages @@ -197,6 +185,26 @@ class UsersController < ApplicationController end end + # 初始化/更新 点击按钮时间 + def update_onclick_time + # 记录当前点击按钮的时间 + # 考虑到用户未退出刷新消息页面 + + message_time = OnclickTime.where("user_id =?", User.current).first + if message_time.nil? + message_new_time = OnclickTime.new + message_new_time.user_id = User.current.id + message_new_time.onclick_time = Time.now + message_new_time.save + else + # 24小时内显示 + contrast_time = Time.now - 86400 + message_time.update_attributes(:onclick_time => Time.now) + end + # 24小时内显示系统消息 + @user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc") + end + # 系统消息 def user_system_messages @sytem_messages = SystemMessage.order("created_at desc").all From d9620e416edf0f7fb12920d2db8a31f5d7b0bb44 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Sep 2015 15:17:10 +0800 Subject: [PATCH 23/79] =?UTF-8?q?=E4=BC=98=E5=8C=96=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E8=AE=BE=E4=B8=BA=E5=B7=B2=E8=AF=BB=E2=80=9D=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c00f7ec17..874f9c607 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -106,16 +106,7 @@ class UsersController < ApplicationController update_onclick_time # 全部设为已读 if params[:viewed] == "all" - course_querys = @user.course_messages - forge_querys = @user.forge_messages - user_querys = @user.user_feedback_messages - forum_querys = @user.memo_messages - if User.current.id == @user.id - course_querys.update_all(:viewed => true) - forge_querys.update_all(:viewed => true) - user_querys.update_all(:viewed => true) - forum_querys.update_all(:viewed => true) - end + update_message_viewed(@user) end # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count case params[:type] @@ -189,7 +180,6 @@ class UsersController < ApplicationController def update_onclick_time # 记录当前点击按钮的时间 # 考虑到用户未退出刷新消息页面 - message_time = OnclickTime.where("user_id =?", User.current).first if message_time.nil? message_new_time = OnclickTime.new @@ -205,6 +195,20 @@ class UsersController < ApplicationController @user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc") end + # 消息设置为已读 + def update_message_viewed(user) + course_querys = CourseMessage.where("user_id =? and viewed =?", user, 0) + forge_querys = ForgeMessage.where("user_id =? and viewed =?", user, 0) + user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0) + forum_querys = MemoMessage.where("user_id =? and viewed =?", user, 0) + if User.current.id == @user.id + course_querys.update_all(:viewed => true) + forge_querys.update_all(:viewed => true) + user_querys.update_all(:viewed => true) + forum_querys.update_all(:viewed => true) + end + end + # 系统消息 def user_system_messages @sytem_messages = SystemMessage.order("created_at desc").all From 553c1396dd2ee5822ff968283bd2edf8b5c9d0ce Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 21 Sep 2015 15:31:00 +0800 Subject: [PATCH 24/79] =?UTF-8?q?=E5=B8=96=E5=AD=90=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=B8=8D=E6=88=90=E5=8A=9F=20=E7=BB=99=E5=87=BA=E5=8E=9F?= =?UTF-8?q?=E5=9B=A0=20=E5=B8=96=E5=AD=90=E5=8F=91=E5=B8=83=E6=97=B6?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/forums_controller.rb | 11 ++------- app/controllers/memos_controller.rb | 37 ++++------------------------ app/views/forums/show.html.erb | 31 ++++++++++++++++++++--- 3 files changed, 35 insertions(+), 44 deletions(-) diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb index 415321655..be6543be2 100644 --- a/app/controllers/forums_controller.rb +++ b/app/controllers/forums_controller.rb @@ -7,7 +7,7 @@ class ForumsController < ApplicationController before_filter :find_forum_if_available before_filter :authenticate_user_edit, :only => [:edit, :update] before_filter :authenticate_user_destroy, :only => [:destroy] - before_filter :require_login, :only => [:new, :create,:show,:destroy,:update,:edit] + before_filter :require_login, :only => [:new, :create,:destroy,:update,:edit] helper :sort include SortHelper @@ -164,14 +164,7 @@ class ForumsController < ApplicationController @memos @my_topic_count = Memo.where("forum_id = #{@forum.id} and author_id = #{User.current.id} and parent_id is null").count @my_replies_count = Memo.where("forum_id = #{@forum.id} and author_id = #{User.current.id} and parent_id is not null").count - # @offset, @limit = api_offset_and_limit({:limit => 10}) - # @forum = Forum.find(params[:id]) - # @memos_all = @forum.topics - # @topic_count = @memos_all.count - # @topic_pages = Paginator.new @topic_count, @limit, params['page'] - - # @offset ||= @topic_pages.offset - # @memos = @memos_all.offset(@offset).limit(@limit).all + @errors = params[:errors] respond_to do |format| format.js format.html { diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index 9922aabbe..f7de712ca 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -73,41 +73,14 @@ class MemosController < ApplicationController end end #end - format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" } - format.json { render json: @memo, status: :created, location: @memo } + format.html { redirect_to back_memo_url, notice: "#{l :label_memo_create_succ}" } + format.json { render json: @memo, status: :created, location: @memo } else flash.now[:error] = "#{l :label_memo_create_fail}: #{@memo.errors.full_messages[0]}" - # back_error_page = @memo.parent_id.nil? ? forum_path(@forum) : forum_memo_path(@forum, @memo.parent_id) - pre_count = REPLIES_PER_PAGE - - @memo_new = @memo.dup - @memo = @memo.root # 取出楼主,防止输入帖子id让回复作为主贴显示 - unless @memo.new_record? - @memo.update_column(:viewed_count, (@memo.viewed_count.to_i + 1)) - end - - - page = params[:page] - if params[:r] && page.nil? - offset = @memo.children.where("#{Memo.table_name}.id < ?", params[:r].to_i).count - page = 1 + offset / pre_count - else - - end - @reply_count = @memo.children.count - @reply_pages = Paginator.new @reply_count, pre_count, page - @replies = @memo.children. - includes(:author, :attachments). - reorder("#{Memo.table_name}.created_at DESC"). - limit(@reply_pages.per_page). - offset(@reply_pages.offset). - all - if @memo.new_record? - format.html { render :new,:layout=>'base_forums'} - else - format.html { render action: :show } + format.js + format.html { redirect_to( forum_path(Forum.find(params[:forum_id]),:errors=>@memo.errors.full_messages[0])) } format.json { render json: @memo.errors, status: :unprocessable_entity } - end + #end end end diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index ee3679241..ad54f6bc0 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -1,3 +1,4 @@ +<%= javascript_include_tag 'new_user' %>
    + onclick="$('#error').hide();clear_form();$('#new_forum_div').slideToggle();$(this).parent().slideToggle();">新建贴吧
    \ No newline at end of file diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb index f7c74e9a7..aeb0e1654 100644 --- a/app/views/forums/index.html.erb +++ b/app/views/forums/index.html.erb @@ -49,7 +49,21 @@ $("#reorder_popu").removeClass("sortArrowActiveD"); add_class("reorder_time"); }); - + document.getElementById('forum_name').onkeydown = function() + { + var n = 0; + var str = this.value; + for (i = 0; i < str.length; i++) { + var leg = str.charCodeAt(i);//ASCII码 + if (leg > 255) {//大于255的都是中文 + n += 2;//如果是中文就是2个字节 + } else { + n += 1;//英文,不多说了 + } + } + if(n >= 160) + event.returnValue = false; + } }); function check_and_submit(doc){ $("#error").html('').hide(); @@ -88,6 +102,9 @@ $('#error').hide(); $('#new_forum_div').slideToggle(); $('#create_btn').parent().slideToggle(); + clear_form(); + } + function clear_form(){ $("#forum_name").val(''); $("#forum_desc").val(''); } @@ -100,7 +117,7 @@ <%= form_tag({:controller => 'forums',:action=>'create',:format=>'js'},:method => 'post',:remote=>'true') do |f| %>
    - + diff --git a/app/views/tags/update_tag_name.js.erb b/app/views/tags/update_tag_name.js.erb index 276c050b8..ec81e7cbc 100644 --- a/app/views/tags/update_tag_name.js.erb +++ b/app/views/tags/update_tag_name.js.erb @@ -40,6 +40,8 @@ $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/new_tag_nam $('#tags_name').val(""); <% elsif @obj_flag == '10'%> //$("#put-tag-form-<%#=@obj.class%>-<%#=@obj.id%>").hide(); +<% elsif @obj_flag == '5'%> + $('#forum_tag_list').html('<%= escape_javascript(render :partial=>'forums/forum_tag_list',:locals=>{:forum=>@forum})%>') <% else%> $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_name', :locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>'); From 5ba889ecc1dc804995e31300126f3d3ec7bb8468 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 23 Sep 2015 11:14:44 +0800 Subject: [PATCH 46/79] =?UTF-8?q?=E9=94=99=E5=88=AB=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 6a061d2b3..58beadb29 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -94,7 +94,7 @@
    - + <%= render 'form_edit_mode' %> + \ No newline at end of file diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index 962331fad..7808af055 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -143,7 +143,7 @@
    @@ -171,7 +171,7 @@
    - 编辑贴吧 + 编辑贴吧 删除贴吧 <% end %> diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 4e1aad655..c97483c9b 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -723,7 +723,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re .postRow {width:970px; border-bottom:1px solid #efefef; padding:15px 0;} .postPortrait {width:75px; height:75px; float:left; margin-right:15px;} .postWrap {width:690px; float:left; margin-right:95px;} -.postTitle {width:690px; max-width:690px; margin-bottom:5px;} +.postTitle {width:690px; max-width:690px; margin-bottom:5px;word-break: break-all; word-wrap:break-word; } .postDes {width:690px; max-width:690px; margin-bottom:6px; color:#484848;} .postCreater {color:#888888; font-size:12px; float:left; margin-right:40px;} .postDate {color:#888888; font-size:12px;} @@ -761,6 +761,7 @@ a.AnnexBtn{ background: url(images/homepage_icon2.png) 0px -343px no-repeat !im a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db;} .postEdit {background:url(images/post_image_list.png) 0px -94px no-repeat; width:18px; height:18px; display:block; float:left;} .postDelete {background:url(images/post_image_list.png) -42px -93px no-repeat; width:18px; height:18px; display:block; float:right;} +.pageBanner {width:968px; margin:0px auto; border:1px solid #dddddd; background-color: #FFF; padding: 10px 15px; float:left;} /*底部*/ #Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} From 7383ac7aa934e5f83f61243bc82b8cee5f35f2ef Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 23 Sep 2015 16:36:11 +0800 Subject: [PATCH 54/79] =?UTF-8?q?=E5=88=A0=E9=99=A4=E8=B4=B4=E5=90=A7?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_forums.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index 7808af055..e8fa7a6bf 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -172,7 +172,7 @@ 编辑贴吧 - 删除贴吧 + 删除贴吧 <% end %>
    From 5ca80d9a4cb44e20a2437fcc405194fe56d7e34e Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 23 Sep 2015 16:46:29 +0800 Subject: [PATCH 55/79] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=9A=84=E8=AF=A6=E7=BB=86=E5=86=85=E5=AE=B9?= =?UTF-8?q?=EF=BC=8C=E5=8C=85=E6=8B=AC=E6=89=A3=E5=88=86=E3=80=81=E6=88=AA?= =?UTF-8?q?=E6=AD=A2=E6=97=A5=E6=9C=9F=E7=AD=89=202.=E5=AF=B9=E8=80=81?= =?UTF-8?q?=E5=B8=88=E5=92=8C=E5=AD=A6=E7=94=9F=EF=BC=8C=E7=BB=99=E5=87=BA?= =?UTF-8?q?=E7=9A=84tips=E8=A6=81=E6=9C=89=E5=8C=BA=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 37 ++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 5 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 97a67a717..ee9c95ccf 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -127,11 +127,38 @@ :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
  • <%= time_tag(ma.created_at).html_safe %>
  • From c8d07dedf6fb1cd5d03cb14f434ac75a239bf017 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 23 Sep 2015 17:09:21 +0800 Subject: [PATCH 56/79] =?UTF-8?q?=E5=B8=96=E5=AD=90=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=BC=96=E8=BE=91=20=E5=88=A0=E9=99=A4=20=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/show.html.erb | 12 ++++++++++++ public/stylesheets/new_user.css | 4 ++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 723bef435..18244d765 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -19,6 +19,18 @@ <%= link_to image_tag(url_to_avatar(@memo.author),:width=>50,:height => 50,:alt=>'贴吧图像' ),user_path(@memo.author) %>
    + <% if @memo.author.id == User.current.id%> +
    + +
    + <%end%>
    <%= format_date( @memo.created_at)%>
    diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index c97483c9b..54cdfb842 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -612,7 +612,7 @@ a.postReplyCancel:hover {color:#ffffff;} .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;} .homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;} a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;} -a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} +a.postOptionLink:hover {color:#ffffff; background-color:#15bccf;} .homepagePostReplyPortrait {float:left; width:33px;} .homepagePostReplyDes {float:left; width:632px; margin-left:15px;} .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;} @@ -754,7 +754,7 @@ a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no .postAttIcon {background:url(images/post_image_list.png) 0px -91px no-repeat; width:16px; height:16px; padding-left:20px;} .postAttIcon:hover {background:url(images/post_image_list.png) 0px -113px no-repeat;} .postThemeContainer {width:720px;} -.postThemeWrap {width:655px; float:left;} +.postThemeWrap {width:655px; float:left;position: relative} .postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px;} .postLikeIcon:hover {background:url(images/post_image_list.png) 0px -64px no-repeat ;} a.AnnexBtn{ background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;} From b94c57691a10d0c1d9d63646ae6d8f38fea56b31 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 23 Sep 2015 17:36:36 +0800 Subject: [PATCH 57/79] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=B0=E5=BB=BA?= =?UTF-8?q?=E9=87=8D=E6=9E=84=20=E9=A1=B9=E7=9B=AE=E5=85=88=E5=BB=BA?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 4 +- app/helpers/projects_helper.rb | 18 ++++++ app/views/projects/new.html.erb | 88 ++++++++++++++++++++------ config/locales/commons/zh.yml | 3 +- config/locales/projects/zh.yml | 1 + public/javascripts/project.js | 3 +- public/stylesheets/project.css | 1 + 7 files changed, 95 insertions(+), 23 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4d80efdf3..ee958f20e 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -162,7 +162,7 @@ class ProjectsController < ApplicationController @trackers = Tracker.sorted.all @project = Project.new @project.safe_attributes = params[:project] - render :layout => 'base' + render :layout => 'new_base' else redirect_to signin_url end @@ -220,7 +220,7 @@ class ProjectsController < ApplicationController end else respond_to do |format| - format.html { render :action => 'new', :layout => 'base'}#Added by young + format.html { render :action => 'new', :layout => 'new_base'}#Added by young format.api { render_validation_errors(@project) } end end diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 6a865b203..2db03dce1 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -76,6 +76,24 @@ module ProjectsHelper return result end + # 项目类型 + def project_type_select + type = [] + option1 = [] + option1 << l(:label_development_team) + option1 << l(:label_development_team) + option2 = [] + option2 << l(:label_research_group) + option2 << l(:label_research_group) + option3 = [] + option3 << l(:label_friend_organization) + option3 << l(:label_friend_organization) + type << option1 + type << option2 + type << option3 + type + end + # 被邀请成员的状态 def status_for_ivitied(ivite_list, project) if ivite_list.user.member_of?(project) diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index 98612b733..039a9e69c 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -1,23 +1,73 @@ <% @nav_dispaly_project_label = 1 @nav_dispaly_forum_label = 1 %> -<%= labelled_form_for @project do |f| %> -
    - <%=l(:label_project_new)%> - - -
    -

    - <%=raw l(:label_project_new_description)%> -

    - <%= render :partial => 'form', :locals => { :f => f } %> - - <%= submit_tag l(:button_create), :class => "enterprise"%> - -
    - <%#= submit_tag l(:button_create_and_continue), :name => 'continue' %> - <%= javascript_tag "$('#project_name').focus();" %> -
    -<% end %> +
    +

    <%= l(:label_project_new)%>

    +
    +
    +
      + <%= labelled_form_for @project do |f| %> +
    • + + + + + +
    • +
      +
    • + + <%= select_tag :project_new_type, options_for_select(project_type_select, @project.project_new_type) %> +
    • +
      +
    • + + +
      +
    • +
    • + + + (打钩为公开,不打钩则不公开,若不公开,仅项目成员可见该项目。) +
      +
    • +
    • + 提交 + <%= link_to "取消",user_activities_path(User.current.id),:class => "blue_btn grey_btn fl c_white"%> +
      +
    • + <% end%> +
    +
    +
    -<% html_title(l(:label_project_new)) -%> \ No newline at end of file +<% html_title(l(:label_project_new)) -%> + + \ No newline at end of file diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml index 457d56dad..7cbb223c6 100644 --- a/config/locales/commons/zh.yml +++ b/config/locales/commons/zh.yml @@ -284,7 +284,8 @@ zh: label_tags_issue: "问题名称" label_tags_issue_description: 问题描述 - label_tags_project_name: "项目名称:" + label_tags_project_name: "项目名称:" + label_projects_new_name: "项目名称" label_tags_project_description: "项目描述" label_tags_user_mail: "用户邮箱:" diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 599b51c30..b4234f358 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -60,6 +60,7 @@ zh: label_friend_organization: 圈子模式 label_research_group: 研讨模式 label_development_team: 开发模式 + label_type_project: 项目类型 label_member: 成员 project_module_attachments: 资源 diff --git a/public/javascripts/project.js b/public/javascripts/project.js index d3c3377f5..491b5bb92 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -505,4 +505,5 @@ function judgeprojectname(){ //用户反馈 function submitProjectFeedback() { $("#project_feedback_form").submit(); -} \ No newline at end of file +} + diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index bee965a90..f69e828e8 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -3,6 +3,7 @@ .project_content{ width:940px; margin:10px auto;} .project_left{ float:left;} .project_right{ width:670px; float:left;background:#fff; padding:10px;} +.project_r_h02{ width:920px; height:40px; background:#eaeaea; margin-bottom:10px;} /*简介*/ .project_intro{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; color:#6d6d6d;} From 53eaac295e2f38758faf8f724a07b80ba659d38b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 23 Sep 2015 17:37:40 +0800 Subject: [PATCH 58/79] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=95=99=E8=A8=80?= =?UTF-8?q?=E4=B8=AD=EF=BC=8C=E5=AF=B9=E6=96=B9=E5=9B=9E=E5=A4=8D=E7=95=99?= =?UTF-8?q?=E8=A8=80=EF=BC=8Ctips=E4=B8=AD=E5=A2=9E=E5=8A=A0=E5=8E=9F?= =?UTF-8?q?=E7=95=99=E8=A8=80=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index ee9c95ccf..8557b7131 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -607,7 +607,14 @@ :onmouseout => "message_titile_hide($(this))" %>
  • <%= time_tag(ma.journals_for_message.created_on).html_safe %>
  • From ad6fbf6c9bf6a752f631d8fae6152ee4f9ed6ad7 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 24 Sep 2015 09:25:56 +0800 Subject: [PATCH 59/79] =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=BD=9C=E5=93=81?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E3=80=81=E5=A7=93=E5=90=8D=E3=80=81=E5=AD=A6?= =?UTF-8?q?=E5=8F=B7=E3=80=81=E6=97=B6=E9=97=B4=E5=88=97=E9=83=BD=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E5=B1=95=E5=BC=80=E4=BD=9C=E5=93=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../student_work/_evaluation_un_work.html.erb | 38 ++++++++++--------- public/javascripts/course.js | 11 ++++++ 2 files changed, 31 insertions(+), 18 deletions(-) diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb index bc9fe2e00..ff2420a1a 100644 --- a/app/views/student_work/_evaluation_un_work.html.erb +++ b/app/views/student_work/_evaluation_un_work.html.erb @@ -3,27 +3,29 @@
    • - <%= image_tag(url_to_avatar(student_work.user),width:"40", height: "40") %> -
    • -
    • - <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> -
      - <%= link_to student_work_name, student_work_path(student_work),:remote => true,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%> -
      -
    • -
    • -
        -
      • - <%= student_work.user.show_name%> -
      • -
      • - <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> -
      • -
      + <%= link_to(image_tag(url_to_avatar(User.current),:width =>"40",:height => "40"),user_activities_path(User.current.id))%>
    • +
      +
    • + <% student_work_name = student_work.name.nil? || student_work.name.empty? ? student_work.user.show_name + '的作品' : student_work.name%> +
      + <%= link_to student_work_name,"javascript:void(0)" ,:title => student_work_name, :class => "linkGrey f14 StudentName break_word #{@homework.homework_type == 2 ? '' : 'width165'}"%> +
      +
    • +
    • +
        +
      • + <%= student_work.user.show_name%> +
      • +
      • + <%= student_work.user.user_extensions.nil? ? "--" : student_work.user.user_extensions.student_id%> +
      • +
      +
    • +
  • -
  • +
  • <%= Time.parse(format_time(student_work.created_at)).strftime("%m-%d %H:%M")%>  <% if Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(student_work.created_at.to_s).strftime("%Y-%m-%d") %> [迟交] diff --git a/public/javascripts/course.js b/public/javascripts/course.js index b471ea89e..07a149adb 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -975,3 +975,14 @@ $(function(){ function new_homework_alert(){ alert("您好!课程内直接发布作业的功能正在改进中,请直接点击\n顶部导航栏的“作业”向本课程发送作业。谢谢!如有问\n题,可参见帮助中心。"); } + +function show_student_work(url){ + $.get( + url, + { + + }, + function (data) { + } + ); +} From b9ff46f8d01a033adcd39367f78a6a1e7abc6440 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 24 Sep 2015 09:40:53 +0800 Subject: [PATCH 60/79] =?UTF-8?q?=E5=B8=96=E5=AD=90=E7=9A=84=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=B8=8E=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/memos_controller.rb | 5 + app/views/forums/index.html.erb | 2 +- app/views/memos/_attachments_links.html.erb | 6 +- app/views/memos/edit.html.erb | 100 +++++++++----------- app/views/memos/show.html.erb | 4 +- public/javascripts/new_user.js | 21 +++- public/stylesheets/header.css | 2 +- public/stylesheets/public_new.css | 2 +- 8 files changed, 79 insertions(+), 63 deletions(-) diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index f7de712ca..f3c383573 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -143,7 +143,12 @@ class MemosController < ApplicationController end def edit + @my_topic_count = Memo.where("forum_id = #{@memo.forum_id} and author_id = #{User.current.id} and parent_id is null").count + @my_replies_count = Memo.where("forum_id = #{@memo.forum_id} and author_id = #{User.current.id} and parent_id is not null").count @replying = false + respond_to do |format| + format.html {render :layout=>'base_forums'} + end end def update diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb index 93dcbc3fa..8f5cb15cc 100644 --- a/app/views/forums/index.html.erb +++ b/app/views/forums/index.html.erb @@ -61,7 +61,7 @@ n += 1;//英文,不多说了 } } - if(n >= 160) + if(n >= 160 && event.keyCode != 8) event.returnValue = false; } }); diff --git a/app/views/memos/_attachments_links.html.erb b/app/views/memos/_attachments_links.html.erb index 7da30aad0..15473e6e7 100644 --- a/app/views/memos/_attachments_links.html.erb +++ b/app/views/memos/_attachments_links.html.erb @@ -35,13 +35,13 @@
    <% end %> - <% if attachment.is_text? %> - <%= link_to image_tag('magnifier.png'), + <%# if attachment.is_text? %> + <%#= link_to image_tag('magnifier.png'), :controller => 'attachments', :action => 'show', :id => attachment, :filename => attachment.filename%> - <% end %> + <%# end %> diff --git a/app/views/memos/edit.html.erb b/app/views/memos/edit.html.erb index 487d923b5..0efa57ccc 100644 --- a/app/views/memos/edit.html.erb +++ b/app/views/memos/edit.html.erb @@ -1,55 +1,47 @@ - -<% @replying = !@memo.parent.nil? %> -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> -

    <%=l(:label_memo_edit)%>

    -<%= labelled_form_for(@memo, :url => forum_memo_path(@memo.forum_id, @memo)) do |f| %> - <% if @memo.errors.any? %> -
    -

    - <%= pluralize(@memo.errors.count, "error") %> - prohibited this memo from being saved: -

    -
      - <% @memo.errors.full_messages.each do |msg| %> -
    • - <%= msg %> -
    • - <% end %> -
    -
    - <% end %> -
    -

    - <% if @memo.parent.nil? && @memo.children.first.nil? %> - <%#= f.text_field :subject, :required => true, :size => 96 ,:readonly => false, :maxlength => 50%> - <% else %> - <%#= f.text_field :subject, :required => true, :size => 96 ,:readonly => true, :style => "border: 1px solid gray", :maxlength => 50%> - <% end %> -

    - <% if User.current.admin?%> -

    - <% unless @replying %> - <% if @memo.safe_attribute? 'sticky' %> - <%= f.check_box :sticky %> - <%= label_tag 'memo_sticky', l(:label_board_sticky) %> - <% end %> - <% if @memo.safe_attribute? 'lock' %> - <%= f.check_box :lock %> <%= label_tag 'memo_locked', l(:label_board_locked) %> - <% end %> - <% end %> -

    - <% end %> -

    - <%= 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;"%> +<%= javascript_include_tag 'new_user'%> + +
    +
    编辑帖子
    +
    +
    + <%= labelled_form_for(@memo, :url => forum_memo_path(@memo.forum_id, @memo),:html=>{:id=>'edit_memo'}) do |f| %> + +
    + +
    -<% end %> +
    + + +
    +
    + + <%= render :partial => 'forums/file_form', :locals => {:container => @memo} %> + + +
    +
    + <% end %> +
    \ No newline at end of file diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 18244d765..57b6875e5 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -24,8 +24,8 @@ diff --git a/public/javascripts/new_user.js b/public/javascripts/new_user.js index eb50c2762..b894edf02 100644 --- a/public/javascripts/new_user.js +++ b/public/javascripts/new_user.js @@ -249,4 +249,23 @@ var autoTextarea = function (elem, extra, maxHeight) { addEvent('input', change); addEvent('focus', change); change(); -}; \ No newline at end of file +}; + +function limitStrsize(id,length){ + document.getElementById(id).onkeydown = function() + { + var n = 0; + var str = this.value; + for (i = 0; i < str.length; i++) { + var leg = str.charCodeAt(i);//ASCII码 + if (leg > 255) {//大于255的都是中文 + n += 2;//如果是中文就是2个字节 + } else { + n += 1;//英文,不多说了 + } + } + + if(n >= length && event.keyCode !== 8) + event.returnValue = false; + } +} \ No newline at end of file diff --git a/public/stylesheets/header.css b/public/stylesheets/header.css index 2d6f5e0b8..ffea2f5b7 100644 --- a/public/stylesheets/header.css +++ b/public/stylesheets/header.css @@ -55,7 +55,7 @@ a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;} .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;} .homepageRightBanner {width:720px; height:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;} -.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; background:url(../images/homepage_icon.png) -18px -230px no-repeat; width:150px; float:left; padding-left:15px; margin-top:4px;} +.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left; margin-top:4px;} .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;} .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;} .homepageNewsList {width:710px; height:49px; line-height:49px; vertical-align:middle; border-bottom:1px dashed #eaeaea; margin-left:10px;} diff --git a/public/stylesheets/public_new.css b/public/stylesheets/public_new.css index 7cd0a461c..7dc695428 100644 --- a/public/stylesheets/public_new.css +++ b/public/stylesheets/public_new.css @@ -534,7 +534,7 @@ a.sendButtonBlue:hover {color:#ffffff;} outline:none; } .homepageRightBanner {width:720px; height:34px; margin:0px auto; border-bottom:1px solid #e9e9e9;} -.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; background:url(images/homepage_icon.png) -18px -230px no-repeat; width:150px; float:left; padding-left:15px; margin-top:4px;} +.NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left; margin-top:4px;} a.resourcesTypeAll {background:url(images/homepage_icon.png) -180px -89px no-repeat; padding-left:23px;} a.resourcesTypeAtt {background:url(images/homepage_icon.png) -180px -49px no-repeat; padding-left:23px;} .resourcesType {width:75px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 20px; left:-90px; font-size:12px; color:#888888; display:none; line-height:2;} From bb676b697b78ce8e050179a233f4e196f070dfdd Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 09:47:40 +0800 Subject: [PATCH 61/79] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E2=80=9C=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E2=80=9D=20=E6=96=B0=E5=BB=BA=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=96=B0=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_form_new.html.erb | 28 +++++++++++++++++++++++++++ app/views/projects/new.html.erb | 28 +++++++++++++++++++++++---- 2 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 app/views/projects/_form_new.html.erb diff --git a/app/views/projects/_form_new.html.erb b/app/views/projects/_form_new.html.erb new file mode 100644 index 000000000..c53c23d47 --- /dev/null +++ b/app/views/projects/_form_new.html.erb @@ -0,0 +1,28 @@ +<%# 这些代码删除也没什么影响,暂时放着,待优化 %> +<%= wikitoolbar_for 'project_description' %> + +<% @project.custom_field_values.each do |value| %> +

    + <%= custom_field_tag_with_label :project, value %> +

    +<% end %> +<%= call_hook(:view_projects_form, :project => @project, :form => f) %> +<% unless @project.identifier_frozen? %> + <% content_for :header_tags do %> + <%= javascript_include_tag 'project_identifier' %> + <% end %> +<% end %> + +<% if !User.current.admin? && @project.inherit_members? && @project.parent && User.current.member_of?(@project.parent) %> + <%= javascript_tag do %> + $(document).ready(function() { + $("#project_inherit_members").change(function(){ + if (!$(this).is(':checked')) { + if (!confirm("<%= escape_javascript(l(:text_own_membership_delete_confirmation)) %>")) { + $("#project_inherit_members").attr("checked", true); + } + } + }); + }); + <% end %> +<% end %> diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index 039a9e69c..26fb104bd 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -1,6 +1,6 @@ <% @nav_dispaly_project_label = 1 @nav_dispaly_forum_label = 1 %> - +<%= error_messages_for 'project' %>

    <%= l(:label_project_new)%>

    @@ -17,7 +17,7 @@
  • - <%= select_tag :project_new_type, options_for_select(project_type_select, @project.project_new_type) %> + <%= select_tag :project_new_type, options_for_select(project_type_select, @project.project_new_type) %>开发模式开发模式开发模式开发模式开发模式开发模式开发模式开发模
  • @@ -25,12 +25,31 @@
  • +
  • +

    + <%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH, + value:"#{User.current.id.to_s + '_' +Time.now.to_s.gsub(' ','_').gsub(':','').gsub('+','')}" %> + <% unless @project.identifier_frozen? %> + + <%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> + <%= l(:text_project_identifier_info).html_safe %> + + <% end %>

    +
  • - + (打钩为公开,不打钩则不公开,若不公开,仅项目成员可见该项目。)
  • +
  • +

    + <%= f.text_field :project_type, :value => 0 %> +

    +
  • +
  • + <%= render :partial => 'form_new', :locals => { :f => f } %> +
  • 提交 <%= link_to "取消",user_activities_path(User.current.id),:class => "blue_btn grey_btn fl c_white"%> @@ -70,4 +89,5 @@ $("#new_project").submit(); } } - \ No newline at end of file + + From 44b93af3074104cc31807b5ab516423ce77b8c3b Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 24 Sep 2015 09:52:57 +0800 Subject: [PATCH 62/79] =?UTF-8?q?tag=E6=B5=AE=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_forums.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index e8fa7a6bf..e6fe778f4 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -167,8 +167,8 @@
  • - <%if @forum.creator.id == User.current.id%>
    + <%if @forum.creator.id == User.current.id%> 编辑贴吧 From 756664a3db76eb82e9813ce766b06d990185d5f8 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 24 Sep 2015 11:07:09 +0800 Subject: [PATCH 63/79] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=A2=9E=E5=8A=A0=E7=A7=B0=E5=91=BC?= =?UTF-8?q?=E3=80=81tips=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 65 ++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 4 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 8557b7131..c7895efb7 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -176,7 +176,39 @@ :onmouseout => "message_titile_hide($(this))" %>
  •    截止时间快到了!
  • <% else %> @@ -304,7 +336,13 @@ <% if ma.course_message_type == "StudentWorksScore" %> From 6449b2563b9f2e0784ebfebabb4c93df56dfafd5 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 11:19:07 +0800 Subject: [PATCH 64/79] =?UTF-8?q?1=E3=80=81=E5=8E=BB=E6=8E=89=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=9A=90=E8=97=8F=E4=BB=A3=E7=A0=81=E5=BA=93=E7=9A=84?= =?UTF-8?q?=E5=8A=9F=E8=83=BD=202=E3=80=81=E5=90=8C=E6=AD=A5=E5=9C=88?= =?UTF-8?q?=E5=AD=90=E7=9A=84=E6=8F=8F=E8=BF=B0=203=E3=80=81=E5=9C=88?= =?UTF-8?q?=E5=AD=90JS=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 2 +- app/helpers/projects_helper.rb | 3 +++ app/views/layouts/base_projects.html.erb | 6 +++--- app/views/projects/new.html.erb | 10 +++++++++- app/views/projects/settings/_new_edit.html.erb | 10 ++-------- public/stylesheets/public.css | 2 +- 6 files changed, 19 insertions(+), 14 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index ee958f20e..414ef6d70 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -188,7 +188,7 @@ class ProjectsController < ApplicationController @project.safe_attributes = params[:project] @project.organization_id = params[:organization_id] @project.user_id = User.current.id - @project.project_new_type = 1 + @project.project_new_type = params[:project_new_type] if validate_parent_id && @project.save @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') # Add current user as a project member if he is not admin diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 2db03dce1..f0ce70dc2 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -94,6 +94,9 @@ module ProjectsHelper type end + # 项目类型描述 + + # 被邀请成员的状态 def status_for_ivitied(ivite_list, project) if ivite_list.user.member_of?(project) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index b7b88c186..c9bc68c33 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -170,9 +170,9 @@

    请选择项目类型:

      -
    • id="development_group"/>
    • -
    • id="research_group"/>
    • -
    • id="friend_organization"/>
    • +
    • id="development_group"/>
    • +
    • id="research_group"/>
    • +
    • id="friend_organization"/>
    确定
    diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index 26fb104bd..f78bbf0c5 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -17,7 +17,7 @@
  • - <%= select_tag :project_new_type, options_for_select(project_type_select, @project.project_new_type) %>开发模式开发模式开发模式开发模式开发模式开发模式开发模式开发模 + <%= select_tag :project_new_type, options_for_select([["开发模式", "1"], ["研讨模式", "2"], ["圈子模式", "3"]]) %>为团队提供系列在线开发工具!
  • @@ -89,5 +89,13 @@ $("#new_project").submit(); } } + + $(document).ready(function(){ + $('#project_new_type').change(function(){ + alert($(this).children('option:selected').val("开发模式:面向小组开发,支持问题跟踪、代码托管、论坛交流等所有功能。")); + var p1=$(this).children('option:selected').val("研讨模式:面向小组研究,支持任务分工、论坛交流、资源分享等。");//这就是selected的值 +// var p2=$('#param2').val();//获取本页面其他标签的值 + }) + }) diff --git a/app/views/projects/settings/_new_edit.html.erb b/app/views/projects/settings/_new_edit.html.erb index 8de9b8229..b38871a60 100644 --- a/app/views/projects/settings/_new_edit.html.erb +++ b/app/views/projects/settings/_new_edit.html.erb @@ -5,9 +5,8 @@ <%= render :partial=>"avatar/new_avatar_form",:locals=> {source:@project} %>
  • -
  • - + @@ -15,7 +14,7 @@
  • - +
  • @@ -24,11 +23,6 @@ >
    -
  • - - > -
    -
  • 保存 <% end %> diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 4f44a8b60..d8902876e 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -852,7 +852,7 @@ 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:310px;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:450px;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;} From f9f51557ddd72d232a84a4cdb7d1188616256068 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 24 Sep 2015 11:31:07 +0800 Subject: [PATCH 65/79] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_feedback.html.erb | 67 +++++++++++----------- app/views/layouts/_new_feedback.html.erb | 3 +- public/images/sidebar_bg.png | Bin 9114 -> 9913 bytes public/javascripts/feedback.js | 65 +++++++-------------- public/stylesheets/new_user.css | 17 +++--- public/stylesheets/public.css | 18 +++--- 6 files changed, 73 insertions(+), 97 deletions(-) diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index 07f852914..9fe25ce95 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -1,9 +1,9 @@ @@ -39,7 +39,7 @@ minStatue : true, skin : 'blue', durationTime : 1000 - } + }; var options = $.extend(defaults, options); this.each(function(){ @@ -56,13 +56,13 @@ if(options.minStatue == "true"){ $(".show_btn").css("float", options.float); sideContent.css('width', 0); - show_btn.css('width', 25); + show_btn.css('width', 29); } //close closeBtn.bind("click",function(){ sideContent.animate({width: '0px'},"fast"); - show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast"); + show_btn.stop(true, true).delay(300).animate({ width: '29px'},"fast"); cookiesave('minStatue','true','','',''); }); //show @@ -83,14 +83,10 @@ $(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(); } @@ -169,15 +165,15 @@ function cookieget(n)
    <% get_memo %> - <% if @public_forum %> - <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %> - <%= f.text_area :subject,:id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %> - <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %> - <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %> - - <%= l(:label_submit)%> - <% end %> - <% end %> + <% if @public_forum %> + <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %> + <%= f.text_area :subject,:id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %> + <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %> + <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %> + + <%= l(:label_submit)%> + <% end %> + <% end %>
    -
    <%= l(:label_submit)%>
    +
    diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index db0a3c3ee..136e49b37 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -30,6 +30,7 @@
    - 在线客服 + <%= l(:label_submit)%> +
    diff --git a/public/images/sidebar_bg.png b/public/images/sidebar_bg.png index 2704727d7d7984e6fb748b28a35ee9e14cf25d84..9ceea0f9176902560fa21d8eddd17a372d761edd 100644 GIT binary patch delta 7003 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 delta 6177 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 diff --git a/public/javascripts/feedback.js b/public/javascripts/feedback.js index 1bbab1f45..fb3b35ca7 100644 --- a/public/javascripts/feedback.js +++ b/public/javascripts/feedback.js @@ -5,7 +5,7 @@ minStatue : true, skin : 'blue', durationTime : 1000 - } + }; var options = $.extend(defaults, options); this.each(function(){ @@ -13,17 +13,13 @@ var thisBox = $(this), closeBtn = thisBox.find('.close_btn' ), show_btn = thisBox.find('.show_btn' ), - sideContent = thisBox.find('.side_content'), - sideList = thisBox.find('.side_list') - ; + sideContent = thisBox.find('.side_content'); var defaultTop = thisBox.offset().top; //????????top - thisBox.css(options.float, 0); if(options.minStatue == "true"){ - $(".show_btn").css("float", options.float); + show_btn.css("float", options.float); sideContent.css('width', 0); show_btn.css('width', 25); - } //close closeBtn.bind("click",function(){ @@ -37,26 +33,12 @@ sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast"); 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").val(); -// $("#memo_subject").val(subject+":"+ content.substr(0,18)+"..."); $("#new_memo").submit(); } @@ -68,11 +50,8 @@ function cookiesave(n, v, mins, dn, path) 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; @@ -86,34 +65,31 @@ function cookieget(n) var c = ca[i]; while (c.charAt(0)==' ') c = c.substring(1,c.length); if (c.indexOf(name) == 0){ - return c.substring(name.length,c.length);} - + return c.substring(name.length,c.length); + } } return false; } $(function(){ + $(".closeSidebar").click(function(){ + $(".show_btn").css("display","none"); + $("#scrollsidebar").css("display","none"); + return false; + }); + $("#button1").click(function(){ - myTips("<%= l(:label_feedback_success) %>","success"); + myTips("反馈成功","success"); }); -}); - - -$(document).ready(function () { - $(function () { - $("#scrollsidebar").fix({ - float: 'right', //default.left or right - minStatue: cookieget('minStatue'), - skin: 'green', //default.gray or blue - durationTime: 600 - }); + $("#scrollsidebar").fix({ + float: 'right', //default.left or right + minStatue: cookieget('minStatue'), + skin: 'green', //default.gray or blue + durationTime: 600 }); -}); - -$(document).ready(function(){ $("#subject").keydown(function(){ var curLength=$("#subject").val().length; if(curLength>50){ @@ -123,8 +99,7 @@ $(document).ready(function(){ else{ $("#textCount").text(50-$("#subject").val().length) } - }) - $("#subject").keyup(function(){ + }).keyup(function(){ var curLength=$("#subject").val().length; if(curLength>50){ var num=$("#subject").val().substr(0,50); @@ -133,5 +108,5 @@ $(document).ready(function(){ else{ $("#textCount").text(50-$("#subject").val().length) } - }) -}) \ No newline at end of file + }); +}); \ No newline at end of file diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index ed872936e..1022d5aa2 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -711,7 +711,7 @@ html{ overflow-x:hidden;} .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; } .side_content{width:154px; height:auto; overflow:hidden; float:left; } .side_content .side_list {width:154px;overflow:hidden;} -.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:190px;cursor:pointer;} +.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:200px; cursor:pointer;} .show_btn span { display:none;} .close_btn{width:24px;height:24px;cursor:pointer;} .side_title,.side_bottom,.close_btn,.show_btn {background:url(../images/sidebar_bg.png) no-repeat; } @@ -721,20 +721,21 @@ html{ overflow-x:hidden;} .close_btn { float:right; display:block; width:21px; height:16px; margin:9px 10px 0 0; _margin:16px 5px 0 0;} .close_btn span { display:none;} .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;} -.msgserver { margin-top:5px;} -.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -112px; padding-left:22px; height:21px; display:block; } +.msgserver { margin:10px 0 0px 5px;} +.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -110px; padding-left:22px; display:block; height:24px; } .opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;} -a.opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;} -a:hover.opnionButton{background: #0fa9bb; } +a.opnionButton{ display:block; background:#269ac9; width:130px; height:26px; margin-top:5px; text-align:center; padding-top:0px; color:#fff;} +a.opnionButton:hover{background: #297fb8; } /* blue skin as the default skin */ .side_title {background-position:-195px 0;} .side_center {background:url(../images/blue_line.png) repeat-y center; } .side_bottom {background-position:-195px -50px;} -a.close_btn {background-position:-44px 0;} -a:hover.close_btn {background-position:-66px 0;} +.close_btn {background-position:-44px 0;} +.close_btn:hover {background-position:-66px 0;} .show_btn {background-position:-119px 0;} -.msgserver a {color:#15bccf; } +.msgserver a {color:#269ac9; } .msgserver a:hover { text-decoration:underline; } +.closeSidebar {background:url(../images/sidebar_bg.png) 0px -112px no-repeat; width:28px; height:18px; margin-top:65px; position:absolute;} /***** Ajax indicator ******/ diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index d8285709f..3031a964e 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -714,7 +714,7 @@ html{ overflow-x:hidden;} .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; } .side_content{width:154px; height:auto; overflow:hidden; float:left; } .side_content .side_list {width:154px;overflow:hidden;} -.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:190px;cursor:pointer;} +.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:200px; cursor:pointer;} .show_btn span { display:none;} .close_btn{width:24px;height:24px;cursor:pointer;} .side_title,.side_bottom,.close_btn,.show_btn {background:url(../images/sidebar_bg.png) no-repeat; } @@ -724,21 +724,21 @@ html{ overflow-x:hidden;} .close_btn { float:right; display:block; width:21px; height:16px; margin:9px 10px 0 0; _margin:16px 5px 0 0;} .close_btn span { display:none;} .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;} -.msgserver { margin-top:5px;} -/*.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -112px; padding-left:22px; height:21px; display:block; }*/ -.msgserver a { padding-left:4px; height:21px; display:block; } +.msgserver { margin:10px 0 0px 5px;} +.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -110px; padding-left:22px; display:block; height:24px; } .opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;} -a.opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;} -a:hover.opnionButton{background: #0fa9bb; } +a.opnionButton{ display:block; background:#269ac9; width:130px; height:26px; margin-top:5px; text-align:center; padding-top:0px; color:#fff;} +a.opnionButton:hover{background: #297fb8; } /* blue skin as the default skin */ .side_title {background-position:-195px 0;} .side_center {background:url(../images/blue_line.png) repeat-y center; } .side_bottom {background-position:-195px -50px;} -a.close_btn {background-position:-44px 0;} -a:hover.close_btn {background-position:-66px 0;} +.close_btn {background-position:-44px 0;} +.close_btn:hover {background-position:-66px 0;} .show_btn {background-position:-119px 0;} -.msgserver a {color:#15bccf; } +.msgserver a {color:#269ac9; } .msgserver a:hover { text-decoration:underline; } +.closeSidebar {background:url(../images/sidebar_bg.png) 0px -112px no-repeat; width:28px; height:18px; margin-top:65px; position:absolute;} .hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} From 4c71e2c2562e101cd6097b7fad38c940f2716504 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 11:44:02 +0800 Subject: [PATCH 66/79] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8F=90=E7=A4=BAJS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 11 ++++++++++- app/views/projects/new.html.erb | 19 +++++++++++++++---- config/locales/projects/zh.yml | 3 +++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index f0ce70dc2..41f25d1a3 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -95,7 +95,16 @@ module ProjectsHelper end # 项目类型描述 - + def project_newtype_descrption + case params + when 1 + value = l(:label_type_des_development) + when 2 + value = l(:label_type_des_research) + when 3 + value = l(:label_type_des_friend) + end + end # 被邀请成员的状态 def status_for_ivitied(ivite_list, project) diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index f78bbf0c5..e57afe0ad 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -17,7 +17,8 @@
  • - <%= select_tag :project_new_type, options_for_select([["开发模式", "1"], ["研讨模式", "2"], ["圈子模式", "3"]]) %>为团队提供系列在线开发工具! + <%= select_tag :project_new_type, options_for_select([["开发模式", "1"], ["研讨模式", "2"], ["圈子模式", "3"]]) %> + 为团队提供系列在线开发工具!
  • @@ -90,12 +91,22 @@ } } - $(document).ready(function(){ + $(function(){ $('#project_new_type').change(function(){ - alert($(this).children('option:selected').val("开发模式:面向小组开发,支持问题跟踪、代码托管、论坛交流等所有功能。")); - var p1=$(this).children('option:selected').val("研讨模式:面向小组研究,支持任务分工、论坛交流、资源分享等。");//这就是selected的值 + var type = $('#project_new_type').val(); + if(type == '1'){ + $(this).next().html("<%= l(:label_type_des_development)%>"); + } + else if(type == '2'){ + $(this).next().html("<%= l(:label_type_des_research)%>"); + } + else if(type == '3'){ + $(this).next().html("<%= l(:label_type_des_friend)%>"); + } +// var p1=$(this).children('option:selected').val("研讨模式:面向小组研究,支持任务分工、论坛交流、资源分享等。");//这就是selected的值 // var p2=$('#param2').val();//获取本页面其他标签的值 }) + }) diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index b4234f358..dbce93219 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -61,6 +61,9 @@ zh: label_research_group: 研讨模式 label_development_team: 开发模式 label_type_project: 项目类型 + label_type_des_development: 开发模式:面向小组开发,支持问题跟踪、代码托管、论坛交流等所有功能。 + label_type_des_research: 研讨模式:面向小组研究,支持任务分工、论坛交流、资源分享等。 + label_type_des_friend: 圈子模式:面向好友分享,支持论坛交流、资源分享等。 label_member: 成员 project_module_attachments: 资源 From 38a24e8fe4b95061a35f492a95e1b01644f12bde Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 24 Sep 2015 12:17:14 +0800 Subject: [PATCH 67/79] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/show.html.erb | 114 +++++++++++++++----------------- public/stylesheets/new_user.css | 1 + 2 files changed, 53 insertions(+), 62 deletions(-) diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 57b6875e5..81758ff97 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor","forum" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor","forum" %>
    @@ -53,75 +71,47 @@
    -
    - <%= form_for(@memo_new, url: forum_memos_path, :html => {:multipart => true}) do |f|%> - <%= f.hidden_field :subject, :required => true, value: @memo.subject %> - <%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %> - <%= f.hidden_field :parent_id, :required => true, value: @memo.id %> - -

    -
    - 取消 - 留言 - <% end %> -
    -
    - <% @replies.each do |reply| %> -
    -
    - - <%= link_to image_tag(url_to_avatar(reply.author), :width => 45,:height => 45), user_path(reply.author) %> +
    +
    回复(<%=@reply_count %>)
    +
    + -
    -
    <%= reply.author.name%> - <% if reply.parent && reply.parent.id != @memo.id%> - 回复<%= reply.parent.author.name%> - <% end %> - - <%= format_date(reply.created_at)%> - - <%= link_to( - l(:button_delete), - {:action => 'destroy', :id => reply}, - :method => :delete, - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete),:class=>'replyGrey fr ml10' - ) if reply.destroyable_by?(User.current) %> - 回复
    +
    +
    + <% @replies.each_with_index do |reply,i| %> +
    +
    + <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> +
    +
    +
    <%= reply.author.name%><%= format_date(reply.created_at) %>
    <%= reply.content.html_safe%>
    - +
    +
    + <% end %> +
    +
    +
    +
    <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
    +
    +
    + <%= form_for('memo',:url=>forum_memos_path,:method => "post") do |f|%> <%= f.hidden_field :subject, :required => true, value: @memo.subject %> <%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %> <%= f.hidden_field :parent_id, :required => true, value: @memo.id %> <%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %> - -

    -
    - 取消 - 发布 - <% end %> -
    + +
    + +
    +

    + <% end%>
    - <% end %> - - - - - - - - - - -
    -
      - <%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false,:flag=>true %> -
    \ No newline at end of file diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 859a5db27..b2330b18d 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -776,6 +776,7 @@ a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repe .postEdit {background:url(images/post_image_list.png) 0px -94px no-repeat; width:18px; height:18px; display:block; float:left;} .postDelete {background:url(images/post_image_list.png) -42px -93px no-repeat; width:18px; height:18px; display:block; float:right;} .pageBanner {width:968px; margin:0px auto; border:1px solid #dddddd; background-color: #FFF; padding: 10px 15px; float:left;} +.homepagePostReplyInput {width:543px; height:33px; max-width:543px; max-height:33px; border:1px solid #d9d9d9; outline:none;} /*底部*/ #Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;} From 9f22eed093cb1da79befd65a7199c93ed2198002 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 24 Sep 2015 13:38:40 +0800 Subject: [PATCH 68/79] =?UTF-8?q?=E5=B8=96=E5=AD=90=E7=9A=84=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=E4=B9=9F=E8=A6=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/memos_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/memos_controller.rb b/app/controllers/memos_controller.rb index f3c383573..4181090a5 100644 --- a/app/controllers/memos_controller.rb +++ b/app/controllers/memos_controller.rb @@ -156,7 +156,8 @@ class MemosController < ApplicationController if( #@memo.update_column(:subject, params[:memo][:subject]) && @memo.update_column(:content, params[:memo][:content]) && @memo.update_column(:sticky, params[:memo][:sticky]) && - @memo.update_column(:lock, params[:memo][:lock])) + @memo.update_column(:lock, params[:memo][:lock]) && + @memo.update_column(:subject,params[:memo][:subject])) @memo.save_attachments(params[:attachments] || (params[:memo] && params[:memo][:uploads])) @memo.save # @memo.root.update_attribute(:updated_at, @memo.updated_at) From 032ccdb2b85e7fec1517b34b8b10c06274ebbcbc Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 14:01:29 +0800 Subject: [PATCH 69/79] =?UTF-8?q?=E5=85=88=E5=BB=BA=E9=A1=B9=E7=9B=AE=20--?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B=E9=BB=98=E8=AE=A4=E6=8F=90?= =?UTF-8?q?=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/new.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index e57afe0ad..66d933adc 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -18,7 +18,7 @@
  • <%= select_tag :project_new_type, options_for_select([["开发模式", "1"], ["研讨模式", "2"], ["圈子模式", "3"]]) %> - 为团队提供系列在线开发工具! + <%=l(:label_type_des_development) %>
  • From f4cad2897a4ccc6359f1b0955a936d6a63b6c5a3 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 24 Sep 2015 14:48:48 +0800 Subject: [PATCH 70/79] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E8=80=81=E5=B8=88?= =?UTF-8?q?=E5=85=B3=E9=97=AD=E4=BD=9C=E5=93=81=E8=AF=84=E9=98=85=E5=92=8C?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E4=BD=9C=E5=93=81=E8=AF=84=E9=98=85=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E5=92=8C=E6=A0=B7=E5=BC=8F=202.=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E8=80=81=E5=B8=88=E5=85=B3=E9=97=AD=E4=BD=9C=E5=93=81=E8=AF=84?= =?UTF-8?q?=E9=98=85=E5=92=8C=E5=BC=80=E5=90=AF=E4=BD=9C=E5=93=81=E8=AF=84?= =?UTF-8?q?=E9=98=85=E7=9A=84tips=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 86 ++++++++++++-------------- 1 file changed, 41 insertions(+), 45 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index c7895efb7..8f64d6c29 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -224,61 +224,57 @@
  • <%= time_tag(ma.created_at).html_safe %>
  • <% end %> - - <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %> -
      -
    • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
    • -
    • <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>">发布的作业:
    • - <% if ma.viewed == 0 %> -
    • - <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), - :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :onmouseover =>"message_titile_show($(this),event)", - :onmouseout => "message_titile_hide($(this))" %> -
    • - -
    •    开启匿评了!
    • - <% else %> -
    • - <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :onmouseover =>"message_titile_show($(this),event)", - :onmouseout => "message_titile_hide($(this))"%> -
    • - - <% end %> -
    • <%= time_tag(ma.created_at).html_safe %>
    • -
    - <% end %> + + <% if ma.course_message_type == "HomeworkCommon" && ma.status == 2 %> +
      +
    • + <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %> +
    • +
    • + <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", + user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %> + ">启动了作业匿评: +
    • +
    • + <%= link_to "作业题目:" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", + :onmouseover => "message_titile_show($(this),event)", + :onmouseout => "message_titile_hide($(this))" %> +
    • + +
    • <%= time_tag(ma.created_at).html_safe %>
    • +
    + <% end %> <% if ma.course_message_type == "HomeworkCommon" && ma.status == 3 %>
    • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
    • -
    • <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>">发布的作业:
    • - <% if ma.viewed == 0 %> -
    • - <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), - :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :onmouseover =>"message_titile_show($(this),event)", - :onmouseout => "message_titile_hide($(this))" %> -
    • - -
    •    匿评已经关闭!
    • - <% else %> +
    • + <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", + user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>">关闭了作业匿评:
    • - <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", + <%= link_to "作业题目:" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))"%>
    • - <% end %>
    • <%= time_tag(ma.created_at).html_safe %>
    <% end %> From 2aa52bfc59e54b8f9387322e2233cab723b436eb Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 24 Sep 2015 16:02:15 +0800 Subject: [PATCH 71/79] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E7=BF=BB=E9=A1=B5=20?= =?UTF-8?q?=E6=AF=8F=E9=A1=B5=E9=83=BD=E8=A6=81=E5=8A=A0=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 2fba3af1b..34c7d6e64 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -127,7 +127,7 @@ <%= render :partial => 'show_topics',:locals => {:memos=>@memos}%>
      - <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => false, :remote => true, :flag => true %> + <%= pagination_links_full @topic_pages, @topic_count ,:per_page_links => true, :remote => true, :flag => true %>
    From 38ba47f8c8b799b88777d615fddd74515a379333 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 16:16:37 +0800 Subject: [PATCH 72/79] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E4=BF=AE=E6=94=B9=20=E4=BB=BB=E5=8A=A1=E4=B8=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E8=87=AA=E5=8A=A8=E5=BC=80=E5=90=AF?= =?UTF-8?q?/=E5=85=B3=E9=97=AD=E5=8C=BF=E8=AF=84=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=20=E5=8C=BF=E8=AF=84=E5=BC=80=E5=90=AF?= =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/messages_controller.rb | 1 + .../20150924063215_add_reply_id_to_message.rb | 5 ++++ lib/tasks/homework_evaluation.rake | 28 +++++++++++++++++-- 3 files changed, 31 insertions(+), 3 deletions(-) create mode 100644 db/migrate/20150924063215_add_reply_id_to_message.rb diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index f9b5b7d32..8d2cb63aa 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -160,6 +160,7 @@ class MessagesController < ApplicationController @reply.safe_attributes = params[:reply] @reply.content = @quote + @reply.content @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject] + @reply.reply_id = @message.author @topic.children << @reply user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first user_activity.updated_at = Time.now diff --git a/db/migrate/20150924063215_add_reply_id_to_message.rb b/db/migrate/20150924063215_add_reply_id_to_message.rb new file mode 100644 index 000000000..b55449ad7 --- /dev/null +++ b/db/migrate/20150924063215_add_reply_id_to_message.rb @@ -0,0 +1,5 @@ +class AddReplyIdToMessage < ActiveRecord::Migration + def change + add_column :messages, :reply_id, :integer + end +end diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake index af833448d..75166391d 100644 --- a/lib/tasks/homework_evaluation.rake +++ b/lib/tasks/homework_evaluation.rake @@ -25,9 +25,25 @@ namespace :homework_evaluation do end end homework_detail_manual.update_column('comment_status', 2) - # 匿评开启消息邮件通知 + # 匿评开启消息邮件通知,# 所有人 + course = homework_common.course + course.members.each do |m| + homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2) + end + # 邮件通知 + Mailer.send_mail_anonymous_comment_close(homework_common).deliver else - #作业数小于2,启动失败 + #作业数小于2,启动失败, 只给老师发 + # status==4 发送失败 + # 匿评开启消息邮件通知,# 所有人 + course = homework_common.course + course.members.each do |m| + if m.user.allowed_to?(:as_teacher,course) + homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 4) + end + end + # 邮件通知 + # Mailer.send_mail_anonymous_comment_close(homework_common).deliver end end end @@ -47,7 +63,13 @@ namespace :homework_evaluation do student_work.save end homework_detail_manual.update_column('comment_status', 3) - # 匿评关闭消息邮件通知 + # 匿评关闭消息通知 给所有人发 + course = homework_common.course + course.members.each do |m| + homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 3) + end + # 邮件通知 + Mailer.send_mail_anonymous_comment_close(homework_common).deliver end end end From 6b98b2a273601cda9f04cf3c38ad13fa895dc4c9 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 24 Sep 2015 16:17:50 +0800 Subject: [PATCH 73/79] =?UTF-8?q?=E6=9A=82=E6=97=B6=E4=B8=8D=E5=8F=AF?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=9A=84=E9=93=BE=E6=8E=A5=20=E4=B8=8D?= =?UTF-8?q?=E7=94=A8=E6=89=8B=E5=9E=8B=E5=85=89=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_forums.html.erb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index e6fe778f4..0a377b1e5 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -145,7 +145,7 @@
    <%= @forum.description%> @@ -182,12 +182,12 @@
    From fcf34b5918152f4dcd99dbfa3ff01b8e502778e1 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 16:38:36 +0800 Subject: [PATCH 74/79] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E2=80=9C=E7=A7=81=E6=9C=89=E2=80=9D?= =?UTF-8?q?=20=E2=80=9C=E5=85=AC=E5=BC=80=E2=80=9D=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 1 + app/models/message.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 414ef6d70..251c47d4c 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -189,6 +189,7 @@ class ProjectsController < ApplicationController @project.organization_id = params[:organization_id] @project.user_id = User.current.id @project.project_new_type = params[:project_new_type] + params[:project][:is_public] ? @project.is_public = 1 : @project.is_public = 0 if validate_parent_id && @project.save @project.set_allowed_parent!(params[:project]['parent_id']) if params[:project].has_key?('parent_id') # Add current user as a project member if he is not admin diff --git a/app/models/message.rb b/app/models/message.rb index 37129885f..2c46857f8 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -86,7 +86,7 @@ class Message < ActiveRecord::Base } - safe_attributes 'subject', 'content' + safe_attributes 'subject', 'content', 'reply_id' safe_attributes 'board_id','locked', 'sticky', :if => lambda {|message, user| if message.project From 25a604d7b8d49b9bf5f75d2559a786010c57823c Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 16:59:19 +0800 Subject: [PATCH 75/79] =?UTF-8?q?issue=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/show.html.erb | 118 ++++++++------------------------- db/schema.rb | 13 +++- 2 files changed, 38 insertions(+), 93 deletions(-) diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 2b706be7f..76467275d 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg' %>

    <%= l(:label_issue_edit) %>

    @@ -12,7 +12,6 @@
    <%= link_to image_tag(url_to_avatar(@issue.author), :width => 46, :height => 46), user_path(@issue.author), :class => "ping_dispic" %>
    -

    @@ -21,59 +20,32 @@


    - 由<%= @issue.author %>添加于 <%= format_time(@issue.created_on).html_safe %> +

    <%= @issue.author %> + <%# if @issue.created_on != @issue.updated_on %> + 添加于 <%= format_time(@issue.created_on).html_safe %> + <%# else %> + <%#= format_time(@issue.updated_on).html_safe %> + <%# end %>

    - 'action_menu' %>
    - <% if @issue.description? || @issue.attachments.any? -%> -
    +
    + <% if @issue.description? || @issue.attachments.any? -%> <% if @issue.description? %> <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %> <%= textAreailizable @issue, :description, :attachments => @issue.attachments %> <% end %> -
    - <% end -%> - - +
    + + + <%= link_to_attachment_project @issue, :thumbnails => true %>
    + <% end -%> <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %> -
    -
    - - -<<<<<<< .mine - <%= render :partial => 'attributes_show' %> - - - - - - - - - - - - - - - - - - - - - - - - - - -======= +
    +
    +
    <%= issue_fields_rows do |rows| %>
      @@ -101,18 +73,7 @@ <% end %>
    ->>>>>>> .theirs -<<<<<<< .mine - <%# 该应用是对issue主题内容的引用,对应:to => 'journals#new %> - - - - - - -
    -=======
      <% unless @issue.disabled_core_fields.include?('start_date') %>
    •  开始  : 

      @@ -121,33 +82,6 @@
    • <% end %>
      ->>>>>>> .theirs -<<<<<<< .mine - - - - - - - - - - - - - - - - - - - - - - - - -======= <% unless @issue.disabled_core_fields.include?('estimated_hours') %>
    •  周期  : 

      <%= l_hours(@issue.estimated_hours) %> @@ -172,23 +106,28 @@ <% end %> <%#= render_custom_fields_rows(@issue) %> <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %> ->>>>>>> .theirs -
    - +
    + +
    + <%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'talk_edit fr' if authorize_for('issues', 'edit') %> +
    +
    - <% if @issue.editable? %>
    <%= render :partial => 'edit' %>

    - <%#--引用时不能修改,剥离出引用内容--%> + + + <%= l(:button_submit) %> <% end %> + <%#= submit_tag l(:button_submit) %> <%#= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' ,'preview',{:class => "blue_btn fr mr10"}%> @@ -199,7 +138,6 @@ <%= render :partial => 'changesets', :locals => {:changesets => @changesets} %> <% end %> -
    <% other_formats_links do |f| %> <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> diff --git a/db/schema.rb b/db/schema.rb index 40daded12..b364ed83e 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 => 20150918134804) do +ActiveRecord::Schema.define(:version => 20150924063215) do create_table "activities", :force => true do |t| t.integer "act_id", :null => false @@ -476,6 +476,13 @@ ActiveRecord::Schema.define(:version => 20150918134804) do 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" + t.datetime "created_at", :null => false + t.datetime "updated_at", :null => false + end + create_table "documents", :force => true do |t| t.integer "project_id", :default => 0, :null => false t.integer "category_id", :default => 0, :null => false @@ -895,6 +902,7 @@ ActiveRecord::Schema.define(:version => 20150918134804) do t.datetime "updated_on", :null => false t.boolean "locked", :default => false t.integer "sticky", :default => 0 + t.integer "reply_id" end add_index "messages", ["author_id"], :name => "index_messages_on_author_id" @@ -912,7 +920,6 @@ ActiveRecord::Schema.define(:version => 20150918134804) do t.datetime "created_on" t.integer "comments_count", :default => 0, :null => false t.integer "course_id" - t.datetime "updated_on" end add_index "news", ["author_id"], :name => "index_news_on_author_id" @@ -1324,7 +1331,7 @@ ActiveRecord::Schema.define(:version => 20150918134804) do t.datetime "updated_at", :null => false t.integer "late_penalty", :default => 0 t.integer "absence_penalty", :default => 0 - t.float "system_score", :default => 0.0 + t.integer "system_score" t.boolean "is_test", :default => false end From b66de0ee9fe938fc57b5b5904c549deb1d1123da Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 17:03:43 +0800 Subject: [PATCH 76/79] =?UTF-8?q?issue=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/show.html.erb | 111 ++++++++------------------------- 1 file changed, 26 insertions(+), 85 deletions(-) diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 76467275d..67867e2c6 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor", '/assets/kindeditor/pasteimg' %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>

    <%= l(:label_issue_edit) %>

    @@ -12,6 +12,7 @@
    <%= link_to image_tag(url_to_avatar(@issue.author), :width => 46, :height => 46), user_path(@issue.author), :class => "ping_dispic" %>
    +

    @@ -20,114 +21,53 @@


    -

    <%= @issue.author %> - <%# if @issue.created_on != @issue.updated_on %> - 添加于 <%= format_time(@issue.created_on).html_safe %> - <%# else %> - <%#= format_time(@issue.updated_on).html_safe %> - <%# end %> + 由<%= @issue.author %>添加于 <%= format_time(@issue.created_on).html_safe %>

    + 'action_menu' %>
    -
    - <% if @issue.description? || @issue.attachments.any? -%> + <% if @issue.description? || @issue.attachments.any? -%> +
    <% if @issue.description? %> <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %> <%= textAreailizable @issue, :description, :attachments => @issue.attachments %> <% end %> -
    - + <% end -%> + +
    + + + <%= link_to_attachment_project @issue, :thumbnails => true %>
    <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %> -
    -
    - -
    - <%= issue_fields_rows do |rows| %> -
      -
    •  状态  : 

      +
    +
    -

    <%= @issue.status.name %>

    - -
    - <% unless @issue.disabled_core_fields.include?('assigned_to_id') %> -
  •  指派给  : 

    - <%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %> -
  • - <% end %> -
    - -
      -
    •  优先级  : 

      - <%= @issue.priority.name %> -
    • -
      - <% unless @issue.disabled_core_fields.include?('done_ratio') %> -
    •  % 完成  : 

      - <%= @issue.done_ratio %>% -
    • - <% end %> -
      -
    + + <%= render :partial => 'attributes_show' %> + -
      - <% unless @issue.disabled_core_fields.include?('start_date') %> -
    •  开始  : 

      + <%# 该应用是对issue主题内容的引用,对应:to => 'journals#new %> + + +
      +
    -

    <%= format_date(@issue.start_date) %>

    - - <% end %> -
    - <% unless @issue.disabled_core_fields.include?('estimated_hours') %> -
  •  周期  : 

    - <%= l_hours(@issue.estimated_hours) %> -
  • - <% end %> -
    - -
      - <% unless @issue.disabled_core_fields.include?('due_date') %> -
    •  计划完成  : 

      - <%= format_date(@issue.due_date) ? format_date(@issue.due_date) : "--" %> -
    • - <% end %> -
      - <% unless @issue.disabled_core_fields.include?('fixed_version_id') %> -
    •  目标版本  : 

      - <%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %> -
    • - <% end %> -
      -
    - <% end %> - <%#= render_custom_fields_rows(@issue) %> - <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %> - - -
    - <%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'talk_edit fr' if authorize_for('issues', 'edit') %> -
    -
    + <% if @issue.editable? %>
    <%= render :partial => 'edit' %>

    - - - + <%#--引用时不能修改,剥离出引用内容--%> <%= l(:button_submit) %> <% end %> - <%#= submit_tag l(:button_submit) %> <%#= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' ,'preview',{:class => "blue_btn fr mr10"}%> @@ -138,6 +78,7 @@ <%= render :partial => 'changesets', :locals => {:changesets => @changesets} %> <% end %> +
    <% other_formats_links do |f| %> <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> From a3840ebad9fc6c6df03d3f07d95b485bcd6e2e3f Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Thu, 24 Sep 2015 17:11:39 +0800 Subject: [PATCH 77/79] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=A4=B1=E8=B4=A5=E5=AF=B9=E5=BA=94=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 8f64d6c29..d536b6ed7 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -279,6 +279,34 @@ <% end %> + <% if ma.course_message_type == "HomeworkCommon" && ma.status == 4 %> +
      +
    • + <%= link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %> +
    • +
    • + <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", + user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %> + ">启动作业匿评失败 +
    • +
    • + <%= link_to "作业题目:" + ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class => "#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", + :onmouseover => "message_titile_show($(this),event)", + :onmouseout => "message_titile_hide($(this))" %> +
    • + +
    • <%= time_tag(ma.created_at).html_safe %>
    • +
    + <% end %> + <% if ma.course_message_type == "Poll" %>
    • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
    • From 1e8cb91ab43253f451960f9752ee1b34aefa0586 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 17:18:58 +0800 Subject: [PATCH 78/79] boards --- app/controllers/messages_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 8d2cb63aa..2c7df84cf 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -160,7 +160,7 @@ class MessagesController < ApplicationController @reply.safe_attributes = params[:reply] @reply.content = @quote + @reply.content @reply.subject = "RE: #{@topic.subject}" unless params[:reply][:subject] - @reply.reply_id = @message.author + # @reply.reply_id = params[:id] @topic.children << @reply user_activity = UserActivity.where("act_type='Message' and act_id =#{@topic.id}").first user_activity.updated_at = Time.now From e60119d6d360b7a31d6341b6311cf9c44e15482a Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 25 Sep 2015 08:59:34 +0800 Subject: [PATCH 79/79] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=8C=BF=E5=90=8D?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B6=88=E6=81=AF=E4=B8=AD=E5=AE=9E=E5=90=8D?= =?UTF-8?q?=E8=AF=84=E4=BB=B7=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index d536b6ed7..6ee5f729a 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -359,10 +359,20 @@ <% end %> <% if ma.course_message_type == "StudentWorksScore" %>
        -
      • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
      • +
      • + <% if ma.course_message.reviewer_role == 3 %> + <%=link_to image_tag(url_to_avatar(""), :width => "30", :height => "30") %> + <% else %> + <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %> + <% end %> +
      • - <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", - user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %> + <% if ma.course_message.reviewer_role == 3 %> + 匿名用户 + <% else %> + <%= link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", + user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %> + <% end %> "> <%= ma.status == 0 ? "评阅了您的作品:" : "重新评阅了您的作品:" %>