zhongjin
/
cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace nbsp to actual spaces

Browse Source
pull/12678/head
Carlos Matallín 7 years ago
parent 000063e768
commit bc12b5b0d6
58 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File

4
Guardfile
Unescape View File

@ -16,10 +16,10 @@ guard 'minitest', test_folders: 'services' do
# Rails 3.2
# watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/controllers/#{m[1]}_test.rb" }
# watch(%r|^app/helpers/(.*)\.rb|) { |m| "test/helpers/#{m[1]}_test.rb" }
# watch(%r|^app/models/(.*)\.rb|) { |m| "test/unit/#{m[1]}_test.rb" }
# watch(%r|^app/models/(.*)\.rb|) { |m| "test/unit/#{m[1]}_test.rb" }
# Rails
# watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/functional/#{m[1]}_test.rb" }
# watch(%r|^app/helpers/(.*)\.rb|) { |m| "test/helpers/#{m[1]}_test.rb" }
# watch(%r|^app/models/(.*)\.rb|) { |m| "test/unit/#{m[1]}_test.rb" }
# watch(%r|^app/models/(.*)\.rb|) { |m| "test/unit/#{m[1]}_test.rb" }
end

4
app/assets/stylesheets/sessions/sessions.css.scss
Unescape View File

@ -111,7 +111,7 @@ $cWhite: #FFFFFF;
text-decoration: none;
}
a:hover {
a:hover {
text-decoration: underline;
}
}
@ -128,7 +128,7 @@ $cWhite: #FFFFFF;
color: $cWhite;
text-decoration: none;
&:hover {
&:hover {
text-decoration: underline;
}
}

2
config/app_config.yml.sample
Unescape View File

@ -245,7 +245,7 @@ defaults: &defaults
"user_name", "style_version", "tile_style", "query_wrapper"]
default_tile_styles:
point: "{\n marker-fill: #FF6600;\n marker-opacity: 0.9;\n marker-width: 12;\n marker-line-color: white;\n marker-line-width: 3;\n marker-line-opacity: 0.9;\n marker-placement: point;\n marker-type: ellipse;\n marker-allow-overlap: true;\n}"
geometry: "{\n // points\n [mapnik-geometry-type=point] {\n    marker-fill: #FF6600;\n    marker-opacity: 1;\n    marker-width: 12;\n    marker-line-color: white;\n    marker-line-width: 3;\n    marker-line-opacity: 0.9;\n    marker-placement: point;\n    marker-type: ellipse;marker-allow-overlap: true;\n  }\n\n //lines\n [mapnik-geometry-type=linestring] {\n    line-color: #FF6600; \n    line-width: 2; \n    line-opacity: 0.7;\n  }\n\n //polygons\n [mapnik-geometry-type=polygon] {\n    polygon-fill:#FF6600;\n    polygon-opacity: 0.7;\n    line-opacity:1;\n    line-color: #FFFFFF;\n   }\n }"
geometry: "{\n // points\n [mapnik-geometry-type=point] {\n marker-fill: #FF6600;\n marker-opacity: 1;\n marker-width: 12;\n marker-line-color: white;\n marker-line-width: 3;\n marker-line-opacity: 0.9;\n marker-placement: point;\n marker-type: ellipse;marker-allow-overlap: true;\n }\n\n //lines\n [mapnik-geometry-type=linestring] {\n line-color: #FF6600; \n line-width: 2; \n line-opacity: 0.7;\n }\n\n //polygons\n [mapnik-geometry-type=polygon] {\n polygon-fill:#FF6600;\n polygon-opacity: 0.7;\n line-opacity:1;\n line-color: #FFFFFF;\n }\n }"
polygon: "{\n polygon-fill:#FF6600;\n polygon-opacity: 0.7;\n line-opacity:1;\n line-color: #FFFFFF;\n}"
multipolygon: "{\n polygon-fill:#FF6600;\n polygon-opacity: 0.7;\n line-opacity:1;\n line-color: #FFFFFF;\n}"
multilinestring: "{\n line-color:#FF6600;\n line-width:1;\n line-opacity: 0.7;\n}"

2
lib/assets/core/javascripts/cartodb3/components/background-importer/twitter-import-details.tpl
Unescape View File

@ -29,7 +29,7 @@
<% } %>
</p>
<p class="CDB-Text CDB-Size-medium u-altTextColor">
<% if (tweetsCost > 0 || availableTweets <= 0) { %>
<% if (tweetsCost > 0 || availableTweets <= 0) { %>
<%- _t('components.background-importer.twitter-import-details.no-more-credits', { blockPriceFormatted: blockPriceFormatted, blockSizeFormatted: blockSizeFormatted }) %>
<% } else { %>
<% if (availableTweets != 1) { %>

2
lib/assets/core/javascripts/cartodb3/components/modals/add-layer/content/datasets/dataset-item.tpl
Unescape View File

@ -50,7 +50,7 @@
<%- _t('components.modals.add-layer.datasets.item.by') %>
</span>
<span class="DatasetsList-avatar">
<img class="DatasetsList-avatarImg" src="<%- owner.avatar_url %>" alt="<%- owner.name || owner.username  %>" title="<%- owner.name || owner.username  %>" />
<img class="DatasetsList-avatarImg" src="<%- owner.avatar_url %>" alt="<%- owner.name || owner.username %>" title="<%- owner.name || owner.username %>" />
</span>
<% } %>
</span>

10
lib/assets/core/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-no-result.tpl
Unescape View File

@ -7,20 +7,20 @@
<% } else { %> CDB-IconFont-lens <% } %>" />
</div>
<h4 class="CDB-Text CDB-Size-large u-mainTextColor u-bSpace u-secondaryTextColor u-tSpace-xl">
<% if (page > 1 || totalItems === 0 && totalEntries > 0) { %>
<% if (page > 1 || totalItems === 0 && totalEntries > 0) { %>
<%- _t('components.modals.add-layer.datasets.no-results.desc') %>
<% } %>
<% if (( tag || q ) && totalItems === 0 && totalEntries === 0) { %>
0 <%- tag || q %> <%- type %> <%- _t('components.modals.add-layer.datasets.no-results.found') %>
<% if (( tag || q ) && totalItems === 0 && totalEntries === 0) { %>
0 <%- tag || q %> <%- type %> <%- _t('components.modals.add-layer.datasets.no-results.found') %>
<% } %>
<% if (page === 1 && !tag && !q && totalItems === 0 && totalEntries === 0) { %>
<% if (page === 1 && !tag && !q && totalItems === 0 && totalEntries === 0) { %>
<%- _t('components.modals.add-layer.datasets.no-results.there-are-no') %> <%- shared === "only" ? 'shared' : '' %> <%- locked ? 'locked' : '' %> <%- library ? 'library' : '' %> <%- type %>
<% } %>
</h4>
<p class="CDB-Text CDB-Size-medium u-altTextColor">
<% if (!tag && !q && totalItems === 0 && totalEntries === 0) { %>
<% if (!tag && !q && totalItems === 0 && totalEntries === 0) { %>
<%- _t('components.modals.add-layer.datasets.no-results.no-fun', { type: type }) %>
<% } %>
</p>

2
lib/assets/core/javascripts/cartodb3/components/table/body/table-body-cell.tpl
Unescape View File

@ -1,7 +1,7 @@
<td class="Table-cellItem" data-attribute="<%- columnName %>" title="<%- value %>" data-clipboard-text='<%- value %>'>
<div class="
Table-cell u-flex u-justifySpace
<%- columnName === 'cartodb_id' || (type === 'geometry' && geometry !== 'point') ? 'Table-cell--short' : '' %>
<%- columnName === 'cartodb_id' || (type === 'geometry' && geometry !== 'point') ? 'Table-cell--short' : '' %>
">
<p class="
CDB-Text CDB-Size-medium

2
lib/assets/core/javascripts/cartodb3/components/table/head/table-head-item.tpl
Unescape View File

@ -1,6 +1,6 @@
<div class="
Table-headItemWrapper
<%- name === 'cartodb_id' || (type === 'geometry' && geometry !== 'point') ? 'Table-headItemWrapper--short' : '' %>
<%- name === 'cartodb_id' || (type === 'geometry' && geometry !== 'point') ? 'Table-headItemWrapper--short' : '' %>
">
<div class="u-flex u-justifySpace">
<input class="Table-headItemName CDB-Text CDB-Size-medium is-semibold u-ellipsis js-attribute" value="<%- name %>" title="<%- name %>" readonly />

2
lib/assets/core/javascripts/cartodb3/editor.js
Unescape View File

@ -431,7 +431,7 @@ if (!configModel.get('cartodb_com_hosted')) {
$('.js-editorMenu').append(feedbackView.render().el);
}
document.title = visDefinitionModel.get('name') + ' | CARTO';
document.title = visDefinitionModel.get('name') + ' | CARTO';
if (window.__backboneAgent) {
window.__backboneAgent.handleBackbone(Backbone);

2
lib/assets/core/javascripts/cartodb3/editor/layers/change-view-buttons.tpl
Unescape View File

@ -47,7 +47,7 @@
<% if (isReadOnly || !isVisible) { %>data-tooltip="<%- _t('editor.edit-feature.geometry-disabled') %>"<% } %>
>
<% if (queryGeometryModel === 'point' || !queryGeometryModel) { %>
<li class="Editor-contextSwitcherItem js-newGeometryItem <% if (isReadOnly || !isVisible) { %>is-disabled<% } %>">
<li class="Editor-contextSwitcherItem js-newGeometryItem <% if (isReadOnly || !isVisible) { %>is-disabled<% } %>">
<div class="Editor-contextSwitcherButton js-newGeometry" data-feature-type='point'>
<svg width="12" height="12" viewBox="0 0 12 12" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<defs>

2
lib/assets/core/test/spec/cartodb3/helpers/reset-style-per-node.spec.js
Unescape View File

@ -165,7 +165,7 @@ describe('helpers/reset-style-per-node', function () {
spyOn(layerDefModel.styleModel, 'setDefaultPropertiesByType');
});
describe('and style model type is none', function () {
describe('and style model type is none', function () {
beforeEach(function () {
layerDefModel.styleModel.attributes.type = 'none';
nodeDefModel.queryGeometryModel.set({

6
lib/assets/javascripts/cartodb/common/background_polling/views/imports/background_import_item_view.js
Unescape View File

@ -65,11 +65,11 @@ module.exports = cdb.core.View.extend({
d.name = upload.value.name;
}
}
if (upload.type === "url" || upload.type === "remote") {
if (upload.type === "url" || upload.type === "remote") {
d.name = upload.value;
}
if (upload.type === "service") {
d.name = upload.value && upload.value.filename || '';
d.name = upload.value && upload.value.filename || '';
}
if (upload.service_name === "twitter_search") {
d.name = 'Twitter import';
@ -78,7 +78,7 @@ module.exports = cdb.core.View.extend({
d.name = 'SQL';
}
if (upload.type === "duplication") {
d.name = upload.table_name || upload.value;
d.name = upload.table_name || upload.value;
}
} else {
d.name = imp.display_name || imp.item_queue_id || 'import';

2
lib/assets/javascripts/cartodb/common/background_polling/views/imports/twitter_import_details.jst.ejs
Unescape View File

@ -27,7 +27,7 @@
<% } %>
</h4>
<p class="BackgroundPollingDetails-infoText DefaultParagraph">
<% if (tweetsCost > 0 || availableTweets <= 0) { %>
<% if (tweetsCost > 0 || availableTweets <= 0) { %>
You have consumed all your credits during this billing cycle (price is $<%- blockPriceFormatted %>/<%- blockSizeFormatted %> extra credits).
<% } else { %>
You still have <%- availableTweetsFormatted %> credit<%- availableTweets != 1 ? 's' : '' %> left for this billing cycle.

4
lib/assets/javascripts/cartodb/common/dialogs/change_privacy/start.jst.ejs
Unescape View File

@ -65,9 +65,9 @@
<% sharedEntitiesSample.forEach(function(user) { %>
<span class="UserAvatar Dialog-sharedEntitiesAvatar u-lSpace--xl">
<% if (user.get('avatar_url')) { %>
<img class="UserAvatar-img UserAvatar-img--medium" src="<%- user.get('avatar_url') %>" alt="<%- user.get('name') || user.get('username') %>" title="<%- user.get('name') || user.get('username') %>" />
<img class="UserAvatar-img UserAvatar-img--medium" src="<%- user.get('avatar_url') %>" alt="<%- user.get('name') || user.get('username') %>" title="<%- user.get('name') || user.get('username') %>" />
<% } else { %>
<div class="UserAvatar-img UserAvatar-img--medium UserAvatar-img--no-src" title="<%- user.get('name') || user.get('username') %>"></div>
<div class="UserAvatar-img UserAvatar-img--medium UserAvatar-img--no-src" title="<%- user.get('name') || user.get('username') %>"></div>
<% } %>
</span>
<% }); %>

2
lib/assets/javascripts/cartodb/common/dialogs/create/listing/datasets/dataset_item_view.js
Unescape View File

@ -30,7 +30,7 @@ module.exports = cdb.core.View.extend({
var vis = this.model;
var table = this.table;
var tags = vis.get('tags') || [];
var description = vis.get('description') && Utils.stripHTML(markdown.toHTML(vis.get('description'))) || '';
var description = vis.get('description') && Utils.stripHTML(markdown.toHTML(vis.get('description'))) || '';
var d = {
isRaster: vis.get('kind') === 'raster',

4
lib/assets/javascripts/cartodb/common/dialogs/create/listing/datasets/remote_dataset_item_view.js
Unescape View File

@ -30,8 +30,8 @@ module.exports = DatasetItem.extend({
var vis = this.model;
var table = this.table;
var tags = vis.get('tags') || [];
var description = vis.get('description') && Utils.stripHTML(markdown.toHTML(vis.get('description'))) || '';
var source = vis.get('source') && markdown.toHTML(vis.get('source')) || '';
var description = vis.get('description') && Utils.stripHTML(markdown.toHTML(vis.get('description'))) || '';
var source = vis.get('source') && markdown.toHTML(vis.get('source')) || '';
var d = {
isRaster: vis.get('kind') === 'raster',

2
lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/data_import/data_header_view.js
Unescape View File

@ -21,7 +21,7 @@ module.exports = cdb.core.View.extend({
initialize: function() {
this.user = this.options.user;
this.template = cdb.templates.getTemplate(this.options.template || 'common/views/create/listing/import_types/data_header');
this.template = cdb.templates.getTemplate(this.options.template || 'common/views/create/listing/import_types/data_header');
this._initBinds();
this._checkVisibility();
},

2
lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/import_selected_dataset_view.js
Unescape View File

@ -112,7 +112,7 @@ module.exports = cdb.core.View.extend({
}
if (descriptionOpts.itemName && descriptionKeyValue) {
descriptionStr += ' ' + (descriptionOpts.itemName && pluralizeString(descriptionOpts.itemName, descriptionKeyValue) || '');
descriptionStr += ' ' + (descriptionOpts.itemName && pluralizeString(descriptionOpts.itemName, descriptionKeyValue) || '');
}
return descriptionStr;

2
lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/service_import/service_list_item_view.js
Unescape View File

@ -85,7 +85,7 @@ module.exports = cdb.core.View.extend({
}
if (descriptionOpts.itemName && descriptionKeyValue) {
descriptionStr += ' ' + (descriptionOpts.itemName && pluralizeString(descriptionOpts.itemName, descriptionKeyValue) || '');
descriptionStr += ' ' + (descriptionOpts.itemName && pluralizeString(descriptionOpts.itemName, descriptionKeyValue) || '');
}
return descriptionStr;

4
lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports_view.js
Unescape View File

@ -164,10 +164,10 @@ module.exports = cdb.core.View.extend({
var fn = self['_check' + i + 'Import'];
var isEnabled = (fn && fn(imp, self));
if (( isEnabled || isEnabled === undefined ) && !_.isEmpty(imp)) {
if (( isEnabled || isEnabled === undefined ) && !_.isEmpty(imp)) {
pane = new imp.className(
_.extend(
( imp.options || {} ),
( imp.options || {} ),
{
user: self.user,
title: imp.title

6
lib/assets/javascripts/cartodb/common/dialogs/delete_items_view_template.jst.ejs
Unescape View File

@ -43,7 +43,7 @@
<%- vis.timeDiff %>
<% if (!vis.isOwner) { %>
by <span class="UserAvatar">
<img class="UserAvatar-img UserAvatar-img--smaller" src="<%- vis.owner.get('avatar_url') %>" alt="<%- vis.owner.nameOrUsername()  %>" title="<%- vis.owner.nameOrUsername() %>" />
<img class="UserAvatar-img UserAvatar-img--smaller" src="<%- vis.owner.get('avatar_url') %>" alt="<%- vis.owner.nameOrUsername() %>" title="<%- vis.owner.nameOrUsername() %>" />
</span>
<% } %>
</p>
@ -62,9 +62,9 @@
<% affectedEntitiesSample.forEach(function(user) { %>
<span class="UserAvatar is-in-list">
<% if (user.get('avatar_url')) { %>
<img class="UserAvatar-img UserAvatar-img--medium" src="<%- user.get('avatar_url') %>" alt="<%- user.get('name') || user.get('username') %>" title="<%- user.get('name') || user.get('username') %>" />
<img class="UserAvatar-img UserAvatar-img--medium" src="<%- user.get('avatar_url') %>" alt="<%- user.get('name') || user.get('username') %>" title="<%- user.get('name') || user.get('username') %>" />
<% } else { %>
<div class="UserAvatar-img UserAvatar-img--medium UserAvatar-img--no-src" title="<%- user.get('name') || user.get('username') %>"></div>
<div class="UserAvatar-img UserAvatar-img--medium UserAvatar-img--no-src" title="<%- user.get('name') || user.get('username') %>"></div>
<% } %>
</span>
<% }); %>

2
lib/assets/javascripts/cartodb/common/dialogs/edit_vis_metadata/edit_vis_metadata_dialog_model.js
Unescape View File

@ -17,7 +17,7 @@ module.exports = cdb.core.Model.extend({
},
initialize: function(attrs, opts) {
if (!opts || !opts.vis || !opts.user || !opts.dataLayer) {
if (!opts || !opts.vis || !opts.user || !opts.dataLayer) {
throw new Error('Visualization, user and dataLayer models are required');
}
this.vis = opts.vis;

2
lib/assets/javascripts/cartodb/common/dialogs/map/image_picker/assets_item_view.js
Unescape View File

@ -72,7 +72,7 @@ module.exports = cdb.core.View.extend({
});
}
} else {
if ((w || h) > self._SIZE) {
if ((w || h) > self._SIZE) {
$thumbnail.css({
"background-size": "cover",
"background-origin": "content-box"

2
lib/assets/javascripts/cartodb/common/edit_fields/date_field/date_picker/date_picker_view.js
Unescape View File

@ -27,7 +27,7 @@ module.exports = cdb.admin.DropdownMenu.extend({
},
render: function() {
var date = this.model.get('value') || new Date();
var date = this.model.get('value') || new Date();
this.$el.html(
cdb.templates.getTemplate('common/edit_fields/date_field/date_picker/date_picker')({

2
lib/assets/javascripts/cartodb/common/local_storage.js
Unescape View File

@ -13,7 +13,7 @@ var _ = require('underscore-cdb-v3');
var LocalStorageWrapper = function(name) {
this.name = name || 'cartodb';
this.name = name || 'cartodb';
if(!localStorage.getItem(this.name) && this.isEnabled()) {
localStorage.setItem(this.name, "{}");
}

2
lib/assets/javascripts/cartodb/common/views/create/listing/dataset_item.jst.ejs
Unescape View File

@ -44,7 +44,7 @@
<% if (!isOwner) { %>
by
<span class="UserAvatar">
<img class="UserAvatar-img UserAvatar-img--smaller" src="<%- owner.avatar_url %>" alt="<%- owner.name || owner.username  %>" title="<%- owner.name || owner.username  %>" />
<img class="UserAvatar-img UserAvatar-img--smaller" src="<%- owner.avatar_url %>" alt="<%- owner.name || owner.username %>" title="<%- owner.name || owner.username %>" />
</span>
<% } %>
</span>

10
lib/assets/javascripts/cartodb/common/views/create/listing/datasets_no_result.jst.ejs
Unescape View File

@ -7,20 +7,20 @@
<% } else { %> CDB-IconFont-lens <% } %>" />
</div>
<h4 class="CDB-Text CDB-Size-large u-mainTextColor u-secondaryTextColor u-bSpace--m u-tSpace-xl">
<% if (page > 1 || totalItems === 0 && totalEntries > 0) { %>
<% if (page > 1 || totalItems === 0 && totalEntries > 0) { %>
There are no results in this page
<% } %>
<% if (( tag || q ) && totalItems === 0 && totalEntries === 0) { %>
0 <%- tag || q %> <%- type %> found
<% if (( tag || q ) && totalItems === 0 && totalEntries === 0) { %>
0 <%- tag || q %> <%- type %> found
<% } %>
<% if (page === 1 && !tag && !q && totalItems === 0 && totalEntries === 0) { %>
<% if (page === 1 && !tag && !q && totalItems === 0 && totalEntries === 0) { %>
There are no <%- shared === "only" ? 'shared' : '' %> <%- locked ? 'locked' : '' %> <%- library ? 'library' : '' %> <%- type %>
<% } %>
</h4>
<p class="CDB-Text CDB-Size-medium u-altTextColor">
<% if (!tag && !q && totalItems === 0 && totalEntries === 0) { %>
<% if (!tag && !q && totalItems === 0 && totalEntries === 0) { %>
No <%- type %>, no fun
<% } %>
</p>

4
lib/assets/javascripts/cartodb/common/views/dashboard_header/notifications/view.js
Unescape View File

@ -105,7 +105,7 @@ module.exports = cdb.core.View.extend({
d.userType = 'org';
} else if (d.isOrgOwner) {
d.userType = 'admin';
} else if (d.accountType === "internal" || d.accountType === "partner" || d.accountType === "ambassador") {
} else if (d.accountType === "internal" || d.accountType === "partner" || d.accountType === "ambassador") {
d.userType = 'internal'
}
@ -177,7 +177,7 @@ module.exports = cdb.core.View.extend({
if (window.organization_notifications) {
for (var n = 0; n < window.organization_notifications.length; n++) {
var notification = window.organization_notifications[n];
var icon = notification.icon ? ('CDB-IconFont-' + notification.icon) : 'CDB-IconFont-alert';
var icon = notification.icon ? ('CDB-IconFont-' + notification.icon) : 'CDB-IconFont-alert';
arr.push({
iconFont: icon,

2
lib/assets/javascripts/cartodb/common/views/dashboard_header/settings_dropdown_view.js
Unescape View File

@ -67,7 +67,7 @@ module.exports = cdb.admin.DropdownMenu.extend({
var accountType = this.shortDisplayName(user);
var userUrl = this.model.viewUrl();
var upgradeUrl = window.upgrade_url || cdb.config.get('upgrade_url') || '';
var upgradeUrl = window.upgrade_url || cdb.config.get('upgrade_url') || '';
this.$el.html(this.template_base({
name: user.fullName() || user.get('username'),

2
lib/assets/javascripts/cartodb/common/views/dashboard_header/user_support_template.jst.ejs
Unescape View File

@ -1,6 +1,6 @@
<% if (userType === 'org') { %>
<a href="mailto:enterprise-support@carto.com" class="Header-navigationLink u-hideOnMobile">Support</a>
<% } else if (userType === 'client' || userType === 'internal') { %>
<% } else if (userType === 'client' || userType === 'internal') { %>
<a href="mailto:support@carto.com" class="Header-navigationLink u-hideOnMobile">Support</a>
<% } else { %>
<a href="http://gis.stackexchange.com/questions/tagged/carto" class="Header-navigationLink u-hideOnMobile">Support</a>

2
lib/assets/javascripts/cartodb/common/views/support_banner.jst.ejs
Unescape View File

@ -34,7 +34,7 @@
<a href="mailto:<%- orgDisplayEmail %>" class="SupportBanner-link CDB-Button CDB-Button--secondary">
<span class="CDB-Button-Text CDB-Text is-semibold CDB-Size-medium u-upperCase">Contact administrator</span>
</a>
<% } else if (userType === 'client' || userType === 'internal') { %>
<% } else if (userType === 'client' || userType === 'internal') { %>
<a href="mailto:support@carto.com" class="SupportBanner-link CDB-Button CDB-Button--secondary">
<span class="CDB-Button-Text CDB-Text is-semibold CDB-Size-medium u-upperCase">Contact us</span>
</a>

4
lib/assets/javascripts/cartodb/dashboard/datasets/remote_datasets_item.js
Unescape View File

@ -33,8 +33,8 @@ module.exports = DatasetsItem.extend({
var vis = this.model;
var table = this.table;
var tags = vis.get('tags') || [];
var description = vis.get('description') && Utils.stripHTML(markdown.toHTML(vis.get('description'))) || '';
var source = vis.get('source') && markdown.toHTML(vis.get('source')) || '';
var description = vis.get('description') && Utils.stripHTML(markdown.toHTML(vis.get('description'))) || '';
var source = vis.get('source') && markdown.toHTML(vis.get('source')) || '';
var d = {
isRaster: vis.get('kind') === 'raster',

2
lib/assets/javascripts/cartodb/dashboard/router.js
Unescape View File

@ -155,7 +155,7 @@ module.exports = Router.extend({
},
normalizeFragmentOrUrl: function(fragmentOrUrl) {
return fragmentOrUrl && fragmentOrUrl.toString().replace(this._dashboardUrl, '') || this.currentDashboardUrl().toString();
return fragmentOrUrl && fragmentOrUrl.toString().replace(this._dashboardUrl, '') || this.currentDashboardUrl().toString();
},
/**

10
lib/assets/javascripts/cartodb/dashboard/views/content_no_results.jst.ejs
Unescape View File

@ -15,8 +15,8 @@
You haven't liked any <%- type %> yet
<% } %>
<% if (isSearching && totalItems === 0 && totalEntries === 0) { %>
0 <%- tag || q %> <%- type %> found
<% if (isSearching && totalItems === 0 && totalEntries === 0) { %>
0 <%- tag || q %> <%- type %> found
<% } %>
<% if (page === 1 && !isSearching && !liked && totalItems === 0 && totalEntries === 0) { %>
@ -24,15 +24,15 @@
<% } %>
</h4>
<p class="CDB-Text CDB-Size-medium u-altTextColor">
<% if (page > 1 || totalItems === 0 && totalEntries > 0) { %>
<% if (page > 1 || totalItems === 0 && totalEntries > 0) { %>
Back to your <a class="ContentResult-urlLink" href="<%- defaultUrl %>">first page</a>
<% } %>
<% if (isSearching && totalItems === 0 && totalEntries === 0) { %>
<% if (isSearching && totalItems === 0 && totalEntries === 0) { %>
Back to your <a class="ContentResult-urlLink" href="<%- defaultUrl %>"><%- type %></a>
<% } %>
<% if (!liked && !isSearching && totalItems === 0 && totalEntries === 0) { %>
<% if (!liked && !isSearching && totalItems === 0 && totalEntries === 0) { %>
No <%- type %>, no fun
<% } %>

2
lib/assets/javascripts/cartodb/dashboard/views/datasets_item.jst.ejs
Unescape View File

@ -51,7 +51,7 @@
<%- timeDiff %>
<% if (!isOwner) { %>
by
<span class="UserAvatar u-lSpace" data-title="<%- owner.name || owner.username  %>">
<span class="UserAvatar u-lSpace" data-title="<%- owner.name || owner.username %>">
<img class="UserAvatar-img UserAvatar-img--smaller" src="<%- owner.avatar_url %>" />
</span>
<% } %>

2
lib/assets/javascripts/cartodb/dashboard/views/maps_item.jst.ejs
Unescape View File

@ -31,7 +31,7 @@
<%- timeDiff %> <% if (!isOwner) { %>by<% } %>
</span>
<% if (!isOwner) { %>
<span class="UserAvatar" data-title="<%- owner.name || owner.username  %>">
<span class="UserAvatar" data-title="<%- owner.name || owner.username %>">
<img class="UserAvatar-img UserAvatar-img--smaller" src="<%- owner.avatar_url %>" />
</span>
<% } %>

2
lib/assets/javascripts/cartodb/data_library/content/list/dataset_item_template.jst.ejs
Unescape View File

@ -11,7 +11,7 @@
<div class="MapCard-contentFooterDetails u-ellipsLongText">
<div class="MapCard-contentFooterTitle">
<h3 class="MapCard-title DefaultTitle CDB-Text is-semibold CDB-Size-large">
<a href="<%- dataset_base_url %><%- vis.name %>" class="DefaultTitle-link u-ellipsLongText" title="<%- vis.display_name %>"><% if (vis.display_name == "" || vis.display_name == null) { %><%- vis.name %><% } else { %><%- vis.display_name %><% } %></a>
<a href="<%- dataset_base_url %><%- vis.name %>" class="DefaultTitle-link u-ellipsLongText" title="<%- vis.display_name %>"><% if (vis.display_name == "" || vis.display_name == null) { %><%- vis.name %><% } else { %><%- vis.display_name %><% } %></a>
</h3>
</div>

4
lib/assets/javascripts/cartodb/models/carto.js
Unescape View File

@ -432,7 +432,7 @@ function normalizeQuartiles(quartiles) {
}
function choropleth_generator(table, props, changed, callback) {
var type = table.geomColumnTypes() && table.geomColumnTypes()[0] || "polygon";
var type = table.geomColumnTypes() && table.geomColumnTypes()[0] || "polygon";
var carto_props = manage_choropleth_props(type,props);
@ -735,7 +735,7 @@ cdb.admin.CartoStyles = Backbone.Model.extend({
}
}, {
DEFAULT_GEOMETRY_STYLE: "{\n // points\n [mapnik-geometry-type=point] {\n    marker-fill: #FF6600;\n    marker-opacity: 1;\n    marker-width: 12;\n    marker-line-color: white;\n    marker-line-width: 3;\n    marker-line-opacity: 0.9;\n    marker-placement: point;\n    marker-type: ellipse;marker-allow-overlap: true;\n  }\n\n //lines\n [mapnik-geometry-type=linestring] {\n    line-color: #FF6600; \n    line-width: 2; \n    line-opacity: 0.7;\n  }\n\n //polygons\n [mapnik-geometry-type=polygon] {\n    polygon-fill:#FF6600;\n    polygon-opacity: 0.7;\n    line-opacity:1;\n    line-color: #FFFFFF;\n   }\n }",
DEFAULT_GEOMETRY_STYLE: "{\n // points\n [mapnik-geometry-type=point] {\n marker-fill: #FF6600;\n marker-opacity: 1;\n marker-width: 12;\n marker-line-color: white;\n marker-line-width: 3;\n marker-line-opacity: 0.9;\n marker-placement: point;\n marker-type: ellipse;marker-allow-overlap: true;\n }\n\n //lines\n [mapnik-geometry-type=linestring] {\n line-color: #FF6600; \n line-width: 2; \n line-opacity: 0.7;\n }\n\n //polygons\n [mapnik-geometry-type=polygon] {\n polygon-fill:#FF6600;\n polygon-opacity: 0.7;\n line-opacity:1;\n line-color: #FFFFFF;\n }\n }",
});

4
lib/assets/javascripts/cartodb/models/carto/category.js
Unescape View File

@ -11,7 +11,7 @@ cdb.admin.carto.category = {
var self = this;
var type = table.geomColumnTypes() && table.geomColumnTypes()[0] || "polygon";
var type = table.geomColumnTypes() && table.geomColumnTypes()[0] || "polygon";
// Get fill cartocss parameter
@ -94,7 +94,7 @@ cdb.admin.carto.category = {
var table_name = table.getUnqualifiedName();
var css = '';
var type = table.geomColumnTypes() && table.geomColumnTypes()[0] || "polygon";
var type = table.geomColumnTypes() && table.geomColumnTypes()[0] || "polygon";
var categories = metadata || props.categories;
if (categories) {
// type of the column, number -> no quotes, string -> quotes, boolean -> no quotes

2
lib/assets/javascripts/cartodb/models/synchronization.js
Unescape View File

@ -94,7 +94,7 @@
self.fetch({
error: function(m, e) {
self.set({
error_message: e.statusText || "",
error_message: e.statusText || "",
state: 'failure'
});
}

4
lib/assets/javascripts/cartodb/models/user.js
Unescape View File

@ -140,7 +140,7 @@ cdb.admin.User = cdb.core.Model.extend({
},
canAddLayerTo: function(map) {
if (!map || !map.layers || !map.layers.getDataLayers) {
if (!map || !map.layers || !map.layers.getDataLayers) {
throw new Error("Map model is not defined or wrong");
}
var dataLayers = map.layers.getDataLayers();
@ -171,7 +171,7 @@ cdb.admin.User = cdb.core.Model.extend({
},
getMaxLayersPerMap: function() {
return this.get('max_layers') || 4;
return this.get('max_layers') || 4;
},
canStartTrial: function() {

2
lib/assets/javascripts/cartodb/old_common/forms/text_custom_combo.js
Unescape View File

@ -89,7 +89,7 @@
},
_changeSelection: function(e) {
var val = this.$('select').val() || this.$('select').data('select2').data().id;
var val = this.$('select').val() || this.$('select').data('select2').data().id;
// Check if val is from text or value
var isText = !this._valueAsOption(val);

2
lib/assets/javascripts/cartodb/old_common/forms/widgets.js
Unescape View File

@ -876,7 +876,7 @@ cdb.forms.Combo = cdb.core.View.extend({
},
_formatResult: function(data) {
return data.id || data.text;
return data.id || data.text;
},
_matcher: function(term, text, option) {

2
lib/assets/javascripts/cartodb/public_table/table_router_public.js
Unescape View File

@ -17,7 +17,7 @@
change: function(_id,scenario) {
// Check active view, if it is different, change
if (scenario != 'table' && scenario != 'map') scenario = 'table';
if (scenario != 'table' && scenario != 'map') scenario = 'table';
this.table.workViewMobile.active(scenario);
}

2
lib/assets/javascripts/cartodb/table/actions_menu.js
Unescape View File

@ -265,7 +265,7 @@
offset: 0,
fade: true,
title: function() {
if (!self.vis.isVisualization() || self.model.get('open')) {
if (!self.vis.isVisualization() || self.model.get('open')) {
return '';
}
return $(this).find('span.name').text();

2
lib/assets/javascripts/cartodb/table/menu_modules/carto_editor.js
Unescape View File

@ -56,7 +56,7 @@ cdb.admin.mod.CartoCSSEditor = cdb.admin.Module.extend({
this.model.tile_style_history_position =
_.indexOf(history, style) !== -1
? _.indexOf(history, style)
: 0;
: 0;
this.model.bind('parseError', this._showErrorFromServer, this);
/*

2
lib/assets/javascripts/cartodb/table/menu_modules/carto_wizard.js
Unescape View File

@ -129,7 +129,7 @@ cdb.admin.mod.CartoCSSWizard = cdb.admin.Module.extend({
, move = 100 + Math.ceil(40/list_size)
, block_width = $ul.parent().outerWidth() || 380
, list_width = list_size * (move + 5)
, left = parseInt($ul.css("left").replace("px","")) || 0
, left = parseInt($ul.css("left").replace("px","")) || 0
, $right = this.$('a.right')
, $left = this.$('a.left')
, self = this;

2
lib/assets/javascripts/cartodb/table/menu_modules/infowindow/infowindow_base_pane.js
Unescape View File

@ -25,7 +25,7 @@
// Restore template_name if exists, reset old_template_name and reset template
this.model.set({
template_name: this.model.get('old_template_name') || this._DEFAULT_TEMPLATE,
template_name: this.model.get('old_template_name') || this._DEFAULT_TEMPLATE,
old_template_name: '',
template: ''
});

2
lib/assets/javascripts/cartodb/table/menu_modules/legend_editor.js
Unescape View File

@ -201,7 +201,7 @@ cdb.admin.mod.LegendEditorItem = cdb.core.View.extend({
// Set custom_value to true if value was added
// manually
this.editInPlace.bind("change", function(val) {
if (this.model.get('name') == "Left label" || this.model.get('name') == "Right label") {
if (this.model.get('name') == "Left label" || this.model.get('name') == "Right label") {
this.model.set('custom_value', true);
}
})

2
lib/assets/javascripts/cartodb/table/menu_modules/sql.js
Unescape View File

@ -45,7 +45,7 @@ cdb.admin.mod.SQL = cdb.admin.Module.extend({
, position = this.model.query_history_position
, sql = this.model.get('query') || this._defaultSQL();
this.model.query_history_position = _.indexOf(history, sql) || 0;
this.model.query_history_position = _.indexOf(history, sql) || 0;
this.add_related_model(this.model);
this._initBinds();

6
lib/assets/javascripts/cartodb/table/menu_modules/wizards/category_wizard.js
Unescape View File

@ -129,7 +129,7 @@
var categories = _.clone(this.model.get('properties').categories);
for (var i = 0, l = colors.length; i < l; i++) {
if ((colors[i][0] != categories[i].title) || (colors[i][1] != categories[i].color) || (colors[i][2] != categories[i].title_type)) {
if ((colors[i][0] != categories[i].title) || (colors[i][1] != categories[i].color) || (colors[i][2] != categories[i].title_type)) {
return false;
}
}
@ -143,7 +143,7 @@
/**
* Custom categories view within Cagetories Wizard
* - Manage thanks to a collection.
* - Each item needs a model with 'title', 'title_type', 'color' || 'file',
* - Each item needs a model with 'title', 'title_type', 'color' || 'file',
* 'value_type' and 'default' if it is neccessary.
*
* new cdb.admin.mod.CategoryWizard.CategoryView({
@ -186,7 +186,7 @@
/**
* Custom category item view using the categories collection.
* - It needs a model with 'title', 'title_type', 'color' || 'file',
* - It needs a model with 'title', 'title_type', 'color' || 'file',
* 'value_type' and 'default' if it is neccessary.
*
* new cdb.admin.mod.CategoryWizard.CategoriesViewItem({

4
lib/assets/javascripts/cartodb/table/table_router.js
Unescape View File

@ -28,7 +28,7 @@
// Get scenario param (table or map)
var last_route = this.history.length > 0 && _.last(this.history).split('/');
// Create url
var url = "/viz/" + vis.get("id") + "/" + ( last_route[2] || 'table' );
var url = "/viz/" + vis.get("id") + "/" + ( last_route[2] || 'table' );
// Navigate
this.navigate(url, { trigger: false });
this.addToHistory();
@ -85,7 +85,7 @@
}
// Check active view, if it is different, change
if (scenario != 'table' && scenario != 'map') scenario = 'table';
if (scenario != 'table' && scenario != 'map') scenario = 'table';
this.table.activeView(scenario);
// Add to history :)

2
lib/assets/javascripts/cartodb/table/watching_notifier_view.js
Unescape View File

@ -28,7 +28,7 @@
},
_onModelChange: function() {
var users = this._removeCurrentUser( this.model.get('users') ) || [];
var users = this._removeCurrentUser( this.model.get('users') ) || [];
if (users.length > 0) {
this

20
lib/assets/test/spec/cartodb/models/carto.spec.js
Unescape View File

@ -404,22 +404,22 @@ describe("cdb.admin.CartoStyles", function() {
style = "" +
" @test_var: #FF6622; " +
" #sensor_log_2013_06_02_12_43{" +
"   marker-fill: #FF6611;" +
"   marker-opacity: 1;" +
" marker-fill: #FF6611;" +
" marker-opacity: 1;" +
"marker-width: [ax]*3;" +
"   marker-line-color: white;" +
"   marker-line-width: 3;" +
"   marker-line-opacity: 0.9;" +
"   marker-placement: point;" +
"   marker-type: ellipse;marker-allow-overlap: true;" +
" marker-line-color: white;" +
" marker-line-width: 3;" +
" marker-line-opacity: 0.9;" +
" marker-placement: point;" +
" marker-type: ellipse;marker-allow-overlap: true;" +
"[az > 1] {" +
" marker-fill:@test_var;" +
" marker-fill:@test_var;" +
"}" +
"[zoom = 12][az > 1] {" +
" marker-fill: red;" +
" marker-fill: red;" +
"}" +
"[mapnik-geometry-type = 'point'] {" +
" marker-fill: blue;" +
" marker-fill: blue;" +
"}" +
"}";
parser = new cdb.admin.CartoParser(style);

4
services/importer/Guardfile
Unescape View File

@ -12,10 +12,10 @@ guard 'minitest', test_folders: 'spec' do
# Rails 3.2
# watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/controllers/#{m[1]}_test.rb" }
# watch(%r|^app/helpers/(.*)\.rb|) { |m| "test/helpers/#{m[1]}_test.rb" }
# watch(%r|^app/models/(.*)\.rb|) { |m| "test/unit/#{m[1]}_test.rb" }
# watch(%r|^app/models/(.*)\.rb|) { |m| "test/unit/#{m[1]}_test.rb" }
# Rails
# watch(%r|^app/controllers/(.*)\.rb|) { |m| "test/functional/#{m[1]}_test.rb" }
# watch(%r|^app/helpers/(.*)\.rb|) { |m| "test/helpers/#{m[1]}_test.rb" }
# watch(%r|^app/models/(.*)\.rb|) { |m| "test/unit/#{m[1]}_test.rb" }
# watch(%r|^app/models/(.*)\.rb|) { |m| "test/unit/#{m[1]}_test.rb" }
end

BIN
services/importer/spec/regression/failing/fsq_places_uniq.csv
View File

Binary file not shown.
Can't render this file because it is too large.

2
spec/requests/carto/api/grantables_controller_spec.rb
Unescape View File

@ -79,7 +79,7 @@ describe Carto::Api::GrantablesController do
get_json api_v1_grantables_index_url(user_domain: @org_user_owner.username, organization_id: @carto_organization.id, api_key: @org_user_owner.api_key), { page: page, per_page: per_page, order: 'name' }, @headers do |response|
response.status.should == 200
response.body[:grantables][0]['id'].should eq(expected_id), "#{response.body[:grantables][0]['id']} != #{expected_id}. Failing page: #{page}"
response.body[:grantables][0]['id'].should eq(expected_id), "#{response.body[:grantables][0]['id']} != #{expected_id}. Failing page: #{page}"
response.body[:grantables].length.should == per_page
response.body[:total_entries].should == count_grantables(@carto_organization)
end

24
spec/support/data/clubbing.csv
Unescape View File

@ -279,7 +279,7 @@ Zona 2: Felix Da Housecat + Vitalic (live) + Rynecologist + Donovans + Produkkt
173269,Fact Córdoba,2011-02-26,TECHNASIA + BONY STUCHE + MARK FONT,19:30-01:00h,375,Metrópolis,Metropolis_Cordoba_140.jpg,Avenida Profesor Arnold J Toynbee s/n. Pol. Ind. Chinales,Córdoba,Córdoba,España,Techno,"Avenida Profesor Arnold J Toynbee s/n. Pol. Ind. Chinales, Córdoba, España"
172830,"",2011-02-26,"Blasmanjazz (live act)
",22:45-01:00h,1125,No Club,nologo.jpg,Sin confirmar,Sin confirmar,Madrid,España,Techno,"Sin confirmar, Sin confirmar, España"
172844,Festplatten Family Meets Catenaccio,2011-02-26,"Lenique + Benjamin Fehr + Raumagent Alpha + B-Funk
172844,Festplatten Family Meets Catenaccio,2011-02-26,"Lenique + Benjamin Fehr + Raumagent Alpha + B-Funk
",00:00h,2428,Suicide Circus,nologo.jpg,Revaler Strasse 99,Berlín,Extranjero,Alemania,Techno,"Revaler Strasse 99, Berlín, Alemania"
172973,"",2011-02-26,"21.30 h Concierto: Cardova (Entrada: 6 €)
23.00 h The Presidentes",23:30-06:00h,1765,Marula Café,MarulaCafe_Barcelona_140.jpg,Escudellers 49,Barcelona,Barcelona,España,Rare Groove,"Escudellers 49, Barcelona, España"
@ -888,7 +888,7 @@ B Room: Dj Under B + Rebound + Tuwes",23:00h,734,Brancaleone,Brancaleone_140.jpg
176806,Circuito Special,2011-03-04,Dubfire + Carlo Lio,00:00h,2149,Clash Club,Clash_Club_SaoPaulo_140.jpg,R. Barra Funda 969,Sao Paulo,Extranjero,Brasil,Techno,"R. Barra Funda 969, Sao Paulo, Brasil"
176810,"",2011-03-04,"La1: Residentes La3: Catalina Isis + Obtuso
PI: Fernando Luna & Guests
La2 WAAAARGH! by THE GARAGE MUSIC // Fiesta Privada",01:00-07:30h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,sin especificar,"c/ Padre Porta, 2, Valencia, España"
La2 WAAAARGH! by THE GARAGE MUSIC // Fiesta Privada",01:00-07:30h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,sin especificar,"c/ Padre Porta, 2, Valencia, España"
176824,Los Conciertos de La3,2011-03-04,CALEIDOSCOPE + CAMDEM + MIDNIGHT SHOTS,22:00h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,Indie,"c/ Padre Porta, 2, Valencia, España"
176833,"",2011-03-04,"DJ Neil Armstrong (Jay-Z, 5th Platoon), Spin Doctor, Mr Thing & Chris P Cuts",21:00h,1108,East Village,EastVillage_London_140.jpg,89 Great Eastern St,Londres,Extranjero,UK,House,"89 Great Eastern St, Londres, UK"
170988,Future Music Festival 2011,2011-03-05,The Chemical Brothers + Dizzee Rascal + Pendulum + Mark Ronson and The Business Intl + MGMT + Ke$ha + The Presets + Leftfield + Richie Hawtin Pres. Plastikman + Art vs Science + Steve Angello + Sven Vath + Sander Van Doorn + Steve Aoki + Loco Dice + Cosmic Gate + Don Diablo + Etienne De Crecy + Zane Lowe + The Subs + Sound of Stereo + James Holroyd + Professor Green + Zowie + Tydi + The Stafford Brothers + Binary Finary + Tai + Shazam,12:00h,1,No Disponible,"","","",Extranjero,Australia,sin especificar,", , Australia"
@ -1026,7 +1026,7 @@ Djs: Patrice Bäumel & Nuno dos Santos",21:00h,1613,Trouw,Trouw_Amsterdam_140.jp
Water Floor: 5 Years Of Leftroom: Matt Tolfrey + Inxec + Pablo Cahn",00:00h,719,Watergate,Water_gate_Berlin.jpg,Falckensteinstr. 49,Berlín,Extranjero,Alemania,Techno,"Falckensteinstr. 49, Berlín, Alemania"
176465,"",2011-03-05,"NU KIDS ON DA BLOC
",23:30-04:00h,1296,Cassette,Cassette_Mallorca_140.jpg,Darsena de Can Barbara nº 113,Palma de Mallorca,Baleares,España,sin especificar,"Darsena de Can Barbara nº 113, Palma de Mallorca, España"
176483,Goldregen küsst Susi Klub,2011-03-05,"Laminat (Schönbrunner Techno, RTS.FM, Wien) + Colt aus Gold (Susi Klub, Wien) + Flow Job (Susi Klub, Wien) + Alma Gold (female:pressure, Chaca Chaca, München)",23:00h,1949,Chaca Chaca,ChacaChaca_Munich_140.jpg,Landwherstrasse 16,Munich,Extranjero,Alemania,Techno,"Landwherstrasse 16, Munich, Alemania"
176483,Goldregen küsst Susi Klub,2011-03-05,"Laminat (Schönbrunner Techno, RTS.FM, Wien) + Colt aus Gold (Susi Klub, Wien) + Flow Job (Susi Klub, Wien) + Alma Gold (female:pressure, Chaca Chaca, München)",23:00h,1949,Chaca Chaca,ChacaChaca_Munich_140.jpg,Landwherstrasse 16,Munich,Extranjero,Alemania,Techno,"Landwherstrasse 16, Munich, Alemania"
176484,KLUBNACHT,2011-03-05,"Berghain: Mike Dehnert + Dj Pete + Boris + Matthew Herbert + Rødhåd
Panorama Bar: Legowelt + I-F + David Vunk + Intergalactic Gary
Sonntags: Oliver Deutschmann + Clé + Funk D’Void",Sin confirmar,945,Panorama,PanoramaBar_Berlin_140.jpg,Am Wriezener Bahnhof,Berlin,Extranjero,Alemania,Techno,"Am Wriezener Bahnhof, Berlin, Alemania"
@ -1399,7 +1399,7 @@ Box Bar: Gavin Foord + Deejay Philly
",23:00h,135,El Tornillo,El_Tornillo_Valencia.jpg,Campoamor 42,Valencia,Valencia,España,Indie,"Campoamor 42, Valencia, España"
176812,Presentación SOS FESTIVAL,2011-03-11,"La1: NAPOLEÓN SOLO (Live) + ADDICTIVE TV Djs & Vdjs Live + ELYELLA DJS (La3/SOS)
PI: Olmo (Kafka club/Sevilla)
La2: SLASH pD",01:00-07:30h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,sin especificar,"c/ Padre Porta, 2, Valencia, España"
La2: SLASH pD",01:00-07:30h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,sin especificar,"c/ Padre Porta, 2, Valencia, España"
176823,Los Conciertos de La3,2011-03-11,Canal Blues,22:30h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,Indie,"c/ Padre Porta, 2, Valencia, España"
166456,Eventual party,2011-03-12,"Oscaromero + Pumuki + Blow + V.Cassillas
",22:00-03:30h,2636,Scorpio,Scorpio_Coria_140.jpg,"Plaza del rollo, 4",Coria,Cáceres,España,Techno,"Plaza del rollo, 4, Coria, España"
@ -1624,7 +1624,7 @@ TERRAZA FREE: BEATRONIK, FELIPE SOARES E TOM KELLER",23:00h,1018,Pacha Sao Paulo
176813,POST WINTER,2011-03-12,"La1: JOHANN WALD (MTV WINTER) & JAVI SENZ (MTV DJ)
PI: Falomir Freak show
La2: NOCHE ESPECIAL AREA VIP",01:00-07:30h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,sin especificar,"c/ Padre Porta, 2, Valencia, España"
176822,Los Conciertos de La3,2011-03-12,LA PULQUERIA + Artista invitado,22:00h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,Indie,"c/ Padre Porta, 2, Valencia, España"
176822,Los Conciertos de La3,2011-03-12,LA PULQUERIA + Artista invitado,22:00h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,Indie,"c/ Padre Porta, 2, Valencia, España"
176831,"",2011-03-12,JONATHAN PETERS12,22:00h,2687,District 36,District36_NYC_140.jpg,29 West 36th Street,Nueva York,Extranjero,USA,House,"29 West 36th Street, Nueva York, USA"
170991,Future Music Festival 2011,2011-03-13,The Chemical Brothers + Dizzee Rascal + Pendulum + Mark Ronson and The Business Intl + MGMT + Ke$ha + The Presets + Leftfield + Richie Hawtin Pres. Plastikman + Art vs Science + Steve Angello + Sven Vath + Sander Van Doorn + Steve Aoki + Loco Dice + Cosmic Gate + Don Diablo + Etienne De Crecy + Zane Lowe + The Subs + Sound of Stereo + James Holroyd + Professor Green + Zowie + Tydi + The Stafford Brothers + Binary Finary + Tai + Shazam,12:00h,1,No Disponible,"","","",Extranjero,Australia,sin especificar,", , Australia"
173162,Bloc 2011 - Día 3,2011-03-13,"</b> Artistas confirmados para todo el festival:
@ -1674,7 +1674,7 @@ ROWBAR: ICE CUBES & BLACK OUT: A-Lex (Blackout / Titbit) + DG STAR (Warung Privi
23h Dj CUE",21:00h,547,La Boca del Lobo,La_Boca_Del_Lobo.jpg,Echegaray 11,Madrid,Madrid,España,Indie,"Echegaray 11, Madrid, España"
176552,LE PETIT SOCIAL,2011-03-15,"Dj Kodh + VHM + Calcium + Nego
",23:00-06:00h,1041,Social Club,SocialClub_Paris_140.jpg,8 Boulevard De La Madeleine,Paris,Extranjero,Francia,Techno,"8 Boulevard De La Madeleine, Paris, Francia"
176821,Los Conciertos de La3,2011-03-15,CONCERT AMPLIFICAT: Batak + Malnom + Enderrocks + Inèrcia + LA TROBA KUNG FÚ,21:00h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,Indie,"c/ Padre Porta, 2, Valencia, España"
176821,Los Conciertos de La3,2011-03-15,CONCERT AMPLIFICAT: Batak + Malnom + Enderrocks + Inèrcia + LA TROBA KUNG FÚ,21:00h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,Indie,"c/ Padre Porta, 2, Valencia, España"
176508,Mr Jones: Westway Flyovers Paddys Day Carnival,2011-03-16,"The Basement: Hertz-U Present: MARCUS INTALEX (The 21 Album Release Tour) + NICK FURY b2b TEDDY
The Stage: GENERAL LEVY (UK) + THE DIRTY DUBSTERS
The Mezz: ALL CITY RECORDS SHOWCASE
@ -1745,7 +1745,7 @@ Redrum: Los Gemelos Derrick (Guashaus) + Gentle (Guashaus)",00:00h,405,BeCool,be
176795,Semana de Fallas,2011-03-17,"LOS OJEADORES
",23:00h,135,El Tornillo,El_Tornillo_Valencia.jpg,Campoamor 42,Valencia,Valencia,España,Indie,"Campoamor 42, Valencia, España"
176814,"",2011-03-17,"La1: THE ZOMBIE KIDS + Catalina Isis (La3)
La2: GUILLE MILKYWAY Dj Set (LA CASA AZUL DJ)",01:00-07:30h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,sin especificar,"c/ Padre Porta, 2, Valencia, España"
La2: GUILLE MILKYWAY Dj Set (LA CASA AZUL DJ)",01:00-07:30h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,sin especificar,"c/ Padre Porta, 2, Valencia, España"
170943,The Gallery,2011-03-18,"BOX: Hernan Cattaneo & Nick Warren (4 hours) + Anthony Pappa
103: Dzeta & Basile + Gavyn Mytchel + Steve Lee + Carlo Ventuno
LOFT: Endemic Digital Inc & Friends: Norman H + Wez Saunders & Moojaa + Sasha Le Monnier + d00sh + Justin Steel + Tom Lennox
@ -2032,7 +2032,7 @@ ROOM 4: Anto + Gabriele Cutrano + Nils + JB + La Gosse",22:00-06:00h,981,Egg,Egg
176807,Fuego Special,2011-03-19,Antonhy Rother,00:00h,2149,Clash Club,Clash_Club_SaoPaulo_140.jpg,R. Barra Funda 969,Sao Paulo,Extranjero,Brasil,Electro,"R. Barra Funda 969, Sao Paulo, Brasil"
176816,LA CREMÀ DE LA3,2011-03-19,"La1: BLOC PARTY DJS + Fono
PI: Toni Zaragoza
La2: Pedro Slash & Guest",01:00-07:30h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,sin especificar,"c/ Padre Porta, 2, Valencia, España"
La2: Pedro Slash & Guest",01:00-07:30h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,sin especificar,"c/ Padre Porta, 2, Valencia, España"
174381,Wet Yourself,2011-03-20,"Special Guest TBC + Cormac + Jacob Husley + Peter Pixzel
",23:00-06:00h,709,Fabric,fabric_logo.jpg,77a Charterhouse St.,London,Extranjero,UK,Techno,"77a Charterhouse St., London, UK"
175671,DOLLAR DISCO,2011-03-20,"ROSS KELLY (Leather Disco, Brilliant Pebbles) + MICHAEL SERAFINI + KID COLOR + ADULTURE
@ -2278,8 +2278,8 @@ Bar Floor hosted by Sebastian Klenk + Denis + Guillaume aka Malice + Clown Trist
176731,Sankeys Friday Edition,2011-03-25,Kissy Sell Out,22:00h,717,Sankeys,Sankeys_UK_140.jpg,Radium Street,Manchester,Extranjero,UK,House,"Radium Street, Manchester, UK"
176799,"",2011-03-25,"TOXICOSMOS PLAYS SPANISHPOP
",23:00h,135,El Tornillo,El_Tornillo_Valencia.jpg,Campoamor 42,Valencia,Valencia,España,Indie,"Campoamor 42, Valencia, España"
176817,"",2011-03-25,"La1: UNDERCOVER KOSTROK: THE WARRIORS (Madrid) + La Musique D’Ordinateur (Onion Records/Kiez Biets) + Lurbe und Hosen
PI: FINAL CONCURSO DJS: A MAN CALLED ANGEL + ALEX TOOM DJ + XIMO NOGUERA",01:00-07:30h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,sin especificar,"c/ Padre Porta, 2, Valencia, España"
176817,"",2011-03-25,"La1: UNDERCOVER KOSTROK: THE WARRIORS (Madrid) + La Musique D’Ordinateur (Onion Records/Kiez Biets) + Lurbe und Hosen
PI: FINAL CONCURSO DJS: A MAN CALLED ANGEL + ALEX TOOM DJ + XIMO NOGUERA",01:00-07:30h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,sin especificar,"c/ Padre Porta, 2, Valencia, España"
176820,Los Conciertos de La3,2011-03-25,Zulú 930 + Nanai,22:00h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,Indie,"c/ Padre Porta, 2, Valencia, España"
171213,Black Music Festival,2011-03-26,James Hunter (directo),Sin confirmar,1,No Disponible,"","","",Gerona,España,sin especificar,", , España"
173057,Ultra Music Festival 2011 - Día 2,2011-03-26,"Main Stage: deadmau5 + Underworld + Armin Van Buuren + Kaskade + Afrojack + Avicii + Sander Klienenberg (live) + Hernan Cattaneo + Sunnery James/Ryan Marciano + Jerome Isma AE + Riotgear.
@ -2413,9 +2413,9 @@ BOITE: Counterstrike + Fran The Breakstorm + Mc Osito + Dj Domi
176732,"",2011-03-26,Sebastian Leger (live) + Brothers Vibe + Delano Smith + Dillan Joseph + Si'Ke DJs and Jozef K,22:00h,717,Sankeys,Sankeys_UK_140.jpg,Radium Street,Manchester,Extranjero,UK,House,"Radium Street, Manchester, UK"
176800,"",2011-03-26,"MIQUI PUIG
",23:00h,135,El Tornillo,El_Tornillo_Valencia.jpg,Campoamor 42,Valencia,Valencia,España,Indie,"Campoamor 42, Valencia, España"
176818,"",2011-03-26,"La1: CHEW LIPS (live) + BILBADINO + Catalina Isis (La3)
176818,"",2011-03-26,"La1: CHEW LIPS (live) + BILBADINO + Catalina Isis (La3)
PI: Los Pastores (Snna + Nacho Arauz)",01:00-07:30h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,sin especificar,"c/ Padre Porta, 2, Valencia, España"
176819,Los Conciertos de La3,2011-03-26,Costo Rico + Viva Tirado,22:00h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,Indie,"c/ Padre Porta, 2, Valencia, España"
176819,Los Conciertos de La3,2011-03-26,Costo Rico + Viva Tirado,22:00h,2205,La 3,La3_Valencia_140.jpg,"c/ Padre Porta, 2",Valencia,Valencia,España,Indie,"c/ Padre Porta, 2, Valencia, España"
173058,Ultra Music Festival 2011 - Día 3,2011-03-27,"Main Stage: The Chemical Brothers (live) + David Guetta + Erick Morillo (live) + will.i.am + Laidback Luke + Wolfgang Gartner + Gui Boratto.
Live Stage: Crystal Castles + The Disco Biscuits + MSTRKRFT + Chromeo + CSS + Fake Blood + Hybrid (live) + Subfocus (live) + !!! + Afrobeta.
A State of Trance 500: Armin van Buuren + Ferry Corsten + ATB + Gareth Emery + Sander Van Doorn + Alex M.O.R.P.H. + Cosmic Gate + Marcus Schossow.

Can't render this file because it is too large.
Write Preview
Loading…
Cancel
Save