From 36d7068ba3525d85bc2c8c3fa6c7b827ea93f772 Mon Sep 17 00:00:00 2001 From: yanxd Date: Mon, 23 Dec 2013 16:44:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AD=E5=90=88forum=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/_show_topics.html.erb | 2 +- app/views/forums/show.html.erb | 4 +-- app/views/layouts/base_forums.html.erb | 41 +++++++++++++------------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb index 1aab4af80..61b136ba1 100644 --- a/app/views/forums/_show_topics.html.erb +++ b/app/views/forums/_show_topics.html.erb @@ -5,7 +5,7 @@ <% if memos.any? %> <% memos.each do |topic| %> - +
<%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) %>
<%= link_to image_tag(url_to_avatar(topic.author), :class => "avatar"), user_path(topic.author) %> diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index bb358c99c..8388b6aef 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -14,7 +14,7 @@ <% end %> -
+

<%= f.text_field :subject, :required => true, :size => 95 %>

<%= f.text_area :content, :required => true, :id => 'editor02' %>

@@ -24,7 +24,7 @@ <%= 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;' %>

+ <%= link_to l(:button_cancel), "#", :onclick => '$("#add-memo").hide(); return false;' %>
<% end %> <% end %> diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index cd53d6140..48f55244e 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -1,4 +1,3 @@ - @@ -14,7 +13,6 @@ <%= heads_for_theme %> <%= javascript_include_tag "ckeditor/ckeditor.js" %> <%= call_hook :view_layouts_base_html_head %> - <%= yield :header_tags -%> @@ -26,8 +24,8 @@
- - + + - - + +
软件项目托管社区<%= l(:label_user_location) %> : 软件项目托管社区<%= l(:label_user_location) %> :
<%= form_tag(:controller => 'forums', :action => "search_memo", :id => params[:id], :method => :get) do %> @@ -39,9 +37,8 @@
<%= link_to "forge.trustie.net/forums", forums_path %>

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

<%= link_to "forge.trustie.net/forums", forums_path %>

<%=link_to l(:label_home),home_path %> > <%=link_to '公共贴吧', :controller => 'forums', :action => 'index' %> > <%=link_to @forum.name, forum_path(@forum) %>
@@ -49,24 +46,27 @@
-
<%= @forum.name %>
-
<%= textilizable @forum.description %>
+
<%= @forum.name %>
+
<%= textilizable @forum.description %>
创建人信息
-
- <%= image_tag(url_to_avatar(@forum.creator), :class =>'vatar-size') %> - <%=link_to @forum.creator.show_name, user_path(@forum.creator) %> -
- <%= link_to l(:label_user_watcher)+"("+User.watched_by(@forum.creator.id).count.to_s+")" ,:controller=>"users", :action=>"user_watchlist", :id => @forum.creator.id %> - <%= link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@forum.creator.watcher_users(@forum.creator.id).count.to_s+")", :controller=>"users", :action=>"user_fanslist", :id => @forum.creator.id %>
 -
+
+ <%= image_tag(url_to_avatar(@forum.creator), :class =>'vatar-size') %> + + <%=link_to @forum.creator.show_name, user_path(@forum.creator) %> +
+ <%= link_to l(:label_user_watcher)+"("+User.watched_by(@forum.creator.id).count.to_s+")" ,:controller=>"users", :action=>"user_watchlist", :id => @forum.creator.id %> + <%= link_to l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)+"("+@forum.creator.watcher_users(@forum.creator.id).count.to_s+")", :controller=>"users", :action=>"user_fanslist", :id => @forum.creator.id %> +
+ +
- <% if User.current.logged? || User.current.admin? %> + <% if User.current.logged? || User.current.admin? %>
<%= render :partial => 'tags/tag', :locals => {:obj => @forum,:object_flag => "5"}%>
- <% end %> + <% end %>
@@ -78,7 +78,7 @@
<%= render :partial => 'layouts/base_footer'%> - <%= debug(params) if Rails.env.development? %> + <%= debug(params) if Rails.env.development? %> - <%= call_hook :view_layouts_base_body_bottom %> + + <%= call_hook :view_layouts_base_body_bottom %>