From bc12b5b0d639305e6cb00b868be89765139d38fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Matall=C3=ADn?= Date: Mon, 28 Aug 2017 18:39:46 +0200 Subject: [PATCH] replace nbsp to actual spaces --- Guardfile | 4 +-- .../stylesheets/sessions/sessions.css.scss | 4 +-- config/app_config.yml.sample | 2 +- .../twitter-import-details.tpl | 2 +- .../content/datasets/dataset-item.tpl | 2 +- .../content/datasets/datasets-no-result.tpl | 10 ++++---- .../components/table/body/table-body-cell.tpl | 2 +- .../components/table/head/table-head-item.tpl | 2 +- .../core/javascripts/cartodb3/editor.js | 2 +- .../editor/layers/change-view-buttons.tpl | 2 +- .../helpers/reset-style-per-node.spec.js | 2 +- .../imports/background_import_item_view.js | 6 ++--- .../imports/twitter_import_details.jst.ejs | 2 +- .../dialogs/change_privacy/start.jst.ejs | 4 +-- .../listing/datasets/dataset_item_view.js | 2 +- .../datasets/remote_dataset_item_view.js | 4 +-- .../imports/data_import/data_header_view.js | 2 +- .../imports/import_selected_dataset_view.js | 2 +- .../service_import/service_list_item_view.js | 2 +- .../dialogs/create/listing/imports_view.js | 4 +-- .../delete_items_view_template.jst.ejs | 6 ++--- .../edit_vis_metadata_dialog_model.js | 2 +- .../map/image_picker/assets_item_view.js | 2 +- .../date_picker/date_picker_view.js | 2 +- .../cartodb/common/local_storage.js | 2 +- .../views/create/listing/dataset_item.jst.ejs | 2 +- .../create/listing/datasets_no_result.jst.ejs | 10 ++++---- .../dashboard_header/notifications/view.js | 4 +-- .../settings_dropdown_view.js | 2 +- .../user_support_template.jst.ejs | 2 +- .../common/views/support_banner.jst.ejs | 2 +- .../datasets/remote_datasets_item.js | 4 +-- .../javascripts/cartodb/dashboard/router.js | 2 +- .../views/content_no_results.jst.ejs | 10 ++++---- .../dashboard/views/datasets_item.jst.ejs | 2 +- .../cartodb/dashboard/views/maps_item.jst.ejs | 2 +- .../list/dataset_item_template.jst.ejs | 2 +- .../javascripts/cartodb/models/carto.js | 4 +-- .../cartodb/models/carto/category.js | 4 +-- .../cartodb/models/synchronization.js | 2 +- lib/assets/javascripts/cartodb/models/user.js | 4 +-- .../old_common/forms/text_custom_combo.js | 2 +- .../cartodb/old_common/forms/widgets.js | 2 +- .../public_table/table_router_public.js | 2 +- .../javascripts/cartodb/table/actions_menu.js | 2 +- .../table/menu_modules/carto_editor.js | 2 +- .../table/menu_modules/carto_wizard.js | 2 +- .../infowindow/infowindow_base_pane.js | 2 +- .../table/menu_modules/legend_editor.js | 2 +- .../cartodb/table/menu_modules/sql.js | 2 +- .../menu_modules/wizards/category_wizard.js | 6 ++--- .../javascripts/cartodb/table/table_router.js | 4 +-- .../cartodb/table/watching_notifier_view.js | 2 +- .../test/spec/cartodb/models/carto.spec.js | 20 +++++++-------- services/importer/Guardfile | 4 +-- .../regression/failing/fsq_places_uniq.csv | Bin 1753802 -> 1753802 bytes .../carto/api/grantables_controller_spec.rb | 2 +- spec/support/data/clubbing.csv | 24 +++++++++--------- 58 files changed, 107 insertions(+), 107 deletions(-) diff --git a/Guardfile b/Guardfile index 9cdf59c066..94b38f6c48 100644 --- a/Guardfile +++ b/Guardfile @@ -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 diff --git a/app/assets/stylesheets/sessions/sessions.css.scss b/app/assets/stylesheets/sessions/sessions.css.scss index ae82d26f0c..fc92f26e25 100644 --- a/app/assets/stylesheets/sessions/sessions.css.scss +++ b/app/assets/stylesheets/sessions/sessions.css.scss @@ -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; } } diff --git a/config/app_config.yml.sample b/config/app_config.yml.sample index 0c71949400..97a2134b19 100644 --- a/config/app_config.yml.sample +++ b/config/app_config.yml.sample @@ -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}" diff --git a/lib/assets/core/javascripts/cartodb3/components/background-importer/twitter-import-details.tpl b/lib/assets/core/javascripts/cartodb3/components/background-importer/twitter-import-details.tpl index eeffeba36e..f8e47c7040 100755 --- a/lib/assets/core/javascripts/cartodb3/components/background-importer/twitter-import-details.tpl +++ b/lib/assets/core/javascripts/cartodb3/components/background-importer/twitter-import-details.tpl @@ -29,7 +29,7 @@ <% } %>

- <% 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) { %> diff --git a/lib/assets/core/javascripts/cartodb3/components/modals/add-layer/content/datasets/dataset-item.tpl b/lib/assets/core/javascripts/cartodb3/components/modals/add-layer/content/datasets/dataset-item.tpl index 30df8f41b0..51c50f35bd 100755 --- a/lib/assets/core/javascripts/cartodb3/components/modals/add-layer/content/datasets/dataset-item.tpl +++ b/lib/assets/core/javascripts/cartodb3/components/modals/add-layer/content/datasets/dataset-item.tpl @@ -50,7 +50,7 @@ <%- _t('components.modals.add-layer.datasets.item.by') %> - <%- owner.name || owner.username  %> + <%- owner.name || owner.username %> <% } %> diff --git a/lib/assets/core/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-no-result.tpl b/lib/assets/core/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-no-result.tpl index 9772509b96..01440777e6 100755 --- a/lib/assets/core/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-no-result.tpl +++ b/lib/assets/core/javascripts/cartodb3/components/modals/add-layer/content/datasets/datasets-no-result.tpl @@ -7,20 +7,20 @@ <% } else { %> CDB-IconFont-lens <% } %>" />

- <% 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 %> <% } %>

- <% 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 }) %> <% } %>

diff --git a/lib/assets/core/javascripts/cartodb3/components/table/body/table-body-cell.tpl b/lib/assets/core/javascripts/cartodb3/components/table/body/table-body-cell.tpl index 6a5056eec0..e0a3b29d36 100755 --- a/lib/assets/core/javascripts/cartodb3/components/table/body/table-body-cell.tpl +++ b/lib/assets/core/javascripts/cartodb3/components/table/body/table-body-cell.tpl @@ -1,7 +1,7 @@

+ <%- name === 'cartodb_id' || (type === 'geometry' && geometry !== 'point') ? 'Table-headItemWrapper--short' : '' %> ">

diff --git a/lib/assets/core/javascripts/cartodb3/editor.js b/lib/assets/core/javascripts/cartodb3/editor.js index 5038713faf..4b3eceec53 100755 --- a/lib/assets/core/javascripts/cartodb3/editor.js +++ b/lib/assets/core/javascripts/cartodb3/editor.js @@ -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); diff --git a/lib/assets/core/javascripts/cartodb3/editor/layers/change-view-buttons.tpl b/lib/assets/core/javascripts/cartodb3/editor/layers/change-view-buttons.tpl index a4864f0a34..782f9ab2a4 100755 --- a/lib/assets/core/javascripts/cartodb3/editor/layers/change-view-buttons.tpl +++ b/lib/assets/core/javascripts/cartodb3/editor/layers/change-view-buttons.tpl @@ -47,7 +47,7 @@ <% if (isReadOnly || !isVisible) { %>data-tooltip="<%- _t('editor.edit-feature.geometry-disabled') %>"<% } %> > <% if (queryGeometryModel === 'point' || !queryGeometryModel) { %> -
  • +
  • diff --git a/lib/assets/core/test/spec/cartodb3/helpers/reset-style-per-node.spec.js b/lib/assets/core/test/spec/cartodb3/helpers/reset-style-per-node.spec.js index f6006cd44d..b36ad5468d 100644 --- a/lib/assets/core/test/spec/cartodb3/helpers/reset-style-per-node.spec.js +++ b/lib/assets/core/test/spec/cartodb3/helpers/reset-style-per-node.spec.js @@ -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({ diff --git a/lib/assets/javascripts/cartodb/common/background_polling/views/imports/background_import_item_view.js b/lib/assets/javascripts/cartodb/common/background_polling/views/imports/background_import_item_view.js index 72a7bbf718..49465bb131 100644 --- a/lib/assets/javascripts/cartodb/common/background_polling/views/imports/background_import_item_view.js +++ b/lib/assets/javascripts/cartodb/common/background_polling/views/imports/background_import_item_view.js @@ -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'; diff --git a/lib/assets/javascripts/cartodb/common/background_polling/views/imports/twitter_import_details.jst.ejs b/lib/assets/javascripts/cartodb/common/background_polling/views/imports/twitter_import_details.jst.ejs index 3a86fe7839..7bf41a4ada 100644 --- a/lib/assets/javascripts/cartodb/common/background_polling/views/imports/twitter_import_details.jst.ejs +++ b/lib/assets/javascripts/cartodb/common/background_polling/views/imports/twitter_import_details.jst.ejs @@ -27,7 +27,7 @@ <% } %>

    - <% 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. diff --git a/lib/assets/javascripts/cartodb/common/dialogs/change_privacy/start.jst.ejs b/lib/assets/javascripts/cartodb/common/dialogs/change_privacy/start.jst.ejs index 414c20bd8f..3cb3ce7628 100644 --- a/lib/assets/javascripts/cartodb/common/dialogs/change_privacy/start.jst.ejs +++ b/lib/assets/javascripts/cartodb/common/dialogs/change_privacy/start.jst.ejs @@ -65,9 +65,9 @@ <% sharedEntitiesSample.forEach(function(user) { %> <% if (user.get('avatar_url')) { %> - <%- user.get('name') || user.get('username') %> + <%- user.get('name') || user.get('username') %> <% } else { %> -

    +
    <% } %> <% }); %> diff --git a/lib/assets/javascripts/cartodb/common/dialogs/create/listing/datasets/dataset_item_view.js b/lib/assets/javascripts/cartodb/common/dialogs/create/listing/datasets/dataset_item_view.js index 06fdf1cbf2..6b3fb17354 100644 --- a/lib/assets/javascripts/cartodb/common/dialogs/create/listing/datasets/dataset_item_view.js +++ b/lib/assets/javascripts/cartodb/common/dialogs/create/listing/datasets/dataset_item_view.js @@ -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', diff --git a/lib/assets/javascripts/cartodb/common/dialogs/create/listing/datasets/remote_dataset_item_view.js b/lib/assets/javascripts/cartodb/common/dialogs/create/listing/datasets/remote_dataset_item_view.js index f166c5957d..857754e491 100644 --- a/lib/assets/javascripts/cartodb/common/dialogs/create/listing/datasets/remote_dataset_item_view.js +++ b/lib/assets/javascripts/cartodb/common/dialogs/create/listing/datasets/remote_dataset_item_view.js @@ -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', diff --git a/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/data_import/data_header_view.js b/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/data_import/data_header_view.js index 8843844a56..699201e869 100644 --- a/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/data_import/data_header_view.js +++ b/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/data_import/data_header_view.js @@ -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(); }, diff --git a/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/import_selected_dataset_view.js b/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/import_selected_dataset_view.js index e4a0cb30bf..f097d4f929 100644 --- a/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/import_selected_dataset_view.js +++ b/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/import_selected_dataset_view.js @@ -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; diff --git a/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/service_import/service_list_item_view.js b/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/service_import/service_list_item_view.js index 4f85e670d2..061c2e5531 100644 --- a/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/service_import/service_list_item_view.js +++ b/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports/service_import/service_list_item_view.js @@ -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; diff --git a/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports_view.js b/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports_view.js index 69835e6dac..377dc0f0a7 100644 --- a/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports_view.js +++ b/lib/assets/javascripts/cartodb/common/dialogs/create/listing/imports_view.js @@ -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 diff --git a/lib/assets/javascripts/cartodb/common/dialogs/delete_items_view_template.jst.ejs b/lib/assets/javascripts/cartodb/common/dialogs/delete_items_view_template.jst.ejs index f8f700fa4e..1f9cb463af 100644 --- a/lib/assets/javascripts/cartodb/common/dialogs/delete_items_view_template.jst.ejs +++ b/lib/assets/javascripts/cartodb/common/dialogs/delete_items_view_template.jst.ejs @@ -43,7 +43,7 @@ <%- vis.timeDiff %> <% if (!vis.isOwner) { %> by - <%- vis.owner.nameOrUsername()  %> + <%- vis.owner.nameOrUsername() %> <% } %>

    @@ -62,9 +62,9 @@ <% affectedEntitiesSample.forEach(function(user) { %> <% if (user.get('avatar_url')) { %> - <%- user.get('name') || user.get('username') %> + <%- user.get('name') || user.get('username') %> <% } else { %> -
    +
    <% } %>     <% }); %> diff --git a/lib/assets/javascripts/cartodb/common/dialogs/edit_vis_metadata/edit_vis_metadata_dialog_model.js b/lib/assets/javascripts/cartodb/common/dialogs/edit_vis_metadata/edit_vis_metadata_dialog_model.js index fb52b91cc8..55df0530c1 100644 --- a/lib/assets/javascripts/cartodb/common/dialogs/edit_vis_metadata/edit_vis_metadata_dialog_model.js +++ b/lib/assets/javascripts/cartodb/common/dialogs/edit_vis_metadata/edit_vis_metadata_dialog_model.js @@ -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; diff --git a/lib/assets/javascripts/cartodb/common/dialogs/map/image_picker/assets_item_view.js b/lib/assets/javascripts/cartodb/common/dialogs/map/image_picker/assets_item_view.js index ff18de0b2c..c6656ea3e8 100644 --- a/lib/assets/javascripts/cartodb/common/dialogs/map/image_picker/assets_item_view.js +++ b/lib/assets/javascripts/cartodb/common/dialogs/map/image_picker/assets_item_view.js @@ -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" diff --git a/lib/assets/javascripts/cartodb/common/edit_fields/date_field/date_picker/date_picker_view.js b/lib/assets/javascripts/cartodb/common/edit_fields/date_field/date_picker/date_picker_view.js index 3d7adf3ba3..9c16f44eaa 100644 --- a/lib/assets/javascripts/cartodb/common/edit_fields/date_field/date_picker/date_picker_view.js +++ b/lib/assets/javascripts/cartodb/common/edit_fields/date_field/date_picker/date_picker_view.js @@ -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')({ diff --git a/lib/assets/javascripts/cartodb/common/local_storage.js b/lib/assets/javascripts/cartodb/common/local_storage.js index c195ed13ba..2af738f986 100644 --- a/lib/assets/javascripts/cartodb/common/local_storage.js +++ b/lib/assets/javascripts/cartodb/common/local_storage.js @@ -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, "{}"); } diff --git a/lib/assets/javascripts/cartodb/common/views/create/listing/dataset_item.jst.ejs b/lib/assets/javascripts/cartodb/common/views/create/listing/dataset_item.jst.ejs index a33f333922..abd41fb9b2 100644 --- a/lib/assets/javascripts/cartodb/common/views/create/listing/dataset_item.jst.ejs +++ b/lib/assets/javascripts/cartodb/common/views/create/listing/dataset_item.jst.ejs @@ -44,7 +44,7 @@ <% if (!isOwner) { %> by - <%- owner.name || owner.username  %> + <%- owner.name || owner.username %> <% } %> diff --git a/lib/assets/javascripts/cartodb/common/views/create/listing/datasets_no_result.jst.ejs b/lib/assets/javascripts/cartodb/common/views/create/listing/datasets_no_result.jst.ejs index 18fb28a795..ec741d3309 100644 --- a/lib/assets/javascripts/cartodb/common/views/create/listing/datasets_no_result.jst.ejs +++ b/lib/assets/javascripts/cartodb/common/views/create/listing/datasets_no_result.jst.ejs @@ -7,20 +7,20 @@ <% } else { %> CDB-IconFont-lens <% } %>" />

    - <% 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 %> <% } %>

    - <% if (!tag && !q && totalItems === 0 && totalEntries === 0) { %> + <% if (!tag && !q && totalItems === 0 && totalEntries === 0) { %> No <%- type %>, no fun <% } %>

    diff --git a/lib/assets/javascripts/cartodb/common/views/dashboard_header/notifications/view.js b/lib/assets/javascripts/cartodb/common/views/dashboard_header/notifications/view.js index f50511adbd..08a251efa4 100644 --- a/lib/assets/javascripts/cartodb/common/views/dashboard_header/notifications/view.js +++ b/lib/assets/javascripts/cartodb/common/views/dashboard_header/notifications/view.js @@ -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, diff --git a/lib/assets/javascripts/cartodb/common/views/dashboard_header/settings_dropdown_view.js b/lib/assets/javascripts/cartodb/common/views/dashboard_header/settings_dropdown_view.js index 0110e05342..8432a59900 100644 --- a/lib/assets/javascripts/cartodb/common/views/dashboard_header/settings_dropdown_view.js +++ b/lib/assets/javascripts/cartodb/common/views/dashboard_header/settings_dropdown_view.js @@ -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'), diff --git a/lib/assets/javascripts/cartodb/common/views/dashboard_header/user_support_template.jst.ejs b/lib/assets/javascripts/cartodb/common/views/dashboard_header/user_support_template.jst.ejs index f2f3b021fa..433b7aa290 100644 --- a/lib/assets/javascripts/cartodb/common/views/dashboard_header/user_support_template.jst.ejs +++ b/lib/assets/javascripts/cartodb/common/views/dashboard_header/user_support_template.jst.ejs @@ -1,6 +1,6 @@ <% if (userType === 'org') { %> Support -<% } else if (userType === 'client' || userType === 'internal') { %> +<% } else if (userType === 'client' || userType === 'internal') { %> Support <% } else { %> Support diff --git a/lib/assets/javascripts/cartodb/common/views/support_banner.jst.ejs b/lib/assets/javascripts/cartodb/common/views/support_banner.jst.ejs index a18d7f3b1b..3683f5e96f 100644 --- a/lib/assets/javascripts/cartodb/common/views/support_banner.jst.ejs +++ b/lib/assets/javascripts/cartodb/common/views/support_banner.jst.ejs @@ -34,7 +34,7 @@ Contact administrator - <% } else if (userType === 'client' || userType === 'internal') { %> + <% } else if (userType === 'client' || userType === 'internal') { %> Contact us diff --git a/lib/assets/javascripts/cartodb/dashboard/datasets/remote_datasets_item.js b/lib/assets/javascripts/cartodb/dashboard/datasets/remote_datasets_item.js index 01345de06b..55e655b83b 100644 --- a/lib/assets/javascripts/cartodb/dashboard/datasets/remote_datasets_item.js +++ b/lib/assets/javascripts/cartodb/dashboard/datasets/remote_datasets_item.js @@ -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', diff --git a/lib/assets/javascripts/cartodb/dashboard/router.js b/lib/assets/javascripts/cartodb/dashboard/router.js index d48c7723b8..f407c100ef 100644 --- a/lib/assets/javascripts/cartodb/dashboard/router.js +++ b/lib/assets/javascripts/cartodb/dashboard/router.js @@ -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(); }, /** diff --git a/lib/assets/javascripts/cartodb/dashboard/views/content_no_results.jst.ejs b/lib/assets/javascripts/cartodb/dashboard/views/content_no_results.jst.ejs index 67ca8e7384..e5057e19bd 100644 --- a/lib/assets/javascripts/cartodb/dashboard/views/content_no_results.jst.ejs +++ b/lib/assets/javascripts/cartodb/dashboard/views/content_no_results.jst.ejs @@ -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 @@ <% } %>

    - <% if (page > 1 || totalItems === 0 && totalEntries > 0) { %> + <% if (page > 1 || totalItems === 0 && totalEntries > 0) { %> Back to your first page <% } %> - <% if (isSearching && totalItems === 0 && totalEntries === 0) { %> + <% if (isSearching && totalItems === 0 && totalEntries === 0) { %> Back to your <%- type %> <% } %> - <% if (!liked && !isSearching && totalItems === 0 && totalEntries === 0) { %> + <% if (!liked && !isSearching && totalItems === 0 && totalEntries === 0) { %> No <%- type %>, no fun <% } %> diff --git a/lib/assets/javascripts/cartodb/dashboard/views/datasets_item.jst.ejs b/lib/assets/javascripts/cartodb/dashboard/views/datasets_item.jst.ejs index 10c22d9641..85c2602161 100644 --- a/lib/assets/javascripts/cartodb/dashboard/views/datasets_item.jst.ejs +++ b/lib/assets/javascripts/cartodb/dashboard/views/datasets_item.jst.ejs @@ -51,7 +51,7 @@ <%- timeDiff %> <% if (!isOwner) { %> by - + <% } %> diff --git a/lib/assets/javascripts/cartodb/dashboard/views/maps_item.jst.ejs b/lib/assets/javascripts/cartodb/dashboard/views/maps_item.jst.ejs index 7a42363a7d..fe2f80ade7 100644 --- a/lib/assets/javascripts/cartodb/dashboard/views/maps_item.jst.ejs +++ b/lib/assets/javascripts/cartodb/dashboard/views/maps_item.jst.ejs @@ -31,7 +31,7 @@ <%- timeDiff %> <% if (!isOwner) { %>by<% } %> <% if (!isOwner) { %> - + <% } %> diff --git a/lib/assets/javascripts/cartodb/data_library/content/list/dataset_item_template.jst.ejs b/lib/assets/javascripts/cartodb/data_library/content/list/dataset_item_template.jst.ejs index e5f29a1f1b..f3348d4117 100644 --- a/lib/assets/javascripts/cartodb/data_library/content/list/dataset_item_template.jst.ejs +++ b/lib/assets/javascripts/cartodb/data_library/content/list/dataset_item_template.jst.ejs @@ -11,7 +11,7 @@

    - <% if (vis.display_name == "" || vis.display_name == null) { %><%- vis.name %><% } else { %><%- vis.display_name %><% } %> + <% if (vis.display_name == "" || vis.display_name == null) { %><%- vis.name %><% } else { %><%- vis.display_name %><% } %>

    diff --git a/lib/assets/javascripts/cartodb/models/carto.js b/lib/assets/javascripts/cartodb/models/carto.js index 884065effe..1c0c583b0d 100644 --- a/lib/assets/javascripts/cartodb/models/carto.js +++ b/lib/assets/javascripts/cartodb/models/carto.js @@ -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 }", }); diff --git a/lib/assets/javascripts/cartodb/models/carto/category.js b/lib/assets/javascripts/cartodb/models/carto/category.js index 9803902610..18629e3020 100644 --- a/lib/assets/javascripts/cartodb/models/carto/category.js +++ b/lib/assets/javascripts/cartodb/models/carto/category.js @@ -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 diff --git a/lib/assets/javascripts/cartodb/models/synchronization.js b/lib/assets/javascripts/cartodb/models/synchronization.js index 8971aa8233..b7ad26077e 100644 --- a/lib/assets/javascripts/cartodb/models/synchronization.js +++ b/lib/assets/javascripts/cartodb/models/synchronization.js @@ -94,7 +94,7 @@ self.fetch({ error: function(m, e) { self.set({ - error_message: e.statusText || "", + error_message: e.statusText || "", state: 'failure' }); } diff --git a/lib/assets/javascripts/cartodb/models/user.js b/lib/assets/javascripts/cartodb/models/user.js index 6c3fb5aa72..3a1786ff54 100644 --- a/lib/assets/javascripts/cartodb/models/user.js +++ b/lib/assets/javascripts/cartodb/models/user.js @@ -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() { diff --git a/lib/assets/javascripts/cartodb/old_common/forms/text_custom_combo.js b/lib/assets/javascripts/cartodb/old_common/forms/text_custom_combo.js index 74b1a901be..bbfc673006 100644 --- a/lib/assets/javascripts/cartodb/old_common/forms/text_custom_combo.js +++ b/lib/assets/javascripts/cartodb/old_common/forms/text_custom_combo.js @@ -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); diff --git a/lib/assets/javascripts/cartodb/old_common/forms/widgets.js b/lib/assets/javascripts/cartodb/old_common/forms/widgets.js index 9b259dfdba..48861fa0f7 100644 --- a/lib/assets/javascripts/cartodb/old_common/forms/widgets.js +++ b/lib/assets/javascripts/cartodb/old_common/forms/widgets.js @@ -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) { diff --git a/lib/assets/javascripts/cartodb/public_table/table_router_public.js b/lib/assets/javascripts/cartodb/public_table/table_router_public.js index 88624928c4..25d03ea962 100644 --- a/lib/assets/javascripts/cartodb/public_table/table_router_public.js +++ b/lib/assets/javascripts/cartodb/public_table/table_router_public.js @@ -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); } diff --git a/lib/assets/javascripts/cartodb/table/actions_menu.js b/lib/assets/javascripts/cartodb/table/actions_menu.js index 25b3fa0178..ec84ef276e 100644 --- a/lib/assets/javascripts/cartodb/table/actions_menu.js +++ b/lib/assets/javascripts/cartodb/table/actions_menu.js @@ -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(); diff --git a/lib/assets/javascripts/cartodb/table/menu_modules/carto_editor.js b/lib/assets/javascripts/cartodb/table/menu_modules/carto_editor.js index f7197df545..2b51270231 100644 --- a/lib/assets/javascripts/cartodb/table/menu_modules/carto_editor.js +++ b/lib/assets/javascripts/cartodb/table/menu_modules/carto_editor.js @@ -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); /* diff --git a/lib/assets/javascripts/cartodb/table/menu_modules/carto_wizard.js b/lib/assets/javascripts/cartodb/table/menu_modules/carto_wizard.js index 03a0da1353..e9c897591b 100644 --- a/lib/assets/javascripts/cartodb/table/menu_modules/carto_wizard.js +++ b/lib/assets/javascripts/cartodb/table/menu_modules/carto_wizard.js @@ -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; diff --git a/lib/assets/javascripts/cartodb/table/menu_modules/infowindow/infowindow_base_pane.js b/lib/assets/javascripts/cartodb/table/menu_modules/infowindow/infowindow_base_pane.js index d730dd8828..8640d5c3cd 100644 --- a/lib/assets/javascripts/cartodb/table/menu_modules/infowindow/infowindow_base_pane.js +++ b/lib/assets/javascripts/cartodb/table/menu_modules/infowindow/infowindow_base_pane.js @@ -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: '' }); diff --git a/lib/assets/javascripts/cartodb/table/menu_modules/legend_editor.js b/lib/assets/javascripts/cartodb/table/menu_modules/legend_editor.js index aa04b1f734..42534a4019 100644 --- a/lib/assets/javascripts/cartodb/table/menu_modules/legend_editor.js +++ b/lib/assets/javascripts/cartodb/table/menu_modules/legend_editor.js @@ -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); } }) diff --git a/lib/assets/javascripts/cartodb/table/menu_modules/sql.js b/lib/assets/javascripts/cartodb/table/menu_modules/sql.js index 03aa754cd9..086587c4b8 100644 --- a/lib/assets/javascripts/cartodb/table/menu_modules/sql.js +++ b/lib/assets/javascripts/cartodb/table/menu_modules/sql.js @@ -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(); diff --git a/lib/assets/javascripts/cartodb/table/menu_modules/wizards/category_wizard.js b/lib/assets/javascripts/cartodb/table/menu_modules/wizards/category_wizard.js index f4968c4a7b..ccf6ec1a24 100644 --- a/lib/assets/javascripts/cartodb/table/menu_modules/wizards/category_wizard.js +++ b/lib/assets/javascripts/cartodb/table/menu_modules/wizards/category_wizard.js @@ -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({ diff --git a/lib/assets/javascripts/cartodb/table/table_router.js b/lib/assets/javascripts/cartodb/table/table_router.js index 36e9316b7b..117f08750b 100644 --- a/lib/assets/javascripts/cartodb/table/table_router.js +++ b/lib/assets/javascripts/cartodb/table/table_router.js @@ -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 :) diff --git a/lib/assets/javascripts/cartodb/table/watching_notifier_view.js b/lib/assets/javascripts/cartodb/table/watching_notifier_view.js index 24e5045645..3161874418 100644 --- a/lib/assets/javascripts/cartodb/table/watching_notifier_view.js +++ b/lib/assets/javascripts/cartodb/table/watching_notifier_view.js @@ -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 diff --git a/lib/assets/test/spec/cartodb/models/carto.spec.js b/lib/assets/test/spec/cartodb/models/carto.spec.js index 3c6a4e6b13..82f4d0f831 100644 --- a/lib/assets/test/spec/cartodb/models/carto.spec.js +++ b/lib/assets/test/spec/cartodb/models/carto.spec.js @@ -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); diff --git a/services/importer/Guardfile b/services/importer/Guardfile index 8ab1ff05a8..8df38a8001 100644 --- a/services/importer/Guardfile +++ b/services/importer/Guardfile @@ -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 diff --git a/services/importer/spec/regression/failing/fsq_places_uniq.csv b/services/importer/spec/regression/failing/fsq_places_uniq.csv index 39f3381c1a2fae4f3e6bf30f1cd111b066743a24..a2d8cdf064a359d356b546665833bb7204bf3314 100644 GIT binary patch delta 153 zcmX@rntiG@yP<`#g{g(Pg{6hHg{_6Xg`?Z-X}%nD>wXisz&1Y#i|76xJwAQs)8=qwh#kX?bHkfD?zbGo4ltMv2@55(A} fKX@V*gerXCsTf;()Kf7a76)R9?NLu93+@5{LgPEb delta 153 zcmX@rntiG@yP<`#g{g(Pg{6hHg{_6Xg`hGYH&-oAN$A!#N0s41H`;Q z%m>8$+mC$|m=(ylpgqx95Qv3#>>S#TEs+2cLK diff --git a/spec/requests/carto/api/grantables_controller_spec.rb b/spec/requests/carto/api/grantables_controller_spec.rb index 80fc074fe8..a7c4df6da1 100644 --- a/spec/requests/carto/api/grantables_controller_spec.rb +++ b/spec/requests/carto/api/grantables_controller_spec.rb @@ -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 diff --git a/spec/support/data/clubbing.csv b/spec/support/data/clubbing.csv index 1f6cbb92f9..f89db7d48c 100644 --- a/spec/support/data/clubbing.csv +++ b/spec/support/data/clubbing.csv @@ -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," 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.