| <%= link_to image_tag(url_to_avatar(bid.author), :class => 'avatar'), :class => "avatar" %> | @@ -26,7 +26,7 @@ | |||||||||||||||||||||||||||||||||||||||
|
-
- <% end %>
<%= form_tag(bids_path, :method => :get) do %>
- <%= toggle_link l(:button_new_bid), 'put-bid-form', {:focus => 'project_id'} %>
-
- <%=l(:label_bid_plural)%>
-
<%end%>
-
<% if User.current.logged? %>
-<%= text_field_tag 'name', params[:name], :size => 30 %>
-<%= submit_tag l(:label_search), :class => "small", :name => nil %>
-
+
- <%= 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 a2fd0d88e..c318b5077 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) %>
-
-
-<% end %>
+<%end%>
-<%= text_field_tag 'name', params[:name], :size => 30 %>
-<%= submit_tag l(:label_search), :class => "small", :name => nil %>
+
-
-<%= render_project_hierarchy(@projects)%>
+ <%= render_project_hierarchy(@projects)%>
@@ -31,20 +31,22 @@
<% if User.current.logged? %>
-<%= l(:label_my_projects) %> + <%= l(:label_my_projects) %> <% end %> <% other_formats_links do |f| %> - <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> +<%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> <% end %> <% content_for :sidebar do %> - <%= form_tag({}, :method => :get) do %> -<%= l(:label_project_plural) %>- -<%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %> - <% end %> +<%= form_tag({}, :method => :get) do %> +<%= l(:label_project_plural) %>+ ++ <%= submit_tag l(:button_apply), :class => 'button-small', :name => nil %> + +<% end %> <% end %> <% html_title(l(:label_project_plural)) -%> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 8bdf06654..bc9280184 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -11,10 +11,10 @@ <% case e.act_type %> <% when 'Bid' %> <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_bid_plural)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> |
<% else %>
- <%= link_to(h(e.user_id), user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_bid_plural)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> |
+ <%= link_to(h(e.user), user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_bid_plural)}##{act.id}:#{act.name}"), respond_path(e.act_id) %> |
<% end %>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> |
<% else %>
- <%= link_to(h(e.user_id), user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> |
+ <%= link_to(h(e.user), user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{act.issue.tracker} ##{act.issue.id}: #{act.issue.subject}"), {:controller => 'issues', :action => 'show', :id => act.issue.id, :anchor => "change-#{act.id}"} %> |
<% end %>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title(act.title), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %> |
<% else %>
- <%= link_to(h(e.user_id), user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title(act.title), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %> |
+ <%= link_to(h(e.user), user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title(act.title), {:controller => 'repositories', :action => 'revision', :id => act.repository.project, :repository_id => act.repository.identifier_param, :rev => act.identifier} %> |
<% end %>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), {:controller => 'messages', :action => 'show', :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> |
<% else %>
- <%= link_to(h(e.user_id), user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), {:controller => 'messages', :action => 'show', :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> |
+ <%= link_to(h(e.user), user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{act.board.name}: #{act.subject}"), {:controller => 'messages', :action => 'show', :board_id => act.board_id}.merge(act.parent_id.nil? ? {:id => act.id} : {:id => act.parent_id, :r => act.id, :anchor => "message-#{act.id}"}) %> |
<% end %>
<%= link_to("#{l(:label_i)}", user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> |
<% else %>
- <%= link_to(h(e.user_id), user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> |
+ <%= link_to(h(e.user), user_path(e.user_id)) %><%= l(:label_new_activity) %> <%= link_to format_activity_title("#{l(:label_news)}: #{act.title}"), {:controller => 'news', :action => 'show', :id => act.id} %> |
<% end %>
<%= format_time journal.created_on %> |
<%= link_to(image_tag('comment.png'), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true,
:method => 'post', :title => l(:button_quote))%><%= link_to(image_tag('delete.png'), {:controller => 'words', :action => 'destroy', :object_id => journal, :user_id => user},
- :remote => true, :method => 'delete', :class => "delete", :title => l(:button_delete)) if remove_allowed || journal.jour_id == User.current.id %> |
+ :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "delete", :title => l(:button_delete)) if remove_allowed || journal.jour_id == User.current.id %>
|
|||||||||||||||||||||||