From cbe2f768b6a1d62273b880b5118b2fd853e7c4a1 Mon Sep 17 00:00:00 2001 From: rulingcom Date: Tue, 28 Dec 2021 07:51:50 +0000 Subject: [PATCH] update template --- modules/announcement/_annc_widget15.html.erb | 4 +-- modules/text_marquee/_widget.html.erb | 32 ++++++++------------ modules/text_marquee/info.json | 22 +++++++------- partial/_head.html.erb | 2 +- 4 files changed, 27 insertions(+), 33 deletions(-) diff --git a/modules/announcement/_annc_widget15.html.erb b/modules/announcement/_annc_widget15.html.erb index f6ab3de..01c1a98 100644 --- a/modules/announcement/_annc_widget15.html.erb +++ b/modules/announcement/_annc_widget15.html.erb @@ -128,7 +128,7 @@ num=1; } var flag=false; - $('.btn-left').click(function(){ + $('[data-subpart-id=\"{{subpart-id}}\"] .btn-left').click(function(){ if(!flag){ var uls = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list:not(.hidden_item)').toArray(); var ul_length = uls.length; @@ -147,7 +147,7 @@ $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list.active').eq(0).effect("slide", { direction: "left", mode: 'show', duration: 500},function(){$("body").css("overflow-x","");flag=false;}); }; }); - $('.btn-right').click(function(){ + $('[data-subpart-id=\"{{subpart-id}}\"] .btn-right').click(function(){ var lilength = $('[data-subpart-id=\"{{subpart-id}}\"] li.w-annc__item').length; if(!flag){ var uls = $('[data-subpart-id=\"{{subpart-id}}\"] ul.w-annc__list:not(.hidden_item)').toArray(); diff --git a/modules/text_marquee/_widget.html.erb b/modules/text_marquee/_widget.html.erb index e001a7d..f4ca0fd 100644 --- a/modules/text_marquee/_widget.html.erb +++ b/modules/text_marquee/_widget.html.erb @@ -3,35 +3,29 @@
  • {{content}}
  • - + - - - - - diff --git a/modules/text_marquee/info.json b/modules/text_marquee/info.json index 40b4be6..dc4f6df 100644 --- a/modules/text_marquee/info.json +++ b/modules/text_marquee/info.json @@ -1,12 +1,12 @@ -{ - "widgets" : [ - { - "filename" : "widget", - "name" : { - "zh_tw" : "跑馬燈", - "en" : "marquee" - }, - "thumbnail" : "thumb.png" - } - ] +{ + "widgets" : [ + { + "filename" : "widget", + "name" : { + "zh_tw" : "跑馬燈", + "en" : "marquee" + }, + "thumbnail" : "thumb.png" + } + ] } \ No newline at end of file diff --git a/partial/_head.html.erb b/partial/_head.html.erb index b1e9121..f5dca8a 100644 --- a/partial/_head.html.erb +++ b/partial/_head.html.erb @@ -13,7 +13,7 @@ <%= javascript_include_tag "plugin/picturefill.min.js"%> <%= javascript_include_tag "plugin/jquery.mobile.custom.min.js"%> <%= javascript_include_tag "bootstrap.min"%> - <%= javascript_include_tag "bootstrap.min"%> + <%= javascript_include_tag "plugin/jquery.cycle2.video.min.js"%> <%= javascript_include_tag "plugin/jquery-bullseye-min.js"%>