goldencobra 1.2.8 → 1.3.4

data/README.markdown

@@ -2,7 +2,7 @@
 
 [![Build Status](https://secure.travis-ci.org/ikusei/Goldencobra.png)](http://travis-ci.org/ikusei/Goldencobra)
 
-This Project is under development
+This Project is still under development
 
 #Powered by
 - ActiveAdmin

data/app/assets/javascripts/goldencobra/active_admin.js

@@ -30,6 +30,29 @@ $(function() {
     }
   });
 
+  if (typeof tinyMCESetting_theme_advanced_blockformats === 'undefined') {
+    var tinyMCESetting_theme_advanced_blockformats = "p,h1,h2,h3,div"
+  }
+
+  $('textarea.tinymce-no-buttons').tinymce({
+    script_url: "/assets/goldencobra/tiny_mce.js",
+      mode : "textareas",
+      theme : "advanced",
+      theme_advanced_buttons1 : "",
+      theme_advanced_buttons2 : "",
+      theme_advanced_buttons3 : "",
+      theme_advanced_toolbar_location : "top",
+      theme_advanced_toolbar_align : "center",
+      theme_advanced_resizing : false,
+    relative_urls : true,
+    convert_urls : false,
+    theme_advanced_blockformats : tinyMCESetting_theme_advanced_blockformats,
+    plugins : "autolink,paste",
+    dialog_type : "modal",
+    paste_auto_cleanup_on_paste : true
+  });
+
+
 	$('textarea.tinymce').tinymce({
 		script_url: "/assets/goldencobra/tiny_mce.js",
   		mode : "textareas",
@@ -42,7 +65,7 @@ $(function() {
   		theme_advanced_resizing : false,
 		relative_urls : true,
     convert_urls : false,
-		theme_advanced_blockformats : "p,h1,h2,h3,div",
+		theme_advanced_blockformats : tinyMCESetting_theme_advanced_blockformats,
 		plugins : "fullscreen,autolink,paste",
 		dialog_type : "modal",
 		paste_auto_cleanup_on_paste : true
@@ -60,7 +83,7 @@ $(function() {
   		theme_advanced_resizing : false,
 		relative_urls : true,
     	convert_urls : false,
-		theme_advanced_blockformats : "p,h1,h2,h3,div",
+		theme_advanced_blockformats : tinyMCESetting_theme_advanced_blockformats,
 		plugins : "fullscreen,autolink,paste,table",
 		dialog_type : "modal",
 		paste_auto_cleanup_on_paste : true,

data/app/controllers/goldencobra/application_controller.rb

@@ -61,7 +61,7 @@ module Goldencobra
       else
         d = Goldencobra::Domain.main
         if d.present? && @current_client.present? && @current_client.id != d.id
-          meta_tags[:canonical] = "http://#{d.hostname}#{current_article.public_url}"
+          meta_tags[:canonical] = "http://#{d.hostname}#{d.url_prefix}#{current_article.public_url(false)}"
         end
       end
 

data/app/controllers/goldencobra/articles_controller.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Goldencobra
   class ArticlesController < Goldencobra::ApplicationController
     layout "application"
@@ -166,11 +168,11 @@ module Goldencobra
 
     # ------------------ associated models ------------------------------------
     def can_load_associated_model?
-      @article.article_type.present? && @article.article_type_form_file != "Default" && @article_type = @article.send(@article.article_type_form_file.downcase.to_sym)
+      @article.article_type.present? && @article.article_type_form_file != "Default" && @article_type = @article.send(@article.article_type_form_file.underscore.parameterize.downcase.to_sym)
     end
 
     def load_associated_model_into_liquid
-      Goldencobra::Article::LiquidParser["#{@article.article_type_form_file.downcase}"] = @article_type
+      Goldencobra::Article::LiquidParser["#{@article.article_type_form_file.underscore.parameterize.downcase}"] = @article_type
     end
 
     # ------------------ /associated models -----------------------------------

data/app/controllers/goldencobra/sessions_controller.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Goldencobra
   class SessionsController < Goldencobra::ApplicationController
     layout "application"

data/app/helpers/goldencobra/articles_helper.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Goldencobra
   module ArticlesHelper
 
@@ -71,7 +73,7 @@ module Goldencobra
 
     def render_article_type_content(options={})
       if @article && @article.article_type.present? && @article.kind_of_article_type.present?
-        render :partial => "articletypes/#{@article.article_type_form_file.downcase}/#{@article.kind_of_article_type.downcase}"
+        render :partial => "articletypes/#{@article.article_type_form_file.underscore.parameterize.downcase}/#{@article.kind_of_article_type.downcase}"
       else
         render :partial => "articletypes/default/show"
       end

data/app/models/goldencobra/article.rb

@@ -287,8 +287,8 @@ module Goldencobra
 
     # Gets the related object by article_type
     def get_related_object
-      if self.article_type.present? && self.article_type_form_file.present? && self.respond_to?(self.article_type_form_file.downcase)
-        return self.send(self.article_type_form_file.downcase)
+      if self.article_type.present? && self.article_type_form_file.present? && self.respond_to?(self.article_type_form_file.underscore.parameterize.downcase)
+        return self.send(self.article_type_form_file.underscore.parameterize.downcase)
       else
         return nil
       end
@@ -321,7 +321,7 @@ module Goldencobra
         end
       end
       #include related models
-      @list_of_articles = @list_of_articles.includes("#{self.article_type_form_file.downcase}") if self.respond_to?(self.article_type_form_file.downcase)
+      @list_of_articles = @list_of_articles.includes("#{self.article_type_form_file.underscore.parameterize.downcase}") if self.respond_to?(self.article_type_form_file.underscore.parameterize.downcase)
       #get articles with tag
       if self.index_of_articles_tagged_with.present?
         @list_of_articles = @list_of_articles.tagged_with(self.index_of_articles_tagged_with.split(",").map{|t| t.strip}, on: :tags, any: true)
@@ -462,7 +462,9 @@ module Goldencobra
 
     # Gibt Consultant | Subsidiary | etc. zurück je nach Seitentyp
     def article_type_form_file
-      self.article_type.split(" ").first if self.article_type.present?
+      if self.article_type.present?
+        self.article_type.split(" ")[0..-2].join("")
+      end
     end
 
     # Gibt Index oder Show zurück, je nach Seitentyp
@@ -473,7 +475,7 @@ module Goldencobra
     # Liefert Kategorienenamen für sie Suche unabhängig ob Die Seite eine show oder indexseite ist
     def article_type_for_search
       if self.article_type.present?
-        self.article_type.split(" ").first
+        self.article_type.split(" ")[0..-2].join("")
       else
         "Article"
       end
@@ -531,8 +533,8 @@ module Goldencobra
 
     #Datum für den RSS reader, Datum ist created_at es sei denn ein Articletype hat ein published_at definiert
     def published_at
-      if self.article_type.present? && self.article_type_form_file.present? && self.respond_to?(self.article_type_form_file.downcase)
-        related_object = self.send(self.article_type_form_file.downcase)
+      if self.article_type.present? && self.article_type_form_file.present? && self.respond_to?(self.article_type_form_file.underscore.parameterize.downcase)
+        related_object = self.send(self.article_type_form_file.underscore.parameterize.downcase)
         if related_object && related_object.respond_to?(:published_at)
           related_object.published_at
         else
@@ -705,8 +707,8 @@ module Goldencobra
           file_name_path = File.join(path_to_articletypes,name)
           if File.directory?(file_name_path)
             Dir.foreach(file_name_path) do |sub_name|
-                file_name = "#{name}#{sub_name}" if File.exist?(File.join(file_name_path,sub_name)) && (sub_name =~ /^_(?!edit).*/) == 0
-                results << file_name.split(".").first.to_s.titleize if file_name.present?
+                file_name = "#{name.titleize.gsub(' ','')}#{sub_name.titleize}" if File.exist?(File.join(file_name_path,sub_name)) && (sub_name =~ /^_(?!edit).*/) == 0
+                results << file_name.split(".").first if file_name.present?
             end
           end
         end

data/app/models/goldencobra/upload.rb

@@ -48,6 +48,7 @@ module Goldencobra
       result << "#{self.image_file_name} " if self.image_file_name.present?
       result << "(#{self.source}, #{self.rights}) " if self.source.present? || self.rights.present?
       result << "- #{self.updated_at.strftime("%d.%m.%Y - %H:%M Uhr")}"
+      return result
     end
 
     def unzip_files

data/app/views/goldencobra/admin/articles/_layout_sidebar.html.erb

@@ -1,11 +1,28 @@
 <div class="layout-sidebar">
   <h5>
-  	Artikel-Seitentyp: <%= I18n.t(@article.article_type.split(' ').first.to_s.strip, :scope => [:goldencobra, :article_types], :default => @article.article_type.split(' ').first) %>
+    Artikel-Seitentyp: <%= I18n.t(@article.article_type.split(' ').first.to_s.strip, :scope => [:goldencobra, :article_types], :default => @article.article_type.split(' ').first) %>
   </h5>
-	<%= semantic_form_for ["admin", @article], :html => {:id => "goldencobra_events_article_event_modul"} do |f| %>
-		<ul>
-			<%= f.input :template_file, :as => :select, :collection => Goldencobra::Article.templates_for_select, :include_blank => false %>
-		</ul>
-		<p><br/><%= f.submit t("submit_layout", :scope => [:active_admin, :sidebars]) %></p>
-	<% end %>
-</div>
+  <% article_types = {} %>
+  <% Goldencobra::Article.article_types_for_select.each do |article_type| %>
+    <% translated_article_type = I18n.t(article_type.parameterize.underscore.downcase, scope: [:goldencobra, :article_types], default: article_type) %>
+    <% article_types[translated_article_type.to_sym] = article_type %>
+  <% end %>
+
+  <%= form_tag change_articletype_admin_article_path(@article.id) do %>
+    <%= select_tag :new_article_type, options_for_select(article_types.sort, @article.article_type), :include_blank => false %>
+    <br/><br/>
+    <%= submit_tag "Artikeltyp zuweisen", id: "submit_widgets_partial" %>
+  <% end %>
+  <br/>
+  <hr>
+  <br/>
+
+  <%= semantic_form_for ["admin", @article], :html => {:id => "goldencobra_events_article_event_modul"} do |f| %>
+    <h5>
+      <%= I18n.t(@article.article_type.split(' ').first.to_s.strip, :scope => [:activerecord, :models, "goldencobra/article"], :default => "Layout der Seite") %>
+    </h5>
+    <%= f.select :template_file, Goldencobra::Article.templates_for_select, :include_blank => false %>
+    <br/><br/>
+    <%= f.submit t("submit_layout", :scope => [:active_admin, :sidebars]) %>
+  <% end %>
+</div>

data/app/views/goldencobra/admin/articles/_select_article_type.html.erb

@@ -1,11 +1,11 @@
 <% article_types = {} %>
 
 <% Goldencobra::Article.article_types_for_select.each do |article_type|
-  translated_article_type = I18n.t(article_type.parameterize.downcase, scope: [:article_types], default: article_type)
+  translated_article_type = I18n.t(article_type.parameterize.underscore.downcase, scope: [:goldencobra, :article_types], default: article_type)
   article_types[translated_article_type.to_sym] = article_type
 end %>
 
-<%= f.inputs I18n.t(:selection, scope: [:article_types]), :class => "foldable inputs" do
+<%= f.inputs I18n.t(:selection, scope: [:articles]), :class => "foldable inputs" do
   if article_types.count > 0
     f.input :article_type, :label => "Artikeltyp", :as => :select, :collection => article_types.sort, include_blank: true
   end

data/app/views/goldencobra/articles/_domain.html.erb

@@ -0,0 +1 @@
+<%= Goldencobra::Domain.current.hostname %><%= Goldencobra::Domain.current.url_prefix %>

data/app/views/goldencobra/articles/sitemap.xml.builder

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 xml.instruct! :xml, :version => '1.0', :encoding => 'UTF-8'
 xml.urlset :xmlns => 'http://www.sitemaps.org/schemas/sitemap/0.9' do
   @articles.each do |article|
@@ -7,4 +9,7 @@ xml.urlset :xmlns => 'http://www.sitemaps.org/schemas/sitemap/0.9' do
       xml.priority 0.5
     end
   end
+  if File.exists?(File.join(::Rails.root, "app", "views", "articletypes", "default", "_sitemap.xml.builder"))
+  	render :partial => "articletypes/default/sitemap.xml.builder"
+  end
 end

data/app/worker/articles_cache_worker.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 class ArticlesCacheWorker
   include Sidekiq::Worker
   sidekiq_options queue: "default"

data/config/initializers/geocoder.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 Geocoder::Configuration.always_raise << Geocoder::OverQueryLimitError
 Geocoder::Configuration.lookup = :google
 #Geocoder::Configuration.api_key = "AIzaSyCFREOloLh2CTRpELzzGJJSEPV-LKyAfjY"
@@ -7,4 +9,4 @@ Geocoder::Configuration.use_https = false
 Geocoder::Configuration.language = :de
 #Geocoder::Configuration.cache = Redis.new
 
-Geokit::Geocoders::google = ""
+#Geokit::Geocoders::google = ""

data/config/initializers/liquid_tags.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 class PartialRenderer < Liquid::Tag
   #include ActionController::RequestForgeryProtection
   def self.description
@@ -27,6 +29,25 @@ end
 Liquid::Template.register_tag('render_partial', PartialRenderer)
 
 
+class DomainUrl < Liquid::Tag
+  #include ActionController::RequestForgeryProtection
+  def self.description
+    "gibt die aktuelle domain mit url prefix aus"
+  end
+
+  def self.usage
+    "{% domain %} => www.xyz.de/url_prefix"
+  end
+
+  def initialize(tag_name, message, tokens)
+    super
+  end
+
+  def render(context)
+    ActionController::Base.new.render_to_string(:partial => "/goldencobra/articles/domain", :layout => false, :locals => {:context => context} )
+  end
+end
+Liquid::Template.register_tag('domain', DomainUrl)
 
 # {% navigation_menue 3 | id: css_id_name, class_name: test %}
 class NavigationRenderer < Liquid::Tag

data/config/locales/active_admin.de.yml

@@ -22,6 +22,8 @@ de:
       list: "auflisten"
       create: "erstellen"
   active_admin:
+    menue:
+      settings: "Einstellungen"
     dashboard: Übersicht
     dashboard_welcome:
       welcome: "Willkommen in Active Admin. Dies ist die Standard-Übersichtsseite."
@@ -65,7 +67,7 @@ de:
       widgets_options: "Schnipsel-Optionen"
       startpage_options: "Startseiten-Optionen"
       filters: "Filter"
-      layout: "Ansicht & Layout"
+      layout: "Artikeltyp & Layout"
       image_module: "Bildergalerie"
       image_formates: "Bildgrößen"
       overview: "Überblick"

data/config/locales/active_admin.en.yml

@@ -22,6 +22,8 @@ en:
       list: "list"
       create: "create"
   active_admin:
+    menue:
+      settings: "Settings"
     dashboard: Dashboard
     dashboard_welcome:
       welcome: "Welcome to Active Admin. This is the default dashboard page."

data/config/locales/activerecord.en.yml

@@ -10,6 +10,12 @@ en:
       goldencobra/comment:
         one: "Comment"
         other: "Comments"
+      author:
+        one: "Author"
+        other: "Authors"
+      goldencobra/author:
+        one: "Author"
+        other: "Authors"
       import:
         one: "Import"
         other: "Imports"

data/config/locales/goldencobra.de.yml

@@ -1,6 +1,7 @@
 de:
   articles:
     read_on: 'weiterlesen'
+    selection: "Artikel"
   goldencobra:
     article_types:
       Chairman: "Vorstand"
@@ -15,25 +16,25 @@ de:
       Pressrelease: "Pressemitteilung"
       Default: "Standard"
       Partner: "Partner"
-      consultant-index: "Berater Übersicht"
-      consultant-show: "Berater Einzelseite"
-      report-index: "Nachrichten Übersicht"
-      report-show: "Nachrichten Einzelseite"
-      subsidiary-index: "Niederlassung Übersicht"
-      subsidiary-show: "Niederlassung Einzelseite"
-      event-index: "Veranstaltungen Übersicht"
-      event-show: "Veranstaltungen Einzelseite"
-      default-index: "Standard Übersicht"
-      default-show: "Standard Einzelseite"
-      pressreferent-index: "Pressereferenten Übersicht"
-      pressreferent-show: "Pressereferenten Einzelseite"
-      personelreferent-index: "Personalreferenten Übersicht"
-      personelreferent-show: "Personalreferenten Einzelseite"
-      chairman-index: "Vorstand Übersicht"
-      chairman-show: "Vorstand Einzelseite"
-      pressrelease-index: "Pressemitteilung Übersicht"
-      pressrelease-show: "Pressemitteilung Einzelseite"
-      faq-index: "FAQ Übersicht"
-      faq-show: "FAQ Einzelseite"
-      partner-index: "Partner Übersicht"
-      partner-show: "Partner Einzelseite"
+      consultant_index: "Berater Übersicht"
+      consultant_show: "Berater Einzelseite"
+      report_index: "Nachrichten Übersicht"
+      report_show: "Nachrichten Einzelseite"
+      subsidiary_index: "Niederlassung Übersicht"
+      subsidiary_show: "Niederlassung Einzelseite"
+      event_index: "Veranstaltungen Übersicht"
+      event_show: "Veranstaltungen Einzelseite"
+      default_index: "Standard Übersicht"
+      default_show: "Standard Einzelseite"
+      pressreferent_index: "Pressereferenten Übersicht"
+      pressreferent_show: "Pressereferenten Einzelseite"
+      personelreferent_index: "Personalreferenten Übersicht"
+      personelreferent_show: "Personalreferenten Einzelseite"
+      chairman_index: "Vorstand Übersicht"
+      chairman_show: "Vorstand Einzelseite"
+      pressrelease_index: "Pressemitteilung Übersicht"
+      pressrelease_show: "Pressemitteilung Einzelseite"
+      faq_index: "FAQ Übersicht"
+      faq_show: "FAQ Einzelseite"
+      partner_index: "Partner Übersicht"
+      partner_show: "Partner Einzelseite"

data/db/seeds.rb

@@ -2,7 +2,7 @@ User.delete_all
 Goldencobra::Role.delete_all
 admin = Goldencobra::Role.find_or_create_by_name("admin")
 guest = Goldencobra::Role.find_or_create_by_name("guest")
-user = User.create!(:email => "admin@goldencobra.de", :password => "12345", :password_confirmation => "12345", :firstname => "Admin", :lastname => "Goldencobra")
+user = User.create!(:email => "admin@goldencobra.de", :password => "password", :password_confirmation => "password", :firstname => "Admin", :lastname => "Goldencobra")
 user.roles << admin
 
 Goldencobra::Help.delete_all
@@ -64,7 +64,7 @@ puts "footer menu created."
 ### START AND 404 PAGE ###
 puts "create start page article..."
 start = Goldencobra::Article.find_by_title("Willkommen")
-start = Goldencobra::Article.create!(title: "Willkommen", article_type: "Default Show", ancestry: nil, active: true, url_name: "willkommen", template_file: "application") if start.blank?
+start = Goldencobra::Article.create!(title: "Willkommen",breadcrumb:"Willkommen", article_type: "Default Show", ancestry: nil, active: true, url_name: "willkommen", template_file: "application") if start.blank?
 start.mark_as_startpage!
 
 ### CONTENT PAGES ###
@@ -93,7 +93,7 @@ newsblogContent = "<article>
     </div>
     <hr>
   </article>"
-newsblog = Goldencobra::Article.create!(title: "News", article_type: "Default Show", ancestry: nil, active: true, content: newsblogContent, url_name: "news", template_file: "application") if newsblog.blank?
+newsblog = Goldencobra::Article.create!(title: "News",breadcrumb:"News", article_type: "Default Show", ancestry: nil, active: true, content: newsblogContent, url_name: "news", template_file: "application") if newsblog.blank?
 
 datestable = Goldencobra::Article.find_by_title("Termine")
 datestableContent = "<table border='0'>
@@ -120,7 +120,7 @@ datestableContent = "<table border='0'>
       </tr>
     </tbody>
   </table>"
-datestable = Goldencobra::Article.create!(title: "Termine", article_type: "Default Show", ancestry: nil, active: true, content: datestableContent, url_name: "termine", template_file: "application") if datestable.blank?
+datestable = Goldencobra::Article.create!(title: "Termine",breadcrumb:"Termine", article_type: "Default Show", ancestry: nil, active: true, content: datestableContent, url_name: "termine", template_file: "application") if datestable.blank?
 
 moreform = Goldencobra::Article.find_by_title("Weiteres")
 moreformContent = "<form method='post' data-remote='true' action='/' accept-charset='UTF-8'>
@@ -153,7 +153,7 @@ moreformContent = "<form method='post' data-remote='true' action='/' accept-char
     <input type='submit' value='Eintragen' name='commit'>
     <div class='clear'></div>
   </form>"
-moreform = Goldencobra::Article.create!(title: "Weiteres", article_type: "Default Show", ancestry: nil, active: true, content: moreformContent, url_name: "weiteres", template_file: "application") if moreform.blank?
+moreform = Goldencobra::Article.create!(title: "Weiteres",breadcrumb:"Weiteres", article_type: "Default Show", ancestry: nil, active: true, content: moreformContent, url_name: "weiteres", template_file: "application") if moreform.blank?
 
 puts "content page articles created."
 

data/lib/generators/goldencobra/articletype/articletype_generator.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Goldencobra
   module Generators
     class ArticletypeGenerator < Rails::Generators::NamedBase
@@ -5,10 +7,12 @@ module Goldencobra
       argument :model_attributes, type: :array, default: [], banner: "model:attributes"
 
       def create_articletype_files
+        #TODO: Check if class name already exists and abort if true
         generate("model", "#{name} #{model_attributes.join(' ')} article_id:integer")
       end
 
       def create_partials
+        #TODO: Check if class name already exists and abort if true
         copy_file 'index.html.erb', "app/views/articletypes/#{name.underscore}/_index.html.erb"
         copy_file 'show.html.erb', "app/views/articletypes/#{name.underscore}/_show.html.erb"
         template 'edit_show.html.erb', "app/views/articletypes/#{name.underscore}/_edit_show.html.erb"

data/lib/generators/goldencobra/articletype/templates/initializer.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 Rails.application.config.to_prepare do
   Goldencobra::Article.class_eval do
     has_one :<%= name.underscore %>, :dependent => :destroy

data/lib/generators/goldencobra/templates/views/articletypes/default/_sitemap.xml.builder

@@ -0,0 +1,7 @@
+# encoding: utf-8
+# xml.url do # create the url entry, with the specified location and date
+#   xml.loc "http#{@use_ssl}://#{@domain_name}#{article.public_url}"
+#   xml.lastmod article.updated_at.strftime('%Y-%m-%d')
+#   xml.priority 0.5
+# end
+

data/lib/goldencobra/select_current_client.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Selects the client by hostname
 module Goldencobra
   module SelectCurrentClient

data/lib/goldencobra/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Goldencobra
-  VERSION = "1.2.8"
+  VERSION = "1.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: goldencobra
 version: !ruby/object:Gem::Version
-  version: 1.2.8
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coffee-script-source
@@ -33,17 +33,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rvm-capistrano
   requirement: !ruby/object:Gem::Requirement
@@ -673,17 +673,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - '='
       - !ruby/object:Gem::Version
-        version: 1.6.7
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -2223,6 +2223,7 @@ files:
 - app/views/goldencobra/admin/shared/_prev_item.html.erb
 - app/views/goldencobra/admin/users/_vita_steps.html.erb
 - app/views/goldencobra/articles/_bugherd.html.erb
+- app/views/goldencobra/articles/_domain.html.erb
 - app/views/goldencobra/articles/_edit_article_link.html.erb
 - app/views/goldencobra/articles/_headers.html.erb
 - app/views/goldencobra/articles/_navigation_menue.html.erb
@@ -2262,8 +2263,6 @@ files:
 - config/locales/active_admin.en.yml
 - config/locales/activerecord.de.yml
 - config/locales/activerecord.en.yml
-- config/locales/article_types.de.yml
-- config/locales/article_types.en.yml
 - config/locales/de.yml
 - config/locales/devise.de.yml
 - config/locales/devise.en.yml
@@ -2420,6 +2419,7 @@ files:
 - lib/generators/goldencobra/templates/seeds.rb.erb
 - lib/generators/goldencobra/templates/views/articletypes/default/_index.html.erb
 - lib/generators/goldencobra/templates/views/articletypes/default/_show.html.erb
+- lib/generators/goldencobra/templates/views/articletypes/default/_sitemap.xml.builder
 - lib/generators/goldencobra/templates/views/layouts/_footer.html.erb
 - lib/generators/goldencobra/templates/views/layouts/_header.html.erb
 - lib/generators/goldencobra/templates/views/layouts/_header_meta.html.erb

data/config/locales/article_types.de.yml

@@ -1,23 +0,0 @@
-de:
-  article_types:
-    selection: "Artikel"
-    consultant-index: "Berater Übersicht"
-    consultant-show: "Berater Einzelseite"
-    report-index: "Nachrichten Übersicht"
-    report-show: "Nachrichten Einzelseite"
-    subsidiary-index: "Niederlassung Übersicht"
-    subsidiary-show: "Niederlassung Einzelseite"
-    event-index: "Veranstaltungen Übersicht"
-    event-show: "Veranstaltungen Einzelseite"
-    default-index: "Standard Übersicht"
-    default-show: "Standard Einzelseite"
-    pressreferent-index: "Pressereferenten Übersicht"
-    pressreferent-show: "Pressereferenten Einzelseite"
-    personelreferent-index: "Personalreferenten Übersicht"
-    personelreferent-show: "Personalreferenten Einzelseite"
-    chairman-index: "Vorstand Übersicht"
-    chairman-show: "Vorstand Einzelseite"
-    pressrelease-index: "Pressemitteilung Übersicht"
-    pressrelease-show: "Pressemitteilung Einzelseite"
-    faq-index: "FAQ Übersicht"
-    faq-show: "FAQ Einzelseite"

data/config/locales/article_types.en.yml

@@ -1,23 +0,0 @@
-en:
-  article_types:
-    selection: "Artikel"
-    consultant-index: "Berater Übersicht"
-    consultant-show: "Berater Einzelseite"
-    report-index: "Nachrichten Übersicht"
-    report-show: "Nachrichten Einzelseite"
-    subsidiary-index: "Niederlassung Übersicht"
-    subsidiary-show: "Niederlassung Einzelseite"
-    event-index: "Veranstaltungen Übersicht"
-    event-show: "Veranstaltungen Einzelseite"
-    default-index: "Standard Übersicht"
-    default-show: "Standard Einzelseite"
-    pressreferent-index: "Pressereferenten Übersicht"
-    pressreferent-show: "Pressereferenten Einzelseite"
-    personelreferent-index: "Personalreferenten Übersicht"
-    personelreferent-show: "Personalreferenten Einzelseite"
-    chairman-index: "Vorstand Übersicht"
-    chairman-show: "Vorstand Einzelseite"
-    pressrelease-index: "Pressemitteilung Übersicht"
-    pressrelease-show: "Pressemitteilung Einzelseite"
-    faq-index: "FAQ Übersicht"
-    faq-show: "FAQ Einzelseite"