camaleon_cms 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f195f6cff8d88d9a9bc9232825dc047bc95bd9c
-  data.tar.gz: d4e89d111af8947ac27e0d67c8b6d425745c94fc
+  metadata.gz: ac6264aa837e1bf65d11ef13a9ddee7d7d287a7c
+  data.tar.gz: 030b3f0ba1bc3720d79aa2b99923bb812f019f95
 SHA512:
-  metadata.gz: 699091da7711e9a2c5dccf80d13dd43ff3184a12ee61acdf060f280ea900936ed605a50294e7fe3d2a5cc4eb92903167e4701c726d1cf10197ee80797c9da793
-  data.tar.gz: 3f507c0b08044285f0b3f3ed9a1208090a2d79648d4955b1d89e5aa6be66740230bcd6ce1c48dd107e5bbf4e85108e170988d06a97f5780326441b373f03ab2d
+  metadata.gz: 14c3f2a6edc55438f0788693fa764c817a7b26bd899774ace020d402ab7208561380629b17a29720e2483368b7955252d98bd5379b0ce029c5f2a01eb63b39a4
+  data.tar.gz: b1939cf9c2dc983e74ce60eff0580a232aa534da332cca90addba07b9899ffb0db33a4089ff97be49f96915930f356ff21c168518f8c8b747bc39e0a98225d3e

data/app/apps/plugins/contact_form/assets/js/form-builder/formbuilder.js

@@ -1163,7 +1163,7 @@ with (obj) {
                   '</ul>' +
                 '</div>\n' +
                 '<div class=\'panel-body\'>\n' +
-                  '<div class=\'fb-no-response-fields\'>'+lang.message_no_response_fields+'</div>\n  ' +
+                  '<div class=\'fb-no-response-fields\'>'+I18n("msg.no_response_fields")+'</div>\n  ' +
                   '<div class=\'fb-response-fields\'></div>\n' +
               '</div>\n' +
             '</div>\n' +

data/app/apps/plugins/contact_form/contact_form_html_helper.rb

@@ -23,7 +23,7 @@ module Plugins::ContactForm::ContactFormHtmlHelper
     current_site.contact_forms.where({parent_id: id})
   end
 
-  def  form_value_rescue(form)
+  def form_value_rescue(form)
     JSON.parse(form.settings).to_sym rescue form.value
   end
 
@@ -34,7 +34,7 @@ module Plugins::ContactForm::ContactFormHtmlHelper
     object.each do |ob|
       temp = "<div class='form-group'>
                <label>[label ci]</span></label>
-               #{ '<p>[descr ci]</p>' if ob[:field_options][:description].present?}
+               #{'<p>[descr ci]</p>' if ob[:field_options][:description].present?}
                <div>[ci]</div>
             </div>"
 
@@ -59,18 +59,16 @@ module Plugins::ContactForm::ContactFormHtmlHelper
           temp2=  form_select_multiple_bootstrap(ob, ob[:label], "checkbox",values)
         when 'text', 'website', 'email'
           class_type = ""
-
           class_type = "railscf-field-#{ob[:field_type]}" if ob[:field_type]=="website"
           class_type = "railscf-field-#{ob[:field_type]}" if ob[:field_type]=="email"
-
-          temp2=  "<input #{ob[:custom_attrs].to_attr_format} type=\"#{ob[:field_type]}\" value=\"#{values[cid]}\" name=\"#{f_name}\"  class=\"#{ob[:custom_class]} #{class_type}\">"
+          temp2 = "<input #{ob[:custom_attrs].to_attr_format} type=\"#{ob[:field_type]}\" value=\"#{values[cid]}\" name=\"#{f_name}\"  class=\"#{ob[:custom_class]} #{class_type}\">"
         when 'captcha'
-          temp2= captcha_tag(5, {}, {class: "#{ob[:custom_class]} field-captcha required"}.merge(ob[:custom_attrs]))
+          temp2 = captcha_tag(5, {}, {class: "#{ob[:custom_class]} field-captcha required"}.merge(ob[:custom_attrs]))
         when 'file'
           class_type = "railscf-field-#{ob[:field_type]}" if ob[:field_type]=="website"
-          temp2=  "<input multiple=\"multiple\" type=\"file\" value=\"\" name=\"#{f_name}\" #{ob[:custom_attrs].to_attr_format} class=\"#{class_type} #{ob[:custom_class]}\">"
+          temp2 = "<input multiple=\"multiple\" type=\"file\" value=\"\" name=\"#{f_name}\" #{ob[:custom_attrs].to_attr_format} class=\"#{class_type} #{ob[:custom_class]}\">"
         when 'dropdown'
-          temp2=  form_select_multiple_bootstrap(ob, ob[:label], "select",values)
+          temp2 = form_select_multiple_bootstrap(ob, ob[:label], "select",values)
         else
       end
       r[:template] = r[:template].sub('[label ci]', for_name).sub('[ci]', temp2)
@@ -81,7 +79,6 @@ module Plugins::ContactForm::ContactFormHtmlHelper
   end
 
   def form_select_multiple_bootstrap(ob, title, type, values)
-
     options = ob[:field_options][:options]
     include_other_option = ob[:field_options][:include_other_option]
     other_input = ""
@@ -91,7 +88,7 @@ module Plugins::ContactForm::ContactFormHtmlHelper
     cid = ob[:cid].to_sym
     html = ""
 
-    if type=="radio" || type=="checkbox"
+    if type == "radio" || type == "checkbox"
 
       other_input = (include_other_option)? "<div class=\"#{type} #{ob[:custom_class]}\"> <label for=\"#{ob[:cid]}\"><input id=\"#{ob[:cid]}-other\" type=\"#{type}\" name=\"#{title.downcase}[]\" class=\"\">Other <input type=\"text\" /></label></div>" : " "
 
@@ -101,62 +98,43 @@ module Plugins::ContactForm::ContactFormHtmlHelper
 
     options.each do |op|
       if type == "radio" || type == "checkbox"
-        html +=  "<div class=\"#{type} #{ob[:custom_class]}\">
+        html += "<div class=\"#{type} #{ob[:custom_class]}\">
                     <label for=\"#{ob[:cid]}\">
                       <input #{ob[:custom_attrs].to_attr_format} type=\"#{type}\" name=\"#{f_name}[]\" class=\"\" value=\"#{op[:label].downcase}\">
                       #{op[:label]}
                     </label>
                   </div>"
       else
-        html +=  "<option  value=\"#{op[:label].downcase.gsub(" ", "_")}\" #{"selected" if "#{op[:label].downcase.gsub(" ", "_")}" == values[cid]} >#{op[:label]}</option>"
+        html += "<option  value=\"#{op[:label].downcase.gsub(" ", "_")}\" #{"selected" if "#{op[:label].downcase.gsub(" ", "_")}" == values[cid]} >#{op[:label]}</option>"
       end
     end
 
-    if type=="radio" || type=="checkbox"
+    if type == "radio" || type == "checkbox"
       html += other_input
     else
       html += " </select>"
     end
-
   end
 
-  def form_post_email_content(op_body, op_fields, fields, file_attachments)
-    @values = {}
+  def convert_form_values(op_fields, fields)
+    values = {}
 
     op_fields.each do |field|
       cid = field[:cid].to_sym
       label = field[:label]
 
-      @values[label] = []
+      values[label] = []
 
-      if field[:field_type] == "file"
-        @values[label] << fields[cid].original_filename  if fields[cid].present?
-      elsif field[:field_type] == "captcha"
-        @values[label] << session[:captcha]
-      elsif field[:field_type] == "radio" || field[:field_type] == "checkboxes"
-        @values[label] << fields[cid].join(",")  if fields[cid].present?
+      if field[:field_type] == 'file'
+        values[label] << fields[cid].original_filename if fields[cid].present?
+      elsif field[:field_type] == 'captcha'
+        values[label] << session[:captcha]
+      elsif field[:field_type] == 'radio' || field[:field_type] == 'checkboxes'
+        values[label] << fields[cid].join(',') if fields[cid].present?
       else
-        @values[label] << fields[cid]  if fields[cid].present?
-      end
-
-    end
-
-    html = "<div class=\"data_body\"></div>"
-    html += "<table style=\"width:100%; float:left\"><tbody><tr><td style=\"width:50%; float:left\">"
-
-    @values.each do |ind, val|
-      if val.to_s != "[]"
-        html += "<div class=\"data_field\"><strong>"+ind + ":</strong>" + "#{val[0].to_s}" +"</div>"
+        values[label] << fields[cid] if fields[cid].present?
       end
     end
-
-    html += "</td><td style=\"width:48%; float:left; vertical-align: top;\">"
-
-    file_attachments.each do |attachment|
-      html += "<div class=\"data_link\"> <strong>Attachment:</strong> <a href=\"'#{attachment}'\">'#{File.basename(attachment)}'</a></div>"
-    end
-
-    html += "</td></tr></tbody></table>"
+    return values
   end
-
 end

data/app/apps/plugins/contact_form/front_controller.rb

@@ -7,6 +7,7 @@
   See the  GNU Affero General Public License (GPLv3) for more details.
 =end
 class Plugins::ContactForm::FrontController < Apps::PluginsFrontController
+  before_filter :append_view_paths
 
   def index
     # here your actions for frontend module
@@ -19,10 +20,9 @@ class Plugins::ContactForm::FrontController < Apps::PluginsFrontController
     settings = JSON.parse(@form.settings).to_sym
     fields = params[:fields]
     attachments = []
-    file_attachments = []
 
     errors = []
-    succes = []
+    success = []
 
     validate = true
 
@@ -31,75 +31,86 @@ class Plugins::ContactForm::FrontController < Apps::PluginsFrontController
       label = f[:label].to_sym
 
       case f[:field_type].to_s
-        when 'text', 'website', 'paragraph', 'textarea', 'email', 'radio', 'checkboxes', 'dropdown', 'file'
-          if f[:required] && !fields[cid].present?
-            errors << "#{label}: #{settings[:railscf_message][:invalid_required]}"
-            validate = false
-          end
-          if f[:field_type].to_s == "email"
-            if !fields[cid].match(/\b[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}\z/)
-              errors << "#{label}: #{settings[:railscf_message][:invalid_email]}"
-              validate = false
-            end
-          end
-        when 'radio'
-
-        when 'checkboxes'
-
-        when 'dropdown'
-
-        when 'captcha'
-          if !captcha_verified?
-            errors << "#{label}: #{settings[:railscf_message][:captcha_not_match]}"
+      when 'text', 'website', 'paragraph', 'textarea', 'email', 'radio', 'checkboxes', 'dropdown', 'file'
+        if f[:required] && !fields[cid].present?
+          errors << "#{label}: #{settings[:railscf_message][:invalid_required]}"
+          validate = false
+        end
+        if f[:field_type].to_s == "email"
+          if !fields[cid].match(/\b[A-Z0-9._%a-z\-]+@(?:[A-Z0-9a-z\-]+\.)+[A-Za-z]{2,4}\z/)
+            errors << "#{label}: #{settings[:railscf_message][:invalid_email]}"
             validate = false
           end
+        end
+      when 'captcha'
+        unless captcha_verified?
+          errors << "#{label}: #{settings[:railscf_message][:captcha_not_match]}"
+          validate = false
+        end
       end
     end
 
     if validate
       values[:fields].each do |f|
         cid = f[:cid].to_sym
-        if f[:field_type] == "file"
+        if f[:field_type] == 'file'
           res = upload_file(fields[cid], {maximum: 5.megabytes, folder: current_site.upload_directory("uploads")})
           if res[:error].present?
             errors << res[:error]
           else
-            attachments << res["file"]
+            attachments << res['file']
           end
         end
       end
 
       new_settings = {"fields" => fields, "created_at" => Time.now.strftime("%Y-%m-%d %H:%M:%S").to_s}.to_json
-      @form_new =  current_site.contact_forms.new(name: "response-#{Time.now}", description: @form.description, settings:fix_meta_value(new_settings), site_id: @form.site_id, parent_id: @form.id)
+      @form_new = current_site.contact_forms.new(name: "response-#{Time.now}", description: @form.description, settings:fix_meta_value(new_settings), site_id: @form.site_id, parent_id: @form.id)
 
       if @form_new.save
-        template_path = "html_mailer"
-
-        dir = Dir.glob("app/apps/themes/#{current_theme.the_slug.to_s}/views/html_mailer/*")
-        content = form_post_email_content(settings[:railscf_mail][:body], values[:fields], fields, attachments)
-        sendmail(settings[:railscf_mail][:to], settings[:railscf_mail][:subject], content, settings[:railscf_mail][:to], attachments) # send mail
-        succes << settings[:railscf_message][:mail_sent_ok]
+        content = render_to_string partial: 'contact_form/submission',
+                                   layout: false,
+                                   locals: {
+                                     file_attachments: attachments,
+                                     fields: convert_form_values(
+                                       values[:fields],
+                                       fields
+                                     )
+                                   }
+        # send mail
+        sendmail(
+          settings[:railscf_mail][:to], settings[:railscf_mail][:subject],
+          content,
+          settings[:railscf_mail][:to],
+          attachments
+        )
+        success << settings[:railscf_message][:mail_sent_ok]
       else
         errors << settings[:railscf_message][:mail_sent_ng]
       end
     end
 
-    if succes.present?
-      flash[:notice] = succes.join("<br>")
+    if success.present?
+      flash[:notice] = success.join('<br>')
     else
-      flash[:error] = errors.join("<br>")
+      flash[:error] = errors.join('<br>')
       flash[:values] = fields
     end
 
     redirect_to :back
   end
 
+  private
+
+  def append_view_paths
+    append_view_path File.join($camaleon_engine_dir, 'app', 'apps', 'plugins', self_plugin_key, 'views')
+  end
+
   def fix_meta_value(value)
-    if (value.is_a?(Array) || value.is_a?(Hash))
+    if value.is_a?(Array) || value.is_a?(Hash)
       value = value.to_json
     elsif value.is_a?(String)
       value = value.to_var
     end
     value
   end
-end
+end

data/app/apps/plugins/contact_form/views/admin_forms/edit.html.erb

@@ -97,26 +97,6 @@
                                         <label for="railscf_mail_body"><%= t('plugin.contact_form.body') %>:</label><br>
                                         <textarea rows="4" cols="5" id="railscf_mail_body" class="form-control" name="railscf_mail[body]"><%= t('plugin.contact_form.body_value') %></textarea>
                                     </div>
-
-                                    <div class="form-group">
-                                        <label for="railscf_mail_body"><%= t('admin.sidebar.themes') %>:</label><br>
-                                        <% dir = Dir.glob("app/apps/themes/#{current_theme.the_slug.to_s}/views/html_mailer/*") %>
-                                        <select id="railscf_mail_theme" name="railscf_mail[theme]">
-                                            <% if dir.size > 0 %>
-                                                <% dir.each do |archivo| file=File.basename(archivo) %>
-                                                    <% f=file.split('.') %>
-                                                    <option value="<%= f[0].to_s %>"><%= f[0].to_s.titleize %></option>
-                                                <% end %>
-                                            <% else %>
-                                                <% dir = Dir.glob("app/views/html_mailer/*") %>
-                                                <% dir.each do |archivo| file=File.basename(archivo) %>
-                                                    <% f=file.split('.') %>
-                                                    <option value="<%= f[0].to_s %>"><%= f[0].to_s.titleize %></option>
-                                                <% end %>
-
-                                            <% end %>
-                                        </select>
-                                    </div>
                                 </div>
                             </div>
                         </div>

data/app/apps/plugins/contact_form/views/contact_form/_submission.html.erb

@@ -0,0 +1,26 @@
+<div class="data_body">
+  <table style="width: 100%; float: left;">
+    <tbody>
+      <tr>
+        <td style="width: 50%; float: left">
+          <% fields.each do |key, value| %>
+            <div class="data_field">
+              <strong><%= key %>:</strong>
+              <%= value[0] %>
+            </div>
+          <% end %>
+        </td>
+        <td style="width: 48%; float: left; vertical-align: top">
+          <% file_attachments.each do |attachment| %>
+            <div class="data_link">
+              <strong>Attachment: </strong>
+              <a href="<%= attachment %>">
+                <%= File.basename(attachment) %>
+              </a>
+            </div>
+          <% end %>
+        </td>
+      </tr>
+    </tbody>
+  </table>
+</div>

data/app/controllers/concerns/frontend_concern.rb

@@ -9,59 +9,6 @@
 module FrontendConcern extend ActiveSupport::Concern
   # visiting sitemap.xml
   def sitemap
-    # create sitemap directory
-    sitemaps_dir = Rails.root.join("public", "sitemaps").to_s
-    FileUtils.mkdir(sitemaps_dir) unless Dir.exist?(sitemaps_dir)
-
-    site = current_site
-    folder "sitemaps/#{site.slug}"
-    host site.the_url.to_s.parse_domain
-    langs = site.get_languages
-
-    sitemap :site do
-      url root_url, priority: 1.0, change_freq: "daily"
-
-      langs.each_with_index{|l, index| url site.the_url(locale: index==0?nil:l), last_mod: site.updated_at, priority: 0.9 }
-      url sitemap_url
-    end
-
-
-    sitemap_for site.posts.public_posts, name: :published_posts do |post|
-      post = post.decorate
-      langs.each_with_index{|l, index| url post.the_url(locale: index==0?nil:l), last_mod: post.updated_at, priority: 0.7 }
-    end
-
-    sitemap_for site.full_categories.no_empty, name: :categories do |cat|
-      cat = cat.decorate
-      langs.each_with_index{|l, index| url cat.the_url(locale: index==0?nil:l), last_mod: cat.updated_at, priority: 0.5 }
-    end
-
-    sitemap_for site.post_types, name: :groups do |ptype|
-      ptype = ptype.decorate
-      langs.each_with_index{|l, index| url ptype.the_url(locale: index==0?nil:l), last_mod: ptype.updated_at, priority: 0.3 }
-    end
-
-    sitemap_for site.post_tags, name: :tags do |ptag|
-      ptag = ptag.decorate
-      langs.each_with_index{|l, index| url ptag.the_url(locale: index==0?nil:l), last_mod: ptag.updated_at, priority: 0.2 }
-    end
-
-    # hooks
-    c = CamaleonController.new
-    c.instance_eval do
-      @current_site = site
-      @_hooks_skip = []
-    end
-
-    # sample: sitemap :site2 do \n  url root_url  \n   end
-    r = {site: site, eval: ""}; c.hooks_run("sitemap", r)
-    instance_eval(r[:eval]) if r[:eval].present?
-
-    ping_with "http://#{host}/sitemap.xml"
-  end
-
-
-  def sitemap2
     path = Rails.root.join("public", "sitemaps", current_site.slug, "sitemap.xml")
     if File.exists?(path)
       respond_to do |format|

data/app/helpers/admin/application_helper.rb

@@ -16,7 +16,7 @@ module Admin::ApplicationHelper
   def admin_system_notifications(args)
     if Date.parse(current_site.get_option("date_notified", 2.days.ago).to_s) < Date.today
       current_site.set_option("date_notified", Date.today)
-      url = "http://camaleon.tuzitio.com/plugins/camaleon_notification/?version=#{"CamaleonCms::VERSION"}&admin_locale=#{current_site.get_admin_language}&site=#{current_site.the_url}"
+      url = "http://camaleon.tuzitio.com/plugins/camaleon_notification/?version=#{CamaleonCms::VERSION}&admin_locale=#{current_site.get_admin_language}&site=#{current_site.the_url}"
       Thread.new do
         current_site.set_meta("date_notified_message", open(url).read)
         ActiveRecord::Base.connection.close #closing connection

data/app/helpers/site_helper.rb

@@ -54,7 +54,7 @@ module SiteHelper
   # get list templates files of current theme
   def get_list_template_files
     contained_files = []
-    Dir[File.join(current_theme.settings["path"], "views", '*.html.erb')].each do |path|
+    Dir[File.join(current_theme.settings["path"], "views", '*')].each do |path|
       f_name = File.basename(path)
       contained_files << f_name.split(".").first if f_name.include?('template_')
     end

data/app/views/layouts/admin/_footer.html.erb

@@ -1,6 +1,6 @@
 <footer class="main-footer">
     <div class="pull-right hidden-xs">
-        <b>Version</b> 1.x <%#= CamaleonCms::VERSION %>
+        <b>Version</b><%= CamaleonCms::VERSION %>
     </div>
     <strong>Copyright &copy; 2015-2016 <a href="http://camaleon.tuzitio.com">Camaleon CMS.</a> </strong> All rights reserved.
-</footer>
+</footer>

data/config/initializers/sass.rb

@@ -1,42 +1,89 @@
-module Sass::Script::Functions
-  # similar to asset_path with prefix for current theme asset
-  # def theme_path(path, options = {})
-  #   asset_path("#{get_theme_prefix}#{path}", options)
-  # end
+# module Sass::Script::Functions
+#   # similar to asset_path with prefix for current theme asset
+#   # def theme_path(path, options = {})
+#   #   asset_path("#{get_theme_prefix}#{path}", options)
+#   # end
+#
+#   # similar to asset_url with prefix for current theme asset
+#   def theme_asset(path, options = {})
+#     asset_url("#{get_theme_prefix}#{path}", options)
+#   end
+#
+#   # similar to asset_url with prefix for current theme asset
+#   def asset_owencio(path, options = {})
+#     puts "*****************************"
+#     puts "*****************************"
+#     puts "*****************************"
+#     puts "*****************************"
+#     puts "*****************************"
+#     puts "*****************************"
+#     puts "*****************************"
+#     puts "*****************************"
+#     puts "*****************************"
+#     puts "*****************************"
+#     puts "*****************************"
+#     puts "*****************************"
+#     asset_url("#{get_theme_prefix}#{path}", options)
+#     Autoload::Sass::Script::String.new("url(#{asset_path("#{get_theme_prefix}#{path}", options)})")
+#   end
+#
+#   # # similar to asset_path with prefix for current plugin asset
+#   # def plugin_path(path, options = {})
+#   #   asset_path("#{get_plugin_prefix}#{path}", options)
+#   # end
+#
+#   # similar to asset_url with prefix for current plugin asset
+#   def plugin_asset(path, options = {})
+#     asset_url("#{get_plugin_prefix}#{path}", options)
+#   end
+#
+#   private
+#   # get plugin asset prefix
+#   def get_plugin_prefix
+#     file = sprockets_context.filename
+#     res = ""
+#     if file.include?("/app/apps/plugins/")
+#       res = "themes/#{file.split("/app/apps/plugins/").last.split("/").first}/assets/"
+#     end
+#     res
+#   end
+#
+#   # get theme asset prefix
+#   def get_theme_prefix
+#     file = sprockets_context.filename
+#     res = ""
+#     if file.include?("/app/apps/themes/")
+#       res = "themes/#{file.split("/app/apps/themes/").last.split("/").first}/assets/"
+#     end
+#     res
+#   end
+# end
 
-  # similar to asset_url with prefix for current theme asset
-  def theme_asset(path, options = {})
-    asset_url("#{get_theme_prefix}#{path}", options)
-  end
-
-  # # similar to asset_path with prefix for current plugin asset
-  # def plugin_path(path, options = {})
-  #   asset_path("#{get_plugin_prefix}#{path}", options)
-  # end
-
-  # similar to asset_url with prefix for current plugin asset
-  def plugin_asset(path, options = {})
-    asset_url("#{get_plugin_prefix}#{path}", options)
-  end
 
-  private
-  # get plugin asset prefix
-  def get_plugin_prefix
-    file = sprockets_context.filename
-    res = ""
-    if file.include?("/app/apps/plugins/")
-      res = "themes/#{file.split("/app/apps/plugins/").last.split("/").first}/assets/"
-    end
-    res
-  end
+module Sprockets
+  # Processor engine class for the SASS/SCSS compiler. Depends on the `sass` gem.
+  #
+  # For more infomation see:
+  #
+  #   https://github.com/sass/sass
+  #   https://github.com/rails/sass-rails
+  #
+  class SassProcessor
+    module Functions
 
-  # get theme asset prefix
-  def get_theme_prefix
-    file = sprockets_context.filename
-    res = ""
-    if file.include?("/app/apps/themes/")
-      res = "themes/#{file.split("/app/apps/themes/").last.split("/").first}/assets/"
+      def asset_owencio(path, options = {})
+        puts "%%%%%%%%%%%%%%%"
+        puts "%%%%%%%%%%%%%%%"
+        puts "%%%%%%%%%%%%%%%"
+        puts "%%%%%%%%%%%%%%%"
+        puts "%%%%%%%%%%%%%%%"
+        puts "%%%%%%%%%%%%%%%"
+        puts "%%%%%%%%%%%%%%%"
+        puts "%%%%%%%%%%%%%%%"
+        puts "***************** #{path.inspect}---#{options.inspect}"
+        ass
+        Autoload::Sass::Script::String.new("url(#{asset_path(path, options).value})")
+      end
     end
-    res
   end
 end

data/config/sitemap.rb

@@ -15,6 +15,7 @@ Site.all.each do |site|
 
   sitemap :site do
     url root_url, priority: 1.0, change_freq: "daily"
+
     langs.each_with_index{|l, index| url site.the_url(locale: index==0?nil:l), last_mod: site.updated_at, priority: 0.9 }
     url sitemap_url
   end

data/lib/camaleon_cms.rb

@@ -1,4 +1,5 @@
 require 'camaleon_cms/engine'
+require 'camaleon_cms/version'
 
 module CamaleonCms
 end

data/lib/camaleon_cms/version.rb

@@ -1,3 +1,3 @@
 module CamaleonCms
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/generators/camaleon_cms/gem_theme_generator.rb

@@ -0,0 +1,122 @@
+require 'rails/generators/base'
+require 'securerandom'
+module CamaleonCms
+  module Generators
+    class GemPluginGenerator < Rails::Generators::Base
+      source_root File.expand_path("../gem_plugin_template", __FILE__)
+      argument :plugin_name, :type => :string, :default => "my_plugin"
+      desc "This generator create all basic gem plugin structure."
+
+      def create_initializer_file
+
+        plugin_dir = Rails.root.join("plugins", 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)
+
+        FileUtils.mkdir_p(plugin_dir)
+        system("cd #{Rails.root}; rails plugin new plugins/#{get_plugin_name} --full")
+
+        FileUtils.cp_r(File.join($camaleon_engine_dir, "lib", "generators", "camaleon_cms", "gem_theme_template"), plugin_app)
+
+        # tmp copy
+        helper_path = File.join(plugin_app, "app", "helpers", "plugins", get_plugin_name)
+        model_path = File.join(plugin_app, "app", "models", "plugins", get_plugin_name)
+        views_path = File.join(plugin_app, "app", "views", "plugins", get_plugin_name)
+        controller_path = File.join(plugin_app, "app", "controllers", "plugins", get_plugin_name)
+        FileUtils.mv(File.join(plugin_app, "app", "controllers", "plugins", "my_plugin"), controller_path) rescue nil
+        FileUtils.mv(File.join(plugin_app, "app", "helpers", "plugins", "my_plugin"), helper_path) rescue nil
+        FileUtils.mv(File.join(plugin_app, "app", "models", "plugins", "my_plugin"), model_path) rescue nil
+        FileUtils.mv(File.join(plugin_app, "app", "views", "plugins", "my_plugin"), views_path) rescue nil
+        FileUtils.mv(File.join(plugin_app, "app", "assets", "images", "plugins", "my_plugin"), File.join(plugin_app, "app", "assets", "images", "plugins", get_plugin_name)) rescue nil
+        FileUtils.mv(File.join(plugin_app, "app", "assets", "javascripts", "plugins", "my_plugin"), File.join(plugin_app, "app", "assets", "javascripts", "plugins", get_plugin_name)) rescue nil
+        FileUtils.mv(File.join(plugin_app, "app", "assets", "stylesheets", "plugins", "my_plugin"), File.join(plugin_app, "app", "assets", "stylesheets", "plugins", get_plugin_name)) rescue nil
+
+        # configuration
+        t = fix_text(File.read(File.join(plugin_app, "config", "camaleon_plugin.json")))
+        File.open(File.join(plugin_app, "config", "camaleon_plugin.json"), "w"){|f| f << t }
+
+        # helper
+        t = fix_text(File.read(File.join(helper_path, "main_helper.rb")))
+        File.open(File.join(helper_path, "main_helper.rb"), "w"){|f|  f << t }
+
+        # controllers
+        t = fix_text(File.read(File.join(controller_path, "admin_controller.rb")))
+        File.open(File.join(controller_path, "admin_controller.rb"), "w"){|f| f << t }
+        t = fix_text(File.read(File.join(controller_path, "front_controller.rb")))
+        File.open(File.join(controller_path, "front_controller.rb"), "w"){|f| f << t }
+
+        # models
+        model_file = File.join(model_path, "my_plugin.rb")
+        t = fix_text(File.read(model_file))
+        File.open(model_file, "w"){|f| f << t }
+        FileUtils.mv(model_file, File.join(File.dirname(model_file), "#{get_plugin_name}.rb")) rescue nil
+
+
+        directory(plugin_app, plugin_dir)
+        gsub_file File.join(plugin_dir, "config", "routes.rb"), "end" do
+          "
+  scope '(:locale)', locale: /\#{PluginRoutes.all_locales}/, :defaults => {  } do
+    # frontend
+    namespace :plugins do
+      namespace '#{get_plugin_name}' do
+        get 'index' => 'front#index'
+      end
+    end
+  end
+
+  #Admin Panel
+  scope 'admin', as: 'admin' do
+    namespace 'plugins' do
+      namespace '#{get_plugin_name}' do
+        get 'index' => 'admin#index'
+      end
+    end
+  end
+
+  # main routes
+  #scope '#{get_plugin_name}', module: 'plugins/#{get_plugin_name}/', as: '#{get_plugin_name}' do
+  #  Here my routes for main routes
+  #end
+end"
+        end
+
+        append_to_file Rails.root.join("Gemfile") do
+          "\n\ngem '#{get_plugin_name}', path:  '#{plugin_dir}/'"
+        end
+
+        # destroy non used files
+        FileUtils.rm_r(plugin_app)
+        FileUtils.rm_r(File.join(plugin_dir, "app", "assets", "images", get_plugin_name))
+        FileUtils.rm_r(File.join(plugin_dir, "app", "assets", "javascripts", get_plugin_name))
+        FileUtils.rm_r(File.join(plugin_dir, "app", "assets", "stylesheets", get_plugin_name))
+
+        # remove TODO text from gem
+        gemspec_file = File.join(plugin_dir, "#{get_plugin_name}.gemspec")
+        t = File.read(gemspec_file).gsub("TODO", "")
+        File.open(gemspec_file, "w"){|f| f << t }
+
+      end
+
+      def fix_text(text = "")
+        text.gsub("pluginTitle", get_plugin_title).gsub("PluginClass", get_plugin_class).gsub("pluginKey", get_plugin_name)
+      end
+
+      def self.next_migration_number(dir)
+        Time.now.utc.strftime("%Y%m%d%H%M%S")
+      end
+
+      private
+      def get_plugin_name
+        plugin_name.underscore.singularize
+      end
+
+      def get_plugin_title
+        plugin_name.titleize
+      end
+      def get_plugin_class
+        get_plugin_name.classify
+      end
+
+    end
+  end
+end

data/lib/generators/camaleon_cms/gem_theme_template/app/controllers/plugins/my_plugin/admin_controller.rb

@@ -0,0 +1,8 @@
+class Plugins::PluginClass::AdminController < Apps::PluginsAdminController
+  include Plugins::PluginClass::MainHelper
+  def index
+    # actions for admin panel
+  end
+
+  # add custom methods below
+end

data/lib/generators/camaleon_cms/gem_theme_template/app/controllers/plugins/my_plugin/front_controller.rb

@@ -0,0 +1,8 @@
+class Plugins::PluginClass::FrontController < Apps::PluginsFrontController
+  include Plugins::PluginClass::MainHelper
+  def index
+    # actions for frontend module
+  end
+
+  # add custom methods below
+end

data/lib/generators/camaleon_cms/gem_theme_template/app/helpers/plugins/my_plugin/main_helper.rb

@@ -0,0 +1,22 @@
+module Plugins::PluginClass::MainHelper
+  def self.included(klass)
+    # klass.helper_method [:my_helper_method] rescue "" # here your methods accessible from views
+  end
+
+  # here all actions on going to active
+  # you can run sql commands like this:
+  # results = ActiveRecord::Base.connection.execute(query);
+  # plugin: plugin model
+  def pluginKey_on_active(plugin)
+  end
+
+  # here all actions on going to inactive
+  # plugin: plugin model
+  def pluginKey_on_inactive(plugin)
+  end
+
+  # here all actions to upgrade for a new version
+  # plugin: plugin model
+  def pluginKey_on_upgrade(plugin)
+  end
+end

data/lib/generators/camaleon_cms/gem_theme_template/app/models/plugins/my_plugin/my_plugin.rb

@@ -0,0 +1,12 @@
+# class Plugins::PluginClass::Models::PluginClass < ActiveRecord::Base
+  # attr_accessible :path, :browser_key
+  # belongs_to :site
+
+  # here create your models normally
+  # notice: your tables in database will be plugins_pluginKey in plural (check rails documentation)
+# end
+
+# here your default models customization
+# Site.class_eval do
+#   has_many :pluginKey, class_name: "Plugins::PluginClass::Models::PluginClass"
+# end

data/lib/generators/camaleon_cms/gem_theme_template/app/views/plugins/my_plugin/admin/index.html.erb

@@ -0,0 +1,2 @@
+<%#= javascript_include_tag plugin_gem_asset("js/my_file.js") %>
+Plugin ready to use in admin panel!.

data/lib/generators/camaleon_cms/gem_theme_template/app/views/plugins/my_plugin/front/index.html.erb

@@ -0,0 +1,2 @@
+<%#= javascript_include_tag plugin_gem_asset("js/my_file.js") %>
+Plugin ready to use! in frontend.

data/lib/generators/camaleon_cms/gem_theme_template/app/views/plugins/my_plugin/layouts/readme.txt

@@ -0,0 +1,2 @@
+You can create your layouts here.
+To load your custom layout you can use: layout: plugin_layout(<layout_name>) in your controller

data/lib/generators/camaleon_cms/gem_theme_template/config/camaleon_plugin.json

@@ -0,0 +1,21 @@
+{
+  "title": "pluginTitle",
+  "descr": "",
+  "version": "0.1",
+  "key": "pluginKey",
+  "helpers": [
+    "Plugins::PluginClass::MainHelper"
+  ],
+  "hooks": {
+    "on_active": [
+      "pluginKey_on_active"
+    ],
+    "on_inactive": [
+      "pluginKey_on_inactive"
+    ],
+    "on_upgrade": [
+      "pluginKey_on_upgrade"
+    ]
+    //here you can add all your hooks (read documentation)
+  }
+}

data/lib/plugin_routes.rb

@@ -233,6 +233,7 @@ class PluginRoutes
     r = cache_variable("all_plugins"); return r unless (r.nil? || r == [])
     res = get_gem_plugins
     entries = [".", ".."]
+    res.each{|plugin| entries << plugin["key"] }
     (Dir["#{apps_dir}/plugins/*"] + Dir["#{camaleon_gem.gem_dir}/app/apps/plugins/*"]).each do |path|
       entry = path.split("/").last
       config = File.join(path, "config", "config.json")
@@ -255,6 +256,7 @@ class PluginRoutes
     r = cache_variable("all_themes"); return r unless (r.nil? || r == [])
     res = get_gem_themes
     entries = [".", ".."]
+    res.each{|theme| entries << theme["key"] }
     (Dir["#{apps_dir}/themes/*"] + Dir["#{camaleon_gem.gem_dir}/app/apps/themes/*"]).each do |path|
       entry = path.split("/").last
       config = File.join(path, "config", "config.json")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: camaleon_cms
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Owen Peredo Diaz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-28 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-page_caching
@@ -235,6 +235,7 @@ files:
 - app/apps/plugins/contact_form/views/admin_forms/index.html.erb
 - app/apps/plugins/contact_form/views/admin_forms/manual.html.erb
 - app/apps/plugins/contact_form/views/admin_forms/responses.html.erb
+- app/apps/plugins/contact_form/views/contact_form/_submission.html.erb
 - app/apps/plugins/contact_form/views/forms_shorcode.html.erb
 - app/apps/plugins/contact_form/views/front/index.html.erb
 - app/apps/plugins/front_cache/admin_controller.rb
@@ -860,6 +861,15 @@ files:
 - lib/generators/camaleon_cms/gem_plugin_template/app/views/plugins/my_plugin/front/index.html.erb
 - lib/generators/camaleon_cms/gem_plugin_template/app/views/plugins/my_plugin/layouts/readme.txt
 - lib/generators/camaleon_cms/gem_plugin_template/config/camaleon_plugin.json
+- lib/generators/camaleon_cms/gem_theme_generator.rb
+- lib/generators/camaleon_cms/gem_theme_template/app/controllers/plugins/my_plugin/admin_controller.rb
+- lib/generators/camaleon_cms/gem_theme_template/app/controllers/plugins/my_plugin/front_controller.rb
+- lib/generators/camaleon_cms/gem_theme_template/app/helpers/plugins/my_plugin/main_helper.rb
+- lib/generators/camaleon_cms/gem_theme_template/app/models/plugins/my_plugin/my_plugin.rb
+- lib/generators/camaleon_cms/gem_theme_template/app/views/plugins/my_plugin/admin/index.html.erb
+- lib/generators/camaleon_cms/gem_theme_template/app/views/plugins/my_plugin/front/index.html.erb
+- lib/generators/camaleon_cms/gem_theme_template/app/views/plugins/my_plugin/layouts/readme.txt
+- lib/generators/camaleon_cms/gem_theme_template/config/camaleon_plugin.json
 - lib/generators/camaleon_cms/install_generator.rb
 - lib/generators/camaleon_cms/install_template/apps/plugins/readme.txt
 - lib/generators/camaleon_cms/install_template/apps/themes/readme.txt