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

Merge branch 'szzh' into develop

This commit is contained in:
sw 2015-09-29 18:03:42 +08:00
parent 87e4bfdd3f 52eabd5c0a
commit ee673ccf49
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/views/layouts/base_forums.html.erb
View File

@ -158,11 +158,11 @@
</div> </div>
<div class="cl"></div> <div class="cl"></div>
<div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description.html_safe%></span> <div class="fontGrey2 mt10"><span id="forum_desc_span" style="word-break:normal; width:auto; display:block; white-space:pre-wrap;word-wrap : break-word ;overflow: hidden ;"><%= @forum.description.html_safe%></span>
<%#if @forum.creator.id == User.current.id%> <%if @forum.creator.id == User.current.id%>
<!--<a href="javascript:void(0);" onclick="edit_desc();">--> <a href="javascript:void(0);" onclick="edit_desc();">
<%#= image_tag('signature_edit.png',{:width=>12,:height=>12})%> <%= image_tag('signature_edit.png',{:width=>12,:height=>12})%>
<!--</a>--> </a>
<%#end%> <%end%>
</div> </div>
<div class="mt15"> <div class="mt15">
<div id="forum_tag_list"> <div id="forum_tag_list">