diff --git a/README.md b/README.md index e894c89..cb0e58b 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ The Story Map Series app lets you present a series of maps via tabs, numbered bu [Download](http://links.esri.com/storymaps/map_series_template_zip) | [Map Series page on Esri Story Maps website](http://links.esri.com/storymaps/map_series_app) -**Latest release is version 1.9.3**, 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-series-storytelling-template-js/releases) for release notes. +**Latest release is version 1.10.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-series-storytelling-template-js/releases) for release notes. For more infomation about using and customizing Esri's Storytelling Apps follow the [Story Maps Developers' Corner](https://developerscorner.storymaps.arcgis.com). diff --git a/package.json b/package.json index 51fbded..d92006a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "Storymaps-MapSeries", - "version": "1.9.3", + "version": "1.10.1", "devDependencies": { "grunt": "~0.4.1", "grunt-contrib-clean": "~0.4.0", diff --git a/src/app/config.js b/src/app/config.js index f4cc4ef..53d1ba9 100644 --- a/src/app/config.js +++ b/src/app/config.js @@ -54,7 +54,7 @@ app.cfg = { // Description link textLink: "#555555", // Media background - media: "#FFFFFF", + media: "#8f999f", // Map Controls background mapControls: "#DBD9DA", // Map Controls text @@ -104,7 +104,7 @@ app.cfg = { panel: "#FFFFFF", text: "#333333", textLink: "#555555", - media: "#FFFFFF", + media: "#DBDBDB", mapControls: "#FFFFFF", softText: "#444444", softBtn: "#444444", @@ -150,7 +150,7 @@ app.cfg = { panel: "#D4E6C3", text: "#231F20", textLink: "#555555", - media: "#FFFFFF", + media: "#c6cdc0", mapControls: "#D4E6C3", softText: "#444444", softBtn: "#444444", @@ -182,7 +182,7 @@ app.cfg = { panel: "#DBD9DA", text: "#000000", textLink: "#555555", - media: "#FFFFFF", + media: "#8f999f", mapControls: "#DBD9DA", softText: "#444444", softBtn: "#444444", @@ -227,7 +227,7 @@ app.cfg = { panel: "#FFFFFF", text: "#333333", textLink: "#555555", - media: "#FFFFFF", + media: "#DBDBDB", mapControls: "#FFFFFF", softText: "#444444", softBtn: "#444444", @@ -271,7 +271,7 @@ app.cfg = { panel: "#D4E6C3", text: "#231F20", textLink: "#555555", - media: "#FFFFFF", + media: "#c6cdc0", mapControls: "#D4E6C3", softText: "#444444", softBtn: "#444444", @@ -302,7 +302,7 @@ app.cfg = { panel: "#DBD9DA", text: "#000000", textLink: "#555555", - media: "#FFFFFF", + media: "#8f999f", mapControls: "#DBD9DA", softText: "#444444", softBtn: "#444444", @@ -348,7 +348,7 @@ app.cfg = { panel: "#FFFFFF", text: "#333333", textLink: "#555555", - media: "#FFFFFF", + media: "#DBDBDB", mapControls: "#FFFFFF", softText: "#444444", softBtn: "#444444", @@ -394,7 +394,7 @@ app.cfg = { panel: "#D4E6C3", text: "#231F20", textLink: "#555555", - media: "#FFFFFF", + media: "#c6cdc0", mapControls: "#D4E6C3", softText: "#444444", softBtn: "#444444", @@ -478,8 +478,8 @@ app.cfg = { // 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 - DEFAULT_SHARING_URL: "//www.arcgis.com/sharing/content/items", - //DEFAULT_SHARING_URL: "//portal.internal.com/arcgis/sharing/content/items", + DEFAULT_SHARING_URL: "//www.arcgis.com/sharing/rest/content/items", + //DEFAULT_SHARING_URL: "//portal.internal.com/arcgis/sharing/rest/content/items", DEFAULT_PROXY_URL: "//www.arcgis.com/sharing/proxy" //DEFAULT_PROXY_URL: "//portal.internal.com/arcgis/sharing/proxy" -}; \ No newline at end of file +}; diff --git a/src/app/storymaps/common/Core.js b/src/app/storymaps/common/Core.js index 94e170f..1d20d9e 100644 --- a/src/app/storymaps/common/Core.js +++ b/src/app/storymaps/common/Core.js @@ -188,7 +188,7 @@ define(["lib-build/css!lib-app/bootstrap/css/bootstrap.min", // Get the portal instance name var instance = location.pathname.substr(0,appLocation); - app.indexCfg.sharingurl = "//" + location.host + instance + "/sharing/content/items"; + app.indexCfg.sharingurl = "//" + location.host + instance + "/sharing/rest/content/items"; app.indexCfg.proxyurl = "//" + location.host + instance + "/sharing/proxy"; } else diff --git a/src/app/storymaps/common/_resources/nls/core.js b/src/app/storymaps/common/_resources/nls/core.js index 2b9fbd7..6ee6550 100644 --- a/src/app/storymaps/common/_resources/nls/core.js +++ b/src/app/storymaps/common/_resources/nls/core.js @@ -159,6 +159,7 @@ define({ "pt-pt": 1, "ro": 1, "ru": 1, + "sl": 1, "sr": 1, "sv": 1, "th": 1, diff --git a/src/app/storymaps/common/_resources/nls/mapcontrols.js b/src/app/storymaps/common/_resources/nls/mapcontrols.js index cb15f54..95aa1fb 100644 --- a/src/app/storymaps/common/_resources/nls/mapcontrols.js +++ b/src/app/storymaps/common/_resources/nls/mapcontrols.js @@ -38,6 +38,7 @@ define({ "pt-pt": 1, "ro": 1, "ru": 1, + "sl": 1, "sr": 1, "sv": 1, "th": 1, diff --git a/src/app/storymaps/common/_resources/nls/media.js b/src/app/storymaps/common/_resources/nls/media.js index 2b4eb38..d662d70 100644 --- a/src/app/storymaps/common/_resources/nls/media.js +++ b/src/app/storymaps/common/_resources/nls/media.js @@ -162,6 +162,7 @@ define({ "pt-pt": 1, "ro": 1, "ru": 1, + "sl": 1, "sr": 1, "sv": 1, "th": 1, diff --git a/src/app/storymaps/common/_resources/nls/ru/core.js b/src/app/storymaps/common/_resources/nls/ru/core.js index 9a2711f..147e865 100644 --- a/src/app/storymaps/common/_resources/nls/ru/core.js +++ b/src/app/storymaps/common/_resources/nls/ru/core.js @@ -68,7 +68,7 @@ define({ }, "share": { "shareTitle": "Откройте доступ к истории", - "preview": "Предварительный просмотр", + "preview": "Просмотр", "viewlive": "Просмотр истории", "btnPrivate": "Частный", "btnPrivateTooltip": "Только вы видите историю.", diff --git a/src/app/storymaps/common/_resources/nls/ru/media.js b/src/app/storymaps/common/_resources/nls/ru/media.js index 1ebf372..8b82255 100644 --- a/src/app/storymaps/common/_resources/nls/ru/media.js +++ b/src/app/storymaps/common/_resources/nls/ru/media.js @@ -102,7 +102,7 @@ define({ "lblMaximizeHelp": "Рекомендуется только для фотографий высокого качества", "lblPosition": "Положение", "lblPosition1": "По центру", - "lblPosition2": "Заливка", + "lblPosition2": "Заполнение", "lblPosition3": "Разместить", "lblPosition4": "Растяжка", "lblPosition5": "Настраиваемый", diff --git a/src/app/storymaps/common/_resources/nls/sl/core.js b/src/app/storymaps/common/_resources/nls/sl/core.js new file mode 100644 index 0000000..ec8b0bd --- /dev/null +++ b/src/app/storymaps/common/_resources/nls/sl/core.js @@ -0,0 +1,134 @@ +define({ + "commonCore": { + "common": { + "add": "Dodaj", + "edit": "Uredi", + "save": "Shrani", + "next": "Naprej", + "cancel": "Prekliči", + "back": "Nazaj", + "apply": "Uporabi", + "close": "Zapri", + "open": "Odpri", + "start": "Začetek", + "loading": "Nalaganje", + "disabledAdmin": "Administrator je onemogočil to funkcionalnost", + "width": "Širina", + "height": "Višina", + "create": "Ustvari", + "yes": "Da", + "no": "Ne", + "mystories": "Moje zgodbe" + }, + "inlineFieldEdit": { + "editMe": "Uredi me!", + "enterTitle": "Vnesite ime...", + "enterSubtitle": "Vnesite dodatni podnaslov..." + }, + "builderPanel": { + "panelHeader": "Graditelj %TPL_NAME%", + "buttonSaving": "Shranjevanje", + "buttonSaved": "Shranjeno", + "buttonShare": "Deli", + "buttonSettings": "Nastavitve", + "buttonHelp": "Pomoč", + "buttonPreview": "Ogled zgodbe", + "tooltipFirstSave": "Ni na voljo, dokler ne shranite.", + "tooltipNotShared": "Ni na voljo, dokler ne delite.", + "tooltipNotShared2": "Vaša zgodba ni deljena, do nje lahko dostopate samo vi.", + "noPendingChange": "Ni čakajočih sprememb", + "unSavedChangePlural": "Spremembe v teku", + "closeWithPendingChange": "Ste prepričani, da želite to dejanje potrditi? Vaše spremembe bodo izgubljene.", + "saveError": "Shranjevanje ni uspelo, poskusite znova", + "status1": "Zgodba je deljena, vendar ima težave", + "status2": "Zgodba ni deljena, vendar ima težave", + "status3": "Zgodba je javna", + "status4": "Zgodba je deljena z vašo organizacijo", + "status5": "Zgodba je zasebna", + "status6": "Zgodba še ni shranjena", + "checking": "Preverjanje", + "fix": "Odpravi" + }, + "saveError": { + "title": "Napaka pri shranjevanju zgodbe", + "err1Div1": "Zgodbe ni bilo mogoče shraniti, saj že obstaja drugi element z istim imenom.", + "err1Div2": "Spremenite ime svoje zgodbe in jo nato shranite.", + "btnOk": "Uredite ime zgodbe" + }, + "saveErrorSocial": { + "title": "Posodobitev deljenja na družbenih omrežjih", + "panel1": "Prisotnost vaše zgodbe na družbenih omrežjih je izboljšana, vendar ime elementa vaše spletne aplikacije ArcGIS ni enako imenu vaše zgodbe.", + "panel1tooltip": "Z določitvijo imena, povzetka in sličice bo vaša zgodba videti tako:", + "panel2": "Katero ime želite uporabiti na družbenih omrežjih:", + "panel2q1": "Ime zgodbe (priporočeno)", + "panel2q1tooltip": "Če izberete to možnost, se bo ime vašega elementa spremenilo zaradi ujemanja z imenom vaše zgodbe, dodatne spremembe pa bodo sinhronizirane v graditelju.", + "panel2q2": "Ime elementa", + "panel3": "Za nadaljnje izboljševanje videza vaše zgodbe na družbenih omrežjih uporabite ${MYSTORIES} in dodajte povzetek in sličico.", + "panel4": "Ne opozarjaj me več za to zgodbo" + }, + "share": { + "shareTitle": "Delite svojo zgodbo", + "preview": "Predogled", + "viewlive": "Ogled zgodbe", + "btnPrivate": "Zasebno", + "btnPrivateTooltip": "Zgodbo lahko vidite samo vi", + "btnOrg": "Organizacija", + "btnOrgTooltip": "Zgodbo lahko vidijo samo člani vaše organizacije", + "btnPublic": "Javno", + "btnPublicTooltip": "Vsi lahko vidijo zgodbo", + "loadingMessage": "Preverjanje težav v vaši zgodbi", + "viewToggle1": "Prikaži vsebino zgodbe", + "viewToggle2": "Zapri vsebino zgodbe", + "socialize": "Druženje", + "statusPrivate": "Vaša zgodba je zasebna, vidite jo lahko samo vi.", + "statusError": "V vsebini vaše zgodbe so težave, ki jih bodo vaši bralci opazili. Te težave lahko prepoznate in popravite spodaj.", + "statusNoErrPrivate": "Svojo zgodbo delite, ko boste pripravljeni!", + "mystoriesinvite": "Upravljajte vse svoje zgodbe", + "notavailable1": "Oprostite, deljenje zgodbe z graditelja ni podprto, saj ta aplikacija ne gostuje v %PRODUCT%.", + "notavailable2": "Oprostite, deljenje vaše zgodbe z graditelja ni podprto na tej različici strani Portal for ArcGIS (zahtevana je različica 10.4 ali novejša).", + "notavailable3": "To zgodbo lahko delite z %LINK%.", + "notavailable4": "Moje zgodbe", + "notavailable5": "stran z elementi", + "notavailable6": "Oprostite, ta funkcionalnost ni v celoti podprta v razvijalskem načinu. Odvisno od vašega namestitvenega scenarija bo ta funkcionalnost podprta po namestitvi.", + "notavailable7": "Obvezno obiščite %MYCONTENT%, da se prepričate, da so karte in sloji, uporabljeni v vaši zgodbi, prav tako deljeni.", + "notavailable8": "Moje vsebine", + "mystoriesinvite2": "Za izboljšanje videza vaše zgodbe na družbenih omrežjih uporabite ${MYSTORIES}, da dodate povzetek in sličico." + }, + "settings": { + "header": "Nastavitve", + "tabError": "Preverite napake v vseh zavihkih" + }, + "settingsLayout": { + "title": "Postavitev", + "explain": "Katero postavitev želite uporabiti?", + "explainInit": "Postavitev lahko kadarkoli spremenite v pogovornem oknu nastavitve.", + "viewExample": "Glejte primer v živo" + }, + "settingsTheme": { + "title": "Tema" + }, + "settingsHeader": { + "title": "Glava", + "logoEsriRadio": "Logotip Esri", + "logoNoneRadio": "Brez logotipa", + "logoOrgRadio": "Logotip organizacije", + "logoCustomRadio": "Moj logotip", + "logoCustomLabel": "Slika:", + "logoCustomUploadHelp": "Logotipi so videti najboljše, ko imajo razmerje širine in višine med 1 : 1 in 5 : 1. Če se povezani logotip počasi izrisuje, shranite kopijo in jo naložite tukaj.", + "logoCustomUploadTooltip": "Uporabite naložen logotip", + "logoCustomUploadButton": "Naloži logotip", + "logoUploadSizeError": "Dimenzije GIF-a so prevelike. Spremenite velikost na ${PIXEL-WIDTH} pikslov širine.", + "logoCustomLinkTooltip": "Povezava do logotipa", + "logoCustomLinkPlaceholder": "URL slike", + "logoUploadGenericError": "Logotip je lahko datoteka .bmp, .gif, .jpg, .jpeg, ali .png. Datoteke GIF morajo biti široke manj kot 250 px in manjše od 10 MB.", + "logoCustomTargetPlaceholder": "Spletna stran se odpre, ko kliknete na logotip", + "logoSocialText": "Označeno besedilo:", + "logoLink": "Povezava:", + "lblSmallHeader": "Uporabite kompaktno glavo (brez podnaslova)" + }, + "header": { + "title": "Uredite ime elementa za %TPL_NAME%", + "subtitle": "Uredite podnaslov elementa za %TPL_NAME%" + } + } +}); \ No newline at end of file diff --git a/src/app/storymaps/common/_resources/nls/sl/mapcontrols.js b/src/app/storymaps/common/_resources/nls/sl/mapcontrols.js new file mode 100644 index 0000000..1d84183 --- /dev/null +++ b/src/app/storymaps/common/_resources/nls/sl/mapcontrols.js @@ -0,0 +1,13 @@ +define({ + "commonMapControls": { + "common": { + "settings": "Nastavitve", + "openDefault": "Privzeto odpri" + }, + "overview": { + "basemapGalleryBtnLabel": "Temeljna karta", + "expandFactorLabel": "Razširitveni dejavnik", + "expandFactorPopover": "Razmerje med velikostjo pregledne karte in obsega pravokotnika, prikazanega na pregledni karti. Privzeta vrednost je 2, kar pomeni, da je pregledna karta najmanj dvakrat večja od obsega pravokotnika." + } + } +}); \ No newline at end of file diff --git a/src/app/storymaps/common/_resources/nls/sl/media.js b/src/app/storymaps/common/_resources/nls/sl/media.js new file mode 100644 index 0000000..9566096 --- /dev/null +++ b/src/app/storymaps/common/_resources/nls/sl/media.js @@ -0,0 +1,137 @@ +define({ + "commonMedia": { + "mediaSelector": { + "lblSelect1": "Mediji", + "lblSelect2": "Vsebina", + "lblMap": "Karta", + "lblImage": "Slika", + "lblVideo": "Video", + "lblExternal": "Spletna stran", + "lblUpload": "Naloži", + "lblLink": "Povezava", + "disabled": "Administrator je onemogočil to funkcionalnost", + "userLookup": "Naloži albume", + "notImplemented": "Ni še uveljavljeno.", + "noData": "Javni albumi niso najdeni" + }, + "imageSelector": { + "lblStep1": "Izberite storitev", + "lblStep2": "Izberite svojo predstavnost", + "lblStep3": "Konfiguriraj" + }, + "imageSelectorHome": { + "explain": "Naložite slike iz družbenih omrežij,
ali neposredno iz URL-ja" + }, + "imageSelectorUpload": { + "lblUploadButton": "poiščite sliko", + "lblDrop": "Odložite sliko tukaj ali", + "infoUpload": "Slike bodo shranjene v vašem računu ArcGIS in dostopne samo znotraj vaše zgodbe.", + "warningFileTypes": "Slika je lahko .jpg, .png, .gif, ali .bmp", + "warningOneFile": "Datoteke se sprejemajo posamično.", + "warningFileSize": "Datoteka presega največjo dovoljeno velikost nalaganja. Izberite drugo datoteko.", + "tooltipRemove": "Izbrišite neuporabljeno sliko z računa ArcGIS.
(Če se boste kasneje odločili za uporabo, jo boste morali znova naložiti.)" + }, + "imageSelectorFlickr": { + "userInputLbl": "Uporabniško ime", + "signInMsg2": "Uporabnik ni najden", + "loadingFailed": "Nalaganje ni uspelo" + }, + "imageSelectorFacebook": { + "leftHeader": "Uporabnik Facebooka", + "rightHeader": "Stran Facebooka", + "pageExplain": "Facebookova stran je javna blagovna znamka/izdelek ali znani subjekt, kot je esrigis. Ime strani vidite po prvem znaku »/« v URL-ju strani.", + "pageInputLbl": "Ime strani", + "lookupMsgError": "Stran ni najdena", + "warning": "Podpora za Facebook je opuščena, ${learn}.", + "learn": "izvedite več" + }, + "imageSelectorPicasa": { + "userInputLbl": "E-pošta ali ID za Google", + "signInMsg2": "Račun ni najden", + "howToFind": "Kako poiskati ID Picase", + "howToFind2": "Kopirajte številke med prvim in drugim znakom »/« katerekoli strani Picase" + }, + "videoSelectorCommon": { + "check": "Preveri", + "notFound": "Video ni najden", + "found": "Video je najden", + "select": "Izberite ta videoposnetek" + }, + "videoSelectorHome": { + "other": "Drugo" + }, + "videoSelectorYoutube": { + "url": "Povezava do videoposnetka na YouTubu", + "pageInputLbl": "Uporabniško ime", + "lookupMsgError": "Uporabnik ni najden", + "howToFind": "Kako poiskati uporabniško ime za YouTube", + "howToFind2": "Uporabniško ime je prikazano pod videoposnetki", + "found": "Najdeno", + "noData": "Javni videoposnetki niso najdeni", + "videoNotChecked": "Videoposnetek ni bil preverjen na YouTubu, vendar je njegov naslov videti pravilno.", + "checkFailedAPI": "Preverjanje na YouTubu ni uspelo, preverite YouTubov ključ API." + }, + "videoSelectorVimeo": { + "url": "Povezava do videoposnetka na Vimeu" + }, + "videoSelectorOther": { + "explain1": "Ta karta z zgodbo ne more predvajati neobdelanih videodatotek (npr. avi ali mpeg), vendar pa lahko predvaja gostujoče videe z vgrajenimi predvajalniki (npr. YouTube ali Vimeo).", + "explain2": "Večina video gostovanih storitev zagotavlja to funkcionalnost. Poiščite možnost za vdelavo videa, kopirajte navedeno kodo in jo dodajte zgodbi s pomočjo možnosti vsebine %WEBPAGE%.", + "explain3": "Druga možnost je, da sami gostite videoposnetek, skupaj s stranjo HTML, ki uporablja videopredvajalnik, kot je %EXAMPLE%. Nato pa URL te strani HTML dodate v svojo zgodbo kot %WEBPAGE%.", + "webpage": "Spletna stran" + }, + "webpageSelectorHome": { + "lblUrl": "Povezava do spletne strani", + "lblEmbed": "Vdelana koda", + "lblOR": "ALI", + "lblError1": "Napaka, počistite eno od dveh vnosnih polj.", + "lblError2": "Vdelana koda lahko vsebuje samo eno %IFRAMETAG%", + "configure": "Konfiguriraj" + }, + "mediaConfigure": { + "lblURL": "Povezava na sliko", + "lblURLPH": "Povezava se mora končati z .jpg, .png, .gif, ali .bmp", + "lblURLError": "Videti je, da slika ni veljavna. Navedite neposredno povezavo do slikovne datoteke (vaš URL se bo po navadi končal z .jpg ali .png). Povezave do spletne strani, ki vsebuje sliko, ne bodo delovale.", + "lblURLCheck": "Preverjanje slike...", + "lblLabel": "Napis slike", + "lblLabel1": "Napis", + "lblLabel2": "Lebdeče besedilo", + "lblLabel3": "Brez", + "lblLabelPH": "Vnesite besedilo...", + "lblMaximize": "V kotu slike vključite gumb za povečanje", + "lblMaximizeHelp": "Priporočljivo samo za fotografije visoke kakovosti", + "lblPosition": "Položaj", + "lblPosition1": "Na sredino", + "lblPosition2": "Polnilo", + "lblPosition3": "Prilagodi", + "lblPosition4": "Raztegni", + "lblPosition5": "Po meri", + "lblURLHelp": "Če želite najboljše rezultate, morajo biti slike manjše od 400 KB. Uporabite stisnjene slike JPG, z 80-% kakovostjo, z naslednjimi priporočenimi širinami slike: 2000 pikslov za glavni oder ali pripovedno ploščo z gumbom za maksimiziranje, 1000 pikslov za pripovedno ploščo brez gumba za maksimiziranje.

Če se slika s povezavo počasi izrisuje, jo za boljše rezultate naložite v svojo zgodbo.", + "tooltipDimension": "Vrednost je lahko navedena v »px« ali »%«", + "tooltipDimension2": "Vrednost mora biti navedena v »px«", + "lblPosition2Explain": "(lahko se obreže)", + "lblPosition3Explain": "(ne bo obrezano)", + "lblPosition3Explain2": "(širina se bo vedno prilegala plošči)", + "lblPosition4Explain": "(lahko se izkrivi)", + "unloadLbl": "Odstrani iz pomnilnika, ko bralec zapusti stran", + "unloadHelp": "Če ima spletna stran zvočno ali video vsebino, naj bo ta možnost obkljukana, da se predvajanje vsebine ustavi, ko bralec zapusti stran. Odkljukajte jo, če želite, da se zvočni posnetek predvaja, medtem ko bralec napreduje skozi zgodbo.
Če je spletna stran aplikacija, odkljukajte to možnost, da se zgodba ne bo ponovno naložila, če se bralec vrne na zgodbo.", + "embedProtocolLabel": "Naložite stran prek varne povezave (HTTPS)", + "embedProtocolWarning1": "Če se stran v vaši zgodbi ne naloži, je ne bo mogoče vdelati zaradi varnostnih razlogov. Namesto tega dodajte povezavo v zgodbo, da odprete stran v novem zavihku brskalnika.Izvedite več", + "embedProtocolWarning2": "Če se stran v vaši zgodbi ne naloži, odkljukajte to možnost in poskusite znova. Če se stran še vedno ne naloži, je ni mogoče vdelati zaradi varnostnih razlogov. Namesto tega dodajte povezavo v zgodbo, da odprete stran v novem zavihku brskalnika.Izvedite več" + }, + "editorActionGeocode": { + "lblTitle": "Najdite naslov ali kraj", + "mapMarkerExplain": "Uporabnik bo ob kliku na povezavo videl označbo na karti" + }, + "editorActions": { + "remove": "Odstrani dejanje", + "preview": "Predogled dejanja" + }, + "editorActionMedia": { + "lblTitle": "Spremenite vsebino glavnega okna" + }, + "editorInlineMedia": { + "lblTitle": "Vstavite sliko, videoposnetek ali spletno stran" + } + } +}); \ No newline at end of file diff --git a/src/app/storymaps/common/_resources/nls/sl/webmap.js b/src/app/storymaps/common/_resources/nls/sl/webmap.js new file mode 100644 index 0000000..8e0b3a8 --- /dev/null +++ b/src/app/storymaps/common/_resources/nls/sl/webmap.js @@ -0,0 +1,94 @@ +define({ + "commonWebmap": { + "selector": { + "lblWebMap": "Karta", + "lblLocation": "Lokacija", + "lblContent": "Vsebina", + "lblPopup": "Pojavno okno", + "lblControls": "Dodatki", + "lblOverview": "Pregledna karta", + "lblLegend": "Legenda", + "lblGeocoder": "Iskalnik po naslovu, kraju ali geoobjektih", + "tooltipGeocoder": "Omogočite svojim bralcem, da po vaši karti iščejo naslove, kraje in/ali geoobjekte. Iskalne možnosti je mogoče konfigurirati na strani elementov spletne karte pod Nastavitve > Spletna karta > Aplikacija > Poišči lokacije.", + "lblEsriGeocoder": "Iskalec krajev", + "loadingTitle": "Nalaganje imena", + "entry": "Vnos", + "entries": "Vnosi", + "section": "Razdelek", + "sections": "Razdelki", + "and": "in", + "action": "Dejanje v razdelku", + "actions": "Dejanje v razdelkih", + "originalWebmap": "Karta je uporabljena za izdajo %TPL_NAME%", + "browseMaps": "Izberi karto", + "createMap": "Ustvari karto", + "current": "Trenutna karta", + "select": "Izberi ali ustvari karto", + "newMap": "Novo izbrana karta", + "newCreatedMap": "Novo ustvarjena karta", + "webmapDefault": "Privzeta karta", + "customCfg": "Konfiguracija po meri", + "tooltipLocation": "Določite lokacijo, ki jo bo prikazala ta karta.", + "tooltipContent": "Določite vidne sloje.", + "tooltipPopup": "Izberite pojavno okno, ki se bo odprlo pri prikazu te karte.", + "tooltipOverview": "Prikaži majhno pregledno karto skupaj z glavno karto.", + "tooltipLegend": "Prikaži legendo na karti, kar je uporabno, ko ima karta veliko slojev in simbolov.", + "mapCfgInvite": "Uporabite te ukaze za konfiguracijo svoje karte", + "lblLocationAlt": "Podedovano s prve karte", + "tooltipLocationAlt": "Lokacija te karte je sinhronizirana s prvo karto v seriji. Za spremembo tega vedenja serije pojdite na Nastavitve > Možnosti karte." + }, + "configure": { + "btnReset": "Ponastavite", + "btnCancel": "Prekliči", + "tocTitle": "Vsebina karte", + "tocExplain": "Izberite sloje, ki bodo prikazani.", + "tocNoData": "Nobenega sloja ni mogoče konfigurirati", + "tocSave": "Shrani vsebino karte", + "extentTitle": "Lokacija karte", + "extentExplain": "Premikajte se po karti in jo povečajte, da določite, kako bo videti za vaše bralce.", + "extentSave": "Shranite lokacijo karte", + "popupTitle": "Pojavno okno karte", + "popupExplain": "Kliknite na geoobjekt, da odprete pojavno okno, ki ga želite prikazati.", + "popupSave": "Shranite konfiguracijo pojavnega okna", + "hintNavigation": "Navigacija po karti je onemogočena." + }, + "editor": { + "loading": "Počakajte, da se urejevalnik kart naloži", + "newTitle": "Ustvari novo karto", + "editTitle": "Uredi karto", + "titleLbl": "Ime", + "titlePh": "Ime karte ...", + "folderLbl": "Karta bo ustvarjena v isti mapi kot zgodba.", + "creating": "Ustvarjanje karte", + "saving": "Shranjevanje karte", + "success": "Karta je shranjena", + "successCreate": "Karta je ustvarjena", + "cancelTitle": "Opustim vse neshranjene spremembe?", + "errorDuplicate": "Karto s tem imenom že imate", + "errorCreate": "Karte ni mogoče ustvariti. Poskusite znova.", + "errorSave": "Karte ni mogoče shraniti. Poskusite znova.", + "notavailable1": "Oprostite, ustvarjanje ali urejanje karte v brskalniku Firefox ni podprto zaradi tehničnih omejitev. Svojo zgodbo lahko izdelate s pomočjo drugega spletnega brskalnika ali uporabite naslednjo nadomestno rešitev.", + "notavailable2": "Oprostite, ustvarjanje ali urejanje karte ni podprto, ker se aplikacija karte z zgodbo ne nahaja v %PRODUCT%. Za več informacij se obrnite na svojega administratorja ArcGIS.", + "notavailable3": "Oprostite, ustvarjanje ali urejanje karte ni podprto v tej različici Portal for ArcGIS (potrebna je različica 10.4 ali novejša). Za več informacij se obrnite na svojega administratorja ArcGIS.", + "notavailable4": "Karto lahko ustvarite z uporabo %MV%, nato se vrnite sem in jo dodajte svoji zgodbi.", + "notavailable5": "Karto lahko uredite z uporabo %MV%, nato se vrnite sem in kliknite %apply%, da vidite svoje spremembe.", + "notavailable6": "pregledovalnik kart", + "notavailable7": "ponovno naloži karto" + } + }, + "configure": { + "mapdlg": { + "items": { + "organizationLabel": "Moja organizacija", + "onlineLabel": "ArcGIS Online", + "contentLabel": "Moja vsebina", + "favoritesLabel": "Moje priljubljene" + }, + "title": "Izberi karto", + "searchTitle": "Išči", + "ok": "V redu", + "cancel": "Prekliči", + "placeholder": "Vnesite iskalni izraz ali ID spletne karte ..." + } + } +}); \ No newline at end of file diff --git a/src/app/storymaps/common/_resources/nls/webmap.js b/src/app/storymaps/common/_resources/nls/webmap.js index b3c604e..53000cd 100644 --- a/src/app/storymaps/common/_resources/nls/webmap.js +++ b/src/app/storymaps/common/_resources/nls/webmap.js @@ -119,6 +119,7 @@ define({ "pt-pt": 1, "ro": 1, "ru": 1, + "sl": 1, "sr": 1, "sv": 1, "th": 1, diff --git a/src/app/storymaps/common/builder/Builder.js b/src/app/storymaps/common/builder/Builder.js index 1491ba0..602470e 100644 --- a/src/app/storymaps/common/builder/Builder.js +++ b/src/app/storymaps/common/builder/Builder.js @@ -893,7 +893,7 @@ define(["lib-build/css!./Builder", text: processForSave() }); - var url = portalUrl + "/sharing/content/users/" + uid + (appItem.ownerFolder ? ("/" + appItem.ownerFolder) : ""); + var url = portalUrl + "/sharing/rest/content/users/" + uid + (appItem.ownerFolder ? ("/" + appItem.ownerFolder) : ""); // Updating if ( appItem.id ) @@ -998,7 +998,7 @@ define(["lib-build/css!./Builder", text: JSON.stringify(app.data.getWebAppData().get()) }); - var url = portalUrl + "/sharing/content/users/" + uid + (appItem.ownerFolder ? ("/" + appItem.ownerFolder) : ""); + var url = portalUrl + "/sharing/rest/content/users/" + uid + (appItem.ownerFolder ? ("/" + appItem.ownerFolder) : ""); // Updating url += "/items/" + appItem.id + "/update"; @@ -1036,12 +1036,12 @@ define(["lib-build/css!./Builder", // Can only be used to add more privilege // Looks like sharing to private imply a unshareItems request first // => don't use it that code to share private without more test - if ( sharingMode != "public" && sharingMode != "account" ) + if ( sharingMode != "public" && sharingMode != "account" && sharingMode != "org") sharingMode = "public"; // Find items to share - only if they aren't already shared to the proper level var targetItems = []; - if( sharingMode == "account" ) { + if( sharingMode == "account" || sharingMode == "org") { if( app.data.getWebMap() && app.data.getWebMap().item.access == "private" && app.data.getWebMap().item.owner == app.portal.getPortalUser().username ) targetItems.push(app.data.getWebMap().item.id); if ( app.data.getWebAppItem().access == "private" ) @@ -1087,17 +1087,17 @@ define(["lib-build/css!./Builder", items: items, groups: '', everyone: '', - account: '' + org: '' }; if ( sharing == "public" ) params.everyone = true; - if ( sharing == "account" ) - params.account = true; + if ( sharing == "account" || sharing == "org" ) + params.org = true; return esriRequest( { - url: portalUrl + "/sharing/content/users/" + uid + "/shareItems", + url: portalUrl + "/sharing/rest/content/users/" + uid + "/shareItems", handleAs: 'json', content: params }, @@ -1120,12 +1120,12 @@ define(["lib-build/css!./Builder", token: token, groups: '', everyone: '', - account: '' + org: '' }; return esriRequest( { - url: portalUrl + "/sharing/content/users/" + uid + "/items/" + itemId + "/protect", + url: portalUrl + "/sharing/rest/content/users/" + uid + "/items/" + itemId + "/protect", handleAs: 'json', content: params }, @@ -1212,7 +1212,7 @@ define(["lib-build/css!./Builder", var saveRq = esriRequest( { - url: portalUrl + "/sharing/content/users/" + uid + (appItem.ownerFolder ? ("/" + appItem.ownerFolder) : "") + "/addItem", + url: portalUrl + "/sharing/rest/content/users/" + uid + (appItem.ownerFolder ? ("/" + appItem.ownerFolder) : "") + "/addItem", handleAs: 'json', content: appItem }, diff --git a/src/app/storymaps/common/builder/BuilderPanel.css b/src/app/storymaps/common/builder/BuilderPanel.css index 42a4d41..7bc421a 100644 --- a/src/app/storymaps/common/builder/BuilderPanel.css +++ b/src/app/storymaps/common/builder/BuilderPanel.css @@ -28,19 +28,34 @@ #builderPanel .buttons { position: absolute; - top: 21px; + top: 18px; left: 315px; color: #FFF; z-index: 3; text-shadow: 0px 0px 0 #000, -1px -1px 0 #000, 1px -1px 0 #000, -1px 1px 0 #000, 1px 1px 0 #000; } +#builderPanel.more-conflicting-text .buttons { + left: 240px; +} + #builderPanel .builder-cmd { display: inline-block; margin-left: 20px; font-size: 1em; cursor: pointer; opacity: 0.8; + background: none; + border: none; +} + +/* adjust button spacing if status text is too long */ +#builderPanel.more-conflicting-text .builder-cmd:first-child { + margin-left: 5px; +} + +#builderPanel.more-conflicting-text .builder-cmd:not(:first-child) { + margin-left: 0; } #builderPanel .builder-cmd:hover { @@ -76,6 +91,11 @@ vertical-align: -4px; } +/* hide labels for buttons if fix message is too long */ +#builderPanel.conflicting-text .builder-cmd-hidden-label { + display: none; +} + /* * Right panel */ diff --git a/src/app/storymaps/common/builder/BuilderPanel.html b/src/app/storymaps/common/builder/BuilderPanel.html index b901314..27d2754 100644 --- a/src/app/storymaps/common/builder/BuilderPanel.html +++ b/src/app/storymaps/common/builder/BuilderPanel.html @@ -1,9 +1,16 @@

-
<%= btnSettings %>
-
<%= btnShare %>
-
<%= btnPreview %>
-
<%= btnHelp %>
+ + + +
diff --git a/src/app/storymaps/common/builder/BuilderPanel.js b/src/app/storymaps/common/builder/BuilderPanel.js index fdbfcb7..4bef410 100644 --- a/src/app/storymaps/common/builder/BuilderPanel.js +++ b/src/app/storymaps/common/builder/BuilderPanel.js @@ -392,21 +392,22 @@ define(["lib-build/tpl!./BuilderPanel", function updateStatus() { container.find(".status-msg").show(); + var appAccess = app.data.getWebAppItem().access; if( app.isDirectCreationFirstSave || app.isGalleryCreation ) container.find(".status-msg").html(i18n.commonCore.builderPanel.status6); else if ( app.mystories && app.mystories.hasCheckErrors ) { - if ( app.data.getWebAppItem().access == "public" ) + if ( appAccess == "public" ) container.find(".status-msg").html(i18n.commonCore.builderPanel.status1); - else if ( app.data.getWebAppItem().access == "account" ) + else if ( appAccess == "account" || appAccess == "org") container.find(".status-msg").html(i18n.commonCore.builderPanel.status1); else container.find(".status-msg").html(i18n.commonCore.builderPanel.status2); } else { - if ( app.data.getWebAppItem().access == "public" ) + if ( appAccess == "public" ) container.find(".status-msg").html(i18n.commonCore.builderPanel.status3); - else if ( app.data.getWebAppItem().access == "account" ) + else if ( appAccess == "account" || appAccess == "org") container.find(".status-msg").html(i18n.commonCore.builderPanel.status4); else container.find(".status-msg").html(i18n.commonCore.builderPanel.status5); @@ -459,10 +460,30 @@ define(["lib-build/tpl!./BuilderPanel", this.resize = function() { - container.find('.status-msg').css( - 'max-width', - $(window).width() - (container.find('.buttons').position().left + container.find('.buttons').outerWidth() + container.find('.status-btns').outerWidth() + 20) - ); + var jqStatusMsg = container.find('.status-msg'); + var jqStatusBtns = container.find('.status-btns button'); + container.removeClass('conflicting-text more-conflicting-text'); + jqStatusBtns.removeClass('btn-xs'); + jqStatusMsg.css('max-width', 'auto'); + var btns = container.find('.buttons')[0]; + var statusMsg = jqStatusMsg[0]; + + if (btns && statusMsg) { + // unfortunately, we have to keep computing the bounding client rect because it keeps changing. + if (btns.getBoundingClientRect().right + 10 >= statusMsg.getBoundingClientRect().left) { + container.addClass('conflicting-text'); + } + // do the check again to see if we need to condense some more. + if (btns.getBoundingClientRect().right + 10 >= statusMsg.getBoundingClientRect().left) { + container.addClass('more-conflicting-text'); + } + // once more to set a max width on the fix message box and make it wrap + var btnRight = btns.getBoundingClientRect().right; + if (btnRight + 10 >= statusMsg.getBoundingClientRect().left) { + jqStatusBtns.addClass('btn-xs'); + jqStatusMsg.css('max-width', parseInt(statusMsg.getBoundingClientRect().right - btnRight, 10)); + } + } }; function initLocalization() diff --git a/src/app/storymaps/common/builder/SharePopup.js b/src/app/storymaps/common/builder/SharePopup.js index 3815c4a..7fabf9e 100644 --- a/src/app/storymaps/common/builder/SharePopup.js +++ b/src/app/storymaps/common/builder/SharePopup.js @@ -132,11 +132,12 @@ define([ // Toggle the share buttons var isOrg = app.portal.isOrganization !== false, + appAccess = app.data.getWebAppItem().access, 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", + storyIsPrivate = appAccess == "private" || appAccess == "shared", + storyIsOrg = appAccess == "account" || appAccess == "org", userIsOwner = app.data.getWebAppItem().owner == app.portal.getPortalUser().username; // TODO: to review with 4.2 @@ -291,7 +292,7 @@ define([ if ( result.targetAccess == 'private') app.data.getWebAppItem().access = 'private'; else if ( result.targetAccess == 'organization') - app.data.getWebAppItem().access = 'account'; + app.data.getWebAppItem().access = 'org'; else if ( result.targetAccess == 'public') app.data.getWebAppItem().access = 'public'; @@ -313,8 +314,9 @@ define([ function refreshMyStories(params) { - var isPrivate = app.data.getWebAppItem().access == "private" || app.data.getWebAppItem().access == "shared", - isOrg = app.data.getWebAppItem().access == "account", + var appAccess = app.data.getWebAppItem().access, + isPrivate = appAccess == "private" || appAccess == "shared", + isOrg = appAccess == "account" || appAccess == "org", isFromScratch = app.isDirectCreationFirstSave || app.isGalleryCreation, sharingLevelIndex = isPrivate ? 0 : (isOrg ? 1 : 2), status = ""; 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 440343b..7f6620f 100644 --- a/src/app/storymaps/common/builder/browse-dialog/js/Grid.js +++ b/src/app/storymaps/common/builder/browse-dialog/js/Grid.js @@ -34,7 +34,7 @@ define([ "
" + "" + "
${title:_formatTitle}
" + - "${owner}" + + "
${owner}
" + "" + "
"; diff --git a/src/app/storymaps/common/builder/media/ViewConfigure.js b/src/app/storymaps/common/builder/media/ViewConfigure.js index 2f1440c..07e0c4c 100644 --- a/src/app/storymaps/common/builder/media/ViewConfigure.js +++ b/src/app/storymaps/common/builder/media/ViewConfigure.js @@ -106,6 +106,9 @@ define(["lib-build/css!./ViewConfigure", _params.fromService = false; } + if(url && app.appCfg.mediaPickerConfigureForceMode == "shortlist" && url.indexOf(("sharing/rest/content/items/") > -1)) + url = CommonHelper.possiblyAddToken(url); + container.find('.mediaURL') .val(url) .keyup(function(){ @@ -137,6 +140,8 @@ define(["lib-build/css!./ViewConfigure", // Thumbnail URL var thumbUrl = media ? media[media.type].thumb_url : ''; + if(thumbUrl && app.appCfg.mediaPickerConfigureForceMode == "shortlist" && thumbUrl.indexOf(("sharing/rest/content/items/") > -1)) + thumbUrl = CommonHelper.possiblyAddToken(thumbUrl); container.find('.mediaThumbURL') .val(thumbUrl) .keyup(function(){ diff --git a/src/app/storymaps/common/builder/media/map/MapConfigOverlay.css b/src/app/storymaps/common/builder/media/map/MapConfigOverlay.css index 565df90..c28ef01 100644 --- a/src/app/storymaps/common/builder/media/map/MapConfigOverlay.css +++ b/src/app/storymaps/common/builder/media/map/MapConfigOverlay.css @@ -15,7 +15,7 @@ font-size: 1.25em; font-family: 'open_sanssemibold', sans-serif; text-align: center; - padding: 6px 0 0 0; + padding: 5px; text-transform: uppercase; } @@ -23,16 +23,17 @@ color: #a5a5a5; text-align: center; font-size: 0.9em; - margin-bottom: 10px; + padding: 5px; } .mapConfigOverlay .btns { - padding: 10px 0; + margin: 10px; text-align: center; } .mapConfigOverlay .btn { text-transform: uppercase; + white-space: normal; } .mapConfigOverlay .btn-naked { @@ -127,39 +128,30 @@ body.layout-float .mapConfigOverlay.toc { } /* - * MAP LOCATION + * MAP LOCATION AND POPUP */ -.mapConfigOverlay.position { +.mapConfigOverlay.position, +.mapConfigOverlay.popup { bottom: 0; left: 50%; - width: 300px; - margin-left: -150px; - padding: 1.1em 1.0em 0.5em 1.0em; + width: 500px; + margin-left: -250px; border-bottom: none; } -.mapConfigOverlay.position .explain { - margin-top: 15px; +@media screen and (max-width: 1280px) { + .mapConfigOverlay.position, + .mapConfigOverlay.popup { + width: 400px; + margin-left: -200px; + } } /* * MAP Popup */ -.mapConfigOverlay.popup { - bottom: 0; - left: 50%; - width: 300px; - margin-left: -150px; - padding: 1.1em 1.0em 0.5em 1.0em; - border-bottom: none; -} - -.mapConfigOverlay.popup .explain { - margin-top: 15px; -} - /* * Geocoder */ diff --git a/src/app/storymaps/common/builder/media/map/MapViewerWrapper.js b/src/app/storymaps/common/builder/media/map/MapViewerWrapper.js index a47c177..ae21e21 100644 --- a/src/app/storymaps/common/builder/media/map/MapViewerWrapper.js +++ b/src/app/storymaps/common/builder/media/map/MapViewerWrapper.js @@ -167,13 +167,13 @@ define([ function receiveMessage(event) { if ( event.origin !== MapViewerWrapperUtils.getPortalDomain() ) { - console.log("MV ignored a message from another domain:", event.origin, event.data); + // ignoring a message from another domain return; } var json = _.isString(event.data) ? JSON.parse(event.data) : event.data; if (!json || !json.type) { - console.log('MV ignored event without data or without data type', event.data); + // ignoring event without data or data type return; } console.log("MV received", json); diff --git a/src/app/storymaps/common/mapcontrols/command/MapCommand.js b/src/app/storymaps/common/mapcontrols/command/MapCommand.js index b9eda59..0ccc099 100644 --- a/src/app/storymaps/common/mapcontrols/command/MapCommand.js +++ b/src/app/storymaps/common/mapcontrols/command/MapCommand.js @@ -22,7 +22,7 @@ define(["lib-build/css!./MapCommand", // Home/wait button // var tsUpdateStart = 0; - var homeButton = $('
'); + var homeButton = $('
'); var locateSymbol = new PictureMarkerSymbol('app/storymaps/common/_resources/icons/mapcommand-location-marker.png', 21, 21); var locateLayer = new GraphicsLayer({id: 'locateLayer'}); diff --git a/src/app/storymaps/common/mapcontrols/legend/Legend.js b/src/app/storymaps/common/mapcontrols/legend/Legend.js index 62d5d92..ec114a7 100644 --- a/src/app/storymaps/common/mapcontrols/legend/Legend.js +++ b/src/app/storymaps/common/mapcontrols/legend/Legend.js @@ -16,7 +16,7 @@ define(["lib-build/tpl!./Legend", var tplStrings = { isInBuilder: isInBuilder, - title: i18n.viewer.legendFromCommon.title + title: i18n.viewer.mapFromCommon.legend }; if ( isInBuilder ) { diff --git a/src/app/storymaps/common/mapcontrols/overview/Overview.js b/src/app/storymaps/common/mapcontrols/overview/Overview.js index 33ecb32..a8267ed 100644 --- a/src/app/storymaps/common/mapcontrols/overview/Overview.js +++ b/src/app/storymaps/common/mapcontrols/overview/Overview.js @@ -36,7 +36,7 @@ define(["lib-build/tpl!./Overview", var tplStrings = { isInBuilder: isInBuilder, - title: i18n.viewer.overviewFromCommon.title, + title: i18n.viewer.mapFromCommon.overview, overlayHeader: '', basemapGalleryBtnLabel: '', expandFactorLabel: '' diff --git a/src/app/storymaps/common/ui/autoplay/Autoplay.css b/src/app/storymaps/common/ui/autoplay/Autoplay.css index 52df1e8..ca2db95 100644 --- a/src/app/storymaps/common/ui/autoplay/Autoplay.css +++ b/src/app/storymaps/common/ui/autoplay/Autoplay.css @@ -40,6 +40,7 @@ body.mobile-view .autoplay { cursor: pointer; vertical-align: middle; color: #FFF; + text-shadow: 0 0 5px black; } .autoplay.theme-white2 .btn-play-container { diff --git a/src/app/storymaps/common/utils/connector/Vimeo.js b/src/app/storymaps/common/utils/connector/Vimeo.js index cae6a6c..09a02bc 100644 --- a/src/app/storymaps/common/utils/connector/Vimeo.js +++ b/src/app/storymaps/common/utils/connector/Vimeo.js @@ -1,4 +1,4 @@ -define(["dojo/Deferred"], +define(["dojo/Deferred"], function(Deferred) { return function Vimeo() @@ -65,7 +65,7 @@ define(["dojo/Deferred"], function getVimeoEmbed(videoId) { - return "//player.vimeo.com/video/" + videoId; + return "//player.vimeo.com/video/" + videoId + "?transparent=0"; } }; } diff --git a/src/app/storymaps/tpl/builder/BuilderView.css b/src/app/storymaps/tpl/builder/BuilderView.css index e7ef567..9ffb325 100644 --- a/src/app/storymaps/tpl/builder/BuilderView.css +++ b/src/app/storymaps/tpl/builder/BuilderView.css @@ -18,6 +18,15 @@ background-repeat: no-repeat; } +#builderPanel.more-conflicting-text .appTitle { + width: 240px; + height: 26px; + top: 17px; + background-size: contain; + background-repeat: no-repeat; + left: 5px; + } + #builderPanel .buttons { left: 280px; } @@ -148,7 +157,7 @@ body.layout-bullet .mapConfigOverlay.toc { padding: 0 6px; margin: 0 3px; border-radius: 80px; - box-shadow: rgba(0, 0, 0, 0.498039) 1px 1px 3px !important; + /*box-shadow: rgba(0, 0, 0, 0.498039) 1px 1px 3px !important;*/ } .layout-thumbnail .layout-block { @@ -249,7 +258,7 @@ body.layout-bullet .mapConfigOverlay.toc { .builder-shadows.media-blues .landing-btn, .builder-shadows.panel-blues .accordionPanel .builder-btn { border-radius: 50%; - box-shadow: 0 0 2px 1px white; + /*box-shadow: 0 0 2px 1px white;*/ } .builder-shadows.media-blues .landing-tour-container .landing-lbl { @@ -265,4 +274,4 @@ body.layout-bullet .mapConfigOverlay.toc { .builder-shadows.media-dark { -} \ No newline at end of file +} diff --git a/src/app/storymaps/tpl/builder/Help.css b/src/app/storymaps/tpl/builder/Help.css index 5810143..dc7e612 100644 --- a/src/app/storymaps/tpl/builder/Help.css +++ b/src/app/storymaps/tpl/builder/Help.css @@ -1,9 +1,9 @@ /* * Application unique help container */ - + #builderHelp { - display: none; + display: none; position: absolute; top: 0; left: 0; @@ -45,7 +45,7 @@ /* * Common */ - + .builderHelp .help-header, .builderHelp .helpNav, .builderHelp .helpFooter { @@ -65,7 +65,7 @@ text-align: left; line-height: 1.1; font-size: 1.4em; - font-family: 'open_sanssemibold', sans-serif; + font-family: 'open_sanssemibold', sans-serif; margin: -2px 14px 15px 14px; } @@ -198,7 +198,7 @@ /* * Content */ - + .builderHelp .helpText { font-size: 1em; margin: 0.5em; @@ -249,8 +249,8 @@ /* * Content - TIPS */ - -.builderHelp .tips-sync-on, + +.builderHelp .tips-sync-on, .builderHelp .tips-sync-off { cursor: pointer; } @@ -261,18 +261,19 @@ .builderHelp .helpFooter { position: absolute; - left: 10px; + left: 14px; right: 10px; bottom: 10px; - height: 34px; + height: 38px; color: #CECECE; font-style: italic; } .builderHelp .helpFooter .btn-external-help { - padding-left: 2px; + padding-left: 0px; font-style: italic; - vertical-align: 0px; + display: block; + margin-top: -5px; } .builderHelp .helpFooter .footerBtn { @@ -292,4 +293,4 @@ background-color: #5DADDE; border-color: #5DADDE; vertical-align: -2px; -} \ No newline at end of file +} diff --git a/src/app/storymaps/tpl/core/Config.js b/src/app/storymaps/tpl/core/Config.js index 969e6e1..f6aad29 100644 --- a/src/app/storymaps/tpl/core/Config.js +++ b/src/app/storymaps/tpl/core/Config.js @@ -117,7 +117,7 @@ define([], height = 100 - headerHeight - 1, styleOpt = "", styleOptPanel = "", - styleOptMedia = "box-shadow: inset 0px 0px 52px 3px rgba(0,0,0,0.3);"; + styleOptMedia = ""; if ( layout == "accordion" ) { if ( options.panel.size == 'small' ) { diff --git a/src/app/storymaps/tpl/ui/MainStage.css b/src/app/storymaps/tpl/ui/MainStage.css index 1c109dc..df43c72 100644 --- a/src/app/storymaps/tpl/ui/MainStage.css +++ b/src/app/storymaps/tpl/ui/MainStage.css @@ -1,9 +1,9 @@ #mainStagePanel { position: relative; background-size: 100% 100%; - -webkit-box-shadow: inset 0px 0px 82px 19px rgba(0,0,0,0.3); + /*-webkit-box-shadow: inset 0px 0px 82px 19px rgba(0,0,0,0.3); -moz-box-shadow: inset 0px 0px 82px 19px rgba(0,0,0,0.3); - box-shadow: inset 0px 0px 82px 19px rgba(0,0,0,0.3); + box-shadow: inset 0px 0px 82px 19px rgba(0,0,0,0.3);*/ } body.layout-tab #mainStagePanel, diff --git a/src/app/storymaps/tpl/ui/MainStage.js b/src/app/storymaps/tpl/ui/MainStage.js index a285991..652b046 100644 --- a/src/app/storymaps/tpl/ui/MainStage.js +++ b/src/app/storymaps/tpl/ui/MainStage.js @@ -1275,6 +1275,17 @@ define(["lib-build/tpl!./MainMediaContainerMap", embedContainer.off('load').load(stopMainStageLoadingIndicator); startMainStageLoadingIndicator(); + // vimeo changed their player in fall 2017 to make it more... compact? idk. + // in any case, it screws up expected styling for "fill" layout on mainstage + // so we're adding a url param transparent=0 to revert to the old styling + if (url.match('//player.vimeo.com/video') && !url.match('transparent=0')) { + if (url.match(/\?/)) { + url = url + '&transparent=0'; + } else { + url = url + '?transparent=0'; + } + } + // TODO youtube recommand an origin param "&origin=" + encodeURIComponent(document.location.origin) // https://developers.google.com/youtube/iframe_api_reference#Loading_a_Video_Player embedContainer.attr('src', url); diff --git a/src/app/storymaps/tpl/ui/desktop/AccordionPanel.js b/src/app/storymaps/tpl/ui/desktop/AccordionPanel.js index 4f0ff9d..56db8b9 100644 --- a/src/app/storymaps/tpl/ui/desktop/AccordionPanel.js +++ b/src/app/storymaps/tpl/ui/desktop/AccordionPanel.js @@ -194,7 +194,7 @@ define(["lib-build/tpl!./AccordionPanelEntry", if ( containerHeight - contentHeight < 120 ) container.find(".accordion-content") .css("height", "") - .css("max-height", containerHeight / 3); + .css("max-height", containerHeight / 1.5); else container.find(".accordion-content") .css("height", containerHeight - contentHeight) diff --git a/src/index.html b/src/index.html index b1384e4..85e365f 100644 --- a/src/index.html +++ b/src/index.html @@ -19,7 +19,7 @@ --> - + @@ -65,8 +65,8 @@