jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

解决冲突。修改版本页面 

Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq

Conflicts:
	public/stylesheets/project.css
This commit is contained in:
huang 2015-04-16 13:42:45 +08:00
parent 08fb04aff4 20b17f5503
commit 4afd9afd08
4 changed files with 26 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/attachments/_form.html.erb
View File

@ -32,6 +32,9 @@
%>
<%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
</span>
<% end %>
<% end %>
</span>
<script type='text/javascript'>

17
app/views/issues/_edit.html.erb
View File

@ -4,34 +4,35 @@
<!--编辑的整个属性-->
<% if @edit_allowed || !@allowed_statuses.empty? %>
<div id="all_attributes" style="display:none;">
<%= render :partial => 'form', :locals => {:f => f} %>
<%= render :partial => 'form', :locals => {:f => f} %>
</div>
<% end %><!--end-->
<div class="ping_C mb10"> </div>
<div class="ping_C mb10"></div>
<!--<fieldset><legend><%#= l(:field_notes) %></legend>-->
<!--回复框-->
<% if @journals.present? %>
<div id="history">
<%= render :partial => 'history', :locals => { :issue => @issue, :journals => @journals } %>
<%= render :partial => 'history', :locals => {:issue => @issue, :journals => @journals} %>
</div>
<% end %>
<%= f.text_area :notes, :style =>"width:99%;", :rows => "5", :no_label => true %>
<fieldset><legend>说明</legend>
<%= f.text_area :notes, :style => "width:99%;", :rows => "5", :no_label => true %>
</fieldset>
<!--<%# if @issue.safe_attribute? 'private_notes' %>-->
<!--<label for="issue_private_notes"><%#= f.check_box :private_notes, :no_label => true %> <%#= l(:field_private_notes) %></label>-->
<!--<%# end %>-->
<%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
<%= call_hook(:view_issues_edit_notes_bottom, {:issue => @issue, :notes => @notes, :form => f}) %>
<!--</fieldset>-->
<!--<fieldset><legend><%#= l(:label_attachment_plural) %></legend>-->
<p style="padding-top: 5px;"><%= render :partial => 'attachments/form', :locals => {:container => @issue} %>
<!--<p style="padding-top: 5px;"><%= render :partial => 'attachments/new_form', :locals => {:container => @issue} %>-->
<!--</fieldset>-->
<div class="cl"></div>
<%= f.hidden_field :lock_version %>
<%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %>
<%= hidden_field_tag 'reference_user_id', params[:reference_user_id]%>
<%= hidden_field_tag 'reference_user_id', params[:reference_user_id] %>
<% end %>
<div id="preview" class="wiki"></div>

1
app/views/issues/show.html.erb
View File

@ -115,6 +115,7 @@
</div>
<% end %>
<!--留言-->
<br>
<a remote="true" href="javascript:void(0)" class="blue_btn fr mr80" onclick="$('#issue-form').submit();">
<%= l(:button_submit) %>
</a>

62
public/stylesheets/project.css
View File

@ -339,7 +339,8 @@ a:hover.st_add{ color:#ff8e15;}
padding-top: 2px;
padding-bottom: 3px;
}
fieldset {border: 1px solid #e4e4e4; margin:0;}
legend {color: #484848;}
/* 新建问题 */
.label{ width:80px; text-align:right; font-size:14px; display:block; float:left;}
.label02{ width:110px; text-align:right; font-size:14px; display:block; float:left;}
@ -481,52 +482,15 @@ p.percent {
}
/*版本库tab*/
/*div.repos_explain {*/
/*word-wrap: normal;*/
/*line-height: 8px;*/
/*font-size: 13px;*/
/*background-color: #F8F8F8;*/
/*border: 1px solid #DDD;*/
/*overflow: auto;*/
/*border-radius: 3px;*/
/*padding: 6px 10px;*/
/*font-family: Consolas,"Liberation Mono",Courier,monospace;*/
/*color: #333;*/
/*}*/
/*div.autoscroll {*/
/*overflow-x: visible;*/
/*padding: 1px;*/
/*margin-bottom: 1.2em;*/
/*}*/
.contextual {
float: right;
white-space: nowrap;
line-height: 1.4em;
padding-left: 10px;
padding-right: 10px;
padding-top: 5px;
font-size: 0.9em;
}
/*div.revision-graph {*/
/*position: absolute;*/
/*min-width: 1px;*/
/*}*/
/*table.list {*/
/*border: medium none;*/
/*}*/
/*tr.entry {*/
/*border: 1px solid #F8F8F8;*/
/*}*/
/*tr.entry td {*/
/*white-space: nowrap;*/
/*}*/
/*tr.entry td.size {*/
/*text-align: right;*/
/*font-size: 90%;*/
/*}*/
/*table.list thead th {*/
/*border-width: medium medium 1px;*/
/*border-style: none none solid;*/
/*border-color: -moz-use-text-color -moz-use-text-color #999;*/
/*-moz-border-top-colors: none;*/
/*-moz-border-right-colors: none;*/
/*-moz-border-bottom-colors: none;*/
/*-moz-border-left-colors: none;*/
/*border-image: none;*/
/*font-size: 12px;*/
/*font-weight: 400;*/
/*padding: 0px 3px 3px;*/
/*text-transform: uppercase;*/
/*}*/
/*导出*/
a.atom { background: url(../images/feed.png) no-repeat 1px 50%; padding: 2px 0px 3px 16px; }