Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
This commit is contained in:
commit
248a3c191a
|
@ -5,7 +5,7 @@
|
||||||
<% if @edit_allowed || !@allowed_statuses.empty? %>
|
<% if @edit_allowed || !@allowed_statuses.empty? %>
|
||||||
<div id="all_attributes" style="display:none;">
|
<div id="all_attributes" style="display:none;">
|
||||||
<%= render :partial => 'form', :locals => {:f => f} %>
|
<%= render :partial => 'form', :locals => {:f => f} %>
|
||||||
<div class="ping_C mb10"></div>
|
<div class="ping_C mb10 ml10"></div>
|
||||||
<!--<a remote="true" href="javascript:void(0)" class="blue_btn fl" style="margin-left: 80px;margin-bottom: 10px;margin-top: -10px;" onclick="$('#issue-form').submit();">-->
|
<!--<a remote="true" href="javascript:void(0)" class="blue_btn fl" style="margin-left: 80px;margin-bottom: 10px;margin-top: -10px;" onclick="$('#issue-form').submit();">-->
|
||||||
<!--<%#= l(:button_submit) %>-->
|
<!--<%#= l(:button_submit) %>-->
|
||||||
<!--</a>-->
|
<!--</a>-->
|
||||||
|
|
|
@ -3,9 +3,9 @@
|
||||||
<!-- modified by bai -->
|
<!-- modified by bai -->
|
||||||
<div id="change-<%= journal.id %>" class="<%= journal.css_classes %>" style=" word-wrap: break-word; word-break: break-all">
|
<div id="change-<%= journal.id %>" class="<%= journal.css_classes %>" style=" word-wrap: break-word; word-break: break-all">
|
||||||
<!-- end -->
|
<!-- end -->
|
||||||
<div class="ping_C mb10">
|
<div class="ping_C mb10 ml10">
|
||||||
<div class="ping_dispic"><a href="#" target="_blank"><%= image_tag(url_to_avatar(journal.user), :class => "ping_dispic",:width => 46,:height => 46) %></a></div>
|
<div class="ping_dispic"><a href="#" target="_blank"><%= image_tag(url_to_avatar(journal.user), :class => "ping_dispic",:width => 46,:height => 46) %></a></div>
|
||||||
<div class="ping_discon">
|
<div class="ping_discon" style="width: 600px;">
|
||||||
<div class="ping_distop">
|
<div class="ping_distop">
|
||||||
<a href="#" target="_blank" class="c_blue fb fl mb10 "><%= journal.user %></a><span class="c_grey fr"><%= format_time journal.created_on %></span>
|
<a href="#" target="_blank" class="c_blue fb fl mb10 "><%= journal.user %></a><span class="c_grey fr"><%= format_time journal.created_on %></span>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
|
|
Loading…
Reference in New Issue