adminpanel 0.0.6.1 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA1: 
-  metadata.gz: f89ba58112b29a75f227a8d2220d5d53e86de71b
-  data.tar.gz: df1e26ec3b6fb85782c1876dcdc9a866c8126e99
 SHA512: 
-  metadata.gz: 00b4687518b4a7d91024b3141698c7d18e19c3924d2fd337741b3bc4d44faffabd63cace40117c9b2a2856c9b9f5f354c297d9f89cd7feb69aca3e70bfc00543
-  data.tar.gz: feb9fef87348256156bbf7aed8d6d4bb8c815091b4a6fe6749f1a5efe8e994615e24158a54a9cffd3bd7e2d113be16385a7faed7d523009c6665b182a123ab45
+  data.tar.gz: c1b2563a9b1c4c707c9653e0361a2fe667e1e06d4187d1191ae29b7f188ccd861ab5d231881e158266f1481a0b9c5b6920b317e96c6a227aab085d3e18c41dd0
+  metadata.gz: 7c5526de8b8d50f76261a7b6973ec949020ad24da0dd6fc53c76394f135d526819f48304dfc186e69584acbfd318de30845d0021c48140016cebe0ab808440c8
+SHA1: 
+  data.tar.gz: a985bd1a3f33365906afb35f48d872c1829952cf
+  metadata.gz: 1a829db829744d3dc281b3ac16ecd74618855d84

data/app/controllers/adminpanel/sessions_controller.rb

@@ -1,8 +1,7 @@
 module Adminpanel
 	class SessionsController < Adminpanel::ApplicationController
 
-		layout "login"
-		layout 'sessions'
+		layout "admin-login"
 		skip_before_filter :signed_in_user
 
 		def new

data/app/helpers/adminpanel/images_helper.rb

@@ -0,0 +1,10 @@
+module Adminpanel
+	module ImagesHelper
+
+		def is_class?(name)
+			Module.const_get(name).is_a?(Class) 
+			rescue NameError 
+				return false
+		end
+	end
+end

data/app/models/adminpanel/image.rb

@@ -1,8 +1,15 @@
 module Adminpanel
 	class Image < ActiveRecord::Base
-	  attr_accessible :file, :foreign_key, :model
-	  mount_uploader :file, Adminpanel::ImageUploader
-	  validates_presence_of :model
-	  validates_presence_of :file
+		extend ImagesHelper
+		
+		attr_accessible :file, :foreign_key, :model
+		validates_presence_of :model
+		validates_presence_of :file
+
+		if is_class?("ProductUploader")
+	  		mount_uploader :file, ProductUploader
+		else
+	  		mount_uploader :file, Adminpanel::ImageUploader
+		end
 	end
 end

data/app/uploaders/adminpanel/image_uploader.rb

@@ -5,7 +5,6 @@ module Adminpanel
     # 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
@@ -38,10 +37,6 @@ module Adminpanel
       process :resize_to_fill => [468, 312]
     end
 
-    version :tiny do
-      process :resize_to_fill => [460, 307]
-    end
-
     # Create different versions of your uploaded files:
     version :thumb do
       process :resize_to_limit => [220, 220]

data/app/views/adminpanel/products/_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/layouts/_top_bar.html.erb

@@ -4,11 +4,13 @@
       <div class="logo"> 
         <%= 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>
@@ -26,16 +28,16 @@
           </li>
         </ul>
       </div>
-
+      
       <div class="top-menu visible-phone visible-tablet">
         <ul class="pull-right">  
           <li>
             <% if signed_in? %>
               <%= link_to content_tag('i', nil, :class => 'icon-off'), signout_path, :method => "delete", :title => 'Logout', :id => "signout-button" %>
-            <% end %>
           </li>
         </ul>
       </div>
+      <% end %>
       
     </div>
   </div>

data/app/views/layouts/admin-login.html.erb

@@ -16,6 +16,7 @@
 
 	<body>
 		<div id="wrap">
+			<%= render 'layouts/top_bar' %>
 			<div class="container-fluid">
 				<%= yield %>
 				<%= debug(params) if Rails.env.development? %>

data/config/locales/es.yml

@@ -4,6 +4,7 @@ es:
     Adminpanel::Product: "Producto"
     Adminpanel::Gallery: "Galería de Inicio"
     Adminpanel::Section: "Sección"
+    Adminpanel::Image: "Imagen"
     Adminpanel::Category: "Categoría"
     attributes:
       Adminpanel::User:

data/lib/adminpanel/version.rb

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

data/spec/uploaders/image_uploader_spec.rb

@@ -28,10 +28,4 @@ describe Adminpanel::ImageUploader do
       @image_uploader.portfolio.should be_no_larger_than(468, 312)
     end
   end
-
-  context 'the tiny version' do
-    it "should scale down a landscape image to fit within 400 by 307 pixels" do
-      @image_uploader.tiny.should have_dimensions(460, 307)
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: adminpanel
 version: !ruby/object:Gem::Version 
-  version: 0.0.6.1
+  version: 0.0.7
 platform: ruby
 authors: 
 - Jose Ramon Camacho
@@ -266,6 +266,7 @@ files:
 - app/controllers/adminpanel/sessions_controller.rb
 - app/controllers/adminpanel/users_controller.rb
 - app/helpers/adminpanel/application_helper.rb
+- app/helpers/adminpanel/images_helper.rb
 - app/helpers/adminpanel/sessions_helper.rb
 - app/helpers/custom_form_builder.rb
 - app/models/adminpanel/category.rb
@@ -315,7 +316,6 @@ files:
 - app/views/layouts/_top_bar.html.erb
 - app/views/layouts/admin-login.html.erb
 - app/views/layouts/admin.html.erb
-- app/views/layouts/sessions.html.erb
 - app/views/shared/_breadcrumb.html.erb
 - app/views/shared/_error_messages.html.erb
 - config/database.yml
@@ -369,7 +369,6 @@ files:
 - spec/features/product_pages_spec.rb
 - spec/models/category_spec.rb
 - spec/models/gallery_spec.rb
-- spec/models/image_uploader.rb
 - spec/models/product_spec.rb
 - spec/models/section_spec.rb
 - spec/models/user_spec.rb
@@ -449,7 +448,6 @@ test_files:
 - spec/features/product_pages_spec.rb
 - spec/models/category_spec.rb
 - spec/models/gallery_spec.rb
-- spec/models/image_uploader.rb
 - spec/models/product_spec.rb
 - spec/models/section_spec.rb
 - spec/models/user_spec.rb

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

@@ -1,11 +0,0 @@
-<% content_for :login do %>
-  <div class="row-fluid">
-    <div class="span12">
-      	<div class="row-fluid">
-			<%= yield %>
-    	</div><!--/row-fluid-->
-    <%= debug(params) if Rails.env.development? %>
-    </div><!--/span10-->
-  </div><!--/row-fluid-->
-<% end %>
-<%= render :template => 'layouts/admin' %>

data/spec/models/image_uploader.rb

@@ -1,25 +0,0 @@
-require 'spec_helper'
-
-describe Adminpanel::Image do
-  before do
-    @image = Adminpanel::Image.new(
-      :file => "Test file"
-      )
-  end
-
-  subject { @image }
-
-  it { should respond_to(:file) }
-  it { should respond_to(:foreign_key) }
-  it { should respond_to(:model) }
-
-  describe "when file is not present" do
-    before {@image.file = " "}
-    it {should_not be_valid}
-  end
-
-  describe "when model is not present" do
-    before {@image.model = " "}
-    it {should_not be_valid}
-  end
-end