active_leonardo 0.0.6 → 0.0.7

data/lib/generators/leolay/leolay_generator.rb

@@ -76,7 +76,8 @@ class LeolayGenerator < Rails::Generators::Base
     template "styles/#{style_name}/stylesheets/app/_enviroment.css.scss", "app/assets/stylesheets/_enviroment.css.scss"
 
     copy_file "app/helpers/layout_helper.rb", "app/helpers/layout_helper.rb"
-    directory "styles/#{style_name}/images/style", "app/assets/images/styles/#{style_name}"
+    directory "styles/#{style_name}/images", "app/assets/images/styles/#{style_name}"
+    copy_file "styles/#{style_name}/favicon.ico", "app/assets/images/favicon.ico"
 
     copy_file "styles/#{style_name}/views/layout/application.html.erb", "app/views/layouts/application.html.erb", :force => true
     copy_file "styles/#{style_name}/views/layout/_message.html.erb", "app/views/application/_message.html.erb"
@@ -92,6 +93,15 @@ class LeolayGenerator < Rails::Generators::Base
       end
       break if files.any?
     end
+    if options.authentication?
+      source_paths.each do |source_path|
+        files = Dir["#{source_path}/#{locale_path}/devise.??.yml"]
+        files.each do |f|
+          copy_file f, "#{locale_path}/#{File.basename(f)}"
+        end
+        break if files.any?
+      end
+    end
   end
 
   def setup_application
@@ -177,6 +187,12 @@ class LeolayGenerator < Rails::Generators::Base
       def role?(role)
         roles.include? role.to_s
       end
+      def roles?(*roles)
+        roles.each do |role|
+          return true if role? role
+        end
+        nil
+      end
       def admin?
         self.role? 'admin'
       end

data/lib/generators/leolay/templates/config/initializers/activeadmin_leonardo.rb

@@ -7,7 +7,8 @@ module ActiveAdmin
         private
         def build_footer
           div :id => "footer" do
-            para "#{CONFIG[:application][:name]} #{Rails.env} #{CONFIG[:application][:version]} <%= Time.now.year %>.".html_safe
+            para "#{CONFIG[:application][:name]} #{Rails.env} #{CONFIG[:application][:version]}, <%= Time.now.year %>.".html_safe
+            para style_image_tag "logo.png"
           end
         end
 

data/lib/generators/leolay/templates/styles/active/stylesheets/app/custom_active_admin.css.scss

@@ -1,23 +1,28 @@
-@import "enviroment";
+body.active_admin {
+  @import "enviroment";
 
-#active_admin_content {
-  padding: 10px 10px;
-}
-.price {
-  text-align: right;
-}
-table.index_table tr.odd.selected td {
-    background: none repeat scroll 0 0 #FFFFBD;
-}
-table.index_table tr.even.selected td {
-    background: none repeat scroll 0 0 #FFFFAC;
-}
-.table_tools_segmented_control li.selected {
-  a {
-    background-color: #E6E6E6;
-    cursor: pointer;
+  #active_admin_content {
+    padding: 10px 10px;
   }
-  a:hover {
-    color: inherit;
+  .price {
+    text-align: right;
+  }
+  table.index_table tr.odd.selected td {
+      background: none repeat scroll 0 0 #FFFFBD;
+  }
+  table.index_table tr.even.selected td {
+      background: none repeat scroll 0 0 #FFFFAC;
+  }
+  .table_tools_segmented_control li.selected {
+    a {
+      background-color: #E6E6E6;
+      cursor: pointer;
+    }
+    a:hover {
+      color: inherit;
+    }
+  }
+  #footer {
+    text-align: center;
   }
 }

data/lib/generators/leolay/templates/styles/active/stylesheets/app/stylesheet.css.scss

@@ -1,53 +1,53 @@
 @import "active_admin/mixins";
 @import "active_admin/base";
-@import "enviroment";
-#body {
-  @import "active_admin/pages/logged_out";
-}
 
-#header {
-  #session {
-    display: inline-block;
-    color: #cdcdcd;
-    float: right;
-    margin-right: 20px;
-    margin-bottom: 0px;
-    padding-top: 3px;
-    font-size: 1em;
-    font-weight: normal;
+body.active_admin {
+  @import "enviroment";
+  @import "active_admin/pages/logged_out";
+  #header {
+    #session {
+      display: inline-block;
+      color: #cdcdcd;
+      float: right;
+      margin-right: 20px;
+      margin-bottom: 0px;
+      padding-top: 3px;
+      font-size: 1em;
+      font-weight: normal;
+    }
+  }
+  body.logged_out #content_wrapper {
+      width: 600px;
+  }
+  ul li {
+      list-style-type: circle;
   }
-}
-body.logged_out #content_wrapper {
-    width: 600px;
-}
-ul li {
-	list-style-type: circle;
-}
 
-#login {
-  form {
-    input[type=text], input[type=password], input[type=email], input[type=url], input[type=tel], textarea {
-      //width: 76%;
-      //border: 1px solid #c9d0d6;
-      //@include rounded;
-      //font-size: 0.95em;
-      //@include sans-family;
-      //outline: none;
-      padding: 8px 7px;
+  #login {
+    form {
+      input[type=text], input[type=password], input[type=email], input[type=url], input[type=tel], textarea {
+        //width: 76%;
+        //border: 1px solid #c9d0d6;
+        //@include rounded;
+        //font-size: 0.95em;
+        //@include sans-family;
+        //outline: none;
+        padding: 8px 7px;
 
-      //&:focus {
-      //  border: 1px solid #99a2aa;
-      //  @include shadow(0,0,4px,#99a2aa);
+        //&:focus {
+        //  border: 1px solid #99a2aa;
+        //  @include shadow(0,0,4px,#99a2aa);
+        //}
+      }
+      input[type=submit] {
+        @include dark-button;
+        margin-left: 20px;
+        //padding: 4px 8px;
+      }
+      //.buttons {
+      //  margin-top: 15px;
+      //  //input[type=submit] { margin-right: 10px; }
       //}
     }
-    input[type=submit] {
-      @include dark-button;
-      margin-left: 20px;
-      //padding: 4px 8px;
-    }
-    //.buttons {
-    //  margin-top: 15px;
-    //  //input[type=submit] { margin-right: 10px; }
-    //}
   }
-}
+}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: active_leonardo
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Marco Mastrodonato
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-14 00:00:00 Z
+date: 2013-01-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -125,10 +125,10 @@ files:
 - lib/generators/leolay/templates/spec/factories.rb
 - lib/generators/leolay/templates/spec/helpers/application_helpers.rb
 - lib/generators/leolay/templates/spec/support/devise.rb
+- lib/generators/leolay/templates/styles/active/favicon.ico
+- lib/generators/leolay/templates/styles/active/images/ico_v.png
+- lib/generators/leolay/templates/styles/active/images/ico_x.png
 - lib/generators/leolay/templates/styles/active/images/logo.png
-- lib/generators/leolay/templates/styles/active/images/style/ico_v.png
-- lib/generators/leolay/templates/styles/active/images/style/ico_x.png
-- lib/generators/leolay/templates/styles/active/images/style/Thumbs.db
 - lib/generators/leolay/templates/styles/active/stylesheets/app/custom_active_admin.css.scss
 - lib/generators/leolay/templates/styles/active/stylesheets/app/stylesheet.css.scss
 - lib/generators/leolay/templates/styles/active/stylesheets/app/_enviroment.css.scss