From 1402ae190daac64787b0c5ffd7338de14bf644b4 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 17 May 2016 10:03:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=A4=B4=E5=83=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 4cae284f5..0249cb34c 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -65,7 +65,7 @@ <% if @org_logo_attchment.blank? %> <% else %> - + <% end %> <% if User.current.admin_of_org?(@organization) %> From 15ea9a96598222b3c617bb23741837c24cdb3550 Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 17 May 2016 10:04:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=97=A8=E6=88=B7?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=92=AD=E6=94=BE=E7=A6=81=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_org2.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_org2.html.erb b/app/views/layouts/base_org2.html.erb index 0249cb34c..dd85d2e4b 100644 --- a/app/views/layouts/base_org2.html.erb +++ b/app/views/layouts/base_org2.html.erb @@ -46,7 +46,7 @@ scrollPic.speed = 10; //移动速度(单位毫秒,越小越快) scrollPic.space = 10; //每次移动像素(单位px,越大越快) - scrollPic.autoPlay = true; //自动播放 + scrollPic.autoPlay = false; //自动播放 scrollPic.autoPlayTime = 3; //自动播放间隔时间(秒) scrollPic.initialize(); //初始化