fullstack-cms 0.3.4 → 0.3.5

data/Gemfile

@@ -4,7 +4,7 @@
 
 source "http://rubygems.org"
 
-gem "fullstack-admin", '~> 0.2.3'
+gem "fullstack-admin", '~> 0.2.4'
 
 gem "ars-permalink"
 gem "acts-as-taggable-on"

data/Gemfile.lock

@@ -41,7 +41,7 @@ GEM
       activerecord (>= 3.0)
     awesome_nested_set (2.1.3)
       activerecord (>= 3.0.0)
-    aws-sdk (1.7.0)
+    aws-sdk (1.7.1)
       httparty (~> 0.7)
       json (~> 1.4)
       nokogiri (>= 1.4.4)
@@ -117,7 +117,7 @@ GEM
       remotipart
       resource-presentation-helpers
       squeel
-    fullstack-admin (0.2.3)
+    fullstack-admin (0.2.4)
       bootstrap-datepicker-rails
       bootstrap-helpers (~> 0.1.7)
       chosen-rails
@@ -266,7 +266,7 @@ DEPENDENCIES
   ars-permalink
   awesome_nested_set
   bluecloth
-  fullstack-admin (~> 0.2.3)
+  fullstack-admin (~> 0.2.4)
   jeweler
   rails_i18n_gettext
   rinku (~> 1.2.2)

data/VERSION

@@ -1 +1 @@
-0.3.4
+0.3.5

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

@@ -5,12 +5,13 @@
                <%= content_tag :li, :class => (:active if @locale.blank?) do  %>
                  <%= link_to t("fullstack.cms.commons", :default => "Commons"), request.path %> 
                <% end %>
-
+           
                <% I18n.available_locales.each do |locale| %>
                   <%= content_tag :li, :class => (:active if @locale == locale.to_s) do  %>
                    <%= link_to t("locale_names.#{locale}", :default => "#{locale}".humanize), "?locale=#{locale}" %>
                  <% end %>
-               <% end %>    
+               <% end %>
+               
            <% end %>
  
 <% end %>
@@ -19,8 +20,7 @@
 <ul class="nav">
   <% @pages.roots.each do |root| %>
   <% Page.each_with_level(root.self_and_descendants) do |page, level| %>
-  <%= nav_item page.name, edit_admin_page_path(page), :icon => (page.root? ? "home" : "file"), :style => "line-height: 36px; padding-left:#{20 * level}px" %>
+  <%= nav_item t(page.name, :scope => 'fullstack.cms.pages', :default => page.name.try(:humanize)), edit_admin_page_path(page), :icon => (page.root? ? "home" : "file"), :style => "line-height: 36px; padding-left:#{20 * level}px" %>
   <% end %>
 <% end %>
-</ul>
-  
+</ul>

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

@@ -1,14 +1,19 @@
 <%= admin_form_for [:"admin", current_resource], :html => {:multipart => true} do |f| -%>
   <%= f.errors %>
-  
-  <%= tabs do |t| %>
-    <%= t.pane t('fullstack.admin.info', :default => "Info")  do %>
-      
+ 
+  <div class="box">
+    <div class="box-header">
+      <%= t('fullstack.admin.info', :default => "Info") %>
+    </div>
+    <div class="box-content">
       <%= f.inputs do %>
-        <%= f.input :name %>
         <% if !@page.resourceful? %>
           <%= f.input :title %>
           <%= f.input :description, :as => :text %>
+          <% else %>
+          <div class="alert alert-info">
+            <%= t('fullstack.cms.this_page_is_linked_to_a_resource', :default => "This page is linked to a resource. Title and description will be the same of the linked resource.") %>
+          </div>
         <% end %>
       <% end -%>
       
@@ -26,19 +31,24 @@
           <%= f.input :uid, :input_html => {:readonly => true} %>
         <% end %>
       </div>
-      
-  
-    <% end %>
-    
-    <% current_resource.page_parts.each do |p| %>
-        <%= t.pane t(p.name, :scope => 'fullstack.cms.parts', :default => p.name.try(:humanize)) do  %>
+    </div>
+  </div>
+ 
+  <% current_resource.page_parts.each do |p| %>
+ 
+    <div class="box">
+      <div class="box-header">
+        <%=  t(p.name, :scope => 'fullstack.cms.parts', :default => p.name.try(:humanize))  %>
+      </div>
+      <div class="box-content">
         <%= f.admin_fields_for :page_parts, p do |f| %>
-        <%= f.resource_inputs :except => [:page, :name] %>
-          <% end %>
+          <%= f.resource_inputs :except => [:page, :name] %>
         <% end %>
+      </div>
+    </div>
+  
     <% end %>
-    
-  <% end %>
+
 
   <%= f.actions do %>
     <%= f.resource_submit %>

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

@@ -3,16 +3,17 @@
  <% if Fullstack::Cms.localized? %>
  
            <%= nav :class => "nav-pills" do %>
-               
-               <%= content_tag :li, :class => (:active if @locale.blank?) do  %>
-                 <%= link_to t("fullstack.cms.commons", :default => "Commons"), request.path %> 
-               <% end %>
+ 
+             <%= content_tag :li, :class => (:active if @locale.blank?) do  %>
+               <%= link_to t("fullstack.cms.commons", :default => "Commons"), request.path %> 
+             <% end %>
 
-               <% I18n.available_locales.each do |locale| %>
-                  <%= content_tag :li, :class => (:active if @locale == locale.to_s) do  %>
-                   <%= link_to t("locale_names.#{locale}", :default => "#{locale}".humanize), "?locale=#{locale}" %>
-                 <% end %>
-               <% end %>    
+             <% I18n.available_locales.each do |locale| %>
+                <%= content_tag :li, :class => (:active if @locale == locale.to_s) do  %>
+                 <%= link_to t("locale_names.#{locale}", :default => "#{locale}".humanize), "?locale=#{locale}" %>
+               <% end %>
+             <% end %>
+                              
            <% end %>
  
 <% end %>

data/config/locales/it.yml

@@ -5,12 +5,20 @@ it:
       link_resource_or_url: "Collega una risorsa o un indirizzo"
       type_the_title_name_of_the_resource_to_link: "Digita il titolo/nome della risorsa da collegare"
       url: "Indirizzo"
-      commons: "Comuni"
+      commons: "Tutte le lingue"
       empty: "Vuoto"
+      this_page_is_linked_to_a_resource: "Questa pagina è collegata ad una risorsa. Il titolo e la descrizione della pagina saranno gli stessi della risorsa collegata"
     admin:
       groups:
         global: "Generale"
         contacts: "Contatti"
+    pages:
+      home: Homepage
+      text: Testo
+      contacts: Contatti
+      blog: Blog
+      post: Post
+
 
   helpers:
     label:

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.3.4"
+  s.version = "0.3.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-11-08"
+  s.date = "2012-11-09"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -147,7 +147,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fullstack-admin>, ["~> 0.2.3"])
+      s.add_runtime_dependency(%q<fullstack-admin>, ["~> 0.2.4"])
       s.add_runtime_dependency(%q<ars-permalink>, [">= 0"])
       s.add_runtime_dependency(%q<acts-as-taggable-on>, [">= 0"])
       s.add_runtime_dependency(%q<acts_as_indexed>, [">= 0"])
@@ -158,7 +158,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<bluecloth>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<fullstack-admin>, ["~> 0.2.3"])
+      s.add_dependency(%q<fullstack-admin>, ["~> 0.2.4"])
       s.add_dependency(%q<ars-permalink>, [">= 0"])
       s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
       s.add_dependency(%q<acts_as_indexed>, [">= 0"])
@@ -170,7 +170,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<fullstack-admin>, ["~> 0.2.3"])
+    s.add_dependency(%q<fullstack-admin>, ["~> 0.2.4"])
     s.add_dependency(%q<ars-permalink>, [">= 0"])
     s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
     s.add_dependency(%q<acts_as_indexed>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2012-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fullstack-admin
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
   name: ars-permalink
   requirement: !ruby/object:Gem::Requirement
@@ -313,7 +313,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2057879843510790051
+      hash: -1942476360000283023
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: