spree_essential_cms 0.3.0.rc1 → 0.4.0

data/app/models/spree/page_image.rb

@@ -1,15 +1,19 @@
 class Spree::PageImage < Spree::Asset
 
-  validate :no_attachement_errors
+  attr_accessible :viewable, :attachment, :alt
 
+  validates_attachment_presence :attachment
+  
   has_attached_file :attachment,
     :styles => Proc.new{ |clip| clip.instance.attachment_sizes },
-    :default_style => :medium
- 
+    :default_style => :medium,
+    :url => '/spree/pages/:id/:style/:basename.:extension',
+    :path => ':rails_root/public/spree/pages/:id/:style/:basename.:extension'
+
   def image_content?
-    attachment_content_type.match(/\/(jpeg|png|gif|tiff|x-photoshop)/)
+    attachment_content_type.to_s.match(/\/(jpeg|png|gif|tiff|x-photoshop)/)
   end
-     
+
   def attachment_sizes
     sizes = {}
     if image_content?
@@ -18,14 +22,5 @@ class Spree::PageImage < Spree::Asset
     end
     sizes
   end
-  
-  def no_attachement_errors
-    unless attachment.errors.empty?
-      # uncomment this to get rid of the less-than-useful interrim messages
-      errors.clear
-      errors.add :attachment, "Paperclip returned errors for file '#{attachment_file_name}' - check ImageMagick installation or image source file."
-      false
-    end
-  end
-  
+
 end

data/app/views/spree/admin/contents/_form.html.erb

@@ -32,7 +32,14 @@
     <%= error_message_on :content, :attachment %>
   <% end %>
   
-  <% if @content.has_image? %>
+  <% if @content.attachment.exists?(:mini) %>
+    <%= form.field_container :delete_attachment do %>
+      <%= form.check_box :delete_attachment %>
+      <%= form.label :delete_attachment, t('content.delete_attachment') %><br />
+    <% end %>
+  <% end %>
+  
+  <% if @content.attachment.exists?(:mini) %>
     <p><%= image_tag @content.attachment.url(:mini) %></p>
   <% end %>
 
@@ -57,8 +64,6 @@
 </div>
 
 <% content_for :head do %>
-  <%= stylesheet_link_tag "markitup.css" %>
-  <%= javascript_include_tag 'jquery.markitup.js', 'markdown.set.js' %>
   <script type="text/javascript">
   //<![CDATA[
     $(document).ready(function() {
@@ -71,4 +76,4 @@
     }); 
   //]]>
   </script>
-<% end %>
+<% end %>

data/app/views/spree/admin/contents/edit.html.erb

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => 'Contents'} %>
 
 <% if @content.try(:errors).present? %>

data/app/views/spree/admin/contents/index.html.erb

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
-
 <div class='toolbar'>
   <ul class='actions'>
     <li>
@@ -13,13 +11,13 @@
 
 <h2><%= t('.listing_contents') %></h2>
 
-<table class="index sortable">
+<table class="index sortable" data-sortable-link="<%= update_positions_admin_page_contents_url(@page) -%>">
   <thead>
-	<tr>
-    	<th><%= sort_link @search, :title, t("content.title") %></th>
-    	<th><%= sort_link @search, :context, t("content.context") %></th>
-    	<th><%= t("action") %></th>
-	</tr>
+  <tr>
+      <th><%= sort_link @search, :title, t("content.title") %></th>
+      <th><%= sort_link @search, :context, t("content.context") %></th>
+      <th><%= t("action") %></th>
+  </tr>
   </thead>
   <tbody>
     <%- @collection.each do |content|%>
@@ -27,8 +25,8 @@
       <td><span class="handle">&nbsp;</span>&nbsp; <%= link_to content.title, object_url(content) %></td>
       <td><%= content.context %>
       <td>
-      	<%= link_to_edit content %> &nbsp;
-      	<%= link_to_delete content %>
+        <%= link_to_edit content %> &nbsp;
+        <%= link_to_delete content %>
       </td>
     </tr>
     <% end %>
@@ -38,17 +36,18 @@
 <%= paginate @collection %>
 
 <% content_for :sidebar do %>
-
-<div class="box">
-  <h3><%= t(:search) %></h3>
-
-  <% @content = Spree::Content.metasearch %>
-  <%= form_for [:admin, @page, @content] do |f| %>
-    <p>
-      <label><%= t('content.title') %></label><br />
-      <%= f.text_field :title_like, :size => 25 %>
-    </p>      
-    <p><%= button t("search") %></p>
-  <% end %>
-</div>
+  <div class="box">
+    <h3><%= t(:search) %></h3>
+    <%= search_form_for [:admin, @page, @search] do |f| %>
+      <p>
+        <%= f.label :title_cont, t('content.title') %><br />
+        <%= f.text_field :title_cont, :size => 25 %>
+      </p>
+      <p>
+        <%= f.label :context_cont, t('content.context') %><br />
+        <%= f.text_field :context_cont, :size => 25 %>
+      </p>
+      <p><%= button t("search") %></p>
+    <% end %>
+  </div>
 <% end %>

data/app/views/spree/admin/contents/new.html.erb

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => 'Contents'} %>
 
 <% if @content.try(:errors).present? %>

data/app/views/spree/admin/contents/show.html.erb

@@ -1,4 +1,3 @@
-<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
 <%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => 'Contents'} %>
 
 <h2>Content: <%= h @content.title %></h2>

data/app/views/spree/admin/page_images/edit.html.erb

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => "Images"} %>
 
 <% if @page_image.try(:errors).present? %>
@@ -17,4 +15,4 @@
     <%= button t("update") %>
     or <%= link_to t("cancel"), admin_page_images_url(@page), :id => "cancel_link" %>
   </p>
-<% end %>
+<% end %>

data/app/views/spree/admin/page_images/index.html.erb

@@ -1,26 +1,26 @@
-<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => "Images"} %>
 
-<table class="index sortable">
-	<tr>
-	  <th><%= t("thumbnail") %></th>
-	  <th><%= t("alt_text") %></th>
-	  <th><%= t("action") %></th>
-	</tr>
- 
-  <% @page.images.each do |image| %>
-    <tr id="<%= dom_id(image).sub('page_', '') %>">
-      <td><span class="handle">&nbsp;</span>&nbsp; <%= link_to(image_tag(image.attachment.url(:mini)), image.attachment.url(:large)) %></td>
-      <td><%= image.alt %></td>
-      <td class="actions">
-        <%= link_to_with_icon('edit', t("edit"), edit_admin_page_image_url(@page, image)) %>
-        &nbsp;
-        <%= link_to_delete image, {:url => admin_page_image_url(@page, image) }%>
-      </td>
+<table class="index sortable" data-sortable-link="<%= update_positions_admin_page_images_url(@page) -%>">
+  <thead>
+    <tr>
+      <th><%= t("thumbnail") %></th>
+      <th><%= t("alt_text") %></th>
+      <th><%= t("action") %></th>
     </tr>
-  <% end %>
- 
+  </thead>
+  <tbody>
+    <% @page.images.each do |image| %>
+      <tr id="<%= dom_id(image) %>">
+        <td><span class="handle">&nbsp;</span>&nbsp; <%= link_to(image_tag(image.attachment.url(:mini)), image.attachment.url(:large)) %></td>
+        <td><%= image.alt %></td>
+        <td class="actions">
+          <%= link_to_with_icon('edit', t("edit"), edit_admin_page_image_url(@page, image)) %>
+          &nbsp;
+          <%= link_to_delete image, {:url => admin_page_image_url(@page, image) }%>
+        </td>
+      </tr>
+    <% end %>
+  </tbody>
 </table>
 
 <div id="images"></div>
@@ -31,14 +31,14 @@
 
 <% content_for :head do %>
   <script type="text/javascript">
-    jQuery(document).ready(function(){  
-      
-      jQuery('#new_image_link').click(function (event) { 
+    jQuery(document).ready(function(){
+
+      jQuery('#new_image_link').click(function (event) {
         event.preventDefault();
         jQuery(this).hide();
         jQuery.ajax({type: 'GET', url: this.href, data: ({authenticity_token: AUTH_TOKEN}), success: function(r){ jQuery('#images').html(r);} });
       });
-      
+
     });
   </script>
-<% end %>
+<% end %>

data/app/views/spree/admin/page_images/new.html.erb

@@ -1,3 +1,5 @@
+<%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => "Images"} unless request.xhr? %>
+
 <h3><%= t("new_image") %></h3>
 
 <%= render 'spree/shared/error_messages', :target => @page_image %>
@@ -17,4 +19,4 @@
     jQuery('#new_image_link').show();
     jQuery('#images').html('');
   }); 
-</script>
+</script>

data/app/views/spree/admin/pages/edit.html.erb

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => 'Page Details'} %>
 
 <% if @page.try(:errors).present? %>

data/app/views/spree/admin/pages/index.html.erb

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
-
 <div class='toolbar'>
   <ul class='actions'>
     <li>
@@ -11,15 +9,15 @@
 
 <h1><%= t('.listing_pages') %></h1>
 
-<table class="index sortable">
+<table class="index sortable" data-sortable-link="<%= update_positions_admin_pages_url -%>">
   <thead>
-	<tr>
-    	<th><%= sort_link @search, :title, t("page.title") %></th>
-    	<th><%= sort_link @search, :path, t("page.path") %></th>
-    	<th><%= sort_link @search, :accessible, t("page.accessible") %></th>
-    	<th><%= sort_link @search, :visible, t("page.visible") %></th>
-    	<th><%= t("action") %></th>
-	</tr>
+  <tr>
+      <th><%= sort_link @search, :title, t("page.title") %></th>
+      <th><%= sort_link @search, :path, t("page.path") %></th>
+      <th><%= sort_link @search, :accessible, t("page.accessible") %></th>
+      <th><%= sort_link @search, :visible, t("page.visible") %></th>
+      <th><%= t("action") %></th>
+  </tr>
   </thead>
   <tbody>
     <%- @collection.each do |page|%>
@@ -29,10 +27,10 @@
       <td><%= page.accessible %></td>
       <td><%= page.visible %></td>
       <td>
-      	<%= link_to_with_icon :accept, t('preview'), page.path, :onclick => 'window.open(this.href);return false;' %> &nbsp;
-      	<%= link_to_with_icon :pages, t('page.contents'), admin_page_contents_path(page) %> &nbsp;
-      	<%= link_to_edit page %> &nbsp;
-      	<%= link_to_delete page %>
+        <%= link_to_with_icon :accept, t('preview'), page.path, :onclick => 'window.open(this.href);return false;' %> &nbsp;
+        <%= link_to_with_icon :pages, t('page.contents'), admin_page_contents_path(page) %> &nbsp;
+        <%= link_to_edit page %> &nbsp;
+        <%= link_to_delete page %>
       </td>
     </tr>
     <% end %>
@@ -42,16 +40,18 @@
 <%= paginate @collection %>
 
 <% content_for :sidebar do %>
-<div class="box">
-  <h3><%= t(:search) %></h3>
-
-  <% @page = Spree::Page.metasearch %>
-  <%= form_for [:admin, @page] do |f| %>
-    <p>
-      <label><%= t '.title_contains' %></label><br />
-      <%= f.text_field :title_contains, :size => 25 %>
-    </p>      
-    <p><%= button t("search") %></p>
-  <% end %>
-</div>
+  <div class="box">
+    <h3><%= t(:search) %></h3>
+    <%= search_form_for [:admin, @search] do |f| %>
+      <p>
+        <%= f.label :title_cont, t('page.title') %><br />
+        <%= f.text_field :title_cont, :size => 25 %>
+      </p>
+      <p>
+        <%= f.label :path_cont, t('page.path') %><br />
+        <%= f.text_field :path_cont, :size => 25 %>
+      </p>
+      <p><%= button t("search") %></p>
+    <% end %>
+  </div>
 <% end %>

data/app/views/spree/admin/pages/new.html.erb

@@ -1,4 +1,4 @@
-<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
+<%#= render :partial => 'spree/admin/shared/contents_sub_menu' %>
 
 <% if @page.try(:errors).present? %>
   <%= render 'spree/shared/error_messages', :target => @page %>

data/app/views/spree/admin/pages/show.html.erb

@@ -1,5 +1,3 @@
-<%= render :partial => 'spree/admin/shared/contents_sub_menu' %>
-
 <%= render :partial => 'spree/admin/shared/page_tabs', :locals => {:current => "Page Details"} %>
 
 <h3>Meta Data:</h3>

data/app/views/spree/pages/home.html.erb

@@ -26,3 +26,13 @@
     </div>
   <% end %>
 </div>
+
+<% content_for :sidebar do %>
+  <div data-hook="homepage_sidebar_navigation">
+    <%= render :partial => 'spree/shared/taxonomies' %>
+  </div>
+<% end %>
+
+<div data-hook="homepage_products">
+  <%= render :partial => 'spree/shared/products', :locals => { :products => @products } %>
+</div>

data/app/views/spree/shared/_main_menu.html.erb

@@ -1,7 +1,3 @@
-<% if @pages %>
-  <ul id="main-menu">
-    <% @pages.each do |page| %>
-      <li<%= ' class="active"'.html_safe if page.matches?(request.path) %>><%= link_to page.nav_title, page.path %></li>
-    <% end %>
-  </ul>
-<% end %>
+<ul id="main-menu">
+  <%= render "spree/shared/main_menu_items" %>
+</ul>

data/app/views/spree/shared/_main_menu_items.html.erb

@@ -0,0 +1,6 @@
+<% unless @pages.blank? %>
+  <% @pages.each do |page| %>
+    <% next if page.root? || !page.visible? %>
+    <%= content_tag(:li, link_to(page.nav_title, page.path), :class => page.matches?(request.path) ? "active" : nil) %>
+  <% end %>
+<% end %>

data/config/locales/en.yml

@@ -24,6 +24,7 @@ en:
     link_text: Link Text
     context: Context
     hide_title: Hide Title
+    delete_attachment: Delete current attachment
   
   pages: Pages
   

data/config/locales/it.yml

@@ -0,0 +1,63 @@
+it:
+  page:
+    model_name: Pagina
+    contents: Contenuti
+    title: Titolo
+    nav_title: Titolo navigazione
+    path: Percorso
+    meta_title: Titolo (metadato)
+    meta_description: Descrizione (metadato)
+    meta_keywords: Parole chiave (metadato)
+    accessible: Accessibile
+    visible: Visibile
+    explain_accessible: le pagine non accessibili devono essere messe in un controller personalizzato
+    explain_visible: le pagine visibili verranno mostrate nel menù principale
+
+  content:
+    model_name: Contenuto
+    page_title: Titolo pagina
+    page: Pagina
+    title: Titolo
+    body: Corpo
+    attachment: Allegato
+    link: URL del collegamento
+    link_text: Testo del collegamento
+    context: Contesto
+    hide_title: Nascondi titolo
+    delete_attachment: Cancella gli allegati correnti
+
+  pages: Pagine
+
+  spree:
+    admin:
+      subnav:
+        pages: Pagine
+      shared:
+        contents_tab:
+          content: Contenuto
+        page_tabs:
+          editing_page: Modifica pagina
+          page_details: Dettagli della pagina
+          contents: Contenuti
+          images: Immagini
+      pages:
+        index:
+          title: Titolo
+          listing_pages: Elenco pagine
+          new_page: Nuova pagina
+          title_contains: Titolo
+        new:
+          new_page: Nuova pagina
+
+      contents:
+        index:
+          new_content: Nuovo contenuto
+          listing_contents: Elenca contenuti
+        new:
+          new_content: Nuovo contenuto
+        edit:
+          edit_content: Modifica contenuto
+
+      uploads:
+        index:
+          new_upload: Carica un nuovo allegato