Merge branch 'release/1.7.4'

Dashboard/Assetfile

@@ -37,10 +37,28 @@ class HandlebarsFilter < Filter
   end
 end
 
+class CSSMinFilter < Filter
+  def generate_output(inputs, output)
+    inputs.each do |input|
+      result = input.read
+      result.gsub!(/href="css\/(.*)\.css"/, 'href="css/\1.min.css"') # index.html
+      result.gsub!(/url\("(.*?).css"\)/, 'url("\1.min.css")') # screen.css
+      output.write(result)
+    end
+  end
+end
+
 output '../GAE/war/admin'
 input 'app' do
-
+
+  match 'css/main.scss' do
+    scss
+  end
+
   match 'dashboard.html' do
+    if ENV['RAKEP_MODE'] == 'production'
+      filter CSSMinFilter
+    end
     copy 'index.html'
   end
 
@@ -57,19 +75,6 @@ input 'app' do
     concat 'js/app.js'
   end
 
-  # match 'js/vendor/**/*.js' do
-  #   filter LoaderFilter,
-  #     :module_id_generator => proc { |input|
-  #       input.path.sub(/^js\/vendor\//, "vendor/").sub(/\.js$/, '')
-  #     }
-
-  #   if ENV['RAKEP_MODE'] == 'production'
-  #     filter EmberAssertFilter
-  #     uglify {|input| input}
-  #   end
-  #   concat 'js/app.js'
-  # end
-
   match 'js/plugins/**/*.js' do
     if ENV['RAKEP_MODE'] == 'production'
       uglify {|input| input}
@@ -98,18 +103,17 @@ input 'app' do
     end
   end
 
-  match "css/**/*" do
-    concat do |input|
-      input
+  match "css/**/*.css" do
+    if ENV['RAKEP_MODE'] == 'production'
+      yui_css
+      filter CSSMinFilter
+    else
+      concat do |input|
+        input
+      end
     end
   end
 
- # match "js/vendor/**/*.js" do
- #   concat do |input|
- #     input
- #   end
- # end
-
 end
 
 output '../GAE/war/vendorjs'

Dashboard/AssetfilePublic

@@ -37,10 +37,28 @@ class HandlebarsFilter < Filter
   end
 end
 
+class CSSMinFilter < Filter
+  def generate_output(inputs, output)
+    inputs.each do |input|
+      result = input.read
+      result.gsub!(/href="\/publicmap\/css\/(.*)\.css"/, 'href="/publicmap/css/\1.min.css"') # index.html
+      result.gsub!(/url\("(.*?).css"\)/, 'url("\1.min.css")') # screen.css
+      output.write(result)
+    end
+  end
+end
+
 output '../GAE/war/publicmap'
 input 'app' do
-
+
+  match 'css/main.scss' do
+    scss
+  end
+
   match 'public.html' do
+    if ENV['RAKEP_MODE'] == 'production'
+      filter CSSMinFilter
+    end
     copy '../index.html'
   end
 
@@ -110,9 +128,14 @@ input 'app' do
     end
   end
 
-  match "css/**/*" do
-    concat do |input|
-      input
+  match "css/**/*.css" do
+    if ENV['RAKEP_MODE'] == 'production'
+      yui_css
+      filter CSSMinFilter
+    else
+      concat do |input|
+        input
+      end
     end
   end