goldencobra 1.1.0 → 1.2.0

data/app/assets/stylesheets/goldencobra/active_admin.css.scss

@@ -12,6 +12,16 @@ body.active_admin #title_bar .action_items a.undo{
 
 }
 
+#main_content{
+	.char_count{
+		position: relative;
+		float: right;
+		margin-top:-23px;
+		margin-right: 40px;
+		color:grey;
+	}
+}
+
 span.startpage{
 	font-weight:bold;
 	color:red;
@@ -174,6 +184,14 @@ body.active_admin .sidebar_section > div div.overview-sidebar{
 					display:inline-block;
 				}
 
+        div.secured{
+          width:9px;
+          height:9px;
+          background:url("/assets/goldencobra/icons/16/locked.png");
+          @include background-size(9px);
+          display:inline-block;
+        }
+
 
 				div.title{
 					display:inline-block;
@@ -270,8 +288,19 @@ h3.goldencobra_article_article_type{
 	text-align:center;
 }
 
-table.importer_assoziations td.nested_model_header{
-	font-weight:bold;
+table.importer_assoziations {
+	td.nested_model_header{
+		font-weight:bold;
+	}
+	tr.model_group{
+		display:none;
+	}
+	span.button{
+		cursor: pointer;
+		border: 1px solid gray;
+		padding: 5px;
+		background-color: lightgray;
+	}
 }
 
 form li.hidden.input{
@@ -292,6 +321,15 @@ body.active_admin .edit{
 	display: inline-block;
 }
 
+body.active_admin .secured{
+  width:20px;
+  height:20px;
+  text-indent:-99999px;
+  background:url("/assets/goldencobra/icons/32/locked.png");
+  @include background-size(20px);
+  display: inline-block;
+}
+
 body.active_admin tbody .online{
   background: url("/assets/goldencobra/icons/32/play.png") no-repeat center center transparent;
   @include background-size(20px);
@@ -320,7 +358,7 @@ body.active_admin tbody .create{
 }
 
 body.active_admin tbody .offline{
-  background: url("/assets/goldencobra/icons/32/stop.png") no-repeat center center transparent;
+  background: url("/assets/goldencobra/icons/32/power.png") no-repeat center center transparent;
   @include background-size(20px);
   text-indent:-99999px;
   width: 22px;
@@ -355,14 +393,6 @@ body.active_admin .new_subarticle{
 	display: inline-block;
 }
 
-body.active_admin .import{
-	background: url("/assets/goldencobra/import.jpg") no-repeat center center transparent;
-	text-indent:-99999px;
-	width: 22px;
-	height: 20px;
-	display: inline-block;
-}
-
 body.active_admin table.index_table th:last-child {
 	width: 130px;
 	min-width: 130px;
@@ -409,4 +439,34 @@ body.active_admin form input[type="submit"]:hover:not(.disabled) {
     background: -moz-linear-gradient(center top , #76B347, #5E9E2E);
     background: -webkit-gradient(linear, left top, left bottom, from(#76B347), to(#5E9E2E));
     box-shadow: 0 1px 1px rgba(0, 0, 0, 0.1), 0 1px 0 0 #8DBF67 inset;
+}
+
+li.response_200{
+	color:green;
+	margin: 0 0 5px -10px !important;
+	line-height: 12px;
+	font-size: 10px !important;
+}
+
+li.response_404{
+	color:red;
+	margin: 0 0 5px -10px !important;
+	line-height: 12px;
+	font-size: 10px !important;
+}
+
+ul.link_checker_ul{
+	div.link_checker_label{
+		cursor:pointer;
+	}
+	ul.link_checker_sources{
+		display:none;
+		.link_checker_position{
+			background-color:lightgrey;
+			border-radius:5px;
+			display:inline-block;
+			padding: 2px;
+			margin:2px;
+		}
+	}
 }

data/app/assets/stylesheets/goldencobra/application.css

@@ -11,41 +11,60 @@
  *= require_self
 */
 
-.navigtion_link_imgage_wrapper{
-	display:none;
+.navigtion_link_imgage_wrapper, 
+.navigtion_link_description, 
+.navigtion_link_description_title, 
+.navigtion_link_call_to_action_name {
+	display: none;
 }
-.navigtion_link_description{
-	display:none;
+
+.hidden {
+  display: none !important;
 }
-.navigtion_link_description_title{
-	display:none;
+
+#admin_article_manager {
+  padding: 3px;
+  background-color: #6a7176;
+  background: -webkit-gradient(linear, left top, left bottom, from(#6a7176), to(#4d5256));
+  background: -moz-linear-gradient(-90deg, #6a7176, #4d5256);
+  border-bottom: 1px solid black;
+  position: static;
+  width: 100%;
+  z-index: 99999;
+  color: #cdcdcd;
+  font-size: 11px;
+  box-shadow: 2px 2px 5px #636e2a;
+  height: 20px;
+  padding-top: 3px;
 }
-.navigtion_link_call_to_action_name{
-	display:none;
+
+#admin_article_manager .left a {
+  float: left;
 }
 
-.hidden {
-  display: none;
-}
-
-#edit_article_link {
-  position: fixed;
-  right: 70px;
-  bottom: 5px;
-  background-color: #24282F;
-  background: rgba(0, 0, 0, 0.4);
-  width: 95px;
-  height: 38px;
-  -webkit-border-radius: 4px;
-  -moz-border-radius: 4px;
-  border-radius: 4px;
-  padding: 12px 0 0px 5px;
-  z-index: 99999;
+#admin_article_manager .center a {
+  float: left;
+  margin-top: 5px;
 }
 
-#edit_article_link  a {
-  color: #CCC;
-  font-family: Helvetica;
-  font-size: 12px;
+#admin_article_manager .right a {
+  float: right;
+  border-right: 1px solid #cdcdcd;
+  margin-top: 5px;
+}
+
+#admin_article_manager a {
+  color: #cdcdcd;
+  text-decoration: none;
+  padding-right: 3px;
+  padding-left: 3px;
+}
+
+#admin_article_manager a:hover {
   text-decoration: none;
+  color: white;
 }
+
+body {
+  margin: 0px;
+}

data/app/controllers/goldencobra/api/v1/tokens_controller.rb

@@ -1,31 +1,35 @@
 module Goldencobra
-  class Api::V1::TokensController < ActionController::Base
+  module Api
+    module V1
+      class TokensController < ActionController::Base
 
-    respond_to :json, :xml
+        respond_to :json, :xml
 
-    def create
-      email = params[:email]
-      password = params[:password]
+        def create
+          email = params[:email]
+          password = params[:password]
 
-      if email.nil? || password.nil?
-        render status: 400, json: { error: 'The request must contain ' +
-                                        'the user email and password.' }
-        return
-      end
+          if email.nil? || password.nil?
+            render status: 400, json: { error: 'The request must contain ' +
+                                            'the user email and password.' }
+            return
+          end
 
-      @visitor = Visitor.find_by_email(email)
+          @visitor = Visitor.find_by_email(email)
 
-      if @visitor == nil
-        render status: 401, json: { error: "Invalid email or password." }
-        return
-      end
+          if @visitor == nil
+            render status: 401, json: { error: "Invalid email or password." }
+            return
+          end
 
-      @visitor.ensure_authentication_token!
+          @visitor.ensure_authentication_token!
 
-      if @visitor.valid_password?(password)
-        render status: 200, json: { token: @visitor.authentication_token }
-      else
-        render status: 401, json: { error: "Invalid email or password." }
+          if @visitor.valid_password?(password)
+            render status: 200, json: { token: @visitor.authentication_token }
+          else
+            render status: 401, json: { error: "Invalid email or password." }
+          end
+        end
       end
     end
   end

data/app/controllers/goldencobra/application_controller.rb

@@ -1,11 +1,10 @@
 module Goldencobra
   class ApplicationController < ::ApplicationController
-
     before_filter :set_locale
 
     def set_locale
       unless Rails.env == "test"
-        I18n.locale = session[:locale]
+        I18n.locale = params[:locale] || session[:locale]
       end
     end
 
@@ -32,18 +31,34 @@ module Goldencobra
     end
 
     def initialize_article(current_article)
-      Goldencobra::Article::LiquidParser["current_article"] = @article
-      set_meta_tags :site => s("goldencobra.page.default_title_tag"),
-                    :title => current_article.metatag("Title Tag"),
-                    :description => current_article.metatag("Meta Description"),
-                    :keywords => current_article.metatag("Keywords"),
-                    :canonical => current_article.canonical_url,
-                    :noindex => current_article.robots_no_index,
-                    :open_graph => {:title => current_article.metatag("OpenGraph Title"),
-                                  :description => current_article.metatag("OpenGraph Description"),
-                                  :type => current_article.metatag("OpenGraph Type"),
-                                  :url => current_article.metatag("OpenGraph URL"),
-                                  :image => current_article.metatag("OpenGraph Image")}
+      Goldencobra::Article::LiquidParser["current_article"] = current_article
+
+      meta_tags = {
+        :site => s('goldencobra.page.default_title_tag'),
+        :title => current_article.metatag("Title Tag").present? ? current_article.metatag("Title Tag") : current_article.title,
+        :reverse => true,
+        :description => current_article.metatag("Meta Description"),
+        :keywords => current_article.metatag("Keywords"),
+        :open_graph => {
+          :title => current_article.metatag("OpenGraph Title"),
+          :description => current_article.metatag("OpenGraph Description"),
+          :type => current_article.metatag("OpenGraph Type"),
+          :url => current_article.metatag("OpenGraph URL"),
+          :image => current_article.metatag("OpenGraph Image")
+        }
+      }
+
+      if current_article.robots_no_index
+        # with noindex for meta name="robots"
+        meta_tags[:noindex] = current_article.robots_no_index
+      end
+
+      if !current_article.canonical_url.blank?
+        # with an canonical_url for rel="canonical"
+        meta_tags[:canonical] = current_article.canonical_url
+      end
+
+      set_meta_tags meta_tags
     end
 
     private
@@ -53,5 +68,6 @@ module Goldencobra
         super
       end
     end
+
   end
 end

data/app/controllers/goldencobra/articles_controller.rb

@@ -1,14 +1,11 @@
 module Goldencobra
   class ArticlesController < Goldencobra::ApplicationController
-    #require ::Rails.root + "app" + "controllers" + "application_controller"
-    #load_and_authorize_resource :class => "Goldencobra::Article"
-    #load_and_authorize_resource
-    #authorize_resource
-
     layout "application"
     before_filter :check_format
     before_filter :get_article, :only => [:show, :convert_to_pdf]
+    before_filter :verify_token, :only => [:show]
     before_filter :geocode_ip_address, only: [:show]
+    after_filter :analytics, :only => [:show]
 
     if Goldencobra::Setting.for_key("goldencobra.article.cache_articles") == "true"
       caches_action :show, :cache_path => :show_cache_path.to_proc, :if => proc {@article && @article.present? && is_cachable?  }
@@ -19,14 +16,16 @@ module Goldencobra
       date_cache = Goldencobra::Setting.for_key("goldencobra.article.max_cache_24h") == "true" ? Date.today.strftime("%Y%m%d") : "no_date"
       art_cache = @article ? @article.cache_key : "no_art"
       user_cache = current_user.present? ? current_user.id : "no_user"
-
-      "g/#{geo_cache}/#{user_cache}/#{date_cache}/#{params[:article_id]}/#{art_cache}_#{params[:pdf]}_#{params[:frontend_tags]}__#{params[:iframe]}"
+      flash_message = session.present? && session['flash'].present? ? Time.now.to_i : ""
+      auth_code = params[:auth_token].present? ? 'with_auth' : ''
+      "g/#{I18n.locale.to_s}/#{geo_cache}/#{user_cache}/#{date_cache}/#{params[:article_id]}/#{art_cache}_#{params[:pdf]}_#{params[:frontend_tags]}__#{params[:iframe]}#{flash_message}_#{auth_code}"
     end
 
 
     def show
-      ActiveSupport::Notifications.instrument("goldencobra.article.show", :params => params)
-      before_init()
+      #flash[:confirmation] = "test"
+      ActiveSupport::Notifications.instrument("goldencobra.article.show", :params => params)  #Possible Callbacks on start
+      before_init() #Possible Callbacks on start
       if serve_iframe?
         respond_to do |format|
           format.html { render layout: "/goldencobra/bare_layout" }
@@ -34,17 +33,13 @@ module Goldencobra
       elsif serve_basic_article?
         initialize_article(@article)
         Goldencobra::Article.load_liquid_methods(location: session[:user_location], article: @article, params: params)
-
+        Goldencobra::Article::LiquidParser["url_params"] = params
         load_associated_model_into_liquid() if can_load_associated_model?
         after_init()
 
         if generate_index_list?
-          @list_of_articles = get_articles_by_article_type
-          include_related_models()
-          get_articles_with_tags() if @article.index_of_articles_tagged_with.present?
-          get_articles_without_tags() if @article.not_tagged_with.present?
-          get_articles_by_frontend_tags() if params[:frontend_tags].present?
-          sort_response()
+          current_operator = current_user || current_visitor
+          @list_of_articles = @article.index_articles(current_operator,params[:frontend_tags])
           after_index()
         end
 
@@ -62,33 +57,46 @@ module Goldencobra
           end
         end
       elsif should_statically_redirect?
-          redirect_to @article.external_url_redirect
+        redirect_to @article.external_url_redirect
       elsif should_dynamically_redirect?
         redirect_dynamically()
       else
-        # Render 404 Article if no Article else is found
-        redirect_to_404()
+        if @unauthorized
+          redirect_to_401()
+        else
+          redirect_to_404()
+        end
       end
     end
 
-    def convert_to_pdf
-      if @article
-        require 'net/http'
-        require "uri"
-        uid = Goldencobra::Setting.for_key("goldencobra.html2pdf_uid")
-        uri = URI.parse("http://html2pdf.ikusei.de/converter/new.xml?&print_layout=true&uid=#{uid}&url=#{@article.absolute_public_url}#{CGI::escape('?pdf=1')}")
-        logger.debug(uri)
-        http = Net::HTTP.new(uri.host, uri.port)
-        request = Net::HTTP::Get.new(uri.request_uri)
-        response = http.request(request)
-        doc = Nokogiri::HTML(response.body)
-        file = doc.at_xpath("//file-name").text
-        redirect_to "http://html2pdf.ikusei.de#{file}"
+    def switch_language
+      I18n.locale = params[:locale] || session[:locale]
+      session[:locale] = I18n.locale
+      if params[:redirect_to].present?
+        redirect_to params[:redirect_to]
       else
-        render :text => "404", :status => 404
+        redirect_to "/"
       end
     end
 
+    # def convert_to_pdf
+    #   if @article
+    #     require 'net/http'
+    #     require "uri"
+    #     uid = Goldencobra::Setting.for_key("goldencobra.html2pdf_uid")
+    #     uri = URI.parse("http://html2pdf.ikusei.de/converter/new.xml?&print_layout=true&uid=#{uid}&url=#{@article.absolute_public_url}#{CGI::escape('?pdf=1')}")
+    #     logger.debug(uri)
+    #     http = Net::HTTP.new(uri.host, uri.port)
+    #     request = Net::HTTP::Get.new(uri.request_uri)
+    #     response = http.request(request)
+    #     doc = Nokogiri::HTML(response.body)
+    #     file = doc.at_xpath("//file-name").text
+    #     redirect_to "http://html2pdf.ikusei.de#{file}"
+    #   else
+    #     render :text => "404", :status => 404
+    #   end
+    # end
+
 
     def sitemap
       if Goldencobra::Setting.for_key("goldencobra.use_ssl") == "true"
@@ -104,11 +112,23 @@ module Goldencobra
       end
     end
 
+    private
+
+    def verify_token
+      if params[:auth_token].present?
+        unless current_visitor || current_user
+          render :text => "Nicht authorisiert", :status => 401
+        end
+      end
+    end
+
     def get_article
       if is_startpage?
+        I18n.locale = :de
         @article = Goldencobra::Article.active.startpage.first
       else
         begin
+          set_locale_by_url
           article_by_role
           set_format
         rescue
@@ -117,7 +137,6 @@ module Goldencobra
       end
     end
 
-    private
 
     # ------------------ Redirection ------------------------------------------
     def redirect_dynamically
@@ -148,8 +167,21 @@ module Goldencobra
         render :text => "404", :status => 404
       end
     end
+
+    def redirect_to_401
+      ActiveSupport::Notifications.instrument("goldencobra.article.not_authorized", :params => params)
+      @article = Goldencobra::Article.find_by_url_name("401")
+      if @article
+        respond_to do |format|
+          format.html { render :layout => @article.selected_layout, :status => 401 }
+        end
+      else
+        render :text => "401: Nicht authorisiert", :status => 401
+      end
+    end
     # ------------------ /Redirection -----------------------------------------
 
+
     # ------------------ 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)
@@ -159,9 +191,6 @@ module Goldencobra
       Goldencobra::Article::LiquidParser["#{@article.article_type_form_file.downcase}"] = @article_type
     end
 
-    def include_related_models
-      @list_of_articles = @list_of_articles.includes("#{@article.article_type_form_file.downcase}") if @article.respond_to?(@article.article_type_form_file.downcase)
-    end
     # ------------------ /associated models -----------------------------------
 
     # ------------------ choose article to render -----------------------------
@@ -178,7 +207,11 @@ module Goldencobra
     end
 
     def serve_fresh_page?
-      !is_cachable? || stale?(last_modified: @article.date_of_last_modified_child, etag: @article.id)
+      if request.format == 'application/rss+xml'
+        stale?(last_modified: @article.date_of_last_modified_child, etag: @article)
+      else
+        !is_cachable? || stale?(last_modified: @article.date_of_last_modified_child, etag: @article)
+      end
       # If the request is stale according to the given timestamp and etag value
       # (i.e. it needs to be processed again) then execute this block
       #
@@ -199,50 +232,6 @@ module Goldencobra
     # ------------------ /choose article to render ----------------------------
 
     # ------------------ adjust response --------------------------------------
-    def sort_response
-      if @article.sort_order.present?
-        if @article.sort_order == "Random"
-          @list_of_articles = @list_of_articles.flatten.shuffle
-        elsif @article.sort_order == "Alphabetical"
-          @list_of_articles = @list_of_articles.flatten.sort_by{|article| article.title }
-        elsif @article.respond_to?(@article.sort_order)
-          sort_order = @article.sort_order.downcase
-          @list_of_articles = @list_of_articles.flatten.sort_by{|article| article.respond_to?(sort_order) ? article.send(sort_order) : article }
-        elsif @article.sort_order.include?(".")
-          sort_order = @article.sort_order.downcase.split(".")
-          @unsortable = @list_of_articles.flatten.select{|a| !a.respond_to_all?(@article.sort_order) }
-          @list_of_articles = @list_of_articles.flatten.delete_if{|a| !a.respond_to_all?(@article.sort_order) }
-          @list_of_articles = @list_of_articles.sort_by{|a| eval("a.#{@article.sort_order}") }
-          if @unsortable.count > 0
-            @list_of_articles = @unsortable + @list_of_articles
-            @list_of_articles = @list_of_articles.flatten
-          end
-        end
-        if @article.reverse_sort
-          @list_of_articles = @list_of_articles.reverse
-        end
-      end
-
-      if @article.sorter_limit && @article.sorter_limit > 0
-        @list_of_articles = @list_of_articles[0..@article.sorter_limit-1]
-      end
-    end
-
-    def get_articles_with_tags
-      @list_of_articles = @list_of_articles.tagged_with(@article.index_of_articles_tagged_with.split(",").map{|t| t.strip}, on: :tags, any: true)
-    end
-
-    def get_articles_without_tags
-      @list_of_articles = @list_of_articles.tagged_with(@article.not_tagged_with.split(",").map{|t| t.strip}, :exclude => true, on: :tags)
-    end
-
-    def get_articles_by_frontend_tags
-      @list_of_articles = @list_of_articles.tagged_with(params[:frontend_tags], on: :frontend_tags, any: true)
-    end
-
-    def get_articles_by_article_type
-      @list_of_articles = Goldencobra::Article.active.articletype("#{@article.article_type_form_file} Show")
-    end
 
     def set_expires_in
       if is_cachable?
@@ -262,20 +251,38 @@ module Goldencobra
     end
     # ------------------ /adjust response -------------------------------------
 
+    def set_locale_by_url
+      locale_article = params[:article_id].split("/").first
+      if I18n.available_locales.include?(locale_article.to_sym)
+        I18n.locale = locale_article
+        session[:locale] = I18n.locale
+      else
+        if session[:locale].present?
+          I18n.locale = session[:locale]
+        end
+      end
+    end
+
+
     def article_by_role
       # Admin should get preview of article even if it's offline
       if current_user && current_user.has_role?(Goldencobra::Setting.for_key("goldencobra.article.preview.roles").split(",").map{|a| a.strip})
         @article = Goldencobra::Article.search_by_url(params[:article_id])
       else
         article = Goldencobra::Article.active.search_by_url(params[:article_id])
-        operator = current_user || current_visitor
-        a = Ability.new(operator)
-        if a.can?(:read, article)
-          @article = article
+        if article
+          operator = current_user || current_visitor
+          a = Ability.new(operator)
+          if a.can?(:read, article)
+            @article = article
+          else
+            @unauthorized = true
+          end
         end
       end
     end
 
+
     def is_startpage?
       startpage = params[:startpage]
       startpage && (startpage == true || startpage == "true")
@@ -314,6 +321,9 @@ module Goldencobra
     end
 
     def is_cachable?
+      if session.present? && session['flash'].present?
+        return false
+      end
       if Goldencobra::Setting.for_key("goldencobra.article.cache_articles") == "true" && @article.cacheable
         #Wenn es einen current_user gibt, dann kein caching
         Devise.mappings.keys.each do |key|
@@ -326,5 +336,11 @@ module Goldencobra
         return false
       end
     end
+
+    def analytics
+      Goldencobra::Tracking.analytics(request, session[:user_location])
+    end
+
+
   end
 end