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/50] 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 image_tag(url_to_avatar(forum.creator),:width=>75,:height => 75 ),user_path( forum.creator) %> +
+
+
+ + <%= link_to forum.name, forum_path(forum),:class=>"f16 linkBlue" %> +
+
描述<%= textAreailizable forum.description%>
+
创建者：<%= forum.creator.name %>
+
创建时间：<%= format_date(forum.created_at) %>
+
+
+
+ + <%= 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.subject%>
+
<%= 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 %> - -
- <%#= form_tag(:controller => 'forums', :action => "search_forum", :method => :get) do %> - <%#= text_field_tag 'name', params[:name], :size => 20 %> - <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %> - <%# 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) %> + +
+
+
"><%= @forum.name%>
+
吧主：<%= @forum.creator.name%>
+
回答：<%= @forum.topic_count%> 帖子：<%= @forum.memo_count%>
+
+
+
<%= @forum.description%> + + <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%> + +
+
+
+ <%= 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) %> : -
- <%#= form_tag(:controller => 'forums', :action => "search_memo", :id => params[:id], :method => :get) do %> - <%#= text_field_tag 'name', params[:name], :size => 20 %> - <%#= hidden_field_tag 'forum_id', params[:id] %> - <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %> - <%# end %> -
-
<%= 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) %> +
+
+
主题: <%= @memo.subject%>
+
<%= @memo.author.name%>
+
<%= 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 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 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/50] =?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/50] =?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/50] =?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%>
    创建者：<%= forum.creator.name %>
    创建时间：<%= format_date(forum.created_at) %>
    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/50] =?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/50] =?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/50] =?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/50] =?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/50] =?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/50] =?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/50] =?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|%> <%= tag %> + <%if forum.creator.id == User.current.id%> × + <% 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.topic_count%> 帖子：<%= @forum.memo_count%>
    -
    <%= @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 553c1396dd2ee5822ff968283bd2edf8b5c9d0ce Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Mon, 21 Sep 2015 15:31:00 +0800 Subject: [PATCH 20/50] =?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' %>
    diff --git a/app/views/files/_tag_yun.html.erb b/app/views/files/_tag_yun.html.erb index 9db34ece4..d4bdc57dc 100644 --- a/app/views/files/_tag_yun.html.erb +++ b/app/views/files/_tag_yun.html.erb @@ -3,7 +3,7 @@ <% if tag_name && tag_name == k%> <%= k%>×<%= v%> <% else%> - <%= k%>×<%= v%> + <%= k%>×<%= v%> <% end%> <% end%> <% end%> \ No newline at end of file diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index ded576f12..5d3e60671 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -229,6 +229,9 @@ var ele; //当前双击的链接 var tagId; //标签的id var taggableType; //被标签的类型 + //这里renameTag有两种情况，一种是改变某个资源的tag名称。如果其他资源也有这个tag。则新增一个改变后的tag名 + //第二种是改变某个tag名称。其他所有的资源如果拥有这个tag。那么对应的tag名也要改掉。 + //目前这两种依据 的来源就是 是否 传了参数 id。如果有id。就指定了资源id，就是第一种情况。如果没有id。就是第二种情况 function rename_tag(domEle,name,id,type){ if(domEle.children().get(0) != undefined ){ //已经是编辑框的情况下不要动 return; @@ -256,14 +259,10 @@ }else{ //否则就要更新tag名称了 if(confirm("是否将标签改为 "+ $("#renameTagName").val().trim())){ - $.post( - '<%= update_tag_name_path %>', - {"taggableId":tagId,"taggableType":taggableType,"tagName":tagName,"renameName":$("#renameTagName").val().trim()} -// function(data){ -// ele.parent().css("border",""); -// ele.parent().html(tagNameHtml); -// } - ) + $.post( + '<%= update_tag_name_path %>', + {"taggableId": tagId, "taggableType": taggableType, "tagName": tagName, "renameName": $("#renameTagName").val().trim(),"courseId":<%= @course.id%>} + ) }else{ ele.parent().css("border",""); ele.parent().html(tagNameHtml); diff --git a/app/views/tags/update_tag_name.js.erb b/app/views/tags/update_tag_name.js.erb index b72b0c33f..276c050b8 100644 --- a/app/views/tags/update_tag_name.js.erb +++ b/app/views/tags/update_tag_name.js.erb @@ -14,18 +14,26 @@ $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/tag_project $('#tags_name2').val(""); <% elsif @obj_flag == '6'%> <%if @course%> -$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty(); -$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list', - :locals => {:obj => @obj,:object_flag => @obj_flag,:select_tag_name => @select_tag_name}) %>'); + <% if @obj %> + $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty(); + $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list', + :locals => {:obj => @obj,:object_flag => @obj_flag,:select_tag_name => @select_tag_name}) %>'); + $("#tags_name_<%=@obj.id%>").val(""); + $("#add_tag_<%=@obj.id%>").hide(); + <% else %> + $("#course_list").html("<%= escape_javascript(render :partial => 'files/course_list', + :locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments}) %>"); + <% end %> $("#files_tag").html("<%= escape_javascript(render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @select_tag_name}) %>"); <%else%> $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty(); $("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/course_attachment_tag_name', :locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>'); -<%end%> - $("#tags_name_<%=@obj.id%>").val(""); $("#add_tag_<%=@obj.id%>").hide(); +<%end%> + + <% elsif @obj_flag == '9'%> $('#tags_show').html('<%= escape_javascript(render :partial => 'tags/new_tag_name', :locals => {:obj => @obj,:non_list_all => false,:object_flag => @obj_flag}) %>'); diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index d810c4891..789fba426 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -551,7 +551,7 @@ a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px .vi_zan{color:#28be6c;} .newwork_btn a{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; display:block; text-align:center; float:right;} .newwork_btn a:hover{ background:#329cbd;} -.files_tag{ width:670px; height:22px; overflow:hidden; margin-bottom:10px;} +.files_tag{ width:670px; min-height:22px;margin-bottom:10px;}/* overflow:hidden; */ a.files_tag_icon{ background:#e2f3f9; color:#54aeca; border:1px solid #bbe2ef; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px; } a.files_tag_select{ background:#64bdd9; color:#fff; border:1px solid #64bdd9; padding:1px 10px; float:left; margin-right:10px;margin-bottom:10px;} From 814ad5a3659474c06cfbc77ed7ba1196cb8b4988 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 22 Sep 2015 16:44:12 +0800 Subject: [PATCH 26/50] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E6=A1=86=E7=9A=84=E5=AE=BD=E5=BA=A6=E5=92=8C=E7=88=B6?= =?UTF-8?q?=E5=85=83=E7=B4=A0=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=E3=80=82?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E7=94=B1=E4=BA=8E=E7=88=B6=E5=85=83=E7=B4=A0?= =?UTF-8?q?=E6=9C=89padding=E5=B1=9E=E6=80=A7=E3=80=82=E9=A1=B6=E9=83=A8?= =?UTF-8?q?=E7=9A=84=E6=A0=87=E7=AD=BE=E6=A0=8F=E5=AE=BD=E5=BA=A6=E4=B8=8D?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/index.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index 5d3e60671..537a7a0dc 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -242,7 +242,7 @@ ele = domEle; tagId = id; taggableType = type; - domEle.html(''); + domEle.html(''); domEle.parent().css("border","1px solid #ffffff"); $("#renameTagName").focus(); } From 9ae745a27b46126c2fc6a6b6578d99cad28254b4 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 22 Sep 2015 16:44:45 +0800 Subject: [PATCH 27/50] =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_tag_yun.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/files/_tag_yun.html.erb b/app/views/files/_tag_yun.html.erb index d4bdc57dc..b2c7ab79f 100644 --- a/app/views/files/_tag_yun.html.erb +++ b/app/views/files/_tag_yun.html.erb @@ -3,7 +3,7 @@ <% if tag_name && tag_name == k%> <%= k%>×<%= v%> <% else%> - <%= k%>×<%= v%> + <%= k%>×<%= v%> <% end%> <% end%> <% end%> \ No newline at end of file From 361b391d3cc67df867892d0a8e0059eb7e43fe66 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 22 Sep 2015 17:18:10 +0800 Subject: [PATCH 28/50] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/index.html.erb | 6 +++--- app/views/forums/show.html.erb | 4 +++- app/views/memos/show.html.erb | 6 +++--- public/stylesheets/new_user.css | 7 +++++++ 4 files changed, 16 insertions(+), 7 deletions(-) diff --git a/app/views/forums/index.html.erb b/app/views/forums/index.html.erb index 87fa0657f..22f460990 100644 --- a/app/views/forums/index.html.erb +++ b/app/views/forums/index.html.erb @@ -1,4 +1,5 @@ <%= javascript_include_tag 'new_user' %> +<%= stylesheet_link_tag 'public'%>
    @@ -107,7 +115,7 @@
    确定
    -
    取消或
    +
    取消或
    <% end %> From 7663db693a3919a7d5f64588901704e48e40218a Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 22 Sep 2015 17:30:54 +0800 Subject: [PATCH 30/50] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E5=8F=96=E6=B6=88=20=EF=BC=8C?= =?UTF-8?q?=E6=B8=85=E7=A9=BA=E5=8E=9F=E6=9D=A5=E8=BE=93=E5=85=A5=E7=9A=84?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/show.html.erb | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 169b35d39..6a061d2b3 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -73,6 +73,14 @@ } return true; } + + function create_cancle(){ + $('#create_memo_div').slideToggle(); + $('#create_memo_btn').slideToggle(); + $('#memo_subject').val(''); + $('#memo_content').val('') + $('#error').html('').hide(); + }
    <% end %> From d6c763edb08ee151128e58b340d6d3cae6b96571 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 23 Sep 2015 09:11:29 +0800 Subject: [PATCH 31/50] =?UTF-8?q?=E5=8F=96=E6=B6=88=20=20=E5=92=8C=20?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=20=E8=B4=B4=E5=90=A7=E7=9A=84=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=83=BD=E4=BC=9A=E6=B8=85=E7=A9=BA=E8=B4=B4=E5=90=A7?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=20=E8=AE=BA=E5=9D=9B=E6=A0=87=E9=A2=98?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E9=95=BF=E5=BA=A6=E9=99=90=E5=AE=9A160?= =?UTF-8?q?=E3=80=82=E6=98=AF=E6=B1=89=E5=AD=97=E7=9A=84=E8=AF=9D=E5=8F=AA?= =?UTF-8?q?=E8=83=BD=E8=BE=93=E5=85=A580=E4=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/forum.rb | 2 +- app/views/forums/_post_banner.html.erb | 2 +- app/views/forums/index.html.erb | 21 +++++++++++++++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/models/forum.rb b/app/models/forum.rb index 530639f81..9fa1b7dfd 100644 --- a/app/models/forum.rb +++ b/app/models/forum.rb @@ -14,7 +14,7 @@ class Forum < ActiveRecord::Base 'sticky', 'locked' validates_presence_of :name, :creator_id, :description - validates_length_of :name, maximum: 50 + validates_length_of :name, maximum: 160 #validates_length_of :description, maximum: 255 validates :name, :uniqueness => true after_destroy :delete_kindeditor_assets diff --git a/app/views/forums/_post_banner.html.erb b/app/views/forums/_post_banner.html.erb index 2ea128e9d..797b43245 100644 --- a/app/views/forums/_post_banner.html.erb +++ b/app/views/forums/_post_banner.html.erb @@ -29,5 +29,5 @@
    新建贴吧
    + 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 37/50] =?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 @@
    -
    "><%= @forum.name%>
    +
    " style="word-break: break-all; word-wrap:break-word;"><%= @forum.name%>
    吧主：<%= @forum.creator.name%>
    回答：<%= @forum.memo_count %> 帖子：<%=@forum.topic_count%>
    @@ -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 43/50] =?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 c8d07dedf6fb1cd5d03cb14f434ac75a239bf017 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Wed, 23 Sep 2015 17:09:21 +0800 Subject: [PATCH 44/50] =?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%>
    主题: <%= @memo.subject%>
    <%= @memo.author.name%>
    <%= 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 b9ff46f8d01a033adcd39367f78a6a1e7abc6440 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 24 Sep 2015 09:40:53 +0800 Subject: [PATCH 45/50] =?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 44b93af3074104cc31807b5ab516423ce77b8c3b Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 24 Sep 2015 09:52:57 +0800 Subject: [PATCH 46/50] =?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 38a24e8fe4b95061a35f492a95e1b01644f12bde Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 24 Sep 2015 12:17:14 +0800 Subject: [PATCH 47/50] =?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 48/50] =?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 2aa52bfc59e54b8f9387322e2233cab723b436eb Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 24 Sep 2015 16:02:15 +0800 Subject: [PATCH 49/50] =?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 6b98b2a273601cda9f04cf3c38ad13fa895dc4c9 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 24 Sep 2015 16:17:50 +0800 Subject: [PATCH 50/50] =?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 @@
    " style="word-break: break-all; word-wrap:break-word;"><%= @forum.name%>
    吧主：<%= @forum.creator.name%>
    -
    回答：<%= @forum.memo_count %> 帖子：<%=@forum.topic_count%>
    +
    回答：<%= @forum.memo_count %> 帖子：<%=@forum.topic_count%>
    <%= @forum.description%> @@ -182,12 +182,12 @@
    - +
    回答
    - +
    发帖