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

公共贴吧--编辑帖子，“置顶”与“引用”控件重叠及中英文混排问题 #1258

This commit is contained in:
sw 2014-09-17 14:55:36 +08:00
parent 0ab7bfcda9
commit 1976aa9c72
5 changed files with 81 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/memos/edit.html.erb
View File

@ -27,8 +27,7 @@
<p><%= f.text_area :content, :required => true, :size => 80, id: 'editor01' %></p>
<script type="text/javascript">var ckeditor=CKEDITOR.replace('editor01');</script>
<br/>
<%= f.submit :value => l(:button_change) %>
<%= f.submit :value => l(:button_change) %>&nbsp;&nbsp;<%= link_to l(:button_back), back_url ,:class => "button-canel",:style => "color: #ffffff;"%>
</div>
<% end %>
<%= link_to l(:button_back), back_url %>
</div>

9
app/views/memos/show.html.erb
View File

@ -43,11 +43,14 @@
:data => {:confirm => l(:text_are_you_sure)},
:title => l(:button_delete)
) if @memo.destroyable_by?(User.current) %>
</div>
<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>" style="word-break: break-all;word-wrap: break-word;"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
<div>&nbsp;</div>
<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>"
style="word-break: break-all;word-wrap: break-word;">
<%= label_tag l(:field_subject) %>: <%=h @memo.subject %>
</div>
<div class="memo-content">
<%= textAreailizable(@memo,:content) %>
<p>

11
app/views/stores/index.html.erb
View File

@ -2,9 +2,9 @@
<%= render 'search_bar' %>
<% end %>
<div class="resource_sum" id="IE_resource_sum_css">
<% @attach_array.each do |k|%>
<div class="line_block" >
<div class="resource_sum">
<% @attach_array.each do |k|%>
<div class="line_block">
<p>
<%= @str_arr.shift %>
</p>
@ -34,7 +34,7 @@
</div>
</div>
<% end; reset_cycle %>
<% end; reset_cycle %>
</div>
<script type='text/javascript'>
function validate_required(field,alerttxt)
@ -64,8 +64,5 @@
$(this).find('img').attr("src", "/images/button/download.png")
});
});
if(navigator.appName=="Microsoft Internet Explorer"){
$("#IE_resource_sum_css").children(".line_block").css("width","45%");
}
});
</script>

2
config/locales/zh.yml
View File

@ -1936,7 +1936,7 @@ zh:
label_forum_edit: 编辑讨论区
label_memo_create: 发布
label_memo_new: 新建主题
label_memo_edit: 修改主题label_board_new
label_memo_edit: 修改主题
label_memo_new_from_forum: 发布帖子
label_forum: 公共贴吧
label_forum_new: 新建贴吧

16
public/stylesheets/application.css
View File

@ -2794,3 +2794,19 @@ div.repos_explain{
padding-top: 20px;
padding-bottom: 20px;
}
.button-canel{
padding-bottom: 5px;
width: auto;
height: 25px;
font-family: '微软雅黑',Arial,Helvetica,sans-serif;
font-size: 12px;
color: #ffffff;
padding: 3px 9px;
background: #15bccf;
border-radius: 4px;
border: 1px solid #15bccf;
box-shadow: 0px 1px 3px rgba(0, 0, 0, 0.2), 0px 0px 2px rgb(255, 255, 255) inset;
text-shadow: 0px -1px 0px rgba(0, 0, 0, 0.2), 0px 1px 0px rgb(255, 255, 255);
cursor: pointer;
}