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

Merge branch 'hjq_beidou' of https://git.trustie.net/jacknudt/trustieforge into hjq_beidou

This commit is contained in:
huang 2016-05-05 09:45:53 +08:00
parent aaf97ac81c c3514f5b6a
commit 18dff4f8a3
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/views/organizations/_org_subfield_rightM.html.erb
View File

@ -38,7 +38,7 @@
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_url_in_org(message.board.id,message.id), :target => "_blank", :class => "fl sn-index-wximg" %>
<% end %> <% end %>
<p class="fl sn-index-txt"><%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %></p> <p class="fl sn-index-txt sn-w229"><%=link_to message.content.to_s.html_safe, board_message_url_in_org(message.board.id, message.id), :target => "_blank" %></p>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<% else %> <% else %>
@ -50,7 +50,7 @@
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), board_message_path(message.board, activity), :target => "_blank", :class => "fl sn-index-wximg" %>
<% end %> <% end %>
<p class="fl sn-index-txt"><%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %></p> <p class="fl sn-index-txt sn-w229"><%=link_to message.content.to_s.html_safe, board_message_path(message.board, activity), :target => "_blank" %></p>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<% end %> <% end %>
@ -65,7 +65,7 @@
<% else %> <% else %>
<%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %> <%= link_to image_tag("/files/uploads/image#{iamge_path}", :width => "104", :height => "104"), news_path(news), :target => "_blank", :class => "fl sn-index-wximg" %>
<% end %> <% end %>
<p class="fl sn-index-txt"><%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %></p> <p class="fl sn-index-txt sn-w229"><%=link_to news.description.to_s.html_safe, news_path(news), :target => "_blank" %></p>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<% end %> <% end %>
@ -76,7 +76,7 @@
<h2 class="h2-title "><%= field.name %></h2> <h2 class="h2-title "><%= field.name %></h2>
<div class="sn-index-wx"> <div class="sn-index-wx">
<img class="fl sn-index-wximg" src="/images/default_blank/right-02.jpg" width="104" height="104" alt=""/> <img class="fl sn-index-wximg" src="/images/default_blank/right-02.jpg" width="104" height="104" alt=""/>
<p class="fl sn-index-txt">暂无内容！</p> <p class="fl sn-index-txt sn-w229">暂无内容！</p>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
</div> </div>

2
app/views/organizations/_subfield_sub_domains_list.html.erb
View File

@ -12,7 +12,7 @@
</div> </div>
</li> </li>
<li class="orgSubColumn"> <li class="orgSubColumn">
<div id="subsubdomain_show_<%= subdomain.id %>"><%= subdomain.name %></div> <div id="subsubdomain_show_<%= subdomain.id %>" class="subColumnControl"><%= subdomain.name %></div>
<div id="subsubdomain_edit_<%= subdomain.id %>" style="display:none;"> <div id="subsubdomain_edit_<%= subdomain.id %>" style="display:none;">
<input type="text" name="name" onblur="update_subsubdomain('#subsubdomain_show_<%= subdomain.id %>','#subsubdomain_edit_<%= subdomain.id %>','<%= subdomain.id %>',$(this).val());" value="<%= subdomain.name %>" style="width:70px;"/> <input type="text" name="name" onblur="update_subsubdomain('#subsubdomain_show_<%= subdomain.id %>','#subsubdomain_edit_<%= subdomain.id %>','<%= subdomain.id %>',$(this).val());" value="<%= subdomain.name %>" style="width:70px;"/>
</div> </div>

1
public/stylesheets/org.css
View File

@ -87,6 +87,7 @@ a.linkGrey8:hover {color:#585858;}
.orgSubTree {width:20px; height:31px; background:url(/images/org_tree.png) 0 0 no-repeat; float:left; margin-left:30px;} .orgSubTree {width:20px; height:31px; background:url(/images/org_tree.png) 0 0 no-repeat; float:left; margin-left:30px;}
.orgSubTree2 {width:20px; height:31px; background:url(/images/org_tree.png) 0 -45px no-repeat; float:left; margin-left:30px;} .orgSubTree2 {width:20px; height:31px; background:url(/images/org_tree.png) 0 -45px no-repeat; float:left; margin-left:30px;}
.orgSubColumn {width:100px; float:left;} .orgSubColumn {width:100px; float:left;}
.subColumnControl {width:90px; max-width:90px; margin-right:10px; float:left; white-space:nowrap; overflow:hidden; text-overflow:ellipsis;}
.personalUrl {border:1px solid #dddddd; width:75px; outline:none; white-space:nowrap; padding-left:2px;} .personalUrl {border:1px solid #dddddd; width:75px; outline:none; white-space:nowrap; padding-left:2px;}
.reCon{ margin:5px; width:710px;} .reCon{ margin:5px; width:710px;}
.retop{width:710px; height:40px; background:#eaeaea; padding:5px;} .retop{width:710px; height:40px; background:#eaeaea; padding:5px;}

2
public/stylesheets/org2.css
View File

@ -157,7 +157,7 @@ a.more-btn{ display:block; width:185px; height:30px; text-align:center; backgrou
/* index-wx*/ /* index-wx*/
.sn-index-wxbox{margin-bottom:20px; background:#fff;} .sn-index-wxbox{margin-bottom:20px; background:#fff;}
.sn-index-wximg{ margin:15px; margin-right:5px;} .sn-index-wximg{ margin:15px; margin-right:5px;}
.sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px;} .sn-index-txt{ font-size:16px; line-height:2.0; margin-top:30px; max-height:64px; overflow:hidden;}
.sn-index-smallbanner img{ display:block; width:369px; height:169px; } .sn-index-smallbanner img{ display:block; width:369px; height:169px; }
/* 内页新闻列表 */ /* 内页新闻列表 */