Merge branch 'staging' into framework
This commit is contained in:
Caleb James DeLisle
@@ -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
|
||||
@@ -639,47 +636,49 @@ define([
|
||||
Pages['/poll/'] = Pages['/poll/index.html'] = function () {
|
||||
return [
|
||||
appToolbar(),
|
||||
h('div#content', [
|
||||
h('div#poll', [
|
||||
h('div#howItWorks', [
|
||||
h('div#cp-app-poll-content', [
|
||||
h('div#cp-app-poll-form', [
|
||||
h('div#cp-app-poll-help', [
|
||||
h('h1', 'CryptPoll'),
|
||||
setHTML(h('h2'), Msg.poll_subtitle),
|
||||
h('p', Msg.poll_p_save),
|
||||
h('p', Msg.poll_p_encryption)
|
||||
]),
|
||||
h('div.upper', [
|
||||
h('button#publish.btn.btn-success', {
|
||||
style: { display: 'none' }
|
||||
}, Msg.poll_publish_button),
|
||||
h('button#admin.btn.btn-primary', {
|
||||
style: { display: 'none' },
|
||||
title: Msg.poll_admin_button
|
||||
}, Msg.poll_admin_button),
|
||||
h('button#help.btn.btn-secondary', {
|
||||
title: Msg.poll_show_help_button
|
||||
}, Msg.poll_show_help_button)
|
||||
]),
|
||||
h('div.realtime', [
|
||||
h('div.cp-app-poll-realtime', [
|
||||
h('br'),
|
||||
h('center', [
|
||||
h('textarea#description', {
|
||||
h('div', [
|
||||
h('textarea#cp-app-poll-description', {
|
||||
rows: "5",
|
||||
cols: "50",
|
||||
placeholder: Msg.poll_descriptionHint,
|
||||
disabled: true
|
||||
}),
|
||||
h('div#cp-app-poll-description-published'),
|
||||
h('br')
|
||||
]),
|
||||
h('div#tableContainer', [
|
||||
h('div#tableScroll'),
|
||||
h('button#create-user.btn.btn-secondary', {
|
||||
h('div#cp-app-poll-table-container', [
|
||||
h('div#cp-app-poll-table-scroll'),
|
||||
h('button#cp-app-poll-create-user.btn.btn-secondary', {
|
||||
title: Msg.poll_create_user
|
||||
}, h('span.fa.fa-plus')),
|
||||
h('button#create-option.btn.btn-secondary', {
|
||||
h('button#cp-app-poll-create-option.btn.btn-secondary', {
|
||||
title: Msg.poll_create_option
|
||||
}, h('span.fa.fa-plus')),
|
||||
h('button#commit.btn.btn-secondary', {
|
||||
title: Msg.poll_commit
|
||||
}, h('span.fa.fa-check'))
|
||||
]),
|
||||
h('div#cp-app-poll-comments', [
|
||||
h('h2#cp-app-poll-comments-add-title', Msg.poll_comment_add),
|
||||
h('div#cp-app-poll-comments-add', [
|
||||
h('input.cp-app-poll-comments-add-name', {
|
||||
type: 'text'
|
||||
}),
|
||||
h('textarea.cp-app-poll-comments-add-msg'),
|
||||
h('button.cp-app-poll-comments-add-submit.btn.btn-secondary',
|
||||
Msg.poll_comment_submit),
|
||||
h('button.cp-app-poll-comments-add-cancel.btn.btn-secondary',
|
||||
Msg.cancel)
|
||||
]),
|
||||
h('h2#cp-app-poll-comments-list-title', Msg.poll_comment_list),
|
||||
h('div#cp-app-poll-comments-list')
|
||||
])
|
||||
])
|
||||
])
|
||||
|
||||
@@ -31,6 +31,6 @@ body.cp-app-slide { @import "../../../slide/app-slide.less"; }
|
||||
body.cp-app-file { @import "../../../file/app-file.less"; }
|
||||
body.cp-app-filepicker { @import "../../../filepicker/app-filepicker.less"; }
|
||||
body.cp-app-contacts { @import "../../../contacts/app-contacts.less"; }
|
||||
//body.cp-app-poll { @import "../../../poll/app-poll.less"; }
|
||||
body.cp-app-poll { @import "../../../poll/app-poll.less"; }
|
||||
body.cp-app-whiteboard { @import "../../../whiteboard/app-whiteboard.less"; }
|
||||
|
||||
|
||||
@@ -245,7 +245,9 @@ define(function () {
|
||||
out.poll_removeUser = "Êtes-vous sûr de vouloir supprimer cet utilisateur ?";
|
||||
|
||||
out.poll_titleHint = "Titre";
|
||||
out.poll_descriptionHint = "Description";
|
||||
out.poll_descriptionHint = "Décrivez votre sondage puis cliquer sur le bouton ✓ (Publier).\n" +
|
||||
"La description peut contenir de la syntaxe markdown, et vous pouvez y ajouter des images stockées dans votre CryptDrive.\n" +
|
||||
"Toutes les personnes possédant le lien d'édition de ce sondage peuvent modifier la description, bien que ce soit déconseillé.";
|
||||
|
||||
out.poll_remove = "Supprimer";
|
||||
out.poll_edit = "Modifier";
|
||||
@@ -255,6 +257,15 @@ 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';
|
||||
|
||||
out.poll_comment_list = "Commentaires";
|
||||
out.poll_comment_add = "Ajouter un commentaire";
|
||||
out.poll_comment_submit = "Envoyer";
|
||||
out.poll_comment_remove = "Supprimer ce commentaire";
|
||||
|
||||
// Canvas
|
||||
out.canvas_clear = "Nettoyer";
|
||||
out.canvas_delete = "Supprimer la sélection";
|
||||
|
||||
@@ -250,7 +250,9 @@ define(function () {
|
||||
out.poll_removeUser = "Are you sure you'd like to remove this user?";
|
||||
|
||||
out.poll_titleHint = "Title";
|
||||
out.poll_descriptionHint = "Describe your poll, and use the 'publish' button when you're done. Anyone with the link can change the description, but this is discouraged.";
|
||||
out.poll_descriptionHint = "Describe your poll, and use the ✓ (publish) button when you're done.\n" +
|
||||
"The description can be written using markdown syntax and you can embed media elements from your CryptDrive.\n" +
|
||||
"Anyone with the link can change the description, but this is discouraged.";
|
||||
|
||||
out.poll_remove = "Remove";
|
||||
out.poll_edit = "Edit";
|
||||
@@ -260,6 +262,15 @@ 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';
|
||||
|
||||
out.poll_comment_list = "Comments";
|
||||
out.poll_comment_add = "Add a comment";
|
||||
out.poll_comment_submit = "Send";
|
||||
out.poll_comment_remove = "Delete this comment";
|
||||
|
||||
// Canvas
|
||||
out.canvas_clear = "Clear";
|
||||
out.canvas_delete = "Delete selection";
|
||||
@@ -385,6 +396,7 @@ define(function () {
|
||||
out.fc_remove = "Delete permanently";
|
||||
out.fc_empty = "Empty the trash";
|
||||
out.fc_prop = "Properties";
|
||||
out.fc_hashtag = "Tags";
|
||||
out.fc_sizeInKilobytes = "Size in Kilobytes";
|
||||
// fileObject.js (logs)
|
||||
out.fo_moveUnsortedError = "You can't move a folder to the list of unsorted pads";
|
||||
|
||||
Reference in New Issue
Block a user