frontend: move common data dist files to public

pull/378/head
Carlos Matallín 11 years ago
parent b688651174
commit be7e180eee

2
.gitignore vendored

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

@ -3,7 +3,7 @@
<% 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 %>
@ -71,7 +71,7 @@
<% 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">

@ -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') %>

@ -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 )

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

@ -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: {

Loading…
Cancel
Save