##// END OF EJS Templates
jro_apps » redmine
RSS
contextual links redesign...
Jean-Philippe Lang -
r90:236c735d08c0
parent child
Show More
Show file before | Show file after | Hide comments
1 NO CONTENT: new file 100644, binary diff hidden
NO CONTENT: new file 100644, binary diff hidden
Show file before | Show file after | Hide comments
1 NO CONTENT: new file 100644, binary diff hidden
NO CONTENT: new file 100644, binary diff hidden
Show file before | Show file after | Hide comments
1 NO CONTENT: new file 100644, binary diff hidden
NO CONTENT: new file 100644, binary diff hidden
Show file before | Show file after | Hide comments
@@ -1,3 +1,7
1 <div class="contextual">
2 <%= link_to l(:label_project_new), {:controller => 'projects', :action => 'add'}, :class => 'pic picAdd' %>
3 </div>
4
1 <h2><%=l(:label_project_plural)%></h2>
5 <h2><%=l(:label_project_plural)%></h2>
2
6
3 <table class="listTableContent">
7 <table class="listTableContent">
@@ -25,6 +29,4
25 </table>
29 </table>
26
30
27 <p><%= pagination_links_full @project_pages %>
31 <p><%= pagination_links_full @project_pages %>
28 [ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]</p>
32 [ <%= @project_pages.current.first_item %> - <%= @project_pages.current.last_item %> / <%= @project_count %> ]</p> No newline at end of file
29
30 <p><%= link_to ('&#187; ' + l(:label_project_new)), :controller => 'projects', :action => 'add' %></p> No newline at end of file
Show file before | Show file after | Hide comments
@@ -1,3 +1,7
1 <div class="contextual">
2 <%= link_to l(:label_auth_source_new), {:action => 'new'}, :class => 'pic picAdd' %>
3 </div>
4
1 <h2><%=l(:label_auth_source_plural)%></h2>
5 <h2><%=l(:label_auth_source_plural)%></h2>
2
6
3 <table class="listTableContent">
7 <table class="listTableContent">
@@ -25,6 +29,3
25 </table>
29 </table>
26
30
27 <%= pagination_links_full @auth_source_pages %>
31 <%= pagination_links_full @auth_source_pages %>
28 <br />
29 <%= link_to '&#187; ' + l(:label_auth_source_new), :action => 'new' %>
30
Show file before | Show file after | Hide comments
@@ -1,34 +1,22
1 <div class="contextual">
2 <%= link_to_if_authorized l(:button_edit), {:controller => 'documents', :action => 'edit', :id => @document}, :class => 'pic picEdit' %>
3 <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy', :id => @document}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
4 </div>
5
1 <h2><%= @document.title %></h2>
6 <h2><%= @document.title %></h2>
2
7
3 <p><em><%= @document.category.name %><br />
8 <p><em><%= @document.category.name %><br />
4 <%= format_date @document.created_on %></em></p>
9 <%= format_date @document.created_on %></em></p>
5 <%= textilizable @document.description %>
10 <%= textilizable @document.description %>
6
7
8 <table width="100%">
9 <tr><td><%= link_to_if_authorized l(:button_edit), :controller => 'documents', :action => 'edit', :id => @document %></td>
10 <td align="right">
11 <% if authorize_for('documents', 'destroy') %>
12 <%= start_form_tag({ :controller => 'documents', :action => 'destroy', :id => @document } ) %>
13 <%= submit_tag l(:button_delete) %>
14 <%= end_form_tag %>
15 <% end %>
16 </td></tr>
17 </table>
18 <br />
11 <br />
19
12
20 <h3><%= l(:label_attachment_plural) %></h3>
13 <h3><%= l(:label_attachment_plural) %></h3>
21 <ul>
14 <ul>
22 <% for attachment in @attachments %>
15 <% for attachment in @attachments %>
23 <li>
16 <li>
24 <% if authorize_for('documents', 'destroy_attachment') %>
17 <div class="contextual">
25 <div style="float:right;padding:6px;">
18 <%= link_to_if_authorized l(:button_delete), {:controller => 'documents', :action => 'destroy_attachment', :id => @document, :attachment_id => attachment}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
26 <%= start_form_tag({ :controller => 'documents', :action => 'destroy_attachment', :id => @document, :attachment_id => attachment } ) %>
19 </div>
27 <%= submit_tag l(:button_delete), :class => 'button-small' %>
28 <%= end_form_tag %>
29 </div>
30 <% end %>
31
32 <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>
20 <%= link_to attachment.filename, :action => 'download', :id => @document, :attachment_id => attachment %>
33 (<%= human_size attachment.filesize %>)<br />
21 (<%= human_size attachment.filesize %>)<br />
34 <em><%= attachment.author.display_name %>, <%= format_date(attachment.created_on) %></em><br />
22 <em><%= attachment.author.display_name %>, <%= format_date(attachment.created_on) %></em><br />
Show file before | Show file after | Hide comments
@@ -1,3 +1,7
1 <div class="contextual">
2 <%= link_to l(:label_issue_status_new), {:action => 'new'}, :class => 'pic picAdd' %>
3 </div>
4
1 <h2><%=l(:label_issue_status_plural)%></h2>
5 <h2><%=l(:label_issue_status_plural)%></h2>
2
6
3 <table class="listTableContent">
7 <table class="listTableContent">
@@ -22,7 +26,4
22 <% end %>
26 <% end %>
23 </table>
27 </table>
24
28
25 <%= pagination_links_full @issue_status_pages %>
29 <%= pagination_links_full @issue_status_pages %> No newline at end of file
26 <br />
27
28 <%= link_to '&#187; ' + l(:label_issue_status_new), :action => 'new' %>
Show file before | Show file after | Hide comments
@@ -1,10 +1,8
1 <h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%= @issue.subject %></h2>
1 <div class="contextual">
2 <div class="topright">
2 <%= l(:label_export_to) %><%= link_to 'PDF', {:action => 'export_pdf', :id => @issue}, :class => 'pic picPdf' %>
3 <small>
4 <%= l(:label_export_to) %>&nbsp;
5 <%= link_to 'PDF', :action => 'export_pdf', :id => @issue %>
6 </small>
7 </div>
3 </div>
4
5 <h2><%= @issue.tracker.name %> #<%= @issue.id %> - <%= @issue.subject %></h2>
8
6
9 <div class="box">
7 <div class="box">
10 <table width="100%">
8 <table width="100%">
@@ -46,13 +44,12 end %>
46 <b><%=l(:field_description)%> :</b><br /><br />
44 <b><%=l(:field_description)%> :</b><br /><br />
47 <%= textilizable @issue.description %>
45 <%= textilizable @issue.description %>
48 <br />
46 <br />
49 <div style="float:left;">
47
50 <% if authorize_for('issues', 'edit') %>
48 <div class="contextual">
51 <%= start_form_tag ({:controller => 'issues', :action => 'edit', :id => @issue}, :method => "get" ) %>
49 <%= link_to_if_authorized l(:button_edit), {:controller => 'issues', :action => 'edit', :id => @issue}, :class => 'pic picEdit' %>
52 <%= submit_tag l(:button_edit) %>
50 <%= link_to_if_authorized l(:button_move), {:controller => 'projects', :action => 'move_issues', :id => @project, "issue_ids[]" => @issue.id }, :class => 'pic picMove' %>
53 <%= end_form_tag %>
51 <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
54 &nbsp;&nbsp;
52 </div>
55 <% end %>
56
53
57 <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
54 <% if authorize_for('issues', 'change_status') and @status_options and !@status_options.empty? %>
58 <%= start_form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) %>
55 <%= start_form_tag ({:controller => 'issues', :action => 'change_status', :id => @issue}) %>
@@ -62,26 +59,8 end %>
62 </select>
59 </select>
63 <%= submit_tag l(:button_change) %>
60 <%= submit_tag l(:button_change) %>
64 <%= end_form_tag %>
61 <%= end_form_tag %>
65 &nbsp;&nbsp;
66 <% end %>
62 <% end %>
67
63
68 <% if authorize_for('projects', 'move_issues') %>
69 <%= start_form_tag ({:controller => 'projects', :action => 'move_issues', :id => @project} ) %>
70 <%= hidden_field_tag "issue_ids[]", @issue.id %>
71 <%= submit_tag l(:button_move) %>
72 <%= end_form_tag %>
73 &nbsp;&nbsp;
74 <% end %>
75 </div>
76 <div style="float:right;">
77 <% if authorize_for('issues', 'destroy') %>
78 <%= start_form_tag ({:controller => 'issues', :action => 'destroy', :id => @issue} ) %>
79 <%= submit_tag l(:button_delete) %>
80 <%= end_form_tag %>
81 &nbsp;&nbsp;
82 <% end %>
83 </div>
84 <div class="clear"></div>
85 </div>
64 </div>
86
65
87 <div id="history" class="box">
66 <div id="history" class="box">
Show file before | Show file after | Hide comments
@@ -1,29 +1,25
1 <div class="contextual">
2 <%= link_to_if_authorized l(:button_edit), {:controller => 'news', :action => 'edit', :id => @news}, :class => 'pic picEdit' %>
3 <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy', :id => @news}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
4 </div>
5
1 <h2><%= @news.title %></h2>
6 <h2><%= @news.title %></h2>
2
7
3 <p><em><%= @news.summary %><br />
8 <p><em><%= @news.summary %><br />
4 <%= @news.author.display_name %>, <%= format_time(@news.created_on) %></em></p>
9 <%= @news.author.display_name %>, <%= format_time(@news.created_on) %></em></p>
5 <br />
10 <br />
6 <%= textilizable auto_link @news.description %>
11 <%= textilizable auto_link @news.description %>
7
12 <br />
8 <div style="float:right;">
9 <% if authorize_for('news', 'destroy') %>
10 <%= start_form_tag ({:controller => 'news', :action => 'destroy', :id => @news}) %>
11 <%= submit_tag l(:button_delete) %>
12 <%= end_form_tag %>
13 <% end %>
14 </div>
15
16 <p><%= link_to_if_authorized l(:button_edit), :controller => 'news', :action => 'edit', :id => @news %></p>
17
13
18 <div id="comments" style="margin-bottom:16px;">
14 <div id="comments" style="margin-bottom:16px;">
19 <h3><%= l(:label_comment_plural) %></h3>
15 <h3><%= l(:label_comment_plural) %></h3>
20 <% @news.comments.each do |comment| %>
16 <% @news.comments.each do |comment| %>
21 <% next if comment.new_record? %>
17 <% next if comment.new_record? %>
22 <h4><%= format_time(comment.created_on) %> - <%= comment.author.name %></h4>
18 <h4><%= format_time(comment.created_on) %> - <%= comment.author.name %></h4>
23 <div style="float:right;">
19 <div class="contextual">
24 <small><%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :post => true %></small>
20 <%= link_to_if_authorized l(:button_delete), {:controller => 'news', :action => 'destroy_comment', :id => @news, :comment_id => comment}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
25 </div>
21 </div>
26 <%= simple_format(auto_link(h comment.comment))%>
22 <%= simple_format(auto_link(h comment.comment))%>
27 <% end if @news.comments_count > 0 %>
23 <% end if @news.comments_count > 0 %>
28 </div>
24 </div>
29
25
Show file before | Show file after | Hide comments
@@ -1,10 +1,10
1 <h2><%= l(:label_gantt) %></h2>
1 <div class="contextual">
2 <div class="topright">
2 <%= l(:label_export_to) %>
3 <small>
3 <%= link_to 'PDF', {:zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :output => 'pdf'}, :class => 'pic picPdf' %>
4 <%= l(:label_export_to) %>&nbsp;&nbsp;<%= link_to 'PDF', :zoom => @zoom, :year => @year_from, :month => @month_from, :months => @months, :output => 'pdf' %>
5 </small>
6 </div>
4 </div>
7
5
6 <h2><%= l(:label_gantt) %></h2>
7
8 <table width="100%">
8 <table width="100%">
9 <tr>
9 <tr>
10 <td align="left">
10 <td align="left">
Show file before | Show file after | Hide comments
@@ -1,3 +1,7
1 <div class="contextual">
2 <%= link_to_if_authorized l(:label_document_new), {:controller => 'projects', :action => 'add_document', :id => @project}, :class => 'pic picAdd' %>
3 </div>
4
1 <h2><%=l(:label_document_plural)%></h2>
5 <h2><%=l(:label_document_plural)%></h2>
2
6
3 <% if @documents.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
7 <% if @documents.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
@@ -16,8 +20,4
16
20
17 <% end %>
21 <% end %>
18 </ul>
22 </ul>
19 <% end %>
23 <% end %> No newline at end of file
20
21 <p>
22 <%= link_to_if_authorized '&#187; ' + l(:label_document_new), :controller => 'projects', :action => 'add_document', :id => @project %>
23 </p>
Show file before | Show file after | Hide comments
@@ -1,3 +1,7
1 <div class="contextual">
2 <%= link_to_if_authorized l(:label_attachment_new), {:controller => 'projects', :action => 'add_file', :id => @project}, :class => 'pic picAdd' %>
3 </div>
4
1 <h2><%=l(:label_attachment_plural)%></h2>
5 <h2><%=l(:label_attachment_plural)%></h2>
2
6
3 <% delete_allowed = authorize_for('versions', 'destroy_file') %>
7 <% delete_allowed = authorize_for('versions', 'destroy_file') %>
@@ -26,9 +30,9
26 <td align="center"><small><%= file.digest %></small></td>
30 <td align="center"><small><%= file.digest %></small></td>
27 <% if delete_allowed %>
31 <% if delete_allowed %>
28 <td align="center">
32 <td align="center">
29 <%= start_form_tag :controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file %>
33 <div class="contextual">
30 <%= submit_tag l(:button_delete), :class => "button-small" %>
34 <%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy_file', :id => version, :attachment_id => file}, :confirm => l(:text_are_you_sure), :post => true, :class => 'pic picDelete' %>
31 <%= end_form_tag %>
35 </div>
32 </td>
36 </td>
33 <% end %>
37 <% end %>
34 </tr>
38 </tr>
@@ -36,11 +40,4
36 reset_cycle %>
40 reset_cycle %>
37 <% end %>
41 <% end %>
38 <% end %>
42 <% end %>
39 </table>
43 </table> No newline at end of file
40
41 <br />
42 <p>
43 <%= link_to_if_authorized '&#187; ' + l(:label_attachment_new), :controller => 'projects', :action => 'add_file', :id => @project %>
44 </p>
45
46
Show file before | Show file after | Hide comments
@@ -1,12 +1,11
1 <h2><%=l(:label_issue_plural)%></h2>
1 <div class="contextual">
2 <div class="topright">
2 <%= l(:label_export_to) %>
3 <small>
3 <%= link_to 'CSV', {:action => 'export_issues_csv', :id => @project}, :class => 'pic picCsv' %>,
4 <%= l(:label_export_to) %>&nbsp;
4 <%= link_to 'PDF', {:action => 'export_issues_pdf', :id => @project}, :class => 'pic picPdf' %>
5 <%= link_to 'CSV', :action => 'export_issues_csv', :id => @project %>,
6 <%= link_to 'PDF', :action => 'export_issues_pdf', :id => @project %>
7 </small>
8 </div>
5 </div>
9
6
7 <h2><%=l(:label_issue_plural)%></h2>
8
10 <%= start_form_tag :action => 'list_issues' %>
9 <%= start_form_tag :action => 'list_issues' %>
11 <table cellpadding=2>
10 <table cellpadding=2>
12 <tr>
11 <tr>
Show file before | Show file after | Hide comments
@@ -1,3 +1,7
1 <div class="contextual">
2 <%= link_to_if_authorized l(:label_news_new), {:controller => 'projects', :action => 'add_news', :id => @project}, :class => 'pic picAdd' %>
3 </div>
4
1 <h2><%=l(:label_news_plural)%></h2>
5 <h2><%=l(:label_news_plural)%></h2>
2
6
3 <% if @news.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
7 <% if @news.empty? %><p><i><%= l(:label_no_data) %></i></p><% end %>
@@ -14,6 +18,3
14
18
15
19
16 <%= pagination_links_full @news_pages %>
20 <%= pagination_links_full @news_pages %>
17 <p>
18 <%= link_to_if_authorized '&#187; ' + l(:label_news_new), :controller => 'projects', :action => 'add_news', :id => @project %>
19 </p>
Show file before | Show file after | Hide comments
@@ -1,3 +1,7
1 <div class="contextual">
2 <%= link_to l(:label_role_new), {:action => 'new'}, :class => 'pic picAdd' %>
3 </div>
4
1 <h2><%=l(:label_role_plural)%></h2>
5 <h2><%=l(:label_role_plural)%></h2>
2
6
3 <table class="listTableContent">
7 <table class="listTableContent">
@@ -15,7 +19,4
15 <% end %>
19 <% end %>
16 </table>
20 </table>
17
21
18 <%= pagination_links_full @role_pages %>
22 <%= pagination_links_full @role_pages %> No newline at end of file
19 <br />
20
21 <%= link_to '&#187; ' + l(:label_role_new), :action => 'new' %>
Show file before | Show file after | Hide comments
@@ -1,3 +1,7
1 <div class="contextual">
2 <%= link_to l(:label_tracker_new), {:action => 'new'}, :class => 'pic picAdd' %>
3 </div>
4
1 <h2><%=l(:label_tracker_plural)%></h2>
5 <h2><%=l(:label_tracker_plural)%></h2>
2
6
3 <table class="listTableContent">
7 <table class="listTableContent">
@@ -16,7 +20,4
16 <% end %>
20 <% end %>
17 </table>
21 </table>
18
22
19 <%= pagination_links_full @tracker_pages %>
23 <%= pagination_links_full @tracker_pages %> No newline at end of file
20 <br />
21
22 <%= link_to '&#187; ' + l(:label_tracker_new), :action => 'new' %>
Show file before | Show file after | Hide comments
@@ -1,3 +1,7
1 <div class="contextual">
2 <%= link_to l(:label_user_new), {:action => 'add'}, :class => 'pic picAdd' %>
3 </div>
4
1 <h2><%=l(:label_user_plural)%></h2>
5 <h2><%=l(:label_user_plural)%></h2>
2
6
3 <table class="listTableContent">
7 <table class="listTableContent">
@@ -39,8 +43,4
39
43
40 <p><%= pagination_links_full @user_pages %>
44 <p><%= pagination_links_full @user_pages %>
41 [ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
45 [ <%= @user_pages.current.first_item %> - <%= @user_pages.current.last_item %> / <%= @user_count %> ]
42 </p>
43
44 <p>
45 <%= link_to '&#187; ' + l(:label_user_new), :action => 'add' %>
46 </p> No newline at end of file
46 </p>
Show file before | Show file after | Hide comments
@@ -7,6 +7,7 http://redmine.org/
7
7
8 == xx/xx/2006 v0.x.x
8 == xx/xx/2006 v0.x.x
9
9
10 * comments can now be added on news
10 * "my page" is now customizable
11 * "my page" is now customizable
11 * improved issues change history
12 * improved issues change history
12 * new functionality: move an issue to another project or tracker
13 * new functionality: move an issue to another project or tracker
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Hide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Hide comments
@@ -128,6 +128,14 background-color: #80b0da;
128 .picLogout { background: url(../images/logout.png) no-repeat 4px 50%; }
128 .picLogout { background: url(../images/logout.png) no-repeat 4px 50%; }
129 .picHelp { background: url(../images/help.png) no-repeat 4px 50%; }
129 .picHelp { background: url(../images/help.png) no-repeat 4px 50%; }
130
130
131 .picEdit { background: url(../images/edit_small.png) no-repeat 4px 50%; }
132 .picDelete { background: url(../images/delete.png) no-repeat 4px 50%; }
133 .picAdd { background: url(../images/add.png) no-repeat 4px 50%; }
134 .picMove { background: url(../images/move.png) no-repeat 4px 50%; }
135 .picPdf { background: url(../images/pdf.png) no-repeat 4px 50%;}
136 .picCsv { background: url(../images/csv.png) no-repeat 4px 50%;}
137
138 .pic { padding-left: 18px; margin-left: 3px; }
131 /**************** Content styles ****************/
139 /**************** Content styles ****************/
132
140
133 html>body #content {
141 html>body #content {
@@ -247,7 +255,7 legend {
247
255
248 table.listTableContent {
256 table.listTableContent {
249 border:1px solid #578bb8;
257 border:1px solid #578bb8;
250 width:99%;
258 width:100%;
251 border-collapse: collapse;
259 border-collapse: collapse;
252 }
260 }
253
261
@@ -458,6 +466,14 img.calendar-trigger {
458 margin-left: 34px;
466 margin-left: 34px;
459 }
467 }
460
468
469 /***** Contextual links div *****/
470 .contextual {
471 float: right;
472 font-size: 0.8em;
473 }
474
475
476
461 /***** CSS FORM ******/
477 /***** CSS FORM ******/
462 .tabular p{
478 .tabular p{
463 margin: 0;
479 margin: 0;
General Comments 0
You need to be logged in to leave comments. Login now