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

导航栏“帮助中心”改为“问吧”，并调整帖子展示内容的高度

This commit is contained in:
daiao 2016-12-30 10:45:22 +08:00
parent a7bf421df8
commit 16e1f0c701
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/forums/_show_topics.html.erb
View File

@ -5,16 +5,16 @@
$(function(){
showNormalImage('postDetailDes_<%= topic.id %>');
autoUrl('postDetailDes_<%= topic.id %>');
if($("#intro_content_<%= topic.id %>").height() > 810) {
if($("#intro_content_<%= topic.id %>").height() > 300) {
$("#intro_content_show_<%= topic.id %>").show();
}
$("#intro_content_show_<%= topic.id %>").click(function(){
$("#postDetailDes_<%= topic.id %>").toggleClass("maxh360");
$("#postDetailDes_<%= topic.id %>").toggleClass("maxh300");
$("#intro_content_show_<%= topic.id %>").hide();
$("#intro_content_hide_<%= topic.id %>").show();
});
$("#intro_content_hide_<%= topic.id %>").click(function(){
$("#postDetailDes_<%= topic.id %>").toggleClass("maxh360");
$("#postDetailDes_<%= topic.id %>").toggleClass("maxh300");
$("#intro_content_hide_<%= topic.id %>").hide();
$("#intro_content_show_<%= topic.id %>").show();
});
@ -36,7 +36,7 @@
<a href="javascript:void(0);" class="linkGrey2 disablePostLikeIcon ml10" style="cursor: default" title="点赞人数" > <%= get_praise_num(topic)%></a>
</div>
<div class="postDetailDes maxh360" id = "postDetailDes_<%= topic.id %>">
<div class="postDetailDes maxh300" id = "postDetailDes_<%= topic.id %>">
<div id="intro_content_<%= topic.id %>">
<%= topic.content.html_safe%>
</div>

2
app/views/forums/new.js.erb
View File

@ -1,5 +1,5 @@
var htmlvalue = "<%= escape_javascript(render :partial => 'forums/new') %>";
pop_box_new(htmlvalue,460,190);
pop_box_new(htmlvalue,560,390);

2
app/views/layouts/_logined_header.html.erb
View File

@ -23,7 +23,7 @@
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<li class="navHomepageMenu fl mr30">
<%= link_to "帮助中心", "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10", :target => "_blank" %>
<%= link_to "贴吧", forums_path, :class =>"c_white f16 db p10", :target => "_blank" %>
</li>
<% end %>
<% else %>

3
public/stylesheets/css/common.css
View File

@ -365,6 +365,7 @@ h4{ font-size:14px;}/*color:#3b3b3b;*/
.lh23{line-height: 23px;}
/*该高度会写入配置文件*/
.maxh360 {max-height: 810px;}
.maxh300 { max-height: 300px; }
.lh18 { line-height: 18px;}
/* Font & background Color */
@ -872,4 +873,4 @@ input.btn{display: inline-block;border:none; padding:0 10px;color: #333;backgrou
input.btn-blue{background: #3b94d6; color: #fff; cursor:pointer;}
input:hover.btn-blue{background: #2788d0; color: #fff;}
input.btn-grey{background: #d9d9d9; color: #656565; cursor:default;}
input.btn-grey:hover{background: #717171; color: #fff; cursor:default;}
input.btn-grey:hover{background: #717171; color: #fff; cursor:default;}