fullstack-cms 0.1.1 → 0.1.2

data/Gemfile

@@ -7,6 +7,7 @@ gem "ars-permalink"
 gem "has-attached"
 gem "acts-as-taggable-on"
 gem "acts_as_indexed"
+gem "awesome_nested_set"
 
 gem "rails_i18n_gettext"
 gem "sitemap"

data/Gemfile.lock

@@ -39,6 +39,8 @@ GEM
       rails
     auto_strip_attributes (2.0.2)
       activerecord (>= 3.0)
+    awesome_nested_set (2.1.3)
+      activerecord (>= 3.0.0)
     aws-sdk (1.6.3)
       httparty (~> 0.7)
       json (~> 1.4)
@@ -280,6 +282,7 @@ DEPENDENCIES
   acts-as-taggable-on
   acts_as_indexed
   ars-permalink
+  awesome_nested_set
   fullstack
   fullstack-admin
   has-attached

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/app/controllers/{pages_controller.rb → admin/pages_controller.rb}

@@ -2,7 +2,7 @@ class Admin::PagesController < Admin::BaseController
   respond_to :html, :js
   
   def index
-    @pages = Page.root.self_and_descendants
+    @pages = Page.all
   end
 
   def edit

data/app/helpers/menus_helper.rb

@@ -20,6 +20,7 @@ module MenusHelper
     content_tag :ul, nav_items_for(uid, &block), options, false
   end  
   
+  
   def link_url(link)
     url = link.url
     if url.blank?
@@ -29,8 +30,8 @@ module MenusHelper
       klass_name, id = url.gsub("content://", "").split("#")
       klass = klass_name.constantize
       resource = klass.find(id)
+      page_path_for(resource)
       
-          
     else
       url
           

data/app/helpers/mobile_helper.rb

@@ -0,0 +1,7 @@
+module MobileHelper
+
+  def mobile?  
+    request.user_agent =~ /Mobile|webOS/  
+  end 
+
+end

data/app/helpers/pages_helper.rb

@@ -3,7 +3,7 @@ module PagesHelper
   def current_page
     @current_page
   end
-    
+  
   def page_part(name)
     if @current_page
       part = @current_page.page_parts.find_or_create_by_name_and_page_id("#{name}", @current_page)
@@ -11,4 +11,28 @@ module PagesHelper
     end
   end
   
+  def page_path_for(resource_or_page)
+    page = resource_or_page.is_a?(Page) ? resource_or_page : Page.find_by_resource_type(resource_or_page.class.name.underscore)
+    path = page.try(:path)
+    
+    path.gsub(/:[A-z_]+/) do |seg|
+      meth = seg.gsub(/^:/, "")
+      resource_or_page.send(meth)
+    end
+  end
+  
+  def page_url_for(resource_or_page)
+    "#{request.protocol}#{request.host_with_port}#{page_path_for(resource_or_page)}"
+  end
+  
+  def current_page_resource()
+    if current_page && current_page.resourceful?
+      controller.instance_variable_get("@#{current_page.resource_type}")        
+    end
+  end
+  
+  def home?
+    request.path == "/"
+  end
+
 end

data/app/models/nestable.rb

@@ -0,0 +1,14 @@
+module Nestable
+  extend ActiveSupport::Concern
+  
+  included do
+    field :parent_id, :integer
+    field :lft, :integer
+    field :rgt, :integer
+    field :depth, :integer
+    
+    acts_as_nested_set
+    attr_protected :lft, :rgt
+  end
+  
+end

data/app/models/page.rb

@@ -1,15 +1,28 @@
 class Page < ActiveRecord::Base
   include Content
+  include Nestable
   
-  validates_presence_of :uid
+  validates_presence_of :uid, :name
+
+  field :name
   field :uid
   index :uid, :unique => true
   
   field :path
+  field :resource_type
   
-  belongs_to :parent, :class_name => "Page", :inverse_of => :children
-  has_many :children, :class_name => "Page", :inverse_of => :parent
+  def home?
+    path == "/"
+  end
+
+  def resourceful?
+    resource_type.present?
+  end
   
+  def to_label
+    name
+  end
+    
   has_many :attachments, :as => :attachable
   has_many :page_parts
 

data/{lib/generators/fullstack/cms/templates/rails/lib/support → app/models}/pageable.rb

@@ -13,8 +13,9 @@ module Pageable
      i18n_scope  = "pages.#{self.name.underscore.split('/').last}##{name}"
      parent      = 
      title       = options.delete(:title) || I18n.t("#{i18n_scope}.title", :default => "#{name}".humanize)   
+
      if Page.table_exists?
-       Page.find_or_create_by_uid(uid, :title => title)
+       page = Page.find_or_create_by_uid(uid, :title => title, :name => name)
      end
 
      map(name, path, options = {}, &block)

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

@@ -1,6 +1,6 @@
 <%= tabs do |t| %>
-<%= t.pane _("Info") do %>
-<%= semantic_form_for [:"admin", resource], :html => { :multipart => true, :'data-type' => :script }, :remote => true do |f| -%>
+<%= t.pane t('fullstack.admin.info', :default => "Info") do %>
+<%= admin_form_for [:"admin", current_resource], :html => { :multipart => true, :'data-type' => :script }, :remote => true do |f| -%>
 
     <%= form_errors(f) %>
   
@@ -14,7 +14,7 @@
     <% end -%> 
 
     <%= form_actions do %>
-      <%= button (resource.persisted? ? _("Update") : _("Create")), :type => :primary, :size => :large %>
+      <%= button (current_resource.persisted? ? t('fullstack.admin.update', :default => "Update") : t('fullstack.admin.create', :default => "Create")), :type => :primary, :size => :large %>
     <% end %>
   
 

data/app/views/admin/links/_index.html.erb

@@ -1,5 +1,5 @@
 <% if thead -%>
-    <th><%= sort_link title_method_for(collection.klass) %></th><th><%= sort_link :created_at %></th><th><%= _("Actions") %></th>
+    <th><%= sort_link title_method_for(current_collection.klass) %></th><th><%= sort_link :created_at %></th><th><%= _("Actions") %></th>
 <% end -%>
 
 <% if tbody -%>

data/app/views/admin/links/_links.html.erb

@@ -1,9 +1,9 @@
 <table class="table table-bordered">
   <thead>
     <tr>
-      <th colspan="2"><%= _("Label") %></th>
-      <th><%= _("Url") %></th>
-      <th><%= _("Actions") %></th>
+      <th colspan="2"><%= t("label", :scope => "activerecord.models", :default => "Label").titleize %></th>
+      <th><%= t("url", :scope => "activerecord.models", :default => "Url").titleize %></th>
+      <th><%= t('fullstack.admin.actions', :default => "Actions") %></th>
     </tr>
   </thead>
   <tbody id="links_table_body" class="sortable" data-update-url="<%= sort_admin_links_path %>">
@@ -17,9 +17,10 @@
 <div id="add_link_form">
   
   <div class="well">
-    <%= semantic_form_for [:"admin", link = Link.new(:link_owner => link_owner)], :html => {:multipart => true}, :remote => true do |f| -%>
+    <%= admin_form_for [:"admin", link = Link.new(:link_owner => link_owner)], :html => {:multipart => true}, :remote => true do |f| -%>
 
-      <%= form_errors(f) %>
+      <%= f.errors %>
+      
       <%= f.inputs :class=>"hide" do %>
         <%= f.input :link_owner_id, :as => :hidden, :label => false %>
         <%= f.input :link_owner_type, :as => :hidden, :label => false  %>
@@ -35,9 +36,9 @@
     </div>
         
     <%= tabs do |t| %>
-    <%= t.pane(_("Link a Page")) do %>
+    <%= t.pane(t('fullstack.admin.link_a_page', :default => "Link a Page")) do %>
       <div class="clearfix" style="padding: 18px; min-height: 54px;">
-        <select class="select-resource-url" data-placeholder="<%= _('Choose a page by title') %>">
+        <select class="select-resource-url" data-placeholder="<%= t('fullstack.cms.links.choose_a_page_by_title', :default => 'Choose a page by title') %>">
            <option value=""></option>
            <% Page.all.each do |page| %>
                <option value="content://Page#<%= page.id %>"><%= page.title %></option>
@@ -45,7 +46,7 @@
         </select>
       </div>
       <% end %>
-      <%= t.pane _("Insert by hand") do %>
+      <%= t.pane t('fullstack.admin.insert_by_hand', :default => "Insert by hand") do %>
       <%= f.input :url %>
       <% end %>
     <% end %>
@@ -58,45 +59,11 @@
             <%= f.input :alignment_right %>          
           </div>
     
-    
-<!-- =============== -->
-<!-- = Image input = -->
-<!-- =============== -->
-
-
-
-
-<%= f.inputs "Immagine" do %>
- 
-    <% if link.image.exists? %>
-      <ul class="thumbnails">
-        <li class="span3">
-          <a href="<%= link.image.url %>" target="blank" class="thumbnail">
-            <img src="<%= link.image.url(:thumb) %>"/>
-          </a>
-        </li>
-      </ul>
-    <% else %>
-    <div class="alert">
-      <a class="close" data-dismiss="alert">×</a>
-      Nessuna immagine caricata
-    </div>
-   <% end %>
-   
-    <%= f.input :image, :as => :file, :hint => "Dimensione consigliata 800x600", :label => false %>
-    
-  <% end %>
-
-
-
-
-
-
-
-<!-- ================ -->
-<!-- = ############ = -->
-<!-- ================ -->    
-          <%= f.input :icon %>
+          <%= f.inputs do %>
+            <%= f.input :image %>
+            <%= f.input :icon %>
+          <% end %>
+          
         </div>
       </div>
 
@@ -104,7 +71,7 @@
       <% end -%>
       
       <%= form_actions do %>
-      <%= button  _("Add Link"), :type => :primary %>
+      <%= button  t('fullstack.admin.add_link', :default => "Add Link"), :type => :primary %>
       <% end %>
 
     <% end -%>

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

@@ -2,9 +2,9 @@
   <%= t.pane _("Info") do %>
   
   
-  <%= semantic_form_for [:"admin", resource], :html => {:multipart => true} do |f| -%>
+  <%= admin_form_for [:"admin", current_resource], :html => {:multipart => true} do |f| -%>
 
-    <%= form_errors(f) %>
+  <%= f.errors %>
   
     <%= f.inputs do %>
       <%= f.input :name %>
@@ -12,7 +12,7 @@
     <% end -%>
 
     <%= form_actions do %>
-      <%= button (resource.persisted? ? _("Update") : _("Create")), :type => :primary, :size => :large %>
+      <%= button (current_resource.persisted? ? _("Update") : _("Create")), :type => :primary, :size => :large %>
     <% end %>
   
 
@@ -21,13 +21,13 @@
   <% end %>
   <%= t.pane _("Links") do %>
     
-    <% if !resource.persisted? %>
+    <% if !current_resource.persisted? %>
     <div class="alert">
       <button class="close" data-dismiss="alert">×</button>
       <%= _("You should save the menu to start adding links") %>
     </div>
     <% else %>
-      <%= render :partial => "admin/links/links", :locals => {:link_owner => resource} %>
+      <%= render :partial => "admin/links/links", :locals => {:link_owner => current_resource} %>
     <% end %>
     
   <% end %>

data/app/views/admin/menus/_index.html.erb

@@ -1,9 +1,18 @@
 <% if thead -%>
-    <th><%= sort_link title_method_for(collection.klass) %></th><th><%= sort_link :created_at %></th><th><%= _("Actions") %></th>
+    <th><%= sort_link title_method_for(current_collection.klass) %></th>
+    
+      <th><%= sort_link :created_at %></th>
+    
+    
+    <th><%= t('fullstack.admin.actions', :default => "Actions") %></th>
 <% end -%>
 
 <% if tbody -%>
     <td><%= link_to title_for(content), [:edit,  :admin, content]  %></td>
-    <td><%= l content.created_at, :format => :pubdate %></td>
+    
+    
+    <td><%= l content.created_at.to_date, :format => :long %></td>
+    
+    
     <td><%= default_collection_actions_for(content) %></td>
 <% end -%>

data/app/views/admin/page_parts/_tabs.html.erb

@@ -1,16 +1,16 @@
 <% page.page_parts.each do |part| %>
     <%= tabs.pane(part.name) do %>
     
-          <%= semantic_form_for [:"admin", page, part], :html => {:multipart => true}, :remote => true, :'data-type' => "js" do |f| -%>
+          <%= admin_form_for [:"admin", page, part], :html => {:multipart => true}, :remote => true, :'data-type' => "js" do |f| -%>
 
-            <%= form_errors(f) %>
+          <%= f.errors %>
         
             <%= f.inputs do %>
             <%= f.input :content, :label => false, :input_html => { :class => "markup-ckeditor", :id => "page_part_#{part.id}_content" } %>
             <% end -%>
   
             <%= form_actions do %>
-              <%= button (resource.persisted? ? _("Update") : _("Create")), 
+              <%= button (current_resource.persisted? ? _("Update") : _("Create")), 
                           :type => :primary, :size => :large %>
               <%= link_to _("Delete"), [:admin, page, part], :data => {:method => "delete", :remote => true, :confirm => _("Are you sure?") }, :class => "btn btn-large btn-danger" %>
             <% end %>

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

@@ -1,8 +1,8 @@
 <%= tabs do |t| %>
   <%= t.pane _("Info") do %>
-  <%= semantic_form_for [:"admin", resource], :html => {:multipart => true, :"data-type" => :script}, :remote => true do |f| -%>
+  <%= admin_form_for [:"admin", current_resource], :html => {:multipart => true, :"data-type" => :script}, :remote => true do |f| -%>
 
-      <%= form_errors(f) %>
+      <%= f.errors %>
   
       <%= f.inputs do %>
         <%= f.input :name %>
@@ -28,7 +28,7 @@
 
 
       <%= form_actions do %>
-        <%= button (resource.persisted? ? _("Update") : _("Create")), :type => :primary, :size => :large %>
+      <%= button (current_resource.persisted? ? t('fullstack.admin.update', :default => "Update") : t('fullstack.admin.create', :default => "Create")), :type => :primary, :size => :large %>
       <% end %>
   
 
@@ -36,19 +36,4 @@
     
   <% end %>
   <%= render :partial => "admin/page_parts/tabs", :locals => {:page => current_resource, :tabs => t} %>
-<% end %>
-
-
-
-<% content_for :javascripts do -%>
-  <script type="text/javascript" charset="utf-8">
-    $(document).ready(function() {
-
-      $("form")
-        .bind('ajax:error', function(xhr, status, error) {
-          console.log(error);
-        })
-    });
- 
-  </script>
-<% end -%>
+<% end %>

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

@@ -1,24 +1,26 @@
-<%= semantic_form_for [:"admin", resource], :html => {:multipart => true} do |f| -%>
+<%= admin_form_for [:"admin", current_resource], :html => {:multipart => true} do |f| -%>
 
-  <%= form_errors(f) %>
-   <% if resource.new_record? %>
+  <%= f.errors %>
   
-   <%= f.inputs do %>
-     <%= f.input :key %>
-     <%= f.input :kind, :as => "select", :collection => Setting.kinds %>
-   <% end -%> 
+  <% if current_resource.new_record? %>
+  
+    <%= f.inputs do %>
+      <%= f.input :key %>
+      <%= f.input :kind, :as => "select", :collection => Setting.kinds %>
+    <% end -%> 
    
-   <% else %>
+  <% else %>
+
+    <%=  f.inputs do %>
+      <%= f.input :key, :input_html => {:readonly => true} %>     
+      <%= f.input :"#{current_resource.kind}_value" %>
+    <% end -%> 
+
+  <% end %>
 
-   <%=  f.inputs do %>
-     <%= f.input :key, :input_html => {:readonly => true} %>     
-     <%= f.input :"#{resource.kind}_value" %>
-   <% end -%> 
 
-   
-    <% end %>
   <%= form_actions do %>
-    <%= button (resource.persisted? ? _("Update") : _("Create")), :type => :primary, :size => :large %>
+    <%= resource_submit(current_resource) %>
   <% end %>