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

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

This commit is contained in:
huang 2016-05-17 10:06:17 +08:00
parent 20e8627b02 15ea9a9659
commit 985b1e4c95
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/layouts/base_org2.html.erb
View File

@ -46,7 +46,7 @@
scrollPic.speed = 10; //移动速度(单位毫秒，越小越快) scrollPic.speed = 10; //移动速度(单位毫秒，越小越快)
scrollPic.space = 10; //每次移动像素(单位px，越大越快) scrollPic.space = 10; //每次移动像素(单位px，越大越快)
scrollPic.autoPlay = true; //自动播放 scrollPic.autoPlay = false; //自动播放
scrollPic.autoPlayTime = 3; //自动播放间隔时间(秒) scrollPic.autoPlayTime = 3; //自动播放间隔时间(秒)
scrollPic.initialize(); //初始化 scrollPic.initialize(); //初始化
@ -65,7 +65,7 @@
<% if @org_logo_attchment.blank? %> <% if @org_logo_attchment.blank? %>
<img src="/images/org_new_style/logo.jpg" width="367" height="63" class="sn-mt13 sn-fl" alt=""/> <img src="/images/org_new_style/logo.jpg" width="367" height="63" class="sn-mt13 sn-fl" alt=""/>
<% else %> <% else %>
<img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13" alt=""> <img src="/attachments/<%= @org_logo_attchment.id %>/<%= @org_logo_attchment.filename %>" width="367" height="63" class="sn-mt13 sn-fl" alt="">
<% end %> <% end %>
<% if User.current.admin_of_org?(@organization) %> <% if User.current.admin_of_org?(@organization) %>
<a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a> <a href="#" class="sn-logo-add" title="点击替换LOGO" onclick="org_new_files_upload();"></a>