activoate 0.5.0 → 0.6.8

data/app/assets/javascripts/activo.js.coffee

@@ -0,0 +1,16 @@
+# This is a manifest file that'll be compiled into including all the files listed below.
+# Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+# be included in the compiled file accessible from http:#example.com/assets/activo-2.js
+# It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
+# the compiled file.
+#
+#= require jquery
+#= require jquery-ui
+#= require jquery_ujs
+#= require_tree ./activo
+#= require_self
+
+$(document).ready =>
+	$('#destroy-toggle').click ->
+		state = $(this).is(':checked')
+		$('[name="destroy[]"]').attr('checked', state)

data/app/assets/stylesheets/{activo-2 → activo}/base.css

@@ -1,5 +1,3 @@
-/** This is the original web-app-theme main stylesheet */
-
 * {margin:0;padding:0}
 .clear { clear: both; height: 0; }
 
@@ -177,7 +175,7 @@ body {
 
 /* pagination */
 
-.pagination a, .pagination span {
+.pagination a, .pagination span, .pagination em {
   padding: 2px 5px;
   margin-right: 5px; 
   display: block;
@@ -186,7 +184,7 @@ body {
   border-width: 1px;
 }
 
-.pagination span.current {
+.pagination em {
   font-weight: bold;  
 }
 
@@ -361,24 +359,33 @@ a.button:link, a.button:visited, a.button:hover, a.button:active, button.button
   background-color: #eee;
   border:1px solid #bfbfbf;
   font-size: 1em;
-  line-height: 26px;
+  line-height: 1.3em;
   font-weight:bold;
   cursor:pointer;
+  padding:5px 10px 6px 7px;
   text-decoration: none;
-  padding: 0 10px;
-  height: 26px;
 }
 
 button.button {
-  height: 28px;
+  width:auto;
+  overflow:visible;
+  padding:4px 10px 3px 7px; /* IE6 */
+}
+button.button[type] {
+  padding:5px 10px 5px 7px; /* Firefox */
+  line-height:17px; /* Safari */
 }
 
-.button img {
-  vertical-align: middle;
-  margin: 0 0 2px -3px;
-  border: none;
-  width: 16px;
-  height: 16px;
+*:first-child+html button.button[type] {
+  padding:4px 10px 3px 7px; /* IE7 */
+}
+
+button.button img, a.button img {
+  margin:0 3px -3px 0 !important;
+  padding:0;
+  border:none;
+  width:16px;
+  height:16px;
 }
 
 button.button:hover, a.button:hover {
@@ -387,4 +394,17 @@ button.button:hover, a.button:hover {
 
 button.button:active, a.button:active {
   background-color:#e5e5e5;
+}
+.text_button_padding{
+  color: #222222;
+  display: block;
+  float: left;
+  font-size: 1em;
+  line-height: 2em;
+  margin: 0 7px 0 0;
+  padding: 5px 0 6px 7px;
+  text-decoration: none;
+}
+.link_button{
+  cursor: pointer;
 }

data/app/assets/stylesheets/{activo-2 → activo}/libs/jquery.tipsy.css

@@ -1,6 +1,6 @@
 /** Stylesheet for the tooltips (jquery.tipsy) */
 
-.tipsy { padding: 5px; font-size: 12px; opacity: 0.8; filter: alpha(opacity=80); background-repeat: no-repeat;  background-image: url('/assets/activo-2/tipsy/tipsy.gif'); }
+.tipsy { padding: 5px; font-size: 12px; opacity: 0.8; filter: alpha(opacity=80); background-repeat: no-repeat;  background-image: url('/assets/activo/tipsy/tipsy.gif'); }
   .tipsy-inner { padding: 5px 8px 4px 8px; background-color: black; color: white; max-width: 200px; text-align: center; }
   .tipsy-inner { -moz-border-radius:3px; -webkit-border-radius:3px; -moz-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6);  -webkit-box-shadow: 0 0 3px rgba(0, 0, 0, 0.6); }
   .tipsy-north { background-position: top center; }

data/app/assets/stylesheets/{activo-2 → activo}/libs/uniform.default.css

@@ -23,7 +23,7 @@ div.uploader,
 div.uploader span.action,
 div.button,
 div.button span {
-  background-image: url('/assets/activo-2/uniform/sprite.png');
+  background-image: url('/assets/activo/uniform/sprite.png');
   background-repeat: no-repeat;
   -webkit-font-smoothing: antialiased;
 }
@@ -53,8 +53,8 @@ textarea.uniform {
   font-weight: normal;
   padding: 3px;
   color: #777;
-  background: url('/assets/activo-2/bg-input-focus.png') repeat-x 0px 0px;
-  background: url('/assets/activo-2/bg-input.png') repeat-x 0px 0px;
+  background: url('/assets/activo/bg-input-focus.png') repeat-x 0px 0px;
+  background: url('/assets/activo/bg-input.png') repeat-x 0px 0px;
   border-top: solid 1px #aaa;
   border-left: solid 1px #aaa;
   border-bottom: solid 1px #ccc;
@@ -73,7 +73,7 @@ textarea.uniform:focus {
   -moz-box-shadow: 0px 0px 4px rgba(0,0,0,0.3);
   box-shadow: 0px 0px 4px rgba(0,0,0,0.3);
   border-color: #999;
-  background: url('/assets/activo-2/bg-input-focus.png') repeat-x 0px 0px;
+  background: url('/assets/activo/bg-input-focus.png') repeat-x 0px 0px;
 }
 
 /* SPRITES */

data/app/assets/stylesheets/{activo-2 → activo}/style.sass

@@ -22,10 +22,6 @@
 
 /////////////////////// NOTICE ////////////////////////
 
-//  Components included in this stylesheet that
-//  don't exist in other activo-2 themes
-//  ---------------------------------------------------
-//
 //  #full-main (ocupa os 100% de width para
 //    páginas que não têm barra lateral)
 //  .flash .error-list
@@ -61,7 +57,7 @@ $yellow:     #ffee79
 
 body
   color: $black_text
-  background: #C4C4C4 url('/assets/activo-2/bgd.jpg')
+  background: #C4C4C4 url('/assets/activo/bgd.jpg')
   +font-normal-weight
 
 h1, h2, h3
@@ -89,7 +85,7 @@ hr
     width: 160px
     margin-top: 20px
     float: left
-    background-image: url('/assets/activo-2/logo.png')
+    background-image: url('/assets/activo/logo.png')
     background-repeat: no-repeat
 
   h1
@@ -190,7 +186,7 @@ hr
 // TOP NAVIGATION
 
 .secondary-navigation
-  background: #e0e0e0 url('/assets/activo-2/boxbar-background.png') top
+  background: #e0e0e0 url('/assets/activo/boxbar-background.png') top
   border-bottom-width: 0px
   @include rounded-corner(top, left, 6px)
   @include rounded-corner(top, right, 6px)
@@ -236,7 +232,7 @@ hr
 
 .secondary-inner-nav
   background-color: #f0eff0
-  background-image: url('/assets/activo-2/boxbar-background.png')
+  background-image: url('/assets/activo/boxbar-background.png')
   font-size: 13px
 
   border-bottom-color: #fff
@@ -334,7 +330,7 @@ hr
     // sidebar list
     background-position: 0 11px
     background-repeat: no-repeat
-    background-image: url('/assets/activo-2/arrow.png')
+    background-image: url('/assets/activo/arrow.png')
     border-bottom: 1px dashed #777
     list-style-type: none
     a
@@ -364,7 +360,7 @@ hr
       padding-top: 10px
       padding-left: 17px // distance to the image
       margin-right: 15px // space between elements
-      background: url('/assets/activo-2/breadcrumb.png') no-repeat 0px 12px
+      background: url('/assets/activo/breadcrumb.png') no-repeat 0px 12px
       float: left
 
       a
@@ -396,7 +392,7 @@ hr
     min-width: 15px
     text-align: center
     background: $light_grey
-    background-image: url('/assets/activo-2/button-background.png')
+    background-image: url('/assets/activo/button-background.png')
     color: $black_text
 
   a:hover
@@ -409,7 +405,7 @@ hr
     border: 1px solid $black
 
 .pagination a:active
-  background-image: url('/assets/activo-2/button-background-active.png')
+  background-image: url('/assets/activo/button-background-active.png')
   outline: none /* hide dotted outline in Firefox */
 
 
@@ -499,7 +495,7 @@ hr
 
 .search_submit
   border: 0px
-  background: transparent url('/assets/activo-2/search-button.png') no-repeat center left
+  background: transparent url('/assets/activo/search-button.png') no-repeat center left
   position: absolute
   left: 273px
   height: 25px
@@ -524,17 +520,17 @@ hr
 
   .error, .error-list
     border: 1px solid #993624 // rgba(0,0,0,.25)
-    background: #CC4831 url('/assets/activo-2/messages/error.png') no-repeat 10px center
+    background: #CC4831 url('/assets/activo/messages/error.png') no-repeat 10px center
 
   .warning
     border: 1px solid #BB9004 // rgba(0,0,0,.25)
-    background: #F9C006 url('/assets/activo-2/messages/warning.png') no-repeat 10px center
+    background: #F9C006 url('/assets/activo/messages/warning.png') no-repeat 10px center
 
   .notice
     color: #28485E
     text-shadow: 0 1px 0 rgba(255,255,255,.7)
     border: 1px solid #8A9DAA // rgba(0,0,0,.25)
-    background: #B8D1E2 url('/assets/activo-2/messages/notice.png') no-repeat 10px center
+    background: #B8D1E2 url('/assets/activo/messages/notice.png') no-repeat 10px center
 
   .error-list
     text-align: left
@@ -587,7 +583,7 @@ ul.list li
 //  BUTTONS
 
 a.button, button.button
-  background: #EDEEED url('/assets/activo-2/button-background.png') top
+  background: #EDEEED url('/assets/activo/button-background.png') top
   border: 1px solid #c3c4ba
   +font-normal-weight
   @include rounded-corners(3px)
@@ -595,10 +591,10 @@ a.button, button.button
 
   &:link, &:visited, &:hover, &:active
     font-weight: normal
-    background: #EDEEED url('/assets/activo-2/button-background.png') top
+    background: #EDEEED url('/assets/activo/button-background.png') top
 
 a.button:active, button.button:active
-  background: #EAEAEA url('/assets/activo-2/button-background-active.png') top
+  background: #EAEAEA url('/assets/activo/button-background-active.png') top
   outline: none /* hide dotted outline in Firefox */
   margin-top: 1px
   margin-bottom: -1px

data/app/assets/stylesheets/{activo-2.css → activo.css}

@@ -1,9 +1,9 @@
 /* 
  * This css will include all web-app-theme css you need
  *
- *= require activo-2/base
- *= require activo-2/style
- *= require_tree ./activo-2/libs
+ *= require ./activo/base
+ *= require ./activo/style
+ *= require_tree ./activo/libs
  *= require_self
  */
 

data/app/helpers/activo_helper.rb

@@ -33,6 +33,7 @@ module ActivoHelper
     end
   end
 
+  
   # Wraps the button helper, creating an add button
   #
   # path - The button`s action
@@ -42,7 +43,19 @@ module ActivoHelper
   #
   # Returns an anchor tag
   def add_button(path)
-    button(path, t("web-app-theme.add", :default => 'Add'), 'add')
+    button(path, t("activoated.add", :default => 'Add'), 'add')
+  end
+  
+  # Wraps the button helper, creating a cancel button
+  #
+  # path - The button`s action
+  #
+  # Example:
+  #   <%= cancel_button users_path %>
+  #
+  # Returns an anchor tag
+  def cancel_button(path)
+    button(path, t("activoated.cancel", :default => 'Cancel'), 'cross')
   end
 
   # Wraps the button helper, creating an edit button
@@ -56,7 +69,7 @@ module ActivoHelper
   #
   # Returns an anchor tag
   def edit_button(path, alternative_icon = false)
-    button(path, t("web-app-theme.edit", :default => 'Edit'), alternative_icon ? 'edit' : 'application_edit')
+    button(path, t("activoated.edit", :default => 'Edit'), alternative_icon ? 'edit' : 'application_edit')
   end
 
   # Wraps the button helper, creating a delete button
@@ -71,10 +84,10 @@ module ActivoHelper
   # Returns an anchor tag
   def delete_button(path, alternative_icon = false)
     options = {
-        :confirm => t("web-app-theme.confirm", :default => "Are you sure?"),
+        :confirm => t("activoated.confirm", :default => "Are you sure?"),
         :method => :delete
     }
-    button(path, t("web-app-theme.delete", :default => 'Delete'), alternative_icon ? 'delete' : 'cross', options)
+    button(path, t("activoated.delete", :default => 'Delete'), alternative_icon ? 'delete' : 'cross', options)
   end
 
   # Displays a button
@@ -93,7 +106,26 @@ module ActivoHelper
     options = default_options.merge(options)
 
     link_to path, options do
-      image_tag("activo-2/icons/#{icon}.png", :alt => caption) + " " + caption
+      image_tag("activo/icons/#{icon}.png", :alt => caption) + " " + caption
+    end
+  end
+  
+  # Displays a submit button
+  #
+  # caption - The button`s caption
+  # icon - The icon file name, without the extension
+  # options - A hash of attributes to apply to the wrapping button tag
+  #
+  # Example:
+  #   <%= submit_button root_path, { :caption => 'home', :icon => 'home' } %>
+  #
+  # Returns a button tag
+  def submit_button(caption = 'submit', icon = 'show', options = {})
+    default_options = { :class => "button", :type => 'submit' }
+    options = default_options.merge(options)
+
+    content_tag("button", options) do
+      image_tag("activo/icons/#{icon}.png", :alt => caption) + " " + caption
     end
   end
 
@@ -140,7 +172,7 @@ module ActivoHelper
 
     options[:alt] ||= name.capitalize.gsub("_", " ")
 
-    path = "activo-2/icons/#{name}.png"
+    path = "activo/icons/#{name}.png"
 
     image_tag path, { :alt => options[:alt] }
   end

data/lib/activoate/engine.rb

@@ -2,5 +2,43 @@ require 'rails'
 
 module Activoate
   class Engine < Rails::Engine
+    
+    # Sets default values for the generators
+    initializer "generator default values" do |app|
+
+      # Have attrtastic?
+      begin
+        require 'attrtastic'
+        config.attrtastic = true
+      rescue LoadError
+        config.attrtastic = false
+      end
+
+      # Using haml?
+      begin
+        require 'haml'
+        config.engine = 'haml'
+      rescue LoadError
+        config.engine = 'erb'
+      end
+      
+      # Using formtastic?
+      begin
+        require 'formtastic'
+        config.formtastic = true
+      rescue LoadError
+        config.formtastic = false
+      end
+
+      # Using will_paginate?
+      begin
+        require 'will_paginate'
+        config.will_paginate = true
+      rescue LoadError
+        config.will_paginate = false
+      end
+      
+    end
+    
   end
 end

data/lib/activoate/version.rb

@@ -1,3 +1,3 @@
 module Activoate
-  VERSION = "0.5.0"
+  VERSION = "0.6.8"
 end

data/lib/generators/activoate/{activated/activated_generator.rb → activoated/activoated_generator.rb}

@@ -1,19 +1,21 @@
 require 'rails/generators/generated_attribute'
 
 module Activoate
-  class ActivatedGenerator < Rails::Generators::Base
+  class ActivoatedGenerator < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
         
     argument :controller_path,  :type => :string
     argument :model_name,       :type => :string, :required => false    
     
     class_option :layout,         :type => :string,   :desc => 'Specify the layout name'
-    class_option :engine,         :type => :string,   :default => 'erb', :desc => 'Specify the template engine'
-    class_option :will_paginate,  :type => :boolean,  :default => false, :desc => 'Specify if you use will_paginate'
     class_option :themed_type,    :type => :string,   :default => 'crud', :desc => 'Specify the themed type, crud or text. Default is crud'
     
-    class_option :formtastic,     :type => :boolean,  :default => false, :desc => 'Specify if you use formtastic'
-    class_option :attrtastic,     :type => :boolean,  :default => false, :desc => 'Specify if you use attrtastic'
+    class_option :attrtastic,     :type => :boolean,  :default => Activoate::Engine.config.attrtastic,    :desc => 'Specify if you use attrtastic'
+    class_option :engine,         :type => :string,   :default => Activoate::Engine.config.engine,        :desc => 'Specify the template engine'
+    class_option :formtastic,     :type => :boolean,  :default => Activoate::Engine.config.formtastic,    :desc => 'Specify if you use formtastic'
+    class_option :will_paginate,  :type => :boolean,  :default => Activoate::Engine.config.will_paginate, :desc => 'Specify if you use will_paginate'
+    
+    class_option :mass_destroy,   :type => :boolean,  :default => false,                                  :desc => 'Specify if you want to add mass destroy checkboxes on tables'
     
     def initialize(args, *options)
       super(args, *options)