frontend: move common data dist files to public

.gitignore

@@ -7,6 +7,8 @@ tmp/*
 tmp/**/*
 public/system
 public/uploads
+public/javascripts
+public/stylesheets
 db/schema.rb
 *.pyc
 bin/

app/helpers/application_helper.rb

@@ -173,9 +173,9 @@ module ApplicationHelper
   end #v2_vizjon_url
 
   # TODO reactivate in order to allow CartoDB plugins
-  # to inject content into the CartoDB admin UI 
+  # to inject content into the CartoDB admin UI
   # def content_from_plugins_for(hook)
-  #   ::CartoDB::Plugin.registered.map do |plugin| 
+  #   ::CartoDB::Plugin.registered.map do |plugin|
   #     hook_name = "#{plugin.name.underscore}_#{hook}_hook"
   #     send(hook_name) if defined?(hook_name)
   #   end.join('').html_safe

app/views/admin/pages/common_data.html.erb

@@ -3,13 +3,13 @@
   <% end %>
 
   <%= content_for(:js) do %>
-    <%= javascript_include_tag :cdb, :application, :common_data %>
+    <%= javascript_include_tag 'cdb.js', 'models.js', 'templates.js', 'application.js', 'common_data.js' %>
     <script type="text/javascript">
       var username = "<%= current_user.username %>"
       , user_data = <%=raw current_user.data.to_json.html_safe %>
       , config = <%=raw frontend_config.html_safe %>
       , mixpanel_token = "<%= Cartodb.config[:mixpanel]['token'] if Cartodb.config[:mixpanel].present? %>"
-      , public_data = [{ 
+      , public_data = [{
           name: "World borders",
           description: "World countries borders",
           author: null,
@@ -17,7 +17,7 @@
           url: "http://cartodb.s3.amazonaws.com/static/TM_WORLD_BORDERS_SIMPL-0.3.zip",
           size: 483328,
           rows: 246
-        }, { 
+        }, {
           name: "European countries",
           description: "European countries geometries",
           author: null,
@@ -25,7 +25,7 @@
           url: "http://cartodb.s3.amazonaws.com/static/european_countries.zip",
           size: 376832,
           rows: 46
-        }, { 
+        }, {
           name: "Urban Areas",
           description: "Areas of human habitation",
           author: "naturalearthdata.com",
@@ -33,7 +33,7 @@
           url: "http://cartodb.s3.amazonaws.com/static/50m-urban-area.zip",
           size: 983040,
           rows: 2143
-        }, { 
+        }, {
           name: "Populated places",
           description: "Most populated places",
           author: "naturalearthdata.com",
@@ -41,7 +41,7 @@
           url: "http://cartodb.s3.amazonaws.com/static/10m-populated-places-simple.zip",
           size: 1824522,
           rows: 7313
-        }, { 
+        }, {
           name: "World rivers",
           description: "Most of the world rivers",
           author: "naturalearthdata.com",
@@ -49,7 +49,7 @@
           url: "http://cartodb.s3.amazonaws.com/static/50m-rivers-lake-centerlines-with-scale-ranks.zip",
           size: 704512,
           rows: 1611
-        }, { 
+        }, {
           name: "New York Counties",
           description: "All the New York counties",
           author: null,
@@ -66,12 +66,12 @@
           size: 385024,
           rows: 1904
         }];
-      
+
     </script>
   <% end %>
 
   <%= content_for(:css) do %>
-    <%= stylesheet_link_tag :common, :dashboard, :pages, :media => 'all' %>
+    <%= stylesheet_link_tag 'common.css', 'dashboard.css', 'pages.css', :media => 'all' %>
   <% end %>
 
   <div class="content">
@@ -85,7 +85,7 @@
       </div>
     </article>
     <article class="support" style="display: inline-block;">
-      <div class="inner">   
+      <div class="inner">
         <section class="left">
         <h3>Don’t find what you are looking for?</h3>
         <p>Try in our <a href="https://groups.google.com/forum/#!forum/cartodb" title="CartoDB Google Group">Google Group</a>, there may be some users looking forward to help you.</p>

app/views/layouts/application.html.erb

@@ -5,7 +5,7 @@
     <title><%= yield :page_title %>CartoDB</title>
     <link id="favicon" rel="shortcut icon" href="/favicons/favicon.ico" />
     <%= yield :css %>
-    <!--[if gt IE 8]><%= stylesheet_link_tag :fonts_ie %><![endif]-->
+    <!--[if gt IE 8]><%= stylesheet_link_tag 'fonts_ie' %><![endif]-->
     <%= yield :js %>
     <%= csrf_meta_tag %>
     <%= insert_google_analytics('primary') %>

config/application.rb

@@ -56,7 +56,7 @@ module CartoDB
     config.assets.enabled = false
 
     # Default setting is [/\w+\.(?!js|css).+/, /application.(css|js)$/]
-    config.assets.precompile = %w( application.js cdb.js organization.js keys.js dashboard.js common_data.js table.js table_public.js login.js specs.js common.js jquery.tipsy.js)
+    config.assets.precompile = %w( cdb.js models.js templates.js application.js common_data.js )
     config.assets.precompile += %w( common.css organization.css keys.css leaflet.css tables.css pages.css map.css table.css front.css embeds/password_protected.css cdb/themes/css/cartodb.css cdb/themes/css/cartodb.ie.css specs.css map/leaflet.ie.css plugins/tipsy.css fonts_ie.css dashboard.css)
     config.assets.precompile += %w( *.jpg *.ico *.gif *.png *.eot *.otf *.svg *.woff *.ttf *.swf )
 

config/environments/production.rb

@@ -52,15 +52,15 @@ CartoDB::Application.configure do
 
   # Compress JavaScript and CSS
   config.assets.compress = true
-     
+
   # Don't fallback to assets pipeline
   config.assets.compile = false
-     
+
   # Generate digests for assets URLs
   config.assets.digest = true
-  
+
   config.assets.initialize_on_precompile = true
-  
+
   config.action_controller.asset_host = Proc.new { Cartodb.config[:app_assets] ? Cartodb.config[:app_assets]['asset_host'] : nil }
-  
+
 end

config/initializers/mustache.rb

@@ -1,4 +0,0 @@
-require 'mustache/js'
-require 'tilt/mustache_js_template'
-
-Rails.application.assets.register_engine '.mustache', Tilt::MustacheJsTemplate

lib/build/Gruntfile.js

@@ -9,7 +9,7 @@ module.exports = function(grunt) {
     if(f[0] !== '_') {
       concat[f] = {
         src: cartodb_files[f],
-        dest: 'dist/' + f + ".js"
+        dest: '../../public/javascripts/' + f + ".js"
       };
     }
   }
@@ -27,7 +27,7 @@ module.exports = function(grunt) {
           }
         },
         files: {
-          "dist/templates.js": cartodb_files._templates
+          "../../public/javascripts/templates.js": cartodb_files._templates
         }
       },
       mustache: {