web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update UI in poll and remove old code

Browse Source
This commit is contained in:
yflory
2017-10-03 14:11:11 +02:00
parent 3337689630
commit 5cf86bf74a
8 changed files with 100 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
customize.dist/pages.js
View File

@@ -570,15 +570,12 @@ define([
};
var appToolbar = function () {
return h('div#toolbar.cryptpad-toolbar');
};
var appToolbar3 = function () {
return h('div#cp-toolbar.cp-toolbar-container');
};
Pages['/whiteboard/'] = Pages['/whiteboard/index.html'] = function () {
return [
appToolbar3(),
appToolbar(),
h('div#cp-app-whiteboard-canvas-area', h('canvas#cp-app-whiteboard-canvas', {
width: 600,
height: 600
@@ -638,7 +635,7 @@ define([
Pages['/poll/'] = Pages['/poll/index.html'] = function () {
return [
appToolbar3(),
appToolbar(),
h('div#cp-app-poll-content', [
h('div#cp-app-poll-form', [
h('div#cp-app-poll-help', [
@@ -647,18 +644,6 @@ define([
h('p', Msg.poll_p_save),
h('p', Msg.poll_p_encryption)
]),
h('div.cp-app-poll-upper', [
h('button#cp-app-poll-action-publish.btn.btn-success', {
style: { display: 'none' }
}, Msg.poll_publish_button),
h('button#cp-app-poll-action-admin.btn.btn-primary', {
style: { display: 'none' },
title: Msg.poll_admin_button
}, Msg.poll_admin_button),
h('button#cp-app-poll-action-help.btn.btn-secondary', {
title: Msg.poll_show_help_button
}, Msg.poll_show_help_button)
]),
h('div.cp-app-poll-realtime', [
h('br'),
h('center', [

4
customize.dist/translations/messages.fr.js
View File

@@ -256,6 +256,10 @@ define(function () {
out.poll_show_help_button = "Afficher l'aide";
out.poll_hide_help_button = "Cacher l'aide";
out.poll_bookmark_col = "Marquer cette colonne comme favorite pour qu'elle soit toujours déverouillée et affichée en première position.";
out.poll_bookmarked_col = "Voici votre colonne favorite; elle sera toujours dévérouillée et affichée en première position.";
out.poll_total = 'TOTAL';
// Canvas
out.canvas_clear = "Nettoyer";
out.canvas_delete = "Supprimer la sélection";

4
customize.dist/translations/messages.js
View File

@@ -258,6 +258,10 @@ define(function () {
out.poll_show_help_button = "Show help";
out.poll_hide_help_button = "Hide help";
out.poll_bookmark_col = 'Bookmark this column so that it is always unlocked and displayed at the beginning for you';
out.poll_bookmarked_col = 'This is your bookmarked column. It will always be unlocked and displayed at the beginning for you.';
out.poll_total = 'TOTAL';
// Canvas
out.canvas_clear = "Clear";
out.canvas_delete = "Delete selection";