app/views/layouts/application.html.haml in fat_free_crm-0.13.2 vs app/views/layouts/application.html.haml in fat_free_crm-0.13.3
- old
+ new
@@ -15,21 +15,21 @@
- unless tabless_layout? || %w(en-US en-GB).include?(I18n.locale.to_s)
= javascript_include_tag "jquery_ui_datepicker/jquery.ui.datepicker-#{I18n.locale}"
= javascript_include_tag "jquery_ui_datepicker/jquery-ui-timepicker-#{I18n.locale}"
= csrf_meta_tag
- = hook(:javascript_includes, self)
+ = hook(:javascript_includes, self) {}
:javascript
crm.language = "#{I18n.locale}"
window.controller = "#{controller.controller_name}"
- if current_user.present?
:javascript
#{yield :javascript}
var _ffcrm_users = [
- #{User.all.map{|u| "\"#{u.full_name} (@#{u.username})\"" }.join(",\n")}
+ #{User.all.map{|u| "\"#{j u.full_name} (@#{j u.username})\"" }.join(",\n")}
];
<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
<link rel="icon" href="/favicon.ico" type="image/x-icon">
@@ -43,6 +43,6 @@
%script{:type => "text/javascript"}
= "crm.base_url = '#{Setting.base_url}';" unless Setting.base_url.blank?
= get_browser_timezone_offset
= content_for :javascript_epilogue
- = hook(:javascript_epilogue, self)
+ = hook(:javascript_epilogue, self) {}