Index: app/views/messages/show.html.erb IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- app/views/messages/show.html.erb (revision 6d0770c6d6fc57fb53cac49876f122485b20f47b) +++ app/views/messages/show.html.erb (revision fc236075754c3f9f7180269a1c48aa06f608e238) @@ -22,16 +22,18 @@ ) if @message.destroyable_by?(User.current) %> +
-

<%= avatar(@topic.author, :size => "24") %><%= @topic.subject %>

+

<%= avatar(@topic.author, :size => "24") %><%= @topic.subject %>

- -
+
-

<%= authoring @topic.created_on, @topic.author %>

+

<%= authoring @topic.created_on, @topic.author %>

-
-<%= textilizable(@topic, :content) %> -
-<%= link_to_attachments @topic, :author => false %> -
-
+
+ <%= textilizable(@topic, :content) %> +
+ <%= link_to_attachments @topic, :author => false %> +
+
+
+ <% unless @replies.empty? %>

<%= l(:label_reply_plural) %> (<%= @reply_count %>)

Index: app/views/news/_news.html.erb IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- app/views/news/_news.html.erb (revision ed8793d4a2c31d9333e94fc9834ee6c0f7cd35e9) +++ app/views/news/_news.html.erb (revision 6d0770c6d6fc57fb53cac49876f122485b20f47b) @@ -1,6 +1,9 @@

<%= link_to_project(news.project) + ': ' unless @project %> -<%= link_to news.title, news_path(news) %> + <%= link_to news.title, news_path(news) %> -<% if news.comments_count > 0 %>(<%= l(:label_x_comments, :count => news.comments_count) %>)<% end %> + <% if news.comments_count > 0 %> + (<%= l(:label_x_comments, :count => news.comments_count) %>) + <% end %> -
+
-<% unless news.summary.blank? %><%= news.summary %>
<% end %> + <% unless news.summary.blank? %><%= news.summary %>
+ <% end %> -<%= authoring news.created_on, news.author %>

+ <%= authoring news.created_on, news.author %>

\ No newline at end of file Index: app/views/news/index.html.erb IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- app/views/news/index.html.erb (revision ed8793d4a2c31d9333e94fc9834ee6c0f7cd35e9) +++ app/views/news/index.html.erb (revision 6d0770c6d6fc57fb53cac49876f122485b20f47b) @@ -1,52 +1,54 @@
-<%= link_to(l(:label_news_new), - new_project_news_path(@project), - :class => 'icon icon-add', - :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %> -<%= watcher_link(@project.enabled_module('news'), User.current) if @project && User.current.logged? %> + <%= link_to(l(:label_news_new), + new_project_news_path(@project), + :class => 'icon icon-add', + :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %> + <%= watcher_link(@project.enabled_module('news'), User.current) if @project && User.current.logged? %>
-

<%=l(:label_news_plural)%>

+

<%= l(:label_news_plural) %>

<% if @newss.empty? %> -

<%= l(:label_no_data) %>

+

<%= l(:label_no_data) %>

<% else %> -<% @newss.each do |news| %> + <% @newss.each do |news| %> +
-
-
-

<%= avatar(news.author, :size => "24") %><%= link_to_project(news.project) + ': ' unless news.project == @project %> - <%= link_to h(news.title), news_path(news) %> - <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %> -

<%= authoring news.created_on, news.author %>

- -
-
- <%= textilizable(news, :description) %> -
-
+
+
+

<%= avatar(news.author, :size => "24") %><%= link_to_project(news.project) + ': ' unless news.project == @project %> + <%= link_to h(news.title), news_path(news) %> + <%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %> +

<%= authoring news.created_on, news.author %>

+ +
+
+ <%= textilizable(news, :description) %> +
+
+
-<% end %> + <% end %> <% end %> <%= pagination_links_full @news_pages %> <% other_formats_links do |f| %> - <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %> + <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %> <% end %> <% content_for :header_tags do %> - <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> - <%= stylesheet_link_tag 'scm' %> + <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %> + <%= stylesheet_link_tag 'scm' %> <% end %> <% html_title(l(:label_news_plural)) -%> Index: app/views/news/show.html.erb IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- app/views/news/show.html.erb (revision ed8793d4a2c31d9333e94fc9834ee6c0f7cd35e9) +++ app/views/news/show.html.erb (revision fc236075754c3f9f7180269a1c48aa06f608e238) @@ -1,66 +1,71 @@
-<%= watcher_link(@news, User.current) %> -<%= link_to(l(:button_edit), - edit_news_path(@news), - :class => 'icon icon-edit', - :accesskey => accesskey(:edit), - :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %> -<%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %> + <%= watcher_link(@news, User.current) %> + <%= link_to(l(:button_edit), + edit_news_path(@news), + :class => 'icon icon-edit', + :accesskey => accesskey(:edit), + :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %> + <%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
-

<%= avatar(@news.author, :size => "24") %><%=h @news.title %>

+ <% if authorize_for('news', 'edit') %> - <% end %> -

<% unless @news.summary.blank? %><%= @news.summary %>
<% end %> -<%= authoring @news.created_on, @news.author %>

+
+

<%= avatar(@news.author, :size => "24") %><%= h @news.title %>

+

+ <% unless @news.summary.blank? %><%= @news.summary %>
+ <% end %> + <%= authoring @news.created_on, @news.author %>

-
-<%= textilizable(@news, :description) %> -
-<%= link_to_attachments @news %> +
+ <%= textilizable(@news, :description) %> +
+ <%= link_to_attachments @news %> -
+
+
-

<%= l(:label_comment_plural) %>

-<% @comments.each do |comment| %> - <% next if comment.new_record? %> -
- <%= link_to_if_authorized l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment}, - :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, - :title => l(:button_delete), - :class => 'icon-only icon-del' %> -
-

<%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %>

-
- <%= textilizable(comment.comments) %> -
-<% end if @comments.any? %> +

<%= l(:label_comment_plural) %>

+ <% @comments.each do |comment| %> + <% next if comment.new_record? %> +
+ <%= link_to_if_authorized l(:button_delete), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment}, + :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, + :title => l(:button_delete), + :class => 'icon-only icon-del' %> +
+

<%= avatar(comment.author, :size => "24") %><%= authoring comment.created_on, comment.author %>

+
+ <%= textilizable(comment.comments) %> +
+ <% end if @comments.any? %>
<% if @news.commentable? %> -

<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>

-<%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %> -
- <%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %> - <%= wikitoolbar_for 'comment_comments' %> -
-

<%= submit_tag l(:button_add) %>

-<% end %> +

<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>

+ <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %> +
+ <%= text_area 'comment', 'comments', :cols => 80, :rows => 15, :class => 'wiki-edit' %> + <%= wikitoolbar_for 'comment_comments' %> +
+

<%= submit_tag l(:button_add) %>

+ <% end %> <% end %> <% html_title @news.title -%> <% content_for :header_tags do %> - <%= stylesheet_link_tag 'scm' %> + <%= stylesheet_link_tag 'scm' %> <% end %> Index: public/stylesheets/application.css IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- public/stylesheets/application.css (revision ed8793d4a2c31d9333e94fc9834ee6c0f7cd35e9) +++ public/stylesheets/application.css (revision 6d0770c6d6fc57fb53cac49876f122485b20f47b) @@ -10,6 +10,7 @@ pre, code {font-family: Consolas, Menlo, "Liberation Mono", Courier, monospace;} /***** Layout *****/ +/***** Layout *****/ #wrapper {background: white;overflow: hidden;} #top-menu {background: #3E5B76; color: #fff; height:1.8em; font-size: 0.8em; padding: 2px 2px 0px 6px;}