camaleon_cms 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 289ef1eabd68fa970c95a6abdb5dfb37908fc788
-  data.tar.gz: 1e19ff8c9e625de6849d1e54616f49f42238ca48
+  metadata.gz: 1d04da9c72bd60007ce6782ea3b4dee7283d482e
+  data.tar.gz: b097e968fc8eb8110ad743253adffb5a7c193410
 SHA512:
-  metadata.gz: 4a4ef462928c29569278fa1171e97de6c7573818aaaa09975f415948d7a90661de544adf87c697f58fc6c6d3ef70b84750c545e54e6e408d81364ef0c4d1e9ee
-  data.tar.gz: 25947d06a6e681ea99a988b65d385514dd6f333558658d0802e3a34d913823985356d44c795d91debfe976332397a5f2f748e100ddd4a2295ab92566e74afef8
+  metadata.gz: 0e5e8e7c6fbd11ede07e3af21a39513ebb7a8b573a71edced3bfc8275d68afd95b0368ac681b430a0de464f84f57fe9e3296691fb7353ee95b03acbf77aa33fe
+  data.tar.gz: 1850c3e2d6ee182f9b57588448333c424dcb60a1a3dde5c63debaf95fd5f42b2e771111584c8b812c0fa80ccceea4cb0e0cf45b7c5fa612792f2e0d5e4a6d435

data/README.md

@@ -167,7 +167,8 @@ http://camaleon.tuzitio.com/license.html/
 
 ## Coming soon
 * Documentation and Videos
-* Create more basic plugins
+* Create more basic plugins and themes
+
 
 ## Contributing
 * Fork it.

data/app/apps/themes/default/views/page.html.erb

@@ -5,7 +5,7 @@
                 <%= raw @post.the_thumb %>
             </div>
         <% end %>
-        <h1 class="entry-title"><%= raw @post.the_title %></h1>
+        <h1 class="entry-title"><%= @post.the_title %></h1>
     </header><!-- .entry-header -->
     <div class="entry-content">
         <%= raw @post.the_content %>

data/app/apps/themes/default/views/post.html.erb

@@ -5,7 +5,7 @@
                 <%= raw @post.the_thumb %>
             </div>
         <% end %>
-        <h1 class="entry-title"><%= raw @post.the_title %></h1>
+        <h1 class="entry-title"><%= @post.the_title %></h1>
     </header><!-- .entry-header -->
     <div class="entry-content">
         <%= raw @post.the_content %>

data/app/apps/themes/new/views/post.html.erb

@@ -3,7 +3,7 @@
     <div class="row">
         <div class="col-md-9 post-view">
             <article class="post-content">
-                <h1><%= raw @post.the_title %></h1>
+                <h1><%= @post.the_title %></h1>
                 <div class="author">
                     <time datetime=""><%= @post.the_created_at %></time>
                 </div>

data/app/assets/javascripts/admin/modal.js

@@ -80,10 +80,12 @@ jQuery(function(){
  * modal_size: "modal-lg", "modal-sm", ""(default as normal "")
  * callback: function evaluated after modal shown
  * type: modal color (primary|default|success)
+ * zindex: Integer zindex position (default nil)
+ * on_submit: Function executed after submit button click (if this is present, enable the submit button beside cancel button)
  * return modal object
  */
 function open_modal(settings){
-    var def = {title: "", content: null, url: null, show_footer: false, mode: "inline", ajax_params: {}, modal_size: "", type: '', modal_settings:{}, on_submit: null, callback: function(){}}
+    var def = {title: "", content: null, url: null, show_footer: false, mode: "inline", ajax_params: {}, zindex: nil, modal_size: "", type: '', modal_settings:{}, on_submit: null, callback: function(){}}
     settings = $.extend({}, def, settings);
     var modal = $('<div id="ow_inline_modal" class="modal fade modal-'+settings.type+'">'+
         '<div class="modal-dialog '+settings.modal_size+'">'+
@@ -103,6 +105,8 @@ function open_modal(settings){
         if(!$(e["currentTarget"]).attr("data-skip_destroy")) $(e["currentTarget"]).remove();
     });
 
+    if(settings.zindex) modal.css("z-index", settings.zindex);
+
     // submit button
     if(settings.on_submit) modal.find(".modal-footer .modal_submit").click(function(){
         settings.on_submit(modal);

data/app/assets/stylesheets/admin/custom_admin.css.scss

@@ -165,4 +165,7 @@
     width: 100%;
   }
 }
-//.introjs-skipbutton{ display: none; }
+//.introjs-skipbutton{ display: none; }
+#modal_elfinder{
+  z-index: 99999;
+}

data/app/controllers/concerns/frontend_concern.rb

@@ -9,11 +9,23 @@
 module FrontendConcern extend ActiveSupport::Concern
   # visiting sitemap.xml
   def sitemap
-
+    r = {layout: (params[:format] == "html" ? (self.send :_layout) : false), render: "sitemap"}
+    hooks_run("on_render_sitemap", r)
+    render r[:render], layout: r[:layout]
   end
 
   # accessing for robots.txt
   def robots
+    r = {layout: false, render: "robots"}
+    hooks_run("on_render_robots", r)
+    render r[:render], layout: r[:layout]
+  end
+
+  # rss for current site
+  def rss
+    r = {layout: false, render: "rss"}
+    hooks_run("on_render_rss", r)
+    render r[:render], layout: r[:layout]
   end
 
   # save comment from a post

data/app/controllers/frontend_controller.rb

@@ -16,17 +16,15 @@ class FrontendController < CamaleonController
   after_action :after_hooks
   # rescue_from ActiveRecord::RecordNotFound, with: :page_not_found
 
+  # home page for frontend
   def index
     init_seo(current_site)
-    r = {layout: (self.send :_layout), render: "nil", custom: false}; hooks_run("on_render_index", r)
-    if r[:custom]
-      render r[:render], layout: r[:layout]
+    if @_site_options[:home_page].present?
+      render_post(@_site_options[:home_page].to_i)
     else
-      if @_site_options[:home_page].present?
-        render_post(@_site_options[:home_page].to_i)
-      else
-        render "index"
-      end
+      r = {layout: (self.send :_layout), render: "index"}
+      hooks_run("on_render_index", r)
+      render r[:render], layout: r[:layout]
     end
   end
 
@@ -194,7 +192,7 @@ class FrontendController < CamaleonController
       page_404 = current_site.posts.find(@_site_options[:error_404]) rescue ""
       if page_404.present?
         page_404 = page_404.decorate
-        redirect_to page_404.the_link
+        redirect_to page_404.the_url
         return
       end
     end

data/app/helpers/frontend/seo_helper.rb

@@ -25,36 +25,46 @@ module Frontend::SeoHelper
     options[:keywords] = I18n.transliterate(is_home? ? current_site.the_option("keywords") : options[:keywords].to_s)
     options[:url] = request.original_url
     s = {
-       :title => options[:title],
-       :description => options[:description],
-       :keywords => options[:keywords],
-       :image => options[:image],
-       :author => current_site.get_option("seo_author"),
-       :og => {
-           :title    => options[:title],
-           :description    => options[:description],
-           :type     => 'website',
-           :url      => request.original_url,
-           :image    => options[:image]
-       },
-       :twitter => {
-           :card => 'summary',
-           :title    => options[:title],
-           :description    => options[:description],
-           :url      => request.original_url,
-           :image    => options[:image],
-           :site => current_site.get_option("twitter_card"),
-           :creator => current_site.get_option("twitter_card"),
-           :domain => request.host
-       },
-       alternate: { "application/rss+xml"=> rss_url }
-      }
+      title: options[:title],
+      description: options[:description],
+      keywords: options[:keywords],
+      image: options[:image],
+      author: current_site.get_option('seo_author'),
+      og: {
+        title: options[:title],
+        description: options[:description],
+        type: 'website',
+        url: request.original_url,
+        image: options[:image]
+      },
+      twitter: {
+        card: 'summary',
+        title: options[:title],
+        description: options[:description],
+        url:   request.original_url,
+        image: options[:image],
+        site: current_site.get_option('twitter_card'),
+        creator: current_site.get_option('twitter_card'),
+        domain: request.host
+      },
+      alternate: [
+        { type: 'application/rss+xml', href: rss_url }
+      ]
+    }
 
     l = current_site.get_languages
-    l.each{|_l| s[:alternate][_l] = current_site.the_url(locale: _l) } if l.size > 1
+    if l.size > 1
+      l.each do |lang|
+        s[:alternate] << {
+          href: current_site.the_url(locale: lang),
+          hreflang: lang
+        }
+      end
+    end
 
     # call all hooks for seo
-    r = {seo_data: s, object: options[:object]}; hooks_run("seo", r)
+    r = { seo_data: s, object: options[:object] }
+    hooks_run('seo', r)
     r[:seo_data]
   end
 end

data/app/views/default_theme/single.html.erb

@@ -4,7 +4,7 @@
         <% if @post_type.the_slug == "page" %>
             <div class="col-md-12 page-view">
                 <article class="post-content">
-                    <h1><%= raw @post.the_title %></h1>
+                    <h1><%= @post.the_title %></h1>
                     <div class="item-content">
                         <%= raw @post.the_content %>
                     </div>

data/app/views/default_theme/sitemap.html.erb

@@ -4,7 +4,7 @@
     </li>
     <% current_site.post_types.decorate.each do |ptype| %>
         <li>
-            <h3><a href="<%= ptype.the_title %>"><%= ptype.the_title %></a></h3>
+            <h3><a href="<%= ptype.the_url %>"><%= ptype.the_title %></a></h3>
             <% if ptype.manage_categories? %>
                 <%= raw(cama_sitemap_cats_generator(ptype.the_categories)) %>
             <% else %>

data/config/routes/frontend.rb

@@ -23,7 +23,7 @@ Rails.application.routes.draw do
       # sitemap
       get "sitemap" => :sitemap, as: :sitemap, defaults: { format: :xml }
       get "robots" => :robots, as: :robots, defaults: { format: :txt }
-      get "rss" =>:index, defaults: { format: "rss" }
+      get "rss", defaults: { format: "rss" }
       get "ajax"
     end
 

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = "1.0.5"
+  VERSION = "1.0.6"
 end

data/lib/generators/camaleon_cms/gem_plugin_generator.rb

@@ -9,7 +9,7 @@ module CamaleonCms
 
       def create_initializer_file
 
-        plugin_dir = Rails.root.join("plugins", get_plugin_name).to_s
+        plugin_dir = Rails.root.join("apps", get_plugin_name).to_s
         plugin_app = File.join($camaleon_engine_dir, "lib", "generators", "camaleon_cms", "gem_plugin_#{get_plugin_name}")
         FileUtils.rm_r(plugin_app) if Dir.exist?(plugin_app)
 

data/lib/generators/camaleon_cms/install_template/plugin_routes.rb

@@ -19,16 +19,4 @@ class PluginRoutes
     dir.pop
     dir.join("/")+ '/app/apps'
   end
-
-  # check if a gem is available or not
-  # Arguemnts:
-  # name: name of the gem
-  # return (Boolean) true/false
-  def self.get_gem(name)
-    Gem::Specification.find_by_name(name)
-  rescue Gem::LoadError
-    false
-  rescue
-    Gem.available?(name)
-  end
 end

data/lib/plugin_routes.rb

@@ -291,7 +291,7 @@ class PluginRoutes
       if File.exist?(config)
         p = JSON.parse(File.read(config))
         p = p.with_indifferent_access rescue p
-        p["key"] = gem.name
+        p["key"] = gem.name if p["key"].nil?
         p["path"] = path
         p["kind"] = "plugin"
         p["gem_mode"] = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-06 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching
@@ -98,16 +98,16 @@ dependencies:
   name: meta-tags
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
@@ -763,7 +763,6 @@ files:
 - app/views/default_theme/custom_fields/users.html.erb
 - app/views/default_theme/custom_fields/video.html.erb
 - app/views/default_theme/index.html.erb
-- app/views/default_theme/index.rss.builder
 - app/views/default_theme/layouts/_footer.html.erb
 - app/views/default_theme/layouts/_header.html.erb
 - app/views/default_theme/layouts/index.html.erb
@@ -783,6 +782,7 @@ files:
 - app/views/default_theme/post_type.rss.builder
 - app/views/default_theme/profile.html.erb
 - app/views/default_theme/robots.text.erb
+- app/views/default_theme/rss.rss.builder
 - app/views/default_theme/search.html.erb
 - app/views/default_theme/single.html.erb
 - app/views/default_theme/single.rss.builder