Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject

app/views/issues/_form.html.erb

@@ -89,7 +89,6 @@
           <%= @issue.assigned_to.nil? ? "未指派" : "已指派"  %>
         </li>
         <li class=" clear">
-          <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %>
               <%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version),
                            {:include_blank => true, :required => @issue.required_attribute?('fixed_version_id'), :no_label => true},
                            {:onchange => "change_milestone_tip();",:class => "w150"} %>
@@ -100,7 +99,6 @@
                               :title => l(:label_version_new),
                               :tabindex => 200) if User.current.allowed_to?(:manage_versions, @issue.project) %>
               <!--<a href="javascript:viod(0)" class="pic_add mt5 ml5"></a>-->
-          <% end %>
         </li>
         <li class=" clear" id="milestone_option_tips">
           <%= @issue.fixed_version.nil? ? "无里程碑" : "已指派里程碑" %>

app/views/projects/new.html.erb

@@ -15,12 +15,12 @@
           <span class="c_red" id="project_name_notice" style="display: none;">项目名称不能为空</span>
         </li>
         <div class="cl"></div>
-        <li  class="ml45 mb10">
+       <!-- <li  class="ml45 mb10">
-          <label><span class="c_red">*</span>&nbsp;<%= l(:label_type_project)%>&nbsp;&nbsp;：</label>
+          <label><span class="c_red">*</span>&nbsp;<%#= l(:label_type_project)%>&nbsp;&nbsp;：</label>
-          <%= select_tag :project_new_type, options_for_select([["开发模式", "1"], ["研讨模式", "2"], ["圈子模式", "3"]]) %>
+          <%#= select_tag :project_new_type, options_for_select([["开发模式", "1"], ["研讨模式", "2"], ["圈子模式", "3"]]) %>
-          <span class=" ml15 c_orange" id = "project_newtype_select"><%=l(:label_type_des_development) %></span>
+          <span class=" ml15 c_orange" id = "project_newtype_select"><%#= l(:label_type_des_development) %></span>
         </li>
-        <div class="cl"></div>
+        <div class="cl"></div>-->
         <li class="ml45">
           <label class="fl" >&nbsp;&nbsp;<%= l(:label_tags_project_description) %>&nbsp;&nbsp;：</label>
           <textarea  name="project[description]" placeholder="最多3000个汉字(或6000个英文字符)"  class="courses_text fl"  ></textarea>

app/views/projects/settings/_new_edit.html.erb

@@ -2,10 +2,10 @@
   <%= error_messages_for 'project' %>
   <%= labelled_form_for @project do |f| %>
       <ul class="pro_newsetting_con mb15">
-        <li class="clear mb10" id="project_avatar_form">
+    <!--    <li class="clear mb10" id="project_avatar_form">
           <label class="label fl">&nbsp;&nbsp;</label>
-          <%= render :partial=>"avatar/new_avatar_form",:locals=> {source:@project} %>
+          <%#= render :partial=>"avatar/new_avatar_form",:locals=> {source:@project} %>
-        </li>
+        </li>-->
         <li class="mb10">
           <label class="label"><span class="c_red f12">*</span>&nbsp;项目名称&nbsp;&nbsp;:&nbsp;</label>
           <input  type="text" name="project[name]" id="project_name" class="ml5 w690" maxlength="100" style="height: 28px;" onkeyup="regex_project_name();" value="<%= @project.name %>">

app/views/versions/_new_milestone.html.erb

@@ -22,8 +22,8 @@
             </li>
             <li class="mb10 clear">
               <label class=" fl">&nbsp;结束日期&nbsp;&nbsp;:&nbsp;</label>
-              <%= f.text_field :effective_date, :size => 10, :readonly => true,:class=>"issues_calendar_input fl", :id => "version_effective_datex", :placeholder=>"结束日期", :style=>"height:28px;", :no_label => true  %>
+              <%= f.text_field :effective_date, :size => 10, :readonly => true, :class => "issues_calendar_input fl", :id => "version_effective_date", :placeholder=>"结束日期", :style=>"height:28px;", :no_label => true  %>
-              <%= calendar_for('version_effective_datex') %>
+              <%= calendar_for('version_effective_date') %>
               <!--<input type="text" placeholder="结束日期" class="issues_calendar_input fl ">-->
               <!--<a href="" class="issues_data_img fl"></a>-->
             </li>