camaleon_cms 1.0.4 → 1.0.5

data/app/views/admin/users/form.html.erb

@@ -123,35 +123,31 @@
                     </div>
                 </div>
             </div>
-        <% end %>
-        <div class="col-md-3">
-            <div class="panel panel-default form-horizontal">
-                <div class="panel-body">
-                    <h3><span class="fa fa-info-circle"></span> <%= t('admin.table.quick_info')%></h3>
-                    <p><%= t('admin.message.quick_info')%></p>
-                </div>
-                <div class="panel-body form-group-separated">
-                    <div class="form-group">
-                        <label class="col-md-4 col-xs-5 control-label"><%= t('admin.table.last_visit')%></label>
-                        <div class="col-md-8 col-xs-7 line-height-30"><%= @user.last_login_at %></div>
-                    </div>
-                    <div class="form-group">
-                        <label class="col-md-4 col-xs-5 control-label"><%= t('admin.table.registration')%></label>
-                        <div class="col-md-8 col-xs-7 line-height-30"><%= @user.created_at %></div>
-                    </div>
 
-                </div>
+            <div class="col-md-3">
                 <div class="panel panel-default form-horizontal">
-                  <div class="panel-body">
-                    <h3><span class="fa fa-cube"></span> <%= t('admin.table.more_actions') %></h3>
-                    <p><%= t('admin.message.more_actions_info') %></p>
-                  </div>
+                    <div class="panel-body">
+                        <h3><span class="fa fa-info-circle"></span> <%= t('admin.table.quick_info')%></h3>
+                        <p><%= t('admin.message.quick_info')%></p>
+                    </div>
+                    <div class="panel-body form-group-separated">
+                        <div class="form-group">
+                            <label class="col-md-4 col-xs-5 control-label"><%= t('admin.table.last_visit')%></label>
+                            <div class="col-md-8 col-xs-7 line-height-30"><%= @user.last_login_at %></div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-md-4 col-xs-5 control-label"><%= t('admin.table.registration')%></label>
+                            <div class="col-md-8 col-xs-7 line-height-30"><%= @user.created_at %></div>
+                        </div>
 
-                  <%= r = { html: ""}; hooks_run('user_update_more_actions', r); raw(r[:html]); %>
+                    </div>
                 </div>
+
+                <%= r = { html: ''}; hooks_run('user_update_more_actions_form', r); raw(r[:html]); %>
             </div>
-        </div>
+        <% end %>
 
+        <%= r = { html: ''}; hooks_run('user_update_more_actions', r); raw(r[:html]); %>
     </div>
 
 

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

@@ -0,0 +1,19 @@
+<ul>
+    <li>
+        <h2><a href="<%= current_site.the_url %>"><%= current_site.the_title %></a></h2>
+    </li>
+    <% current_site.post_types.decorate.each do |ptype| %>
+        <li>
+            <h3><a href="<%= ptype.the_title %>"><%= ptype.the_title %></a></h3>
+            <% if ptype.manage_categories? %>
+                <%= raw(cama_sitemap_cats_generator(ptype.the_categories)) %>
+            <% else %>
+                <ul>
+                    <% ptype.the_posts.decorate.each do |post| %>
+                        <li><a href='<%= post.the_url %>'><%= post.the_title %></a></li>
+                    <% end %>
+                </ul>
+            <% end %>
+        </li>
+    <% end %>
+</ul>

data/app/views/default_theme/sitemap.xml.builder

@@ -0,0 +1,48 @@
+xml.instruct! :xml, :version => "1.0"
+xml.urlset "xmlns" => "http://www.sitemaps.org/schemas/sitemap/0.9" do
+  current_site.get_languages.each_with_index do |lang, index| lang = (index == 0 ? nil : lang);
+    xml.url do
+      xml.loc current_site.the_url(locale: lang)
+      xml.lastmod current_site.updated_at
+      xml.changefreq "daily"
+      xml.priority "1.0"
+    end
+
+    for post in current_site.the_posts.decorate do
+      xml.url do
+        xml.loc post.the_url(locale: lang)
+        xml.lastmod post.updated_at
+        xml.changefreq "monthly"
+        xml.priority "0.5"
+      end
+    end
+
+    for cat in current_site.full_categories.no_empty.decorate do
+      xml.url do
+        xml.loc cat.the_url(locale: lang)
+        xml.lastmod cat.updated_at
+        xml.changefreq "monthly"
+        xml.priority "0.5"
+      end
+    end
+
+    for ptype in current_site.post_types.decorate do
+      xml.url do
+        xml.loc ptype.the_url(locale: lang)
+        xml.lastmod ptype.updated_at
+        xml.changefreq "monthly"
+        xml.priority "0.5"
+      end
+    end
+
+    for tag in current_site.post_tags.decorate do
+      xml.url do
+        xml.loc tag.the_url(locale: lang)
+        xml.lastmod tag.updated_at
+        xml.changefreq "monthly"
+        xml.priority "0.5"
+      end
+    end
+  end
+
+end

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

@@ -4,10 +4,8 @@
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <title><%= raw admin_title_draw %></title>
-
     <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
     <meta name="viewport" content="width=device-width, initial-scale=1"/>
-
     <%= stylesheet_link_tag "admin/admin-manifest", media: "all" %>
     <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
     <script>
@@ -15,21 +13,16 @@
         var NO_IMAGE_URL = '<%= asset_url("image-not-found.png") %>';
         var CURRENT_LOCALE = '<%= current_locale %>';
         var ADMIN_TRANSLATIONS = <%= raw current_site.get_languages.to_json %>;
-        String.prototype.to_url = function () { return root_url.slice(0, root_url.length - 1) + this; };
-        window.run = [];
-        var tinymce_assets = {language_url: "<%= asset_path("admin/tinymce/langs/#{current_locale}.js") %>", custom_css: <%= r = {css_assets: []}; hooks_run("tinymce_custom_css", r); raw(r[:css_assets].to_json); %>};
+        var tinymce_global_settings = {language_url: "<%= asset_path("admin/tinymce/langs/#{current_locale}.js") %>", custom_css: [], custom_toolbar: [], post_render: [], init: [], setups: []};
         var I18n_data = <%= I18n.backend.send(:translations)[current_locale.to_sym][:admin][:js].to_json.html_safe %>
     </script>
     <%= javascript_include_tag "admin/admin-manifest" %>
     <%= javascript_include_tag "admin/#{current_locale}.js" if current_locale != "en" %> <!-- validator translations -->
     <%= javascript_include_tag "admin/elfinder/i18n/elfinder.#{current_locale}.js" if current_locale != "en" %> <!-- elfinder translations -->
     <%= raw the_head({}, false) %>
-
-    <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
-    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
-    <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
-    <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+        <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+        <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
     <![endif]-->
 </head>
 <body class="hold-transition skin-blue sidebar-mini" data-intro="<%= current_site.get_option("save_intro") %>">
@@ -57,10 +50,7 @@
         </div>
 
         <%= render partial: "layouts/admin/footer" %>
-        <%= raw content_after_draw %>
     </div>
-
-    <script> jQuery(function () { while (run.length > 0) { (run.shift())(); } }); </script>
     <%= raw content_after_draw %>
 </body>
 </html>

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

@@ -1,6 +1,13 @@
 <footer class="main-footer">
-    <div class="pull-right hidden-xs">
-        <b>Version</b><%= CamaleonCms::VERSION %>
+    <div class="row">
+        <div class="col-md-6"><strong>Copyright &copy; 2015-2016 <a href="http://camaleon.tuzitio.com">Camaleon CMS.</a> </strong>.</div>
+        <div class="col-md-6 hidden-xs">
+            <div class="pull-left">
+                <a id="link_see_intro" href="#" onclick="init_intro(); return false;"><i class="fa fa-tv"></i> See Intro.</a>
+            </div>
+            <div class="pull-right">
+                <b>Version</b><%= CamaleonCms::VERSION %>
+            </div>
+        </div>
     </div>
-    <strong>Copyright &copy; 2015-2016 <a href="http://camaleon.tuzitio.com">Camaleon CMS.</a> </strong>.
 </footer>

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

@@ -18,7 +18,7 @@
                 <%= r = {html: ""}; hooks_run("admin_notifications", r); raw(r[:html]); %>
                 <li><a target="_blank" href="<%= current_site.the_url %>"><i class="fa fa-eye"></i> <%= t("common.visit") %></a></li>
                 <li class="dropdown user user-menu">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-intro='<%= t("admin.intro.profile") %>' data-position='left'>
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-intro2='<%= t("admin.intro.profile") %>' data-position='left'>
                         <img src="<%= current_user.the_avatar %>" class="user-image" alt="User Image">
                         <span class="hidden-xs"><%= current_user.fullname %></span>
                         <span class="caret"></span>

data/config/initializers/doorkeeper.rb

@@ -0,0 +1,128 @@
+include SessionHelper
+include SiteHelper
+include HooksHelper
+
+Doorkeeper.configure do
+  # Change the ORM that doorkeeper will use (needs plugins)
+  orm :active_record
+  default_scopes :public, :admin, :client
+
+  resource_owner_from_credentials do |routes|
+    login_user_with_password(params[:username], params[:password])
+  end
+
+  # This block will be called to check whether the resource owner is authenticated or not.
+  # resource_owner_authenticator do
+  #   User.find_by_id(session[:current_user_id]) || redirect_to(login_url)
+  # fail "Please configure doorkeeper resource_owner_authenticator block located in #{__FILE__}"
+  # Put your resource owner authentication logic here.
+  # Example implementation:
+  #   User.find_by_id(session[:user_id]) || redirect_to(new_user_session_url)
+  # end
+
+  # If you want to restrict access to the web interface for adding oauth authorized applications, you need to declare the block below.
+  admin_authenticator do
+    begin
+      authorize! :manager, :comments
+    rescue CanCan::AccessDenied
+      redirect_to admin_dashboard_path
+    end
+  end
+
+  # Authorization Code expiration time (default 10 minutes).
+  # authorization_code_expires_in 10.minutes
+
+  # Access token expiration time (default 2 hours).
+  # If you want to disable expiration, set this to nil.
+  # access_token_expires_in 2.hours
+
+  # Assign a custom TTL for implicit grants.
+  # custom_access_token_expires_in do |oauth_client|
+  #   oauth_client.application.additional_settings.implicit_oauth_expiration
+  # end
+
+  # Use a custom class for generating the access token.
+  # https://github.com/doorkeeper-gem/doorkeeper#custom-access-token-generator
+  # access_token_generator "::Doorkeeper::JWT"
+
+  # Reuse access token for the same resource owner within an application (disabled by default)
+  # Rationale: https://github.com/doorkeeper-gem/doorkeeper/issues/383
+  # reuse_access_token
+
+  # Issue access tokens with refresh token (disabled by default)
+  # use_refresh_token
+
+  # Provide support for an owner to be assigned to each registered application (disabled by default)
+  # Optional parameter :confirmation => true (default false) if you want to enforce ownership of
+  # a registered application
+  # Note: you must also run the rails g doorkeeper:application_owner generator to provide the necessary support
+  # enable_application_owner :confirmation => false
+
+  # Define access token scopes for your provider
+  # For more information go to
+  # https://github.com/doorkeeper-gem/doorkeeper/wiki/Using-Scopes
+  # default_scopes  :public
+  # optional_scopes :write, :update
+
+  # Change the way client credentials are retrieved from the request object.
+  # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
+  # falls back to the `:client_id` and `:client_secret` params from the `params` object.
+  # Check out the wiki for more information on customization
+  # client_credentials :from_basic, :from_params
+
+  # Change the way access token is authenticated from the request object.
+  # By default it retrieves first from the `HTTP_AUTHORIZATION` header, then
+  # falls back to the `:access_token` or `:bearer_token` params from the `params` object.
+  # Check out the wiki for more information on customization
+  # access_token_methods :from_bearer_authorization, :from_access_token_param, :from_bearer_param
+
+  # Change the native redirect uri for client apps
+  # When clients register with the following redirect uri, they won't be redirected to any server and the authorization code will be displayed within the provider
+  # The value can be any string. Use nil to disable this feature. When disabled, clients must provide a valid URL
+  # (Similar behaviour: https://developers.google.com/accounts/docs/OAuth2InstalledApp#choosingredirecturi)
+  #
+  # native_redirect_uri 'urn:ietf:wg:oauth:2.0:oob'
+
+  # Forces the usage of the HTTPS protocol in non-native redirect uris (enabled
+  # by default in non-development environments). OAuth2 delegates security in
+  # communication to the HTTPS protocol so it is wise to keep this enabled.
+  #
+  # force_ssl_in_redirect_uri !Rails.env.development?
+
+  # Specify what grant flows are enabled in array of Strings. The valid
+  # strings and the flows they enable are:
+
+  #
+  # "authorization_code" => Authorization Code Grant Flow
+  # "implicit"           => Implicit Grant Flow
+  # "password"           => Resource Owner Password Credentials Grant Flow
+  # "client_credentials" => Client Credentials Grant Flow
+  #
+  # If not specified, Doorkeeper enables authorization_code and
+  # client_credentials.
+  #
+  # implicit and password grant flows have risks that you should understand
+  # before enabling:
+  #   http://tools.ietf.org/html/rfc6819#section-4.4.2
+  #   http://tools.ietf.org/html/rfc6819#section-4.4.3
+  #
+  grant_flows %w(password)
+
+  # Under some circumstances you might want to have applications auto-approved,
+  # so that the user skips the authorization step.
+  # For example if dealing with a trusted application.
+  skip_authorization do |resource_owner, client|
+    # client.superapp? or resource_owner.admin?
+    true
+  end
+
+  # skip_authorization do |resource_owner, client|
+  # client.superapp? or resource_owner.admin?
+  # true
+  # end
+
+  # WWW-Authenticate Realm (default "Doorkeeper").
+  # realm "Doorkeeper"
+
+  # configuration.token_grant_types << 'password'
+end

data/config/initializers/rufus_cron.rb

@@ -15,9 +15,9 @@ end
 
 if loaded_rufus
   $scheduler = Rufus::Scheduler.singleton
-  $scheduler.cron '00 05 * * *' do
-    system("rake camaleon_cms:sitemap")
-  end
+  # $scheduler.cron '00 05 * * *' do
+  #
+  # end
 
   sites = Site.all rescue []
   sites.each do |site|

data/config/initializers/sass.rb

@@ -1,65 +1,3 @@
-# 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
-
-
 module Sprockets
   # Processor engine class for the SASS/SCSS compiler. Depends on the `sass` gem.
   #

data/config/locales/admin/en.yml

@@ -318,7 +318,8 @@ en:
       author: "Author Name"
       seo_setting: "Seo Settings"
       email_settings: "Email Settings (SMTP)"
-
+      security:
+        captcha_user_register: "Enable captcha on user registration?"
       message:
         language_updated: 'Your languages was configured.'
         site_updated: 'The site has been updated.'
@@ -587,7 +588,7 @@ en:
         not_registered_widgets: 'There are no registered widgets'
     intro:
       profile: "In this place you can see your profile options."
-      content: "This block contains all content groups of your site. Each content can have different structure configured in settings => Post Type"
+      content: "This block contains all content groups of your site. Each content can have different structure configured in settings => Content Groups"
       #dashboard: "In this section you can see "
       media: "This section manage your all your public media files"
       comments: "This section manage all the comments of your contents"

data/config/locales/admin/es.yml

@@ -316,6 +316,8 @@ es:
       author: "Nombre de Autor"
       seo_setting: "Posicionamiento Web."
       email_settings: "Configuración de Correo (SMTP)"
+      security:
+        captcha_user_register: "¿Activar captcha en el registro de usuarios?"
       message:
         language_updated: 'Tus idiomas se han configurado.'
         site_updated: 'El sitio ha sido actualizado.'

data/config/locales/admin/js.yml

@@ -19,6 +19,7 @@ en:
         permalink: 'Permalink'
         recover: 'Recovering...'
         type_contents: 'Type Contents'
+        confirm_del: "Are you sure to delete this item?"
 
       button:
         edit: "Edit"
@@ -29,18 +30,8 @@ en:
         add_tag: 'Add Tag'
         close: 'Close'
         settings: 'Settings'
-      grid_editor:
-        templates: "Templates"
-        use_tpl: "Use Template"
-        save_tpl: "Save as template"
-        list: "List of templates"
-        text_editor: "Text Editor"
-        blocks: "Blocks"
-        contents: "Content Elements"
-        toggle_editor: "Are you sure to leave this editor?"
-        del_block: "Are you sure to delete this block?"
-        del_content: "Are you sure to delete this content?"
-        clear_editor: "Are you sure to clear the editor?"
+        save: "Save"
+        submit: "Submit"
 
 es:
   admin:
@@ -70,6 +61,7 @@ es:
         processing: 'Procesando...'
         type_contents: 'Tipo de Contenidos'
         upload_image: 'Subir Imagen'
+        confirm_del: "Esta seguro de eliminar este item?"
       button:
         edit: "Edit"
         accept: "Accept"
@@ -79,19 +71,8 @@ es:
         close: 'Cerrar'
         add_tag: 'Agregar Etiqueta'
         settings: 'Configuración'
-
-      grid_editor:
-        templates: "Plantillas"
-        use_tpl: "Use Template"
-        save_tpl: "Guardar como plnatilla"
-        list: "Lista de plantillas"
-        text_editor: "Editor de Texto"
-        blocks: "Bloques"
-        contents: "Contenidos"
-        toggle_editor: "Esta seguro de abandonar este editor?"
-        del_block: "Esta seguro de eliminar este bloque?"
-        del_content: "Esta seguro de eliminar este contenido?"
-        clear_editor: "Esta seguro de limpiar el editor?"
+        save: "Guardar"
+        submit: "Ingresar"
 
 it:
   admin:
@@ -123,6 +104,7 @@ it:
         processing: 'Caricamento...'
         type_contents: 'Type Contents'
         upload_image: 'Carica Immagine'
+        confirm_del: "Sei sicuro di voler eliminare l'articolo?"
       button:
         edit: "Edit"
         accept: "Accept"
@@ -132,16 +114,5 @@ it:
         add_tag: 'Aggiungi Tag'
         close: 'Chiudi'
         settings: 'Impostazioni'
-
-      grid_editor:
-        templates: "Modelli"
-        use_tpl: "Use Template"
-        save_tpl: "Salva come modello"
-        list: "Elenco dei modelli"
-        text_editor: "Editor di testo"
-        blocks: "Blocchi"
-        contents: "Contenuto"
-        toggle_editor: "Sei sicuro di voler lasciare questo editor?"
-        del_block: "Sei sicuro di voler eliminare questo blocco?"
-        del_content: "Sei sicuro di voler cancellare questo contenuto?"
-        clear_editor: "Sei sicuro di voler cancellare l'editor?"
+        save: "Salvare"
+        submit: "Presentare"