diff options
Diffstat (limited to 'app/views')
-rw-r--r-- | app/views/projects/_form.rhtml | 19 | ||||
-rw-r--r-- | app/views/projects/new.html.erb | 12 | ||||
-rw-r--r-- | app/views/projects/settings/_modules.rhtml | 2 | ||||
-rw-r--r-- | app/views/wiki/history.rhtml | 12 |
4 files changed, 24 insertions, 21 deletions
diff --git a/app/views/projects/_form.rhtml b/app/views/projects/_form.rhtml index e8045bf2c..9772a899c 100644 --- a/app/views/projects/_form.rhtml +++ b/app/views/projects/_form.rhtml @@ -23,8 +23,22 @@ <%= call_hook(:view_projects_form, :project => @project, :form => f) %> </div> +<% if @project.new_record? %> +<fieldset class="box"><legend><%= l(:label_module_plural) %></legend> +<% Redmine::AccessControl.available_project_modules.each do |m| %> + <label class="floating"> + <%= check_box_tag 'project[enabled_module_names][]', m, @project.module_enabled?(m), :id => "project_enabled_module_names_#{m}" %> + <%= l_or_humanize(m, :prefix => "project_module_") %> + </label> +<% end %> +<%= hidden_field_tag 'project[enabled_module_names][]', '' %> +<%= javascript_tag 'observeProjectModules()' %> +</fieldset> +<% end %> + +<% if @project.new_record? || @project.module_enabled?('issue_tracking') %> <% unless @trackers.empty? %> -<fieldset class="box"><legend><%=l(:label_tracker_plural)%></legend> +<fieldset class="box" id="project_trackers"><legend><%=l(:label_tracker_plural)%></legend> <% @trackers.each do |tracker| %> <label class="floating"> <%= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %> @@ -36,7 +50,7 @@ <% end %> <% unless @issue_custom_fields.empty? %> -<fieldset class="box"><legend><%=l(:label_custom_field_plural)%></legend> +<fieldset class="box" id="project_issue_custom_fields"><legend><%=l(:label_custom_field_plural)%></legend> <% @issue_custom_fields.each do |custom_field| %> <label class="floating"> <%= check_box_tag 'project[issue_custom_field_ids][]', custom_field.id, (@project.all_issue_custom_fields.include? custom_field), (custom_field.is_for_all? ? {:disabled => "disabled"} : {}) %> @@ -46,4 +60,5 @@ <%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %> </fieldset> <% end %> +<% end %> <!--[eoform:project]--> diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index aad9c2c29..2642241bf 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -2,18 +2,6 @@ <% labelled_tabular_form_for :project, @project, :url => { :action => "create" } do |f| %> <%= render :partial => 'form', :locals => { :f => f } %> - -<fieldset class="box"><legend><%= l(:label_module_plural) %></legend> -<% Redmine::AccessControl.available_project_modules.each do |m| %> - <label class="floating"> - <%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) %> - <%= l_or_humanize(m, :prefix => "project_module_") %> - </label> -<% end %> -<%= hidden_field_tag 'enabled_modules[]', '' %> - -</fieldset> - <%= submit_tag l(:button_save) %> <%= javascript_tag "Form.Element.focus('project_name');" %> <% end %> diff --git a/app/views/projects/settings/_modules.rhtml b/app/views/projects/settings/_modules.rhtml index c123b4c9c..9e0f92caa 100644 --- a/app/views/projects/settings/_modules.rhtml +++ b/app/views/projects/settings/_modules.rhtml @@ -7,7 +7,7 @@ <legend><%= l(:text_select_project_modules) %></legend> <% Redmine::AccessControl.available_project_modules.each do |m| %> -<p><label><%= check_box_tag 'enabled_modules[]', m, @project.module_enabled?(m) -%> +<p><label><%= check_box_tag 'enabled_module_names[]', m, @project.module_enabled?(m) -%> <%= l_or_humanize(m, :prefix => "project_module_") %></label></p> <% end %> </fieldset> diff --git a/app/views/wiki/history.rhtml b/app/views/wiki/history.rhtml index eac24705b..23d45099a 100644 --- a/app/views/wiki/history.rhtml +++ b/app/views/wiki/history.rhtml @@ -4,7 +4,7 @@ <% form_tag({:action => "diff"}, :method => :get) do %> <%= hidden_field_tag('project_id', h(@project.to_param)) %> -<table class="list"> +<table class="list wiki-page-versions"> <thead><tr> <th>#</th> <th></th> @@ -18,14 +18,14 @@ <% show_diff = @versions.size > 1 %> <% line_num = 1 %> <% @versions.each do |ver| %> -<tr class="<%= cycle("odd", "even") %>"> +<tr class="wiki-page-version <%= cycle("odd", "even") %>"> <td class="id"><%= link_to ver.version, :action => 'show', :id => @page.title, :project_id => @page.project, :version => ver.version %></td> <td class="checkbox"><%= radio_button_tag('version', ver.version, (line_num==1), :id => "cb-#{line_num}", :onclick => "$('cbto-#{line_num+1}').checked=true;") if show_diff && (line_num < @versions.size) %></td> <td class="checkbox"><%= radio_button_tag('version_from', ver.version, (line_num==2), :id => "cbto-#{line_num}") if show_diff && (line_num > 1) %></td> - <td align="center"><%= format_time(ver.updated_on) %></td> - <td><%= link_to_user ver.author %></td> - <td><%=h ver.comments %></td> - <td align="center"><%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %></td> + <td class="updated_on"><%= format_time(ver.updated_on) %></td> + <td class="author"><%= link_to_user ver.author %></td> + <td class="comments"><%=h ver.comments %></td> + <td class="buttons"><%= link_to l(:button_annotate), :action => 'annotate', :id => @page.title, :version => ver.version %></td> </tr> <% line_num += 1 %> <% end %> |