hushasha
/
trustieforge
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

Browse Source
beidou_tim
huang 9 years ago
parent 9fbf713709 5d7c8c0b61
commit 002d0c18ba
9 changed files with 842 additions and 825 deletions
Show Stats Download Patch File Download Diff File

28
app/views/layouts/base_org2.html.erb
Unescape View File

@ -27,14 +27,14 @@
tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]} tex2jax: {inlineMath: [['$','$'], ['\\(','\\)']]}
}); });
</script> </script>
<script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script><!--焦点图--> <script type="text/javascript" src="/javascripts/jquery-1.8.3.min.js"></script>
<script type="text/javascript" src="/javascripts/koala.min.1.5.js"></script><!--焦点图--> <script type="text/javascript" src="/javascripts/koala.min.1.5.js"></script><!--焦点图-->
<script src="/javascripts/scrollPic.js"></script><!--滚动--> <script src="/javascripts/scrollPic.js"></script><!--滚动-->
<script> <script>
window.onload = function(){ $(document).ready(function(){
scrollPic(); scrollPic();
} });
function scrollPic() { function scrollPic() {
var scrollPic = new ScrollPic(); var scrollPic = new ScrollPic();
scrollPic.scrollContId = "scrollPic"; //内容容器ID scrollPic.scrollContId = "scrollPic"; //内容容器ID
@ -147,7 +147,25 @@
<% elsif field.status.to_i == 4 %> <% elsif field.status.to_i == 4 %>
<%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %> <%= render :partial => 'organizations/org_subfield_leftMD', :locals => {:field => field} %>
<% elsif field.status.to_i == 5 %> <% elsif field.status.to_i == 5 %>
<%= render :partial => 'organizations/org_subfield_leftD', :locals => {:field => field} %> <div class="sn-index-leftbox" style="display:<%= field.hide == 0?'block':'none' %>;">
<h2 class="h2-title">合作伙伴<a href="javascript:void(0);" target="_blank" class="more">更多</a></h2>
<div class="sn-index-partnerbox " >
<ul id="scrollPic" >
<div style="width: 760px;">
<li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-dhyq.jpg" width="363" height="43" alt="" /></a></li>
<li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-qhdx.jpg" width="363" height="43" alt="" /></a></li>
<li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-jzdz.jpg" width="363" height="43" alt="" /></a></li>
<li class="fl"><a href="javascript:void(0);" target="_blank" class="partnerimg"><img src="images/partner/img-zgdz.jpg" width="363" height="43" alt="" /></a></li>
</div>
</ul>
<div class="cl"></div>
<div class="partner-btnbox">
<div class="partner-prev partner-btn fl " id="LeftArr">&lt;</div>
<div class="partner-next partner-btn fl" id="RightArr">&gt;</div>
<div class="cl"></div>
</div>
</div>
</div>
<% end %> <% end %>
<% end %> <% end %>
</div> </div>

2
public/stylesheets/new_user.css
Unescape View File

@ -704,7 +704,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
.imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;} .imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
.homepagePostReplyDes {float:left; width:642px; margin-left:15px;} .homepagePostReplyDes {float:left; width:642px; margin-left:15px;}
.homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;} .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;}
.homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: 微软雅黑, 宋体;} .homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: "微软雅黑", "宋体";}
.table_maxWidth table {max-width: 642px;} .table_maxWidth table {max-width: 642px;}
.homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
.homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;} .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}

5
public/stylesheets/org2.css
Unescape View File

@ -136,10 +136,9 @@ a.sn-search-button {width:53px; height:40px; border:1px solid #ccc; border-left:
.resources-tagbox img {max-width: 100%;} .resources-tagbox img {max-width: 100%;}
a.more-btn{ display:block; width:185px; height:30px; text-align:center; background:#ccc; color:#666; line-height:30px;} a.more-btn{ display:block; width:185px; height:30px; text-align:center; background:#ccc; color:#666; line-height:30px;}
/* index-partner */ /* index-partner */
.sn-index-partnerbox{ padding:25px 30px; } .sn-index-partnerbox{width:760px; padding:25px 30px;}
.sn-index-partnerbox{ width:775px;}
.sn-index-partnerbox ul li{ height:55px;} .sn-index-partnerbox ul li{ height:55px;}
.sn-index-partnerbox ul li a.partnerimg{ display:block; margin:0 10px 10px 0; border:1px solid #ccc; width:370px; height:43px; float:left;} .sn-index-partnerbox ul li a.partnerimg{ display:block; margin:0 10px 10px 0; border:1px solid #ccc; width:368px; height:43px; float:left;}
.partner-btnbox{ width:90px; margin:0 auto;} .partner-btnbox{ width:90px; margin:0 auto;}
.partner-btn{ width:35px; height:22px; background-color:#999; line-height:1.0; font-size:18px; color:#fff; text-align: center; margin-right:5px; cursor:pointer;} .partner-btn{ width:35px; height:22px; background-color:#999; line-height:1.0; font-size:18px; color:#fff; text-align: center; margin-right:5px; cursor:pointer;}
.partner-btn:hover{ background-color:#172b65;} .partner-btn:hover{ background-color:#172b65;}

Write Preview
Loading…
Cancel
Save