jro_apps/redmine Commit - r506:0dbbf776c6d6

Slight modifications on project settings views...

Jean-Philippe Lang -

r506:0dbbf776c6d6

parent child

Context file:

r506:0dbbf776c6d6

Collapse all files

app/views/projects/_members.rhtml +3 -3

             <%= error_messages_for 'member' %>
             <% roles = Role.find(:all, :order => 'position') %>
             <% users = User.find_active(:all) - @project.users %>
             <table class="list">
             	<thead>
             	  <th><%= l(:label_user) %></th>
             	  <th><%= l(:label_role) %></th>
-            	  <th></th>
+            	  <th style="width:15%"></th>
             	</thead>
             	<tbody>
             	<% @project.members.find(:all, :include => [:role, :user]).sort{|x,y| x.role.position <=> y.role.position}.each do |member| %>
             	<% next if member.new_record? %>
             	<tr class="<%= cycle 'odd', 'even' %>">
             	<td><%= member.user.display_name %></td>
                 <td align="center">
                 <% if authorize_for('members', 'edit') %>
                   <% remote_form_for(:member, member, :url => {:controller => 'members', :action => 'edit', :id => member}, :method => :post) do |f| %>
                     <%= f.select :role_id, roles.collect{|role| [role.name, role.id]}, {}, :class => "small" %>
                     <%= submit_tag l(:button_change), :class => "small" %>
                   <% end %>
                 <% end %>
                 </td>
                 <td align="center">
                   <small><%= link_to_remote l(:button_delete), { :url => {:controller => 'members', :action => 'destroy', :id => member},
                                                           :method => :post
                                                         }, :title => l(:button_delete),
                                                            :class => 'icon icon-del' %></small>
                 </td>
             	</tr>
             	</tbody>
             <% end; reset_cycle %>
             </table>
             &nbsp;
             <% if authorize_for('projects', 'add_member') && !users.empty? %>
-              <p><label for="member_user_id"><%=l(:label_member_new)%></label></p>
               <% remote_form_for(:member, @member, :url => {:controller => 'projects', :action => 'add_member', :tab => 'members', :id => @project}, :method => :post) do |f| %>
+                <p><label for="member_user_id"><%=l(:label_member_new)%></label><br />
                 <%= f.select :user_id, users.collect{|user| [user.name, user.id]} %>
                 <%= l(:label_role) %>: <%= f.select :role_id, roles.collect{|role| [role.name, role.id]}, :selected => nil %>
-                <%= submit_tag l(:button_add) %>
+                <%= submit_tag l(:button_add) %></p>
               <% end %>
             <% end %>

app/views/projects/settings.rhtml +7 -5

             <h2><%=l(:label_settings)%></h2>
             <div class="tabs">
             <ul>
             <li><%= link_to l(:label_information_plural), {}, :id=> "tab-info", :onclick => "showTab('info'); this.blur(); return false;" %></li>
             <li><%= link_to l(:label_member_plural), {}, :id=> "tab-members", :onclick => "showTab('members'); this.blur(); return false;" %></li>
             <li><%= link_to l(:label_version_plural), {}, :id=> "tab-versions", :onclick => "showTab('versions'); this.blur(); return false;" %></li>
             <li><%= link_to l(:label_issue_category_plural), {}, :id=> "tab-categories", :onclick => "showTab('categories'); this.blur(); return false;" %></li>
             </ul>
             </div>
             <div id="tab-content-info" class="tab-content">
             <% if authorize_for('projects', 'edit') %>
             	<% labelled_tabular_form_for :project, @project, :url => { :action => "edit", :id => @project } do |f| %>
             	<%= render :partial => 'form', :locals => { :f => f } %>
             	<%= submit_tag l(:button_save) %>
             	<% end %>
             <% end %>
             </div>
             <div id="tab-content-members" class="tab-content" style="display:none;">
               <%= render :partial => 'members' %>
             </div>
             <div id="tab-content-versions" class="tab-content" style="display:none;">
             <table class="list">
-            	<thead><th><%= l(:label_version) %></th><th><%= l(:field_effective_date) %></th><th><%= l(:field_description) %></th><th></th><th></th></thead>
+            	<thead><th><%= l(:label_version) %></th><th><%= l(:field_effective_date) %></th><th><%= l(:field_description) %></th><th style="width:15%"></th><th style="width:15%"></th></thead>
             	<tbody>
             <% for version in @project.versions %>
                 <tr class="<%= cycle 'odd', 'even' %>">
                 <td><%=h version.name %></td>
                 <td align="center"><%= format_date(version.effective_date) %></td>
                 <td><%=h version.description %></td>
                 <td align="center"><small><%= link_to_if_authorized l(:button_edit), { :controller => 'versions', :action => 'edit', :id => version }, :class => 'icon icon-edit' %></small></td>
                 <td align="center"><small><%= link_to_if_authorized l(:button_delete), {:controller => 'versions', :action => 'destroy', :id => version}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></small></td>
                 </td>
                 </tr>
             <% end; reset_cycle %>
                 </tbody>
             </table>
-            <%= link_to_if_authorized l(:label_version_new), :controller => 'projects', :action => 'add_version', :id => @project %>
+            &nbsp;
+            <p><%= link_to_if_authorized l(:label_version_new), :controller => 'projects', :action => 'add_version', :id => @project %></p>
             </div>
             <div id="tab-content-categories" class="tab-content" style="display:none;">
             <table class="list">
-            	<thead><th><%= l(:label_issue_category) %></th><th></th></thead>
+            	<thead><th><%= l(:label_issue_category) %></th><th style="width:15%"></th></thead>
             	<tbody>
             <% for @category in @project.issue_categories %>
             	<% unless @category.new_record? %>
             	<tr class="<%= cycle 'odd', 'even' %>">
                 <td>
                     <% form_tag({:controller => 'issue_categories', :action => 'edit', :id => @category}) do %>
                     <%= text_field 'category', 'name', :size => 25  %>
                     <% if authorize_for('issue_categories', 'edit') %>
                     <%= submit_tag l(:button_save), :class => "button-small" %>
                     <% end %>
                     <% end %>
                 </td>
                 <td align="center">
                   <small><%= link_to_if_authorized l(:button_delete), {:controller => 'issue_categories', :action => 'destroy', :id => @category}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %></small>
                 </td>
             	</tr>
             	<% end %>
             <% end %>
                 </tbody>
             </table>
+            &nbsp;
             <% if authorize_for('projects', 'add_issue_category') %>
                 <% form_tag({:action => 'add_issue_category', :tab => 'categories', :id => @project}) do %>
-                <label for="issue_category_name"><%=l(:label_issue_category_new)%></label><br/>
+                <p><label for="issue_category_name"><%=l(:label_issue_category_new)%></label><br />
                 <%= error_messages_for 'issue_category' %>
                 <%= text_field 'issue_category', 'name', :size => 25 %>
-                <%= submit_tag l(:button_create) %>
+                <%= submit_tag l(:button_add) %></p>
                 <% end %>
             <% end %>
             </div>
             <%= tab = params[:tab] ? h(params[:tab]) : 'info'
             javascript_tag "showTab('#{tab}');" %>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages