diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index efa078ea..e20a0c29 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -209,7 +209,7 @@ module ApplicationHelper javascripts << "\n" javascripts << "\n" page.design.javascripts.each do |js| - # javascripts << "" + javascripts << "" end javascripts end diff --git a/app/views/front/show_banner.html.erb b/app/views/front/show_banner.html.erb index 2d790279..921c360d 100644 --- a/app/views/front/show_banner.html.erb +++ b/app/views/front/show_banner.html.erb @@ -19,7 +19,7 @@
diff --git a/public/static/kernel.js b/public/static/kernel.js index f8f95e61..cef6f066 100644 --- a/public/static/kernel.js +++ b/public/static/kernel.js @@ -27,7 +27,7 @@ function getTimeout() { } $(document).ready(function() { - $('.slideshow').children('img').click(function() + $(document).on('click', '.slideshow img', function() { if($(this).attr('link_url')!='') { diff --git a/vendor/built_in_modules/web_resource/app/helpers/panel/web_resource/back_end/web_link_categorys_helper.rb b/vendor/built_in_modules/web_resource/app/helpers/panel/web_resource/back_end/web_link_categorys_helper.rb new file mode 100644 index 00000000..78e553ce --- /dev/null +++ b/vendor/built_in_modules/web_resource/app/helpers/panel/web_resource/back_end/web_link_categorys_helper.rb @@ -0,0 +1,13 @@ +module Panel::WebResource::BackEnd::WebLinkCategorysHelper + include ActionView::Helpers::UrlHelper + + def show_web_link_permission_link(web_link) + type = 'edit' + oa = web_link.get_object_auth_by_title(type) + if oa.nil? + web_link.object_auths.new(title: type ).save + oa = web_link.get_object_auth_by_title(type) + end + link_to t(:category_auth),admin_object_auth_ob_auth_path(oa) + end +end \ No newline at end of file