dev_zanle
lizanle 10 years ago
parent 02a9f08fe6
commit 2aa241bffa

@ -1,35 +1,44 @@
<% issue_list(issues) do |issue, level| -%> <% issue_list(issues) do |issue, level| -%>
<% if @query.grouped? && (group = @query.group_by_column.value(issue)) != previous_group %> <script>
<% reset_cycle %> function expand_reply(container, btnid) {
<% previous_group = group %> var target = $(container);
<% end %> var btn = $(btnid);
<!-- CONTENT LIST --> if (btn.data('init') == '0') {
<div class="problem_main"> btn.data('init', 1);
<% column_content = ( query.inline_columns.map {|column| "#{column_content_new(column, issue)}"}) %> btn.html('收起回复');
<% unless issue.author.nil? || issue.author.name == "Anonymous" %> target.show();
<span class ="<%= get_issue_type(column_content[1])[0] %>" title="<%= get_issue_type(column_content[1])[1] %>"></span> } else {
<div class="problem_txt fl w600"> btn.data('init', 0);
<%= link_to issue.author.name, user_path(issue.author), :class => "problem_name c_orange fl" %> btn.html('展开更多');
<span class="fl"><%= l(:label_post_on_issue) %>(<%= "#{raw column_content[2]}" %>)</span> target.hide();
<div class="problem_tit_div fl break_word"> target.eq(0).show();
<%=link_to "#{column_content[4]}<span class = '#{get_issue_priority(column_content[3])[0]}'>#{get_issue_priority(column_content[3])[1]}</span>".html_safe, issue_path(issue.id), :class => "problem_tit_a break_word",:target => "_blank" %> target.eq(1).show();
</div> target.eq(2).show();
<div class="cl"></div> }
<p> }
<% unless issue.assigned_to_id.nil? %>
<%= l(:field_assigned_to) %>
<%=link_to issue.assigned_to(@user), user_path(issue.assigned_to(@user)), :class => "problem_name c_orange f1" %>
<% end %>
<%= l(:label_updated_time_on, format_date(issue.updated_on)).html_safe %>
</p>
</div>
<%=link_to "<span class = 'pic_mes'>#{issue.journals.all.count}</span>".html_safe, issue_path(issue.id), :class => "pro_mes_w" %>
<div class="cl"></div> $(function () {
<% end %> init_activity_KindEditor_data(<%= issue.id%>, null, "87%");
<div class="cl"></div> showNormalImage('activity_description_<%= issue.id %>');
</div> if ($("#intro_content_<%= issue.id %>").height() > 360) {
<% end -%> $("#intro_content_show_<%= issue.id %>").show();
}
$("#intro_content_show_<%= issue.id %>").click(function () {
$("#activity_description_<%= issue.id %>").toggleClass("maxh360");
$("#activity_description_<%= issue.id%>").toggleClass("lh18");
$("#intro_content_show_<%= issue.id %>").hide();
$("#intro_content_hide_<%= issue.id %>").show();
});
$("#intro_content_hide_<%= issue.id %>").click(function () {
$("#activity_description_<%= issue.id %>").toggleClass("maxh360");
$("#activity_description_<%= issue.id%>").toggleClass("lh18");
$("#intro_content_hide_<%= issue.id %>").hide();
$("#intro_content_show_<%= issue.id %>").show();
});
});
</script>
<%= render :partial => 'users/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %>
<% end %>
<ul class="wlist"> <ul class="wlist">
<%= pagination_links_full issue_pages, issue_count, :per_page_links => false, :remote => true, :flag => true %> <%= pagination_links_full issue_pages, issue_count, :per_page_links => false, :remote => true, :flag => true %>
</ul> </ul>

File diff suppressed because it is too large Load Diff

@ -161,9 +161,9 @@ a:hover.invi_search_btn{ background:#0da1b2; border:1px solid #0da1b2;}
/*问题跟踪*/ /*问题跟踪*/
.problem_top{ margin:10px 0 ;} .problem_top{ margin:10px 0 ;}
.problem_search_input{ border:1px solid #64bdd9; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:5px;} .problem_search_input{ border:1px solid #dddddd; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:5px;}
a.problem_search_btn{ background:#64bdd9; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #64bdd9; padding-top:2px; cursor:pointer;} a.problem_search_btn{ background:#269ac9; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #64bdd9; padding-top:2px; cursor:pointer;}
a:hover.problem_search_btn{ background:#3da1c1; border:1px solid #3da1c1;} a:hover.problem_search_btn{ background:#269ac9; border:1px solid #3da1c1;}
a.problem_new_btn{ margin-left:10px; border:1px solid #ff7143; color:#ff7143; width:60px; height:21px; font-size:12px; text-align:center; padding-top:3px;} a.problem_new_btn{ margin-left:10px; border:1px solid #ff7143; color:#ff7143; width:60px; height:21px; font-size:12px; text-align:center; padding-top:3px;}
a:hover.problem_new_btn{ background:#ff7143; color:#fff;} a:hover.problem_new_btn{ background:#ff7143; color:#fff;}
.problem_p{ color:#535252; margin-top:5px;} .problem_p{ color:#535252; margin-top:5px;}

@ -87,6 +87,7 @@ h4{ font-size:14px; color:#3b3b3b;}
.mr55{ margin-right:55px;} .mr55{ margin-right:55px;}
.mr10{ margin-right:10px;} .mr10{ margin-right:10px;}
.mr15 {margin-right:15px;} .mr15 {margin-right:15px;}
.mr18 {margin-right:15px;}
.mr20{ margin-right:20px;} .mr20{ margin-right:20px;}
.mr25 {margin-right:25px;} .mr25 {margin-right:25px;}
.mr30{ margin-right:30px;} .mr30{ margin-right:30px;}

Loading…
Cancel
Save