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

app/views/attachments/_form.html.erb

@@ -1,13 +1,13 @@
 <style type="text/css">
-  input.is_public,input.is_public_checkbox{height:12px;}
-  input.is_public_checkbox{margin-left:4px;margin-right:4px;}
+    input.is_public,input.is_public_checkbox{height:12px;}
+    input.is_public_checkbox{margin-left:4px;margin-right:4px;}
 </style>
 <div class="fl">
 <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
   <% container.attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
-      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly => 'readonly') %>
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'upload_filename readonly', :readonly => 'readonly', :style=>'border:none;') %>
       <%#= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %>
       <!--<span class="ispublic-label"><%#= l(:field_is_public) %>:</span>-->
       <%#= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>

app/views/issues/_form.html.erb

@@ -61,7 +61,11 @@
           <%= render :partial => 'attachments/form', :locals => {:container => @issue} %>
         </li>
         <li class="clear">
+          <% if params[:action] == "new" %>
           <a href="<%= project_issues_path(@project, :remote => true) %>" class="sy_btn_grey mr5 fr"> 取消</a>
+          <% else %>
+              <a href="javascript:void(0);" onclick="issueDetailShow();" class="sy_btn_grey mr5 fr" > 取消 </a>
+          <% end %>
           <a href="javascript:void(0);" class="sy_btn_blue mr5 fr"> 保存并继续</a>
           <a href="javascript:void(0);" onclick="issue_desc_editor.sync();$('#issue-form').submit();" class="sy_btn_blue mr5 fr" id="issue_confirm"> 保存</a>
         </li>
@@ -81,7 +85,13 @@
                            {:onchange => "change_assigned_tip();",:class => "w150"}  %>
           <% end %>
         </li>
-        <li class=" clear" id="assigned_to_tips">未指派</li>
+        <li class=" clear" id="assigned_to_tips">
+          <% if @issue.assigned_to.nil? %>
+              未指派
+          <% else %>
+              已指派
+          <% end %>
+        </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),
@@ -97,7 +107,11 @@
           <% end %>
         </li>
         <li class=" clear" id="milestone_option_tips">
-          无里程碑
+          <% if  @issue.fixed_version.nil? %>
+              无里程碑
+          <% else %>
+              已指派里程碑
+          <% end %>
           <%= link_to "", new_project_version_path(@issue.project), :class => "pic_add mt5 ml5 fr", :target => "_blank" %>
         </li>
         <li class=" clear" style="border:1px solid #c8c8c8;">
@@ -108,7 +122,11 @@
           <% end %>
         </li>
         <li class=" clear" id="option_start_date_tips">
-          未选择开始日期
+          <% if @issue.start_date.nil? %>
+              未选择开始日期
+          <% else %>
+              已选择开始日期
+          <% end %>
         </li>
         <li class=" clear" style="border:1px solid #c8c8c8;">
           <label class="label02" ></label>
@@ -119,7 +137,11 @@
           <% end %>
         </li>
         <li class=" clear " id="option_end_date_tips">
-          未选择结束日期
+          <% if @issue.due_date.nil? %>
+              未选择结束日期
+          <% else %>
+              已选择结束日期
+          <% end %>
         </li>
         <li class=" clear"><%= l(:field_estimated_hours) %></li>
         <li class=" clear">

app/views/issues/show.html.erb

@@ -16,9 +16,9 @@
     });
 </script>
 <div  class="mb10" id =issue_show_total"">
-    <div class="banner-big f16 fontGrey3">
-        问题跟踪
-    </div>
+  <div class="banner-big f16 fontGrey3">
+    问题跟踪
+  </div>
 
   <div class="container-big mt10" >
     <div class="pro_page_box">
@@ -26,9 +26,6 @@
         <div id="issue_detail_show">
           <%= render :partial => 'issues/detail'%>
         </div>
-        <div id="issue_edit_show">
-          <%= render :partial => 'issues/edit'%>
-        </div>
       </div>
 
       <!--problem_main end-->
@@ -47,4 +44,8 @@
       </div>
     </div>
   </div>
+
+  <div id="issue_edit_show"  class="mt10 pro_newissue_con clear">
+    <%= render :partial => 'issues/edit'%>
+  </div>
 </div>

public/javascripts/project.js

@@ -565,12 +565,14 @@ function cancel_relation(orgId,projectId){
 
 function issueEditShow(){
     $("#issue_detail").hide();
+    $(".container-big").hide();
     $("#issue_edit").show();
 }
 
 function issueDetailShow(){
     $("#issue_edit").hide();
     $("#issue_detail").show();
+    $(".container-big").show();
 }
 
 //项目讨论区提交