From 063460f1198c974a3b0838e800cfc7becb7e6a70 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 1 Jul 2014 17:49:12 +0800
Subject: [PATCH] tt

---
 app/views/projects/_form.html.erb | 58 ++++++++++++++++---------------
 config/routes.rb                  |  2 +-
 2 files changed, 31 insertions(+), 29 deletions(-)

diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index fa2e8da11..ec0bf7fbf 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -5,7 +5,9 @@
 <% end %>
 <p><%= f.text_field :name, :required => true, :size => 60, :style => "width:490px;" %></p>
 
-<p style="margin-left:-10px;padding-right: 20px;"><%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %></p><!--by young-->
+<p style="margin-left:-10px;padding-right: 20px;">
+  <%= f.text_area :description, :rows => 8, :class => 'wiki-edit', :style => "font-size:small;width:490px;margin-left:10px;" %>
+</p><!--by young-->
 <p><%= f.text_field :identifier, :required => true, :size => 60, :style => "width:488px;", :disabled => @project.identifier_frozen?, :maxlength => Project::IDENTIFIER_MAX_LENGTH %>
 <% unless @project.identifier_frozen? %>
   <em class="info"><%= l(:text_length_between, :min => 1, :max => Project::IDENTIFIER_MAX_LENGTH) %> <%= l(:text_project_identifier_info).html_safe %></em>
@@ -24,44 +26,44 @@
 <%= call_hook(:view_projects_form, :project => @project, :form => f) %>
 
 
-<!-- <% if @project.new_record? %>
-<fieldset class="box tabular"><legend><%= l(:label_module_plural) %></legend>
-<% Redmine::AccessControl.available_project_modules.each do |m| %>
+<!-- <%# if @project.new_record? %>
+<fieldset class="box tabular"><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_") %>
+    <%#= 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()' %>
+<%# end %>
+<%#= hidden_field_tag 'project[enabled_module_names][]', '' %>
+<%#= javascript_tag 'observeProjectModules()' %>
 </fieldset>
-<% end %>
+<%# end %>
 
-<% if @project.new_record? || @project.module_enabled?('issue_tracking') %>
-<% unless @trackers.empty? %>
-<fieldset class="box tabular" id="project_trackers"><legend><%=l(:label_tracker_plural)%></legend>
-<% @trackers.each do |tracker| %>
+<%# if @project.new_record? || @project.module_enabled?('issue_tracking') %>
+<%# unless @trackers.empty? %>
+<fieldset class="box tabular" 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) %>
-    <%=h tracker %>
+    <%#= check_box_tag 'project[tracker_ids][]', tracker.id, @project.trackers.include?(tracker) %>
+    <%#=h tracker %>
     </label>
-<% end %>
-<%= hidden_field_tag 'project[tracker_ids][]', '' %>
+<%# end %>
+<%#= hidden_field_tag 'project[tracker_ids][]', '' %>
 </fieldset>
-<% end %>
+<%# end %>
 
-<% unless @issue_custom_fields.empty? %>
-<fieldset class="box tabular" id="project_issue_custom_fields"><legend><%=l(:label_custom_field_plural)%></legend>
-<% @issue_custom_fields.each do |custom_field| %>
+<%# unless @issue_custom_fields.empty? %>
+<fieldset class="box tabular" 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"} : {}) %>
-  <%=h custom_field.name %>
+  <%#= 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"} : {}) %>
+  <%#=h custom_field.name %>
   </label>
-<% end %>
-<%= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
+<%# end %>
+<%#= hidden_field_tag 'project[issue_custom_field_ids][]', '' %>
 </fieldset>
-<% end %>
-<% end %> -->
+<%# end %>
+<%# end %> -->
 <!--[eoform:project]-->
 
 <% unless @project.identifier_frozen? %>
diff --git a/config/routes.rb b/config/routes.rb
index ad493bce8..c584ba3cf 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -698,7 +698,7 @@ RedmineApp::Application.routes.draw do
   get 'welcome/search', to: 'welcome#search'
   get 'school/index', to: 'school#index'
   get 'course/:school_id', to: 'welcome#course'
-  get 'course/:school_id', to: 'welcome#course'
+  #get 'course/:school_id', to: 'welcome#course'
   post 'school/get_options/:province', :to => 'school#get_options'
   get 'school/get_options/:province', :to => 'school#get_options'