Commit df80c170a44df59606af497033fe3db58c7bd495

Authored by Karpikau Andrei
1 parent 68edaefe

include separate css for pdf

... ... @@ -169,7 +169,10 @@ module Kanjai
169 169 layer.gsub!(marker, $scheme + ADMIN_CONFIG['domain_name'])
170 170 when '###INCLUDE_JS_FILE###'
171 171 js_array = []
172   - if params[:format].to_s != 'pdf'
  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 +'">')
  175 + else
173 176 if current_admin_user
174 177 js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.js')}'></script>"
175 178 css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend.css')}"
... ... @@ -180,8 +183,9 @@ module Kanjai
180 183 js_array << "<script src='#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.js')}'></script>"
181 184 css_path = "#{$scheme}#{ADMIN_CONFIG['domain_name']}#{ActionController::Base.helpers.asset_path('kanjai/frontend_extend.css')}"
182 185 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(''))
183 187 end
184   - layer.gsub!(marker, js_array.join(''))
  188 +
185 189 else
186 190 #if PageMarker.public_instance_methods.include?("process_#{marker.gsub('###', '')}".to_sym)
187 191 # page_marker = PageMarker.new
... ...
1 1 module Kanjai
2   - VERSION = "0.0.82"
  2 + VERSION = "0.0.83"
3 3 end
... ...