camaleon_cms 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ef2da600c309c607a5d0e66251e06122df3f987
-  data.tar.gz: 474804ac876a091a9d4df3cacdf4539344be39f2
+  metadata.gz: 415c1c54c6394047eed0288ad0bb0952d7ca85a2
+  data.tar.gz: 64c1a5ef8d255332e774db402f17eadcbf744113
 SHA512:
-  metadata.gz: eac88226ef781a13156844d1740dd5693acb39236d13e660704063539afccedc64791a1ddd23782e8d93691a9b35bae19e7059bc6e52dc87d04e21ef0ec4b26f
-  data.tar.gz: a1b09c443ae3ff2c4db21a38612de8efd67655ad0712155110514b9be06708975fd490adf63406b6c60df825a0210114ee493824b74a7d1b29d2b1de1a6f5271
+  metadata.gz: a5c400e61ba8915efe5023d88a6f182832d4ac9f2a52d375fed953f8a99031b04858cc924751d63d95d1d0cad3f10ad19ceb566c8319f89ef4561b75edccd9e0
+  data.tar.gz: d3b8a9e9af79d3e80e899df245e4b9a049bde3b4324e394f6f3c82cf6f8cf7d356921d8459536b6f2cfc1535748d332f1624995169cfa55e5d3641428e4c39c5

data/{lib/generators/camaleon_cms/install_template → app}/apps/plugins/contact_form/config/locales/translation.yml

@@ -10,7 +10,7 @@ en:
       add_new_field: 'Add New Field'
       add_option: 'Add Option'
       body: 'Body'
-      body_value: 'This e-mail sent via contact form from Site.'
+      body_value: 'This e-mail was send from contact form.'
       button:
         back: 'Back'
         submit: 'Submit'

data/{lib/generators/camaleon_cms/install_template → app}/apps/plugins/contact_form/front_controller.rb

@@ -76,10 +76,8 @@ class Plugins::ContactForm::FrontController < Apps::PluginsFrontController
         template_path = "html_mailer"
 
         dir = Dir.glob("app/apps/themes/#{current_theme.the_slug.to_s}/views/html_mailer/*")
-        #template_path = "app/apps/themes/#{current_theme.the_slug.to_s}/views/html_mailer" if dir.size > 0
-
         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, current_site, template_path, settings[:railscf_mail][:theme].to_s) # send mail
+        sendmail(settings[:railscf_mail][:to], settings[:railscf_mail][:subject], content, settings[:railscf_mail][:to], attachments) # send mail
         succes << settings[:railscf_message][:mail_sent_ok]
       else
         errors << settings[:railscf_message][:mail_sent_ng]

data/{lib/generators/camaleon_cms/install_template → app}/apps/plugins/contact_form/views/admin_forms/edit.html.erb

@@ -13,7 +13,7 @@
     <div class="col-md-12">
       <div class="panel panel-default">
 
-        <%= form_for @form, url:{action: @form.new_record? ? :create : :update} , role: 'form' do |f| %>
+        <%= form_for @form, url:{action: @form.new_record? ? :create : :update} , role: 'form', html: { id: "contact_form_editor", class: "validate" } do |f| %>
             <%= f.hidden_field :site_id  %>
             <%= f.hidden_field :id  %>
             <input id="meta_forms" type="hidden" name="meta" />
@@ -62,13 +62,13 @@
                             <div class="panel-body">
                                 <div class="row">
                                     <div class="form-group">
-                                        <%= f.label t('admin.table.name'), :class => ""  %><br>
-                                        <%= f.text_field :name, :class => "form-control", style: "" %>
+                                        <%= f.label nil, "#{t('admin.table.name')} <abbr title='required'>*</abbr>".html_safe, :class => ""  %><br>
+                                        <%= f.text_field :name, :class => "form-control required", style: "" %>
                                     </div>
 
                                     <div class="form-group">
-                                        <%= f.label "#{t('admin.table.slug')}", :class => ""  %>
-                                        <%= f.text_field :slug, :class => "form-control slug", "data-parent" => "plugins_contact_form_models_contact_form_name", style: "" %>
+                                        <%= f.label nil, "#{t('admin.table.slug')} <abbr title=\"required\">*</abbr>".html_safe, :class => ""  %>
+                                        <%= f.text_field :slug, :class => "form-control slug required", "data-parent" => "plugins_contact_form_models_contact_form_name", style: "" %>
                                     </div>
                                 </div>
                             </div>
@@ -84,13 +84,13 @@
                             <div class="panel-body">
                                 <div class="row">
                                     <div class="form-group">
-                                        <label for="railscf_mail_to"><%= t('plugin.contact_form.to') %>:</label><br>
-                                        <input id="railscf_mail_to" class="form-control" type="text" value="info@skylogix.net" name="railscf_mail[to]" />
+                                        <label for="railscf_mail_to"><%= t('plugin.contact_form.to') %> <abbr title="required">*</abbr>:</label><br>
+                                        <input id="railscf_mail_to" class="form-control required" type="text" value="" name="railscf_mail[to]" />
                                     </div>
 
                                     <div class="form-group">
-                                        <label for="railscf_mail_subject"><%= t('plugin.contact_form.subject') %>:</label><br>
-                                        <input id="railscf_mail_subject" class="form-control" type="text" name="railscf_mail[subject]" />
+                                        <label for="railscf_mail_subject"><%= t('plugin.contact_form.subject') %> <abbr title="required">*</abbr>:</label><br>
+                                        <input id="railscf_mail_subject" class="form-control required" type="text" name="railscf_mail[subject]" />
                                     </div>
 
                                     <div class="form-group">

data/{lib/generators/camaleon_cms/install_template → app}/apps/plugins/contact_form/views/admin_forms/index.html.erb

@@ -10,7 +10,7 @@
                 <div class="panel-heading ui-draggable-handle">
                     <h3 class="panel-title"><%= t('plugin.contact_form.add_form') %></h3>
                 </div>
-                <%= render partial: 'plugins/contact_form/views/admin_forms/form' %>
+                <%= render partial: 'form' %>
             </div>
         </div>
         <div class="col-md-8">

data/{lib/generators/camaleon_cms/install_template → app}/apps/plugins/visibility_post/visibility_post_helper.rb

@@ -57,7 +57,11 @@ module Plugins::VisibilityPost::VisibilityPostHelper
   def plugin_visibility_filter_post(args)
     args[:active_record] = args[:active_record].where("(posts.published_at is null or posts.published_at <= ?)", Time.now)
     if signin?
-      args[:active_record] = args[:active_record].where("visibility != 'private' or (visibility = 'private' and FIND_IN_SET(?, posts.visibility_value))", current_site.visitor_role)
+      if ActiveRecord::Base.connection.adapter_name.downcase.include?("sqlite")
+        args[:active_record] = args[:active_record].where("visibility != 'private' or (visibility = 'private' and (',' || posts.visibility_value || ',') LIKE '%,#{current_site.visitor_role},%')")
+      else
+        args[:active_record] = args[:active_record].where("visibility != 'private' or (visibility = 'private' and FIND_IN_SET(?, posts.visibility_value))", current_site.visitor_role)
+      end
     else
       args[:active_record] = args[:active_record].where("visibility != 'private'")
     end

data/app/apps/themes/camaleon_first/views/html_mailer/mailer.html.erb

@@ -0,0 +1,4 @@
+<h5><%= raw @subject  %></h5>
+<div>
+    <%= raw @html  %>
+</div>

data/app/apps/themes/camaleon_first/views/layouts/mailer.html.erb

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <title></title>
+</head>
+<body>
+    <table style="width: 100%">
+        <tr>
+            <td style="text-align: center; background-color: #1ABC9C; padding: 10px;"><img src="http://camaleon.tuzitio.com/media/132/logo2.png"></td>
+        </tr>
+        <tr>
+            <td>
+                <%= yield %>
+            </td>
+        </tr>
+        <tr>
+            <td style="text-align: center;"><a href="<%= @url_base %>" style="color: #ffffff;">Visit Site</a></td>
+        </tr>
+    </table>
+</body>
+</html>