diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index 96e36a4b1..4ad51bdf7 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -79,12 +79,14 @@ define(function () { out.printButton = "Imprimer"; out.printButtonTitle = "Imprimer votre présentation ou l'enregistrer au format PDF"; - out.printOptions = "Options d'impression"; + out.printOptions = "Options de mise en page"; out.printSlideNumber = "Afficher le numéro des slides"; out.printDate = "Afficher la date"; out.printTitle = "Afficher le titre du pad"; out.printCSS = "Personnaliser l'apparence (CSS):"; + out.slideOptionsTitle = "Personnaliser la présentation"; + out.editShare = "Lien d'édition"; out.editShareTitle = "Copier le lien d'édition dans le presse-papiers"; out.editOpen = "Éditer dans un nouvel onglet"; diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index b463b4853..15540fd1a 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -81,12 +81,14 @@ define(function () { out.printButton = "Print"; out.printButtonTitle = "Print your slides or export them as a PDF file"; - out.printOptions = "Print options"; + out.printOptions = "Layout options"; out.printSlideNumber = "Display the slide number"; out.printDate = "Display the date"; out.printTitle = "Display the pad title"; out.printCSS = "Custom style rules (CSS):"; + out.slideOptionsTitle = "Customize your slides"; + out.editShare = "Editing link"; out.editShareTitle = "Copy the editing link to clipboard"; out.editOpen = "Open editing link in a new tab"; diff --git a/q b/q new file mode 100644 index 000000000..cbba0eb66 --- /dev/null +++ b/q @@ -0,0 +1,478 @@ +warning: LF will be replaced by CRLF in customize.dist/translations/messages.fr.js. +The file will have its original line endings in your working directory. +[1mdiff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js[m +[1mindex 96e36a4..4ad51bd 100644[m +[1m--- a/customize.dist/translations/messages.fr.js[m +[1m+++ b/customize.dist/translations/messages.fr.js[m +[36m@@ -79,12 +79,14 @@[m [mdefine(function () {[m + [m + out.printButton = "Imprimer";[m + out.printButtonTitle = "Imprimer votre présentation ou l'enregistrer au format PDF";[m +[31m- out.printOptions = "Options d'impression";[m +[32m+[m[32m out.printOptions = "Options de mise en page";[m + out.printSlideNumber = "Afficher le numéro des slides";[m + out.printDate = "Afficher la date";[m + out.printTitle = "Afficher le titre du pad";[m + out.printCSS = "Personnaliser l'apparence (CSS):";[m + [m +[32m+[m[32m out.slideOptionsTitle = "Personnaliser la présentation";[m +[32m+[m + out.editShare = "Lien d'édition";[m + out.editShareTitle = "Copier le lien d'édition dans le presse-papiers";[m + out.editOpen = "Éditer dans un nouvel onglet";[m +[1mdiff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js[m +[1mindex b463b48..15540fd 100644[m +[1m--- a/customize.dist/translations/messages.js[m +[1m+++ b/customize.dist/translations/messages.js[m +[36m@@ -81,12 +81,14 @@[m [mdefine(function () {[m + [m + out.printButton = "Print";[m + out.printButtonTitle = "Print your slides or export them as a PDF file";[m +[31m- out.printOptions = "Print options";[m +[32m+[m[32m out.printOptions = "Layout options";[m + out.printSlideNumber = "Display the slide number";[m + out.printDate = "Display the date";[m + out.printTitle = "Display the pad title";[m + out.printCSS = "Custom style rules (CSS):";[m + [m +[32m+[m[32m out.slideOptionsTitle = "Customize your slides";[m +[32m+[m + out.editShare = "Editing link";[m + out.editShareTitle = "Copy the editing link to clipboard";[m + out.editOpen = "Open editing link in a new tab";[m +[1mdiff --git a/www/slide/main.js b/www/slide/main.js[m +[1mindex 50f216e..0bc6f5f 100644[m +[1m--- a/www/slide/main.js[m +[1m+++ b/www/slide/main.js[m +[36m@@ -136,7 +136,8 @@[m [mdefine([[m + [m + var $modal = $pad.contents().find('#modal');[m + var $content = $pad.contents().find('#content');[m +[31m- var $print = $pad.contents().find('#print');[m +[32m+[m[32m var $print = $pad.contents().find('#print'); var slideOptions = {};[m +[32m+[m + $( window ).resize(function() {[m + // 20vh[m + // 20 * 16 / 9vw[m +[36m@@ -149,7 +150,13 @@[m [mdefine([[m + // $print.css('font-size', (20*9/16)+'vw');[m + });[m + [m +[31m- Slide.setModal($modal, $content, $pad, ifrw, initialState);[m +[32m+[m[32m Slide.setModal(APP, $modal, $content, $pad, ifrw, slideOptions, initialState);[m +[32m+[m +[32m+[m[32m var setStyleState = function (state) {[m +[32m+[m[32m $pad.contents().find('#print, #content').find('style').each(function (i, el) {[m +[32m+[m[32m el.disabled = !state;[m +[32m+[m[32m });[m +[32m+[m[32m };[m + [m + var enterPresentationMode = function (shouldLog) {[m + Slide.show(true, editor.getValue());[m +[36m@@ -158,6 +165,7 @@[m [mdefine([[m + }[m + };[m + var leavePresentationMode = function () {[m +[32m+[m[32m setStyleState(false);[m + Slide.show(false);[m + };[m + [m +[36m@@ -229,7 +237,8 @@[m [mdefine([[m + content: textValue,[m + metadata: {[m + users: userData,[m +[31m- defaultTitle: defaultName[m +[32m+[m[32m defaultTitle: defaultName,[m +[32m+[m[32m slideOptions: slideOptions[m + }[m + };[m + if (!initializing) {[m +[36m@@ -370,6 +379,7 @@[m [mdefine([[m + setTabTitle();[m + $bar.find('.' + Toolbar.constants.title).find('span.title').text(data);[m + $bar.find('.' + Toolbar.constants.title).find('input').val(data);[m +[32m+[m[32m if (slideOptions.title) { Slide.updateOptions(); }[m + });[m + };[m + [m +[36m@@ -387,6 +397,15 @@[m [mdefine([[m + }[m + };[m + [m +[32m+[m[32m var updateOptions = function (newOpt) {[m +[32m+[m[32m if (stringify(newOpt) !== stringify(slideOptions)) {[m +[32m+[m[32m $.extend(slideOptions, newOpt);[m +[32m+[m[32m // TODO: manage realtime + cursor in the "options" modal ??[m +[32m+[m[32m console.log('updating options');[m +[32m+[m[32m Slide.updateOptions();[m +[32m+[m[32m }[m +[32m+[m[32m };[m +[32m+[m + var updateDefaultTitle = function (defaultTitle) {[m + defaultName = defaultTitle;[m + $bar.find('.' + Toolbar.constants.title).find('input').attr("placeholder", defaultName);[m +[36m@@ -409,6 +428,7 @@[m [mdefine([[m + updateTitle(json.metadata.title || defaultName);[m + titleUpdated = true;[m + }[m +[32m+[m[32m updateOptions(json.metadata.slideOptions);[m + updateColors(json.metadata.color, json.metadata.backColor);[m + }[m + if (!titleUpdated) {[m +[36m@@ -424,12 +444,14 @@[m [mdefine([[m + };[m + [m + var createPrintDialog = function () {[m +[31m- var printOptions = {[m +[32m+[m[32m var slideOptionsTmp = {[m + title: true,[m + slide: true,[m +[31m- date: true[m +[32m+[m[32m date: true,[m +[32m+[m[32m style: ''[m + };[m + [m +[32m+[m[32m $.extend(slideOptionsTmp, slideOptions);[m[41m [m + var $container = $('