From a3addb517c7a894089d4d2b7755be106a0be527a Mon Sep 17 00:00:00 2001 From: fanqiang <316257774@qq.com> Date: Mon, 12 Aug 2013 20:43:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=97=E8=A1=A8=E4=B8=AD?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=A1=86=E4=BD=8D=E7=BD=AE=EF=BC=8C=E7=95=99?= =?UTF-8?q?=E8=A8=80=E5=88=A0=E9=99=A4=E6=97=B6=E6=8F=90=E7=A4=BA=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_bid_show.html.erb | 4 +- app/views/bids/_history.html.erb | 2 +- app/views/bids/index.html.erb | 28 ++++++----- app/views/news/index.html.erb | 6 ++- app/views/projects/index.html.erb | 46 ++++++++++--------- app/views/users/show.html.erb | 20 ++++---- app/views/words/_message.html.erb | 2 +- .../stylesheets/application.css | 6 +-- 8 files changed, 63 insertions(+), 51 deletions(-) diff --git a/app/views/bids/_bid_show.html.erb b/app/views/bids/_bid_show.html.erb index 1732a02f..397d636f 100644 --- a/app/views/bids/_bid_show.html.erb +++ b/app/views/bids/_bid_show.html.erb @@ -2,7 +2,7 @@ <% bids.each do |bid|%> - +
diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb index 5b594ee9..c0b5bca8 100644 --- a/app/views/bids/index.html.erb +++ b/app/views/bids/index.html.erb @@ -1,20 +1,26 @@ -<% if User.current.logged? %> -
-
- <%= toggle_link l(:button_new_bid), 'put-bid-form', {:focus => 'project_id'} %> -
<% end %> <%= form_tag(bids_path, :method => :get) do %>
- <%=l(:label_bid_plural)%> -
-<%= text_field_tag 'name', params[:name], :size => 30 %> -<%= submit_tag l(:label_search), :class => "small", :name => nil %> -
+
<%= link_to image_tag(url_to_avatar(bid.author), :class => 'avatar'), :class => "avatar" %> @@ -26,7 +26,7 @@
- +
diff --git a/app/views/bids/_history.html.erb b/app/views/bids/_history.html.erb index a64a28f3..c33013d9 100644 --- a/app/views/bids/_history.html.erb +++ b/app/views/bids/_history.html.erb @@ -50,7 +50,7 @@ + :remote => true, :method => 'delete', :class => "delete", :confirm => l(:text_are_you_sure), :title => l(:button_delete)) if remove_allowed || journal.user_id == User.current.id %>
<%= bid.description%>
<%= link_to(image_tag('comment.png'), {:controller => 'bids', :action => 'new', :id => bid, :journal_id => journal}, :remote => true, :method => 'post', :title => l(:button_quote))%> <%= link_to(image_tag('delete.png'), {:controller => 'bids', :action => 'destroy', :object_id => journal, :id => bid},:confirm => l(:label_delete_confirm), - :remote => true, :method => 'delete', :class => "delete", :title => l(:button_delete)) if remove_allowed || journal.user_id == User.current.id %>
+ + + + + + +
<%= l(:label_bid_plural)%><% if User.current.logged? %> + +
+ <%= toggle_link l(:button_new_bid), 'put-bid-form', {:focus => 'project_id'} %> +
+ <% end %>		 +
+ <%= text_field_tag 'name', params[:name], :size => 30 %> + <%= submit_tag l(:label_search), :class => "small", :name => nil %> +
<%end%> - <% if User.current.logged? %>
-

<%= pagination_links_full @news_pages %>

+ <% other_formats_links do |f| %> <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %> diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb index a2fd0d88..c318b507 100644 --- a/app/views/projects/index.html.erb +++ b/app/views/projects/index.html.erb @@ -1,26 +1,26 @@ <% content_for :header_tags do %> - <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %> +<%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %> <% end %> - - - - <%= form_tag(projects_path, :method => :get) do %>
- <%=l(:label_project_plural)%> - - <%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %> - -
-<%= text_field_tag 'name', params[:name], :size => 30 %> -<%= submit_tag l(:label_search), :class => "small", :name => nil %> + + + + + + + +
<%= l(:label_project_plural)%><%= link_to(l(:label_project_new), {:controller => 'projects', :action => 'new'}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %> +
+ <%= text_field_tag 'name', params[:name], :size => 30 %> + <%= submit_tag l(:label_search), :class => "small", :name => nil %> +
-
-<% end %> +<%end%>
-<%= render_project_hierarchy(@projects)%> + <%= render_project_hierarchy(@projects)%>