adminpanel 1.2.4 → 1.2.5

data/app/views/adminpanel/categories/_category_form.html.erb

@@ -0,0 +1,14 @@
+
+<%= custom_form_for(resource, :remote => true, :html => {:class => "form-horizontal", :id => "new_resource"}) do |f| -%>
+  <div class="row-fluid">
+    <div class="modal-body">
+        <%= render 'shared/error_messages', :object => resource %>
+        <%= render 'shared/form_fields', :f => f %>
+        <%= f.hidden_field :model, :value => model %>
+    </div>
+  </div>
+  <div class="modal-footer">
+    <button class="btn" data-dismiss="modal" aria-hidden="true"><%= I18n.t('action.close') %></button>
+    <%= f.submit t("action.add") + " " + @model.display_name, :disable_with => t("action.submitting"), :id =>"new-resource-button" %>
+  </div>
+<% end -%>

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

@@ -0,0 +1,55 @@
+<%= provide(:page_title, "Categorias") %>
+
+<div class="row-fluid">
+  <div class="widget widget-padding span12" id="wizard">
+    <div class="widget-header">
+      <ul class="nav nav-tabs">
+        <% current_page = "no-page" %>
+        <% @categories.each_with_index do |category, index| %>
+          <% if current_page != category.model %>
+          <% if index == 0 %>
+            <li class = "active">
+          <% else %>
+            <li>
+          <% end %>
+            <% if !category.model.nil? %>
+              <%= link_to (category.model.capitalize), "#tab#{index}", "data-toggle" => "tab" %></li>
+            <% current_page = category.model %>
+            <% end %>
+          <% end %>
+        <% end %>
+      </ul>
+    </div>
+
+    <div class="widget-body">
+      <div class="tab-content">
+        <% current_page = "no-page" %>
+        <% @categories.each_with_index do |categories, index| %>
+
+          <% if current_page != categories.model %>
+            <% if index == 0 %>
+              <div class="tab-pane active" id="tab<%= index %>">
+            <% else %>
+              <div class="tab-pane" id="tab<%= index %>">
+            <% end %>
+              <% current_cateogory_records = Adminpanel::Category.of_model categories.model %>
+              <%= render "categories_table", :categories => current_cateogory_records, :model => categories.model %>
+            </div>
+            <% current_page = categories.model %>
+          <% end %>
+        <% end %>
+      </div>
+
+    </div>
+  </div>
+</div>
+
+<!-- example modal -->
+<div id="example_modal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-header" id="modal-header">
+    <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+    <h3 id="myModalLabel">Crear Categoría</h3>
+  </div>
+  <div id="modal-container">
+  </div>
+</div>

data/app/views/adminpanel/categories/new.js.erb

@@ -0,0 +1 @@
+$("#modal-container").html('<%= escape_javascript(render "category_form", :resource => resource, :model => model) %>');

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

@@ -1,50 +1,119 @@
 <!-- Side menu -->
 <div class="sidebar-nav nav-collapse collapse" id="sidebar-navigation">
-	<% if signed_in? %>
-		<div class="user_side clearfix">
-				<h5>
-					<%= @current_user.name.humanize %>
-				</h5>
-				<%= link_to (content_tag(:i, nil, :class => 'icon-cog') + ' Editar'), edit_user_path(@current_user) %>
-		</div>
-	<% end %>
+	<div class="user_side clearfix">
+		<h5>
+			<%= @current_user.name.humanize %>
+		</h5>
+		<%=
+		link_to(
+			content_tag(:i, nil, :class => 'icon-cog') + ' Editar',
+			edit_user_path(@current_user)
+		)
+		%>
+	</div>
 	<div class="accordion" id="accordion2">
-		<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')}"  %>
+
+		<% if !Adminpanel.unincluded_modules.include?(:analytics) %>
+			<div class="accordion-group">
+				<div class="accordion-heading">
+					<%=
+					link_to(
+						content_tag(
+							:i,
+							nil,
+							:class => 'icon-dashboard') +
+							content_tag(:span," #{I18n.t('model.Analytics')}"),
+						pages_path,
+						:class => "accordion-toggle b_D1B2D1 #{is_current_section?('pages')}"
+						)
+					%>
+				</div>
 			</div>
-		</div>
+		<% end %>
 
 		<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')}"  %>
+				<%=
+				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-tasks') + content_tag(:span, ' Secciones'), sections_path, :class => "accordion-toggle b_F6F1A2 #{is_current_section?('sections')}"  %>
+		<% if !Adminpanel.unincluded_modules.include?(:gallery) %>
+			<div class="accordion-group">
+				<div class="accordion-heading">
+					<%=
+					link_to(
+						content_tag(
+							:i,
+							nil,
+							:class => 'icon-picture') +
+							content_tag(:span, " #{t('model.Gallery')}"),
+						galleries_path,
+						:class => "accordion-toggle b_C3F7A7 #{is_current_section?('galleries')}"
+					)
+					%>
+				</div>
 			</div>
-		</div>
+		<% end %>
+
+		<% if !Adminpanel.unincluded_modules.include?(:sections) %>
+			<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>
+		<% end %>
+
+		<% if !Adminpanel.unincluded_modules.include?(:categories) %>
+			<div class="accordion-group">
+				<div class="accordion-heading">
+					<%=
+					link_to(
+						content_tag(:i, nil, :class => 'icon-bookmark') +
+							content_tag(:span, " #{t('model.Categories')}"),
+						categories_path,
+						:class => "accordion-toggle b_99FFCC #{is_current_section?('categories')}"
+					)
+					%>
+				</div>
+			</div>
+		<% end %>
+
 
 		<% @menu_items.each do |menu| %>
 			<div class="accordion-group">
 				<div class="accordion-heading">
-					<%= 
+					<%=
 					link_to content_tag(
 						:i,
 						nil,
 						:class => "Adminpanel::#{menu}".constantize.icon
 					) + content_tag(
-						:span, 
-						" " + ("Adminpanel::#{menu}".constantize.plural_name)
+						:span,
+						" " + pluralize_es("Adminpanel::#{menu}".constantize.display_name)
 					),
 					[route_symbol(menu)],
-					:class => "accordion-toggle b_F5C294 #{is_current_section?(menu)}" 
+					:class => "accordion-toggle b_F5C294 #{is_current_section?(menu)}"
 					%>
 				</div>
 			</div>
 		<% end %>
 	</div>
 </div>
-<!-- /Side menu -->
+<!-- /Side menu -->

data/app/views/shared/_error_messages.html.erb

@@ -1,13 +1,13 @@
 <% if object.errors.any? %>
 	<div id="error_explanation">
 		<div id="alerts" class="alert alert-error">
-			<%= t( :errors, :count => object.errors.count, :model => t("model.#{object.class.model_name}")) %>:
+			<%= t( :errors, :count => object.errors.count, :model => @model.display_name) %>:
 			<ul>
 			<% object.errors.messages.keys.each do |field| %>
 				<% object.errors.messages[field].each do |value| %>
 				 <li>
-				 	<%= t("model.attributes.#{field}") %>
-				 	<%= value %>
+				  	<%= @model.get_attribute_name(field.to_s) %>
+				  	<%= value %>
 				 </li>
 				<% end %>
 			<% end %>

data/app/views/shared/_form_fields.html.erb

@@ -14,26 +14,27 @@
 
 	<% elsif properties["type"] == "adminpanel_file_field" %>
 		<%= f.fields_for :images do |builder| %>
-        	<%= render 'shared/image_fields', :f => builder, :model_name => @model.display_name.capitalize %>
-    	<% end -%>
-    	<%= link_to_add_fields t("Add Image"), f, :images, @model.display_name.capitalize %>
+    	<%= render 'shared/image_fields', :f => builder, :model_name => @model.display_name.capitalize %>
+  	<% end -%>
+  	<%= link_to_add_fields t("Add Image"), f, :images, @model.display_name.capitalize %>
 
-    <% elsif properties["type"] == "belongs_to" %>
+  <% elsif properties["type"] == "belongs_to" %>
 		<% args = properties.except("type", "name", "model") %>
 		<% args.symbolize_keys! %>
-    	<%= f.select(attribute, (@collections["#{properties["model"]}"].collect{|resource| [resource.name, resource.id]}), args) %>
+  	<%= f.select(attribute, (@collections["#{properties["model"]}"].collect{|resource| [resource.name, resource.id]}), args) %>
 
-    <% elsif properties["type"] == "has_many" %>
-    	<%= hidden_field_tag("#{class_name_downcase(f.object)}[#{relationship_ids(properties["model"])}][]", nil) %>
-    	<% @collections["#{properties["model"]}"].each do |resource| %>
-    		<%= f.checkbox(resource, class_name_downcase(f.object) ,relationship_ids(properties["model"])) %>
+  <% elsif properties["type"] == "has_many" %>
+		<%= I18n.t('other.choose', :model => pluralize_es(properties["model"].classify.constantize.display_name)) %>
+  	<%= hidden_field_tag("#{class_name_downcase(f.object)}[#{relationship_ids(properties["model"])}][]", nil) %>
+  	<% @collections["#{properties["model"]}"].each do |resource| %>
+  		<%= f.checkbox(resource, class_name_downcase(f.object) ,relationship_ids(properties["model"])) %>
 		<% end %>
 
-    <% else %>
+  <% else %>
 		<% type = properties["type"] %>
 		<% args = properties.except("type", "name") %>
-	    <%= f.send(type, attribute, args) %>
-    <% end %>
+    <%= f.send(type, attribute, args) %>
+  <% end %>
 
 <% end %>
-<% end %>
+<% end %>

data/app/views/shared/index.html.erb

@@ -17,7 +17,7 @@
     <div class="widget-header">
       <%= content_tag(:i, nil, :class => @model.icon) %>
       <h5>
-        <%= @model.display_name %>
+        <%= pluralize_es(@model.display_name) %>
       </h5>
     </div>
     <div class="widget-body">

data/config/locales/es.yml

@@ -1,15 +1,8 @@
 es:
   model:
-    Adminpanel::User: "Usuario"
-    Adminpanel::Product: "Producto"
-    Adminpanel::Gallery: "Galería de Inicio"
-    Adminpanel::Section: "Sección"
-    Adminpanel::Image: "Imagen"
-    Adminpanel::Category: "Categoría"
-    Adminpanel::Client: "Cliente"
-    Adminpanel::Post: "Publicación"
-    Adminpanel::Adminproject: "Proyecto"
-    Adminpanel::Siteproject: "Proyecto"
+    Analytics: "Google Analytics"
+    Gallery: "Galería de Inicio"
+    Categories: "Categorías"
     attributes:
       adminproject_id: "Proyecto"
       brief: "Pequeña descripción"
@@ -51,6 +44,7 @@ es:
   action:
     add: "Agregar"
     create: "Crear"
+    close: "Cerrar"
     show: "Ver"
     submitting: "Enviando..."
     save: "Guardar"
@@ -84,4 +78,5 @@ es:
     password: "Contraseña"
     email: "Correo electrónico"
   other:
+    choose: "Selecciona %{model} pertenecientes"
     no description: "No tiene descripción aún"

data/config/routes.rb

@@ -2,23 +2,34 @@ include Adminpanel::RouterHelper
 
 Adminpanel::Engine.routes.draw do
 
-    adminpanel_resources.each do |file|
-        if file
-            resources file.to_sym
-        end
+  adminpanel_resources.each do |file|
+    if file
+      resources file.to_sym
     end
+  end
 
 	resources :sections, :except => [:new, :create, :destroy]
     match '/signout', :to => 'sessions#destroy', :via => :delete, :as => "signout"
     match '/signin', :to => 'sessions#new', :as => "signin"
     resources :users
-    resources :galleries do
+    if !Adminpanel.unincluded_modules.include?(:categories)
+      resources :categories
+    end
+
+    if !Adminpanel.unincluded_modules.include?(:gallery)
+      resources :galleries do
         member do
-            put :move_better, :as => "move_to_better"
-            put :move_worst, :as => "move_to_worst"
+          put :move_better, :as => "move_to_better"
+          put :move_worst, :as => "move_to_worst"
         end
+      end
     end
     resources :sessions, :only => [:new, :create, :destroy]
 
-    root :to => 'pages#index'
-end
+    if !Adminpanel.unincluded_modules.include?(:analytics)
+      resources :pages, :path => 'analytics', :only => [:index]
+      root :to => 'pages#index'
+    else
+      root :to => 'users#index'
+    end
+end

data/lib/adminpanel/active_record_extension.rb

@@ -2,14 +2,17 @@ module ActiveRecordExtension
   extend ActiveSupport::Concern
   #instance methods
   # def foo
-    
+
   # end
 
   # static(class) methods
   module ClassMethods
     def form_attributes
       [{
-        "name" => {"type" => "text_field", "name" => ":name"}
+        "name" => {
+          "type" => "text_field",
+          "name" => "name"
+        }
       }]
     end
 
@@ -17,6 +20,51 @@ module ActiveRecordExtension
       "display_name"
     end
 
+    def get_attribute_name(field)
+      form_attributes.each do |attribute|
+        attribute.each do |name, properties|
+          if name == field
+            return properties["name"]
+          end
+        end
+      end
+      return ":("
+    end
+
+
+    def get_attribute_name(field)
+      form_attributes.each do |attribute|
+        attribute.each do |name, properties|
+          if name == field
+            return properties["name"]
+          end
+        end
+      end
+      return ":("
+    end
+
+    def get_attribute_label(field)
+      form_attributes.each do |attribute|
+        attribute.each do |name, properties|
+          if name == field
+            return properties["label"]
+          end
+        end
+      end
+      return ":("
+    end
+
+    def get_attribute_placeholder(field)
+      form_attributes.each do |attribute|
+        attribute.each do |name, properties|
+          if name == field
+            return properties["placeholder"]
+          end
+        end
+      end
+      return ":("
+    end
+
     def display_attributes
       display_attributes = []
       form_attributes.each do |attribute|
@@ -30,10 +78,6 @@ module ActiveRecordExtension
       return display_attributes
     end
 
-    def plural_name
-      display_name.pluralize
-    end
-
     def has_images?
       form_attributes.each do |fields|
       fields.each do |attribute, properties|
@@ -75,5 +119,5 @@ module ActiveRecordExtension
   end
 end
 
-# include the extension 
-ActiveRecord::Base.send(:include, ActiveRecordExtension)
+# include the extension
+ActiveRecord::Base.send(:include, ActiveRecordExtension)