From 57de4532c14a66df49809c9945b0656e19c016d4 Mon Sep 17 00:00:00 2001 From: Gregory L'Azou Date: Mon, 29 Feb 2016 15:46:59 -0800 Subject: [PATCH] Map Journal V1.7.0 --- Gruntfile.js | 9 - README.md | 9 +- package.json | 2 +- src/app/commonConfig.js | 18 - src/app/config.js | 25 +- src/app/main-app.js | 3 +- src/app/main-config.js | 9 +- src/app/storymaps/common/Core.js | 146 +++++-- .../common/_resources/nls/ar/core.js | 26 +- .../common/_resources/nls/ar/webmap.js | 12 +- .../storymaps/common/_resources/nls/core.js | 24 +- .../common/_resources/nls/cs/core.js | 28 +- .../common/_resources/nls/cs/webmap.js | 8 +- .../common/_resources/nls/da/core.js | 24 +- .../common/_resources/nls/da/webmap.js | 12 +- .../common/_resources/nls/de/core.js | 26 +- .../common/_resources/nls/de/webmap.js | 8 +- .../common/_resources/nls/el/core.js | 24 +- .../common/_resources/nls/el/webmap.js | 8 +- .../common/_resources/nls/es/core.js | 24 +- .../common/_resources/nls/es/webmap.js | 6 +- .../common/_resources/nls/et/core.js | 28 +- .../common/_resources/nls/et/webmap.js | 4 +- .../common/_resources/nls/fi/core.js | 22 +- .../common/_resources/nls/fi/webmap.js | 8 +- .../common/_resources/nls/fr/core.js | 24 +- .../common/_resources/nls/fr/webmap.js | 4 +- .../common/_resources/nls/he/core.js | 22 +- .../common/_resources/nls/he/webmap.js | 12 +- .../common/_resources/nls/it/core.js | 22 +- .../common/_resources/nls/it/webmap.js | 6 +- .../common/_resources/nls/ja/core.js | 24 +- .../common/_resources/nls/ja/webmap.js | 4 +- .../common/_resources/nls/ko/core.js | 24 +- .../common/_resources/nls/ko/webmap.js | 4 +- .../common/_resources/nls/lt/core.js | 22 +- .../common/_resources/nls/lt/webmap.js | 6 +- .../common/_resources/nls/lv/core.js | 24 +- .../common/_resources/nls/lv/webmap.js | 4 +- .../common/_resources/nls/nb/core.js | 26 +- .../common/_resources/nls/nb/webmap.js | 10 +- .../common/_resources/nls/nl/core.js | 24 +- .../common/_resources/nls/nl/webmap.js | 10 +- .../common/_resources/nls/pl/core.js | 24 +- .../common/_resources/nls/pl/webmap.js | 6 +- .../common/_resources/nls/pt-BR/core.js | 24 +- .../common/_resources/nls/pt-BR/webmap.js | 8 +- .../common/_resources/nls/pt-PT/core.js | 24 +- .../common/_resources/nls/pt-PT/webmap.js | 10 +- .../common/_resources/nls/ro/core.js | 22 +- .../common/_resources/nls/ro/webmap.js | 12 +- .../common/_resources/nls/ru/core.js | 24 +- .../common/_resources/nls/ru/webmap.js | 8 +- .../common/_resources/nls/sv/core.js | 22 +- .../common/_resources/nls/sv/webmap.js | 8 +- .../common/_resources/nls/th/core.js | 26 +- .../common/_resources/nls/th/webmap.js | 10 +- .../common/_resources/nls/tr/core.js | 28 +- .../common/_resources/nls/tr/webmap.js | 6 +- .../common/_resources/nls/vi/core.js | 26 +- .../common/_resources/nls/vi/webmap.js | 4 +- .../storymaps/common/_resources/nls/webmap.js | 12 +- .../common/_resources/nls/zh-CN/core.js | 28 +- .../common/_resources/nls/zh-CN/webmap.js | 4 +- .../common/_resources/nls/zh-hk/core.js | 24 +- .../common/_resources/nls/zh-hk/webmap.js | 6 +- .../common/_resources/nls/zh-tw/core.js | 24 +- .../common/_resources/nls/zh-tw/webmap.js | 6 +- src/app/storymaps/common/builder/Builder.js | 60 ++- .../storymaps/common/builder/BuilderPanel.js | 89 +++- .../common/builder/SaveErrorPopupSocial.css | 49 +++ .../common/builder/SaveErrorPopupSocial.html | 52 +++ .../common/builder/SaveErrorPopupSocial.js | 83 ++++ .../storymaps/common/builder/SharePopup.css | 21 +- .../storymaps/common/builder/SharePopup.html | 2 +- .../storymaps/common/builder/SharePopup.js | 41 +- .../browse-dialog/css/browse-dialog.css | 7 + .../builder/browse-dialog/js/BrowseIdDlg.js | 2 +- .../common/builder/browse-dialog/js/Grid.js | 7 +- .../storymapsAction/dialog/Geocode.css | 10 +- .../plugins/storymapsAction/dialog/Geocode.js | 61 +-- .../common/builder/media/map/EditDialog.js | 25 +- .../builder/media/map/MapConfigOverlay.js | 50 ++- .../builder/media/map/MapViewerWrapper.js | 19 +- .../builder/media/map/WebMapSelector.js | 20 +- .../common/builder/media/webpage/ViewHome.js | 4 +- .../common/mapcontrols/command/MapCommand.css | 2 + .../common/mapcontrols/command/MapCommand.js | 2 +- .../common/mapcontrols/legend/Legend.css | 6 + .../storymaps/common/ui/autoplay/Autoplay.css | 56 +++ .../common/ui/autoplay/Autoplay.html | 9 + .../storymaps/common/ui/autoplay/Autoplay.js | 259 ++++++++++++ .../storymaps/common/ui/share/ShareDialog.css | 22 + .../common/ui/share/ShareDialog.html | 11 + .../storymaps/common/ui/share/ShareDialog.js | 22 + .../common/ui/share/ShareEmbedPanel.js | 15 +- .../common/ui/share/ShareURLPanel.js | 19 +- .../storymaps/common/utils/CommonHelper.js | 139 ++++--- .../storymaps/common/utils/HeaderHelper.js | 38 ++ .../storymaps/common/utils/SocialSharing.css | 5 + .../storymaps/common/utils/SocialSharing.js | 12 +- .../common/utils/connector/Youtube.js | 2 +- .../storymaps/tpl/builder/BuilderView.html | 1 + .../storymaps/tpl/builder/addedit/Popup.js | 12 + .../storymaps/tpl/builder/addedit/ViewText.js | 93 +++-- src/app/storymaps/tpl/core/Config.js | 7 +- src/app/storymaps/tpl/core/Data.js | 16 +- src/app/storymaps/tpl/core/MainView.js | 87 +++- .../storymaps/tpl/core/WebApplicationData.js | 19 +- src/app/storymaps/tpl/ui/MainStage.css | 19 + src/app/storymaps/tpl/ui/MainStage.js | 10 + src/app/storymaps/tpl/ui/StoryText.js | 14 +- src/app/storymaps/tpl/ui/desktop/Common.css | 32 +- .../storymaps/tpl/ui/desktop/FloatingPanel.js | 109 ++++- src/app/storymaps/tpl/ui/desktop/SidePanel.js | 92 ++++- .../tpl/ui/mobile/FloatingSwiper.css | 13 + .../storymaps/tpl/ui/mobile/FloatingSwiper.js | 23 +- .../tpl/ui/mobile/FloatingSwiperSection.html | 9 +- src/index.html | 25 +- src/lib-app/bootstrap-slider/css/slider.css | 138 +++++++ .../bootstrap-slider/js/bootstrap-slider.js | 388 ++++++++++++++++++ src/lib-app/bootstrap-slider/less/slider.less | 104 +++++ .../tpl/builder/icons/builder-help-social.png | Bin 0 -> 19430 bytes src/resources/tpl/viewer/nls/ar/template.js | 17 +- src/resources/tpl/viewer/nls/cs/template.js | 15 +- src/resources/tpl/viewer/nls/da/template.js | 15 +- src/resources/tpl/viewer/nls/de/template.js | 15 +- src/resources/tpl/viewer/nls/el/template.js | 15 +- src/resources/tpl/viewer/nls/es/template.js | 15 +- src/resources/tpl/viewer/nls/et/template.js | 15 +- src/resources/tpl/viewer/nls/fi/template.js | 15 +- src/resources/tpl/viewer/nls/fr/template.js | 15 +- src/resources/tpl/viewer/nls/he/template.js | 15 +- src/resources/tpl/viewer/nls/it/template.js | 15 +- src/resources/tpl/viewer/nls/ja/template.js | 15 +- src/resources/tpl/viewer/nls/ko/template.js | 17 +- src/resources/tpl/viewer/nls/lt/template.js | 15 +- src/resources/tpl/viewer/nls/lv/template.js | 17 +- src/resources/tpl/viewer/nls/nb/template.js | 15 +- src/resources/tpl/viewer/nls/nl/template.js | 15 +- src/resources/tpl/viewer/nls/pl/template.js | 15 +- .../tpl/viewer/nls/pt-BR/template.js | 17 +- .../tpl/viewer/nls/pt-PT/template.js | 17 +- src/resources/tpl/viewer/nls/ro/template.js | 15 +- src/resources/tpl/viewer/nls/ru/template.js | 17 +- src/resources/tpl/viewer/nls/sv/template.js | 15 +- src/resources/tpl/viewer/nls/template.js | 17 +- src/resources/tpl/viewer/nls/th/template.js | 17 +- src/resources/tpl/viewer/nls/tr/template.js | 17 +- src/resources/tpl/viewer/nls/vi/template.js | 17 +- .../tpl/viewer/nls/zh-CN/template.js | 15 +- .../tpl/viewer/nls/zh-hk/template.js | 15 +- .../tpl/viewer/nls/zh-tw/template.js | 15 +- 153 files changed, 3354 insertions(+), 729 deletions(-) delete mode 100644 src/app/commonConfig.js create mode 100644 src/app/storymaps/common/builder/SaveErrorPopupSocial.css create mode 100644 src/app/storymaps/common/builder/SaveErrorPopupSocial.html create mode 100644 src/app/storymaps/common/builder/SaveErrorPopupSocial.js create mode 100644 src/app/storymaps/common/ui/autoplay/Autoplay.css create mode 100644 src/app/storymaps/common/ui/autoplay/Autoplay.html create mode 100644 src/app/storymaps/common/ui/autoplay/Autoplay.js create mode 100644 src/lib-app/bootstrap-slider/css/slider.css create mode 100644 src/lib-app/bootstrap-slider/js/bootstrap-slider.js create mode 100644 src/lib-app/bootstrap-slider/less/slider.less create mode 100644 src/resources/tpl/builder/icons/builder-help-social.png diff --git a/Gruntfile.js b/Gruntfile.js index 43ff52ff..a22216a6 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -190,14 +190,6 @@ dest: 'deploy/' }] }, - commonConfig: { - files: [{ - expand: true, - cwd: 'src/app', - src:['commonConfig.js'], - dest: 'deploy/app' - }] - }, readme: { files: [{ expand: true, @@ -429,7 +421,6 @@ // Copy resources 'copy:config', - 'copy:commonConfig', 'copy:resources', 'copy:commonResources', diff --git a/README.md b/README.md index ce6e5d8e..16974263 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Story Map Journal is ideal when you want to combine narrative text with maps [Map Journal page on Esri Story Maps website](http://storymaps.arcgis.com/en/app-list/map-journal/) | [Download](http://links.esri.com/storymaps/map_journal_template_zip) -**Latest release is version 1.6.1**, if you want to be informed of new releases, we recommend you to watch this repository ([see GitHub help](https://help.github.com/articles/watching-repositories)). See the [release page](https://github.com/Esri/map-journal-storytelling-template-js/releases) for release notes. +**Latest release is version 1.7.0**, if you want to be informed of new releases, we recommend you to watch this repository ([see GitHub help](https://help.github.com/articles/watching-repositories)). See the [release page](https://github.com/Esri/map-journal-storytelling-template-js/releases) for release notes. ## Help content @@ -167,14 +167,14 @@ Yes. When the Journal is hosted in ArcGIS Online or Portal for ArcGIS, users that don't have access to the Journal or a webmap used in the Journal will be redirected to the ArcGIS Online sign-in page. It is not possible to display an authentication dialog in the Map Journal when the Journal is hosted in ArcGIS Online. -To use a premium layer in a public webmap, [follow that procedure](http://blogs.esri.com/esri/arcgis/2014/10/07/public-access-to-arcgis-online-premium-services/). - When the Journal is hosted on your web server, an authentication dialog will appear inside the application. Note that for that authentication to work on some older browser (Internet Explorer 9) you need to install a proxy server on your web server to make sure the login credentials can be passed securely to ArcGIS Online. For more information, see the [Using the proxy](https://developers.arcgis.com/javascript/jshelp/ags_proxy.html) in the ArcGIS API for JavaScript documentation. Because of that limitation, we recommend that you configure the application to use OAuth. OAuth 2.0 based authentication is available for ArcGIS Online and Portal for ArcGIS users with developer or organizational accounts. Follow the procedure to [add an application](http://doc.arcgis.com/en/arcgis-online/share-maps/add-items.htm#ESRI_SECTION1_55703F1EE9C845C3B07BBD85221FB074) and [register an application](http://doc.arcgis.com/en/arcgis-online/share-maps/add-items.htm#ESRI_SECTION2_20AF85308FD548B5ADBAE28836F66D3F) to get an OAuth application ID. Once you have that application, open `index.html`, locate the `configOptions` section and fill the `oAuthAppId` property. +If you are using secured services but don't want users to have to authenticate, you can use a proxy to store the username/password to be used, see [Working with Proxy Services](https://developers.arcgis.com/authentication/working-with-proxies/#selfhosted-proxy-service), and add a proxy rules to specify what services need to use the proxy by editing `PROXY_RULES` in `app/config.js`. + ### Deployment Deploying a Map Journal require to use ArcGIS Online or Portal for ArcGIS. The Journal content have to be created using the Map Journal builder and will live in a Web Application Item. @@ -242,7 +242,7 @@ Example of the same application displaying two stories: * http://myserver.com/MapJournal/index.html?appid=c7ad1a55de0247a68454a76f251225a5 ## Configuration -In addition to the configuration offered by the builder, the files `app/config.js` and `app/commonConfig.js` provide various settings. Documentation is provided in those files. +In addition to the configuration offered by the builder, the file `app/config.js` provide various additional settings. This is for example the place where you can override some settings like the list of Geocoder services to be used (changes override ArcGIS Online or your Organization default settings). See the documentation provided in that file for more details. ## Customize the look and feel @@ -404,7 +404,6 @@ The application is structured as this: | src/ | Main source code folder with index.html and the Eclipse project configuration | | src/app/ | Javascript and CSS source code | | src/app/config.js | App configuration file (loaded at execution time) | -| src/app/commonConfig.js | More configuration (only used when deployed outside of ArcGIS Online and Portal for ArcGIS) | | **src/app/storymaps/common/** | Modules common across storymaps templates (main module is Core.js) | | src/app/storymaps/common/builder/ | Builder modules (main module is Builder.js) | | src/app/storymaps/common/mapcontrols/ | Map UI components (Overview, Legend) | diff --git a/package.json b/package.json index a3ca402e..36b40047 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Storymaps-MapJournal", - "version": "1.6.1", + "version": "1.7.0", "devDependencies": { "grunt": "~0.4.1", "grunt-contrib-clean": "~0.4.0", diff --git a/src/app/commonConfig.js b/src/app/commonConfig.js deleted file mode 100644 index ffd22263..00000000 --- a/src/app/commonConfig.js +++ /dev/null @@ -1,18 +0,0 @@ -define([], - function() { - var config = { - bingMapsKey:"", - helperServices: { - geometry:{ - url: location.protocol + "//utility.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer" - }, - geocode: [{ - url: location.protocol + "//geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer", - suggest: true - }] - } - }; - commonConfig = config; - return config; - } -); \ No newline at end of file diff --git a/src/app/config.js b/src/app/config.js index 9e127c71..45be01e5 100644 --- a/src/app/config.js +++ b/src/app/config.js @@ -127,9 +127,32 @@ app.cfg = { // Portal configuration // - // Optional array of server that will leverage CORS (for developement or specific cross domain deployment) + // Optional array of servers that will leverage CORS (for development or specific cross domain deployment) CORS_SERVER: [], + // Optional array of proxy rules + PROXY_RULES: [ + /*{ + urlPrefix: "http://services.arcgis.com/", + proxyUrl: "http://myserver.domain.com/DotNet/proxy.ash" + }*/ + ], + + BING_MAPS_KEY: "", + HELPER_SERVICES: { + geometry: { + //url: location.protocol + "//utility.arcgisonline.com/ArcGIS/rest/services/Geometry/GeometryServer" + }, + geocode: [ + /* + { + url: location.protocol + "//geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer", + name: "My Geocoder" + } + */ + ] + }, + // Edit those to set a custom sharing or proxy URL // You have to edit those only if your webmap is deployed on Portal for ArcGIS instance and if you are not deploying the template on the Portal webserver // If you are using ArcGIS Online or deploying the template on a Portal instance, you don't have to edit those URL diff --git a/src/app/main-app.js b/src/app/main-app.js index c20213c5..6daf6249 100644 --- a/src/app/main-app.js +++ b/src/app/main-app.js @@ -23,8 +23,7 @@ else { require([ "storymaps/common/Core", - "storymaps/tpl/core/MainView", - "templateConfig/commonConfig.js?v=" + app.version + "storymaps/tpl/core/MainView" ], function( Core, MainView diff --git a/src/app/main-config.js b/src/app/main-config.js index aa242a1a..92d2c3a6 100644 --- a/src/app/main-config.js +++ b/src/app/main-config.js @@ -39,8 +39,7 @@ function getUrlVar(name) function defineDojoConfig() { - var path1 = location.pathname.replace(/\/[^/]+$/, '/'), - path2 = location.pathname.replace(/\/[^/]+$/, ''); + var path1 = location.pathname.replace(/\/[^/]+$/, '/'); window.dojoConfig = { parseOnLoad: true, @@ -52,12 +51,6 @@ function defineDojoConfig() name: 'storymaps', location: path1 + 'app/storymaps' }, - { - name: "templateConfig", - // If the application is deployed on a Portal (apps path contains /apps/MapJournal/ or /home/MapJournal/) - // commonConfig.js is loaded from the parent folder, otherwise it's loaded from the app folder - location: (/(\/)([a-zA-Z0-9]+(\/))*(apps\/|home\/)([a-zA-Z0-9]+\/)/).test(document.location.pathname) ? path2.substr(0,path2.lastIndexOf('/MapJournal')) : path2.replace(/\/+$/, '') + '/app' - }, { name: 'lib-app', location: path1 + 'lib-app' diff --git a/src/app/storymaps/common/Core.js b/src/app/storymaps/common/Core.js index 5dd7c2a9..080f6c0c 100644 --- a/src/app/storymaps/common/Core.js +++ b/src/app/storymaps/common/Core.js @@ -73,6 +73,8 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", console.log("common.core.Core - init", builder); _mainView = mainView; + + app.userCanEdit = false; initLocalization(); @@ -98,7 +100,8 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", proxyurl: app.indexCfg.proxyurl, sharingurl: app.indexCfg.sharingurl, username: app.indexCfg.username, - password: app.indexCfg.password + password: app.indexCfg.password, + oAuthAppId: app.indexCfg.oAuthAppId }; } @@ -205,6 +208,15 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", }); } + // Proxy rules + if ( app.cfg.PROXY_RULES && app.cfg.PROXY_RULES.length ) { + $.each(app.cfg.PROXY_RULES, function(i, rule){ + if ( rule && rule.urlPrefix && rule.proxyUrl ) { + urlUtils.addProxyRule(rule); + } + }); + } + // Set timeout depending on the application mode esriConfig.defaults.io.timeout = app.isInBuilder ? app.cfg.TIMEOUT_BUILDER_REQUEST : app.cfg.TIMEOUT_VIEWER_REQUEST; @@ -245,7 +257,8 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", if ( app.indexCfg.oAuthAppId ) { var info = new ArcGISOAuthInfo({ appId: app.indexCfg.oAuthAppId, - popup: false + popup: false, + portalUrl: 'https:' + app.indexCfg.sharingurl.split('/sharing/')[0] }); IdentityManager.registerOAuthInfos([info]); @@ -313,7 +326,9 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", redirectToExternalHelp(); else if ( _urlParams.appid && (! app.indexCfg.authorizedOwners || ! app.indexCfg.authorizedOwners[0]) ) initError("unspecifiedConfigOwner"); - else + else if ( ! app.isProduction ) + initError("invalidConfigNoAppDev"); + else initError("invalidConfigNoApp"); } @@ -354,6 +369,22 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", app.data.setWebAppItem(itemRq); app.data.getWebAppData().set(dataRq); + app.userCanEdit = app.data.userIsAppOwner(); + + // Prevent app from accessing the cookie in viewer when user is not the owner + if ( ! app.isInBuilder && ! app.userCanEdit ) { + if( ! document.__defineGetter__ ) { + Object.defineProperty(document, 'cookie', { + get: function(){ return ''; }, + set: function(){ return true; } + }); + } + else { + document.__defineGetter__("cookie", function() { return ''; }); + document.__defineSetter__("cookie", function() {} ); + } + } + if( app.indexCfg.authorizedOwners && app.indexCfg.authorizedOwners.length > 0 && app.indexCfg.authorizedOwners[0] ) { var owner = itemRq.owner, ownerFound = false; @@ -364,6 +395,17 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", if ( ! ownerFound && app.indexCfg.authorizedOwners[0] == "*" ) ownerFound = true; + if ( ! ownerFound ) { + $.each(app.indexCfg.authorizedOwners, function(i, owner){ + var test = owner.match(/^\[(.*)\]$/); + if ( test ) { + if ( itemRq.orgId == test[1] ) { + ownerFound = true; + } + } + }); + } + if ( ! ownerFound ) { initError("invalidConfigOwner"); return; @@ -384,7 +426,7 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", } // If in builder, check that user is app owner or org admin - if (app.isInBuilder && isProd() && !app.data.userIsAppOwner()) { + if (app.isInBuilder && isProd() && !app.userCanEdit) { initError("notAuthorized"); return; } @@ -428,6 +470,15 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", app.portal.signIn().then( function() { + + // If in builder, check that user is user can create/edit item + if (app.isInBuilder && ! app.data.checkUserItemPrivileges()) { + initError("notAuthorizedBuilder"); + return; + } + + app.userCanEdit = app.data.userIsAppOwner(); + definePortalConfig(); resultDeferred.resolve(); }, @@ -523,7 +574,7 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", app.builder && app.builder.appInitComplete(); // Load My Stories in builder or viewer if user is owning the story - if ( app.isInBuilder || app.data.userIsAppOwner() ) { + if ( (app.isInBuilder || app.userCanEdit) && has("ie") != 9 && ! _urlParams.preview ) { if ( has("ff") ) { $(".builderShare #my-stories-frame").remove(); } @@ -534,6 +585,13 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", MyStoriesWrapper.loadMyStories(); } + + // Update URL for hosted apps so that when shared it will have the proper metadata on social medias + if ( document.location.pathname.match(/\/apps\/[a-zA-Z]+\/$/) + && document.location.search.match(/^\?appid=/) + && (! has('ie') || has('ie') >= 10) ) { + History.replaceState({}, "", "index.html" + document.location.search + document.location.hash); + } } function displayApp() @@ -747,7 +805,8 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", { return ! app.isInBuilder && ( (! isProd() && !! CommonHelper.getAppID(isProd())) - || isProd() && app.data.userIsAppOwner()); + || isProd() && app.userCanEdit) + && ! _urlParams.preview; } // @@ -881,45 +940,29 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", if ( ! app.portal ) return; - // If geometry, geocode service or bing maps key are defined by portal, - // they override the configuration file values - - var geometryServiceURL, geocodeServices; - - // - // Config file - // - - if (commonConfig && commonConfig.CommonHelperServices) { - if (commonConfig.CommonHelperServices.geometry && commonConfig.CommonHelperServices.geometry) - geometryServiceURL = location.protocol + commonConfig.CommonHelperServices.geometry.url; - if (commonConfig.CommonHelperServices.geocode && commonConfig.CommonHelperServices.geocode.length && commonConfig.CommonHelperServices.geocode[0].url) - geocodeServices = commonConfig.CommonHelperServices.geocode; - // Deprecated syntax - else if (commonConfig.CommonHelperServices.geocode && commonConfig.CommonHelperServices.geocode && commonConfig.CommonHelperServices.geocode.url) - geocodeServices = [{ - name: "myGeocoder", - url: commonConfig.CommonHelperServices.geocode.url - }]; - } - - // - // Portal - // - - if (app.portal.helperServices) { - if (app.portal.helperServices.geometry && app.portal.helperServices.geometry.url) - geometryServiceURL = app.portal.helperServices.geometry.url; - - if (app.portal.helperServices.geocode && app.portal.helperServices.geocode.length && app.portal.helperServices.geocode[0].url ) - geocodeServices = app.portal.helperServices.geocode; + // Use geocode service from the portal if none declared in config + if (! app.cfg.HELPER_SERVICES.geocode.length && app.portal.helperServices) { + if (app.portal.helperServices.geocode && app.portal.helperServices.geocode.length && app.portal.helperServices.geocode[0].url) { + $.each(app.portal.helperServices.geocode, function (index, geocoder){ + app.cfg.HELPER_SERVICES.geocode.push(geocoder); + }); + } } + // Use geometry service from the portal if none declared in config + var geometryServiceURL; + if (app.cfg.HELPER_SERVICES.geometry && app.cfg.HELPER_SERVICES.geometry.url) { + geometryServiceURL = app.cfg.HELPER_SERVICES.geometry.url; + } + else if (app.portal.helperServices.geometry && app.portal.helperServices.geometry.url) { + geometryServiceURL = app.portal.helperServices.geometry.url; + } esriConfig.defaults.geometryService = new GeometryService(geometryServiceURL); - app.indexCfg.geocodeServices = geocodeServices; - if( app.portal.bingKey ) - commonConfig.bingMapsKey = app.portal.bingKey; + // Use bing key from the portal if none declared in config + if( ! app.cfg.BING_MAPS_KEY && app.portal.bingKey ) { + app.cfg.BING_MAPS_KEY = app.portal.bingKey; + } // Disable feature service creation as Portal for ArcGIS 10.2 doesn't support that yet if( app.portal.isPortal && app.cfg && app.cfg.AUTHORIZED_IMPORT_SOURCE ) @@ -948,10 +991,29 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", function initPopupPrepare() { + var errMsg = "notConfiguredMobile"; + cleanLoadingTimeout(); app.isInitializing = true; app.initScreenIsOpen = true; - initError("notConfiguredMobile", null, true); + + // Touch device + if ( has("touch") && CommonHelper.isMobile() ) { + // in portrait mode with enough room in landscape for builder + if ( window.innerHeight > window.innerWidth ) { + if ( window.innerHeight > 768 ) { + errMsg = "notConfiguredMobile2"; + } + } + // in landscape mode with enough room to fit builder but prepare in case of orientation change + else { + if ( window.innerWidth > 768 ) { + errMsg = "notConfiguredMobile2"; + } + } + } + + initError(errMsg, null, true); setTimeout(handleWindowResize, 50); } diff --git a/src/app/storymaps/common/_resources/nls/ar/core.js b/src/app/storymaps/common/_resources/nls/ar/core.js index 0537be88..fa8b9301 100644 --- a/src/app/storymaps/common/_resources/nls/ar/core.js +++ b/src/app/storymaps/common/_resources/nls/ar/core.js @@ -18,7 +18,8 @@ height: "الارتفاع", create: "إنشاء", yes: "نعم", - no: "لا" + no: "لا", + mystories: "قصتي" }, inlineFieldEdit: { editMe: "تحرير!" @@ -30,9 +31,10 @@ buttonShare: "مشاركة", buttonSettings: "الإعدادات", buttonHelp: "تعليمات", - buttonPreview: "عرض مباشر", + buttonPreview: "عرض القصة", tooltipFirstSave: "غير متاح حتى يتم حفظ التطبيق.", tooltipNotShared: "غير متاح حتى يتم حفظ التطبيق.", + tooltipNotShared2: "لم يتم مشاركة القصة، ويمكنك أنت فقط الوصول إليها.", noPendingChange: "لا يوجد تغيير معلق", unSavedChangePlural: "تغييرات معلقة", closeWithPendingChange: "هل أنت متأكد من تأكيد هذا الإجراء؟ سيتم فقدان التغييرات.", @@ -52,10 +54,21 @@ err1Div2: "يرجى تعديل عنوان القصة ثم حفظه.", btnOk: "تحرير عنوان القصة" }, + saveErrorSocial: { + title: "تحديث مشاركة في مواقع التواصل الاجتماعي", + panel1: "تم تحسين مظهر القصة’s على المواقع التواصل الاجتماعي، ولكن لا يكون عنوان عنصر تطبيق ArcGIS على الويب هو نفسه عنوان القصة.", + panel1tooltip: "وبتعريف العنوان والملخص والصورة المصغرة، ستظهر القصر كما يلي:", + panel2: "ما هو العنوان الذي تريد استخدامه في مواقع التواصل الاجتماعي:", + panel2q1: "عنوان القصة (مُوصَى به)", + panel2q1tooltip: "بتحديد هذا الخيار، سيتم تعديل عنوان العنصر ليطابق عنوان القصة، وسيتم تزامن مزيد من التغييرات في المُنشئ.", + panel2q2: "عنوان العنصر", + panel3: "لتحسين مظهر القصة بشكل أكبر في مواقع التواصل الاجتماعي، استخدم ${MYSTORIES} لإضافة ملخص وصورة مصغرة.", + panel4: "لا تحذرني مجددًا بشأن هذه القصة" + }, share: { shareTitle: "مشاركة القصة", preview: "معاينة", - viewlive: "عرض مباشر", + viewlive: "عرض القصة", btnPrivate: "خاص", btnPrivateTooltip: "يمكنك رؤية القصة فقط", btnOrg: "مؤسسة", @@ -74,17 +87,18 @@ notavailable2: "عذرًا، مشاركة القصة من \"المنشئ\" غير مدعومة في هذا الإصدار من Portal for ArcGIS (يتطلب الإصدار 10.4 أو أحدث).", notavailable3: "يمكنك مشاركة هذه القصة من %LINK%.", notavailable4: "قصتي", - notavailable5: "عنصر صفحة", + notavailable5: "صفحة العنصر", notavailable6: "عذرًا، هذه الميزة غير مدعومة بالكامل في وضع التطوير. واستنادًا إلى سيناريو النشر، قد يتم دعم هذه الميزة عند النشر.", notavailable7: "تأكد من زيارة %MYCONTENT% للتأكيد على مشاركة الخرائط والطبقات المستخدمة في القصة.", - notavailable8: "الخاص" + notavailable8: "الخاص", + mystoriesinvite2: "لتحسين مظهر القصة بشكل أكبر في شبكات التواصل الاجتماعي، استخدم ${MYSTORIES} لإضافة ملخص وصورة مصغرة." }, settings: { header: "الإعدادات", tabError: "الرجاء التحقق من جميع علامات التبويب لاكتشاف الأخطاء" }, settingsLayout: { - title: "المخطط", + title: "تخطيط", explain: "أي التخطيطات الطباعية تريد استخدامها؟", explainInit: "يمكن تغيير التخطيط الطباعي في أي وقت من مربع حوار الإعدادات.", viewExample: "عرض مثال حي" diff --git a/src/app/storymaps/common/_resources/nls/ar/webmap.js b/src/app/storymaps/common/_resources/nls/ar/webmap.js index fdbc8ea9..7c703084 100644 --- a/src/app/storymaps/common/_resources/nls/ar/webmap.js +++ b/src/app/storymaps/common/_resources/nls/ar/webmap.js @@ -5,10 +5,12 @@ lblWebMap: "خريطة", lblLocation: "الموقع", lblContent: "المحتوى", - lblPopup: "القائمة المنبثقة", + lblPopup: "العنصر المنبثق", lblControls: "التطبيقات الإضافية", lblOverview: "خريطة النظرة العامة", lblLegend: "مفتاح الخريطة", + lblGeocoder: "الباحث عن العنوان أو المكان", + tooltipGeocoder: "السماح للمستخدمين بالعثور على العناوين والأماكن على الخريطة.", loadingTitle: "تحميل العنوان", entry: "إدخال", entries: "إدخالات", @@ -28,7 +30,7 @@ customCfg: "التكوين المخصص", tooltipLocation: "تعريف الموقع الذي ستعرضه هذه الخريطة.", tooltipContent: "تعريف الطبقات المرئية.", - tooltipPopup: "اختيار عناصر منبثق سيتم فتحه عند عرض هذه الخريطة.", + tooltipPopup: "اختر عنصرًا منبثقًا سيُفتح عند عرض الخريطة.", tooltipOverview: "عرض خريطة نظرة عامة صغيرة مع الخريطة الأساسية", tooltipLegend: "عرض وسيلة إيضاح الخريطة على الخريطة وتكون مفيدة عند حصول الخريطة على العديد من الطبقات والرموز.", mapCfgInvite: "استخدم عناصر التحكم الحالية لتكوين الخريطة", @@ -45,9 +47,9 @@ extentTitle: "موقع الخريطة", extentExplain: "تحريك الخريطة وتكبيرها لتحديد كيفية ظهورها للقراء.", extentSave: "حفظ موقع الخريطة", - popupTitle: "العناصر المنبثقة للخريطة", - popupExplain: "انقر على معلم لفتح النافذة المنبثقة التي ترغب في عرضها.", - popupSave: "حفظ تكوين العناصر المنبثقة", + popupTitle: "عنصر الخريطة المنبثق", + popupExplain: "انقر على أحد المعالم لفتح العنصر المنبثق الذي تريد عرضه.", + popupSave: "احفظ تكوين العنصر المنبثق", hintNavigation: "انتقال الخريطة مُعطل." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/core.js b/src/app/storymaps/common/_resources/nls/core.js index cf2ad3e3..097aea03 100644 --- a/src/app/storymaps/common/_resources/nls/core.js +++ b/src/app/storymaps/common/_resources/nls/core.js @@ -18,7 +18,8 @@ define({ height: "Height", create: "Create", yes: "Yes", - no: "No" + no: "No", + mystories: "My Stories" }, inlineFieldEdit: { editMe: "Edit me!" @@ -30,9 +31,10 @@ define({ buttonShare: "Share", buttonSettings: "Settings", buttonHelp: "Help", - buttonPreview: "View Live", + buttonPreview: "View story", tooltipFirstSave: "This isn't available until you save.", tooltipNotShared: "This isn't available until you share.", + tooltipNotShared2: "Your story isn't shared, only you can access it.", noPendingChange: "No pending change", unSavedChangePlural: "Pending changes", closeWithPendingChange: "Are you sure to want to confirm this action? Your changes will be lost.", @@ -52,10 +54,21 @@ define({ err1Div2: "Please modify the title of your story and then save it.", btnOk: "Edit the story title" }, + saveErrorSocial: { + title: "Social media sharing update", + panel1: "Your story’s appearance on social media has been improved, but your ArcGIS web application item title is not the same as your story title.", + panel1tooltip: "By defining a title, summary and thumbnail image, your story will look like this:", + panel2: "Which title would you like to use on social media:", + panel2q1: "Story title (recommended)", + panel2q1tooltip: "By choosing this option, your item title will be modified to match your story title and further changes in the builder will be synchronized.", + panel2q2: "Item title", + panel3: "To further improve how your story looks on social media use ${MYSTORIES} to add a summary and a thumbnail image.", + panel4: "Do not warn me again for this story" + }, share: { shareTitle: "Share your story", preview: "Preview", - viewlive: "View live", + viewlive: "View story", btnPrivate: "Private", btnPrivateTooltip: "Only you can see the story", btnOrg: "Organization", @@ -74,10 +87,11 @@ define({ notavailable2: "Sorry, sharing your story from the Builder is not supported on this version of Portal for ArcGIS (requires 10.4 or later).", notavailable3: "You can share this story from %LINK%.", notavailable4: "My Stories", - notavailable5: "it's item page", + notavailable5: "its item page", notavailable6: "Sorry, this feature is not fully supported in development mode. Depending on your deployment scenario, this feature may be supported when deployed.", notavailable7: "Make sure to visit %MYCONTENT% to confirm the maps and layers used in your story are also shared.", - notavailable8: "My Content" + notavailable8: "My Content", + mystoriesinvite2: "To improve how your story looks on social networks use ${MYSTORIES} to add a summary and a thumbnail image." }, settings: { header: "Settings", diff --git a/src/app/storymaps/common/_resources/nls/cs/core.js b/src/app/storymaps/common/_resources/nls/cs/core.js index 6f188688..241dc392 100644 --- a/src/app/storymaps/common/_resources/nls/cs/core.js +++ b/src/app/storymaps/common/_resources/nls/cs/core.js @@ -18,7 +18,8 @@ height: "Výška", create: "Vytvořit", yes: "Ano", - no: "Ne" + no: "Ne", + mystories: "Moje příběhy" }, inlineFieldEdit: { editMe: "Edituj mě!" @@ -30,9 +31,10 @@ buttonShare: "Sdílet", buttonSettings: "Nastavení", buttonHelp: "Nápověda", - buttonPreview: "Živý náhled", + buttonPreview: "Zobrazit příběh", tooltipFirstSave: "Tato funkce není k dispozici, dokud aplikaci neuložíte.", tooltipNotShared: "Tato funkce není k dispozici, dokud aplikaci nenasdílíte.", + tooltipNotShared2: "Váš příběh není sdílen, máte k němu přístup jenom vy.", noPendingChange: "Žádná neuložená změna", unSavedChangePlural: "Neuložené změny", closeWithPendingChange: "Opravdu chcete potvrdit tuto akci? Vaše změny budou ztraceny.", @@ -52,10 +54,21 @@ err1Div2: "Změňte název příběhu a poté ho uložte.", btnOk: "Změňte název příběhu" }, + saveErrorSocial: { + title: "Aktualizace sdílení na sociálních sítích", + panel1: "Vzhled vašeho příběhu na sociálních médiích byl aktualizován, název vaší položky webové aplikace ArcGIS se však neshoduje s názvem vašeho příběhu.", + panel1tooltip: "Pokud definujete název, shrnutí a náhledový obrázek, váš příběh bude vypadat následovně:", + panel2: "Název, který chcete použít na sociálních sítích:", + panel2q1: "Název příběhu (doporučeno)", + panel2q1tooltip: "Pokud zvolíte tuto možnost, název položky se změní tak, aby se shodoval s názvem příběhu, a následující změny provedené v nástroji pro tvorbu se synchronizují.", + panel2q2: "Název položky", + panel3: "Chcete-li dále vylepšit vzhled příběhu na sociálních sítích, přejděte na ${MYSTORIES} a přidejte shrnutí a náhledový obrázek.", + panel4: "Příště již neupozorňovat u tohoto příběhu" + }, share: { shareTitle: "Sdílejte svůj příběh", preview: "Náhled", - viewlive: "Živý náhled", + viewlive: "Zobrazit příběh", btnPrivate: "Soukromé", btnPrivateTooltip: "Příběh můžete vidět pouze vy", btnOrg: "Organizace", @@ -74,23 +87,24 @@ notavailable2: "Je nám líto, sdílení vašeho příběhu z nástroje pro tvorbu není podporováno v této verzi Portal for ArcGIS (vyžaduje 10.4 nebo novější).", notavailable3: "Tento příběh můžete sdílet z %LINK%.", notavailable4: "Moje příběhy", - notavailable5: "je to stránka položky", + notavailable5: "stránku položky", notavailable6: "Je nám líto, tato funkce není v režimu vývoje plně podporována. V závislosti na vašem scénáři nasazení může být tato funkce podporována při nasazení.", notavailable7: "Nezapomeňte v %MYCONTENT% ověřit, že mapy a vrstvy použité ve vašem příběhu jsou také sdílené.", - notavailable8: "Můj obsah" + notavailable8: "Můj obsah", + mystoriesinvite2: "Chcete-li vylepšit vzhled příběhu na sociálních sítích, přejděte na ${MYSTORIES} a přidejte shrnutí a náhledový obrázek." }, settings: { header: "Nastavení", tabError: "Zkontrolujte prosím, nejsou-li v záložkách chyby." }, settingsLayout: { - title: "Rozvržení stránky", + title: "Rozvržení", explain: "Jaké rozvržení chcete použít?", explainInit: "Rozvržení můžete kdykoli změnit v dialogu nastavení.", viewExample: "Zobrazit živý příklad" }, settingsTheme: { - title: "Motiv" + title: "Téma" }, settingsHeader: { title: "Záhlaví", diff --git a/src/app/storymaps/common/_resources/nls/cs/webmap.js b/src/app/storymaps/common/_resources/nls/cs/webmap.js index 6c0fe809..7fac852c 100644 --- a/src/app/storymaps/common/_resources/nls/cs/webmap.js +++ b/src/app/storymaps/common/_resources/nls/cs/webmap.js @@ -9,6 +9,8 @@ lblControls: "Doplňky", lblOverview: "Mapa přehledu", lblLegend: "Legenda", + lblGeocoder: "Vyhledávání adresy nebo místa", + tooltipGeocoder: "Umožňuje uživatelům vyhledávat adresy a místa ve vašich mapách.", loadingTitle: "Načítání nadpisu", entry: "Záznam", entries: "Záznamy", @@ -28,7 +30,7 @@ customCfg: "Vlastní konfigurace", tooltipLocation: "Určete oblast, kterou bude tato mapa zobrazovat.", tooltipContent: "Určete viditelné vrstvy.", - tooltipPopup: "Vyberte vyskakovací okno, které se zobrazí po otevření mapy.", + tooltipPopup: "Zvolte vyskakovací okno, které se otevře po zobrazení mapy.", tooltipOverview: "Zobrazí spolu s hlavní mapou malou přehledovou mapu.", tooltipLegend: "Zobrazí v mapě její legendu. Užitečné v případě, kdy mapa obsahuje velké množství vrstev a symbolů.", mapCfgInvite: "Pomocí těchto ovládacích prvků můžete konfigurovat mapu.", @@ -46,8 +48,8 @@ extentExplain: "Pomocí posunutí a přiblížení mapy můžete nastavit, jak se zobrazí čtenářům.", extentSave: "Uložit umístění mapy", popupTitle: "Vyskakovací okno mapy", - popupExplain: "Kliknutím na prvek otevřete vyskakovací okno, s informacemi, které chcete o prvku zobrazit.", - popupSave: "Uložit konfiguraci vyskakovacího okna", + popupExplain: "Kliknutím na prvek otevřete požadované vyskakovací okno.", + popupSave: "Uložit konfiguraci vyskakovacích oken", hintNavigation: "Navigace mapy je vypnuta." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/da/core.js b/src/app/storymaps/common/_resources/nls/da/core.js index ecbb3b22..a3c916cb 100644 --- a/src/app/storymaps/common/_resources/nls/da/core.js +++ b/src/app/storymaps/common/_resources/nls/da/core.js @@ -18,7 +18,8 @@ height: "Højde", create: "Opret", yes: "Ja", - no: "Nej" + no: "Nej", + mystories: "Mine historier" }, inlineFieldEdit: { editMe: "Redigér mig!" @@ -30,9 +31,10 @@ buttonShare: "Del", buttonSettings: "Indstillinger", buttonHelp: "Hjælp", - buttonPreview: "Vis Live", + buttonPreview: "Vis historie", tooltipFirstSave: "Er ikke tilgængelig, før du har gemt.", tooltipNotShared: "Er ikke tilgængelig, før du har delt.", + tooltipNotShared2: "Din historie er ikke delt. Kun du kan få adgang til den.", noPendingChange: "Ingen ventende ændringer", unSavedChangePlural: "Ventende ændringer", closeWithPendingChange: "Er du sikker på, at du vil bekræfte denne handling? Dine ændringer vil gå tabt.", @@ -52,10 +54,21 @@ err1Div2: "Redigér titlen på din historie, og gem den.", btnOk: "Redigér historiens titel" }, + saveErrorSocial: { + title: "Opdatering af deling på sociale medier", + panel1: "Visningen af din historie på de sociale medier er blevet forbedret, men din ArcGIS-webapplikations elementtitel er ikke identisk med din historietitel.", + panel1tooltip: "Ved at definere en titel, et resumé og et miniaturebillede kan din historie komme til at se sådan ud:", + panel2: "Hvilken titel vil du gerne bruge på de sociale medier:", + panel2q1: "Historietitel (anbefales)", + panel2q1tooltip: "Når du vælger denne indstilling, vil din elementtitel blive ændret, så den matcher din historietitel, og yderligere ændringer i builder-programmet vil blive synkroniserede.", + panel2q2: "Elementtitel", + panel3: "Hvis du vil forbedre visningen af din historie på de sociale medier yderligere, kan du bruge ${MYSTORIES} til at tilføje et resumé og et miniaturebillede.", + panel4: "Giv mig ikke igen besked om denne historie" + }, share: { shareTitle: "Del din historie", preview: "Eksempel", - viewlive: "Vis live", + viewlive: "Vis historie", btnPrivate: "Privat", btnPrivateTooltip: "Kun du kan se historien", btnOrg: "Organisation", @@ -74,10 +87,11 @@ notavailable2: "Beklager, men deling af din historie via builder-programmet understøttes ikke på denne version af Portal for ArcGIS (kræver version 10.4 eller nyere).", notavailable3: "Du kan dele denne historie via %LINK%.", notavailable4: "Mine historier", - notavailable5: "det er elementsiden", + notavailable5: "Dens elementside", notavailable6: "Beklager, men denne funktion understøttes ikke fuldt ud i udviklertilstand. Afhængigt af dit installationsscenarie understøttes denne funktion muligvis, når den installeres.", notavailable7: "Sørg for at besøge %MYCONTENT% for at få bekræftet, om de kort og lag, der benyttes i din historie, også deles.", - notavailable8: "Mit indhold" + notavailable8: "Mit indhold", + mystoriesinvite2: "Hvis du vil forbedre visningen af din historie på de sociale medier, kan du bruge ${MYSTORIES} til at tilføje et resumé og et miniaturebillede." }, settings: { header: "Indstillinger", diff --git a/src/app/storymaps/common/_resources/nls/da/webmap.js b/src/app/storymaps/common/_resources/nls/da/webmap.js index 781d4f88..bea15d60 100644 --- a/src/app/storymaps/common/_resources/nls/da/webmap.js +++ b/src/app/storymaps/common/_resources/nls/da/webmap.js @@ -5,10 +5,12 @@ lblWebMap: "Kort", lblLocation: "Position", lblContent: "Indhold", - lblPopup: "Pop-up", + lblPopup: "Pop-up-vindue", lblControls: "Ekstra", lblOverview: "Oversigtskort", lblLegend: "Signaturforklaring", + lblGeocoder: "Adresse eller stedsøgning", + tooltipGeocoder: "Tillad dine brugere at finde adresser og steder på dine kort.", loadingTitle: "Indlæser titel", entry: "Post", entries: "Poster", @@ -28,7 +30,7 @@ customCfg: "Tilpasset konfiguration", tooltipLocation: "Definér den position, som kortet skal vise.", tooltipContent: "Definér synlige lag.", - tooltipPopup: "Vælg en pop-up, der skal åbnes, når kortet bliver vist.", + tooltipPopup: "Vælg et pop-up-vindue, der åbnes, når kortet bliver vist.", tooltipOverview: "Få vist et lille oversigtskort sammen med hovedkortet.", tooltipLegend: "Få vist signaturforklaringen på kortet. Dette er nyttigt, når kortet har mange lag og symboler.", mapCfgInvite: "Brug disse knapper til at konfigurere kortet", @@ -45,9 +47,9 @@ extentTitle: "Kortposition", extentExplain: "Panorér og zoom kortet for at definere, hvordan det skal vises for læserne.", extentSave: "Gem kortposition", - popupTitle: "Kort-pop-up", - popupExplain: "Klik på et objekt for at åbne den pop-up, du vil have vist", - popupSave: "Gem pop-up-konfiguration", + popupTitle: "Kort-pop-up-vindue", + popupExplain: "Klik på et objekt for at åbne det pop-up-vindue, du vil have vist", + popupSave: "Gem pop-up-konfigurationen", hintNavigation: "Kortnavigation er deaktiveret." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/de/core.js b/src/app/storymaps/common/_resources/nls/de/core.js index 7a40afd9..573d2bb3 100644 --- a/src/app/storymaps/common/_resources/nls/de/core.js +++ b/src/app/storymaps/common/_resources/nls/de/core.js @@ -18,7 +18,8 @@ height: "Höhe", create: "Erstellen", yes: "Ja", - no: "Nein" + no: "Nein", + mystories: "My Stories" }, inlineFieldEdit: { editMe: "Bearbeiten!" @@ -30,9 +31,10 @@ buttonShare: "Freigeben", buttonSettings: "Einstellungen", buttonHelp: "Hilfe", - buttonPreview: "Live anzeigen", + buttonPreview: "Story anzeigen", tooltipFirstSave: "Dies ist erst nach dem Speichern verfügbar.", tooltipNotShared: "Dies ist erst nach dem Freigeben verfügbar.", + tooltipNotShared2: "Ihre Story ist nicht freigegeben, nur Sie können auf sie zugreifen.", noPendingChange: "Keine ausstehende Änderung", unSavedChangePlural: "Ausstehende Änderungen", closeWithPendingChange: "Möchten Sie die Aktion wirklich bestätigen? Ihre Änderungen gehen dabei verloren.", @@ -52,10 +54,21 @@ err1Div2: "Ändern Sie den Titel Ihrer Story, und speichern Sie sie anschließend.", btnOk: "Den Titel der Story bearbeiten" }, + saveErrorSocial: { + title: "Freigabeaktualisierung für Social Media", + panel1: "Das Aussehen Ihrer Story in den Social Media wurde verbessert, der Titel Ihres ArcGIS-Webanwendungselements stimmt aber nicht mit dem Titel der Story überein.", + panel1tooltip: "Wenn Sie einen Titel, eine Zusammenfassung und eine Miniaturansicht definieren, sieht Ihre Story wie folgt aus:", + panel2: "Welchen Titel möchten Sie in den Social Media verwenden?", + panel2q1: "Titel der Story (empfohlen)", + panel2q1tooltip: "Wenn Sie diese Option wählen, wird der Elementtitel in den Titel Ihrer Story geändert und alle weitere Änderungen im Builder werden synchronisiert.", + panel2q2: "Elementtitel", + panel3: "Wenn Sie das Aussehen Ihrer Story in den Social Media zusätzlich verbessern möchten, fügen Sie mithilfe von ${MYSTORIES} eine Zusammenfassung und eine Miniaturansicht hinzu.", + panel4: "Für diese Story keine Warnmeldung mehr anzeigen" + }, share: { shareTitle: "Story freigeben", preview: "Vorschau", - viewlive: "Live anzeigen", + viewlive: "Story anzeigen", btnPrivate: "Privat", btnPrivateTooltip: "Nur Sie können die Story sehen", btnOrg: "Organisation", @@ -77,7 +90,8 @@ notavailable5: "die Elementseite", notavailable6: "Dieses Feature wird im Entwicklungsmodus leider nicht vollständig unterstützt. Je nach Entwicklungsszenario wird es möglicherweise nach der Bereitstellung unterstützt.", notavailable7: "Besuchen Sie %MYCONTENT%, um sicherzustellen, dass die Karten und Layer, die Sie in Ihrer Story verwenden, ebenfalls freigegeben sind.", - notavailable8: "Eigene Inhalte" + notavailable8: "Eigene Inhalte", + mystoriesinvite2: "Wenn Sie das Aussehen Ihrer Story in den sozialen Netzwerken verbessern möchten, fügen Sie mithilfe von ${MYSTORIES} eine Zusammenfassung und eine Miniaturansicht hinzu." }, settings: { header: "Einstellungen", @@ -90,7 +104,7 @@ viewExample: "Live-Beispiel anzeigen" }, settingsTheme: { - title: "Design" + title: "Thema" }, settingsHeader: { title: "Kopfzeile", @@ -105,7 +119,7 @@ lblSmallHeader: "Kompakte Überschrift verwenden (keinen Untertitel)" }, header: { - title: "Den Titel für %TPL_NAME% bearbeiten", + title: "Bearbeiten Sie den Titel von %TPL_NAME%", subtitle: "Den Untertitel für %TPL_NAME% bearbeiten" } } diff --git a/src/app/storymaps/common/_resources/nls/de/webmap.js b/src/app/storymaps/common/_resources/nls/de/webmap.js index 169a893b..25dcc7fe 100644 --- a/src/app/storymaps/common/_resources/nls/de/webmap.js +++ b/src/app/storymaps/common/_resources/nls/de/webmap.js @@ -9,6 +9,8 @@ lblControls: "Extras", lblOverview: "Übersichtskarte", lblLegend: "Legende", + lblGeocoder: "Adress- oder Ortssuche", + tooltipGeocoder: "Ermöglichen Sie Benutzern das Suchen von Adressen und Orten auf Ihren Karten.", loadingTitle: "Titel wird geladen", entry: "Eintrag", entries: "Einträge", @@ -28,7 +30,7 @@ customCfg: "Benutzerdefinierte Konfiguration", tooltipLocation: "Die Position definieren, die diese Karte anzeigt.", tooltipContent: "Die sichtbaren Layer definieren.", - tooltipPopup: "Ein Pop-up auswählen, das geöffnet werden soll, wenn diese Karte angezeigt wird.", + tooltipPopup: "Wählen Sie ein Pop-up, das sich öffnet, wenn diese Karte angezeigt wird.", tooltipOverview: "Eine kleine Übersichtskarte mit der Hauptkarte anzeigen.", tooltipLegend: "Die Kartenlegende auf der Karte anzeigen. Dies ist hilfreich, wenn die Karte mehrere Layer und Symbole aufweist.", mapCfgInvite: "Konfigurieren Sie die Karte mit diesen Steuerelementen", @@ -45,8 +47,8 @@ extentTitle: "Kartenposition", extentExplain: "Die Karten schwenken und zoomen, um zu definieren, wie Sie Lesern angezeigt wird.", extentSave: "Kartenposition speichern", - popupTitle: "Karten-Pop-up", - popupExplain: "Klicken Sie auf ein Feature, um das Pop-up zu öffnen, das Sie anzeigen möchten.", + popupTitle: "Pop-up der Karte", + popupExplain: "Klicken Sie auf ein Feature, um das gewünschte Pop-up anzuzeigen.", popupSave: "Pop-up-Konfiguration speichern", hintNavigation: "Kartennavigation ist deaktiviert." }, diff --git a/src/app/storymaps/common/_resources/nls/el/core.js b/src/app/storymaps/common/_resources/nls/el/core.js index 037bf7d5..01b15b6e 100644 --- a/src/app/storymaps/common/_resources/nls/el/core.js +++ b/src/app/storymaps/common/_resources/nls/el/core.js @@ -18,7 +18,8 @@ height: "Ύψος", create: "Δημιουργία", yes: "Ναι", - no: "Όχι" + no: "Όχι", + mystories: "Οι αφηγήσεις μου" }, inlineFieldEdit: { editMe: "Επεξεργαστείτε!" @@ -30,9 +31,10 @@ buttonShare: "Κοινοποίηση", buttonSettings: "Ρυθμίσεις", buttonHelp: "Βοήθεια", - buttonPreview: "Προβολή σε πραγματικό χρόνο", + buttonPreview: "Προβολή αφήγησης", tooltipFirstSave: "Αυτή η ενέργεια δεν είναι διαθέσιμη πριν αποθηκεύσετε.", tooltipNotShared: "Αυτή η ενέργεια δεν είναι διαθέσιμη πριν κοινοποιήσετε.", + tooltipNotShared2: "Η αφήγησή σας δεν κοινοποιήθηκε. Μόνο εσείς μπορείτε να την δείτε.", noPendingChange: "Δεν υπάρχει εκκρεμής αλλαγή", unSavedChangePlural: "Εκκρεμείς αλλαγές", closeWithPendingChange: "Είστε βέβαιοι ότι θέλετε να επιβεβαιώσετε αυτή την ενέργεια; Οι αλλαγές σας θα χαθούν.", @@ -52,10 +54,21 @@ err1Div2: "Τροποποιήστε τον τίτλο της αφήγησής σας και στη συνέχεια αποθηκεύστε την.", btnOk: "Επεξεργασία του τίτλου αφήγησης" }, + saveErrorSocial: { + title: "Ενημέρωση κοινοποίησης στα μέσα κοινωνικής δικτύωσης", + panel1: "Η εμφάνιση της αφήγησής’ σας στα μέσα κοινωνικής δικτύωσης βελτιώθηκε, αλλά ο τίτλος αντικειμένου της διαδικτυακής εφαρμογής ArcGIS δεν είναι ίδιος με τον τίτλο της αφήγησης.", + panel1tooltip: "Με τον ορισμό ενός τίτλου, μιας σύνοψης και μιας εικόνας μικρογραφίας, η αφήγησή σας θα έχει την ακόλουθη μορφή:", + panel2: "Ποιος τίτλος θέλετε να χρησιμοποιηθεί στα μέσα κοινωνικής δικτύωσης:", + panel2q1: "Τίτλος αφήγησης (προτείνεται)", + panel2q1tooltip: "Με αυτήν την επιλογή, ο τίτλος αντικειμένου θα τροποποιηθεί ώστε να συμφωνεί με τον τίτλο της αφήγησης και θα συγχρονιστούν τυχόν περαιτέρω αλλαγές στο Εργαλείο δημιουργίας.", + panel2q2: "Τίτλος αντικειμένου", + panel3: "Για την περαιτέρω βελτίωση της εμφάνισης της αφήγησής σας στα μέσα κοινωνικής δικτύωσης χρησιμοποιήστε το ${MYSTORIES} για την προσθήκη μιας σύνοψης και μιας εικόνας μικρογραφίας.", + panel4: "Να μην προειδοποιηθώ ξανά για αυτήν την αφήγηση" + }, share: { shareTitle: "Κοινοποιήστε την αφήγησή σας", preview: "Προεπισκόπηση", - viewlive: "Προβολή σε πραγματικό χρόνο", + viewlive: "Προβολή αφήγησης", btnPrivate: "Ιδιωτική", btnPrivateTooltip: "Μόνο εσείς μπορείτε να δείτε την αφήγηση", btnOrg: "Στον Οργανισμό", @@ -74,10 +87,11 @@ notavailable2: "Δυστυχώς, η κοινοποίηση της αφήγησής σας από το Εργαλείο δημιουργίας δεν υποστηρίζεται σε αυτή την έκδοση του Portal for ArcGIS (απαιτείται έκδοση 10.4 ή νεότερη).", notavailable3: "Μόνο εσείς μπορείτε να κοινοποιήσετε την αφήγηση από το %LINK%.", notavailable4: "Οι αφηγήσεις μου", - notavailable5: "είναι σελίδα αντικειμένων", + notavailable5: "σελίδα αντικειμένων", notavailable6: "Δυστυχώς, αυτό το στοιχείο δεν υποστηρίζεται πλήρως σε λειτουργία προγραμματισμού. Ανάλογα με το σενάριο ανάπτυξης, αυτό το στοιχείο μπορεί να υποστηρίζεται μετά την ανάπτυξή του.", notavailable7: "Μην ξεχάσετε να επισκεφθείτε το %MYCONTENT% για να βεβαιωθείτε ότι οι χάρτες και τα επίπεδα που χρησιμοποιούνται στην αφήγησή σας έχουν επίσης κοινοποιηθεί.", - notavailable8: "Περιεχόμενo" + notavailable8: "Περιεχόμενo", + mystoriesinvite2: "Για τη βελτίωση της εμφάνισης της αφήγησής σας στα κοινωνικά δίκτυα χρησιμοποιήστε το ${MYSTORIES} για την προσθήκη μιας σύνοψης και μιας εικόνας μικρογραφίας." }, settings: { header: "Ρυθμίσεις", diff --git a/src/app/storymaps/common/_resources/nls/el/webmap.js b/src/app/storymaps/common/_resources/nls/el/webmap.js index f8a279e7..504722b9 100644 --- a/src/app/storymaps/common/_resources/nls/el/webmap.js +++ b/src/app/storymaps/common/_resources/nls/el/webmap.js @@ -9,6 +9,8 @@ lblControls: "Πρόσθετα", lblOverview: "Χάρτης αναφοράς", lblLegend: "Υπόμνημα", + lblGeocoder: "Εύρεση διεύθυνσης ή μέρους", + tooltipGeocoder: "Επιτρέπει στους χρήστες να βρίσκουν διευθύνσεις και μέρη στους χάρτες σας.", loadingTitle: "Φόρτωση τίτλου", entry: "Καταχώριση", entries: "Καταχωρίσεις", @@ -28,7 +30,7 @@ customCfg: "Προσαρμοσμένη διαμόρφωση", tooltipLocation: "Ορίστε την τοποθεσία που θα εμφανίζει αυτός ο χάρτης.", tooltipContent: "Ορίστε τα ορατά θεματικά επίπεδα.", - tooltipPopup: "Επιλέξτε ένα αναδυόμενο παράθυρο που θα ανοίγει όταν εμφανίζεται αυτός ο χάρτης.", + tooltipPopup: "Επιλέξτε ένα αναδυόμενο παράθυρο το οποίο θα ανοίγει όταν προβάλλεται αυτός ο χάρτης.", tooltipOverview: "Εμφανίστε έναν μικρό χάρτη αναφοράς μαζί με τον κύριο χάρτη.", tooltipLegend: "Εμφανίστε το υπόμνημα χάρτη πάνω στο χάρτη (χρήσιμο όταν ο χάρτης έχει πολλά θεματικά επίπεδα και σύμβολα).", mapCfgInvite: "Χρησιμοποιήστε αυτά τα στοιχεία ελέγχου για να διαμορφώσετε το χάρτη σας", @@ -46,8 +48,8 @@ extentExplain: "Μετατοπίστε το χάρτη και εστιάστε για να ορίσετε πώς θα φαίνεται για τους αναγνώστες σας.", extentSave: "Αποθήκευση τοποθεσίας χάρτη", popupTitle: "Αναδυόμενο παράθυρο χάρτη", - popupExplain: "Κάντε κλικ σε ένα στοιχείο για να ανοίξετε το αναδυόμενο παράθυρο που θέλετε να εμφανίζεται.", - popupSave: "Αποθήκευση της διαμόρφωσης του αναδυόμενου παραθύρου", + popupExplain: "Κάντε κλικ σε ένα στοιχείο για το άνοιγμα του αναδυόμενου παραθύρου που θέλετε να εμφανιστεί.", + popupSave: "Αποθήκευση διαμόρφωσης αναδυόμενων παραθύρων", hintNavigation: "Η πλοήγηση χάρτη είναι απενεργοποιημένη." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/es/core.js b/src/app/storymaps/common/_resources/nls/es/core.js index e19a5c99..eafa008e 100644 --- a/src/app/storymaps/common/_resources/nls/es/core.js +++ b/src/app/storymaps/common/_resources/nls/es/core.js @@ -18,7 +18,8 @@ height: "Altura", create: "Crear", yes: "Sí", - no: "No" + no: "No", + mystories: "Mis historias" }, inlineFieldEdit: { editMe: "¡Edítame!" @@ -30,9 +31,10 @@ buttonShare: "Compartir", buttonSettings: "Configuración", buttonHelp: "Ayuda", - buttonPreview: "Ver en directo", + buttonPreview: "Ver historia", tooltipFirstSave: "Esto no está disponible hasta que guardes.", tooltipNotShared: "Esto no está disponible hasta que compartas.", + tooltipNotShared2: "Tu historia no se ha compartido, solo tú puedes acceder a ella.", noPendingChange: "Sin cambios pendientes", unSavedChangePlural: "Cambios pendientes", closeWithPendingChange: "¿Estás seguro de que deseas confirmar esta acción? Los cambios se perderán.", @@ -52,10 +54,21 @@ err1Div2: "Modifica el título de tu historia y, a continuación, guárdala.", btnOk: "Editar título de la historia" }, + saveErrorSocial: { + title: "Actualización de uso compartido de redes sociales", + panel1: "La apariencia de tu historia en las redes sociales ha mejorado, pero el título del elemento de tu aplicación web en ArcGIS no coincide con el título de tu historia.", + panel1tooltip: "Al definir un título, un resumen y una imagen de la vista en miniatura, tu historia tendrá este aspecto:", + panel2: "Indica el título que deseas utilizar en las redes sociales:", + panel2q1: "Título de la historia (recomendado)", + panel2q1tooltip: "Si eliges esta opción, el título de tu elemento se modificará para que coincida con el título de la historia. Todos los cambios que se realicen en el builder se sincronizarán.", + panel2q2: "Título del elemento", + panel3: "Para mejorar aún más la apariencia de tu historia en las redes sociales, utiliza ${MYSTORIES} para agregar un resumen y una imagen de la vista en miniatura.", + panel4: "No volver a advertirme sobre esta historia" + }, share: { shareTitle: "Compartir tu historia", preview: "Vista previa", - viewlive: "Ver en directo", + viewlive: "Ver historia", btnPrivate: "Privado", btnPrivateTooltip: "Solo tú podrás ver la historia", btnOrg: "Organización", @@ -74,10 +87,11 @@ notavailable2: "Lo sentimos, no es posible compartir tu historia desde Builder en esta versión de Portal for ArcGIS (requiere la versión 10.4 o posterior).", notavailable3: "Puedes compartir esta historia desde %LINK%.", notavailable4: "Mis historias", - notavailable5: "es una página de elementos", + notavailable5: "su página de elementos", notavailable6: "Lo sentimos, esta entidad no es totalmente compatible en modo de desarrollo. Según tu escenario de implementación, es posible que la entidad sea compatible al implementarla.", notavailable7: "Asegúrate de visitar %MYCONTENT% para confirmar que los mapas y capas empleados en tu historia se han compartido también.", - notavailable8: "Mi contenido" + notavailable8: "Mi contenido", + mystoriesinvite2: "Para mejorar la apariencia de tu historia en las redes sociales, utiliza ${MYSTORIES} para agregar un resumen y una imagen de la vista en miniatura." }, settings: { header: "Configuración", diff --git a/src/app/storymaps/common/_resources/nls/es/webmap.js b/src/app/storymaps/common/_resources/nls/es/webmap.js index 5d0d37c4..b1f841b3 100644 --- a/src/app/storymaps/common/_resources/nls/es/webmap.js +++ b/src/app/storymaps/common/_resources/nls/es/webmap.js @@ -5,10 +5,12 @@ lblWebMap: "Mapa", lblLocation: "Ubicación", lblContent: "Contenido", - lblPopup: "Menú emergente", + lblPopup: "Elemento emergente", lblControls: "Extras", lblOverview: "Mapa de vista general", lblLegend: "Leyenda", + lblGeocoder: "Buscador de direcciones o lugares", + tooltipGeocoder: "Permite a tus usuarios buscar direcciones y lugares en tus mapas.", loadingTitle: "Cargando título", entry: "Entrada", entries: "Entradas", @@ -45,7 +47,7 @@ extentTitle: "Ubicación del mapa", extentExplain: "Desplázate y haz zoom por el mapa para definir cómo lo verán los lectores.", extentSave: "Guardar ubicación del mapa", - popupTitle: "Ventana emergente del mapa", + popupTitle: "Ventana emergente en el mapa", popupExplain: "Haz clic en una entidad para abrir la ventana emergente que deseas mostrar.", popupSave: "Guardar la configuración de la ventana emergente", hintNavigation: "La navegación del mapa se ha deshabilitado." diff --git a/src/app/storymaps/common/_resources/nls/et/core.js b/src/app/storymaps/common/_resources/nls/et/core.js index a73178e5..c8337a6b 100644 --- a/src/app/storymaps/common/_resources/nls/et/core.js +++ b/src/app/storymaps/common/_resources/nls/et/core.js @@ -18,7 +18,8 @@ height: "Kõrgus", create: "Koosta", yes: "Jah", - no: "Ei" + no: "Ei", + mystories: "Minu lood" }, inlineFieldEdit: { editMe: "Muuda mind!" @@ -30,9 +31,10 @@ buttonShare: "Jaga", buttonSettings: "Seaded", buttonHelp: "Abi", - buttonPreview: "Kuva reaalajas", + buttonPreview: "Kuva lugu", tooltipFirstSave: "See on saadaval alles pärast salvestamist.", tooltipNotShared: "See on saadaval alles pärast jagamist.", + tooltipNotShared2: "Teie lugu pole jagatud, ainult teie pääsete sellele juurde.", noPendingChange: "Ühtegi muudatust ei ole ootel", unSavedChangePlural: "Ootel muudatused", closeWithPendingChange: "Kas olete kindel, et soovite tegevuse kinnitada? Teie tehtud muudatused lähevad kaotsi.", @@ -52,10 +54,21 @@ err1Div2: "Muutke loo pealkirja ning seejärel salvestage see.", btnOk: "Redigeerige loo pealkirja" }, + saveErrorSocial: { + title: "Sotsiaalmeedias jagamise värskendus", + panel1: "Teie loo ilmet on sotsiaalmeedias täiustatud, kuid teie ArcGIS-i veebirakenduse üksuse pealkiri ei ühti teie loo pealkirjaga.", + panel1tooltip: "Kui lisate pealkirja, kokkuvõtte ja pisipildi, näeb teie lugu välja järgmine:", + panel2: "Millist pealkirja soovite sotsiaalmeedias kasutada:", + panel2q1: "Loo pealkiri (soovitatav)", + panel2q1tooltip: "Selle suvandi valimisel muudetakse teie üksuse pealkiri loo pealkirjaga samasuguseks ning sünkroonitakse täiendavad koosturis tehtud muudatused.", + panel2q2: "Üksuse pealkiri", + panel3: "Selleks et oma loo ilmet sotsiaalmeedias veelgi täiustada, kasutage portaali ${MYSTORIES}, et lisada kokkuvõte ja pisipilt.", + panel4: "Ära hoiata mind enam selle loo puhul" + }, share: { shareTitle: "Jagage oma lugu", preview: "Eelvaade", - viewlive: "Kuva reaalajas", + viewlive: "Kuva lugu", btnPrivate: "Privaatne", btnPrivateTooltip: "Lugu on nähtav ainult teile", btnOrg: "Organisatsioon", @@ -74,23 +87,24 @@ notavailable2: "Kahjuks ei toeta see Portal for ArcGIS versioon loo jagamist koostaja kaudu (nõutav on versioon 10.4 või uuem).", notavailable3: "Saate seda lugu jagada %LINK% kaudu.", notavailable4: "Minu lood", - notavailable5: "selle sisuüksuse leht", + notavailable5: "selle üksuse leht", notavailable6: "Kahjuks pole see funktsioon arendusrežiimis täielikult toetatud. Sõltuvalt teie juurutamise stsenaariumist võib see funktsioon pärast juurutamist olla toetatud.", notavailable7: "Külastage kindlasti %MYCONTENT% teie loos olevate kaartide ja kihtide jagamise kinnitamiseks.", - notavailable8: "Minu sisu" + notavailable8: "Minu sisu", + mystoriesinvite2: "Selleks et oma loo ilmet sotsiaalvõrgustikes täiustada, kasutage portaali ${MYSTORIES}, et lisada kokkuvõte ja pisipilt." }, settings: { header: "Seaded", tabError: "Palun kontrollige vigu kõigil vahekaartidel" }, settingsLayout: { - title: "Kujundus", + title: "Paigutus", explain: "Millist paigutust soovite kasutada?", explainInit: "Saate paigutust igal ajal seadete dialoogiakna kaudu muuta.", viewExample: "Kuva reaalajas näide" }, settingsTheme: { - title: "Teema" + title: "Kujundus" }, settingsHeader: { title: "Päis", diff --git a/src/app/storymaps/common/_resources/nls/et/webmap.js b/src/app/storymaps/common/_resources/nls/et/webmap.js index 744db5b5..9329641c 100644 --- a/src/app/storymaps/common/_resources/nls/et/webmap.js +++ b/src/app/storymaps/common/_resources/nls/et/webmap.js @@ -9,6 +9,8 @@ lblControls: "Lisandid", lblOverview: "Ülevaatekaart", lblLegend: "Legend", + lblGeocoder: "Aadressi- või kohaleidja", + tooltipGeocoder: "Võimaldab kasutajatel teie kaartidel aadresse ja kohti otsida.", loadingTitle: "Pealkirja laadimine", entry: "Sissekanne", entries: "Sissekanded", @@ -46,7 +48,7 @@ extentExplain: "Saate kaarti liigutada ja suumida, et määrata selle kuvamine lugejatele.", extentSave: "Salvesta kaardi asukoht", popupTitle: "Kaardi hüpikaken", - popupExplain: "Klikkige objekti, et avada hüpikaken, mida soovite kuvada.", + popupExplain: "Klõpsake objekti, et avada hüpikaken, mida soovite kuvada.", popupSave: "Salvesta hüpikakna konfiguratsioon", hintNavigation: "Kaardil navigeerimine on välja lülitatud." }, diff --git a/src/app/storymaps/common/_resources/nls/fi/core.js b/src/app/storymaps/common/_resources/nls/fi/core.js index a0fe3019..ce153c34 100644 --- a/src/app/storymaps/common/_resources/nls/fi/core.js +++ b/src/app/storymaps/common/_resources/nls/fi/core.js @@ -18,7 +18,8 @@ height: "Korkeus", create: "Luo", yes: "Kyllä", - no: "Ei" + no: "Ei", + mystories: "Omat tarinat" }, inlineFieldEdit: { editMe: "Muokkaa minua!" @@ -30,9 +31,10 @@ buttonShare: "Jaa", buttonSettings: "Asetukset", buttonHelp: "Ohje", - buttonPreview: "Näytä reaaliaikaisesti", + buttonPreview: "Näytä tarina", tooltipFirstSave: "Tämä toiminto ei ole käytettävissä ennen tallennusta.", tooltipNotShared: "Tämä toiminto ei ole käytettävissä ennen jakamista.", + tooltipNotShared2: "Tainaasi ei ole jaettu. Vain sinä voit lukea sen.", noPendingChange: "Ei odottavaa muutosta", unSavedChangePlural: "Odottavat muutokset", closeWithPendingChange: "Haluatko varmasti vahvistaa tämän toiminnon? Menetät tekemäsi muutokset.", @@ -52,10 +54,21 @@ err1Div2: "Muokkaa tarinan otsikkoa ja tallenna sovellus sen jälkeen.", btnOk: "Muokkaa tarinan otsikkoa" }, + saveErrorSocial: { + title: "Sosiaalisen median jakamispäivitys", + panel1: "Tarinasi ulkoasua sosiaalisessa mediassa on parannettu, mutta ArcGIS-Web-sovelluskohteen otsikko ei ole sama kuin tarinan otsikko.", + panel1tooltip: "Jos määrität otsikon, yhteenvedon ja pikkukuvan, tarinasi näyttää tältä:", + panel2: "Mitä otsikkoa haluat käyttää sosiaalisessa mediassa:", + panel2q1: "Tarinan otsikko (suositus)", + panel2q1tooltip: "Valitsemalla tämän vaihtoehdon kohteen otsikkoa muutetaan siten, että se vastaa tarinan otsikkoa ja luontitoiminnon uudet muutokset synkronoidaan.", + panel2q2: "Kohteen otsikko", + panel3: "Jos haluat edelleen parantaa tarinan ulkoasua sosiaalisessa mediassa, lisää yhteenveto ja pikkukuva käyttämällä toimintoa ${MYSTORIES}.", + panel4: "Älä varoita minua enää uudelleen tästä tarinasta" + }, share: { shareTitle: "Jaa tarinasi", preview: "Esikatselu", - viewlive: "Näytä reaaliaikaisesti", + viewlive: "Näytä tarina", btnPrivate: "Yksityinen", btnPrivateTooltip: "Vain sinä näet tarinan", btnOrg: "Organisaatio", @@ -77,7 +90,8 @@ notavailable5: "sen kohdesivu", notavailable6: "Tätä ominaisuutta ei tueta täysin kehittäjätilassa. Käyttöönottoskenaariosi mukaan tämä ominaisuus on ehkä tuettu käyttöönotettaessa.", notavailable7: "Varmista vierailemalla kohteessa %MYCONTENT%, että tarinassasi käytetyt kartat ja karttatasot jaetaan myös.", - notavailable8: "Oma sisältö" + notavailable8: "Oma sisältö", + mystoriesinvite2: "Jos haluat parantaa tarinan ulkoasua sosiaalisessa verkostossa, lisää yhteenveto ja pikkukuva käyttämällä toimintoa ${MYSTORIES}." }, settings: { header: "Asetukset", diff --git a/src/app/storymaps/common/_resources/nls/fi/webmap.js b/src/app/storymaps/common/_resources/nls/fi/webmap.js index 50837f69..0d2470bb 100644 --- a/src/app/storymaps/common/_resources/nls/fi/webmap.js +++ b/src/app/storymaps/common/_resources/nls/fi/webmap.js @@ -5,10 +5,12 @@ lblWebMap: "Kartta", lblLocation: "Sijainti", lblContent: "Sisältö", - lblPopup: "Popup", + lblPopup: "Ponnahdusikkuna", lblControls: "Ylimääräinen sisältö", lblOverview: "Yleiskatsauskartta", lblLegend: "Selite", + lblGeocoder: "Osoitteen tai paikan paikannus", + tooltipGeocoder: "Salli käyttäjien etsiä osoitteita ja paikkoja kartoistasi.", loadingTitle: "Ladataan otsikkoa", entry: "Merkintä", entries: "Merkinnät", @@ -45,9 +47,9 @@ extentTitle: "Karttasijainti", extentExplain: "Vieritä ja tarkenna karttaa määrittääksesi, miten lukijasi sen näkevät.", extentSave: "Tallenna karttasijainti", - popupTitle: "Kartan ponnahdusikkuna", + popupTitle: "Lisää ponnahdusikkuna karttaan", popupExplain: "Avaa näytettävä ponnahdusikkuna napsauttamalla kohdetta.", - popupSave: "Tallenna ponnahdusikkunan konfiguraatio", + popupSave: "Tallenna ponnahdusikkunan määritys", hintNavigation: "Karttanavigointi on poistettu käytöstä." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/fr/core.js b/src/app/storymaps/common/_resources/nls/fr/core.js index b99415fe..dfc740db 100644 --- a/src/app/storymaps/common/_resources/nls/fr/core.js +++ b/src/app/storymaps/common/_resources/nls/fr/core.js @@ -18,7 +18,8 @@ height: "Hauteur", create: "Créer", yes: "Oui", - no: "Non" + no: "Non", + mystories: "Mes récits" }, inlineFieldEdit: { editMe: "Modifier" @@ -30,9 +31,10 @@ buttonShare: "Partager", buttonSettings: "Paramètres", buttonHelp: "Aide", - buttonPreview: "Voir en direct", + buttonPreview: "Afficher le récit", tooltipFirstSave: "Cette fonction n\'est pas disponible tant qu\'un enregistrement n\'est pas effectué.", tooltipNotShared: "Cette fonction n\'est pas disponible tant qu\'un partage n\'est pas effectué.", + tooltipNotShared2: "Votre récit n\'est pas partagé, vous seul pouvez y accéder.", noPendingChange: "Aucune modification en attente", unSavedChangePlural: "Modifications en attente", closeWithPendingChange: "Vouez-vous vraiment confirmer cette opération ? Vos modifications seront perdues.", @@ -52,10 +54,21 @@ err1Div2: "Modifiez le titre de votre récit et enregistrez-le.", btnOk: "Modifier le titre du récit" }, + saveErrorSocial: { + title: "Mise à jour du partage sur les réseaux sociaux", + panel1: "L\'apparence de votre récit sur les réseaux sociaux a été améliorée, mais le titre de votre élément d\'application Web ArcGIS n\'est pas le même que le titre de votre récit.", + panel1tooltip: "Si vous définissez un titre, un résumé et une image miniature, votre récit ressemblera à ceci :", + panel2: "Quel titre voulez-vous utiliser sur les réseaux sociaux :", + panel2q1: "Titre du récit (recommandé)", + panel2q1tooltip: "Si vous choisissez cette option, le titre de votre élément sera modifié afin de correspondre au titre de votre récit et les autres modifications apportées dans le générateur seront synchronisées.", + panel2q2: "Titre de l\'élément", + panel3: "Pour encore améliorer l\'apparence de votre récit sur les réseaux sociaux, utilisez ${MYSTORIES} pour ajouter un résumé et une image miniature.", + panel4: "Ne plus m\'avertir pour ce récit" + }, share: { shareTitle: "Partager votre récit", preview: "Aperçu", - viewlive: "Voir en direct", + viewlive: "Afficher le récit", btnPrivate: "Privé", btnPrivateTooltip: "Vous seul pouvez voir le récit", btnOrg: "Organisation", @@ -74,10 +87,11 @@ notavailable2: "Le partage de votre récit depuis le générateur n\'est pas pris en charge dans cette version de Portal for ArcGIS (requiert la version 10.4 ou ultérieure).", notavailable3: "Vous pouvez partager ce récit depuis %LINK%.", notavailable4: "Mes récits", - notavailable5: "la page des éléments", + notavailable5: "sa page d\'élément", notavailable6: "Cette fonctionnalité n\'est pas entièrement prise en charge en mode de développement. Selon votre type de déploiement, elle peut être prise en charge une fois déployée.", notavailable7: "Consultez %MYCONTENT% pour vérifier que les cartes et couches utilisées dans votre récit sont également partagées.", - notavailable8: "Mon contenu" + notavailable8: "Mon contenu", + mystoriesinvite2: "Pour améliorer l\'apparence de votre récit sur les réseaux sociaux, utilisez ${MYSTORIES} pour ajouter un résumé et une image miniature." }, settings: { header: "Paramètres", diff --git a/src/app/storymaps/common/_resources/nls/fr/webmap.js b/src/app/storymaps/common/_resources/nls/fr/webmap.js index 8cda6e25..fab70f91 100644 --- a/src/app/storymaps/common/_resources/nls/fr/webmap.js +++ b/src/app/storymaps/common/_resources/nls/fr/webmap.js @@ -9,6 +9,8 @@ lblControls: "Suppléments", lblOverview: "Vue générale", lblLegend: "Légende", + lblGeocoder: "Répertoire géographique", + tooltipGeocoder: "Autorisez vos utilisateurs à rechercher des adresses et des lieux sur vos cartes.", loadingTitle: "Chargement du titre", entry: "Entrée", entries: "Entrées", @@ -28,7 +30,7 @@ customCfg: "Configuration personnalisée", tooltipLocation: "Définissez l\'emplacement que cette carte affichera.", tooltipContent: "Définissez les couches visibles.", - tooltipPopup: "Choisissez la fenêtre contextuelle à afficher à l\'ouverture de la carte.", + tooltipPopup: "Choisissez une fenêtre contextuelle qui sera ouverte lorsque la carte s\'affichera.", tooltipOverview: "Affichez une petite vue générale avec la carte principale.", tooltipLegend: "Affichez la légende de la carte, qui est utile lorsque la carte comporte beaucoup de couches et de symboles.", mapCfgInvite: "Utilisez ces contrôles pour configurer la carte", diff --git a/src/app/storymaps/common/_resources/nls/he/core.js b/src/app/storymaps/common/_resources/nls/he/core.js index 08be1196..0146dca3 100644 --- a/src/app/storymaps/common/_resources/nls/he/core.js +++ b/src/app/storymaps/common/_resources/nls/he/core.js @@ -18,7 +18,8 @@ height: "גובה", create: "צור", yes: "כן", - no: "לא" + no: "לא", + mystories: "הסיפורים שלי" }, inlineFieldEdit: { editMe: "ערוך אותי!" @@ -30,9 +31,10 @@ buttonShare: "שתף", buttonSettings: "הגדרות", buttonHelp: "עזרה", - buttonPreview: "תצוגה דינמית", + buttonPreview: "הצג סיפור", tooltipFirstSave: "אפשרות זו אינה זמינה עד לשמירה.", tooltipNotShared: "אפשרות זו אינה זמינה עד לשיתוף.", + tooltipNotShared2: "הסיפור שלך לא משותף, רק אתה יכול לגשת אליו.", noPendingChange: "אין שינוי לביצוע", unSavedChangePlural: "השינויים בהמתנה", closeWithPendingChange: "האם הינך בטוח שברצונך לאשר פעולה זו? אתה עלול לאבד את השינויים שביצעת.", @@ -52,10 +54,21 @@ err1Div2: "שנה את כותרת הסיפור ולאחר מכן שמור אותו.", btnOk: "ערוך את כותרת הסיפור" }, + saveErrorSocial: { + title: "עדכון של שיתוף במדיה חברתית", + panel1: "הופעת הסיפור שלך במדיה החברתית שופרה, אבל כותרת הפריט של אפליקציית האינטרנט ArcGIS אינה זהה לכותרת הסיפור שלך.", + panel1tooltip: "על-ידי הגדרת כותרת, סיכום ותמונה ממוזערת, הסיפור שלך ייראה כך:", + panel2: "באיזו כותרת ברצונך להשתמש במדיה החברתית:", + panel2q1: "כותרת סיפור (מומלץ)", + panel2q1tooltip: "על-ידי בחירת אפשרות זו, כותרת הפריט שלך תשתנה כדי להתאים לכותרת הסיפור שלך, ושינויים נוספים בבונה יסונכרנו.", + panel2q2: "כותרת פריט", + panel3: "כדי לשפר עוד יותר את הופעת הסיפור שלך במדיה החברתית, השתמש ב-${MYSTORIES} כדי להוסיף סיכום ותמונה ממוזערת.", + panel4: "אל תזהיר אותי שוב לגבי סיפור זה" + }, share: { shareTitle: "שתף את הסיפור שלך", preview: "תצוגה מקדימה", - viewlive: "תצוגה חיה", + viewlive: "הצג סיפור", btnPrivate: "פרטי", btnPrivateTooltip: "רק אתה יכול לראות את הסיפור", btnOrg: "ארגון", @@ -77,7 +90,8 @@ notavailable5: "זה דף פריט", notavailable6: "מצטערים, ישות זו לא נתמכת במלואה במצב פיתוח. בהתאם לתרחיש הפיתוח שלך, ייתכן שיישות זו תיתמך כאשר תיפרס.", notavailable7: "הקפד לבקר את %MYCONTENT% כדי לוודא שהמפות והשכבות שבסיפור שלך משותפות.", - notavailable8: "התכולה שלי" + notavailable8: "התכולה שלי", + mystoriesinvite2: "כדי לשפר את הופעת הסיפור שלך ברשתות החברתיות, השתמש ב-${MYSTORIES} כדי להוסיף סיכום ותמונה ממוזערת." }, settings: { header: "הגדרות", diff --git a/src/app/storymaps/common/_resources/nls/he/webmap.js b/src/app/storymaps/common/_resources/nls/he/webmap.js index 3859ea6e..b3042d2c 100644 --- a/src/app/storymaps/common/_resources/nls/he/webmap.js +++ b/src/app/storymaps/common/_resources/nls/he/webmap.js @@ -5,10 +5,12 @@ lblWebMap: "מפה", lblLocation: "מיקום", lblContent: "תוכן", - lblPopup: "חלון קופץ", + lblPopup: "חלונית קופצת", lblControls: "תוספות", lblOverview: "מפת התמצאות", lblLegend: "מקרא", + lblGeocoder: "מאתר כתובות או מקומות", + tooltipGeocoder: "אפשר למשתמשים למצוא כתובות ומקומות במפות שלך.", loadingTitle: "טוען כותרת", entry: "ערך", entries: "ערכים", @@ -28,7 +30,7 @@ customCfg: "הגדרות מותאמות", tooltipLocation: "הגדר את המיקום שמפה זו תציג.", tooltipContent: "הגדר את השכבות הנראות.", - tooltipPopup: "בחר חלון קופץ שייפתח בעת הצגת מפה זו.", + tooltipPopup: "בחר חלונית קופצת שתיפתח כאשר מפה זו תוצג.", tooltipOverview: "הצג מפת התמצאות קטנה יחד עם המפה הראשית.", tooltipLegend: "הצג את מקרא המפה על המפה. זה יכול להועיל כאשר יש למפה שכבות וסמלים רבים.", mapCfgInvite: "השתמש בפקדים הללו לקבוע את תצורת המפה שלך", @@ -45,9 +47,9 @@ extentTitle: "מיקום המפה", extentExplain: "הזז והתמקד במפה כדי לקבוע כיצד היא תראה לקוראים שלך.", extentSave: "בחר את מיקום המפה", - popupTitle: "חלון מפה קופץ", - popupExplain: "לחץ על ישות כדי לפתוח את החלון הקופץ שברצונך להציג.", - popupSave: "שמור את הגדרות התצוגה של החלון הקופץ", + popupTitle: "חלונית קופצת של מפה", + popupExplain: "לחץ על ישות כדי לפתוח את החלונית הקופצת שברצונך להציג.", + popupSave: "שמור את תצורת החלונית הקופצת", hintNavigation: "הניווט של המפה חסום." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/it/core.js b/src/app/storymaps/common/_resources/nls/it/core.js index ef7eb331..e8b7df4e 100644 --- a/src/app/storymaps/common/_resources/nls/it/core.js +++ b/src/app/storymaps/common/_resources/nls/it/core.js @@ -18,7 +18,8 @@ height: "Altezza", create: "Crea", yes: "Sì", - no: "No" + no: "No", + mystories: "My Stories" }, inlineFieldEdit: { editMe: "Modifica utente" @@ -30,9 +31,10 @@ buttonShare: "Condividi", buttonSettings: "Impostazioni", buttonHelp: "Guida", - buttonPreview: "Visualizza in tempo reale", + buttonPreview: "Visualizza storia", tooltipFirstSave: "Questa funzione è disponibile solo dopo il salvataggio.", tooltipNotShared: "Questa funzione è disponibile solo dopo la condivisione.", + tooltipNotShared2: "La storia non è condivisa, è accessibile solo dall\'utente corrente.", noPendingChange: "Nessuna modifica in sospeso", unSavedChangePlural: "Modifiche in sospeso", closeWithPendingChange: "Confermare l\'azione? Le modifiche apportate andranno perse.", @@ -52,10 +54,21 @@ err1Div2: "Modificare il titolo della storia, quindi salvarla.", btnOk: "Modifica il titolo della storia" }, + saveErrorSocial: { + title: "Aggiornamento condivisione con social media", + panel1: "L\'aspetto della storia sui social media è stata migliorata, ma il titolo dell\'elemento applicazione Web ArcGIS è diverso dal titolo della storia.", + panel1tooltip: "Se si definisce un titolo, un riepilogo e un\'immagine di anteprima, l\'aspetto della storia sarà:", + panel2: "Specificare il titolo che si desidera utilizzare sui social media:", + panel2q1: "Titolo della storia (consigliato)", + panel2q1tooltip: "Se si sceglie questa opzione, il titolo dell\'elemento verrà modificato per corrispondere al titolo della storia e ulteriori modifiche nel generatore verranno sincronizzate.", + panel2q2: "Titolo elemento", + panel3: "Per migliorare ulteriormente l\'aspetto della storia sui social media utilizzare ${MYSTORIES} per aggiungere un riepilogo e un\'immagine di anteprima.", + panel4: "Non visualizzare più avvisi per questa storia" + }, share: { shareTitle: "Condividi la storia", preview: "Anteprima", - viewlive: "Visualizza in tempo reale", + viewlive: "Visualizza storia", btnPrivate: "Privato", btnPrivateTooltip: "La storia può essere visualizzata solo dall\'utente corrente", btnOrg: "Organizzazione", @@ -77,7 +90,8 @@ notavailable5: "la sua pagina degli elementi", notavailable6: "Spiacenti, questa feature non è completamente supportata in modalità di sviluppo. In base allo scenario di sviluppo, essa potrebbe essere sviluppata quando viene distribuita.", notavailable7: "Accertarsi di visitare %MYCONTENT% per confermare che anche le mappe e i layer utilizzati nella storia siano condivisi.", - notavailable8: "Contenuto personale" + notavailable8: "Contenuto personale", + mystoriesinvite2: "Per migliorare ulteriormente l\'aspetto della storia sulle reti social utilizzare ${MYSTORIES} per aggiungere un riepilogo e un\'immagine di anteprima." }, settings: { header: "Impostazioni", diff --git a/src/app/storymaps/common/_resources/nls/it/webmap.js b/src/app/storymaps/common/_resources/nls/it/webmap.js index 7c9581c3..f06c7fa3 100644 --- a/src/app/storymaps/common/_resources/nls/it/webmap.js +++ b/src/app/storymaps/common/_resources/nls/it/webmap.js @@ -9,6 +9,8 @@ lblControls: "Extra", lblOverview: "Mappa d\'insieme", lblLegend: "Legenda", + lblGeocoder: "Ricerca indirizzo o località", + tooltipGeocoder: "Consente agli utenti di cercare indirizzi e località sulle mappe.", loadingTitle: "Caricamento titolo in corso", entry: "Voce", entries: "Voci", @@ -28,7 +30,7 @@ customCfg: "Configurazione personalizzata", tooltipLocation: "Definisce la posizione visualizzata da questa mappa.", tooltipContent: "Definisce i layer visibili.", - tooltipPopup: "Consente di scegliere un popup da aprire quando viene visualizzata questa mappa.", + tooltipPopup: "Scegliere un popup che verrà aperto quando questa mappa viene visualizzata.", tooltipOverview: "Consente di visualizzare una piccola mappa d\'insieme assieme alla mappa principale.", tooltipLegend: "Consente di visualizzare la legenda della mappa, utile quando la mappa contiene numerosi layer e simboli.", mapCfgInvite: "Utilizzare questi controlli per configurare la mappa", @@ -45,7 +47,7 @@ extentTitle: "Posizione mappa", extentExplain: "Consente di applicare pan e zoom alla mappa per definirne l\'aspetto per i lettori.", extentSave: "Salva posizione mappa", - popupTitle: "Popup mappa", + popupTitle: "Mappa popup", popupExplain: "Fare clic su una feature per aprire il popup da visualizzare.", popupSave: "Salva la configurazione del popup", hintNavigation: "Navigazione mappa disabilitata." diff --git a/src/app/storymaps/common/_resources/nls/ja/core.js b/src/app/storymaps/common/_resources/nls/ja/core.js index 941569d1..033cb3da 100644 --- a/src/app/storymaps/common/_resources/nls/ja/core.js +++ b/src/app/storymaps/common/_resources/nls/ja/core.js @@ -18,7 +18,8 @@ height: "高さ", create: "作成", yes: "はい", - no: "いいえ" + no: "いいえ", + mystories: "マイ ストーリー" }, inlineFieldEdit: { editMe: "編集" @@ -30,9 +31,10 @@ buttonShare: "共有", buttonSettings: "設定", buttonHelp: "ヘルプ", - buttonPreview: "最新表示", + buttonPreview: "ストーリーの表示", tooltipFirstSave: "これは保存するまで利用できません。", tooltipNotShared: "これは共有するまで利用できません。", + tooltipNotShared2: "ストーリーは共有されていません。このストーリーにアクセスできるのはあなただけです。", noPendingChange: "保留中の変更はありません", unSavedChangePlural: "保留中の変更", closeWithPendingChange: "このアクションを確認しますか？変更内容は失われます。", @@ -52,10 +54,21 @@ err1Div2: "ストーリーのタイトルを変更して保存してください。", btnOk: "ストーリー タイトルの編集" }, + saveErrorSocial: { + title: "ソーシャル メディアでの共有の更新", + panel1: "ソーシャル メディアでのストーリーの外観が改善されていますが、ArcGIS Web アプリケーション アイテムのタイトルがストーリーのタイトルと同じではありません。", + panel1tooltip: "タイトル、サマリー、およびサムネイル画像を定義すると、ストーリーは次のように表示されます。", + panel2: "ソーシャル メディアで使用するタイトル:", + panel2q1: "ストーリーのタイトル (推奨)", + panel2q1tooltip: "このオプションを選択すると、アイテムのタイトルは、ストーリーのタイトルと一致するように変更され、ビルダーでの追加の変更が同期するようになります。", + panel2q2: "アイテムのタイトル", + panel3: "ソーシャル メディアでのストーリーの外観をさらに改善するには、${MYSTORIES} を使用してサマリーとサムネイル画像を追加します。", + panel4: "今後、ストーリーについて警告しない" + }, share: { shareTitle: "ストーリーの共有", preview: "プレビュー", - viewlive: "最新表示", + viewlive: "ストーリーの表示", btnPrivate: "プライベート", btnPrivateTooltip: "このストーリーを表示できるのはあなただけです", btnOrg: "組織", @@ -77,7 +90,8 @@ notavailable5: "これはアイテム ページです", notavailable6: "開発モードでは、この機能は一部サポートされません。配置シナリオによっては、配置時にこの機能がサポートされる場合があります。", notavailable7: "必ず %MYCONTENT% を参照し、ストーリーで使用されているマップとレイヤーも共有されていることを確認してください。", - notavailable8: "マイ コンテンツ" + notavailable8: "マイ コンテンツ", + mystoriesinvite2: "ソーシャル ネットワークでのストーリーの外観を改善するには、${MYSTORIES} を使用してサマリーとサムネイル画像を追加します。" }, settings: { header: "設定", @@ -90,7 +104,7 @@ viewExample: "最新例を表示" }, settingsTheme: { - title: "主題" + title: "テーマ" }, settingsHeader: { title: "ヘッダー", diff --git a/src/app/storymaps/common/_resources/nls/ja/webmap.js b/src/app/storymaps/common/_resources/nls/ja/webmap.js index fa307da6..4cb5816b 100644 --- a/src/app/storymaps/common/_resources/nls/ja/webmap.js +++ b/src/app/storymaps/common/_resources/nls/ja/webmap.js @@ -9,6 +9,8 @@ lblControls: "その他", lblOverview: "概観図", lblLegend: "凡例", + lblGeocoder: "住所または場所のファインダー", + tooltipGeocoder: "ユーザーはマップ上の住所と場所を検索できます。", loadingTitle: "タイトルを読み込んでいます", entry: "エントリ", entries: "エントリ", @@ -45,7 +47,7 @@ extentTitle: "マップ位置", extentExplain: "マップを移動および拡大/縮小して、ユーザに対する外観を定義します。", extentSave: "マップ位置の保存", - popupTitle: "マップ ポップアップ", + popupTitle: "マップのポップアップ", popupExplain: "フィーチャをクリックして、表示するポップアップを開きます。", popupSave: "ポップアップ構成の保存", hintNavigation: "マップ ナビゲーションは無効化されています。" diff --git a/src/app/storymaps/common/_resources/nls/ko/core.js b/src/app/storymaps/common/_resources/nls/ko/core.js index 44247cf4..6a8ba4f5 100644 --- a/src/app/storymaps/common/_resources/nls/ko/core.js +++ b/src/app/storymaps/common/_resources/nls/ko/core.js @@ -18,7 +18,8 @@ height: "높이", create: "생성", yes: "예", - no: "아니요" + no: "아니요", + mystories: "내 스토리" }, inlineFieldEdit: { editMe: "편집!" @@ -30,9 +31,10 @@ buttonShare: "공유", buttonSettings: "설정", buttonHelp: "도움말", - buttonPreview: "실시간 보기", + buttonPreview: "스토리 보기", tooltipFirstSave: "저장하기 전까지 사용할 수 없습니다.", tooltipNotShared: "공유하기 전까지 사용할 수 없습니다.", + tooltipNotShared2: "스토리가 비공유 상태이므로 사용자 본인만 접근할 수 있습니다.", noPendingChange: "보류 중인 변경 사항 없음", unSavedChangePlural: "보류 중인 변경 내용", closeWithPendingChange: "이 작업을 확인하시겠습니까? 변경 내용이 손실됩니다.", @@ -52,10 +54,21 @@ err1Div2: "스토리 제목을 수정한 후에 스토리를 저장하세요.", btnOk: "스토리 제목 편집" }, + saveErrorSocial: { + title: "소셜 미디어 공유 업데이트", + panel1: "소셜 미디어에서의 스토리의 외관이 향상되었지만 ArcGIS 웹 응용프로그램 항목 제목이 스토리 제목과 같지 않습니다.", + panel1tooltip: "제목, 요약 및 섬네일 이미지를 정의하면 스토리가 다음과 같이 보입니다:", + panel2: "소셜 미디어에서 사용할 제목:", + panel2q1: "스토리 제목(권장됨)", + panel2q1tooltip: "이 옵션을 선택하면 항목 제목이 스토리 제목과 일치하도록 수정되며 빌더에서의 후속 변경 사항이 동기화됩니다.", + panel2q2: "항목 제목", + panel3: "소셜 미디어에서의 스토리의 외관을 더욱 향상시키려면 ${MYSTORIES}을(를) 사용하여 요약 및 섬네일 이미지를 추가합니다.", + panel4: "이 스토리에 대해 다시 경고 안 함" + }, share: { shareTitle: "스토리 공유", preview: "미리 보기", - viewlive: "실시간 보기", + viewlive: "스토리 보기", btnPrivate: "비공개", btnPrivateTooltip: "사용자 본인만 스토리를 볼 수 있음", btnOrg: "기관", @@ -77,7 +90,8 @@ notavailable5: "항목 페이지", notavailable6: "죄송합니다. 개발 모드에서는 이 피처가 완전히 지원되지는 않습니다. 배포 시나리오에 따라 배포 시에 이 피처가 지원될 수도 있습니다.", notavailable7: "%MYCONTENT%에 방문하여 내 스토리에 사용된 맵과 레이어도 공유되는지 확인하세요.", - notavailable8: "내 콘텐츠" + notavailable8: "내 콘텐츠", + mystoriesinvite2: "소셜 미디어에서의 스토리의 외관을 더욱 향상시키려면 ${MYSTORIES}을(를) 사용하여 요약 및 섬네일 이미지를 추가합니다." }, settings: { header: "설정", @@ -93,7 +107,7 @@ title: "테마" }, settingsHeader: { - title: "머리글", + title: "헤더", logoEsri: "Esri 로고", logoNone: "로고 없음", logoCustom: "사용자 지정 로고", diff --git a/src/app/storymaps/common/_resources/nls/ko/webmap.js b/src/app/storymaps/common/_resources/nls/ko/webmap.js index e06d0671..162afd0b 100644 --- a/src/app/storymaps/common/_resources/nls/ko/webmap.js +++ b/src/app/storymaps/common/_resources/nls/ko/webmap.js @@ -9,6 +9,8 @@ lblControls: "추가", lblOverview: "개요 맵", lblLegend: "범례", + lblGeocoder: "주소 또는 장소 찾기", + tooltipGeocoder: "사용자가 맵에서 주소와 장소를 찾을 수 있도록 허용합니다.", loadingTitle: "제목을 불러오는 중", entry: "항목", entries: "항목", @@ -28,7 +30,7 @@ customCfg: "사용자 정의 구성", tooltipLocation: "이 맵이 표시될 위치를 정의합니다.", tooltipContent: "가시 레이어를 정의합니다.", - tooltipPopup: "이 맵이 표시될 때 열릴 팝업을 선택합니다.", + tooltipPopup: "이 맵이 나타날 때 열릴 팝업을 선택합니다.", tooltipOverview: "기본 맵과 함께 소형 개요보기 맵을 표시합니다.", tooltipLegend: "레이어 및 심볼이 맵에 많이 포함되어 있는 경우에 유용한 맵 범례를 맵에 표시합니다.", mapCfgInvite: "이 컨트롤을 사용하여 맵 구성", diff --git a/src/app/storymaps/common/_resources/nls/lt/core.js b/src/app/storymaps/common/_resources/nls/lt/core.js index 18dce661..7f4db18c 100644 --- a/src/app/storymaps/common/_resources/nls/lt/core.js +++ b/src/app/storymaps/common/_resources/nls/lt/core.js @@ -18,7 +18,8 @@ height: "Aukštis", create: "Sukurti", yes: "Taip", - no: "Ne" + no: "Ne", + mystories: "Mano pasakojimai" }, inlineFieldEdit: { editMe: "Redaguoti mane!" @@ -30,9 +31,10 @@ buttonShare: "Bendrinti", buttonSettings: "Nuostatos", buttonHelp: "Pagalba", - buttonPreview: "Peržiūrėti veikiančią", + buttonPreview: "Žiūrėti pasakojimą", tooltipFirstSave: "Kol neišsaugosite, tai nepasiekiama.", tooltipNotShared: "Kol nebendrinsite, tai nepasiekiama.", + tooltipNotShared2: "Jūsų pasakojimas nebendrinamas, jį galite pasiekti tik jūs.", noPendingChange: "Laukiančių pakeitimų nėra", unSavedChangePlural: "Nepatvirtinti pakeitimai", closeWithPendingChange: "Ar tikrai norite patvirtinti šį veiksmą? Pakeitimai bus prarasti.", @@ -52,10 +54,21 @@ err1Div2: "Pakeiskite savo pasakojimo pavadinimą ir įrašykite.", btnOk: "Redaguoti pasakojimo pavadinimą" }, + saveErrorSocial: { + title: "Bendrinimo socialinėje žiniasklaidoje naujinimas", + panel1: "Jūsų pasakojimo išvaizda buvo patobulinta socialiniame tinkle, tačiau ArcGIS internetinės aplikacijos elemento antraštė nesutampa su jūsų pasakojimo pavadinimu.", + panel1tooltip: "Pateikus pavadinimą, santrauką ir miniatiūros vaizdą, jūsų pasakojimas atrodys taip:", + panel2: "Kokį pavadinimą norite naudoti socialiniame tinkle:", + panel2q1: "Pasakojimo pavadinimas (rekomenduojama)", + panel2q1tooltip: "Pasirinkus šią parinktį, jūsų elemento antraštė bus modifikuota, kad sutaptų su jūsų pasakojimo pavadinimu, o kiti kūrimo priemonėje atlikti keitimai bus sinchronizuojami.", + panel2q2: "Elemento antraštė", + panel3: "Jei norite toliau tobulinti pasakojimo išvaizdą socialiniame tinkle, naudokite ${MYSTORIES}, kad pridėtumėte santrauką ir miniatiūros vaizdą.", + panel4: "Nebeįspėti manęs apie šį pasakojimą" + }, share: { shareTitle: "Bendrinti pasakojimą", preview: "Peržiūra", - viewlive: "Peržiūrėti veikiančią", + viewlive: "Žiūrėti pasakojimą", btnPrivate: "Asmeninis", btnPrivateTooltip: "Pasakojimą galite matyti tik jūs", btnOrg: "Organizacija", @@ -77,7 +90,8 @@ notavailable5: "tai elemento puslapis", notavailable6: "Deja, ši funkcija nėra visiškai palaikoma programavimo režime. Atsižvelgiant į jūsų talpinimo scenarijų, ši funkcija gali būti palaikoma patalpinus.", notavailable7: "Būtinai apsilankykite %MYCONTENT%, kad patvirtintumėte, jog jūsų pasakojime naudojami žemėlapiai ir sluoksniai yra taip pat bendrinami.", - notavailable8: "Turinys" + notavailable8: "Turinys", + mystoriesinvite2: "Jei norite tobulinti pasakojimo išvaizdą socialiniuose tinkluose, naudokite ${MYSTORIES}, kad pridėtumėte santrauką ir miniatiūros vaizdą." }, settings: { header: "Nuostatos", diff --git a/src/app/storymaps/common/_resources/nls/lt/webmap.js b/src/app/storymaps/common/_resources/nls/lt/webmap.js index 6dc823f3..beeb9eb9 100644 --- a/src/app/storymaps/common/_resources/nls/lt/webmap.js +++ b/src/app/storymaps/common/_resources/nls/lt/webmap.js @@ -9,6 +9,8 @@ lblControls: "Priedai", lblOverview: "Apžvalga", lblLegend: "Legenda", + lblGeocoder: "Adreso arba vietos radimo priemonė", + tooltipGeocoder: "Leisti vartotojams rasti adresus ir vietas žemėlapiuose.", loadingTitle: "Įkeliamas pavadinimas", entry: "Įrašas", entries: "Įrašai", @@ -28,7 +30,7 @@ customCfg: "Adaptuota konfigūracija", tooltipLocation: "Nustatykite vietą, kurią rodys šis žemėlapis.", tooltipContent: "Nustatykite matomus sluoksnius.", - tooltipPopup: "Pasirinkite iškylantįjį langą, kuris bus atidarytas, kai bus rodomas šis žemėlapis.", + tooltipPopup: "Pasirinkite iškylantį langą, kuris bus atidarytas, kai bus rodomas šis žemėlapis.", tooltipOverview: "Kartu su pagrindiniu žemėlapiu rodyti mažą apžvalgos žemėlapį.", tooltipLegend: "Žemėlapyje rodyti žemėlapio legendą. Tai naudinga, kai žemėlapyje yra daug sluoksnių ir simbolių.", mapCfgInvite: "Konfigūruokite žemėlapį naudodami šiuos valdiklius", @@ -47,7 +49,7 @@ extentSave: "Išsaugoti žemėlapio vietą", popupTitle: "Žemėlapio iškylantis langas", popupExplain: "Spustelėkite elementą, kad atidarytumėte norimą rodyti iškylantį langą.", - popupSave: "Išsaugoti iškylančio lango konfigūraciją", + popupSave: "Įrašyti iškylančio lango konfigūraciją", hintNavigation: "Žemėlapio navigacija išjungta." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/lv/core.js b/src/app/storymaps/common/_resources/nls/lv/core.js index 0be947a2..9780888a 100644 --- a/src/app/storymaps/common/_resources/nls/lv/core.js +++ b/src/app/storymaps/common/_resources/nls/lv/core.js @@ -18,7 +18,8 @@ height: "Augstums", create: "Izveidot", yes: "Jā", - no: "Nē" + no: "Nē", + mystories: "Mani stāsti" }, inlineFieldEdit: { editMe: "Rediģē mani!" @@ -30,9 +31,10 @@ buttonShare: "Koplietot", buttonSettings: "Iestatījumi", buttonHelp: "Palīdzība", - buttonPreview: "Skatīt tiešraidē", + buttonPreview: "Skatīt stāstu", tooltipFirstSave: "Tas nav pieejams pirms saglabāšanas.", tooltipNotShared: "Tas nav pieejams pirms kopīgošanas.", + tooltipNotShared2: "Jūsu stāsts nav kopīgots; tam varat piekļūt tikai jūs pats.", noPendingChange: "Nav neizpildītu izmaiņu", unSavedChangePlural: "Gaida izmaiņas", closeWithPendingChange: "Vai tiešām vēlaties apstiprināt šo darbību? Jūsu veiktās izmaiņas tiks zaudētas.", @@ -52,10 +54,21 @@ err1Div2: "Lūdzu, modificējiet sava stāsta nosaukumu un saglabājiet to.", btnOk: "Rediģējiet stāsta nosaukumu" }, + saveErrorSocial: { + title: "Sociālās multivides kopīgošanas atjaunināšana", + panel1: "Ir uzlabots jūsu stāsta izskats sociālajā multividē, bet jūsu ArcGIS Web lietotnes vienības virsraksts atšķiras no stāsta virsraksta.", + panel1tooltip: "Kad būsiet definējis virsrakstu, kopsavilkumu un sīktēla attēlu, jūsu stāsts izskatīsies šādi:", + panel2: "Kādu virsrakstu vēlaties izmantot sociālajā multividē:", + panel2q1: "Stāsta virsraksts (ieteicams)", + panel2q1tooltip: "Ja izvēlēsieties šo opciju, vienības virsraksts tiks modificēts tā, lai atbilstu stāsta virsrakstam, un veidotājā tiks sinhronizētas tālākās izmaiņas.", + panel2q2: "Vienības virsraksts", + panel3: "Ja sociālajā multividē vēlaties vēl vairāk uzlabot stāsta izskatu, izmantojiet ${MYSTORIES}, lai pievienotu kopsavilkumu un sīktēla attēlu.", + panel4: "Vairāk nerādīt brīdinājumus par šo stāstu" + }, share: { shareTitle: "Koplietojiet stāstu", preview: "Priekšskatīt", - viewlive: "Skatīt tiešraidē", + viewlive: "Skatīt stāstu", btnPrivate: "Privāts", btnPrivateTooltip: "Stāstu varat skatīt tikai jūs", btnOrg: "Organizācija", @@ -74,10 +87,11 @@ notavailable2: "Atvainojiet! Stāsta koplietošana, izmantojot Builder, šajā Portal for ArcGIS versijā netiek atbalstīta (nepieciešama 10.4 vai jaunāka versija).", notavailable3: "Varat koplietot šo stāstu no %LINK%.", notavailable4: "Mani stāsti", - notavailable5: "vienības lapa", + notavailable5: "tā vienības lapa", notavailable6: "Atvainojiet! Šis elements izstrādes režīmā netiek pilnībā atbalstīts. Iespējams, ka šis elements pēc ieviešanas tiks atbalstīts (atkarībā no jūsu ieviešanas scenārija).", notavailable7: "Apmeklējiet sadaļu %MYCONTENT%, lai pārliecinātos, vai jūsu stāstā izmantotās kartes un slāņi arī tiek koplietoti.", - notavailable8: "Mans saturs" + notavailable8: "Mans saturs", + mystoriesinvite2: "Ja sociālajos tīklos vēlaties uzlabot stāsta izskatu, izmantojiet ${MYSTORIES}, lai pievienotu kopsavilkumu un sīktēla attēlu." }, settings: { header: "Iestatījumi", diff --git a/src/app/storymaps/common/_resources/nls/lv/webmap.js b/src/app/storymaps/common/_resources/nls/lv/webmap.js index f837a381..34996bf7 100644 --- a/src/app/storymaps/common/_resources/nls/lv/webmap.js +++ b/src/app/storymaps/common/_resources/nls/lv/webmap.js @@ -5,10 +5,12 @@ lblWebMap: "Karte", lblLocation: "Izvietojums", lblContent: "Saturs", - lblPopup: "Uznirstošais logs", + lblPopup: "Uznirstošie logi", lblControls: "Papildu", lblOverview: "Pārskata karte", lblLegend: "Leģenda", + lblGeocoder: "Adrešu vai vietu meklētājs", + tooltipGeocoder: "Ļaujiet lietotājiem atrast adreses un vietas jūsu kartēs.", loadingTitle: "Virsraksta ielāde", entry: "Ieraksts", entries: "Ieraksti", diff --git a/src/app/storymaps/common/_resources/nls/nb/core.js b/src/app/storymaps/common/_resources/nls/nb/core.js index 11bd9d60..a279b394 100644 --- a/src/app/storymaps/common/_resources/nls/nb/core.js +++ b/src/app/storymaps/common/_resources/nls/nb/core.js @@ -18,7 +18,8 @@ height: "Høyde", create: "Opprette", yes: "Ja", - no: "Nei" + no: "Nei", + mystories: "Mine historier" }, inlineFieldEdit: { editMe: "Rediger meg!" @@ -30,9 +31,10 @@ buttonShare: "Del", buttonSettings: "Innstillinger", buttonHelp: "Hjelp", - buttonPreview: "Vis i sanntid", + buttonPreview: "Vis historie", tooltipFirstSave: "Dette er ikke tilgjengelig før du har lagret.", tooltipNotShared: "Dette er ikke tilgjengelig før du har delt.", + tooltipNotShared2: "Historien er ikke delt. Det er bare du som har tilgang til den.", noPendingChange: "Ingen ventende endring", unSavedChangePlural: "Ventende endringer", closeWithPendingChange: "Er du sikker på at du vil bekrefte denne handlingen? Du mister endringene du har gjort.", @@ -52,10 +54,21 @@ err1Div2: "Endre tittelen på historien, og deretter lagrer du den.", btnOk: "Rediger historietittelen" }, + saveErrorSocial: { + title: "Oppdater deling på sosiale medier", + panel1: "Historien vises på en bedre måte på sosiale medier, men tittelen på ArcGIS-webapplikasjonselementet er ikke den samme som historietittelen.", + panel1tooltip: "Når du angir en tittel, et sammendrag og et miniatyrbilde, vil historien se slik ut:", + panel2: "Hvilken tittel vil du bruke på sosiale medier:", + panel2q1: "Historietittel (anbefales)", + panel2q1tooltip: "Når du velger dette alternativet, endres elementtittelen slik at den er identisk med historietittelen og andre endringer i byggeverktøyet synkroniseres.", + panel2q2: "Elementtittel", + panel3: "Hvis du vil forbedre hvordan historien vises på sosiale medier, bruker du ${MYSTORIES} til å legge til et sammendrag og et miniatyrbilde.", + panel4: "Ikke vis denne advarselen igjen for denne historien" + }, share: { shareTitle: "Del historien", preview: "Forhåndsvisning", - viewlive: "Vis i sanntid", + viewlive: "Vis historie", btnPrivate: "Privat", btnPrivateTooltip: "Bare du kan se historien", btnOrg: "Organisasjon", @@ -77,14 +90,15 @@ notavailable5: "elementsiden", notavailable6: "Beklager, denne funksjonen er ikke støttet fullt ut i utviklermodus. Avhengig av scenarioet ditt, kan det hende denne funksjonen støttes når den distribueres.", notavailable7: "Sørg for å gå til %MYCONTENT% for å bekrefte at kartene og lagene som er brukt i historien din, også er delt.", - notavailable8: "Mitt innhold" + notavailable8: "Mitt innhold", + mystoriesinvite2: "Hvis du vil forbedre hvordan historien vises på sosiale nettverk, bruker du ${MYSTORIES} til å legge til et sammendrag og et miniatyrbilde." }, settings: { header: "Innstillinger", tabError: "Se etter feil i alle faner" }, settingsLayout: { - title: "Utforming", + title: "Oppsett", explain: "Hva slags oppsett vil du bruke?", explainInit: "Du kan når som helst endre oppsettet fra innstillingdialogen.", viewExample: "Vis et eksempel" @@ -105,7 +119,7 @@ lblSmallHeader: "Bruk kompakt overskrift (ingen undertittel)" }, header: { - title: "Rediger tittelen på din %TPL_NAME%", + title: "Rediger tittelen på %TPL_NAME%", subtitle: "Rediger undertittelen på din %TPL_NAME%" } } diff --git a/src/app/storymaps/common/_resources/nls/nb/webmap.js b/src/app/storymaps/common/_resources/nls/nb/webmap.js index ae26401e..1b6befd2 100644 --- a/src/app/storymaps/common/_resources/nls/nb/webmap.js +++ b/src/app/storymaps/common/_resources/nls/nb/webmap.js @@ -5,10 +5,12 @@ lblWebMap: "Kart", lblLocation: "Lokasjon", lblContent: "Innhold", - lblPopup: "Sprettoppvindu", + lblPopup: "oppsprett", lblControls: "Tillegg", lblOverview: "Oversiktskart", lblLegend: "Tegnforklaring", + lblGeocoder: "Adresse- eller stedssøk", + tooltipGeocoder: "Gjør det mulig for brukerne å finne adresser og steder i kartene dine.", loadingTitle: "Laster inn tittel", entry: "Oppføring", entries: "Oppføringer", @@ -45,9 +47,9 @@ extentTitle: "Kartlokasjon", extentExplain: "Panorer og zoom på kartet for å definere hvordan det skal se ut for leserne.", extentSave: "Lagre kartlokasjon", - popupTitle: "Sprettoppvindu for kart", - popupExplain: "Klikk på et geoobjekt for å åpne sprettoppvinduet du vil vise", - popupSave: "Lagre konfigurasjonen av sprettoppvinduet", + popupTitle: "Popup for kart", + popupExplain: "Klikk på et geoobjekt for å åpne popupen du vil vise.", + popupSave: "Lagre popupkonfigurasjonen", hintNavigation: "Kartnavigasjon er deaktivert." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/nl/core.js b/src/app/storymaps/common/_resources/nls/nl/core.js index eccb179a..0e8df706 100644 --- a/src/app/storymaps/common/_resources/nls/nl/core.js +++ b/src/app/storymaps/common/_resources/nls/nl/core.js @@ -18,7 +18,8 @@ height: "Hoogte", create: "Maken", yes: "Ja", - no: "Nee" + no: "Nee", + mystories: "My Stories" }, inlineFieldEdit: { editMe: "Bewerk me!" @@ -30,9 +31,10 @@ buttonShare: "Delen", buttonSettings: "Instellingen", buttonHelp: "Help", - buttonPreview: "Live weergeven", + buttonPreview: "Verhaal bekijken", tooltipFirstSave: "Dit is niet beschikbaar totdat u opslaat.", tooltipNotShared: "Dit is niet beschikbaar totdat u deelt.", + tooltipNotShared2: "Uw verhaal is niet gedeeld, alleen u hebt toegang.", noPendingChange: "Geen wijziging in behandeling", unSavedChangePlural: "Wijzigingen in behandeling", closeWithPendingChange: "Weet u zeker dat u deze actie wilt bevestigen? Uw wijzigingen gaan verloren.", @@ -52,10 +54,21 @@ err1Div2: "Wijzig de titel van uw verhaal en sla het op.", btnOk: "De verhaaltitel bewerken" }, + saveErrorSocial: { + title: "Social media update aangaande het delen", + panel1: "De weergave van uw story’s op social media is verbeterd, maar uw ArcGIS webapplicatietitel is niet hetzelfde als uw verhaaltitel.", + panel1tooltip: "Door het definiëren van een titel, samenvatting en thumbnail-afbeelding, komt uw verhaal er als volgt uit te zien:", + panel2: "Welke titel zou u willen gebruiken op social media:", + panel2q1: "Verhaaltitel (aanbevolen)", + panel2q1tooltip: "Door deze optie te kiezen, wordt uw itemtitel aangepast aan uw verhaaltitel en worden verdere veranderingen in de builder gesynchroniseerd.", + panel2q2: "Itemtitel", + panel3: "Gebruik ${MYSTORIES} om de weergave op social media verder te verbeteren en voeg een samenvatting en thumbnail-afbeelding toe.", + panel4: "Waarschuw me niet opnieuw voor dit verhaal" + }, share: { shareTitle: "Uw verhaal opslaan", preview: "Voorbeeld", - viewlive: "Live weergeven", + viewlive: "Verhaal bekijken", btnPrivate: "Privé", btnPrivateTooltip: "Alleen u kunt het verhaal weergeven", btnOrg: "Organisatie", @@ -77,7 +90,8 @@ notavailable5: "de itempagina ervan", notavailable6: "Het spijt ons, maar deze functie wordt niet geheel ondersteund in de ontwikkelingsmodus. Afhankelijk van uw activeringsscenario kan deze functie ondersteund worden bij implementatie.", notavailable7: "Bezoek %MYCONTENT% om te bevestigen dat de kaarten en kaartlagen in uw verhaal ook gedeeld zijn.", - notavailable8: "Mijn Content" + notavailable8: "Mijn Content", + mystoriesinvite2: "Gebruik ${MYSTORIES} om de weergave op sociale netwerken te verbeteren en voeg een samenvatting en thumbnail-afbeelding toe." }, settings: { header: "Instellingen", @@ -105,7 +119,7 @@ lblSmallHeader: "Compact header gebruiken (geen subtitel)" }, header: { - title: "Bewerk de titel van uw %TPL_NAME%", + title: "De titel van uw %TPL_NAME% bewerken", subtitle: "Bewerk de subtitel van uw %TPL_NAME%" } } diff --git a/src/app/storymaps/common/_resources/nls/nl/webmap.js b/src/app/storymaps/common/_resources/nls/nl/webmap.js index 1e2b7c10..cc55cb44 100644 --- a/src/app/storymaps/common/_resources/nls/nl/webmap.js +++ b/src/app/storymaps/common/_resources/nls/nl/webmap.js @@ -5,10 +5,12 @@ lblWebMap: "Kaart", lblLocation: "Locatie", lblContent: "Inhoud", - lblPopup: "Pop-up", + lblPopup: "Pop-upvenster", lblControls: "Extra\'s", lblOverview: "Overzichtskaart", lblLegend: "Legenda", + lblGeocoder: "Adres of plaatsvinder", + tooltipGeocoder: "Laat uw gebruikers adressen en plaatsen vinden op uw kaarten.", loadingTitle: "Titel laden", entry: "Invoer", entries: "Invoer", @@ -28,7 +30,7 @@ customCfg: "Aangepaste configuratie", tooltipLocation: "Definieer de locatie die deze kaart zal weergeven.", tooltipContent: "Definieer de zichtbare kaartlagen.", - tooltipPopup: "Kies een pop-up die moet worden geopend als deze kaart wordt weergegeven.", + tooltipPopup: "Kies een pop-upvenster dat geopend wordt als deze kaart wordt weergegeven.", tooltipOverview: "Geef een kleine overzichtskaart weer samen met de hoofdkaart.", tooltipLegend: "Geef de kaartlegenda weer op de kaart. Dit is handig als de kaart verschillende lagen en symbolen heeft.", mapCfgInvite: "Gebruik deze bedieningselementen om uw kaart te configureren", @@ -45,9 +47,9 @@ extentTitle: "Kaartlocatie", extentExplain: "Pan en zoom op de kaart om te definiëren hoe deze eruit zal zien voor uw lezers.", extentSave: "Kaartlocatie opslaan", - popupTitle: "Kaartpop-up", + popupTitle: "Map pop-up", popupExplain: "Klik op een object op de pop-up te openen die u wilt weergeven.", - popupSave: "De pop-upconfiguratie opslaan", + popupSave: "Pop-up-configuratie opslaan", hintNavigation: "Kaartnavigatie is uitgeschakeld." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/pl/core.js b/src/app/storymaps/common/_resources/nls/pl/core.js index e014cae6..e186d4ec 100644 --- a/src/app/storymaps/common/_resources/nls/pl/core.js +++ b/src/app/storymaps/common/_resources/nls/pl/core.js @@ -18,7 +18,8 @@ height: "Wysokość", create: "Utwórz", yes: "Tak", - no: "Nie" + no: "Nie", + mystories: "Moje narracje" }, inlineFieldEdit: { editMe: "Edytuj!" @@ -30,9 +31,10 @@ buttonShare: "Udostępnij", buttonSettings: "Ustawienia", buttonHelp: "Pomoc", - buttonPreview: "Wyświetl dane dynamiczne", + buttonPreview: "Wyświetl narrację", tooltipFirstSave: "Z tego elementu można skorzystać dopiero po zapisaniu.", tooltipNotShared: "Z tego elementu można skorzystać dopiero po udostępnieniu.", + tooltipNotShared2: "Twoja narracja nie jest udostępniana, tylko Ty masz do niej dostęp.", noPendingChange: "Brak oczekujących zmian", unSavedChangePlural: "Oczekujące zmiany", closeWithPendingChange: "Czy na pewno chcesz potwierdzić tę operację? Zmiany zostaną utracone.", @@ -52,10 +54,21 @@ err1Div2: "Zmodyfikuj tytuł narracji i ponownie ją zapisz.", btnOk: "Edytuj tytuł narracji" }, + saveErrorSocial: { + title: "Udostępnianie aktualizacji w serwisach społecznościowych", + panel1: "Wygląd narracji w serwisach społecznościowych został poprawiony, ale tytuł elementu aplikacji internetowej ArcGIS jest inny niż tytuł narracji.", + panel1tooltip: "Po zdefiniowaniu tytułu, podsumowania i obrazu miniatury, narracja będzie wyglądała następująco:", + panel2: "Którego tytułu chcesz używać w serwisach społecznościowych:", + panel2q1: "Tytuł narracji (zalecane)", + panel2q1tooltip: "Po wybraniu tej opcji tytuł elementu zostanie zmodyfikowany zgodnie z tytułem narracji, a dodatkowe zmiany w kreatorze zostaną zsynchronizowane.", + panel2q2: "Tytuł elementu", + panel3: "Aby dodatkowo poprawić wygląd narracji w serwisach społecznościowych, użyj karty ${MYSTORIES} w celu dodania podsumowania i obrazu miniatury.", + panel4: "Nie ostrzegaj ponownie dla tej narracji" + }, share: { shareTitle: "Udostępnij narrację", preview: "Zobacz podgląd", - viewlive: "Wyświetl na żywo", + viewlive: "Wyświetl narrację", btnPrivate: "Prywatny", btnPrivateTooltip: "Tylko Ty widzisz narrację", btnOrg: "Instytucja", @@ -77,14 +90,15 @@ notavailable5: "to jest strona elementu", notavailable6: "Przykro nam, ale ta funkcja nie jest obsługiwana w trybie deweloperskim. W zależności od planu wdrożenia ta funkcja może być obsługiwana po jej wdrożeniu.", notavailable7: "Sprawdź na karcie %MYCONTENT%, czy mapy i warstwy wykorzystane w narracji zostały również udostępnione.", - notavailable8: "Moje zasoby" + notavailable8: "Moje zasoby", + mystoriesinvite2: "Aby poprawić wygląd narracji w sieciach społecznościowych, użyj karty ${MYSTORIES} w celu dodania podsumowania i obrazu miniatury." }, settings: { header: "Ustawienia", tabError: "Sprawdź, czy poszczególne karty nie zawierają błędnych danych" }, settingsLayout: { - title: "Układ", + title: "Kompozycja", explain: "Jakiego układu chcesz użyć?", explainInit: "W oknie dialogowym ustawień możesz zmienić układ w dowolnej chwili.", viewExample: "Wyświetl przykład online" diff --git a/src/app/storymaps/common/_resources/nls/pl/webmap.js b/src/app/storymaps/common/_resources/nls/pl/webmap.js index d27ddcd5..84b78b21 100644 --- a/src/app/storymaps/common/_resources/nls/pl/webmap.js +++ b/src/app/storymaps/common/_resources/nls/pl/webmap.js @@ -9,6 +9,8 @@ lblControls: "Dodatki", lblOverview: "Mapa przeglądowa", lblLegend: "Legenda", + lblGeocoder: "Wyszukiwarka adresu lub miejsca", + tooltipGeocoder: "Pozwala użytkownikom znaleźć adresy i miejsca na Twoich mapach.", loadingTitle: "Wczytywanie tytułu", entry: "Wpis", entries: "Wpisy", @@ -46,8 +48,8 @@ extentExplain: "Przesuń i zmień powiększenie, aby zdefiniować wygląd mapy widoczny dla użytkowników.", extentSave: "Zapisz lokalizację mapy", popupTitle: "Okno podręczne mapy", - popupExplain: "Kliknij obiekt, aby otworzyć pożądane okno podręczne.", - popupSave: "Zapisz konfigurację okna podręcznego", + popupExplain: "Kliknij obiekt, aby otworzyć właściwe okno podręczne.", + popupSave: "Zapisz konfigurację okien podręcznych", hintNavigation: "Nawigacja mapy jest wyłączona." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/pt-BR/core.js b/src/app/storymaps/common/_resources/nls/pt-BR/core.js index de47a86a..6b5ca2bb 100644 --- a/src/app/storymaps/common/_resources/nls/pt-BR/core.js +++ b/src/app/storymaps/common/_resources/nls/pt-BR/core.js @@ -18,7 +18,8 @@ height: "Altura", create: "Criar", yes: "Sim", - no: "Não" + no: "Não", + mystories: "Minhas Histórias" }, inlineFieldEdit: { editMe: "Editar-me!" @@ -30,9 +31,10 @@ buttonShare: "Compartilhar", buttonSettings: "Configurações", buttonHelp: "Ajuda", - buttonPreview: "Visualizar em Tempo Real", + buttonPreview: "Visualizar história", tooltipFirstSave: "Isto não está disponível até que seja salvo.", tooltipNotShared: "Isto não está disponível até que seja compartilhado", + tooltipNotShared2: "Sua história não está compartilhada, somente você pode acessá-la.", noPendingChange: "Nenhuma alteração pendente", unSavedChangePlural: "Alterações pendentes", closeWithPendingChange: "Você tem certeza que deseja confirmar esta ação? Suas alterações serão perdidas.", @@ -52,10 +54,21 @@ err1Div2: "Modifique o título da sua história e então salve-a.", btnOk: "Edite o título da história" }, + saveErrorSocial: { + title: "Atualização de compartilhamento da mídia social", + panel1: "O visual da sua história na mídia social foi melhorado, mas seu título de item do aplicativo da web do ArcGIS não é o mesmo que o título da sua história.", + panel1tooltip: "Ao definir um título, resumo e imagem de miniatura, sua história parecerá com isto:", + panel2: "Qual título você gostaria de utilizar na mídia social:", + panel2q1: "Título da história (recomendado)", + panel2q1tooltip: "Ao escolher esta opção, o título do seu item será modificado para corresponder ao título da sua história e alterações adicionais no construtor serão sincronizadas.", + panel2q2: "Título do item", + panel3: "Para melhoria adicional sobre o visual da sua história na mídia social, utilize ${MYSTORIES} para adicionar um resumo e uma imagem de miniatura.", + panel4: "Não me avisar novamente desta história" + }, share: { shareTitle: "Compartilhe sua história", preview: "Visualizar", - viewlive: "Visualizar em Tempo Real", + viewlive: "Visualizar história", btnPrivate: "Privado", btnPrivateTooltip: "Somente você pode visualizar a história", btnOrg: "Organização", @@ -74,10 +87,11 @@ notavailable2: "Desculpe, o compartilhamento da sua história a partir do Construtor não é suportado nesta versão do Portal for ArcGIS (exige 10.4 ou superior).", notavailable3: "Você pode compartilhar esta história do %LINK%.", notavailable4: "Minhas Histórias", - notavailable5: "é a página do item", + notavailable5: "sua página do item", notavailable6: "Desculpe, este recurso não é completamente suportado em modo de desenvolvimento. Dependendo do seu cenário de implantação, este recurso pode ser suportado quando implantado.", notavailable7: "Tenha certeza de visitar o %MYCONTENT% para confirmar que os mapas e camadas utilizadas na sua história também estão compartilhadas.", - notavailable8: "Meu Conteúdo" + notavailable8: "Meu Conteúdo", + mystoriesinvite2: "Para melhoria sobre o visual da sua história em redes sociais, utilize ${MYSTORIES} para adicionar um resumo e uma imagem de miniatura." }, settings: { header: "Configurações", diff --git a/src/app/storymaps/common/_resources/nls/pt-BR/webmap.js b/src/app/storymaps/common/_resources/nls/pt-BR/webmap.js index 816db004..6ee5a272 100644 --- a/src/app/storymaps/common/_resources/nls/pt-BR/webmap.js +++ b/src/app/storymaps/common/_resources/nls/pt-BR/webmap.js @@ -9,6 +9,8 @@ lblControls: "Extras", lblOverview: "Mapa de Visão Geral", lblLegend: "Legenda", + lblGeocoder: "Localizador de Endereços ou Lugares", + tooltipGeocoder: "Permite aos seus usuários localizar endereços e lugares em seus mapas.", loadingTitle: "Carregando título", entry: "Entrada", entries: "Entradas", @@ -45,9 +47,9 @@ extentTitle: "Localização do mapa", extentExplain: "Move e amplia o mapa para definir seu visual para os leitores.", extentSave: "Salvar Localização do Mapa", - popupTitle: "Pop-Up do Mapa", - popupExplain: "Clique em uma feição para abrir o pop-up que deseja exibir.", - popupSave: "Salve a configuração do pop-up", + popupTitle: "Pop-up do mapa", + popupExplain: "Clique em uma feição para abrir o pop-up que você deseja exibir.", + popupSave: "Salvar a configuração do pop-up", hintNavigation: "A navegação do mapa está desabilitada." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/pt-PT/core.js b/src/app/storymaps/common/_resources/nls/pt-PT/core.js index d3825936..c4c80cfa 100644 --- a/src/app/storymaps/common/_resources/nls/pt-PT/core.js +++ b/src/app/storymaps/common/_resources/nls/pt-PT/core.js @@ -18,7 +18,8 @@ height: "Altura", create: "Criar", yes: "Sim", - no: "Não" + no: "Não", + mystories: "As Minhas Histórias" }, inlineFieldEdit: { editMe: "Edite-me!" @@ -30,9 +31,10 @@ buttonShare: "Partilhar", buttonSettings: "Configurações", buttonHelp: "Ajuda", - buttonPreview: "Ver ao Vivo", + buttonPreview: "Visualizar história", tooltipFirstSave: "Esta funcionalidade não se encontra disponível até que a aplicação seja guardada.", tooltipNotShared: "Esta funcionalidade não se encontra disponível até que a aplicação seja partilhada.", + tooltipNotShared2: "A sua história não é partilhada, apenas você a consegue aceder.", noPendingChange: "Nenhuma alteração pendente", unSavedChangePlural: "Alterações pendentes", closeWithPendingChange: "Tem a certeza que pretende confirmar esta ação? As suas alterações serão perdidas.", @@ -52,10 +54,21 @@ err1Div2: "Por favor, modifique o título da sua história e depois guarde-a.", btnOk: "Editar o título da história" }, + saveErrorSocial: { + title: "Actualização de partilha de redes sociais", + panel1: "A aparência da sua story’s nas redes sociais foi melhorada, mas o título de item da sua aplicação web ArcGIS não é o mesmo título que a sua história.", + panel1tooltip: "Definindo um título, resumo e imagem miniatura, a sua história irá parecer assim:", + panel2: "Que título gostaria de usar nas redes sociais:", + panel2q1: "Título da história (recomendado)", + panel2q1tooltip: "Ao escolher esta opção, o título do seu item irá ser modificado para corresponder ao título da sua história e outras alterações que o edifício será sincronizado.", + panel2q2: "Título de item", + panel3: "Para melhorar a aparência da sua história nas redes sociais use ${MYSTORIES} para adicionar um resumo ou uma imagem miniatura.", + panel4: "Não me avise outra vez para esta história" + }, share: { shareTitle: "Partilhar a sua história", preview: "Pré-visualizar", - viewlive: "Visualizar em tempo real", + viewlive: "Visualizar história", btnPrivate: "Privado", btnPrivateTooltip: "A história apenas pode ser vista por si", btnOrg: "Organização", @@ -74,10 +87,11 @@ notavailable2: "Lamentamos, a partilha da sua história a partir do Builder não é suportada nesta versão do Portal for ArcGIS (requer a versão 10.4 ou posterior).", notavailable3: "Pode partilhar esta história a partir de %LINK%.", notavailable4: "As Minhas Histórias", - notavailable5: "é a página do item", + notavailable5: "a sua página de item", notavailable6: "Lamentamos, esta funcionalidade não é totalmente suportada em modo de desenvolvimento. Dependendo do seu contexto de implementação, esta funcionalidade poderá ser suportada após ser implementada.", notavailable7: "Assegure-se que visita %MYCONTENT% para confirmar que os mapas e camadas utilizados na sua história também estão a ser partilhados.", - notavailable8: "O Meu Conteúdo" + notavailable8: "O Meu Conteúdo", + mystoriesinvite2: "Para melhorar a aparência da sua história nas redes sociais use ${MYSTORIES} para adicionar um resumo e uma imagem miniatura." }, settings: { header: "Configurações", diff --git a/src/app/storymaps/common/_resources/nls/pt-PT/webmap.js b/src/app/storymaps/common/_resources/nls/pt-PT/webmap.js index 9c258a7b..735da6e5 100644 --- a/src/app/storymaps/common/_resources/nls/pt-PT/webmap.js +++ b/src/app/storymaps/common/_resources/nls/pt-PT/webmap.js @@ -9,6 +9,8 @@ lblControls: "Extras", lblOverview: "Vista Geral do Mapa", lblLegend: "Legenda", + lblGeocoder: "Localizador de Endereços ou Locais", + tooltipGeocoder: "Permite aos seus utilizadores encontrar endereços e locais nos seus mapas.", loadingTitle: "Carregando título", entry: "Entrada", entries: "Entradas", @@ -28,7 +30,7 @@ customCfg: "Configuração personalizada", tooltipLocation: "Defina a localização em que o mapa exibido.", tooltipContent: "Definir as camadas visíveis.", - tooltipPopup: "Escolha uma janela popup a ser exibida quando este mapa é exibido.", + tooltipPopup: "Escolher um pop-up que irá ser aberto quando este mapa for exibido.", tooltipOverview: "Exiba um pequeno mapa de vista geral juntamente com o mapa principal.", tooltipLegend: "Exiba a legenda de mapa no mapa, útil quando o mapa tem muitas camadas e símbolos.", mapCfgInvite: "Utilize estes controlos para configurar o seu mapa", @@ -45,9 +47,9 @@ extentTitle: "Localização do Mapa", extentExplain: "Mova e amplie o mapa para definir como este aparecerá aos leitores.", extentSave: "Guardar localização do Mapa", - popupTitle: "Popup do Mapa", - popupExplain: "Configure o aspeto da janela popup exibida aos leitores.", - popupSave: "Guarde a configuração da janela popup.", + popupTitle: "Mapa pop-up", + popupExplain: "Clique num elemento para abrir o pop-up que pretende exibir.", + popupSave: "Guarde a configuração pop-up", hintNavigation: "Navegação no mapa desativada." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/ro/core.js b/src/app/storymaps/common/_resources/nls/ro/core.js index f8d7e772..7c74cb4c 100644 --- a/src/app/storymaps/common/_resources/nls/ro/core.js +++ b/src/app/storymaps/common/_resources/nls/ro/core.js @@ -18,7 +18,8 @@ height: "Înălţime", create: "Creare", yes: "Da", - no: "Nu" + no: "Nu", + mystories: "Relatările mele" }, inlineFieldEdit: { editMe: "Editează-mă!" @@ -30,9 +31,10 @@ buttonShare: "Partajare", buttonSettings: "Setări", buttonHelp: "Ajutor", - buttonPreview: "Vizualizare live", + buttonPreview: "Vizualizare scenariu", tooltipFirstSave: "Această funcţie nu este disponibilă decât după ce salvaţi.", tooltipNotShared: "Această funcţie nu este disponibilă decât după ce partajaţi.", + tooltipNotShared2: "Scenariul dvs. nu este partajat, numai dvs. îl puteţi accesa.", noPendingChange: "Nicio modificare în aşteptare", unSavedChangePlural: "Modificări în aşteptare", closeWithPendingChange: "Sigur doriţi să confirmaţi această acţiune? Modificările dvs. se vor pierde.", @@ -52,10 +54,21 @@ err1Div2: "Modificaţi titlul poveştii, apoi salvaţi-l.", btnOk: "Editaţi titlul poveştii" }, + saveErrorSocial: { + title: "Actualizare partajare pe reţele de socializare", + panel1: "Prezentarea scenariului dvs.’ pe reţelele de socializare, a fost îmbunătăţită, dar titlul elementului aplicaţiei dvs. web ArcGIS nu este acelaşi cu titlul scenariului dvs.", + panel1tooltip: "Prin definirea unui titlu, unui rezumat şi unei imagini în miniatură, scenariul dvs. va arăta astfel:", + panel2: "Ce titlu doriţi să utilizaţi pe reţelele de socializare:", + panel2q1: "Titlul scenariului (recomandat)", + panel2q1tooltip: "Prin selectarea acestei opţiuni, titlul elementului dvs. va fi modificat pentru a corespunde titlului scenariului şi modificările ulterioare din aplicația de creare a scenariilor vor fi sincronizate.", + panel2q2: "Titlu element", + panel3: "Pentru a îmbunătăţi în continuare modul în care scenariul dvs. este prezentat pe reţelele de socializare, utilizaţi ${MYSTORIES} pentru a adăuga un rezumat şi o imagine în miniatură.", + panel4: "Opriţi avertizarea pentru acest scenariu" + }, share: { shareTitle: "Partajaţi povestea", preview: "Previzualizare", - viewlive: "Vizualizare live", + viewlive: "Vizualizare scenariu", btnPrivate: "Privat", btnPrivateTooltip: "Numai dvs. puteţi vedea povestea", btnOrg: "Organizaţie", @@ -77,7 +90,8 @@ notavailable5: "pagina elementului său", notavailable6: "Ne pare rău, această caracteristică nu este complet acceptată în modul de dezvoltare. În funcţie de scenariul de dezvoltare, această caracteristică poate fi acceptată la implementare.", notavailable7: "Asiguraţi-vă că vizitaţi %MYCONTENT% pentru a confirma că hărţile şi straturile tematice utilizate în poveste sunt şi ele partajate.", - notavailable8: "Resursele mele" + notavailable8: "Resursele mele", + mystoriesinvite2: "Pentru a îmbunătăţi modul în care scenariul dvs. este prezentat pe reţelele de socializare, utilizaţi ${MYSTORIES} pentru a adăuga un rezumat şi o imagine în miniatură." }, settings: { header: "Setări", diff --git a/src/app/storymaps/common/_resources/nls/ro/webmap.js b/src/app/storymaps/common/_resources/nls/ro/webmap.js index bb46467e..0946c0b4 100644 --- a/src/app/storymaps/common/_resources/nls/ro/webmap.js +++ b/src/app/storymaps/common/_resources/nls/ro/webmap.js @@ -5,10 +5,12 @@ lblWebMap: "Hartă", lblLocation: "Locaţie", lblContent: "Conţinut", - lblPopup: "Fereastră pop-up", + lblPopup: "Mesaj pop-up", lblControls: "Elemente suplimentare", lblOverview: "Hartă de prezentare generală", lblLegend: "Legendă", + lblGeocoder: "Căutare adresă sau loc", + tooltipGeocoder: "Permite utilizatorilor să găsească adrese şi locuri pe hărţile dvs.", loadingTitle: "Se încarcă titlul", entry: "Înregistrare", entries: "Înregistrări", @@ -28,7 +30,7 @@ customCfg: "Configuraţie particularizată", tooltipLocation: "Definiţi locaţia pe care o va afişa această hartă.", tooltipContent: "Definiţi straturile tematice vizibile.", - tooltipPopup: "Alegeţi o fereastră pop-up care va fi deschisă atunci când este afişată această hartă.", + tooltipPopup: "Selectaţi o fereastră pop-up care va fi deschisă atunci când este afişată această hartă.", tooltipOverview: "Afişaţi o mică hartă de prezentare generală împreună cu harta principală.", tooltipLegend: "Afişaţi legenda hărţii pe hartă, lucru util atunci când harta conţine multe straturi tematice şi simboluri.", mapCfgInvite: "Utilizaţi aceste comenzi pentru a configura harta", @@ -45,9 +47,9 @@ extentTitle: "Locaţie hartă", extentExplain: "Panoramaţi şi transfocaţi harta pentru a defini cum va arăta pentru cititori.", extentSave: "Salvare locaţie hartă", - popupTitle: "Fereastră pop-up hartă", - popupExplain: "Faceţi clic pe un obiect spaţial pentru a deschide fereastra pop-up pe care doriţi să o afişaţi.", - popupSave: "Salvare configuraţiei pop-up", + popupTitle: "Pop-up hartă", + popupExplain: "Apăsaţi pe un obiect spaţial pentru a deschide fereastra pop-up pe care doriţi să o afişaţi.", + popupSave: "Salvare configuraţie pop-up", hintNavigation: "Navigarea în hartă este dezactivată." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/ru/core.js b/src/app/storymaps/common/_resources/nls/ru/core.js index 9efa7218..56293a8e 100644 --- a/src/app/storymaps/common/_resources/nls/ru/core.js +++ b/src/app/storymaps/common/_resources/nls/ru/core.js @@ -18,7 +18,8 @@ height: "Высота", create: "Создать", yes: "Да", - no: "Нет" + no: "Нет", + mystories: "Мои истории" }, inlineFieldEdit: { editMe: "Отредактируйте меня!" @@ -30,9 +31,10 @@ buttonShare: "Общий доступ", buttonSettings: "Настройки", buttonHelp: "Справка", - buttonPreview: "Просмотр текущего", + buttonPreview: "Просмотр истории", tooltipFirstSave: "Недоступно, пока приложение не будет сохранено.", tooltipNotShared: "Недоступно, пока приложение не будет опубликовано.", + tooltipNotShared2: "История не опубликована в общий доступ и доступна только для вас.", noPendingChange: "Нет предполагаемых изменений", unSavedChangePlural: "Ожидание изменений", closeWithPendingChange: "Вы действительно хотите подтвердить это действие? Все изменения будут потеряны.", @@ -52,10 +54,21 @@ err1Div2: "Измените заголовок истории, затем сохраните ее.", btnOk: "Изменить заголовок истории" }, + saveErrorSocial: { + title: "Обновление общего доступа через социальные сети", + panel1: "Отображение вашей истории в социальных сетях улучшилось, но название элемента вашего веб-приложения ArcGIS не совпадает с заголовком истории.", + panel1tooltip: "Если указать название, краткую информацию и образец изображения, ваша история будет выглядеть приблизительно так:", + panel2: "Какое название вы хотите использовать в социальных сетях:", + panel2q1: "Заголовок истории (рекомендуется)", + panel2q1tooltip: "Если выбрать эту опцию, заголовок элемента будет изменён соответственно заголовку истории, а дельнейшие изменения в конструкторе будут синхронизированы.", + panel2q2: "Название элемента", + panel3: "Для дальнейшего улучшения отображения своей истории в социальных сетях используйте ${MYSTORIES}, чтобы добавить краткую информацию и изображение образца.", + panel4: "Больше не уведомлять меня об этой истории" + }, share: { shareTitle: "Откройте доступ к истории", preview: "Предварительный просмотр", - viewlive: "Просмотреть вживую", + viewlive: "Просмотр истории", btnPrivate: "Частный", btnPrivateTooltip: "Только вы видите историю.", btnOrg: "Организация", @@ -74,10 +87,11 @@ notavailable2: "Извините, публикация истории из Конструктора не поддерживается в данной версии Portal for ArcGIS (необходима версия 10.4 и выше).", notavailable3: "Вы можете опубликовать эту историю из %LINK%.", notavailable4: "Мои истории", - notavailable5: "это страница элемента", + notavailable5: "страница элемента", notavailable6: "Извините, этот объект не поддерживается в режиме разработки полностью. Он может поддерживаться в зависимости от выбранного варианта разворачивания.", notavailable7: "Посмотрите в %MYCONTENT%, что карты и слои, которые используются в истории, также доступны.", - notavailable8: "Мои ресурсы" + notavailable8: "Мои ресурсы", + mystoriesinvite2: "Для дальнейшего улучшения отображения своей истории в социальных сетях используйте ${MYSTORIES}, чтобы добавить краткую информацию и изображение образца." }, settings: { header: "Настройки", diff --git a/src/app/storymaps/common/_resources/nls/ru/webmap.js b/src/app/storymaps/common/_resources/nls/ru/webmap.js index f2efa58b..69b44484 100644 --- a/src/app/storymaps/common/_resources/nls/ru/webmap.js +++ b/src/app/storymaps/common/_resources/nls/ru/webmap.js @@ -5,10 +5,12 @@ lblWebMap: "Карта", lblLocation: "Местоположение", lblContent: "Содержание", - lblPopup: "Всплывающее окно", + lblPopup: "Всплывающая информация", lblControls: "Дополнения", lblOverview: "Обзорная карта", lblLegend: "Легенда", + lblGeocoder: "Поиск адреса или места", + tooltipGeocoder: "Позволить пользователям выполнять поиск адреса или места на картах.", loadingTitle: "Название загрузки", entry: "Элемент", entries: "Элементы", @@ -46,8 +48,8 @@ extentExplain: "Переместите и измените масштаб карты, чтобы просмотреть, как она будет выглядеть для читателей.", extentSave: "Сохранение местоположение на карте", popupTitle: "Всплывающее окно карты", - popupExplain: "Щелкните объект, чтобы открыть всплывающее окно, которое вы хотите отобразить", - popupSave: "Сохраните конфигурацию всплывающего окна", + popupExplain: "Щелкните объект, чтобы открыть всплывающее окно, которое хотите отобразить.", + popupSave: "Сохранить конфигурацию всплывающего окна", hintNavigation: "Навигация по карте отключена." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/sv/core.js b/src/app/storymaps/common/_resources/nls/sv/core.js index 88f71baf..c3568cb9 100644 --- a/src/app/storymaps/common/_resources/nls/sv/core.js +++ b/src/app/storymaps/common/_resources/nls/sv/core.js @@ -18,7 +18,8 @@ height: "Höjd", create: "Skapa", yes: "Ja", - no: "Nej" + no: "Nej", + mystories: "Mina berättelser" }, inlineFieldEdit: { editMe: "Redigera mig!" @@ -30,9 +31,10 @@ buttonShare: "Dela", buttonSettings: "Inställningar", buttonHelp: "Hjälp", - buttonPreview: "Visa live", + buttonPreview: "Visa berättelse", tooltipFirstSave: "Funktionen finns inte tillgänglig förrän du sparar.", tooltipNotShared: "Funktionen finns inte tillgänglig förrän du delar.", + tooltipNotShared2: "Din berättelse är inte delad och bara du har åtkomst till den.", noPendingChange: "Ingen väntande ändring", unSavedChangePlural: "Väntande ändringar", closeWithPendingChange: "Är du säker på att du vill bekräfta åtgärden? Dina ändringar sparas inte.", @@ -52,10 +54,21 @@ err1Div2: "Ändra titeln på berättelsen och spara den sedan.", btnOk: "Redigera titeln på berättelsen" }, + saveErrorSocial: { + title: "Delningsuppdatering för sociala medier", + panel1: "Din berättelses presentation på sociala medier har förbättrats, men objekttiteln på ArcGIS-webbapplikationen är inte samma som berättelsens titel.", + panel1tooltip: "Om du definierar en titel, sammanfattning och miniatyrbild kommer din berättelse att se ut så här:", + panel2: "Vilken titel skulle du vilja använda på sociala medier:", + panel2q1: "Titel på berättelsen (rekommenderas)", + panel2q1tooltip: "Om du väljer det här alternativet ändras titeln på objektet så att den överensstämmer med titeln på berättelsen. Även övriga ändringar i byggverktyget synkroniseras.", + panel2q2: "Titel på objektet", + panel3: "Om du vill förbättra presentationen av din berättelse på sociala medier ännu mer använder du ${MYSTORIES} för att lägga till en sammanfattning och en miniatyrbild.", + panel4: "Varna mig inte igen för den här berättelsen" + }, share: { shareTitle: "Dela din berättelse", preview: "Förhandsgranska", - viewlive: "Visa live", + viewlive: "Visa berättelse", btnPrivate: "Privat", btnPrivateTooltip: "Bara du kan se berättelsen", btnOrg: "Organisation", @@ -77,7 +90,8 @@ notavailable5: "dess objektsida", notavailable6: "Denna funktion stöds inte fullt ut i utvecklingsläge. Beroende på ditt distributionsscenario kanske detta geoobjekt stöds vid distributionen.", notavailable7: "Se till att du besöker %MYCONTENT% för att bekräfta att de kartor och lager som används i din berättelse också delas.", - notavailable8: "Mitt innehåll" + notavailable8: "Mitt innehåll", + mystoriesinvite2: "Om du vill förbättra presentationen av din berättelse på sociala nätverk använder du ${MYSTORIES} för att lägga till en sammanfattning och en miniatyrbild." }, settings: { header: "Inställningar", diff --git a/src/app/storymaps/common/_resources/nls/sv/webmap.js b/src/app/storymaps/common/_resources/nls/sv/webmap.js index a6382303..fc5a9d28 100644 --- a/src/app/storymaps/common/_resources/nls/sv/webmap.js +++ b/src/app/storymaps/common/_resources/nls/sv/webmap.js @@ -5,10 +5,12 @@ lblWebMap: "Karta", lblLocation: "Plats", lblContent: "Innehåll", - lblPopup: "Popup-fönster", + lblPopup: "Popupfönster", lblControls: "Extra", lblOverview: "Översiktskarta", lblLegend: "Teckenförklaring", + lblGeocoder: "Adress- eller platssökning", + tooltipGeocoder: "Gör att användarna kan söka efter adresser och platser på kartan.", loadingTitle: "Läser in titel", entry: "Post", entries: "Poster", @@ -45,9 +47,9 @@ extentTitle: "Kartplats", extentExplain: "Panorera och zooma kartan för att definiera hur användarna ska se den.", extentSave: "Spara kartplats", - popupTitle: "Kartpopupfönster", + popupTitle: "Popupfönster med karta", popupExplain: "Klicka på ett geoobjekt för att öppna det popupfönster du vill visa.", - popupSave: "Spara konfigurationen av popupfönstret", + popupSave: "Spara popupfönstrets konfiguration", hintNavigation: "Kartnavigeringen är inaktiverad." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/th/core.js b/src/app/storymaps/common/_resources/nls/th/core.js index 68e00e89..02674b76 100644 --- a/src/app/storymaps/common/_resources/nls/th/core.js +++ b/src/app/storymaps/common/_resources/nls/th/core.js @@ -18,7 +18,8 @@ height: "ความสูง", create: "สร้าง", yes: "ใช่", - no: "ไม่" + no: "ไม่", + mystories: "เรื่องราวของฉัน" }, inlineFieldEdit: { editMe: "แก้ไขฉัน!" @@ -30,9 +31,10 @@ buttonShare: "แบ่งปัน", buttonSettings: "การตั้งค่า", buttonHelp: "ช่วยเหลือ", - buttonPreview: "ดูถ่ายทอดสด", + buttonPreview: "แสดงสตอรี่", tooltipFirstSave: "ฟังก์ชั่นนี้ไม่สามารถใช้ได้จนกว่าโปรแกรมจะถูกบันทึกไว้", tooltipNotShared: "ฟังก์ชั่นนี้ไม่สามารถใช้ได้จนกว่าจะมีการประยุกต์ใช้ร่วมกัน", + tooltipNotShared2: "สตอรี่ของคุณยังไม่ได้ถูกแชร์ ดังนั้นคุณคนเดียวที่สามารถใช้งานได้", noPendingChange: "ไม่มีการเปลี่ยนแปลง", unSavedChangePlural: "อยู่ระหว่างการเปลี่ยนแปลง", closeWithPendingChange: "คุณแน่ใจว่าจะต้องการที่จะยืนยันการดำเนินการนี้ การเปลี่ยนแปลงของคุณจะหายไป", @@ -52,10 +54,21 @@ err1Div2: "กรุณาแก้ไขชื่อเรื่องของเรื่องราวและบันทึก", btnOk: "แก้ไขชื่อของเรื่องราว" }, + saveErrorSocial: { + title: "ปรับปรุงสังคมออนไลน์ร่วมกัน", + panel1: "สตอรี่ของคุณที่ปรากฎในสังคมออนไลน์ได้รับทางพัฒนา แต่ชื่อ ArcGIS เว็บแอพลิเคชันของคุณไม่เหมือนกับชื่อสตอรี่", + panel1tooltip: "โดยการกำหนดชื่อ สรุปและภาพเรื่องราวของคุณจะมีลักษณะเช่นนี้:", + panel2: "ชื่อเรื่องไหนที่คุณต้องการใช้บนสังคมออนไลน์", + panel2q1: "ชื่อสตอรี่ (แนะนำ)", + panel2q1tooltip: "โดยเลือกตัวเลือกนี้ชื่อรายการของคุณจะถูกปรับเปลี่ยนให้ตรงกับชื่อเรื่องของคุณและการเปลี่ยนแปลงต่อไปในบิวเดอร์จะทำข้อมูลให้ตรงกัน", + panel2q2: "ชื่อรายการ", + panel3: "ในการทำให้สตอรี่ของคุณมีพัฒนาเพิ่มเติมบนสังคมออนไลน์ ${MYSTORIES} เพื่อเพิ่มสรุปและรูปภาพ", + panel4: "กรุณอย่าเตือนฉันที่เกี่ยวกับสตอรี่นี้อีก" + }, share: { shareTitle: "แบ่งปันเรื่องราว", preview: "แสดงตัวอย่าง", - viewlive: "ดูสด", + viewlive: "แสดงสตอรี่", btnPrivate: "ส่วนตัว", btnPrivateTooltip: "เฉพาะคุณสามารถมองเห็นเรื่องราวได้", btnOrg: "องค์กร", @@ -74,17 +87,18 @@ notavailable2: "ขออภัย การแบ่งปันเรื่องราวของคุณจาก Builder ไม่สนับสนุนบนเวอร์ชั่นนี้ของ Portal for ArcGIS (จำเป็นต้องใช้ 10.4 หรือหลังจากนั้น)", notavailable3: "คุณสามารถแบ่งปันเรื่องราวจาก %ลิงค์%", notavailable4: "เรื่องราวของฉัน", - notavailable5: "หน้าต่างรายการ", + notavailable5: "หน้ารายการ", notavailable6: "ขออภัย ฟีเจอร์นี้ไม่สนับสนุนอย่างสมบูรณ์ในโหมดของการพัฒนา ขึ้นอยู่กับเหตุการณ์ของคุณ ฟีเจอร์อาจจะถูกสนับสนุนเมื่อสร้าง", notavailable7: "ให้แน่ใจว่า ตรวจสอบที่ %เนื้อหาของฉัน% เพื่อยืนยันว่าแผนที่และชั้นข้อมูลที่ใช้ในเรื่องราวของคุณถูกแบ่งปันแล้ว", - notavailable8: "เนื้อหาของฉัน" + notavailable8: "เนื้อหาของฉัน", + mystoriesinvite2: "ในการทำให้สตอรี่ของคุณมีพัฒนาเพิ่มเติมบนสังคมออนไลน์ใช้ ${MYSTORIES} เพื่อเพิ่มสรุปและรูปภาพ" }, settings: { header: "การตั้งค่า", tabError: "กรุณาตรวจสอบความผิดพลาดในทุกๆ แถบ" }, settingsLayout: { - title: "แบบร่าง", + title: "หน้ากระดาษ", explain: "คุณต้องการใช้รูปแบบโครงสร้างแบบใด?", explainInit: "คุณสามารถแก้ไขโครงร่างได้ตลอดเวลาจากการตั้งค่าที่กล่องโต้ตอบ", viewExample: "ดูเป็นตัวอย่างจริง" diff --git a/src/app/storymaps/common/_resources/nls/th/webmap.js b/src/app/storymaps/common/_resources/nls/th/webmap.js index 1746d424..f34fd3a6 100644 --- a/src/app/storymaps/common/_resources/nls/th/webmap.js +++ b/src/app/storymaps/common/_resources/nls/th/webmap.js @@ -9,6 +9,8 @@ lblControls: "พิเศษ", lblOverview: "ภาพรวมของแผนที่", lblLegend: "สัญลักษณ์", + lblGeocoder: "ที่อยู่หรือค้นหาสถานที่", + tooltipGeocoder: "อนุญาตให้ผู้ใช้ค้นหาที่อยู่และสถานที่บนแผนที่ของคุณ", loadingTitle: "กำลังโหลดหัวเรื่อง", entry: "เข้า", entries: "เข้า", @@ -28,7 +30,7 @@ customCfg: "ปรับการตั้งค่า", tooltipLocation: "กำหนดสถานแผนที่ที่จะนำมาใช้เมื่อผู้อ่านของคุณนำทางไปยังส่วนนี้", tooltipContent: "กำหนดระยะการมองเห็นชั้นข้อมูล", - tooltipPopup: "เลือกป๊อปอัพเพื่อแสดงเมื่อคุณนำทางไปยังส่วนนี้", + tooltipPopup: "เลือกป๊อปอัพที่จะเปิดเมื่อที่การแสดงแผนที่", tooltipOverview: "แสดงแผนที่ภาพรวมขนาดเล็กพร้อมๆ กับแผนที่หลัก", tooltipLegend: "เลือกแสดงสัญลักษณ์แผนที่บนแผนที่ ซึ่งจะเป็นประโยชน์อย่างมากในกรณีที่แผนที่มีหลายชั้นข้อมูลและหลายสัญลักษณ์", mapCfgInvite: "ใช้การควบคุมการตั้งค่าแผนที่ของคุณ", @@ -45,9 +47,9 @@ extentTitle: "ตำแหน่งแผนที่", extentExplain: "เลือกและขยายแผนที่ตามที่กำหนด วิธีการมองหาผู้อ่าน", extentSave: "บันทึกตำแหน่งแผนที่", - popupTitle: "ป็อปอัพแผนที่", - popupExplain: "ปรับแต่งภาพลักษณ์ของกล่องข้อความ popup ที่จะแสดงให้ผู้ใช้งานเห็น", - popupSave: "บันทึกการตั้งค่าป็อปอัพ", + popupTitle: "แผนที่ป๊อปอัพ", + popupExplain: "คลิกบนฟีเจอร์เพื่อเปิดป๊อปอัพที่คุณต้องการแสดง", + popupSave: "บันทึกการปรับบนป๊อปอัพ", hintNavigation: "แผนที่นำทางถูกปิดใช้งาน" }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/tr/core.js b/src/app/storymaps/common/_resources/nls/tr/core.js index 87ac3759..9b2cd569 100644 --- a/src/app/storymaps/common/_resources/nls/tr/core.js +++ b/src/app/storymaps/common/_resources/nls/tr/core.js @@ -18,7 +18,8 @@ height: "Yükseklik", create: "Oluştur", yes: "Evet", - no: "Hayır" + no: "Hayır", + mystories: "Hikayelerim" }, inlineFieldEdit: { editMe: "Beni düzenle!" @@ -30,9 +31,10 @@ buttonShare: "Paylaş", buttonSettings: "Ayarlar", buttonHelp: "Yardım", - buttonPreview: "Canlı Görünüm", + buttonPreview: "Hikayeyi görüntüle", tooltipFirstSave: "Bu, kaydedene kadar kullanılamaz.", tooltipNotShared: "Bu, paylaşana kadar kullanılamaz.", + tooltipNotShared2: "Hikayeniz paylaşılmamış, ona yalnızca siz erişebilirsiniz.", noPendingChange: "Bekleyen değişiklik yok", unSavedChangePlural: "Bekleyen değişiklikler", closeWithPendingChange: "Bu eylemi onaylamak istediğinizden emin misiniz? Değişiklikleriniz silinecek.", @@ -52,10 +54,21 @@ err1Div2: "Hikayenizin başlığını değiştirin ve ardından kaydedin.", btnOk: "Hikaye başlığını düzenle" }, + saveErrorSocial: { + title: "Sosyal medya paylaşma güncellemesi", + panel1: "Hikayenizin sosyal medyadaki görünümü iyileştirildi, ancak ArcGIS web uygulaması öğenizin başlığı hikaye başlığınızla aynı değil.", + panel1tooltip: "Bir başlık, özet ve küçük resim tanımlandıktan sonra hikayeniz şöyle görüntülenir:", + panel2: "Sosyal medyada hangi başlığı kullanmak istersiniz?", + panel2q1: "Hikaye başlığı (önerilen)", + panel2q1tooltip: "Bu seçeneği tercih ettiğinizde, öğenizin başlığı hikaye başlığınızla eşleşecek biçimde değiştirilir ve oluşturucudaki ilave değişiklikler senkronize edilir.", + panel2q2: "Öğe başlığı", + panel3: "Hikayenizin sosyal medyada görüntülenme biçimini daha da iyileştirmek için ${MYSTORIES} kullanarak bir özet ve küçük resim ekleyin.", + panel4: "Bu hikaye için beni bir daha uyarma" + }, share: { shareTitle: "Hikayenizi paylaşın", preview: "Önizleme", - viewlive: "Canlı görünüm", + viewlive: "Hikayeyi görüntüle", btnPrivate: "Gizli", btnPrivateTooltip: "Hikayeyi yalnızca siz görebilirsiniz", btnOrg: "Kuruluş", @@ -74,10 +87,11 @@ notavailable2: "Üzgünüz, hikayenizin Oluşturucu\'dan paylaşılması bu Portal for ArcGIS (10.4 veya üstü gerekir) sürümünde desteklenmiyor.", notavailable3: "Bu hikayeyi %LINK% bağlantısından paylaşabilirsiniz.", notavailable4: "Hikayelerim", - notavailable5: "öğe sayfasıdır", + notavailable5: "ilgili öğe sayfası", notavailable6: "Üzgünüz, bu detay geliştirme modunda tam olarak desteklenmez. Dağıtım senaryonuza bağlı olarak bu detay dağıtıldığında desteklenebilir.", notavailable7: "Hikayenizde kullanılan haritaların ve katmanların da paylaşıldığını onaylamak için %MYCONTENT% bağlantısını ziyaret edin.", - notavailable8: "İçeriklerim" + notavailable8: "İçeriklerim", + mystoriesinvite2: "Hikayenizin sosyal ağlarda görüntülenme biçimini daha da iyileştirmek için ${MYSTORIES} kullanarak bir özet ve küçük resim ekleyin." }, settings: { header: "Ayarlar", @@ -90,10 +104,10 @@ viewExample: "Canlı örnek görüntüle" }, settingsTheme: { - title: "Tema" + title: "Konu" }, settingsHeader: { - title: "Üstbilgi", + title: "Başlık", logoEsri: "Esri logosu", logoNone: "Logo yok", logoCustom: "Özel logo", diff --git a/src/app/storymaps/common/_resources/nls/tr/webmap.js b/src/app/storymaps/common/_resources/nls/tr/webmap.js index ba7c906c..8ad652b5 100644 --- a/src/app/storymaps/common/_resources/nls/tr/webmap.js +++ b/src/app/storymaps/common/_resources/nls/tr/webmap.js @@ -5,10 +5,12 @@ lblWebMap: "Harita", lblLocation: "Konum", lblContent: "İçerik", - lblPopup: "Açılır Menü", + lblPopup: "Açılır pencere", lblControls: "Ekstralar", lblOverview: "Genel Bakış Haritası", lblLegend: "Gösterim", + lblGeocoder: "Adres veya Yer Bulucu", + tooltipGeocoder: "Kullanıcılarınızın haritalarınızdaki adresleri ve yerleri bulmasına izin verin.", loadingTitle: "Başlık yükleniyor", entry: "Giriş", entries: "Girişler", @@ -28,7 +30,7 @@ customCfg: "Özel yapılandırma", tooltipLocation: "Bu haritanın görüntüleyeceği konumu tanımlayın.", tooltipContent: "Görünür katmanları tanımlayın.", - tooltipPopup: "Bu harita görüntülendiğinde açılacak bir açılır pencere seçin.", + tooltipPopup: "Bu harita görüntülendiğinde açılacak olan bir açılır pencere seçin.", tooltipOverview: "Ana haritayla birlikte küçük bir genel bakış haritası görüntüleyin.", tooltipLegend: "Harita gösterimini harita üzerinde görüntüleyin, haritada bir çok katman ve sembol olduğunda yararlıdır.", mapCfgInvite: "Haritanızı yapılandırmak için şu denetimleri kullanın", diff --git a/src/app/storymaps/common/_resources/nls/vi/core.js b/src/app/storymaps/common/_resources/nls/vi/core.js index 51a471cd..f0963802 100644 --- a/src/app/storymaps/common/_resources/nls/vi/core.js +++ b/src/app/storymaps/common/_resources/nls/vi/core.js @@ -18,7 +18,8 @@ height: "Chiều cao", create: "Tạo", yes: "Có", - no: "Không" + no: "Không", + mystories: "Câu chuyện của Tôi" }, inlineFieldEdit: { editMe: "Chỉnh sửa tôi!" @@ -30,9 +31,10 @@ buttonShare: "Chia sẻ", buttonSettings: "Thiết lập", buttonHelp: "Trợ giúp", - buttonPreview: "Xem Trực tiếp", + buttonPreview: "Xem câu chuyện", tooltipFirstSave: "Ứng dụng này không khả dụng cho đến khi bạn lưu.", tooltipNotShared: "Ứng dụng này không khả dụng cho đến khi bạn chia sẻ.", + tooltipNotShared2: "Câu chuyện của bạn không được chia sẻ, chỉ có bạn mới được truy cập câu chuyện này.", noPendingChange: "Không có thay đổi chờ xử lý", unSavedChangePlural: "Thay đổi chờ xử lý", closeWithPendingChange: "Bạn có chắc chắn muốn xác nhận hành động này không? Các thay đổi của bạn sẽ bị mất.", @@ -52,10 +54,21 @@ err1Div2: "Vui lòng sửa đổi tiêu đề câu chuyện của bạn, sau đó lưu lại.", btnOk: "Chỉnh sửa tiêu đề câu chuyện" }, + saveErrorSocial: { + title: "Cập nhật chia sẻ trên mạng xã hội", + panel1: "Hình dạng câu chuyện của bạn trên mạng xã hội đã được cải thiện, tuy nhiên, tiêu đề mục ứng dụng web ArcGIS của bạn không giống với tiêu đề câu chuyện của bạn.", + panel1tooltip: "Bằng cách xác định tiêu đề, phần tổng kết và hình thu nhỏ, câu chuyện của bạn sẽ trông như thế này:", + panel2: "Bạn muốn sử dụng tiêu đề nào trên mạng xã hội:", + panel2q1: "Tiêu đề câu chuyện (khuyến nghị)", + panel2q1tooltip: "Bằng cách chọn tùy chọn này, tiêu đề mục của bạn sẽ được điều chỉnh cho khớp với tiêu đề câu chuyện của bạn và các thay đổi tiếp theo trong bộ thiết lập sẽ được đồng bộ hóa.", + panel2q2: "Tiêu đề mục", + panel3: "Để cải thiện hơn nữa hình dạng của câu chuyện của bạn trên mạng xã hội, hãy sử dụng ${MYSTORIES} để thêm phần tổng kết và hình thu nhỏ.", + panel4: "Đừng cảnh báo lại đối với câu chuyện này" + }, share: { shareTitle: "Chia sẻ câu chuyện của bạn", preview: "Xem trước", - viewlive: "Xem trực tiếp", + viewlive: "Xem câu chuyện", btnPrivate: "Riêng tư", btnPrivateTooltip: "Chỉ có bạn được quyền xem câu chuyện", btnOrg: "Tổ chức", @@ -74,10 +87,11 @@ notavailable2: "Xin lỗi, chia sẻ câu chuyện của bạn từ Bộ thiết lập không được hỗ trợ trên phiên bản Portal for ArcGIS này (yêu cầu phiên bản 10.4 trở lên).", notavailable3: "Bạn có thể chia sẻ câu chuyện từ %LINK%.", notavailable4: "Câu chuyện của Tôi", - notavailable5: "Nó là trang mục", + notavailable5: "trang mục của câu chuyện", notavailable6: "Xin lỗi, tính năng này không được hỗ trợ đầy đủ trong chế độ phát triển. Tùy theo kịch bản triển khai của bạn, tính năng này có thể được hỗ trợ khi được triển khai.", notavailable7: "Hãy bảo đảm truy cập %MYCONTENT% để xác nhận bản đồ và lớp được sử dụng trong câu chuyện của bạn cũng được chia sẻ.", - notavailable8: "Nội dung của tôi" + notavailable8: "Nội dung của tôi", + mystoriesinvite2: "Để cải thiện hình dạng của câu chuyện của bạn trên mạng xã hội, hãy sử dụng ${MYSTORIES} để thêm phần tổng kết và hình thu nhỏ." }, settings: { header: "Thiết lập", @@ -93,7 +107,7 @@ title: "Chủ đề" }, settingsHeader: { - title: "Đầu mục", + title: "Đầu trang", logoEsri: "Logo Esri", logoNone: "Không có logo", logoCustom: "Logo tùy chỉnh", diff --git a/src/app/storymaps/common/_resources/nls/vi/webmap.js b/src/app/storymaps/common/_resources/nls/vi/webmap.js index 4295063f..f84946c0 100644 --- a/src/app/storymaps/common/_resources/nls/vi/webmap.js +++ b/src/app/storymaps/common/_resources/nls/vi/webmap.js @@ -9,6 +9,8 @@ lblControls: "Ứng dụng phụ", lblOverview: "Bản đồ Toàn cảnh", lblLegend: "Chú giải", + lblGeocoder: "Trình Tìm kiếm Địa chỉ hoặc Địa điểm", + tooltipGeocoder: "Cho phép người dùng tìm địa chỉ và địa điểm trên các bản đồ của bạn.", loadingTitle: "Đang tải tiêu đề", entry: "Mục nhập", entries: "Các mục nhập", @@ -45,7 +47,7 @@ extentTitle: "Vị trí bản đồ", extentExplain: "Quay và phóng to bản đồ để xác định giao diện của bản đồ cho người đọc của bạn.", extentSave: "Lưu vị trí Bản đồ", - popupTitle: "Cửa sổ pop-up trên Bản đồ", + popupTitle: "Cửa sổ pop-up bản đồ", popupExplain: "Bấm vào một đối tượng để mở cửa sổ popup mà bạn muốn hiển thị.", popupSave: "Lưu cấu hình cửa sổ pop-up", hintNavigation: "Điều hướng bản đồ bị tắt." diff --git a/src/app/storymaps/common/_resources/nls/webmap.js b/src/app/storymaps/common/_resources/nls/webmap.js index b12439e9..83e16ddc 100644 --- a/src/app/storymaps/common/_resources/nls/webmap.js +++ b/src/app/storymaps/common/_resources/nls/webmap.js @@ -5,10 +5,12 @@ define({ lblWebMap: "Map", lblLocation: "Location", lblContent: "Content", - lblPopup: "Popup", + lblPopup: "Pop-up", lblControls: "Extras", lblOverview: "Overview Map", lblLegend: "Legend", + lblGeocoder: "Address or Place Finder", + tooltipGeocoder: "Allow your users to find addresses and places on your maps.", loadingTitle: "Loading title", entry: "Entry", entries: "Entries", @@ -28,7 +30,7 @@ define({ customCfg: "Custom configuration", tooltipLocation: "Define the location that this map will display.", tooltipContent: "Define the visible layers.", - tooltipPopup: "Choose a popup that will be opened when this map is displayed.", + tooltipPopup: "Choose a pop-up that will be opened when this map is displayed.", tooltipOverview: "Display a small overview map along with the main map.", tooltipLegend: "Display the map legend on the map, helpful when the map has many layers and symbols.", mapCfgInvite: "Use these controls to configure your map", @@ -45,9 +47,9 @@ define({ extentTitle: "Map location", extentExplain: "Pan and zoom the map to define how it will look for your readers.", extentSave: "Save Map location", - popupTitle: "Map popup", - popupExplain: "Click on a feature to open the popup you want to display.", - popupSave: "Save the popup configuration", + popupTitle: "Map pop-up", + popupExplain: "Click on a feature to open the pop-up you want to display.", + popupSave: "Save the pop-up configuration", hintNavigation: "Map navigation is disabled." }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/zh-CN/core.js b/src/app/storymaps/common/_resources/nls/zh-CN/core.js index ac530649..f3c2eadb 100644 --- a/src/app/storymaps/common/_resources/nls/zh-CN/core.js +++ b/src/app/storymaps/common/_resources/nls/zh-CN/core.js @@ -18,7 +18,8 @@ height: "高度", create: "创建", yes: "是", - no: "否" + no: "否", + mystories: "我的故事" }, inlineFieldEdit: { editMe: "编辑！" @@ -30,9 +31,10 @@ buttonShare: "共享", buttonSettings: "设置", buttonHelp: "帮助", - buttonPreview: "实时查看", + buttonPreview: "查看故事", tooltipFirstSave: "保存后，此功能才可用。", tooltipNotShared: "共享后，此功能才可用。", + tooltipNotShared2: "您的故事尚未共享，只有您可以进行访问。", noPendingChange: "无待决的更改", unSavedChangePlural: "待决更改", closeWithPendingChange: "是否确定要确认此操作？您的更改将丢失。", @@ -52,10 +54,21 @@ err1Div2: "请修改故事的标题，然后将其保存。", btnOk: "编辑故事标题" }, + saveErrorSocial: { + title: "社交媒体共享更新", + panel1: "您的故事在社交媒体上的外观已改善，但您的 ArcGIS web 应用程序项目标题与故事标题不一致。", + panel1tooltip: "通过定义标题、摘要和缩略图，您的故事将显示如下:", + panel2: "您希望在社交媒体上使用的标题:", + panel2q1: "故事标题(建议)", + panel2q1tooltip: "通过选择此选项，可将您的项目标题修改为与故事标题相匹配的标题并同步对构建器所做的进一步更改。", + panel2q2: "项目标题", + panel3: "要进一步改善您的故事在社交媒体上的外观，请使用 ${MYSTORIES} 添加摘要和缩略图。", + panel4: "此故事不再提醒" + }, share: { shareTitle: "共享您的故事", preview: "预览", - viewlive: "实时查看", + viewlive: "查看故事", btnPrivate: "私有", btnPrivateTooltip: "仅限您个人可查看故事", btnOrg: "组织", @@ -74,10 +87,11 @@ notavailable2: "抱歉，此版本的 Portal for ArcGIS 不支持从“构建器”共享您的故事(需要 10.4 或更高版本)。", notavailable3: "您可从 %LINK% 共享此故事。", notavailable4: "我的故事", - notavailable5: "此为项页面", + notavailable5: "其项目页面", notavailable6: "抱歉，在开发模式下无法完全支持此要素。根据您的部署方案，此要素在部署后可能被支持。", notavailable7: "请务必访问 %MYCONTENT%，以确认在您的故事中使用的地图和图层同样被共享。", - notavailable8: "我的内容" + notavailable8: "我的内容", + mystoriesinvite2: "要改善您的故事在社交网络上的外观，请使用 ${MYSTORIES} 添加摘要和缩略图。" }, settings: { header: "设置", @@ -90,10 +104,10 @@ viewExample: "查看实时示例" }, settingsTheme: { - title: "专题" + title: "主题" }, settingsHeader: { - title: "标题", + title: "页眉", logoEsri: "Esri 徽标", logoNone: "无徽标", logoCustom: "自定义徽标", diff --git a/src/app/storymaps/common/_resources/nls/zh-CN/webmap.js b/src/app/storymaps/common/_resources/nls/zh-CN/webmap.js index cc88cd33..936891d0 100644 --- a/src/app/storymaps/common/_resources/nls/zh-CN/webmap.js +++ b/src/app/storymaps/common/_resources/nls/zh-CN/webmap.js @@ -9,6 +9,8 @@ lblControls: "额外部分", lblOverview: "鹰眼图", lblLegend: "图例", + lblGeocoder: "地址或地点查找器", + tooltipGeocoder: "允许用户在地图上查找地址和地点。", loadingTitle: "加载标题", entry: "条目", entries: "条目", @@ -28,7 +30,7 @@ customCfg: "自定义配置", tooltipLocation: "定义此地图将显示的位置。", tooltipContent: "定义可见图层。", - tooltipPopup: "选择显示此地图时将打开的弹出窗口。", + tooltipPopup: "选择将在显示此地图时打开的弹出窗口。", tooltipOverview: "显示主地图的同时显示一个小总览图。", tooltipLegend: "在地图上显示地图图例，地图具有许多图层和符号的情况下非常有用。", mapCfgInvite: "使用这些控件来配置地图", diff --git a/src/app/storymaps/common/_resources/nls/zh-hk/core.js b/src/app/storymaps/common/_resources/nls/zh-hk/core.js index 8c46f39e..2cb8b00a 100644 --- a/src/app/storymaps/common/_resources/nls/zh-hk/core.js +++ b/src/app/storymaps/common/_resources/nls/zh-hk/core.js @@ -18,7 +18,8 @@ height: "高度", create: "建立(C)", yes: "是", - no: "否" + no: "否", + mystories: "我的經驗" }, inlineFieldEdit: { editMe: "編輯!" @@ -30,9 +31,10 @@ buttonShare: "分享", buttonSettings: "設定", buttonHelp: "說明", - buttonPreview: "即時檢視", + buttonPreview: "檢視故事", tooltipFirstSave: "儲存後，此功能才可用。", tooltipNotShared: "分享後，此功能才可用。", + tooltipNotShared2: "您的故事未分享，只有您可以存取。", noPendingChange: "無待決的變更", unSavedChangePlural: "待決變更", closeWithPendingChange: "是否確定要確認此操作？您的變更將遺失。", @@ -52,10 +54,21 @@ err1Div2: "請修改故事的標題，然後將其儲存。", btnOk: "編輯故事標題" }, + saveErrorSocial: { + title: "社交媒體分享更新", + panel1: "您在社交媒體上的故事外觀已優化，但您的 ArcGIS Web 應用程式項目標題不同於您的故事標題。", + panel1tooltip: "藉由定義標題、摘要和縮圖圖片，您的故事外觀類似於：", + panel2: "您要在社交媒體上使用哪個標題:", + panel2q1: "故事標題（建議）", + panel2q1tooltip: "藉由選擇此選項，將修改您的項目標題來符合您的故事標題，並在將同步的建立器中進一步變更。", + panel2q2: "項目標題", + panel3: "要進一步優化您在社交媒體上的故事外觀，請使用 ${MYSTORIES} 以新增摘要和縮圖圖片。", + panel4: "請勿再針對此故事發出警告" + }, share: { shareTitle: "分享您的故事", preview: "預覽", - viewlive: "即時檢視", + viewlive: "檢視故事", btnPrivate: "私有", btnPrivateTooltip: "只有您能看到故事", btnOrg: "組織", @@ -77,14 +90,15 @@ notavailable5: "其項目頁面", notavailable6: "很抱歉，開發模式不完全支援此圖徵。依據您的部署情況，可能在部署時支援此圖徵。", notavailable7: "請務必造訪 %MYCONTENT%，確認另外分享您故事中使用的地圖和圖層。", - notavailable8: "我的內容" + notavailable8: "我的內容", + mystoriesinvite2: "要優化您在社交網路上的故事外觀，請使用 ${MYSTORIES} 以新增摘要和縮圖圖片。" }, settings: { header: "設定", tabError: "請檢查所有索引標籤中的錯誤" }, settingsLayout: { - title: "版面設定", + title: "版面配置", explain: "想要使用哪種版面設定？", explainInit: "可隨時在設定對話方塊中變更版面設定。", viewExample: "查看即時範例" diff --git a/src/app/storymaps/common/_resources/nls/zh-hk/webmap.js b/src/app/storymaps/common/_resources/nls/zh-hk/webmap.js index 9304915f..b78802ff 100644 --- a/src/app/storymaps/common/_resources/nls/zh-hk/webmap.js +++ b/src/app/storymaps/common/_resources/nls/zh-hk/webmap.js @@ -9,6 +9,8 @@ lblControls: "額外部分", lblOverview: "總覽圖", lblLegend: "圖例", + lblGeocoder: "地址或地點查詢器", + tooltipGeocoder: "允許使用者在地圖上查詢地址和地點。", loadingTitle: "載入標題", entry: "條目", entries: "條目", @@ -45,9 +47,9 @@ extentTitle: "地圖位置", extentExplain: "平移並縮放地圖以定義供讀者觀看的地圖外觀。", extentSave: "儲存地圖位置", - popupTitle: "地圖快顯", + popupTitle: "地圖快顯視窗", popupExplain: "按一下圖徵以打開您要顯示的快顯。", - popupSave: "儲存快顯設定", + popupSave: "儲存快顯配置", hintNavigation: "地圖導航已停用。" }, editor: { diff --git a/src/app/storymaps/common/_resources/nls/zh-tw/core.js b/src/app/storymaps/common/_resources/nls/zh-tw/core.js index 8c46f39e..2cb8b00a 100644 --- a/src/app/storymaps/common/_resources/nls/zh-tw/core.js +++ b/src/app/storymaps/common/_resources/nls/zh-tw/core.js @@ -18,7 +18,8 @@ height: "高度", create: "建立(C)", yes: "是", - no: "否" + no: "否", + mystories: "我的經驗" }, inlineFieldEdit: { editMe: "編輯!" @@ -30,9 +31,10 @@ buttonShare: "分享", buttonSettings: "設定", buttonHelp: "說明", - buttonPreview: "即時檢視", + buttonPreview: "檢視故事", tooltipFirstSave: "儲存後，此功能才可用。", tooltipNotShared: "分享後，此功能才可用。", + tooltipNotShared2: "您的故事未分享，只有您可以存取。", noPendingChange: "無待決的變更", unSavedChangePlural: "待決變更", closeWithPendingChange: "是否確定要確認此操作？您的變更將遺失。", @@ -52,10 +54,21 @@ err1Div2: "請修改故事的標題，然後將其儲存。", btnOk: "編輯故事標題" }, + saveErrorSocial: { + title: "社交媒體分享更新", + panel1: "您在社交媒體上的故事外觀已優化，但您的 ArcGIS Web 應用程式項目標題不同於您的故事標題。", + panel1tooltip: "藉由定義標題、摘要和縮圖圖片，您的故事外觀類似於：", + panel2: "您要在社交媒體上使用哪個標題:", + panel2q1: "故事標題（建議）", + panel2q1tooltip: "藉由選擇此選項，將修改您的項目標題來符合您的故事標題，並在將同步的建立器中進一步變更。", + panel2q2: "項目標題", + panel3: "要進一步優化您在社交媒體上的故事外觀，請使用 ${MYSTORIES} 以新增摘要和縮圖圖片。", + panel4: "請勿再針對此故事發出警告" + }, share: { shareTitle: "分享您的故事", preview: "預覽", - viewlive: "即時檢視", + viewlive: "檢視故事", btnPrivate: "私有", btnPrivateTooltip: "只有您能看到故事", btnOrg: "組織", @@ -77,14 +90,15 @@ notavailable5: "其項目頁面", notavailable6: "很抱歉，開發模式不完全支援此圖徵。依據您的部署情況，可能在部署時支援此圖徵。", notavailable7: "請務必造訪 %MYCONTENT%，確認另外分享您故事中使用的地圖和圖層。", - notavailable8: "我的內容" + notavailable8: "我的內容", + mystoriesinvite2: "要優化您在社交網路上的故事外觀，請使用 ${MYSTORIES} 以新增摘要和縮圖圖片。" }, settings: { header: "設定", tabError: "請檢查所有索引標籤中的錯誤" }, settingsLayout: { - title: "版面設定", + title: "版面配置", explain: "想要使用哪種版面設定？", explainInit: "可隨時在設定對話方塊中變更版面設定。", viewExample: "查看即時範例" diff --git a/src/app/storymaps/common/_resources/nls/zh-tw/webmap.js b/src/app/storymaps/common/_resources/nls/zh-tw/webmap.js index 9304915f..b78802ff 100644 --- a/src/app/storymaps/common/_resources/nls/zh-tw/webmap.js +++ b/src/app/storymaps/common/_resources/nls/zh-tw/webmap.js @@ -9,6 +9,8 @@ lblControls: "額外部分", lblOverview: "總覽圖", lblLegend: "圖例", + lblGeocoder: "地址或地點查詢器", + tooltipGeocoder: "允許使用者在地圖上查詢地址和地點。", loadingTitle: "載入標題", entry: "條目", entries: "條目", @@ -45,9 +47,9 @@ extentTitle: "地圖位置", extentExplain: "平移並縮放地圖以定義供讀者觀看的地圖外觀。", extentSave: "儲存地圖位置", - popupTitle: "地圖快顯", + popupTitle: "地圖快顯視窗", popupExplain: "按一下圖徵以打開您要顯示的快顯。", - popupSave: "儲存快顯設定", + popupSave: "儲存快顯配置", hintNavigation: "地圖導航已停用。" }, editor: { diff --git a/src/app/storymaps/common/builder/Builder.js b/src/app/storymaps/common/builder/Builder.js index 639aeb46..66a63a2e 100644 --- a/src/app/storymaps/common/builder/Builder.js +++ b/src/app/storymaps/common/builder/Builder.js @@ -94,8 +94,25 @@ define(["lib-build/css!./Builder", function appInitComplete() { + var storyTitle = "", + itemTitle = ""; + + if ( app.data.getWebAppData().getTitle() ) { + storyTitle = app.data.getWebAppData().getTitle().trim(); + } + + if (app.data.getWebAppItem() && app.data.getWebAppItem().title ) { + itemTitle = app.data.getWebAppItem().title.trim(); + } + + app.builder.titleMatchOnLoad = itemTitle == storyTitle; + + if (app.data.getWebAppData().isBlank()) { + app.builder.titleMatchOnLoad = true; + } + _builderPanel.updateSharingStatus(); - _builderView.appInitComplete(saveApp); + _builderView.appInitComplete(); } function resize(cfg) @@ -139,7 +156,7 @@ define(["lib-build/css!./Builder", // Save // - function saveAppThenWebmap() + function saveAppThenWebmap(doNotOverwriteTitle) { if ( ! app.portal ) { console.error("Fatal error - not signed in"); @@ -149,7 +166,7 @@ define(["lib-build/css!./Builder", app.portal.signIn().then( function(){ - saveApp(function(response){ + saveApp(doNotOverwriteTitle, function(response){ if (!response || !response.success) { appSaveFailed("APP"); return; @@ -235,12 +252,16 @@ define(["lib-build/css!./Builder", ); */ // Save the app - saveApp(function(response2){ + saveApp(false, function(response2){ if (!response2 || !response2.success) { appSaveFailed("APP"); return; } + var baseUrl = document.location.protocol + '//' + document.location.host + document.location.pathname; + if ( ! baseUrl.match(/index\.html$/) ) + baseUrl += "index.html"; + // Update the app item app.data.setWebAppItem( lang.mixin( @@ -248,13 +269,13 @@ define(["lib-build/css!./Builder", { id: response2.id, item: response2.item, - url: document.location.protocol + '//' + document.location.host + document.location.pathname + '?appid=' + response2.id + url: baseUrl + '?appid=' + response2.id } ) ); // Save the app a second time - saveApp(function(response3){ + saveApp(false, function(response3){ if (!response3 || !response3.success) { appSaveFailed("APP"); return; @@ -266,7 +287,7 @@ define(["lib-build/css!./Builder", app.isDirectCreationFirstSave = false; _builderPanel.updateSharingStatus(); - History.replaceState({}, "", "?appid=" + response3.id + "&edit"); + History.replaceState({}, "", "index.html?appid=" + response3.id + "&edit"); }); }); //}); @@ -327,7 +348,7 @@ define(["lib-build/css!./Builder", ); // Save the app - saveApp(function(response2){ + saveApp(false, function(response2){ if (!response2 || !response2.success) { appSaveFailed("APP"); return; @@ -340,7 +361,7 @@ define(["lib-build/css!./Builder", app.isGalleryCreation = false; _builderPanel.updateSharingStatus(); - History.replaceState({}, "", "?appid=" + response2.id + "&edit"); + History.replaceState({}, "", "index.html?appid=" + response2.id + "&edit"); }; // Share the webmap and eventual FS if the app isn't private @@ -383,7 +404,7 @@ define(["lib-build/css!./Builder", // Web mapping application save // - function saveApp(nextFunction) + function saveApp(doNotOverwriteTitle, nextFunction) { var portalUrl = getPortalURL(), appItem = lang.clone(app.data.getWebAppItem()), @@ -432,6 +453,20 @@ define(["lib-build/css!./Builder", // App proxies appItem.serviceProxyParams = JSON.stringify(appItem.serviceProxyParams); + // Title + if ( ! doNotOverwriteTitle ) { + appItem.title = app.data.getWebAppData().getTitle(); + } + + if ( appItem.properties ) { + appItem.properties = JSON.stringify(appItem.properties); + } + + // Edit URL of hosted apps to always include index.html + if ( appItem.url && appItem.url.match(/apps\/[a-zA-Z]+\/\?appid=/) ) { + appItem.url = appItem.url.replace('/?appid=', '/index.html?appid='); + } + appItem = lang.mixin(appItem, { f: "json", token: token, @@ -567,6 +602,11 @@ define(["lib-build/css!./Builder", function appSaveSucceeded(response) { if (response && response.success) { + app.mystories = app.mystories || { }; + app.mystories.isChecking = true; + + app.isWebMapCreation = false; + _builderPanel.saveSucceeded(); app.data.updateAfterSave(); diff --git a/src/app/storymaps/common/builder/BuilderPanel.js b/src/app/storymaps/common/builder/BuilderPanel.js index d382d0de..6048334a 100644 --- a/src/app/storymaps/common/builder/BuilderPanel.js +++ b/src/app/storymaps/common/builder/BuilderPanel.js @@ -7,8 +7,9 @@ define(["lib-build/tpl!./BuilderPanel", "dojo/i18n!commonResources/nls/core.js?v=" + app.version, "storymaps/common/utils/CommonHelper", "./SaveErrorPopup", + "./SaveErrorPopupSocial", "dojo/topic"], - function (viewTpl, cssTpl, i18n, CommonHelper, SaveErrorPopup, topic) { + function (viewTpl, cssTpl, i18n, CommonHelper, SaveErrorPopup, SaveErrorPopupSocial, topic) { return function BuilderPanel(container, builderSave, builderDirectCreationFirstSave, builderGalleryCreationFirstSave) { container.append(viewTpl({ @@ -19,18 +20,20 @@ define(["lib-build/tpl!./BuilderPanel", btnHelp: i18n.commonCore.builderPanel.buttonHelp, btnPreview: i18n.commonCore.builderPanel.buttonPreview, tooltipFirstSave: i18n.commonCore.builderPanel.tooltipFirstSave, - tooltipNotShared: i18n.commonCore.builderPanel.tooltipNotShared, + tooltipNotShared: i18n.commonCore.builderPanel.tooltipNotShared2, saveCounter: i18n.commonCore.builderPanel.noPendingChange })); var _this = this, _builderView = null, - _saveErrorPopup = null; + _saveErrorPopup = null, + _saveErrorPopupSocial = null; this.init = function(builderView) { _builderView = builderView; _saveErrorPopup = new SaveErrorPopup($("#saveErrorPopup")); + _saveErrorPopupSocial = new SaveErrorPopupSocial($("#saveErrorPopupSocial")); initLocalization(); @@ -126,10 +129,52 @@ define(["lib-build/tpl!./BuilderPanel", builderGalleryCreationFirstSave(); } else { - // Save the app - // If OK and needed call save webmap - // If OK call appSaveSucceeded - builderSave(); + // Save of an existing app + + var storyTitle = "", + itemTitle = ""; + + if ( app.data.getWebAppData().getTitle() ) { + storyTitle = app.data.getWebAppData().getTitle().trim(); + } + + if (app.data.getWebAppItem() && app.data.getWebAppItem().title ) { + itemTitle = app.data.getWebAppItem().title.trim(); + } + + // if item and story title don't match + // and user hasn't chose to not be warned about it + // and story is public + if ( ! app.builder.titleMatchOnLoad + && ! app.data.getWebAppData().getDoNotWarnTitle() + && app.data.getWebAppItem().access == "public" + // Extra check that title actually differs - don't show the dialog it title where not matching but user fixed it + && storyTitle != itemTitle + ) { + // If the warning dialog has already been displayed in the session, skip it and reuse the choice + if ( app.builder.titleMatchDialogDisplayed ) { + builderSave(app.builder.titleFromItem); + } + // Show the warning dialog + else { + app.builder.titleMatchDialogDisplayed = true; + + _saveErrorPopupSocial.present().then( + function(p) { + app.builder.titleFromItem = p && p.choice == 'item'; + builderSave(app.builder.titleFromItem); + } + ); + } + } + else { + // Save the app + // If OK and needed call save webmap + // If OK call appSaveSucceeded + var keepItemTitle = app.data.getWebAppData().getDoNotWarnTitle() + || (app.data.getWebAppItem().access != "public" && ! app.builder.titleMatchOnLoad); + builderSave(keepItemTitle); + } } } @@ -279,9 +324,9 @@ define(["lib-build/tpl!./BuilderPanel", container.find(".builder-save").tooltip('hide'); } - function changeBuilderPanelButtonState(activate) + function changeBuilderPanelButtonState() { - container.find(".builder-cmd").attr("disabled", ! activate); + _this.updateSharingStatus(); _this.resize(); } @@ -291,11 +336,14 @@ define(["lib-build/tpl!./BuilderPanel", * Share & preview button state */ - var disableShare = app.isDirectCreationFirstSave || app.isGalleryCreation, - disablePreview = app.data.getWebAppData().isBlank() || app.data.getWebAppItem().access == "private"; + var disableShare = app.isDirectCreationFirstSave || app.isGalleryCreation || app.isWebMapCreation, + disablePreview = app.data.getWebAppItem().access == "private" + || app.data.getWebAppItem().access == "shared"; container.find('.builder-share').toggleClass("disabled", disableShare); - container.find('.builder-preview').toggleClass("disabled", disablePreview); + container.find('.builder-preview') + .tooltip("destroy") + .removeClass("disabled"); if ( disableShare ) container.find('.builder-share').tooltip({ @@ -304,9 +352,18 @@ define(["lib-build/tpl!./BuilderPanel", else container.find('.builder-share').tooltip('destroy'); - if ( disablePreview ) + if ( disableShare ) { + container.find('.builder-preview') + .addClass("disabled") + .tooltip({ + trigger: 'hover', + title: i18n.commonCore.builderPanel.tooltipFirstSave + }); + } + else if ( disablePreview ) container.find('.builder-preview').tooltip({ - trigger: 'hover' + trigger: 'hover', + title: i18n.commonCore.builderPanel.tooltipNotShared2 }); else container.find('.builder-preview').tooltip('destroy'); @@ -315,6 +372,10 @@ define(["lib-build/tpl!./BuilderPanel", if ( app.ui.headerDesktop ) app.ui.headerDesktop.toggleSocialBtnAppSharing(disablePreview); + app.ui.sidePanel.toggleSocialBtnAppSharing(disablePreview); + app.ui.floatingPanel.toggleSocialBtnAppSharing(disablePreview); + app.ui.mobileView.toggleSocialBtnAppSharing(disablePreview); + /* * Status */ diff --git a/src/app/storymaps/common/builder/SaveErrorPopupSocial.css b/src/app/storymaps/common/builder/SaveErrorPopupSocial.css new file mode 100644 index 00000000..688d5230 --- /dev/null +++ b/src/app/storymaps/common/builder/SaveErrorPopupSocial.css @@ -0,0 +1,49 @@ +.saveErrorPopupSocial .modal-logo { + position: absolute; + top: -20px; + left: -20px; + width: 48px; + height: 48px; + background: url(../_resources/icons/warning-icon.png); + background-size: 42px 42px; + background-repeat: no-repeat; + border: 4px solid #FFF; + border-radius: 24px; +} + +.saveErrorPopupSocial .tooltip.in { + opacity: 1.0; +} + +.saveErrorPopupSocial .panel1 .tooltip-inner { + max-width: 266px !important; + width: 266px; + padding-bottom: 8px; +} + +.saveErrorPopupSocial .panel2 { + margin-top: 10px; +} + +.saveErrorPopupSocial .panel3 { + margin-top: 25px; +} + +.saveErrorPopupSocial .panel2 .form-group { + margin-left: 10px; +} + +.saveErrorPopupSocial .modal-footer { + padding-top: 30px; +} + +.saveErrorPopupSocial .stop-asking { + float: left; + margin-top: -6px; + margin-left: 10px; +} + +.saveErrorPopupSocial .stop-asking label.disabled { + color: #CCC; + cursor: not-allowed; +} \ No newline at end of file diff --git a/src/app/storymaps/common/builder/SaveErrorPopupSocial.html b/src/app/storymaps/common/builder/SaveErrorPopupSocial.html new file mode 100644 index 00000000..de9d4264 --- /dev/null +++ b/src/app/storymaps/common/builder/SaveErrorPopupSocial.html @@ -0,0 +1,52 @@ +
+
+ +
+

<%= title %>

+
+ +
+
+ <%= panel1 %> + + + +
+
+
<%= panel2 %>
+
+
+ +
+
+ +
+
+
+
<%= panel3 %>
+
+ +
+
+
+ +
+
+ +
+
+
\ No newline at end of file diff --git a/src/app/storymaps/common/builder/SaveErrorPopupSocial.js b/src/app/storymaps/common/builder/SaveErrorPopupSocial.js new file mode 100644 index 00000000..a4f243bd --- /dev/null +++ b/src/app/storymaps/common/builder/SaveErrorPopupSocial.js @@ -0,0 +1,83 @@ +define([ + "lib-build/tpl!./SaveErrorPopupSocial", + "lib-build/css!./SaveErrorPopupSocial", + "../utils/CommonHelper", + "storymaps/tpl/core/WebApplicationData", + "dojo/Deferred", + "dojo/i18n!commonResources/nls/core.js?v=" + app.version + ], + function ( + viewTpl, + viewCss, + CommonHelper, + WebApplicationData, + Deferred, + i18n + ) { + return function SaveErrorPopupSocial(container) + { + var _resultDeferred = null; + + container.append(viewTpl({ + title: i18n.commonCore.saveErrorSocial.title, + panel1: i18n.commonCore.saveErrorSocial.panel1, + panel2: i18n.commonCore.saveErrorSocial.panel2, + panel2q1: i18n.commonCore.saveErrorSocial.panel2q1, + panel2q1tooltip: i18n.commonCore.saveErrorSocial.panel2q1tooltip, + panel2q2: i18n.commonCore.saveErrorSocial.panel2q2, + panel3: i18n.commonCore.saveErrorSocial.panel3 + .replace("${MYSTORIES}", '' + i18n.commonCore.common.mystories + ''), + panel4: i18n.commonCore.saveErrorSocial.panel4, + btnSave: i18n.commonCore.common.save + })); + + initEvents(); + + this.present = function() + { + _resultDeferred = new Deferred(); + + container.find('.panel1 .help').tooltip({ + title: i18n.commonCore.saveErrorSocial.panel1tooltip + '', + html: true, + placement: 'right' + }); + + container.find('.panel2 .help').tooltip(); + + container.modal({ keyboard: false }); + + return _resultDeferred; + }; + + function initEvents() + { + container.find("input[name='optErrorSocial']").change(function () { + var value = container.find("input[name='optErrorSocial']:checked").val(); + if ( value == 'story' ) { + container.find('.stop-asking input') + .attr('disabled', 'disabled') + .prop('checked', false); + + container.find('.stop-asking label').addClass('disabled'); + } + else { + container.find('.stop-asking input').removeAttr('disabled'); + container.find('.stop-asking label').removeClass('disabled'); + } + }); + + container.find(".btn-primary").click(function(){ + if ( container.find('.stop-asking input').is(':checked') ) { + WebApplicationData.setDoNotWarnTitle(true); + } + + _resultDeferred.resolve({ + choice: container.find("input[name='optErrorSocial']:checked").val() + }); + container.modal('hide'); + }); + } + }; + } +); \ No newline at end of file diff --git a/src/app/storymaps/common/builder/SharePopup.css b/src/app/storymaps/common/builder/SharePopup.css index 81ab2388..c846540b 100644 --- a/src/app/storymaps/common/builder/SharePopup.css +++ b/src/app/storymaps/common/builder/SharePopup.css @@ -44,11 +44,15 @@ .builderShare .app-sharing-wrapper { position: relative; - display: inline-block; + display: none; text-align: center; margin-left: -6px; } +.builderShare .app-sharing-wrapper.enabled { + display: inline-block; +} + .builderShare .app-sharing-wrapper:first-child .app-sharing-icon { border-left-width: 1px; border-radius: 6px 0 0 6px; @@ -56,9 +60,10 @@ vertical-align: 1px; } -.builderShare .app-sharing-wrapper:nth-child(3) .app-sharing-icon { +.builderShare .app-sharing-wrapper.lastBtn .app-sharing-icon { border-right-width: 1px; - border-radius: 0 6px 6px 0; + border-top-right-radius: 6px; + border-bottom-right-radius: 6px; } .builderShare .locked { @@ -236,7 +241,7 @@ */ .builderShare .view-share { - margin-top: 35px; + margin-top: 25px; } .builderShare .view-share .socialize-title, @@ -284,6 +289,14 @@ display: none; } +.builderShare .my-stories-call { + margin-top: 25px; + color: #555; + text-align: center; + margin-left: auto; + margin-right: auto; +} + /* * Footer */ diff --git a/src/app/storymaps/common/builder/SharePopup.html b/src/app/storymaps/common/builder/SharePopup.html index 7c435fb1..29fdbaa7 100644 --- a/src/app/storymaps/common/builder/SharePopup.html +++ b/src/app/storymaps/common/builder/SharePopup.html @@ -46,8 +46,8 @@

<%= title %>

- +
<%= mystoriesinvite2 %>
diff --git a/src/app/storymaps/common/builder/SharePopup.js b/src/app/storymaps/common/builder/SharePopup.js index 67fe7013..dd300cdd 100644 --- a/src/app/storymaps/common/builder/SharePopup.js +++ b/src/app/storymaps/common/builder/SharePopup.js @@ -40,6 +40,8 @@ define([ // Socialize socialize: i18n.commonCore.share.socialize, embedTitle: i18n.viewer.shareFromCommon.embed, + mystoriesinvite2: i18n.commonCore.share.mystoriesinvite2 + .replace("${MYSTORIES}", '' + i18n.commonCore.common.mystories + ''), // Footer close: i18n.commonCore.common.close })); @@ -128,15 +130,46 @@ define([ container.find('.sharing-action-result').addClass('hide'); - // Toggle the 'share with org' button - container.find('.app-sharing-wrapper').eq(1).toggle(app.portal.isOrganization !== false); + // Toggle the share buttons + var isOrg = app.portal.isOrganization !== false, + enableOrg = isOrg && $.inArray("portal:user:shareToOrg", app.portal.getPortalUser().privileges) > -1, + enablePub = ! isOrg || $.inArray("portal:user:shareToPublic", app.portal.getPortalUser().privileges) > -1, + itemControl = app.data.getWebAppItem().itemControl, + storyIsPrivate = app.data.getWebAppItem().access == "private" || app.data.getWebAppItem().access == "shared", + storyIsOrg = app.data.getWebAppItem().access == "account", + userIsOwner = app.data.getWebAppItem().owner == app.portal.getPortalUser().username; + + // TODO: to review with 4.2 + // Group with shared ownership and custom role with admin:update + if (itemControl == "update") { + enableOrg = false; + enablePub = false; + } + // TODO checking if the privilege is here directly would be enough if builder was not opening if user don't have proper update priv (only admin view all) + else if (itemControl == "admin" && ! userIsOwner) { + enableOrg = $.inArray("portal:admin:shareToOrg", app.portal.getPortalUser().privileges) > -1; + enablePub = $.inArray("portal:admin:shareToPublic", app.portal.getPortalUser().privileges) > -1; + } + + // TODO: in some case the button may need to be disabled + if (storyIsOrg) { + enableOrg = true; + } + else if (! storyIsPrivate) { + enablePub = true; + } + + container.find('.app-sharing-wrapper').eq(0).addClass('enabled'); + container.find('.app-sharing-wrapper').eq(1).toggleClass('enabled', enableOrg); + container.find('.app-sharing-wrapper').eq(2).toggleClass('enabled', enablePub); + container.find('.app-sharing-wrapper.enabled:last').addClass('lastBtn'); container.modal({keyboard: true}); }; function toggleViews() { - var isPrivate = app.data.getWebAppItem().access == "private"; + var isPrivate = app.data.getWebAppItem().access == "private" || app.data.getWebAppItem().access == "shared"; if ( container.find('.views .view-my-stories').hasClass('active') ) { if ( isPrivate ) { @@ -280,7 +313,7 @@ define([ function refreshMyStories(params) { - var isPrivate = app.data.getWebAppItem().access == "private", + var isPrivate = app.data.getWebAppItem().access == "private" || app.data.getWebAppItem().access == "shared", isOrg = app.data.getWebAppItem().access == "account", isFromScratch = app.isDirectCreationFirstSave || app.isGalleryCreation, sharingLevelIndex = isPrivate ? 0 : (isOrg ? 1 : 2), diff --git a/src/app/storymaps/common/builder/browse-dialog/css/browse-dialog.css b/src/app/storymaps/common/builder/browse-dialog/css/browse-dialog.css index 24ac453c..052e156e 100644 --- a/src/app/storymaps/common/builder/browse-dialog/css/browse-dialog.css +++ b/src/app/storymaps/common/builder/browse-dialog/css/browse-dialog.css @@ -39,6 +39,13 @@ body{ overflow:hidden; text-overflow:ellipsis; } +.itemTitle.hover { + text-align: left; + word-break: break-word; + font-size: 90%; + white-space: inherit; + text-overflow: inherit; +} .itemOwner{ color:#757170; white-space:nowrap; diff --git a/src/app/storymaps/common/builder/browse-dialog/js/BrowseIdDlg.js b/src/app/storymaps/common/builder/browse-dialog/js/BrowseIdDlg.js index dd3fbbe7..39b1c7fd 100644 --- a/src/app/storymaps/common/builder/browse-dialog/js/BrowseIdDlg.js +++ b/src/app/storymaps/common/builder/browse-dialog/js/BrowseIdDlg.js @@ -53,7 +53,7 @@ define([ label: this.i18n.items.organizationLabel, value: "org" }, { - label: this.i18n.items.onlineLabel, + label: app.isPortal ? app.portal.name : this.i18n.items.onlineLabel, value: "online" }); //add my favorites to the dropdown for web maps diff --git a/src/app/storymaps/common/builder/browse-dialog/js/Grid.js b/src/app/storymaps/common/builder/browse-dialog/js/Grid.js index 8ebcfba5..9576a4cd 100644 --- a/src/app/storymaps/common/builder/browse-dialog/js/Grid.js +++ b/src/app/storymaps/common/builder/browse-dialog/js/Grid.js @@ -73,7 +73,7 @@ define([ this._view = this.view || "gallery"; this._query = this.query; - this._queryOptions = this.queryOptions || {"sort":this.sort || [{ attribute: "title", descending: false }]}; + this._queryOptions = this.queryOptions || {"sort":this.sort || [{ attribute: "modified", descending: true }]}; this._store = this.store || new Cache(new PortalItemStore({'portal': this.portal, galleryType: this.galleryType}), new Memory({data:[]})); this._rowsPerPage = this.rowsPerPage || 8; this._sort = this.sort || [{ attribute: "title", descending: false }]; @@ -129,10 +129,11 @@ define([ _showSnippet: function(show, event) { var row = this._grid.row(event); if (row){ - query(".itemGrid .itemTitle", row.element).style("display", (show ? "none": "")); + //query(".itemGrid .itemTitle", row.element).style("display", (show ? "none": "")); + query(".itemGrid .itemTitle", row.element)[show ? "addClass" : "removeClass"]("hover"); query(".itemGrid .itemOwner", row.element).style("display", (show ? "none": "")); query(".itemGrid > img", row.element).style("display", (show ? "none" : "")); - query(".itemGrid .snippet", row.element).style("display", (show ? "" : "none")); + //query(".itemGrid .snippet", row.element).style("display", (show ? "" : "none")); } }, diff --git a/src/app/storymaps/common/builder/ckeditor/plugins/storymapsAction/dialog/Geocode.css b/src/app/storymaps/common/builder/ckeditor/plugins/storymapsAction/dialog/Geocode.css index 7b87a376..1ccc092e 100644 --- a/src/app/storymaps/common/builder/ckeditor/plugins/storymapsAction/dialog/Geocode.css +++ b/src/app/storymaps/common/builder/ckeditor/plugins/storymapsAction/dialog/Geocode.css @@ -10,21 +10,13 @@ width: 100% !important; } -.editorDialogGeocode .simpleGeocoder { +.editorDialogGeocode .searchGroup { display: block; position: absolute; top: 20px; left: 70px; } -.editorDialogGeocode .esriGeocoderContainer { - width: 250px; -} - -.editorDialogGeocode #esri_dijit_Geocoder_0_input { - width: 194px; -} - .editorDialogGeocode .mapMarker { margin-top: 5px; } \ No newline at end of file diff --git a/src/app/storymaps/common/builder/ckeditor/plugins/storymapsAction/dialog/Geocode.js b/src/app/storymaps/common/builder/ckeditor/plugins/storymapsAction/dialog/Geocode.js index 25f6e346..2f7d9cb2 100644 --- a/src/app/storymaps/common/builder/ckeditor/plugins/storymapsAction/dialog/Geocode.js +++ b/src/app/storymaps/common/builder/ckeditor/plugins/storymapsAction/dialog/Geocode.js @@ -127,62 +127,21 @@ define(["lib-build/tpl!./Geocode", // // Geocoder // - var geocoder = new Geocoder( - lang.mixin( - { - map: _map/*, - value: value*/ - }, - CommonHelper.createGeocoderOptions() - ), - container.find(".geocoder")[0] - ); - - container.find("#esri_dijit_Geocoder_0_input").attr("placeholder", i18n.commonMedia.editorActionGeocode.lblTitle + "..."); - geocoder.startup(); - on(geocoder, "find-results", function(response){ - //console.log('find', response.results.results[0]) - if( response.results && response.results.results && response.results.results.length ) - geocoder.select(response.results.results[0]); - }); - - on(geocoder, "select", function(response){ - //console.log('select', response.result) - if( response.result && response.result.feature ) - applyGeocodeResult(response.result.feature.geometry); - }); - - /* - on(_geocoder, "select", function(){ - // Close the IOS keyboard - if( has("ios") ) - document.activeElement.blur(); - }); - */ - - on(_map, "extent-change", function(){ - /* - if(_map.locatePointFromMapExtent){ - _map.locatePointFromMapExtent = false; - _geocoderGraphic.setGeometry(_map.extent.getCenter()); - } - */ + CommonHelper.createGeocoder({ + map: _map, + domNode: container.find(".geocoder")[0], + placeHolder: i18n.commonMedia.editorActionGeocode.lblTitle + }).then(function(geocoder) { + on(geocoder, "select-result", function(response){ + //console.log('select', response.result) + if( response.result && response.result.feature ) + applyGeocodeResult(response.result.feature.geometry); + }); }); - // iPad keyboard workaround - //$("#locateMap #geocoder_input").blur(function(){ $(window).scrollTop(0); }); - container.on('shown.bs.modal', function () { _map.resize(); - /* - if ( value ) { - on.once(_map, "update-end", function(){ - //setTimeout(function(){geocoder.find();}, 2000); }); - geocoder.find(); - }); - } - */ }); } diff --git a/src/app/storymaps/common/builder/media/map/EditDialog.js b/src/app/storymaps/common/builder/media/map/EditDialog.js index c87aa8de..0203a613 100644 --- a/src/app/storymaps/common/builder/media/map/EditDialog.js +++ b/src/app/storymaps/common/builder/media/map/EditDialog.js @@ -33,7 +33,8 @@ define([ _hasCreatedMap = false, _hasSavedMap = false, _newMapInfos = null, - _params = null; + _params = null, + _isSaving = false; initEvents(); @@ -206,6 +207,11 @@ define([ function onEnableSave() { + // Avoid conflict if enabling save button while saved confirmation is displayed + if ( _isSaving ) { + return; + } + container.find('.btnSubmit') .removeClass('disabled') .html(i18n.commonCore.common.save); @@ -215,6 +221,14 @@ define([ function createCancelButton(enableConfirmation) { + if ( container.find('.btnCancel').hasClass('open') ) { + return; + } + + if ( enableConfirmation && container.find('.btnCancel').hasClass('has-confirmation') ) { + return; + } + container.find('.btnCancel') .off('click') .confirmation('destroy'); @@ -229,9 +243,13 @@ define([ onConfirm: function() { onClickClose(true); }, btnCancelClass: 'btn btn-sm btn-default btn-cancel-popover' }); + + container.find('.btnCancel').addClass('has-confirmation'); } else { - container.find('.btnCancel').click(onClickClose); + container.find('.btnCancel') + .click(onClickClose) + .removeClass('has-confirmation'); } } @@ -245,6 +263,8 @@ define([ return; } + _isSaving = true; + container.find('.btnSubmit') .addClass('disabled') .html('' + i18n.commonWebmap.editor.saving); @@ -335,6 +355,7 @@ define([ setTimeout(function(){ container.find('.btnSubmit').html(i18n.commonCore.common.save); container.find('.btnSubmit').toggleClass('disabled', true); + _isSaving = false; }, 2000); } diff --git a/src/app/storymaps/common/builder/media/map/MapConfigOverlay.js b/src/app/storymaps/common/builder/media/map/MapConfigOverlay.js index 8f62dc02..43e8ae95 100644 --- a/src/app/storymaps/common/builder/media/map/MapConfigOverlay.js +++ b/src/app/storymaps/common/builder/media/map/MapConfigOverlay.js @@ -8,9 +8,7 @@ define(["lib-build/tpl!./MapConfigOverlay", "dojo/Deferred", "dojo/on", "dojo/topic", - "esri/dijit/Geocoder", - "storymaps/common/utils/CommonHelper", - "dojo/_base/lang"], + "storymaps/common/utils/CommonHelper"], function ( viewTpl, viewCss, @@ -22,9 +20,7 @@ define(["lib-build/tpl!./MapConfigOverlay", Deferred, on, topic, - Geocoder, - CommonHelper, - lang + CommonHelper ){ var container = $('#mainStagePanel'), _viewDeferred = null, @@ -216,22 +212,27 @@ define(["lib-build/tpl!./MapConfigOverlay", if ( _geocoder ) _geocoder.destroy(); + // If map already has a geocoder through viewer config + if ( $(".mainMediaContainer.active .mapContainer").hasClass("has-geocoder") ) { + return; + } + $(".mainMediaContainer.active .geocoder") .html('
') .show(); - var geocoder = new Geocoder( - lang.mixin( - { - map: app.map - }, - CommonHelper.createGeocoderOptions() - ), - $(".mainMediaContainer.active .simpleGeocoder")[0] - ); - - $(".mainMediaContainer.active .geocoder input").attr("placeholder", i18n2.commonMedia.editorActionGeocode.lblTitle + "..."); - geocoder.startup(); + try { + CommonHelper.createGeocoder({ + map: app.map, + domNode: $(".mainMediaContainer.active .simpleGeocoder")[0], + enableButtonMode: false, + placeHolder: i18n2.commonMedia.editorActionGeocode.lblTitle + }).then(function(geocoder) { + _geocoder = geocoder; + }); + } catch(e){ + console.error(e); + } } /* @@ -392,10 +393,15 @@ define(["lib-build/tpl!./MapConfigOverlay", // TODO should have an error message if not found var layer = feature.getLayer(), - fields = layer.fields, - objectIdFields = $.grep(fields, function(field){ - return field.type == "esriFieldTypeOID"; - }); + fields = layer.fields; + + if ( ! fields ) { + return null; + } + + var objectIdFields = $.grep(fields, function(field){ + return field.type == "esriFieldTypeOID"; + }); if ( layer && fields && ! objectIdFields.length ) { objectIdFields = $.grep(fields, function(field){ diff --git a/src/app/storymaps/common/builder/media/map/MapViewerWrapper.js b/src/app/storymaps/common/builder/media/map/MapViewerWrapper.js index 5758dde3..806f05b7 100644 --- a/src/app/storymaps/common/builder/media/map/MapViewerWrapper.js +++ b/src/app/storymaps/common/builder/media/map/MapViewerWrapper.js @@ -9,10 +9,10 @@ define([ }; // - // To be able to use MV in development mode you need to be on a while listed domain (*.arcgis.com or *.esri.com) + // To be able to use MV in development mode you need to be on a while listed domain (the Portal for ArcGIS domain, *.arcgis.com or *.esri.com) // Then paste a token that you get from ArcGIS Online or Portal for ArcGIS by executing // JSON.parse(dojo.cookie("esri_auth")).token - // in a developer console on any page or apps running in Online or Portal + // in a developer console on any page or apps running in Online or Portal (IM short lived token don't work) // var DEV_TOKEN = ''; @@ -37,7 +37,6 @@ define([ _viewerMapIsLoaded = false, _mapViewerLoadingPolling = null, _mapViewerChangesCheck = null, - _saveEnabled = false, _mapEditable = false; window.addEventListener("message", receiveMessage, false); @@ -147,7 +146,6 @@ define([ { if ( ! _mapViewerChangesCheck ) { _mapViewerChangesCheck = setInterval(unsavedChangesCheck, 1000); - _saveEnabled = false; } } @@ -203,19 +201,8 @@ define([ break; case "unsavedChanges": if ( json.value ) { - if ( ! _saveEnabled ) { - params.onEnableSave(); - } - _saveEnabled = true; - } - else { - _saveEnabled = false; - } - /* - else { - params.disableSave(); + params.onEnableSave(); } - */ break; case "loaded": diff --git a/src/app/storymaps/common/builder/media/map/WebMapSelector.js b/src/app/storymaps/common/builder/media/map/WebMapSelector.js index f537571d..6946ffb9 100644 --- a/src/app/storymaps/common/builder/media/map/WebMapSelector.js +++ b/src/app/storymaps/common/builder/media/map/WebMapSelector.js @@ -378,7 +378,15 @@ define(["lib-build/tpl!./WebMapSelector", isPortal: app.isPortal }); } - else if ( ! MapViewerWrapperUtils.isWhiteListedDomain() && app.isProduction ) { + else if ( ! app.isPortal && ! MapViewerWrapperUtils.isWhiteListedDomain() && app.isProduction ) { + _errorDialog.present({ + newMap: true, + error: "DOMAIN", + url: MapViewerWrapperUtils.getMapViewerURL(), + isPortal: app.isPortal + }); + } + else if ( app.isPortal && ! MapViewerWrapperUtils.viewerIsSameDomain() && app.isProduction ) { _errorDialog.present({ newMap: true, error: "DOMAIN", @@ -431,7 +439,15 @@ define(["lib-build/tpl!./WebMapSelector", isPortal: app.isPortal }); } - else if ( ! MapViewerWrapperUtils.isWhiteListedDomain() && app.isProduction ) { + else if ( ! app.isPortal && ! MapViewerWrapperUtils.isWhiteListedDomain() && app.isProduction ) { + _errorDialog.present({ + newMap: false, + error: "DOMAIN", + url: MapViewerWrapperUtils.getMapViewerLink(getSelectedWebmap()), + isPortal: app.isPortal + }); + } + else if ( app.isPortal && ! MapViewerWrapperUtils.viewerIsSameDomain() && app.isProduction ) { _errorDialog.present({ newMap: false, error: "DOMAIN", diff --git a/src/app/storymaps/common/builder/media/webpage/ViewHome.js b/src/app/storymaps/common/builder/media/webpage/ViewHome.js index 3ee0db47..4b3a644d 100644 --- a/src/app/storymaps/common/builder/media/webpage/ViewHome.js +++ b/src/app/storymaps/common/builder/media/webpage/ViewHome.js @@ -83,7 +83,7 @@ define(["lib-build/tpl!./ViewHome", return { url: container.find('.url').val(), - frameTag: container.find('.textarea').val() + frameTag: container.find('.textarea').val().trim() }; } @@ -111,7 +111,7 @@ define(["lib-build/tpl!./ViewHome", }); container.find('.btn-cfg-embed').click(function() { - var embedVal = container.find('.textarea').val(); + var embedVal = container.find('.textarea').val().trim(); if ( ! embedVal.match(/^$/) || embedVal.match(/