Application layout refactored.

The project menu is now the main menu.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@747 e93f8b46-1217-0410-a6f0-8f06a7374b81

3 files changed, 10 insertions, 20 deletions

diff --git a/app/views/roles/_form.rhtml b/app/views/roles/_form.rhtml
index 6213aa2fb..73299293e 100644
--- a/app/views/roles/_form.rhtml
+++ b/app/views/roles/_form.rhtml
@@ -5,9 +5,9 @@
 <p><%= f.check_box :assignable %></p>
 </div>
 
-<div class="box">
-<h3><%= l(:label_permissions) %></h3>
 
+<h3><%= l(:label_permissions) %></h3>
+<div class="box">
 <% perms_by_module = @permissions.group_by {|p| p.project_module.to_s} %>
 <% perms_by_module.keys.sort.each do |mod| %>
     <fieldset><legend><%= mod.blank? ? l(:label_project) : mod.humanize %></legend>
diff --git a/app/views/roles/list.rhtml b/app/views/roles/list.rhtml
index 14ae260aa..bdea2475f 100644
--- a/app/views/roles/list.rhtml
+++ b/app/views/roles/list.rhtml
@@ -23,7 +23,7 @@
   <% end %>
   </td>
   <td align="center" style="width:10%;">
-    <%= button_to(l(:button_delete), { :action => 'destroy', :id => role }, :confirm => l(:text_are_you_sure), :class => "button-small") unless role.builtin? %>
+    <%= button_to(l(:button_delete), { :action => 'destroy', :id => role }, :confirm => l(:text_are_you_sure), :class => "button-small", :disabled => role.builtin? ) %>
   </tr>
 <% end %>
   </tbody>
diff --git a/app/views/roles/workflow.rhtml b/app/views/roles/workflow.rhtml
index 5f1d8f21a..2bc2abd51 100644
--- a/app/views/roles/workflow.rhtml
+++ b/app/views/roles/workflow.rhtml
@@ -3,29 +3,24 @@
 <p><%=l(:text_workflow_edit)%>:</p>
 
 <% form_tag({:action => 'workflow'}, :method => 'get') do %>
-<div style="float:left;margin-right:10px;">
-<p><label for="role_id"><%=l(:label_role)%></label><br/>
+<p><label for="role_id"><%=l(:label_role)%>:</label>
 <select id="role_id" name="role_id">
   <%= options_from_collection_for_select @roles, "id", "name", (@role.id unless @role.nil?) %>
-</select></p>
-</div>
+</select>
 
-<div>
-<p><label for="tracker_id"><%=l(:label_tracker)%></label><br/>
+<label for="tracker_id"><%=l(:label_tracker)%>:</label>
 <select id="tracker_id" name="tracker_id">
   <%= options_from_collection_for_select @trackers, "id", "name", (@tracker.id unless @tracker.nil?) %>
 </select>
-
 <%= submit_tag l(:button_edit) %>
 </p>
-</div>
 <% end %>
   
   
 
 <% unless @tracker.nil? or @role.nil? %>
+<% form_tag({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) do %>
 <div class="box">
-  <% form_tag({:action => 'workflow', :role_id => @role, :tracker_id => @tracker }, :id => 'workflow_form' ) do %>
 	<table>
 	<tr>
 	<td align="center"><strong><%=l(:label_current_status)%></strong></td>
@@ -40,7 +35,7 @@
 	
 	<% for old_status in @statuses %>
 		<tr>
-		<td><div class="square" style="background:#<%= old_status.html_color %>;"></div> <%= old_status.name %></td>		
+		<td><%= old_status.name %></td>		
 		<% for new_status in @statuses %>
 			<td align="center">
       
@@ -55,14 +50,9 @@
 		</tr>
 	<% end %>
 	</table>
-<br />
-<p>
-<a href="javascript:checkAll('workflow_form', true)"><%=l(:button_check_all)%></a> |
-<a href="javascript:checkAll('workflow_form', false)"><%=l(:button_uncheck_all)%></a>
-</p>
-<br />
+    <p><%= check_all_links 'workflow_form' %></p>
+</div>
 <%= submit_tag l(:button_save) %>
 <% end %>
 
 <% end %>
-</div>
\ No newline at end of file