Merge pull request #55 from gtt-project/next

Prepares for next release

Author: dkastl

app/models/subscription_template.rb

@@ -1,4 +1,4 @@
-class SubscriptionTemplate < ActiveRecord::Base
+class SubscriptionTemplate < (defined?(ApplicationRecord) == 'constant' ? ApplicationRecord : ActiveRecord::Base)
   self.table_name = "fiware_subscription_templates"
 
   after_initialize :set_default_alteration_types, if: :new_record?

app/views/projects/settings/_subscription_templates.html.erb

@@ -1,5 +1,5 @@
 <p>
-  <%= link_to l(:label_subscription_template_new), new_project_subscription_template_path(@project), class: 'icon icon-add' %>
+  <%= link_to sprite_icon('add', l(:label_subscription_template_new)), new_project_subscription_template_path(@project), class: 'icon icon-add' %>
 </p>
 
 <%= render partial: 'subscription_templates/list', locals: { subscription_templates: SubscriptionTemplate.where(project_id: @project.id) } %>

app/views/subscription_templates/_subscription_template.html.erb

@@ -18,15 +18,15 @@
     <%= textilizable subscription_template.status %>
   </td>
   <td>
-    <%= link_to l(:link_to_copy), copy_project_subscription_template_path(@project, subscription_template),
-        method: :get, remote: true,class: 'copy-command-link icon icon-copy', title: l(:link_to_copy_hint) %>
+    <%= link_to sprite_icon('fiware-clipboard', l(:link_to_copy), :plugin => :redmine_gtt_fiware), copy_project_subscription_template_path(@project, subscription_template),
+        method: :get, remote: true, class: 'icon icon-copy copy-command-link', title: l(:link_to_copy_hint) %>
   </td>
   <td>
     <% if subscription_template.subscription_id.present? %>
-      <%= link_to l(:link_to_unpublish), unpublish_project_subscription_template_path(@project, subscription_template),
+      <%= link_to sprite_icon('fiware-unpublish', l(:link_to_unpublish), :plugin => :redmine_gtt_fiware), unpublish_project_subscription_template_path(@project, subscription_template),
           method: :get, remote: true, class: 'icon icon-shared' %>
     <% else %>
-      <%= link_to l(:link_to_publish), publish_project_subscription_template_path(@project, subscription_template),
+      <%= link_to sprite_icon('fiware-publish', l(:link_to_publish), :plugin => :redmine_gtt_fiware), publish_project_subscription_template_path(@project, subscription_template),
           method: :get, remote: true, class: 'icon icon-shared' %>
     <% end %>
   </td>

assets/images/icons.svg

@@ -0,0 +1,6 @@
+- name: fiware-clipboard
+  svg: clipboard-copy
+- name: fiware-publish
+  svg: link-plus
+- name: fiware-unpublish
+  svg: link-minus

config/icon_source.yml

@@ -1,5 +1,4 @@
-# Require the issues overrides file
-require File.expand_path('../lib/redmine_gtt_fiware/view_hooks', __FILE__)
+require_relative 'lib/redmine_gtt_fiware/view_hooks'
 
 # Register MIME Types for JSON-LD format
 Mime::Type.register 'application/ld+json', :jsonld
@@ -12,10 +11,10 @@
   author_url 'https://github.com/georepublic'
   url 'https://github.com/gtt-project/redmine_gtt_fiware'
   description 'Adds FIWARE integration capabilities for GTT projects'
-  version '1.0.6'
+  version '2.0.0'
 
   # Specify the minimum required Redmine version
-  requires_redmine :version_or_higher => '5.0.0'
+  requires_redmine :version_or_higher => '6.0.0'
 
   # Plugin settings with default values and partial view for settings
   settings(