 |
fixed the generators and README - reportable - Fork of reportable required by W… |
 |
Log |
|
Files |
|
Refs |
|
README |
|
--- |
|
commit 1e5e60d45e233da72bd7a206466cf4ce379a7532 |
|
parent 4081bb35d05fd34054f6c7a65f452cffde930ed0 |
 |
Author: Marco Otte-Witte <[email protected]> |
|
Date: Thu, 13 May 2010 12:59:38 +0200 |
|
|
|
fixed the generators and README |
|
|
|
Diffstat: |
|
M README.md | 12 ++++++++++-- |
|
M generators/reportable_grafico_asse… | 6 +++--- |
|
M generators/reportable_grafico_asse… | 2 +- |
|
R generators/reportable_grafico_asse… | 0 |
|
M generators/reportable_jquery_flot_… | 5 ----- |
|
M generators/reportable_jquery_flot_… | 4 +++- |
|
D generators/reportable_jquery_flot_… | 20 -------------------- |
|
M generators/reportable_migration/re… | 2 +- |
|
M lib/saulabs/reportable/railtie.rb | 3 ++- |
|
|
|
9 files changed, 20 insertions(+), 34 deletions(-) |
|
--- |
|
diff --git a/README.md b/README.md |
|
@@ -70,7 +70,11 @@ and generate the migration that create reportable's cache ta… |
|
|
|
If you want to use reportable's JavaScript graph output format, you also have … |
|
|
|
- ./script/generate reportable_assets |
|
+ ./script/generate reportable_grafico_assets |
|
+ |
|
+if you want to use [Grafico](http://grafico.kilianvalkhof.com/) or if you want… |
|
+ |
|
+ ./script/generate reportable_jquery_flot_assets |
|
|
|
### Rails 3.0 |
|
|
|
@@ -84,7 +88,11 @@ and generate the migration that create reportable's cache ta… |
|
|
|
If you want to use reportable's JavaScript graph output format, you also have … |
|
|
|
- rails generate reportable_assets |
|
+ rails generate reportable_grafico_assets |
|
+ |
|
+if you want to use [Grafico](http://grafico.kilianvalkhof.com/) or if you want… |
|
+ |
|
+ rails generate reportable_jquery_flot_assets |
|
|
|
|
|
Plans |
|
diff --git a/generators/reportable_grafico_assets/reportable_grafico_assets_gen… |
|
@@ -7,8 +7,8 @@ if Saulabs::Reportable::IS_RAILS3 |
|
def create_grafico_file |
|
empty_directory('public/javascripts') |
|
copy_file( |
|
- File.join(File.dirname(__FILE__), 'templates', 'raphael.js'), |
|
- 'public/javascripts/raphael.js' |
|
+ File.join(File.dirname(__FILE__), 'templates', 'raphael.min.js'), |
|
+ 'public/javascripts/raphael.min.js' |
|
) |
|
copy_file( |
|
File.join(File.dirname(__FILE__), 'templates', 'grafico.min.js'), |
|
@@ -26,7 +26,7 @@ else |
|
def manifest |
|
record do |m| |
|
m.directory('public/javascripts') |
|
- m.file('raphael.js', 'public/javascripts/raphael.js') |
|
+ m.file('raphael.min.js', 'public/javascripts/raphael.min.js') |
|
m.file('grafico.min.js', 'public/javascripts/grafico.min.js') |
|
m.readme('NOTES') |
|
end |
|
diff --git a/generators/reportable_grafico_assets/templates/NOTES b/generators/… |
|
@@ -1,4 +1,4 @@ |
|
|
|
** Beware that Grafico depends on Prototype.js! |
|
- ** Also don't forget to include Raphael, Grafico as well as Prototype.js in … |
|
+ ** Also don't forget to include Raphael and Grafico as well as Prototype.js … |
|
|
|
diff --git a/generators/reportable_grafico_assets/templates/raphael.js b/genera… |
|
diff --git a/generators/reportable_jquery_flot_assets/reportable_jquery_flot_as… |
|
@@ -7,10 +7,6 @@ if Saulabs::Reportable::IS_RAILS3 |
|
def create_grafico_file |
|
empty_directory('public/javascripts') |
|
copy_file( |
|
- File.join(File.dirname(__FILE__), 'templates', 'jquery.min.js'), |
|
- 'public/javascripts/jquery.min.js' |
|
- ) |
|
- copy_file( |
|
File.join(File.dirname(__FILE__), 'templates', 'jquery.flot.min.js'), |
|
'public/javascripts/jquery.flot.min.js' |
|
) |
|
@@ -30,7 +26,6 @@ else |
|
def manifest |
|
record do |m| |
|
m.directory('public/javascripts') |
|
- m.file('jquery.min.js', 'public/javascripts/jquery.min.js') |
|
m.file('jquery.flot.min.js', 'public/javascripts/jquery.flot.min.js') |
|
m.file('excanvas.min.js', 'public/javascripts/excanvas.min.js') |
|
m.readme('NOTES') |
|
diff --git a/generators/reportable_jquery_flot_assets/templates/NOTES b/generat… |
|
@@ -1,2 +1,4 @@ |
|
|
|
- ** Don't forget to include jquery, excanvas, jquery float in your layout's h… |
|
+ ** Beware that flot depends on jQuery! |
|
+ ** Don't forget to include excanvas and flot as well as jQuery in your layou… |
|
+ |
|
diff --git a/generators/reportable_jquery_flot_assets/templates/jquery.min.js b… |
|
@@ -1,19 +0,0 @@ |
|
-/* |
|
- * jQuery JavaScript Library v1.3.2 |
|
- * http://jquery.com/ |
|
- * |
|
- * Copyright (c) 2009 John Resig |
|
- * Dual licensed under the MIT and GPL licenses. |
|
- * http://docs.jquery.com/License |
|
- * |
|
- * Date: 2009-02-19 17:34:21 -0500 (Thu, 19 Feb 2009) |
|
- * Revision: 6246 |
|
- */ |
|
-(function(){var window=this,undefined,_jQuery=window.jQuery,_$=window.$,jQuery… |
|
-/* |
|
- * Sizzle CSS Selector Engine - v0.9.3 |
|
- * Copyright 2009, The Dojo Foundation |
|
- * Released under the MIT, BSD, and GPL Licenses. |
|
- * More information: http://sizzlejs.com/ |
|
- */ |
|
-(function(){var chunker=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][… |
|
-\ No newline at end of file |
|
diff --git a/generators/reportable_migration/reportable_migration_generator.rb … |
|
@@ -6,7 +6,7 @@ if Saulabs::Reportable::IS_RAILS3 |
|
|
|
def create_migration |
|
migration_template( |
|
- File.join(File.dirname(__FILE__), 'templates', 'migration-rails3.rb'), |
|
+ File.join(File.dirname(__FILE__), 'templates', 'migration.rb'), |
|
'db/migrate/create_reportable_cache.rb' |
|
) |
|
end |
|
diff --git a/lib/saulabs/reportable/railtie.rb b/lib/saulabs/reportable/railtie… |
|
@@ -15,7 +15,8 @@ module Saulabs |
|
|
|
generators do |
|
require File.join(GEM_ROOT, 'generators', 'reportable_migration', 'rep… |
|
- require File.join(GEM_ROOT, 'generators', 'reportable_assets', 'report… |
|
+ require File.join(GEM_ROOT, 'generators', 'reportable_grafico_assets',… |
|
+ require File.join(GEM_ROOT, 'generators', 'reportable_jquery_flot_asse… |
|
end |
|
|
|
rake_tasks do |
