fullstack-cms 0.1.14 → 0.1.15

data/VERSION

@@ -1 +1 @@
-0.1.14
+0.1.15

data/app/controllers/admin/settings_controller.rb

@@ -2,8 +2,8 @@ class Admin::SettingsController < Admin::BaseController
   respond_to :html, :js
   
   def index
-    @search = Setting.search(params[:search])
-    @settings = @search.page(params[:page] || 1)
+    @skip_filter = true
+    @settings = Setting.order("key")
   end
 
   def new

data/app/helpers/settings_helper.rb

@@ -10,7 +10,7 @@ module SettingsHelper
     namespaced_key = namespaced_key.to_s
     group, key =  namespaced_key.include?(namespace_separator) ? namespaced_key.split(namespace_separator) : [nil, namespaced_key]
     
-    Setting.global("#{key}", :autocreate => (opts[:autocreate].nil? ? true : opts[:autocreate]), :kind => opts[:kind], :default => value, :group => group)
+    Setting.global("#{key}", :autocreate => (opts[:autocreate].nil? ? true : opts[:autocreate]), :kind => opts[:kind], :default => value, :group => group, :options => opts[:options])
   end
   
   alias :setting :get_setting

data/app/models/setting.rb

@@ -49,8 +49,9 @@ class Setting < ActiveRecord::Base
     kind = opts.delete(:kind) || :string
     default = opts.delete(:default)
     group = opts.delete(:group) || "global"
+    options = opts.delete(:options)
     
-    s = autocreate ? self.find_or_create_by_key_and_settable_id(key.to_s, nil, :kind => kind, :"#{kind}_value" => default, :group => group) : self.find_by_key_and_settable_id(key.to_s, nil)
+    s = autocreate ? self.find_or_create_by_key_and_settable_id(key.to_s, nil, :kind => kind, :"#{kind}_value" => default, :group => group, :options => options) : self.find_by_key_and_settable_id(key.to_s, nil)
     if s
       s.value || default
     end
@@ -63,7 +64,13 @@ class Setting < ActiveRecord::Base
       s.update_attributes(:value => value)
     end
   end
-
-
+  
+  field :options, :text
+  serialize :options, Hash
+  
+  # after_initialize do |record|
+  #   record.options ||= {}
+  # end
+    
 end
 

data/app/views/admin/settings/_collection.html.erb

@@ -8,6 +8,18 @@
     @groups[s.group] ||= []
     @groups[s.group] << s
   }
+ 
+  @groups = @groups.to_a
+  
+  @groups.sort! do |g1, g2|    
+    if g1.first.to_s == "global"
+      -1
+    elsif g2.first.to_s == "global"
+      1
+    else  
+      g1.first.to_s <=> g2.first.to_s
+    end
+  end
 
   nil
  %>

data/app/views/admin/settings/_form.html.erb

@@ -1,27 +1,29 @@
-<%= admin_form_for [:"admin", current_resource], :html => {:multipart => true} do |f| -%>
+<% if current_resource.persisted? %>
 
-  <%= f.errors %>
-  
-  <% if current_resource.new_record? %>
+  <%= admin_form_for [:"admin", current_resource], :html => {:multipart => true} do |f| -%>
+
+    <%= f.errors %>
   
-    <%= f.inputs do %>
-      <%= f.input :key %>
-      <%= f.input :kind, :as => "select", :collection => Setting.kinds %>
-    <% end -%> 
-   
-  <% else %>
 
-    <%=  f.inputs do %>
-      <%= f.input :key, :input_html => {:readonly => true} %>     
-      <%= f.input :"#{current_resource.kind}_value" %>
-    <% end -%> 
+      <%=  f.inputs do %>
+        <%= f.input :key, :input_html => {:readonly => true} %>
+        <% if current_resource.kind.to_s == "text" && current_resource.options[:markup] %>
+          <%= f.input :"#{current_resource.kind}_value", :label => t('fullstack.admin.value', :default => "Value"), :as => :markup %>
+      
+        <% elsif current_resource.kind.to_s == "text" && current_resource.options[:simple_markup] %>
+          <%= f.input :"#{current_resource.kind}_value", :label => t('fullstack.admin.value', :default => "Value"), :as => :simple_markup %>
+      
+        <% else %>
+          <%= f.input :"#{current_resource.kind}_value", :label => t('fullstack.admin.value', :default => "Value") %>
+        
+        <% end %>    
+      <% end -%>
 
-  <% end %>
+    <%= f.actions do %>
+    <%= f.resource_submit %>
+    <% end %>
+
+<% end -%>
 
 
-  <%= f.actions do %>
-  <%= f.resource_submit %>
   <% end %>
-  
-
-<% end -%>

data/config/locales/it.yml

@@ -2,4 +2,15 @@ it:
   fullstack:
     cms:
       advanced_settings: "Impostazioni avanzate"
-        
+    admin:
+      groups:
+        global: "Generale"
+        contacts: "Contatti"
+
+  helpers:
+    label:
+      google_analytics_code: "Codice Google Analytics"
+      site_description: "Descrizione del sito"
+      site_slogan: "Slogan"
+      site_title: "Titolo del sito"
+      value: "Valore"

data/fullstack-cms.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.1.14"
+  s.version = "0.1.15"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
@@ -22,13 +22,13 @@ Gem::Specification.new do |s|
     "Rakefile",
     "TODO.md",
     "VERSION",
-    "app/controllers/admin/markdown_helper.rb",
     "app/controllers/admin/menus_controller.rb",
     "app/controllers/admin/pages_controller.rb",
     "app/controllers/admin/photos_controller.rb",
     "app/controllers/admin/settings_controller.rb",
     "app/controllers/admin/tags_controller.rb",
     "app/controllers/admin/users_controller.rb",
+    "app/helpers/markdown_helper.rb",
     "app/helpers/menus_helper.rb",
     "app/helpers/mobile_helper.rb",
     "app/helpers/pages_helper.rb",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -232,13 +232,13 @@ files:
 - Rakefile
 - TODO.md
 - VERSION
-- app/controllers/admin/markdown_helper.rb
 - app/controllers/admin/menus_controller.rb
 - app/controllers/admin/pages_controller.rb
 - app/controllers/admin/photos_controller.rb
 - app/controllers/admin/settings_controller.rb
 - app/controllers/admin/tags_controller.rb
 - app/controllers/admin/users_controller.rb
+- app/helpers/markdown_helper.rb
 - app/helpers/menus_helper.rb
 - app/helpers/mobile_helper.rb
 - app/helpers/pages_helper.rb
@@ -339,7 +339,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 963209439689046501
+      hash: -3413477236223765243
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: