Moves Javascript and HTML to partial views

Cleans up hooks
Fixes issue with file uploader

Author: dkastl

app/views/redmine_gtt/hooks/_view_layouts_base_body_bottom.html.erb

@@ -2,3 +2,27 @@
   <textarea name="<%= l(:title_geojson_upload) %>" placeholder="<%= l(:placeholder_geojson_upload) %>" class="ui-widget ui-state-default ui-corner-all"></textarea>
   <input type="file" id="file-selector" accept=".json,.geojson">
 </div>
+
+<%= javascript_include_tag 'main', plugin: 'redmine_gtt' %>
+
+<% geocoder = { enabled: false } %>
+
+<% if Setting.plugin_redmine_gtt['enable_geocoding_on_map'] == 'true' %>
+  <% geocoder = {
+    enabled: true,
+    provider: Setting.plugin_redmine_gtt['default_geocoder_provider'],
+    options: (JSON.parse(Setting.plugin_redmine_gtt['default_geocoder_options']) rescue {})
+  } %>
+<% end %>
+
+<%= tag.div data: {
+  lon: Setting.plugin_redmine_gtt['default_map_center_longitude'],
+  lat: Setting.plugin_redmine_gtt['default_map_center_latitude'],
+  zoom: Setting.plugin_redmine_gtt['default_map_zoom_level'],
+  maxzoom: Setting.plugin_redmine_gtt['default_map_maxzoom_level'],
+  vector_minzoom: Setting.plugin_redmine_gtt['vector_minzoom_level'],
+  fit_maxzoom: Setting.plugin_redmine_gtt['default_map_fit_maxzoom_level'],
+  geocoder: geocoder,
+  plugin_settings: Setting.plugin_redmine_gtt.select { |key, value| key.to_s.match(/^(?!default).+/) },
+  i18n: l(:gtt_js).to_json.html_safe
+}, id: 'gtt-defaults', style: 'display:none' %>

app/views/redmine_gtt/hooks/_view_layouts_base_html_head.html.erb

@@ -0,0 +1,7 @@
+<%= tag.meta(
+  name: 'gtt-font-custom-icons',
+  content: asset_path('plugin_assets/redmine_gtt/custom-icons.woff2')) %>
+
+<%= tag.meta(
+  name: 'gtt-font-mdi-webfont',
+  content: asset_path('plugin_assets/redmine_gtt/materialdesignicons-webfont.woff2')) %>

config/routes.rb

@@ -6,6 +6,7 @@
   to: 'projects#update_gtt_configuration',
   as: :update_gtt_configuration
 
+# Todo: check if this route should start with "/assets" for consistency
 get '/plugin_assets/redmine_gtt/javascripts/index.js.map', to: 'gtt#map'
 
 scope 'gtt' do

lib/redmine_gtt/view_hooks.rb

@@ -1,11 +1,10 @@
 module RedmineGtt
   class ViewHooks < Redmine::Hook::ViewListener
-
     include ActionView::Context
 
     # Render partials in various views
     render_on :view_account_left_bottom,
-    partial: 'redmine_gtt/hooks/view_account_left_bottom'
+      partial: 'redmine_gtt/hooks/view_account_left_bottom'
 
     render_on :view_my_account,
       partial: 'redmine_gtt/hooks/view_my_account'
@@ -16,48 +15,10 @@ class ViewHooks < Redmine::Hook::ViewListener
     render_on :view_issues_form_details_top,
       partial: 'redmine_gtt/hooks/view_issues_form_details_top'
 
+    render_on :view_layouts_base_html_head,
+      partial: 'redmine_gtt/hooks/view_layouts_base_html_head'
+
     render_on :view_layouts_base_body_bottom,
       partial: 'redmine_gtt/hooks/view_layouts_base_body_bottom'
-
-    # Add meta tags to the HTML head to inform about available fonts with their URL including the digest
-    def view_layouts_base_html_head(context={})
-      tags = []
-      tags << tag.meta(:name => 'gtt-font-custom-icons', :content => asset_path('plugin_assets/redmine_gtt/custom-icons.woff2'))
-      tags << tag.meta(:name => 'gtt-font-mdi-webfont', :content => asset_path('plugin_assets/redmine_gtt/materialdesignicons-webfont.woff2'))
-      return tags.join("\n")
-    end
-
-    # Add JavaScript and data tags to the body bottom
-    def view_layouts_base_body_bottom(context={})
-      tags = [];
-
-      tags << javascript_include_tag('main', :plugin => 'redmine_gtt')
-
-      geocoder = {
-        enabled: false
-      }
-
-      if Setting.plugin_redmine_gtt['enable_geocoding_on_map'] == 'true'
-        geocoder = {
-          enabled: true,
-          provider: Setting.plugin_redmine_gtt['default_geocoder_provider'],
-          options: (JSON.parse(Setting.plugin_redmine_gtt['default_geocoder_options']) rescue {})
-        }
-      end
-
-      tags.push(tag.div :data => {
-        :lon => Setting.plugin_redmine_gtt['default_map_center_longitude'],
-        :lat => Setting.plugin_redmine_gtt['default_map_center_latitude'],
-        :zoom => Setting.plugin_redmine_gtt['default_map_zoom_level'],
-        :maxzoom => Setting.plugin_redmine_gtt['default_map_maxzoom_level'],
-        :vector_minzoom => Setting.plugin_redmine_gtt['vector_minzoom_level'],
-        :fit_maxzoom => Setting.plugin_redmine_gtt['default_map_fit_maxzoom_level'],
-        :geocoder => geocoder,
-        :plugin_settings => Setting.plugin_redmine_gtt.select{ |key, value| key.to_s.match(/^(?!default).+/) },
-        :i18n => l(:gtt_js).to_json.html_safe
-      }, :id => 'gtt-defaults', :style => 'display:none')
-
-      return tags.join("\n")
-    end
   end
 end