infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Add fixed order for rightside icons in the toolbar

Browse Source
pull/1/head
yflory 7 years ago
parent 95bbc3d130
commit 12bfcbe701
13 changed files with 183 additions and 132 deletions
Show Stats Download Patch File Download Diff File

38
customize.dist/src/less2/include/toolbar.less
Unescape Escape View File

@ -389,11 +389,6 @@
margin: 0; margin: 0;
}*/ }*/
.cp-toolbar-rightside-button {
float: right;
cursor: pointer;
}
select { select {
margin-left: 5px; margin-left: 5px;
margin-right: 5px; margin-right: 5px;
@ -475,13 +470,6 @@
background-color: @bg-color; background-color: @bg-color;
} }
} }
.cp-toolbar-rightside {
@media screen and (max-width: @barWidth) { // 450px
flex-wrap: wrap;
height: auto;
width: 100%;
}
}
.cp-toolbar-title-hoverable:hover { .cp-toolbar-title-hoverable:hover {
.cp-toolbar-title-editable, .cp-toolbar-title-edit { .cp-toolbar-title-editable, .cp-toolbar-title-edit {
cursor: text; cursor: text;
@ -830,13 +818,37 @@
} }
} }
.cp-toolbar-rightside { .cp-toolbar-rightside {
display: flex;
min-height: @toolbar_line-height; min-height: @toolbar_line-height;
overflow: hidden; overflow: hidden;
@media screen and (max-width: @barWidth) { // 450px
flex-wrap: wrap;
height: auto;
width: 100%;
}
&:empty { &:empty {
min-height: 0; min-height: 0;
height: 0; height: 0;
} }
text-align: right;
.cp-toolbar-rightside-button {
cursor: pointer;
// UI actions
&.cp-toolbar-icon-toggle { order: 1; }
&.cp-toolbar-icon-preview { order: 2; }
&.cp-toolbar-icon-present { order: 3; }
// Content actions
&.cp-toolbar-icon-mediatag { order: 10; }
order: 11;
// Storage actions
&.cp-toolbar-icon-hashtag { order: 20; }
&.cp-toolbar-icon-template { order: 21; }
&.cp-toolbar-icon-forget { order: 22; }
// Drawer
&.cp-toolbar-drawer-button { order: 30; }
}
.cp-toolbar-drawer-content:empty ~ .cp-toolbar-drawer-button { .cp-toolbar-drawer-content:empty ~ .cp-toolbar-drawer-button {
display: none; display: none;
} }

11
www/code/inner.js
Unescape Escape View File

@ -102,7 +102,7 @@ define([
class: 'cp-app-code-preview-empty' class: 'cp-app-code-preview-empty'
}).appendTo($previewContainer); }).appendTo($previewContainer);
var $previewButton = framework._.sfCommon.createButton(null, true); var $previewButton = framework._.sfCommon.createButton('preview', true);
var forceDrawPreview = function () { var forceDrawPreview = function () {
try { try {
if (editor.getValue() === '') { if (editor.getValue() === '') {
@ -119,12 +119,6 @@ define([
forceDrawPreview(); forceDrawPreview();
}, 150); }, 150);
$previewButton.removeClass('fa-question').addClass('fa-eye');
window.setTimeout(function () {
// setTimeout needed for tippy (tooltip), otherwise we have the browser's default
// tooltips
$previewButton.attr('title', Messages.previewButtonTitle);
});
var previewTo; var previewTo;
$previewButton.click(function () { $previewButton.click(function () {
clearTimeout(previewTo); clearTimeout(previewTo);
@ -377,9 +371,6 @@ define([
if ($preview.length && $preview.is(':visible')) { if ($preview.length && $preview.is(':visible')) {
return $preview[0]; return $preview[0];
} }
if ($codeMirror.length) {
return $codeMirror[0];
}
}; };
var main = function () { var main = function () {

3
www/common/common-thumbnail.js
Unescape Escape View File

@ -177,6 +177,7 @@ define([
window.html2canvas = undefined; window.html2canvas = undefined;
Thumb.fromDOM = function (opts, cb) { Thumb.fromDOM = function (opts, cb) {
var element = opts.getContainer(); var element = opts.getContainer();
if (!element) { return; }
var todo = function () { var todo = function () {
if (opts.filter) { opts.filter(element, true); } if (opts.filter) { opts.filter(element, true); }
window.html2canvas(element, { window.html2canvas(element, {
@ -202,8 +203,8 @@ define([
var mkThumbnail = function () { var mkThumbnail = function () {
var content = opts.getContent(); var content = opts.getContent();
if (content === oldThumbnailState) { return; } if (content === oldThumbnailState) { return; }
oldThumbnailState = content;
Thumb.fromDOM(opts, function (err, b64) { Thumb.fromDOM(opts, function (err, b64) {
oldThumbnailState = content;
Thumb.setPadThumbnail(common, opts.href, b64); Thumb.setPadThumbnail(common, opts.href, b64);
}); });
}; };

100
www/common/common-ui-elements.js
Unescape Escape View File

@ -468,7 +468,7 @@ define([
switch (type) { switch (type) {
case 'export': case 'export':
button = $('<button>', { button = $('<button>', {
'class': 'fa fa-download', 'class': 'fa fa-download cp-toolbar-icon-export',
title: Messages.exportButtonTitle, title: Messages.exportButtonTitle,
}).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.exportButton)); }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.exportButton));
@ -479,7 +479,7 @@ define([
break; break;
case 'import': case 'import':
button = $('<button>', { button = $('<button>', {
'class': 'fa fa-upload', 'class': 'fa fa-upload cp-toolbar-icon-import',
title: Messages.importButtonTitle, title: Messages.importButtonTitle,
}).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.importButton)); }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.importButton));
if (callback) { if (callback) {
@ -525,7 +525,8 @@ define([
if (!common.isLoggedIn()) { return; } if (!common.isLoggedIn()) { return; }
button = $('<button>', { button = $('<button>', {
title: Messages.saveTemplateButton, title: Messages.saveTemplateButton,
}).append($('<span>', {'class':'fa fa-bookmark', style: 'font:'+size+' FontAwesome'})); class: 'fa fa-bookmark cp-toolbar-icon-template'
});
if (data.rt) { if (data.rt) {
button button
.click(function () { .click(function () {
@ -570,37 +571,45 @@ define([
break; break;
case 'forget': case 'forget':
button = $('<button>', { button = $('<button>', {
id: 'cryptpad-forget',
title: Messages.forgetButtonTitle, title: Messages.forgetButtonTitle,
'class': "fa fa-trash cryptpad-forget", 'class': "fa fa-trash cp-toolbar-icon-forget"
style: 'font:'+size+' FontAwesome'
}); });
if (callback) { callback = typeof callback === "function" ? callback : function () {};
button button
.click(common.prepareFeedback(type)) .click(common.prepareFeedback(type))
.click(function() { .click(function() {
var msg = common.isLoggedIn() ? Messages.forgetPrompt : Messages.fm_removePermanentlyDialog; var msg = common.isLoggedIn() ? Messages.forgetPrompt : Messages.fm_removePermanentlyDialog;
UI.confirm(msg, function (yes) { UI.confirm(msg, function (yes) {
if (!yes) { return; } if (!yes) { return; }
sframeChan.query('Q_MOVE_TO_TRASH', null, function (err) { sframeChan.query('Q_MOVE_TO_TRASH', null, function (err) {
if (err) { return void callback(err); } if (err) { return void callback(err); }
var cMsg = common.isLoggedIn() ? Messages.movedToTrash : Messages.deleted; var cMsg = common.isLoggedIn() ? Messages.movedToTrash : Messages.deleted;
UI.alert(cMsg, undefined, true); UI.alert(cMsg, undefined, true);
callback(); callback();
return; return;
});
}); });
}); });
}
});
break; break;
case 'present': case 'present':
button = $('<button>', { button = $('<button>', {
title: Messages.presentButtonTitle, title: Messages.presentButtonTitle,
'class': "fa fa-play-circle cp-app-slide-present-button", // used in slide.js 'class': "fa fa-play-circle cp-toolbar-icon-present", // used in slide.js
style: 'font:'+size+' FontAwesome'
}); });
break; break;
case 'preview':
button = $('<button>', {
title: Messages.previewButtonTitle,
'class': "fa fa-eye cp-toolbar-icon-preview",
});
break;
case 'print':
button = $('<button>', {
title: Messages.printButtonTitle,
'class': "fa fa-print cp-toolbar-icon-print",
}).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.printText));
break;
case 'history': case 'history':
if (!AppConfig.enableHistory) { if (!AppConfig.enableHistory) {
button = $('<span>'); button = $('<span>');
@ -608,7 +617,7 @@ define([
} }
button = $('<button>', { button = $('<button>', {
title: Messages.historyButton, title: Messages.historyButton,
'class': "fa fa-history history", 'class': "fa fa-history cp-toolbar-icon-history",
}).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.historyText)); }).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.historyText));
if (data.histConfig) { if (data.histConfig) {
button button
@ -622,19 +631,25 @@ define([
button = $('<button>', { button = $('<button>', {
title: Messages.moreActions, title: Messages.moreActions,
'class': "cp-toolbar-drawer-button fa fa-ellipsis-h", 'class': "cp-toolbar-drawer-button fa fa-ellipsis-h",
style: 'font:'+size+' FontAwesome'
}); });
break; break;
case 'mediatag':
button = $('<button>', {
'class': 'fa fa-picture-o cp-toolbar-icon-mediatag',
title: Messages.filePickerButton,
})
.click(common.prepareFeedback(type));
break;
case 'savetodrive': case 'savetodrive':
button = $('<button>', { button = $('<button>', {
'class': 'fa fa-cloud-upload', 'class': 'fa fa-cloud-upload cp-toolbar-icon-savetodrive',
title: Messages.canvas_saveToDrive, title: Messages.canvas_saveToDrive,
}) })
.click(common.prepareFeedback(type)); .click(common.prepareFeedback(type));
break; break;
case 'hashtag': case 'hashtag':
button = $('<button>', { button = $('<button>', {
'class': 'fa fa-hashtag', 'class': 'fa fa-hashtag cp-toolbar-icon-hashtag',
title: Messages.tags_title, title: Messages.tags_title,
}) })
.click(common.prepareFeedback(type)) .click(common.prepareFeedback(type))
@ -642,7 +657,7 @@ define([
break; break;
case 'toggle': case 'toggle':
button = $('<button>', { button = $('<button>', {
'class': 'fa fa-caret-down', 'class': 'fa fa-caret-down cp-toolbar-icon-toggle',
}) })
.click(common.prepareFeedback(type)); .click(common.prepareFeedback(type));
window.setTimeout(function () { window.setTimeout(function () {
@ -668,7 +683,7 @@ define([
break; break;
case 'properties': case 'properties':
button = $('<button>', { button = $('<button>', {
'class': 'fa fa-info-circle', 'class': 'fa fa-info-circle cp-toolbar-icon-properties',
title: Messages.propertiesButtonTitle, title: Messages.propertiesButtonTitle,
}).append($('<span>', {'class': 'cp-toolbar-drawer-element'}) }).append($('<span>', {'class': 'cp-toolbar-drawer-element'})
.text(Messages.propertiesButton)) .text(Messages.propertiesButton))
@ -684,10 +699,24 @@ define([
}); });
break; break;
default: default:
data = data || {};
var icon = data.icon || "fa-question";
button = $('<button>', { button = $('<button>', {
'class': "fa fa-question", 'class': "fa " + icon,
}) })
.click(common.prepareFeedback(type)); .click(common.prepareFeedback(type));
if (data.title) { button.attr('title', data.title); }
if (data.style) { button.attr('style', data.style); }
if (data.id) { button.attr('id', data.id); }
if (data.hiddenReadOnly) { button.addClass('cp-hidden-if-readonly'); }
if (data.name) {
button.addClass('cp-toolbar-icon-'+data.name);
button.click(common.prepareFeedback(data.name));
}
if (data.text) {
$('<span>', {'class': 'cp-toolbar-drawer-element'}).text(data.text)
.appendTo(button);
}
} }
if (rightside) { if (rightside) {
button.addClass('cp-toolbar-rightside-button'); button.addClass('cp-toolbar-rightside-button');
@ -864,10 +893,11 @@ define([
var text = h('p.cp-help-text'); var text = h('p.cp-help-text');
var closeButton = h('span.cp-help-close.fa.fa-window-close'); var closeButton = h('span.cp-help-close.fa.fa-window-close');
var $toolbarButton = common.createButton('', true).addClass('cp-toolbar-button-active'); var $toolbarButton = common.createButton('', true, {
$toolbarButton.attr('title', Messages.hide_help_button); title: Messages.hide_help_button,
$toolbarButton text: Messages.help_button,
.append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.help_button)); name: 'help'
}).addClass('cp-toolbar-button-active');
var help = h('div.cp-help-container', [ var help = h('div.cp-help-container', [
closeButton, closeButton,
text text

6
www/common/sframe-app-framework.js
Unescape Escape View File

@ -398,11 +398,7 @@ define([
'" data-crypto-key="cryptpad:' + data.key + '"></media-tag>'), data); '" data-crypto-key="cryptpad:' + data.key + '"></media-tag>'), data);
} }
}); });
$embedButton = $('<button>', { $embedButton = common.createButton('mediatag', true).click(function () {
title: Messages.filePickerButton,
'class': 'cp-toolbar-rightside-button fa fa-picture-o',
style: 'font-size: 17px'
}).click(function () {
common.openFilePicker({ common.openFilePicker({
types: ['file'], types: ['file'],
where: ['root'] where: ['root']

2
www/drive/app-drive.less
Unescape Escape View File

@ -724,7 +724,7 @@ span {
} }
} }
.history { .cp-toolbar-icon-history {
float: right; float: right;
.cp-toolbar-drawer-element { .cp-toolbar-drawer-element {
display: none; display: none;

24
www/file/app-file.less
Unescape Escape View File

@ -30,6 +30,8 @@ flex-flow: column;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
flex-flow: column;
min-height: 0;
} }
#cp-app-file-content.ready { #cp-app-file-content.ready {
@ -134,3 +136,25 @@ media-tag {
z-index: 10000; z-index: 10000;
display: block; display: block;
} }
#cp-app-file-download-view {
flex: 1;
display: flex;
min-height: 0;
align-items: center;
justify-content: center;
flex-flow: column;
media-tag {
flex: 1;
min-height: 0;
max-width: 100vw;
display: flex;
align-items: center;
justify-content: center;
&> * {
max-height: 100%;
max-width: 100%;
}
}
}

12
www/file/inner.js
Unescape Escape View File

@ -100,6 +100,11 @@ define([
var title = document.title = metadata.name; var title = document.title = metadata.name;
Title.updateTitle(title || Title.defaultTitle); Title.updateTitle(title || Title.defaultTitle);
toolbar.addElement(['pageTitle'], {pageTitle: title}); toolbar.addElement(['pageTitle'], {pageTitle: title});
toolbar.$rightside.append(common.createButton('forget', true));
if (common.isLoggedIn()) {
toolbar.$rightside.append(common.createButton('hashtag', true));
}
common.setPadAttribute('fileType', metadata.type); common.setPadAttribute('fileType', metadata.type);
@ -118,7 +123,6 @@ define([
$mt.attr('data-crypto-key', 'cryptpad:'+cryptKey); $mt.attr('data-crypto-key', 'cryptpad:'+cryptKey);
var rightsideDisplayed = false; var rightsideDisplayed = false;
$(window.document).on('decryption', function (e) { $(window.document).on('decryption', function (e) {
var decrypted = e.originalEvent; var decrypted = e.originalEvent;
if (decrypted.callback) { if (decrypted.callback) {
@ -142,13 +146,7 @@ define([
toolbar.$rightside toolbar.$rightside
.append(common.createButton('export', true, {}, function () { .append(common.createButton('export', true, {}, function () {
saveAs(decrypted.blob, decrypted.metadata.name); saveAs(decrypted.blob, decrypted.metadata.name);
}))
.append(common.createButton('forget', true, {}, function () {
// not sure what to do here
})); }));
if (common.isLoggedIn()) {
toolbar.$rightside.append(common.createButton('hashtag', true));
}
rightsideDisplayed = true; rightsideDisplayed = true;
} }

16
www/poll/inner.js
Unescape Escape View File

@ -1064,7 +1064,7 @@ define([
setTimeout(waitFor()); setTimeout(waitFor());
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
// Switch to non-admin mode // Switch to non-admin mode
$('.cp-toolbar-rightside-button.fa-check').click(); $('.cp-toolbar-icon-publish').click();
setTimeout(waitFor()); setTimeout(waitFor());
}).nThen(function (waitFor) { }).nThen(function (waitFor) {
$('.cp-app-poll-comments-add-name').val("Mr.Me").keyup(); $('.cp-app-poll-comments-add-name').val("Mr.Me").keyup();
@ -1213,9 +1213,11 @@ define([
$(helpMenu.text).html($(help).html()); $(helpMenu.text).html($(help).html());
if (APP.readOnly) { publish(true); return; } if (APP.readOnly) { publish(true); return; }
var $publish = common.createButton('', true) var $publish = common.createButton('', true, {
.removeClass('fa-question').addClass('fa-check') name: 'publish',
.click(function () { publish(!APP.proxy.published); }).appendTo($rightside); icon: 'fa-check',
hiddenReadOnly: true
}).click(function () { publish(!APP.proxy.published); }).appendTo($rightside);
APP.$publishButton = $publish; APP.$publishButton = $publish;
updatePublishButton(); updatePublishButton();
@ -1230,11 +1232,7 @@ define([
} }
}; };
common.initFilePicker(fileDialogCfg); common.initFilePicker(fileDialogCfg);
APP.$mediaTagButton = $('<button>', { APP.$mediaTagButton = common.createButton('mediatag', true).click(function () {
title: Messages.filePickerButton,
'class': 'cp-toolbar-rightside-button fa fa-picture-o',
style: 'font-size: 17px'
}).click(function () {
var pickerCfg = { var pickerCfg = {
types: ['file'], types: ['file'],
where: ['root'] where: ['root']

63
www/slide/inner.js
Unescape Escape View File

@ -73,9 +73,7 @@ define([
}; };
var mkSlidePreviewPane = function (framework, $contentContainer) { var mkSlidePreviewPane = function (framework, $contentContainer) {
var $previewButton = framework._.sfCommon.createButton(null, true); var $previewButton = framework._.sfCommon.createButton('preview', true);
$previewButton.removeClass('fa-question').addClass('fa-eye');
$previewButton.attr('title', Messages.previewButtonTitle);
$previewButton.click(function () { $previewButton.click(function () {
var $c = $contentContainer; var $c = $contentContainer;
if ($c.hasClass('cp-app-slide-preview')) { if ($c.hasClass('cp-app-slide-preview')) {
@ -102,19 +100,16 @@ define([
}); });
}; };
var mkPrintButton = function (framework, editor, $content, $print, $toolbarDrawer) { var mkPrintButton = function (framework, editor, $content, $print) {
var $printButton = $('<button>', { var $printButton = framework._.sfCommon.createButton('print', true);
title: Messages.printButtonTitle, $printButton.click(function () {
'class': 'cp-toolbar-rightside-button fa fa-print',
style: 'font-size: 17px'
}).click(function () {
Slide.update(editor.getValue(), true); Slide.update(editor.getValue(), true);
$print.html($content.html()); $print.html($content.html());
window.focus(); window.focus();
window.print(); window.print();
framework.feedback('PRINT_SLIDES'); framework.feedback('PRINT_SLIDES');
}).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.printText)); });
$toolbarDrawer.append($printButton); framework._.toolbar.$drawer.append($printButton);
}; };
// Flag to check if a file from the filepicker is a mediatag for the slides or a background image // Flag to check if a file from the filepicker is a mediatag for the slides or a background image
@ -122,7 +117,7 @@ define([
isBackground: false isBackground: false
}; };
var mkSlideOptionsButton = function (framework, slideOptions, $toolbarDrawer) { var mkSlideOptionsButton = function (framework, slideOptions) {
var metadataMgr = framework._.cpNfInner.metadataMgr; var metadataMgr = framework._.cpNfInner.metadataMgr;
var updateSlideOptions = function (newOpt) { var updateSlideOptions = function (newOpt) {
if (JSONSortify(newOpt) !== JSONSortify(slideOptions)) { if (JSONSortify(newOpt) !== JSONSortify(slideOptions)) {
@ -319,14 +314,17 @@ define([
return $container; return $container;
}; };
var $slideOptions = $('<button>', { var $optionsButton = framework._.sfCommon.createButton(null, true, {
icon: 'fa-cog',
title: Messages.slideOptionsTitle, title: Messages.slideOptionsTitle,
'class': 'cp-toolbar-rightside-button fa fa-cog cp-hidden-if-readonly', hiddenReadOnly: true,
style: 'font-size: 17px' text: Messages.slideOptionsText,
}).click(function () { name: 'options'
});
$optionsButton.click(function () {
$('body').append(createPrintDialog()); $('body').append(createPrintDialog());
}).append($('<span>', {'class': 'cp-toolbar-drawer-element'}).text(Messages.slideOptionsText)); });
$toolbarDrawer.append($slideOptions); framework._.toolbar.$drawer.append($optionsButton);
metadataMgr.onChange(function () { metadataMgr.onChange(function () {
var md = metadataMgr.getMetadata(); var md = metadataMgr.getMetadata();
@ -363,17 +361,21 @@ define([
framework.localChange(); framework.localChange();
}; };
var $back = $('<button>', { var $back = framework._.sfCommon.createButton(null, true, {
id: SLIDE_BACKCOLOR_ID, icon: 'fa-square',
'class': 'fa fa-square cp-toolbar-rightside-button cp-hidden-if-readonly', title: Messages.backgroundButtonTitle,
'style': 'font-family: FontAwesome; color: #000;', hiddenReadOnly: true,
title: Messages.backgroundButtonTitle name: 'background',
style: 'color: #000;',
id: SLIDE_BACKCOLOR_ID
}); });
var $text = $('<button>', { var $text = framework._.sfCommon.createButton(null, true, {
id: SLIDE_COLOR_ID, icon: 'fa-i-cursor',
'class': 'fa fa-i-cursor cp-toolbar-rightside-button cp-hidden-if-readonly', title: Messages.colorButtonTitle,
'style': 'font-family: FontAwesome; font-weight: bold; color: #fff;', hiddenReadOnly: true,
title: Messages.colorButtonTitle name: 'color',
style: 'font-weight: bold; color: #FFF;',
id: SLIDE_COLOR_ID
}); });
var $testColor = $('<input>', { type: 'color', value: '!' }); var $testColor = $('<input>', { type: 'color', value: '!' });
var $check = $("#cp-app-slide-colorpicker"); var $check = $("#cp-app-slide-colorpicker");
@ -471,7 +473,7 @@ define([
activateLinks($content, framework); activateLinks($content, framework);
Slide.setModal(framework._.sfCommon, $modal, $content, slideOptions, Messages.slideInitialState); Slide.setModal(framework._.sfCommon, $modal, $content, slideOptions, Messages.slideInitialState);
mkPrintButton(framework, editor, $content, $print, $toolbarDrawer); mkPrintButton(framework, editor, $content, $print);
mkSlideOptionsButton(framework, slideOptions, $toolbarDrawer); mkSlideOptionsButton(framework, slideOptions, $toolbarDrawer);
mkColorConfiguration(framework, $modal); mkColorConfiguration(framework, $modal);
mkFilePicker(framework, editor); mkFilePicker(framework, editor);
@ -559,9 +561,6 @@ define([
if ($c.hasClass('cp-app-slide-preview')) { if ($c.hasClass('cp-app-slide-preview')) {
return $('.cp-app-slide-frame').first()[0]; return $('.cp-app-slide-frame').first()[0];
} }
if ($codeMirror.length) {
return $codeMirror[0];
}
}; };
var main = function () { var main = function () {

3
www/slide/slide.js
Unescape Escape View File

@ -139,7 +139,6 @@ define([
change(null, Slide.index); change(null, Slide.index);
Common.setPresentUrl(true); Common.setPresentUrl(true);
$('.cp-app-slide-present-button').hide();
updateFontSize(); updateFontSize();
return; return;
} }
@ -147,8 +146,6 @@ define([
Common.setTabTitle(); // Remove the slide number from the title Common.setTabTitle(); // Remove the slide number from the title
Common.setPresentUrl(false); Common.setPresentUrl(false);
change(Slide.index, null); change(Slide.index, null);
$('.cp-app-slide-present-button').show();
$('.cp-app-slide-source-button').hide();
$modal.removeClass('cp-app-slide-shown'); $modal.removeClass('cp-app-slide-shown');
updateFontSize(); updateFontSize();
}; };

7
www/whiteboard/app-whiteboard.less
Unescape Escape View File

@ -31,6 +31,13 @@
display: none; display: none;
} }
.cp-toolbar-rightside {
.cp-toolbar-icon-savetodrive { order: 13; }
.cp-toolbar-icon-embedImage { order: 12; }
.cp-toolbar-icon-mediatag { order: 11; }
.cp-toolbar-icon-color { order: 10; }
}
#cp-app-whiteboard-media-hidden { #cp-app-whiteboard-media-hidden {
display: none; display: none;
} }

30
www/whiteboard/inner.js
Unescape Escape View File

@ -312,12 +312,13 @@ define([
return; return;
} }
var $color = APP.$color = $('<button>', { var $color = APP.$color = common.createButton(null, true, {
id: "cp-app-whiteboard-color-picker", icon: 'fa-square',
title: Messages.canvas_chooseColor, title: Messages.canvas_chooseColor,
'class': "fa fa-square cp-toolbar-rightside-button", name: 'color',
}) id: 'cp-app-whiteboard-color-picker'
.on('click', function () { });
$color.on('click', function () {
pickColor($color.css('background-color'), function (color) { pickColor($color.css('background-color'), function (color) {
setColor(color); setColor(color);
}); });
@ -469,12 +470,13 @@ define([
}; };
reader.readAsDataURL(file); reader.readAsDataURL(file);
}; };
common.createButton('', true) common.createButton('', true, {
.attr('title', Messages.canvas_imageEmbed) title: Messages.canvas_imageEmbed,
.removeClass('fa-question').addClass('fa-file-image-o') icon: 'fa-file-image-o',
.click(function () { name: 'embedImage'
$('<input>', {type:'file'}).on('change', onUpload).click(); }).click(function () {
}).appendTo($rightside); $('<input>', {type:'file'}).on('change', onUpload).click();
}).appendTo($rightside);
if (common.isLoggedIn()) { if (common.isLoggedIn()) {
var fileDialogCfg = { var fileDialogCfg = {
@ -493,11 +495,7 @@ define([
} }
}; };
common.initFilePicker(fileDialogCfg); common.initFilePicker(fileDialogCfg);
APP.$mediaTagButton = $('<button>', { APP.$mediaTagButton = common.createButton('mediatag', true).click(function () {
title: Messages.filePickerButton,
'class': 'cp-toolbar-rightside-button fa fa-picture-o',
style: 'font-size: 17px'
}).click(function () {
var pickerCfg = { var pickerCfg = {
types: ['file'], types: ['file'],
where: ['root'], where: ['root'],

Write Preview
Loading…
Cancel
Save