fullstack-cms 0.3.1 → 0.3.2

data/Gemfile

@@ -4,7 +4,7 @@
 
 source "http://rubygems.org"
 
-gem "fullstack-admin", '~> 0.2.1'
+gem "fullstack-admin", '~> 0.2.2'
 
 gem "ars-permalink"
 gem "acts-as-taggable-on"
@@ -12,12 +12,9 @@ gem "acts_as_indexed"
 gem "awesome_nested_set"
 
 gem "rails_i18n_gettext"
-gem "sitemap", :git => "git://github.com/viseztrance/rails-sitemap.git"
 gem "whenever"
 gem 'rinku', '~> 1.2.2', :require => 'rails_rinku'
-
 gem 'bluecloth'
-# gem 'i18n_fields'
 
 group :development do
   gem "jeweler"

data/Gemfile.lock

@@ -1,9 +1,3 @@
-GIT
-  remote: git://github.com/viseztrance/rails-sitemap.git
-  revision: 6592de4117ea43bf376c0bc588e7f0e2c6d3691e
-  specs:
-    sitemap (0.3.2)
-
 GEM
   remote: http://rubygems.org/
   specs:
@@ -125,7 +119,7 @@ GEM
       remotipart
       resource-presentation-helpers
       squeel
-    fullstack-admin (0.2.1)
+    fullstack-admin (0.2.2)
       bootstrap-datepicker-rails
       bootstrap-helpers (~> 0.1.7)
       chosen-rails
@@ -286,9 +280,8 @@ DEPENDENCIES
   ars-permalink
   awesome_nested_set
   bluecloth
-  fullstack-admin (~> 0.2.1)
+  fullstack-admin (~> 0.2.2)
   jeweler
   rails_i18n_gettext
   rinku (~> 1.2.2)
-  sitemap!
   whenever

data/TODO.tasks

@@ -1,14 +1,9 @@
 # Fullstack CMS roadmap
 
-- integrate with globalize
-  ✓ release ARS with right migration file names
-  ✓ fix long index names issue
-  ✓ pack into a gem and release
-  - require the packed gem
-  - use :translatable for `page_parts`
-  - available languages with switch into UI
-  
+- RSS
+
 - Linkables/Related
+- dashboard stats?
+- Contacts
 
-- statistics
-- RSS
+- Sitemap (with optional cache)

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/fullstack-cms.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "fullstack-cms"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcasimir"]
-  s.date = "2012-11-04"
+  s.date = "2012-11-05"
   s.description = "CMS system built on fullstack"
   s.email = "maurizio.cas@gmail.com"
   s.extra_rdoc_files = [
@@ -92,6 +92,18 @@ Gem::Specification.new do |s|
     "lib/generators/fullstack/cms/templates/rails/app/assets/stylesheets/site/lib/bootstrap.min.css",
     "lib/generators/fullstack/cms/templates/rails/app/assets/stylesheets/site/site.css",
     "lib/generators/fullstack/cms/templates/rails/app/controllers/site/site_controller.rb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/devise/_links.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/devise/confirmations/new.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/devise/mailer/confirmation_instructions.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/devise/mailer/reset_password_instructions.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/devise/mailer/unlock_instructions.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/devise/passwords/edit.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/devise/passwords/new.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/devise/registrations/edit.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/devise/registrations/new.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/devise/sessions/new.html.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/devise/shared/_links.erb",
+    "lib/generators/fullstack/cms/templates/rails/app/views/devise/unlocks/new.html.erb",
     "lib/generators/fullstack/cms/templates/rails/app/views/layouts/application.html.erb",
     "lib/generators/fullstack/cms/templates/rails/app/views/layouts/email.html.erb",
     "lib/generators/fullstack/cms/templates/rails/app/views/site/_footer.html.erb",
@@ -135,38 +147,35 @@ 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.1"])
+      s.add_runtime_dependency(%q<fullstack-admin>, ["~> 0.2.2"])
       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"])
       s.add_runtime_dependency(%q<awesome_nested_set>, [">= 0"])
       s.add_runtime_dependency(%q<rails_i18n_gettext>, [">= 0"])
-      s.add_runtime_dependency(%q<sitemap>, [">= 0"])
       s.add_runtime_dependency(%q<whenever>, [">= 0"])
       s.add_runtime_dependency(%q<rinku>, ["~> 1.2.2"])
       s.add_runtime_dependency(%q<bluecloth>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
     else
-      s.add_dependency(%q<fullstack-admin>, ["~> 0.2.1"])
+      s.add_dependency(%q<fullstack-admin>, ["~> 0.2.2"])
       s.add_dependency(%q<ars-permalink>, [">= 0"])
       s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
       s.add_dependency(%q<acts_as_indexed>, [">= 0"])
       s.add_dependency(%q<awesome_nested_set>, [">= 0"])
       s.add_dependency(%q<rails_i18n_gettext>, [">= 0"])
-      s.add_dependency(%q<sitemap>, [">= 0"])
       s.add_dependency(%q<whenever>, [">= 0"])
       s.add_dependency(%q<rinku>, ["~> 1.2.2"])
       s.add_dependency(%q<bluecloth>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
     end
   else
-    s.add_dependency(%q<fullstack-admin>, ["~> 0.2.1"])
+    s.add_dependency(%q<fullstack-admin>, ["~> 0.2.2"])
     s.add_dependency(%q<ars-permalink>, [">= 0"])
     s.add_dependency(%q<acts-as-taggable-on>, [">= 0"])
     s.add_dependency(%q<acts_as_indexed>, [">= 0"])
     s.add_dependency(%q<awesome_nested_set>, [">= 0"])
     s.add_dependency(%q<rails_i18n_gettext>, [">= 0"])
-    s.add_dependency(%q<sitemap>, [">= 0"])
     s.add_dependency(%q<whenever>, [">= 0"])
     s.add_dependency(%q<rinku>, ["~> 1.2.2"])
     s.add_dependency(%q<bluecloth>, [">= 0"])

data/lib/fullstack/cms.rb

@@ -29,13 +29,11 @@ require "acts_as_indexed"
 require "awesome_nested_set"
 
 require "rails_i18n_gettext"
-require "sitemap"
 require "whenever"
 
 require 'fullstack/cms/engine'
 require 'fullstack/cms/configuration'
 require 'bluecloth'
-# require 'i18n_fields'
 
 module Fullstack
   module Cms

data/lib/generators/fullstack/cms/templates/rails/app/views/devise/_links.erb

@@ -0,0 +1,3 @@
+<% ActiveSupport::Deprecation.warn "Rendering partials devise/_links.erb is deprecated" \
+  "please use devise/shared/_links.erb instead."%>
+<%= render "shared/links" %>

data/lib/generators/fullstack/cms/templates/rails/app/views/devise/confirmations/new.html.erb

@@ -0,0 +1,15 @@
+<h2 class="page-header"><%= t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions') %></h2>
+
+<%= bootstrap_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post,  :class => "form-horizontal" }) do |f| %>
+  
+  <%= f.inputs do %>
+  <%= f.input :email %>
+  <% end %>
+
+  <%= f.actions do %>
+    <%= f.submit t('.resend_confirmation_instructions', :default => 'Resend confirmation instructions') , :class => "btn btn-primary btn-large"  %>
+  <% end %>
+    
+<% end %>
+
+<%= render "devise/shared/links" %>

data/lib/generators/fullstack/cms/templates/rails/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,8 @@
+<h2>Benvenuto!</h2>
+
+<p>Benvenuto <b><%= @resource.name %></b>,</p>
+
+<p><%= t('.instruction', :default => "You can confirm your account email through the link below:") %></p>
+
+<p><%= link_to t('.action', :default => "Confirm my account"),
+         confirmation_url(@resource, :confirmation_token => @resource.confirmation_token) %></p>

data/lib/generators/fullstack/cms/templates/rails/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,8 @@
+<p><%= t('.greeting', :recepient => @resource.name, :default => "Hello #{@resource.name}!") %></p>
+
+<p><%= t('.instruction', :default => "Someone has requested a link to change your password, and you can do this through the link below.") %></p>
+
+<p><%= link_to t('.action', :default => "Change my password"), edit_password_url(@resource, :reset_password_token => @resource.reset_password_token) %></p>
+
+<p><%= t('.instruction_2', :default => "If you didn't request this, please ignore this email.") %></p>
+<p><%= t('.instruction_3', :default => "Your password won't change until you access the link above and create a new one.") %></p>

data/lib/generators/fullstack/cms/templates/rails/app/views/devise/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p><%= t('.greeting', :recepient => @resource.name, :default => "Hello #{@resource.name}!") %></p>
+
+<p><%= t('.message', :default => "Your account has been locked due to an excessive amount of unsuccessful sign in attempts.") %></p>
+
+<p><%= t('.instruction', :default => "Click the link below to unlock your account:") %></p>
+
+<p><%= link_to t('.action', :default => "Unlock my account"), unlock_url(@resource, :unlock_token => @resource.unlock_token) %></p>

data/lib/generators/fullstack/cms/templates/rails/app/views/devise/passwords/edit.html.erb

@@ -0,0 +1,17 @@
+<h2 class="page-header"><%= t('.change_your_password', :default => "Change your password") %></h2>
+
+<%= bootstrap_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put, :class => "form-horizontal" }) do |f| %>
+  
+  <%= f.hidden_field :reset_password_token %>
+  
+  <%= f.inputs do %>
+  <%= f.input :password, :label =>  t('.new_password', :default => "New password")  %>
+  <%= f.input :password_confirmation, :label => t('.confirm_new_password', :default => "Confirm new password") %>
+  <% end %>
+  <%= f.actions do %>
+  <%= f.submit t('.change_my_password', :default => "Change my password"), :class => "btn btn-primary btn-large" %>
+  <% end %>
+  
+<% end %>
+
+<%= render "devise/shared/links" %>

data/lib/generators/fullstack/cms/templates/rails/app/views/devise/passwords/new.html.erb

@@ -0,0 +1,13 @@
+<h2 class="page-header"><%= t('.forgot_your_password', :default => 'Forgot your password?') %></h2>
+
+<%= bootstrap_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post, :class => "form-horizontal" }) do |f| %>
+  <%= f.inputs do %>
+  <%= f.input :email  %>
+  <% end %>
+  <%= f.actions do %>
+  <%= f.submit t('.send_me_reset_password_instructions', :default => "Send me reset password instructions"), :class => "btn btn-primary btn-large" %>
+  <% end %>
+  
+<% end %>
+
+<%= render "devise/shared/links" %>

data/lib/generators/fullstack/cms/templates/rails/app/views/devise/registrations/edit.html.erb

@@ -0,0 +1,18 @@
+<h2 class="page-header">Modifica il tuo Account</h2>
+
+<%= bootstrap_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put, :class => "form-horizontal"}) do |f| %>
+  
+  
+  <%= f.inputs do %>
+  <%= f.input :email %>
+  <%= f.input :password %>
+  <%= f.input :password_confirmation %>
+  <% end %>
+  
+  <%= f.actions do  %>
+    <%= f.submit "Aggiorna" , :class => "btn btn-primary btn-large" %>
+  <% end %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>

data/lib/generators/fullstack/cms/templates/rails/app/views/devise/registrations/new.html.erb

@@ -0,0 +1,18 @@
+<h2 class="page-header"><%= t('.sign_up', :default => "Sign up") %></h2>
+
+<%= bootstrap_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => {:class => "form-horizontal"}) do |f| %>
+ <%= f.inputs do %>
+  <%= f.input :first_name %>
+  <%= f.input :last_name %>
+  <%= f.input :email %>
+  <%= f.input :password %>
+  <%= f.input :password_confirmation %>
+  <% end %>
+  
+  <%= f.actions do  %>
+  <%= f.submit t('.sign_up', :default => "Sign up"), :class => "btn btn-primary btn-large" %>  
+  <% end %>
+
+<% end %>
+
+<%= render "devise/shared/links" %>

data/lib/generators/fullstack/cms/templates/rails/app/views/devise/sessions/new.html.erb

@@ -0,0 +1,16 @@
+<h2 class="page-header"><%= t('.sign_in', :default => "Sign in") %></h2>
+
+<%= bootstrap_form_for(resource, :as => resource_name, :url => session_path(resource_name), :html => {:class => "form-horizontal"}) do |f| %>
+  <%= f.inputs do %>
+  <%= f.input :email %>
+  <%= f.input :password %>
+  <%= f.input :remember_me, :as => :boolean %>
+  <% end %>
+
+  <%= f.actions do  %>
+    <%= f.submit t('.sign_in', :default => "Sign in"), :class => "btn btn-primary btn-large" %>
+  <% end %>
+<% end %>
+
+
+<%= render "devise/shared/links" %>

data/lib/generators/fullstack/cms/templates/rails/app/views/devise/shared/_links.erb

@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+<%= link_to t(".sign_in", :default => "Sign in"), new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+<%= link_to t(".sign_up", :default => "Sign up"), new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' %>
+<%= link_to t(".forgot_your_password", :default => "Forgot your password?"), new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+<%= link_to t('.didn_t_receive_confirmation_instructions', :default => "Didn't receive confirmation instructions?"), new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+<%= link_to t('.didn_t_receive_unlock_instructions', :default => "Didn't receive unlock instructions?"), new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+  <%= link_to t('.sign_in_with_provider', :provider => provider.to_s.titleize, :default => "Sign in with #{provider.to_s.titleize}"), omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>

data/lib/generators/fullstack/cms/templates/rails/app/views/devise/unlocks/new.html.erb

@@ -0,0 +1,12 @@
+<h2><%= t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></h2>
+
+<%= form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
+  
+
+  <div><%= f.label :email %><br />
+  <%= f.email_field :email %></div>
+
+  <div><%= f.submit t('.resend_unlock_instructions', :default => "Resend unlock instructions") %></div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/lib/generators/fullstack/cms/templates/rails/app/views/site/_header.html.erb

@@ -3,7 +3,7 @@
     
     <div id="logo">
       <h1>
-        <a href="/" rel="home" class="clearfix main-logo"><%= image_tag "/img/logo.png", :title => get_setting(:title, Settings.app.title) %></a>
+        <a href="/" rel="home" class="clearfix main-logo"><%= image_tag "/img/logo.png", :alt => get_setting(:title, Settings.app.title) %></a>
       </h1>
     </div>  
     <div class="tagline"><%= get_setting(:slogan, Settings.app.slogan) %></div>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fullstack-cms
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2012-11-05 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.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: ars-permalink
   requirement: !ruby/object:Gem::Requirement
@@ -107,22 +107,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: sitemap
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: whenever
   requirement: !ruby/object:Gem::Requirement
@@ -270,6 +254,18 @@ files:
 - lib/generators/fullstack/cms/templates/rails/app/assets/stylesheets/site/lib/bootstrap.min.css
 - lib/generators/fullstack/cms/templates/rails/app/assets/stylesheets/site/site.css
 - lib/generators/fullstack/cms/templates/rails/app/controllers/site/site_controller.rb
+- lib/generators/fullstack/cms/templates/rails/app/views/devise/_links.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/devise/confirmations/new.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/devise/mailer/confirmation_instructions.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/devise/mailer/reset_password_instructions.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/devise/mailer/unlock_instructions.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/devise/passwords/edit.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/devise/passwords/new.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/devise/registrations/edit.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/devise/registrations/new.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/devise/sessions/new.html.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/devise/shared/_links.erb
+- lib/generators/fullstack/cms/templates/rails/app/views/devise/unlocks/new.html.erb
 - lib/generators/fullstack/cms/templates/rails/app/views/layouts/application.html.erb
 - lib/generators/fullstack/cms/templates/rails/app/views/layouts/email.html.erb
 - lib/generators/fullstack/cms/templates/rails/app/views/site/_footer.html.erb
@@ -317,7 +313,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4072153903321912068
+      hash: -4587852856576615504
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: