V2.5.2

MapTour/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "StorytellingMapTour",
-	"version": "2.5.1",
+	"version": "2.5.2",
 	"devDependencies": {
 		"grunt": "~0.4.1",
 		"grunt-contrib-clean": "~0.4.0",

MapTour/src/app/maptour-config.js

@@ -141,11 +141,6 @@ APPCFG = {
 
 	// Online photo sharing services connection parameters
 	FLICKR_API_KEY: "750b36a2ac65a72e03cf9cef06d79f45",
-	// The Facebook ID is only valid on arcgis.com domain
-	// If used on another domain, user will have an error in the Facebook popup after login
-	// To use Facebook import on Portal for ArcGIS, create your own ID at https://developers.facebook.com/ 
-	// or set AUTHORIZED_IMPORT_SOURCE.facebook to false
-	FACEBOOK_APP_ID: "471023926309627",
 	// This Youtube key is valid for application running on arcgis.com and esri.com domains
 	// If the application is deployed on Portal for ArcGIS or your own server, the Youtube api call 
 	//  won't be perfomed until you set the following flag and provide your own key

MapTour/src/app/storymaps/builder/SettingsPopupTabHeader.js

@@ -217,6 +217,7 @@ define(["storymaps/utils/Helper"],
 				$(contentContainer).find('p').eq(1).html(i18n.viewer.builderHTML.settingsLogoSocialExplain);
 				$(contentContainer).find('.control-label[for=selectSocialText]').html(i18n.viewer.builderHTML.settingsLogoSocialText + ":");
 				$(contentContainer).find('.control-label[for=selectSocialLink]').html(i18n.viewer.builderHTML.settingsLogoSocialLink + ":");
+				$(contentContainer).find('.header-share-label').html(i18n.viewer.builderHTML.buttonShare);
 			};
 		};
 	}

MapTour/src/app/storymaps/core/Core.css

@@ -22,7 +22,7 @@ html, body {
 		url('../../../resources/font/OpenSans-Semibold-webfont.woff') format('woff'),
 		url('../../../resources/font/OpenSans-Semibold-webfont.ttf') format('truetype'),
 		url('../../../resources/font/OpenSans-Semibold-webfont.svg#open_sanssemibold') format('svg');
-	font-weight: normal;
+	font-weight: bold;
 	font-style: normal;
 }
 

MapTour/src/app/storymaps/core/Core.js

@@ -24,6 +24,7 @@ define(["esri/map",
 		"dojo/on",
 		"dojo/_base/lang",
 		"dojo/_base/array",
+		"dojo/_base/kernel",
 		"dojo/Deferred",
 		"dojo/DeferredList",
 		"dojo/query",
@@ -51,6 +52,7 @@ define(["esri/map",
 		on,
 		lang,
 		array,
+		kernel,
 		Deferred,
 		DeferredList,
 		query,
@@ -962,6 +964,7 @@ define(["esri/map",
 
 		function initLocalization()
 		{
+			document.documentElement.lang = kernel.locale;
 			query('#fatalError .error-title')[0].innerHTML = i18n.viewer.errors.boxTitle;
 		}
 

MapTour/src/app/storymaps/maptour/builder/BuilderView.js

@@ -376,11 +376,6 @@ define(["storymaps/maptour/core/WebApplicationData",
 						nbPicturesMax: APPCFG.MAX_ALLOWED_POINTS,
 						nbPicturesAuthorized: APPCFG.MAX_ALLOWED_POINTS
 					},
-					Facebook: {
-						appId: APPCFG.FACEBOOK_APP_ID,
-						nbPicturesMax: APPCFG.MAX_ALLOWED_POINTS,
-						nbPicturesAuthorized: APPCFG.MAX_ALLOWED_POINTS
-					},
 					Picasa: {
 						nbPicturesMax: APPCFG.MAX_ALLOWED_POINTS,
 						nbPicturesAuthorized: APPCFG.MAX_ALLOWED_POINTS
@@ -470,11 +465,6 @@ define(["storymaps/maptour/core/WebApplicationData",
 						nbPicturesMax: APPCFG.MAX_ALLOWED_POINTS,
 						nbPicturesAuthorized: nbPicturesAuthorized
 					},
-					Facebook: {
-						appId: APPCFG.FACEBOOK_APP_ID,
-						nbPicturesMax: APPCFG.MAX_ALLOWED_POINTS,
-						nbPicturesAuthorized: nbPicturesAuthorized
-					},
 					Picasa: {
 						nbPicturesMax: APPCFG.MAX_ALLOWED_POINTS,
 						nbPicturesAuthorized: nbPicturesAuthorized

MapTour/src/app/storymaps/maptour/builder/HelpPopup.js

@@ -63,6 +63,10 @@ define([],
 					+ '<li>' + i18n.viewer.helpPopup.tab2.div6 + '</li>'
 					+ '<li>' + i18n.viewer.helpPopup.tab2.div7 + '</li></ul><br />'
 					+ '<b>' + i18n.viewer.helpPopup.tab2.div8 + '</b><br />'
+					+ i18n.viewer.helpPopup.tab2.div9a.replace(
+						'${learn}',
+						'<a href="http://links.esri.com/storymaps/facebook_support" target="_blank">' + i18n.viewer.helpPopup.tab2.learn + '</a>'
+					) + ' '
 					+ i18n.viewer.helpPopup.tab2.div9 + '<br /><br />'
 					+ '<b>' + i18n.viewer.helpPopup.tab2.div10 + '</b><br />'
 					+ i18n.viewer.helpPopup.tab2.div11 + '<br /><br />'

MapTour/src/app/storymaps/maptour/builder/ImportPopup.js

@@ -1,6 +1,5 @@
 define(["storymaps/maptour/builder/ImportPopupViewHome",
 		"storymaps/maptour/builder/PopupViewFlickr",
-		"storymaps/maptour/builder/PopupViewFacebook",
 		"storymaps/maptour/builder/PopupViewPicasa",
 		"storymaps/maptour/builder/PopupViewYoutube",
 		"storymaps/maptour/builder/PopupViewCSV",
@@ -9,7 +8,6 @@ define(["storymaps/maptour/builder/ImportPopupViewHome",
 	function (
 		ImportPopupViewHome, 
 		PopupViewFlickr, 
-		PopupViewFacebook, 
 		PopupViewPicasa, 
 		PopupViewYoutube,
 		PopupViewCSV, 
@@ -21,7 +19,6 @@ define(["storymaps/maptour/builder/ImportPopupViewHome",
 			var _views = {
 				home: new ImportPopupViewHome(),
 				Flickr: new PopupViewFlickr(),
-				Facebook: new PopupViewFacebook(),
 				Picasa: new PopupViewPicasa(),
 				Youtube: new PopupViewYoutube(),
 				CSV: new PopupViewCSV(container),
@@ -51,7 +48,6 @@ define(["storymaps/maptour/builder/ImportPopupViewHome",
 				_views.home.init(footer);
 				_views.CSV.init(params.CSV, importCompleteDeferred, footer);
 				_views.Flickr.init(params.Flickr, importCompleteDeferred, footer);
-				_views.Facebook.init(params.Facebook, importCompleteDeferred, footer);
 				_views.Picasa.init(params.Picasa, importCompleteDeferred, footer);
 				_views.Youtube.init(params.Youtube, importCompleteDeferred, footer);
 				_views.geotag.init(params.geotag, importCompleteDeferred, footer);

MapTour/src/app/storymaps/maptour/builder/ImportPopupViewHome.js

@@ -7,7 +7,6 @@ define(["storymaps/maptour/core/WebApplicationData", "dojo/has"],
 			var _selectedView = null;
 
 			_container.find('.btn-select-flickr').click(function(){ select("Flickr"); });
-			_container.find('.btn-select-fb').click(function(){ select("Facebook"); });
 			_container.find('.btn-select-picasa').click(function(){ select("Picasa"); });
 			_container.find('.btn-select-youtube').click(function(){ select("Youtube"); });
 			_container.find('.btn-select-csv').click(function(){ select("CSV"); });
@@ -61,7 +60,6 @@ define(["storymaps/maptour/core/WebApplicationData", "dojo/has"],
 				);
 
 				_container.find('.btn-select-flickr img').attr('src', 'resources/icons/builder-import-flickr.png');
-				_container.find('.btn-select-fb img').attr('src', 'resources/icons/builder-import-facebook.png');
 				_container.find('.btn-select-picasa img').attr('src', 'resources/icons/builder-import-picasa.png');
 				_container.find('.btn-select-youtube img').attr('src', 'resources/icons/builder-import-youtube.png');
 				_container.find('.btn-select-csv img').attr('src', 'resources/icons/builder-import-csv.png');
@@ -70,8 +68,6 @@ define(["storymaps/maptour/core/WebApplicationData", "dojo/has"],
 
 				if (!APPCFG.AUTHORIZED_IMPORT_SOURCE.flickr)
 					_container.find('.btn-select-flickr').addClass("disabled").unbind('click');
-				if (!APPCFG.AUTHORIZED_IMPORT_SOURCE.facebook)
-					_container.find('.btn-select-fb').addClass("disabled").unbind('click');
 				if (!APPCFG.AUTHORIZED_IMPORT_SOURCE.picasa)
 					_container.find('.btn-select-picasa').addClass("disabled").unbind('click');
 				if ( disableYoutube )
@@ -87,16 +83,6 @@ define(["storymaps/maptour/core/WebApplicationData", "dojo/has"],
 					});
 				}
 
-				if (!has("touch") || !APPCFG.AUTHORIZED_IMPORT_SOURCE.facebook) {
-					_container.find('.btn-select-fb').popover({
-						trigger: 'hover',
-						placement: 'top',
-						html: true,
-						content: APPCFG.AUTHORIZED_IMPORT_SOURCE.facebook ? 'Facebook' : i18n.viewer.onlinePhotoSharingCommon.disabled,
-						container: '.popover-import'
-					});
-				}
-
 				if (!has("touch") || !APPCFG.AUTHORIZED_IMPORT_SOURCE.picasa) {
 					_container.find('.btn-select-picasa').popover({
 						trigger: 'hover',

MapTour/src/app/storymaps/maptour/builder/InitPopup.js

@@ -3,7 +3,6 @@ define(["storymaps/maptour/builder/InitPopupViewHome",
 		"storymaps/maptour/builder/InitPopupViewAdvanced",
 		"storymaps/maptour/builder/PopupViewCSV",
 		"storymaps/maptour/builder/PopupViewFlickr",
-		"storymaps/maptour/builder/PopupViewFacebook",
 		"storymaps/maptour/builder/PopupViewPicasa",
 		"storymaps/maptour/builder/PopupViewYoutube",
 		"storymaps/maptour/builder/PopupViewGeoTag",
@@ -14,7 +13,6 @@ define(["storymaps/maptour/builder/InitPopupViewHome",
 			InitPopupViewAdvanced,
 			PopupViewCSV,
 			PopupViewFlickr,
-			PopupViewFacebook,
 			PopupViewPicasa,
 			PopupViewYoutube,
 			PopupViewGeoTag,
@@ -27,7 +25,6 @@ define(["storymaps/maptour/builder/InitPopupViewHome",
 				hostedFS: new InitPopupViewHostedFSCreation($('#initPopupViewHostedFSCreation')),
 				advanced: new InitPopupViewAdvanced(),
 				Flickr: new PopupViewFlickr(),
-				Facebook: new PopupViewFacebook(),
 				Picasa: new PopupViewPicasa(),
 				CSV: new PopupViewCSV(container),
 				Youtube: new PopupViewYoutube(container),
@@ -57,7 +54,6 @@ define(["storymaps/maptour/builder/InitPopupViewHome",
 				_views.advanced.init(params.advanced, initCompleteDeferred, footer);
 				_views.CSV.init(params.CSV, initCompleteDeferred, footer);
 				_views.Flickr.init(params.Flickr, null, footer);
-				_views.Facebook.init(params.Facebook, null, footer);
 				_views.Picasa.init(params.Picasa, null, footer);
 				_views.Youtube.init(params.Youtube, null, footer);
 				_views.geotag.init(params.geotag, initCompleteDeferred, footer);

MapTour/src/app/storymaps/maptour/builder/InitPopupViewHome.js

@@ -7,7 +7,6 @@ define(["dojo/has"],
 			var _footer = null;
 
 			_container.find('.btn-select-flickr').click(function(){ select("Flickr", this); });
-			_container.find('.btn-select-fb').click(function(){ select("Facebook", this); });
 			_container.find('.btn-select-picasa').click(function(){ select("Picasa", this); });
 			_container.find('.btn-select-youtube').click(function(){ select("Youtube", this); });
 			_container.find('.btn-select-advanced').click(function(){ select("advanced", this); });
@@ -102,16 +101,13 @@ define(["dojo/has"],
 				_container.find('.footer').append("<a data-href='#' onClick='app.builder.openHelpPopup(1)'>" + i18n.viewer.initPopupHome.footer5 + "</a>");
 
 				_container.find('.btn-select-flickr img').attr('src', 'resources/icons/builder-import-flickr.png');
-				_container.find('.btn-select-fb img').attr('src', 'resources/icons/builder-import-facebook.png');
 				_container.find('.btn-select-picasa img').attr('src', 'resources/icons/builder-import-picasa.png');
 				_container.find('.btn-select-youtube img').attr('src', 'resources/icons/builder-import-youtube.png');
 				_container.find('.btn-select-advanced img').attr('src', 'resources/icons/builder-import-scratch.png');
 				_container.find('.btn-select-hostedFS img').attr('src', 'resources/icons/builder-import-arcgis.png');
 
 				if (!APPCFG.AUTHORIZED_IMPORT_SOURCE.flickr)
 					_container.find('.btn-select-flickr').addClass("disabled").unbind('click');
-				if (!APPCFG.AUTHORIZED_IMPORT_SOURCE.facebook) 
-					_container.find('.btn-select-fb').addClass("disabled").unbind('click');
 				if (!APPCFG.AUTHORIZED_IMPORT_SOURCE.picasa)
 					_container.find('.btn-select-picasa').addClass("disabled").unbind('click');
 				if (!APPCFG.AUTHORIZED_IMPORT_SOURCE.youtube) 
@@ -127,16 +123,6 @@ define(["dojo/has"],
 					});
 				}
 
-				if (!has("touch") || !APPCFG.AUTHORIZED_IMPORT_SOURCE.facebook) {
-					_container.find('.btn-select-fb').popover({
-						trigger: 'hover',
-						placement: 'top',
-						html: true,
-						content: APPCFG.AUTHORIZED_IMPORT_SOURCE.facebook ? 'Facebook' : i18n.viewer.onlinePhotoSharingCommon.disabled,
-						container: '.popover-init'
-					});
-				}
-
 				if (!has("touch") || !APPCFG.AUTHORIZED_IMPORT_SOURCE.picasa) {
 					_container.find('.btn-select-picasa').popover({
 						trigger: 'hover',