Showing
2 changed files
with
10 additions
and
5 deletions
| @@ -169,9 +169,8 @@ module Kanjai | @@ -169,9 +169,8 @@ module Kanjai | ||
| 169 | layer.gsub!(marker, $scheme + ADMIN_CONFIG['domain_name']) | 169 | layer.gsub!(marker, $scheme + ADMIN_CONFIG['domain_name']) |
| 170 | when '###INCLUDE_JS_FILE###' | 170 | when '###INCLUDE_JS_FILE###' |
| 171 | js_array = [] | 171 | js_array = [] |
| 172 | - if params[:format].to_s == 'pdf' | ||
| 173 | - css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/pdf.css')}" | ||
| 174 | - layer.gsub!(marker, '<link rel="stylesheet" href="'+ css_path +'">') | 172 | + if params[:format].to_s != 'pdf' |
| 173 | + layer.gsub!(marker, '') | ||
| 175 | else | 174 | else |
| 176 | if current_admin_user | 175 | if current_admin_user |
| 177 | js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.js')}'></script>" | 176 | js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.js')}'></script>" |
| @@ -185,7 +184,13 @@ module Kanjai | @@ -185,7 +184,13 @@ module Kanjai | ||
| 185 | js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>" | 184 | js_array << "<script type='text/javascript'>$('<link>', {rel: 'stylesheet',type: 'text/css',href: '#{css_path}'}).appendTo('head');</script>" |
| 186 | layer.gsub!(marker, js_array.join('')) | 185 | layer.gsub!(marker, js_array.join('')) |
| 187 | end | 186 | end |
| 188 | - | 187 | + when '###INCLUDE_CSS_FILE###' |
| 188 | + if params[:format].to_s == 'pdf' | ||
| 189 | + css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/pdf.css')}" | ||
| 190 | + layer.gsub!(marker, '<link rel="stylesheet" href="'+ css_path +'">') | ||
| 191 | + else | ||
| 192 | + layer.gsub!(marker, '') | ||
| 193 | + end | ||
| 189 | else | 194 | else |
| 190 | #if PageMarker.public_instance_methods.include?("process_#{marker.gsub('###', '')}".to_sym) | 195 | #if PageMarker.public_instance_methods.include?("process_#{marker.gsub('###', '')}".to_sym) |
| 191 | # page_marker = PageMarker.new | 196 | # page_marker = PageMarker.new |