adminpanel 0.0.7 → 0.1.0cl

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  data.tar.gz: c1b2563a9b1c4c707c9653e0361a2fe667e1e06d4187d1191ae29b7f188ccd861ab5d231881e158266f1481a0b9c5b6920b317e96c6a227aab085d3e18c41dd0
-  metadata.gz: 7c5526de8b8d50f76261a7b6973ec949020ad24da0dd6fc53c76394f135d526819f48304dfc186e69584acbfd318de30845d0021c48140016cebe0ab808440c8
+  data.tar.gz: 3ec3f7c88d058c6ccddc7998c704088b73e406e1c9d964777cf600a68aa24031a68304dcbe15dbd1ea3ffbbc553f5d0468ffabc9b2105889d6efae37e881ed34
+  metadata.gz: 591f31d3c086c95ca937c363576041d62e1895e2e6f8dd7925a496cbf8b5673758f7b13c6a7b2985ed5baec8bf497c8e170dd3fdeb33d5e8d0b70a5e9c849a58
 SHA1: 
-  data.tar.gz: a985bd1a3f33365906afb35f48d872c1829952cf
-  metadata.gz: 1a829db829744d3dc281b3ac16ecd74618855d84
+  data.tar.gz: 87188479938bf9f0d71305622f5017355b1fb30e
+  metadata.gz: ccfea816f9624ede5eb1848370c3d32848540cf0

data/README.md

@@ -35,7 +35,7 @@ Then, mount the gem wherever you like!
 
     mount Adminpanel::Engine => "/admin"
 
-Any doubts or errors feel free to ask me!
+The version 0.1.0 is the first stable version, feel free to use it, any doubts or errors feel free to ask me!
 
 ## Contributing
 
@@ -49,3 +49,6 @@ Any doubts or errors feel free to ask me!
 
 1. Add english support
 2. Add the medium editor to the custom builder so it inits itself
+3. Get a section generator or some kind of it
+4. Add test to section edit(the only tests remaining)
+5. Add a generator that let you create scaffolded model/controller/view in way that you can change them in the main app.

data/app/controllers/adminpanel/clients_controller.rb

@@ -0,0 +1,45 @@
+module Adminpanel
+	class ClientsController < Adminpanel::ApplicationController
+		def index
+			@clients = Client.find(:all)
+		end
+
+		def show
+	      @client = Client.find(params[:id])
+	    end
+
+	    def edit
+	      @client = Client.find(params[:id])
+	    end
+
+	    def create
+	      @client = Client.new(params[:client])
+
+	      if @client.save
+	        redirect_to client_path(@client), :notice => "El cliente ha sido guardado"
+	      else
+	        render 'new'
+	      end
+	    end
+
+	    def destroy
+	      @client = Client.find(params[:id])
+	      @client.destroy
+
+	      redirect_to clients_path, :notice => "El cliente ha sido eliminada"
+	    end
+
+	    def update
+	      @client = Client.find(params[:id])
+	      if @client.update_attributes(params[:client])
+	        redirect_to client_path(@client)
+	      else
+	        render 'edit'
+	      end
+	    end
+
+	    def new
+	      @client = Client.new
+	    end
+	end
+end

data/app/controllers/adminpanel/galleries_controller.rb

@@ -16,7 +16,7 @@ module Adminpanel
       @gallery = Gallery.new(params[:gallery])
 
       if @gallery.save
-        redirect_to gallery_path(@gallery), :notice => "La imagen ha sido creada"
+        redirect_to gallery_path(@gallery), :notice => t("gallery.success")
       else
         render 'new'
       end

data/app/controllers/adminpanel/users_controller.rb

@@ -45,7 +45,7 @@ module Adminpanel
 
       respond_to do |format|
         if @user.save
-          format.html { redirect_to @user, :notice => 'Se ha creado con exito.' }
+          format.html { redirect_to @user, :notice => t("user.success") }
           format.json { render :json => @user, :status => :created, :location => @user }
         else
           format.html { render :action => "new" }

data/app/helpers/adminpanel/application_helper.rb

@@ -32,7 +32,7 @@ module Adminpanel
 			  render(association.to_s.singularize + "_fields", :f => builder, :model_name => model_name)
 			end
 			link_to(content_tag(:div, content_tag(:button,
-						content_tag(:h6, name, :id => "add-estimate-button"),
+						content_tag(:h6, name, :id => "add-image-button"),
 						 :class => "btn btn-success btn-mini"), :class => "mws-form-row"),
 			'#', :class => "add_fields", :data => {:id => id, :fields => fields.gsub("\n", "")})
 		end

data/app/models/adminpanel/client.rb

@@ -0,0 +1,11 @@
+require "carrierwave"
+require "carrierwave/orm/activerecord"
+module Adminpanel
+	class Client < ActiveRecord::Base
+		attr_accessible :name, :logo
+		mount_uploader :logo, Adminpanel::ClientUploader
+
+		validates_presence_of :name
+		validates_presence_of :logo
+	end
+end

data/app/models/adminpanel/section.rb

@@ -2,10 +2,9 @@ require 'carrierwave'
 require 'carrierwave/orm/activerecord'
 module Adminpanel
 	class Section < ActiveRecord::Base
-	  attr_accessible :description, :file, :has_image, :key, :name, :has_description, :images_attributes
+	  attr_accessible :description, :has_image, :key, :name, :has_description, :images_attributes
 	  has_many :images, :foreign_key => "foreign_key", :conditions => { :model => "Section" }
 	  accepts_nested_attributes_for :images, :allow_destroy => true
-	  mount_uploader :file, Adminpanel::SectionUploader
 	  validates_length_of :description, :minimum => 10, :maximum => 10, :on => :update, :if => lambda{|section| section.key == "telephone"}
 	  validates_presence_of :description, :minimum => 9, :on => :update, :if => lambda{|section| section.has_description == true}
 	  validates :description, :numericality => { :only_integer => true }, :on => :update, :if => lambda{|section| section.key == "telephone"}

data/app/uploaders/adminpanel/{section_uploader.rb → client_uploader.rb}

@@ -1,11 +1,10 @@
 # encoding: utf-8
 module Adminpanel
-  class SectionUploader < CarrierWave::Uploader::Base
+  class ClientUploader < CarrierWave::Uploader::Base
 
     # Include RMagick or MiniMagick support:
     include CarrierWave::RMagick
     # include CarrierWave::MiniMagick
-
     # Choose what kind of storage to use for this uploader:
     storage :file
     # storage :fog
@@ -17,7 +16,7 @@ module Adminpanel
     # Override the directory where uploaded files will be stored.
     # This is a sensible default for uploaders that are meant to be mounted:
     def store_dir
-      "uploads/section/#{mounted_as}/#{model.id}"
+      "uploads/client/#{mounted_as}/#{model.id}"
     end
 
     # Provide a default URL as a default if there hasn't been a file uploaded:
@@ -29,15 +28,18 @@ module Adminpanel
     # end
 
     # Process files as they are uploaded:
-    # process :scale => [200, 300]
+    process :resize_to_fill => [1366, 768]
     #
     # def scale(width, height)
     #   # do something
     # end
+    version :portfolio do
+      process :resize_to_fill => [240, 130]
+    end
 
     # Create different versions of your uploaded files:
     version :thumb do
-      process :resize_to_limit => [460, 355]
+      process :resize_to_limit => [220, 220]
     end
 
     # Add a white list of extensions which are allowed to be uploaded.

data/app/views/adminpanel/clients/_client_form.html.erb

@@ -0,0 +1,22 @@
+<div class = "widget-body">
+	<div class = "widget-forms clearfix">
+<%= custom_form_for(@client, :html => {:class => "form-horizontal"}) do |f| %>
+	<%= render 'shared/error_messages', :object => @client %>
+
+	<%= f.text_field :name, :label => "Nombre" -%>
+	
+	<% if @client.logo %>
+  	<div class="controls">
+  		<div class="control-group">
+  			<%= image_tag @client.logo_url(:thumb) %>
+  		</div>
+  	</div>
+  <% end %>
+
+	<%= f.custom_file_field :logo, :label => "Imagen" -%>
+  	</div>
+</div>
+<div class = "widget-footer">
+  <%= f.submit t("client.new"), :disable_with => 'Submiting...' %>
+</div>
+<% end -%>

data/app/views/adminpanel/clients/edit.html.erb

@@ -0,0 +1,9 @@
+<% provide(:page_title, "Editar") %>
+<% breadcrumb_add(t("Clientes"), clients_path) %>
+<% breadcrumb_add(@client.name, client_path(@client)) %>
+<div class="row-fluid">
+  <div class = "widget widget-padding span12">
+    <div class = "widget-header"><i class = "icon-picture"></i><h5>Cliente</h5></div>
+    <%= render "client_form" %>
+	</div>
+</div>

data/app/views/adminpanel/clients/index.html.erb

@@ -0,0 +1,53 @@
+<%= provide(:page_title, "Clientes") %>
+  <div class="row-fluid">
+    <%= 
+      link_to( 
+        content_tag(:div,
+          content_tag(:i, nil, :class => 'icon-plus-sign icon-2x') + content_tag(:span, t("client.new"), nil), 
+          :class => "btn btn-box span2"), 
+        new_client_path,
+        :id => "new-client-button"
+      )
+    %>
+  </div>
+
+<div class="row-fluid">
+  <div class="widget widget-padding span12">
+    <div class="widget-header">
+          <i class="icon-truck"></i>
+          <h5>Clientes</h5>
+        </div>
+    <div class="widget-body">
+      <div class="dataTables_wrapper form-inline">
+        <table id="information-table" class="table table-striped table-bordered dataTable">
+          <thead>
+            <tr>
+				<th>Nombre</th>
+            	<th>Acción</th>
+            </tr>
+          </thead>
+          <tbody>
+            <% @clients.each do |client| %>
+            <tr>
+              <td><%= link_to client.name, client_path(client) %></td>
+                <td>
+                  <%= link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_client_path(client), :title => t("action.edit") %>
+                  <%= link_to content_tag(:i, nil, :class => 'icon-remove'), client_path(client), 
+                    :title => t("action.delete"),
+                    :id => "client-delete",
+                    :method => :delete,
+                    :data => { :confirm => "Seguro?" }
+                  %>
+                </td>
+            </tr>
+            <% end %>
+          </tbody>
+        </table>
+        <div class="row-fluid">
+          <div class="span6"></div>
+          <div class="span6"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

data/app/views/adminpanel/clients/new.html.erb

@@ -0,0 +1,9 @@
+<% provide(:page_title, t("client.new")) %>
+<% breadcrumb_add(t("model.Adminpanel::Client"), clients_path) %>
+<div class="row-fluid">
+  <div class = "widget widget-padding span12">
+    <div class = "widget-header"><i class = "icon-picture"></i><h5>Cliente</h5></div>
+    
+        <%= render 'client_form' %>
+  </div>
+</div>

data/app/views/adminpanel/clients/show.html.erb

@@ -0,0 +1,18 @@
+<% provide(:page_title, @client.name) %>
+<% breadcrumb_add("Clientes", clients_path) %>
+
+<div class="row-fluid">
+	<div class="widget widget-padding span12">
+		<div class="widget-header">
+			<i class="icon-picture"></i>
+			<h5><%= @client.name %>
+				<%= link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_client_path(@client), :title => "Editar Cliente" %>
+			</h5>
+		</div>
+		<div class="widget-body row-fluid">
+			<div class="span12">
+				<%= image_tag @client.logo_url %>
+			</div>
+		</div>
+	</div>
+</div>

data/app/views/adminpanel/galleries/index.html.erb

@@ -1,4 +1,4 @@
-<%= provide(:page_title, t("Gallery")) %>
+<%= provide(:page_title, t("model.Adminpanel::Gallery")) %>
 <div class="row-fluid">
   <%=
     link_to(
@@ -11,7 +11,7 @@
         ) +
         content_tag(
           :span,
-          'Agregar Imagen',
+          t("gallery.new"),
           nil
         ),
         :class => "btn btn-box span2"
@@ -25,7 +25,7 @@
   <div class="widget widget-padding span12">
     <div class="widget-header">
           <i class="icon-picture"></i>
-          <h5>Galería de Inicio</h5>
+          <h5><%= t("model.Adminpanel::Gallery") %></h5>
         </div>
     <div class="widget-body">
       <div class="dataTables_wrapper form-inline">
@@ -33,7 +33,7 @@
           <thead>
             <tr>
               <th>Imagen</th>
-                <th>Acción</th>
+              <th>Acción</th>
             </tr>
           </thead>
           <tbody>
@@ -41,9 +41,9 @@
             <tr>
               <td><%= link_to image_tag(gallery.file_url(:thumb)), gallery_path(gallery) %></td>
                 <td>
-                  <%= link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_gallery_path(gallery), :title => "Editar"%>
-                  <%= link_to content_tag(:i, nil, :class => 'icon-remove'), gallery_path(gallery), :title => "Borrar", :method => :delete,
-                                      :data => { :confirm => "Seguro?" }
+                  <%= link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_gallery_path(gallery), :title => t("action.edit") %>
+                  <%= link_to content_tag(:i, nil, :class => 'icon-remove'), gallery_path(gallery), :title => t("action.delete"), :method => :delete,
+                                      :data => { :confirm => t("action.delete confirmation") }
                   %>
                 </td>
             </tr>

data/app/views/adminpanel/galleries/new.html.erb

@@ -1,5 +1,5 @@
-<% provide(:page_title, "Nueva Imagen") %>
-<% breadcrumb_add(t("Gallery"), galleries_path) %>
+<% provide(:page_title, t("gallery.new")) %>
+<% breadcrumb_add(t("model.Adminpanel::Gallery"), galleries_path) %>
 <div class="row-fluid">
   <div class = "widget widget-padding span12">
     <div class = "widget-header"><i class = "icon-picture"></i><h5>Imagen</h5></div>
@@ -11,7 +11,7 @@
       </div>
     </div>
     <div class = "widget-footer">
-      <%= f.submit "Agregar", :disable_with => 'Submiting...' %>
+      <%= f.submit t("gallery.new"), :disable_with => 'Submiting...' %>
     </div>
       <% end -%>
   </div>

data/app/views/adminpanel/products/_product_form.html.erb

@@ -12,7 +12,7 @@
         <% if @product.description.nil? %>
           <%= content_tag(:div, @product.description, :class => "editable", "data-placeholder" => t("Write description here")) %>
         <% else %>
-          <%= content_tag(:div, @product.description.html_safe, :class => "editable", "data-placeholder" => t("Write description here")) %>
+          <%= content_tag(:div, @product.description.html_safe, :class => "editable controls", "data-placeholder" => t("Write description here")) %>
         <% end %>
       </div>
     </div>

data/app/views/adminpanel/products/index.html.erb

@@ -31,14 +31,12 @@
             <tr>
               <td><%= link_to product.name, product_path(product) %></td>
               <td><%= strip_tags product.description %></td>
-              <% #if can? :manage, product %>
                 <td>
                   <%= link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_product_path(product), :title => "Editar"%>
                   <%= link_to content_tag(:i, nil, :class => 'icon-remove'), product_path(product), :title => "Borrar", :method => :delete,
                                       :data => { :confirm => "Seguro?" }
                   %>
                 </td>
-              <% #end %>
             </tr>
             <% end %>
           </tbody>

data/app/views/adminpanel/products/show.html.erb

@@ -40,7 +40,7 @@
 			</ul></div>
 		</div>
 	</div>
-	<div class="widget widget-padding span6">
+	<div id="product-content" class="widget widget-padding span6">
 		<div class="widget-header">
 			<i class="icon-truck"></i>
 			<h5>Galería: <%= @product.name.humanize %>

data/app/views/adminpanel/sections/_image_fields.html.erb

@@ -7,7 +7,7 @@
 		</div>
 	<% end %>
 	<div class="control-group">
-			<%= f.label t("model.Image"), :class => "control-label"  %>
+			<%= f.label t("model.Adminpanel::Image"), :class => "control-label"  %>
 		<div class="controls">
 			<%= f.file_field :file %>
 			<%= f.hidden_field :model, :value => model_name %>

data/app/views/adminpanel/sections/edit.html.erb

@@ -1,4 +1,4 @@
-<% provide(:page_title, "Editar") %>
+<% provide(:page_title, t("section.edit")) %>
 <% breadcrumb_add('Secciones', sections_path) %>
 <% breadcrumb_add(@section.name, section_path(@section)) %>
 <div class="row-fluid">
@@ -11,7 +11,7 @@
 
           <% if @section.has_description %>
             <div class="control-group">
-              <label class="control-label"><%= t "Description" %></label>
+              <label class="control-label"><%= t("model.attributes.Adminpanel::Section.description") %></label>
               <div class="controls">
                 <%= f.hidden_field :description, :id => "description-field" %>
                   <% if @section.description.nil? %>
@@ -22,7 +22,7 @@
               </div>
             </div>
           <% else %>
-            <%= f.text_field :description, :label => t("Description") %>
+            <%= f.text_field :description, :label => t("model.attributes.Adminpanel::Section.description") %>
           <% end %>
 
           <% if @section.has_image %>
@@ -35,7 +35,7 @@
       </div>
     </div>
     <div class = "widget-footer">
-      <%= f.submit "Guardar", :disable_with => 'Submiting...', :id => "save-button" %>
+      <%= f.submit t("action.save"), :disable_with => t("action.submiting"), :id => "save-button" %>
     </div>
       <% end -%>
   </div>

data/app/views/adminpanel/sections/show.html.erb

@@ -10,22 +10,21 @@
 			</h5>
 		</div>
 		<div class="widget-body row-fluid">
-			<div class="span1">
+
+			<div class="span2">
 				<b>Descripción</b>
 			</div>
-			<div class="span11">
+			<div class="span10">
 		        <% if @section.description.nil? %>
-		        	<%= t("no description") %>
+		        	<%= t("other.no description") %>
 		        <% else %>
 					<%= @section.description.html_safe %>
 		        <% end %>
 			</div>
 			<div class="span12">
-			<% if @section.has_image %>
 				<% @section.images.each do |image|-%>
 					<%= image_tag(image.file_url :thumb) %>
 				<% end %>
-			<% end %>
 			</div>
 		</div>
 	</div>

data/app/views/adminpanel/users/index.html.erb

@@ -1,16 +1,14 @@
-<%= provide(:page_title, "Usuarios") %>
-<% #if can? :create, Client %>
-  <div class="row-fluid">
-    <%= 
-      link_to( 
-        content_tag(:div,
-          content_tag(:i, nil, :class => 'icon-plus-sign icon-2x') + content_tag(:span, 'Agregar Usuario', nil), 
-          :class => "btn btn-box span2"), 
-        new_user_path
-      )
-    %>
-  </div>
-<% #end %>
+<%= provide(:page_title, t("model.Adminpanel::User")) %>
+<div class="row-fluid">
+  <%= 
+    link_to( 
+      content_tag(:div,
+        content_tag(:i, nil, :class => 'icon-plus-sign icon-2x') + content_tag(:span, t("user.new"), nil), 
+        :class => "btn btn-box span2"), 
+      new_user_path
+    )
+  %>
+</div>
 
 <div class="row-fluid">
   <div class="widget widget-padding span12">
@@ -24,23 +22,19 @@
           <thead>
             <tr>
               <th>Nombre</th>
-              <% #if can? :manage, Client %>
-                <th>Acción</th>
-              <% #end %>
+              <th>Acción</th>
             </tr>
           </thead>
           <tbody>
             <% @users.each do |user| %>
             <tr>
               <td><%= link_to user.name, user_path(user) %></td>
-              <% #if can? :manage, user %>
                 <td>
                   <%= link_to content_tag(:i, nil, :class => 'icon-pencil'), edit_user_path(user), :title => "Editar"%>
                   <%= link_to content_tag(:i, nil, :class => 'icon-remove'), user_path(user), :title => "Borrar", :method => :delete,
                                       :data => { :confirm => "Seguro?" }
                   %>
                 </td>
-              <% #end %>
             </tr>
             <% end %>
           </tbody>

data/app/views/adminpanel/users/new.html.erb

@@ -1,4 +1,4 @@
-<% provide(:page_title, "Nuevo") %>
+<% provide(:page_title, t("user.new")) %>
 <% breadcrumb_add('Usuarios', users_path) %>
 
 <div class="row-fluid">

data/app/views/layouts/_side_menu.html.erb

@@ -10,29 +10,35 @@
 	<% end %>
 	<div class="accordion" id="accordion2">
 
-			<div class="accordion-group">
-				<div class="accordion-heading">
-					<%= link_to content_tag(:i, nil, :class => 'icon-truck') + content_tag(:span, ' Productos'), products_path, :class => "accordion-toggle b_F79999 #{is_current_section?('products')}"  %>
-				</div>
+		<div class="accordion-group">
+			<div class="accordion-heading">
+				<%= link_to content_tag(:i, nil, :class => 'icon-truck') + content_tag(:span, ' Productos'), products_path, :class => "accordion-toggle b_F79999 #{is_current_section?('products')}"  %>
 			</div>
+		</div>
 
-			<div class="accordion-group">
-				<div class="accordion-heading">
-					<%= link_to content_tag(:i, nil, :class => 'icon-user') + content_tag(:span, ' Usuarios'), users_path, :class => "accordion-toggle b_9FDDF6 #{is_current_section?('users')}"  %>
-				</div>
+		<div class="accordion-group">
+			<div class="accordion-heading">
+				<%= link_to content_tag(:i, nil, :class => 'icon-user') + content_tag(:span, ' Usuarios'), users_path, :class => "accordion-toggle b_9FDDF6 #{is_current_section?('users')}"  %>
 			</div>
+		</div>
 
-			<div class="accordion-group">
-				<div class="accordion-heading">
-					<%= link_to content_tag(:i, nil, :class => 'icon-picture') + content_tag(:span, " #{t("model.Adminpanel::Gallery")}"), galleries_path, :class => "accordion-toggle b_C3F7A7 #{is_current_section?('galleries')}"  %>
-				</div>
+		<div class="accordion-group">
+			<div class="accordion-heading">
+				<%= link_to content_tag(:i, nil, :class => 'icon-picture') + content_tag(:span, " #{t("model.Adminpanel::Gallery")}"), galleries_path, :class => "accordion-toggle b_C3F7A7 #{is_current_section?('galleries')}"  %>
 			</div>
+		</div>
 
-			<div class="accordion-group">
-				<div class="accordion-heading">
-					<%= link_to content_tag(:i, nil, :class => 'icon-tasks') + content_tag(:span, ' Secciones'), sections_path, :class => "accordion-toggle b_F6F1A2 #{is_current_section?('sections')}"  %>
-				</div>
+		<div class="accordion-group">
+			<div class="accordion-heading">
+				<%= link_to content_tag(:i, nil, :class => 'icon-tasks') + content_tag(:span, ' Secciones'), sections_path, :class => "accordion-toggle b_F6F1A2 #{is_current_section?('sections')}"  %>
+			</div>
+		</div>
+
+		<div class="accordion-group">
+			<div class="accordion-heading">
+				<%= link_to content_tag(:i, nil, :class => 'icon-star') + content_tag(:span, ' Clientes'), clients_path, :class => "accordion-toggle b_9FDDF6 #{is_current_section?('clients')}"  %>
 			</div>
+		</div>
 			
 		<div class="accordion-group">
 			<div class="accordion-heading">

data/app/views/layouts/_top_bar.html.erb

@@ -5,17 +5,17 @@
         <%= link_to image_tag("logo.png", :alt => "PCP del Sureste"), root_path %>
       </div>
       <% if signed_in? %>
-       <a class="btn btn-navbar visible-phone" data-toggle="collapse" data-target=".nav-collapse">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </a>
-            <% end %>
-       <a class="btn btn-navbar slide_menu_left visible-tablet">
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-        <span class="icon-bar"></span>
-      </a>
+         <a class="btn btn-navbar visible-phone" data-toggle="collapse" data-target=".nav-collapse">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </a>
+         <a class="btn btn-navbar slide_menu_left visible-tablet">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </a>
+      <% end %>
 
       <div class="top-menu visible-desktop">
         <ul class="pull-right">  

data/config/locales/es.yml

@@ -6,6 +6,7 @@ es:
     Adminpanel::Section: "Sección"
     Adminpanel::Image: "Imagen"
     Adminpanel::Category: "Categoría"
+    Adminpanel::Client: "Cliente"
     attributes:
       Adminpanel::User:
         email: "Correo electrónico"
@@ -20,6 +21,9 @@ es:
         file: "Imagen"
       Adminpanel::Category:
         name: "Nombre"
+      Adminpanel::Client:
+        name: "Nombre"
+        logo: "Nombre"
       Adminpanel::Product:
         name: "Nombre"
         brief: "Pequeña descripción"
@@ -90,9 +94,11 @@ es:
   Panel title: "Panel Administrativo"
   New: "Nuevo"
   action:
+    submiting: "Enviando..."
     save: "Guardar"
     edit: "Editar"
     delete: "Eliminar"
+    delete confirmation: "Estás seguro que desea eliminar?"
   authentication:
     welcome: "Bienvenido! Inicia Sesión"
     signin error: "Contraseña incorrecta"
@@ -101,8 +107,20 @@ es:
     new: "Agregar Categoría"
     success: "La categoría ha sido guardada"
   product:
-    new: "Agregar Producto"
+    new: "Agregar Producto" 
     success: "El producto ha sido guardado"
+  gallery:
+    new: "Agregar Imagen"
+    success: "La imagen ha sido guardada"
+  user:
+    new: "Agregar Usuario"
+    success: "El usuario ha sido guardado"
+  client:
+    new: "Agregar Cliente"
+  section:
+    edit: "Editar Sección"
   session:
     password: "Contraseña"
-    email: "Correo electrónico"
+    email: "Correo electrónico"
+  other:
+    no description: "No tiene descripción aún"

data/config/routes.rb

@@ -4,6 +4,7 @@ Adminpanel::Engine.routes.draw do
     resources :galleries
     resources :sessions, :only => [:new, :create, :destroy]
     resources :products
+    resources :clients
     resources :categories
     root :to => 'products#index'
     match '/signout', :to => 'sessions#destroy', :via => :delete, :as => "signout"

data/lib/adminpanel/version.rb

@@ -1,3 +1,3 @@
 module Adminpanel
-  VERSION = "0.0.7"
+  VERSION = "0.1.0cl"
 end

data/lib/generators/adminpanel/install/templates/migrations/create_adminpanel_tables.rb

@@ -36,9 +36,15 @@ class CreateAdminpanelTables < ActiveRecord::Migration
 	      t.text :description
 	      t.string :key
 	      t.boolean :has_image
-	      t.string :file
 	      t.timestamps
 	    end
+
+	    create_table :adminpanel_clients do |t|
+	    	t.string :name
+	    	t.string :logo
+	    	t.timestamps
+	    end
+
 	    add_index :adminpanel_sections, [:key]
 
 	    create_table :adminpanel_categories do |t|

data/spec/dummy/config/application.rb

@@ -28,8 +28,8 @@ module Dummy
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     config.i18n.default_locale = :es
-    config.i18n.enforce_available_locales = false
-
+    I18n.config.enforce_available_locales = true
+    
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 

data/spec/features/categories_pages_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "Categories" do
+describe "Categories pages" do
 	subject {page}
 
 	let(:user) { Factory(:user) }
@@ -9,7 +9,7 @@ describe "Categories" do
 		valid_signin(user)
 	end
 	
-	describe "categories index" do
+	describe "index" do
 		let(:category) { Factory(:category) }
 		before do
 			visit adminpanel.categories_path
@@ -20,7 +20,7 @@ describe "Categories" do
 		it { should have_link("i", adminpanel.edit_category_path(category)) }
 	end
 
-	describe "create category" do
+	describe "new" do
 		before { visit adminpanel.new_category_path }
 
 		it { should have_title(I18n.t("category.new")) }

data/spec/features/galleries_pages_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+
+describe "Gallery pages" do
+	subject {page}
+
+	let(:user) { Factory(:user) }
+	before do 
+		visit adminpanel.signin_path
+		valid_signin(user)
+		clean_uploads_folder
+	end
+	
+	describe "galleries" do
+	let(:gallery) { Factory(:gallery) }
+		before do
+			visit adminpanel.galleries_path
+		end
+
+		it { should have_link(I18n.t("gallery.new"), adminpanel.new_gallery_path)}
+		it { should have_link("i", adminpanel.gallery_path(gallery)) }
+		it { should have_link("i", adminpanel.edit_gallery_path(gallery)) }
+	end
+
+	describe "new" do
+		before do 
+			visit adminpanel.new_gallery_path
+		end
+
+		it { should have_title(I18n.t("gallery.new")) }
+
+		describe "with invalid information" do
+			before { find("form#new_gallery").submit_form! }
+
+			it { should have_title(I18n.t("gallery.new")) }
+			it { should have_selector("div#alerts") }
+		end
+
+		describe "with valid information" do
+			before do
+				attach_file('gallery_file', File.join(Rails.root, '/app/assets/images/hipster.jpg'))
+				find("form#new_gallery").submit_form!
+			end
+
+			it { should have_content(I18n.t("gallery.success"))}
+			it { File.exists? File.join(Rails.root, '/public/uploads/gallery/file/1/thumb_hipster.jpg') }
+		end
+	end
+
+	describe "show" do
+		let(:gallery) { Factory(:gallery) }
+		before do
+			visit adminpanel.gallery_path(gallery)
+		end
+
+		it { page.should have_selector("img", :src => gallery.file_url) }
+	end
+end

data/spec/features/product_pages_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "Products" do
+describe "Product pages" do
 	subject {page}
 
 	let(:user) { Factory(:user) }
@@ -9,7 +9,7 @@ describe "Products" do
 		valid_signin(user)
 	end
 	
-	describe "products index" do
+	describe "index" do
 		let(:product) { Factory(:product) }
 		before do
 			visit adminpanel.products_path
@@ -20,7 +20,7 @@ describe "Products" do
 		it { should have_link("i", adminpanel.edit_product_path(product)) }
 	end
 
-	describe "create product" do
+	describe "new" do
 		let(:category) { Factory(:category) }
 		before do 
 			category.id = 1 #to force instantiation so it becomes available in the select
@@ -47,7 +47,18 @@ describe "Products" do
 
 			it { should have_content(I18n.t("product.success"))}
 		end
+	end
+
+	describe "show" do
+		let(:product) { Factory(:product) }
+
+		before do
+			visit adminpanel.product_path(product)
+		end
 
-		describe
+		it { page.should have_selector("div", :text => product.name.humanize) }
+		it { page.should have_selector("div", :text => product.brief) }
+		it { page.should have_selector("div", :text => product.description) }
+		it { page.should have_selector("div", :text => product.category.name) }
 	end
 end

data/spec/features/section_pages_spec.rb

@@ -0,0 +1,38 @@
+require "spec_helper"
+
+describe "Section pages" do
+	subject {page}
+
+	let(:user) { Factory(:user) }
+	before do 
+		visit adminpanel.signin_path
+		valid_signin(user)
+	end
+	
+	describe "index" do
+		let(:section) { Factory(:section_with_gallery) }
+		before do
+			visit adminpanel.sections_path
+		end
+
+		it { should have_link("i", adminpanel.section_path(section)) }
+		it { should have_link("i", adminpanel.edit_section_path(section)) }
+	end
+
+	describe "show" do
+		describe "with gallery" do
+			let(:section) { Factory(:section_with_gallery) }
+			let(:image) { Factory(:image_section, :foreign_key => section.id) }
+			# let(:image2) { Factory(:image_section, :foreign_key => section.id) }
+			# let(:image3) { Factory(:image_section, :foreign_key => section.id) }
+
+			before do
+				visit adminpanel.section_path(section)
+			end
+
+		    it { should have_title(section.name.humanize) }
+		    it { should have_content(section.description) }
+			it { should have_link("i", adminpanel.edit_section_path(section)) }
+		end
+	end
+end

data/spec/features/user_pages_spec.rb

@@ -0,0 +1,49 @@
+require "spec_helper"
+
+describe "User pages" do
+	subject {page}
+
+	let(:user) { Factory(:user) }
+	before do 
+		visit adminpanel.signin_path
+		valid_signin(user)
+	end
+	
+	describe "index" do
+		before do
+			visit adminpanel.users_path
+		end
+
+		it { should have_link(I18n.t("user.new"), adminpanel.new_user_path)}
+		it { should have_link("i", adminpanel.user_path(user)) }
+		it { should have_link("i", adminpanel.edit_user_path(user)) }
+	end
+
+	describe "new" do
+		let(:category) { Factory(:category) }
+		before do 
+			visit adminpanel.new_user_path
+		end
+
+		it { should have_title(I18n.t("user.new")) }
+
+		describe "with invalid information" do
+			before { find("form#new_user").submit_form! }
+
+			it { should have_title(I18n.t("user.new")) }
+			it { should have_selector("div#alerts") }
+		end
+
+		describe "with valid information" do
+			before do
+				fill_in "user_name", :with => "user_name"
+				fill_in "user_email", :with => "user@example.com"
+				fill_in "user_password", :with => "123456"
+				fill_in "user_password_confirmation", :with => "123456"
+				find("form#new_user").submit_form!
+			end
+
+			it { should have_content(I18n.t("user.success"))}
+		end
+	end
+end

data/spec/models/section_spec.rb

@@ -4,7 +4,6 @@ describe Adminpanel::Section do
 	before do
 		@section = Adminpanel::Section.new(
 			:description => "Test description for product",
-			:file => "example.png",
 			:has_image => true,
 			:key => "example_key",
 			:has_description => true
@@ -14,7 +13,6 @@ describe Adminpanel::Section do
 	subject { @section }
 
 	it { should respond_to(:description) }
-	it { should respond_to(:file) }	
 	it { should respond_to(:has_image) }	
 	it { should respond_to(:key) }
 	it { should respond_to(:name) }

data/spec/support/define_factory_models.rb

@@ -1,3 +1,5 @@
+include ActionDispatch::TestProcess
+
 Factory.define :user, :class => Adminpanel::User do |user|
 	user.name "test user"
 	user.email "email@test.com"
@@ -14,4 +16,21 @@ Factory.define :product, :class => Adminpanel::Product do |product|
 	product.brief "very little description"
 	product.description "this is a little longer description, can be very long"
 	product.association :category, :factory => :category
+end
+
+Factory.define :gallery, :class => Adminpanel::Gallery do |gallery|
+	gallery.file { fixture_file_upload(Rails.root.join('app', 'assets', 'images', 'hipster.jpg'), 'image/jpeg') }
+end
+
+Factory.define :image_section, :class => Adminpanel::Image do |image|
+	image.model "Section"
+	image.file { fixture_file_upload(Rails.root.join('app', 'assets', 'images', 'hipster.jpg'), 'image/jpeg') }
+end
+
+Factory.define :section_with_gallery, :class => Adminpanel::Section do |section|
+	section.key "key"
+	# section.description "<p>description</p>"
+	section.has_image true
+	section.has_description false
+	section.name "section_name"
 end

data/spec/support/helper_methods.rb

@@ -8,4 +8,20 @@ RSpec::Matchers::define :have_title do |text|
   match do |page|
     Capybara.string(page.body).has_selector?('title', :text => text)
   end
+end
+
+def clean_uploads_folder
+	FileUtils.rm_rf(Dir["#{Rails.root}/public/uploads/."])
+end
+
+RSpec::Matchers.define(:have_image) do |src|
+  match { |node| node.has_selector? %(img[src="#{src}"]) }
+
+  failure_message_for_should do
+    "Expected an image with src #{src.inspect}"
+  end
+
+  failure_message_for_should_not do
+    "Found image with src #{src.inspect}!"
+  end
 end

data/spec/support/schema.rb

@@ -56,7 +56,6 @@ ActiveRecord::Schema.define(:version => 20131120070259) do
     t.text     "description"
     t.string   "key"
     t.boolean  "has_image"
-    t.string   "file"
     t.datetime "created_at",      :null => false
     t.datetime "updated_at",      :null => false
     t.boolean  "has_description"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adminpanel
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.1.0cl
 platform: ruby
 authors: 
 - Jose Ramon Camacho
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-12-05 00:00:00 Z
+date: 2013-12-11 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -260,6 +260,7 @@ files:
 - app/assets/stylesheets/application-admin.css
 - app/controllers/adminpanel/application_controller.rb
 - app/controllers/adminpanel/categories_controller.rb
+- app/controllers/adminpanel/clients_controller.rb
 - app/controllers/adminpanel/galleries_controller.rb
 - app/controllers/adminpanel/products_controller.rb
 - app/controllers/adminpanel/sections_controller.rb
@@ -270,19 +271,25 @@ files:
 - app/helpers/adminpanel/sessions_helper.rb
 - app/helpers/custom_form_builder.rb
 - app/models/adminpanel/category.rb
+- app/models/adminpanel/client.rb
 - app/models/adminpanel/gallery.rb
 - app/models/adminpanel/image.rb
 - app/models/adminpanel/product.rb
 - app/models/adminpanel/section.rb
 - app/models/adminpanel/user.rb
+- app/uploaders/adminpanel/client_uploader.rb
 - app/uploaders/adminpanel/gallery_uploader.rb
 - app/uploaders/adminpanel/image_uploader.rb
-- app/uploaders/adminpanel/section_uploader.rb
 - app/views/adminpanel/.DS_Store
 - app/views/adminpanel/categories/edit.html.erb
 - app/views/adminpanel/categories/index.html.erb
 - app/views/adminpanel/categories/new.html.erb
 - app/views/adminpanel/categories/show.html.erb
+- app/views/adminpanel/clients/_client_form.html.erb
+- app/views/adminpanel/clients/edit.html.erb
+- app/views/adminpanel/clients/index.html.erb
+- app/views/adminpanel/clients/new.html.erb
+- app/views/adminpanel/clients/show.html.erb
 - app/views/adminpanel/galleries/create.html.erb
 - app/views/adminpanel/galleries/delete.html.erb
 - app/views/adminpanel/galleries/edit.html.erb
@@ -363,10 +370,15 @@ files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/public/uploads/gallery/file/1/hipster.jpg
+- spec/dummy/public/uploads/gallery/file/1/thumb_hipster.jpg
 - spec/dummy/script/rails
 - spec/features/authentication_pages_spec.rb
 - spec/features/categories_pages_spec.rb
+- spec/features/galleries_pages_spec.rb
 - spec/features/product_pages_spec.rb
+- spec/features/section_pages_spec.rb
+- spec/features/user_pages_spec.rb
 - spec/models/category_spec.rb
 - spec/models/gallery_spec.rb
 - spec/models/product_spec.rb
@@ -380,7 +392,6 @@ files:
 - spec/support/submit_forms_without_button.rb
 - spec/uploaders/gallery_uploader_spec.rb
 - spec/uploaders/image_uploader_spec.rb
-- spec/uploaders/section_uploader_spec.rb
 homepage: https://github.com/joseramonc/adminpanel
 licenses: 
 - MIT
@@ -397,7 +408,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - *id012
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - *id012
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: 
@@ -442,10 +455,15 @@ test_files:
 - spec/dummy/public/422.html
 - spec/dummy/public/500.html
 - spec/dummy/public/favicon.ico
+- spec/dummy/public/uploads/gallery/file/1/hipster.jpg
+- spec/dummy/public/uploads/gallery/file/1/thumb_hipster.jpg
 - spec/dummy/script/rails
 - spec/features/authentication_pages_spec.rb
 - spec/features/categories_pages_spec.rb
+- spec/features/galleries_pages_spec.rb
 - spec/features/product_pages_spec.rb
+- spec/features/section_pages_spec.rb
+- spec/features/user_pages_spec.rb
 - spec/models/category_spec.rb
 - spec/models/gallery_spec.rb
 - spec/models/product_spec.rb
@@ -459,4 +477,3 @@ test_files:
 - spec/support/submit_forms_without_button.rb
 - spec/uploaders/gallery_uploader_spec.rb
 - spec/uploaders/image_uploader_spec.rb
-- spec/uploaders/section_uploader_spec.rb

data/spec/uploaders/section_uploader_spec.rb

@@ -1,32 +0,0 @@
-require 'spec_helper'
-require 'support/active_record'
-require 'carrierwave/test/matchers'
-
-describe Adminpanel::SectionUploader do
-  include CarrierWave::Test::Matchers
-
-  before do
-    Adminpanel::SectionUploader.enable_processing = true
-    @section = Adminpanel::Section.new(
-      :file => "test.jpg",
-      :description => nil,
-      :has_image => true,
-      :key => "section_key",
-      :name => "identifier name",
-      :has_description => false
-      )
-    @section_uploader = Adminpanel::SectionUploader.new(@section, :file)
-    @section_uploader.store!(File.open(Rails.root + "app/assets/images/test.jpg"))
-  end
-
-  after do
-    Adminpanel::SectionUploader.enable_processing = false
-    @section_uploader.remove!
-  end
-
-  context 'the section.thumb version' do
-    it "should scale down a landscape image to be exactly 460 by 355 pixels" do
-      @section_uploader.thumb.should be_no_larger_than(460, 355)
-    end
-  end\
-end