fullstack-cms 0.1.4 → 0.1.5

data/TODO.md

@@ -0,0 +1,25 @@
+# Fullstack CMS roadmap
+
+## Page parts with schema
+
+usage:
+  <%= part "marketing-1",   :schema => "text-with-title" %>
+  <%= part "marketing-2",   :schema => "text-with-title" %>
+  <%= part "announcement",  :schema => "announcement"    %>
+  
+class AnnouncementPagePart < PagePart
+  field :claim, :string
+  field :link, :link
+end
+
+class TextPagePart < PagePart
+  field :text, :text, :markup => true
+end
+
+class TextWithTitlePagePart < PagePart
+  field :title, :string
+  field :text, :text, :markup => true
+end
+
+# Update e Creatore di ogni cosa
+

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/app/controllers/admin/pages_controller.rb

@@ -3,6 +3,7 @@ class Admin::PagesController < Admin::BaseController
   
   def index
     @pages = Page.all
+    @skip_filter = true
   end
 
   def edit

data/app/models/page_part.rb

@@ -1,7 +1,6 @@
 class PagePart < ActiveRecord::Base
+  inheritable
   field :name
-  field :content, :text
   belongs_to :page
   index [:name, :page_id], :unique => true
-  has_many :settings, :as => :settable
 end

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

@@ -20,7 +20,7 @@
 
 
   <%= f.actions do %>
-  <%= f.resource_submit(current_resource) %>
+  <%= f.resource_submit %>
   <% end %>
   
 

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

@@ -0,0 +1,48 @@
+<%= admin_form_for [:admin, current_resource], :html => {:multipart => true} do |f| %>
+  <%= f.errors %>
+
+  <%= f.inputs do %>
+    <%= f.input :email %>
+  <% end %>
+  
+  <% if current_resource.persisted? %>
+  <%= link_to t('fullstack.admin.edit', :default => "Edit") + " " + t('helpers.label.password', :default => "password"), 
+              "javascript:void(0);",
+              :id => "edit_your_password",
+              :class => "btn btn-small" %>
+
+  <div id="password_fields" style="display:none;">
+  <% else %>
+  <div>
+  <% end %>
+    <%= f.inputs do %>
+      <%= f.input :password %>
+      <%= f.input :password_confirmation %>
+    <% end %>
+  </div>
+  
+  
+  <%= f.actions do %>
+    <%= f.resource_submit %>
+  <% end %>
+
+<% end %>
+
+<% content_for :javascripts do -%>
+  <%= coffee_script_tag do %>
+  
+    html = $("#password_fields").find("fieldset")
+    html.remove()
+    $("#password_fields").show()
+  
+    $(document).ready ->
+
+      $("#edit_your_password").click ->
+        elems = $(html)
+        elems.hide()
+        $("#password_fields").empty().append(elems)
+        elems.show('slow')
+        $(@).remove()
+      
+  <% end %>
+<% end %>

data/config/routes.rb

@@ -5,23 +5,7 @@ Rails.application.routes.draw do
       resources :page_parts, :only => [ :update, :destroy ]
     end
 
-    resources :tags, :only => :index, :format => :json
-
-    resources :photos do
-      collection do
-        get "search"
-        get "chooser"
-      end
-    end
-
-    resources :settings, :except => [:show]
-    resources :menus, :except => [:show]
+    resources :tags, :only => :index, :format => :json    
     resources :users, :except => [:show]
-    resources :links, :except => [:show, :index, :new] do
-      collection do
-        post :sort
-      end
-    end
-
   end
 end

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-08-17"
+  s.date = "2012-08-19"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -20,8 +20,8 @@ Gem::Specification.new do |s|
     "Gemfile.lock",
     "README.md",
     "Rakefile",
+    "TODO.md",
     "VERSION",
-    "app/controllers/admin/links_controller.rb",
     "app/controllers/admin/menus_controller.rb",
     "app/controllers/admin/page_parts_controller.rb",
     "app/controllers/admin/pages_controller.rb",
@@ -41,22 +41,12 @@ Gem::Specification.new do |s|
     "app/models/pageable.rb",
     "app/models/redirect.rb",
     "app/models/setting.rb",
-    "app/views/admin/links/_filter.html.erb",
-    "app/views/admin/links/_form.html.erb",
-    "app/views/admin/links/_index.html.erb",
-    "app/views/admin/links/_links.html.erb",
-    "app/views/admin/links/_table_row.html.erb",
-    "app/views/admin/links/create.js.erb",
-    "app/views/admin/links/sort.js.coffee",
-    "app/views/admin/links/update.js.coffee",
-    "app/views/admin/menus/_form.html.erb",
-    "app/views/admin/menus/_index.html.erb",
     "app/views/admin/page_parts/_tabs.html.erb",
     "app/views/admin/page_parts/destroy.js.coffee",
     "app/views/admin/pages/_collection.html.erb",
     "app/views/admin/pages/_form.html.erb",
     "app/views/admin/settings/_form.html.erb",
-    "app/views/admin/settings/_index.html.erb",
+    "app/views/admin/users/_form.html.erb",
     "config/locales/en.yml",
     "config/locales/it.yml",
     "config/routes.rb",
@@ -67,7 +57,6 @@ Gem::Specification.new do |s|
     "lib/fullstack/cms/engine.rb",
     "lib/generators/fullstack/cms/install_generator.rb",
     "lib/generators/fullstack/cms/locale_generator.rb",
-    "lib/generators/fullstack/cms/templates/rails/app/assets/javascripts/admin/links.js.coffee",
     "lib/generators/fullstack/cms/templates/rails/app/assets/javascripts/site/lib/jquery.fitvids.js",
     "lib/generators/fullstack/cms/templates/rails/app/assets/javascripts/site/lib/plugins.js",
     "lib/generators/fullstack/cms/templates/rails/app/assets/javascripts/site/site.js.coffee",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fullstack
@@ -198,8 +198,8 @@ files:
 - Gemfile.lock
 - README.md
 - Rakefile
+- TODO.md
 - VERSION
-- app/controllers/admin/links_controller.rb
 - app/controllers/admin/menus_controller.rb
 - app/controllers/admin/page_parts_controller.rb
 - app/controllers/admin/pages_controller.rb
@@ -219,22 +219,12 @@ files:
 - app/models/pageable.rb
 - app/models/redirect.rb
 - app/models/setting.rb
-- app/views/admin/links/_filter.html.erb
-- app/views/admin/links/_form.html.erb
-- app/views/admin/links/_index.html.erb
-- app/views/admin/links/_links.html.erb
-- app/views/admin/links/_table_row.html.erb
-- app/views/admin/links/create.js.erb
-- app/views/admin/links/sort.js.coffee
-- app/views/admin/links/update.js.coffee
-- app/views/admin/menus/_form.html.erb
-- app/views/admin/menus/_index.html.erb
 - app/views/admin/page_parts/_tabs.html.erb
 - app/views/admin/page_parts/destroy.js.coffee
 - app/views/admin/pages/_collection.html.erb
 - app/views/admin/pages/_form.html.erb
 - app/views/admin/settings/_form.html.erb
-- app/views/admin/settings/_index.html.erb
+- app/views/admin/users/_form.html.erb
 - config/locales/en.yml
 - config/locales/it.yml
 - config/routes.rb
@@ -245,7 +235,6 @@ files:
 - lib/fullstack/cms/engine.rb
 - lib/generators/fullstack/cms/install_generator.rb
 - lib/generators/fullstack/cms/locale_generator.rb
-- lib/generators/fullstack/cms/templates/rails/app/assets/javascripts/admin/links.js.coffee
 - lib/generators/fullstack/cms/templates/rails/app/assets/javascripts/site/lib/jquery.fitvids.js
 - lib/generators/fullstack/cms/templates/rails/app/assets/javascripts/site/lib/plugins.js
 - lib/generators/fullstack/cms/templates/rails/app/assets/javascripts/site/site.js.coffee
@@ -297,7 +286,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1571725266931374814
+      hash: 1053948701747284460
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/app/controllers/admin/links_controller.rb

@@ -1,59 +0,0 @@
-class Admin::LinksController < Admin::BaseController
-  respond_to :html, :js
-  
-  def index
-    @search = Link.search(params[:search])
-    @links = @search.page(params[:page] || 1)
-  end
-
-  def new
-    @link = Link.new  
-  end
-  
-  def edit
-  end
-  
-  def create
-      @link = Link.new(params[:link])
-      
-      if @link.respond_to?(:author)
-        @link.author ||= current_user
-      end
-      
-      @link.save
-      respond_with(@link)
-  end
-
-  def update
-    @link.attributes = params[:link]
-    @link.save
-    respond_with(@link)
-  end
-
-  def destroy
-    @link.destroy
-    respond_with(@link)
-  end
-  
-  def sort
-    @error = false
-    if params[:list]
-      list_ids = params[:list].split(";")
-      list_ids.each_with_index {|id, i|
-        Link.find(id).update_attribute(:position, i)
-      } 
-      
-      begin
-       
-      rescue
-        @error = true
-         
-      end
-    else
-      render :text => "0"
-    end
-    
-  end
-end
-
-

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

@@ -1,14 +0,0 @@
-<!-- https://github.com/ernie/meta_search -->
-<!-- 
- f.input :title_contains
- f.input :created_at, :as => :daterange
--->
-
-
-<%=  f.input :label_contains %>
-
-
-
-  <%=  f.input :created_at, :as => :daterange %>
-
-

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

@@ -1,24 +0,0 @@
-<%= tabs do |t| %>
-<%= 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| -%>
-
-    <%= f.errors %>
-  
-    <%= f.inputs do %>
-      <%= f.input :label %>
-      <%= f.input :description %>
-      <%= f.input :url %>
-      <%= f.input :image %>
-      <%= f.input :alignment_right %>
-
-    <% end -%> 
-
-    <%= f.actions do %>
-      <%= button (current_resource.persisted? ? t('fullstack.admin.update', :default => "Update") : t('fullstack.admin.create', :default => "Create")), :type => :primary, :size => :large %>
-    <% end %>
-  
-
-  <% end -%>
-  
-  <% end %>
-<% end %>

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

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

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

@@ -1,95 +0,0 @@
-<table class="table table-bordered">
-  <thead>
-    <tr>
-      <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 %>">
-    <%  link_owner.links.each do |link| %>
-    <%= render :partial => "admin/links/table_row", :locals => {:link => link} %>
-    <% end %>
-  </tbody>
-</table>
-
-
-<div id="add_link_form">
-  
-  <div class="well">
-    <%= admin_form_for [:"admin", link = Link.new(:link_owner => link_owner)], :html => {:multipart => true}, :remote => true do |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  %>
-      <% end %>
-      
-      <%= f.inputs _("Add a new link"), :class => "clearable" do %>
-<div class="row-fluid">
-  <div class="span8">
-    <%= f.input :label %>
-    <%= f.input :description %>
-    
-    <div class="mb1">
-    </div>
-        
-    <%= tabs do |t| %>
-    <%= 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="<%= 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>
-           <% end %>
-        </select>
-      </div>
-      <% end %>
-      <%= t.pane t('fullstack.admin.insert_by_hand', :default => "Insert by hand") do %>
-      <%= f.input :url %>
-      <% end %>
-    <% end %>
-    
-    
-    
-        </div>
-        <div class="span4">
-          <div class="hide">
-            <%= f.input :alignment_right %>          
-          </div>
-    
-          <%= f.inputs do %>
-            <%= f.input :image %>
-            <%= f.input :icon %>
-          <% end %>
-          
-        </div>
-      </div>
-
-       
-      <% end -%>
-      
-      <%= f.actions do %>
-      <%= button  t('fullstack.admin.add_link', :default => "Add Link"), :type => :primary %>
-      <% end %>
-
-    <% end -%>
-    
-  </div> 
-</div>
-
-
-
-
-<% content_for :javascripts do -%>
- <script type="text/javascript" charset="utf-8">
- $(document).ready(function(){
-   $("select.select-resource-url").change(function(){
-     $("#link_url").val($("select.select-resource-url").val());
-   });
-  
- });
-   
- </script>
-<% end -%>

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

@@ -1,9 +0,0 @@
-<tr data-link-id="<%= link.id %>">
-  <td style="width: 12px;" ><img src="/admin/drag-handle.png" class="handle" /></td>
-  <td><%= link.label %></td>
-  <td><%= link.url %></td>
-  <td>
-    <a href="<%= edit_admin_link_path(link) %>"  data-tooltip="<%= _('Edit') %>"><i class="icon-edit"></i></a>
-    <a href="<%= admin_link_path(link) %>" data-confirm="Are you sure?" data-method="delete" data-remote="true" data-tooltip="<%= _('Delete') %>"><i class="icon-trash"></i></a>   
-  </td>
-</tr>

data/app/views/admin/links/create.js.erb

@@ -1,12 +0,0 @@
-<%= remotipart_response do %>
-  <% if @link.errors.empty? %>
-    $("#links_table_body").append('<%=j render(:partial => "admin/links/table_row", :locals => {:link => @link}) %>');
-    $("#add_link_form .clearable input").each(function() {
-      return $(this).val("");
-    });
-    $("#add_link_form").collapse('hide');
-    $.flash.notify('<%=j t("flash.success.create")  %>');
-  <% else %>
-    $.flash.notify('<%=j t("flash.error.create")  %>');
-  <% end %>
-<% end %>

data/app/views/admin/links/sort.js.coffee

@@ -1,6 +0,0 @@
-<% if !@error %>
-notify_notice('<%=j t("flash.success.update") %>')
-<% else %>
-notify_error('<%=j t("flash.error.update")  %>')
-<% end %>
-

data/app/views/admin/links/update.js.coffee

@@ -1,6 +0,0 @@
-<% if instance_variable_get("@#{controller_name.singularize}").errors.empty? %>
-$.flash.notify('<%=j t("flash.success.update")  %>')
-<% else %>
-$.flash.notify('<%=j t("flash.error.update")  %>')
-<% end %>
-

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

@@ -1,25 +0,0 @@
-<%= admin_form_for [:"admin", current_resource], :html => {:multipart => true} do |f| -%>
-
-<%= f.errors %>
-  
-  <%= f.inputs do %>
-    <%= f.resource_inputs %>
-  <% end -%>
-  
-  <%= render :partial => "associated_resources_table", :locals => {
-    :resource => current_resource,
-    :resource_name => resource_name, 
-    :association => :links,
-    :f => f
-  
-  } %>
-
-  <%= f.actions do %>
-    <%= f.resource_submit %>
-  <% end %>
-  
-<% end -%>
-
-
-
- 

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

@@ -1,18 +0,0 @@
-<% if thead -%>
-    <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.to_date, :format => :long %></td>
-    
-    
-    <td><%= default_collection_actions_for(content) %></td>
-<% end -%>

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

@@ -1,14 +0,0 @@
-<% if thead -%>
-    <th><%= sort_link title_method_for(current_collection.klass) %></th>
-    
-    
-    <th><%= t('fullstack.admin.actions', :default => "Actions") %></th>
-<% end -%>
-
-<% if tbody -%>
-    <td><%= link_to title_for(content), [:edit,  :admin, content]  %></td>
-    
-    
-    
-    <td><%= default_collection_actions_for(content) %></td>
-<% end -%>

data/lib/generators/fullstack/cms/templates/rails/app/assets/javascripts/admin/links.js.coffee

@@ -1,20 +0,0 @@
-fixHelper = (e, ui) ->
-  ui.children().each ->
-    $(this).width $(this).width()
-
-  ui
-
-$("tbody.sortable").sortable({ axis: 'y', items: 'tr', helper: fixHelper,  handle: '.handle'  }).disableSelection()
-$("tbody.sortable").bind "sortupdate", (e, ui) ->
-  url = $(this).data("update-url")
-  if url.length > 0
-    serialized_list = [] 
-    $(this).find("tr").each ->
-      id = $(this).data("link-id")
-      serialized_list.push id
-    
-    $.ajax
-      type: 'POST'
-      url: url
-      data: {list: serialized_list.join(";")}
-