Remove overlay close button, snap-on-release editing, merge button overlay into hotspot

Author: OpenHypervideo

scripts/build.sh

@@ -61,7 +61,6 @@ CSS_FILES=(
     "_shared/types/ResourceHtml/style.css"
     "_shared/types/ResourceQuiz/style.css"
     "_shared/types/ResourceHotspot/style.css"
-    "_shared/types/ResourceButton/style.css"
     "_shared/types/ResourceEntity/style.css"
     "_shared/types/ResourceWistia/style.css"
     "_shared/types/ResourceSoundcloud/style.css"
@@ -141,7 +140,6 @@ JS_FILES=(
     "_shared/types/ResourceHtml/type.js"
     "_shared/types/ResourceQuiz/type.js"
     "_shared/types/ResourceHotspot/type.js"
-    "_shared/types/ResourceButton/type.js"
     "_shared/types/ResourceEntity/type.js"
     "_shared/types/ResourceWistia/type.js"
     "_shared/types/ResourceSoundcloud/type.js"

src/_shared/modules/Localization/locale/de.js

@@ -7,7 +7,6 @@
  */
 
 window.FrameTrail_L10n['de'] = {
-    "ActionCustomJS": "Eigenes JavaScript",
     "ActionOpenUrl": "URL öffnen",
     "ActionPresetInsert": "Aktion einfügen …",
     "ActionPresetJumpToHypervideo": "Zu Hypervideo springen",
@@ -172,6 +171,7 @@ window.FrameTrail_L10n['de'] = {
     "GenericTags": "Tags",
     "GenericTextTranscript": "Text Transkript",
     "GenericTimelines": "Timelines",
+    "GenericTransparent": "Transparent",
     "GenericType": "Typ",
     "GenericUndo": "Rückgängig",
     "GenericVolume": "Lautstärke",
@@ -264,7 +264,6 @@ window.FrameTrail_L10n['de'] = {
     "ResourceOpenInNewTab": "In neuem Tab öffnen",
     "ResourcePasteURL": "URL einfügen",
     "ResourcePlayFromHere": "Von hier abspielen",
-    "ResourceTypeButton": "Button",
     "ResourceTypeAudio": "Audio",
     "ResourceTypeImage": "Bild",
     "ResourceTypeLocation": "Karte",
@@ -302,17 +301,14 @@ window.FrameTrail_L10n['de'] = {
     "SettingsActionsIfWrong": "Bei falscher Antwort",
     "SettingsActionsOnAnswered": "Nach dem Beantworten",
     "SettingsActionTarget": "Ziel",
+    "SettingsActionTargetTime": "Zeit (optional)",
     "SettingsAlign": "Ausrichten",
-    "SettingsAllowClose": "Schließen erlauben",
     "SettingsAllowCollaboration": "Zusammenarbeit erlauben",
     "SettingsAllowUploads": "Uploads erlauben",
     "SettingsAnimationDuration": "Animationsdauer",
     "SettingsAnimationIn": "Eingangsanimation",
     "SettingsAnimationOut": "Ausgangsanimation",
     "SettingsArrange": "Anordnen",
-    "SettingsButtonColor": "Button-Farbe",
-    "SettingsButtonLabel": "Button-Beschriftung",
-    "SettingsButtonTextColor": "Textfarbe",
     "SettingsCaptureUserActions": "Aktionen aufzeichnen",
     "SettingsChapters": "Kapitel",
     "SettingsChapterTitle": "Kapiteltitel",
@@ -336,15 +332,17 @@ window.FrameTrail_L10n['de'] = {
     "SettingsGlobalCSS": "Globales CSS",
     "SettingsHTMLEditor": "HTML Editor",
     "SettingsHiddenFromOtherUsers": "Vor anderen Nutzer:innen verstecken?",
+    "SettingsHotspotBackground": "Hintergrund",
     "SettingsHotspotBorderRadius": "Eckenradius",
     "SettingsHotspotBorderWidth": "Rahmenbreite",
     "SettingsHotspotColor": "Hotspot Farbe",
-    "SettingsHotspotLink": "Link URL (optional)",
     "SettingsHotspotPickHypervideo": "Hypervideo auswählen",
     "SettingsHotspotShape": "Form",
     "SettingsHotspotShapeCircle": "Kreis",
     "SettingsHotspotShapeRectangle": "Rechteck",
     "SettingsHotspotShapeRounded": "Abgerundetes Rechteck",
+    "SettingsHotspotText": "Text",
+    "SettingsHotspotTextColor": "Textfarbe",
     "SettingsHoverBackground": "Hintergrund",
     "SettingsHoverBorder": "Rahmen",
     "SettingsHoverEffect": "Hover-Effekt",
@@ -378,7 +376,6 @@ window.FrameTrail_L10n['de'] = {
     "SettingsQuizTypeLabel": "Fragetyp",
     "SettingsSelectColorTheme": "Farbschema auswählen",
     "SettingsSelectContents": "Inhalte auswählen",
-    "SettingsShowCloseButton": "Schließen-Button anzeigen",
     "SettingsStartCollapsed": "Eingeklappt starten",
     "SettingsSubtitlesShowByDefault": "Untertitel standardmäßig anzeigen (falls vorhanden)",
     "SettingsSynchronization": "Mit Hypervideo synchronisieren",

src/_shared/modules/Localization/locale/en.js

@@ -7,7 +7,6 @@
  */
 
 window.FrameTrail_L10n['en'] = {
-    "ActionCustomJS": "Custom JavaScript",
     "ActionOpenUrl": "Open URL",
     "ActionPresetInsert": "Insert action …",
     "ActionPresetJumpToHypervideo": "Jump to Hypervideo",
@@ -172,6 +171,7 @@ window.FrameTrail_L10n['en'] = {
     "GenericTags": "Tags",
     "GenericTextTranscript": "Text Transcript",
     "GenericTimelines": "Timelines",
+    "GenericTransparent": "Transparent",
     "GenericType": "Type",
     "GenericUndo": "Undo",
     "GenericVolume": "Volume",
@@ -264,7 +264,6 @@ window.FrameTrail_L10n['en'] = {
     "ResourceOpenInNewTab": "Open in New Tab",
     "ResourcePasteURL": "Paste URL",
     "ResourcePlayFromHere": "Play from here",
-    "ResourceTypeButton": "Button",
     "ResourceTypeAudio": "Audio",
     "ResourceTypeImage": "Image",
     "ResourceTypeLocation": "Location",
@@ -302,17 +301,14 @@ window.FrameTrail_L10n['en'] = {
     "SettingsActionsIfWrong": "If answer is wrong",
     "SettingsActionsOnAnswered": "After answering",
     "SettingsActionTarget": "Target",
+    "SettingsActionTargetTime": "Jump to time (optional)",
     "SettingsAlign": "Align",
-    "SettingsAllowClose": "Allow Closing",
     "SettingsAllowCollaboration": "Allow collaboration",
     "SettingsAllowUploads": "Allow uploads",
     "SettingsAnimationDuration": "Animation Duration",
     "SettingsAnimationIn": "Entrance Animation",
     "SettingsAnimationOut": "Exit Animation",
     "SettingsArrange": "Arrange",
-    "SettingsButtonColor": "Button Color",
-    "SettingsButtonLabel": "Button Label",
-    "SettingsButtonTextColor": "Text Color",
     "SettingsCaptureUserActions": "Capture User Actions",
     "SettingsChapters": "Chapters",
     "SettingsChapterTitle": "Chapter title",
@@ -336,15 +332,17 @@ window.FrameTrail_L10n['en'] = {
     "SettingsGlobalCSS": "Global CSS",
     "SettingsHTMLEditor": "HTML Editor",
     "SettingsHiddenFromOtherUsers": "Hidden from other users?",
+    "SettingsHotspotBackground": "Background",
     "SettingsHotspotBorderRadius": "Border Radius",
     "SettingsHotspotBorderWidth": "Border Width",
     "SettingsHotspotColor": "Hotspot Color",
-    "SettingsHotspotLink": "Link URL (optional)",
     "SettingsHotspotPickHypervideo": "Pick Hypervideo",
     "SettingsHotspotShape": "Shape",
     "SettingsHotspotShapeCircle": "Circle",
     "SettingsHotspotShapeRectangle": "Rectangle",
     "SettingsHotspotShapeRounded": "Rounded Rectangle",
+    "SettingsHotspotText": "Text",
+    "SettingsHotspotTextColor": "Text Color",
     "SettingsHoverBackground": "Background",
     "SettingsHoverBorder": "Border",
     "SettingsHoverEffect": "Hover Effect",
@@ -378,7 +376,6 @@ window.FrameTrail_L10n['en'] = {
     "SettingsQuizTypeLabel": "Question Type",
     "SettingsSelectColorTheme": "Select Color Theme",
     "SettingsSelectContents": "Select contents",
-    "SettingsShowCloseButton": "Show Close Button",
     "SettingsStartCollapsed": "Start collapsed",
     "SettingsSubtitlesShowByDefault": "Show subtitles by default (if present)",
     "SettingsSynchronization": "Synchronize with Hypervideo",

src/_shared/modules/Localization/locale/fr.js

@@ -7,7 +7,6 @@
  */
 
 window.FrameTrail_L10n['fr'] = {
-    "ActionCustomJS": "JavaScript personnalisé",
     "ActionOpenUrl": "Ouvrir une URL",
     "ActionPresetInsert": "Insérer une action …",
     "ActionPresetJumpToHypervideo": "Aller à l'Hypervideo",
@@ -172,6 +171,7 @@ window.FrameTrail_L10n['fr'] = {
     "GenericTags": "Tags",
     "GenericTextTranscript": "Transcription textuelle",
     "GenericTimelines": "Timelines",
+    "GenericTransparent": "Transparent",
     "GenericType": "Type",
     "GenericUndo": "Annuler",
     "GenericVolume": "Volume",
@@ -264,7 +264,6 @@ window.FrameTrail_L10n['fr'] = {
     "ResourceOpenInNewTab": "Ouvrir dans un nouvel onglet",
     "ResourcePasteURL": "Coller l'URL",
     "ResourcePlayFromHere": "Jouer à partir d'ici",
-    "ResourceTypeButton": "Bouton",
     "ResourceTypeAudio": "Audio",
     "ResourceTypeImage": "Image",
     "ResourceTypeLocation": "Carte",
@@ -302,17 +301,14 @@ window.FrameTrail_L10n['fr'] = {
     "SettingsActionsIfWrong": "Si la réponse est incorrecte",
     "SettingsActionsOnAnswered": "Après la réponse",
     "SettingsActionTarget": "Cible",
+    "SettingsActionTargetTime": "Aller au temps (optionnel)",
     "SettingsAlign": "Aligner",
-    "SettingsAllowClose": "Autoriser la fermeture",
     "SettingsAllowCollaboration": "Autoriser la collaboration",
     "SettingsAllowUploads": "Autoriser les téléversements",
     "SettingsAnimationDuration": "Durée de l'animation",
     "SettingsAnimationIn": "Animation d'entrée",
     "SettingsAnimationOut": "Animation de sortie",
     "SettingsArrange": "Disposition",
-    "SettingsButtonColor": "Couleur du bouton",
-    "SettingsButtonLabel": "Libellé du bouton",
-    "SettingsButtonTextColor": "Couleur du texte",
     "SettingsCaptureUserActions": "Enregistrer les actions utilisateur",
     "SettingsChapters": "Chapitres",
     "SettingsChapterTitle": "Titre du chapitre",
@@ -336,15 +332,17 @@ window.FrameTrail_L10n['fr'] = {
     "SettingsGlobalCSS": "CSS global",
     "SettingsHTMLEditor": "Éditeur HTML",
     "SettingsHiddenFromOtherUsers": "Masqué des autres utilisateurs ?",
+    "SettingsHotspotBackground": "Arrière-plan",
     "SettingsHotspotBorderRadius": "Rayon de bordure",
     "SettingsHotspotBorderWidth": "Largeur de bordure",
     "SettingsHotspotColor": "Couleur du point chaud",
-    "SettingsHotspotLink": "URL du lien (optionnel)",
     "SettingsHotspotPickHypervideo": "Choisir un Hypervideo",
     "SettingsHotspotShape": "Forme",
     "SettingsHotspotShapeCircle": "Cercle",
     "SettingsHotspotShapeRectangle": "Rectangle",
     "SettingsHotspotShapeRounded": "Rectangle arrondi",
+    "SettingsHotspotText": "Texte",
+    "SettingsHotspotTextColor": "Couleur du texte",
     "SettingsHoverBackground": "Arrière-plan",
     "SettingsHoverBorder": "Bordure",
     "SettingsHoverEffect": "Effet au survol",
@@ -378,7 +376,6 @@ window.FrameTrail_L10n['fr'] = {
     "SettingsQuizTypeLabel": "Type de question",
     "SettingsSelectColorTheme": "Sélectionner un thème de couleur",
     "SettingsSelectContents": "Sélectionner les contenus",
-    "SettingsShowCloseButton": "Afficher le bouton de fermeture",
     "SettingsStartCollapsed": "Démarrer replié",
     "SettingsSubtitlesShowByDefault": "Afficher les sous-titres par défaut (si présent)",
     "SettingsSynchronization": "Synchroniser avec l'Hypervideo",