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

Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

Browse Source
This commit is contained in:
Caleb James DeLisle
2017-06-30 12:11:55 +02:00
parent c25f2df721 7e69d051c4
commit 2144587919
12 changed files with 124 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
www/common/cryptpad-common.js
View File

@@ -967,8 +967,9 @@ define([
switch (type) {
case 'export':
button = $('<button>', {
'class': 'fa fa-download',
title: Messages.exportButtonTitle,
}).append($('<span>', {'class':'fa fa-download', style: 'font:'+size+' FontAwesome'}));
}).append($('<span>', {'class': 'drawer'}).text(Messages.exportButton));
button.click(prepareFeedback(type));
if (callback) {
@@ -977,8 +978,9 @@ define([
break;
case 'import':
button = $('<button>', {
'class': 'fa fa-upload',
title: Messages.importButtonTitle,
}).append($('<span>', {'class':'fa fa-upload', style: 'font:'+size+' FontAwesome'}));
}).append($('<span>', {'class': 'drawer'}).text(Messages.importButton));
if (callback) {
button
.click(prepareFeedback(type))
@@ -1128,10 +1130,11 @@ define([
button = $('<span>');
break;
}
var $text = $('<span>', {'class': 'drawer'}).text(Messages.historyText);
button = $('<button>', {
title: Messages.historyButton,
'class': "fa fa-history history",
});
}).append($text);
if (data.histConfig) {
button
.click(prepareFeedback(type))

8
www/common/toolbar2.js
View File

@@ -85,6 +85,10 @@ define([
var $drawer = Cryptpad.createButton('more', true).appendTo($rightside);
$drawer.click(function () {
$drawerContent.toggle();
$drawer.removeClass('active');
if ($drawerContent.is(':visible')) {
$drawer.addClass('active');
}
});
}
@@ -463,6 +467,10 @@ define([
'class': 'saveIcon',
'title': Messages.saveTitle
}).hide();
if (config.readOnly === 1) {
$titleContainer.append($('<span>', {'class': 'readOnly'})
.text('('+Messages.readonly+')'));
}
if (config.readOnly === 1 || typeof(Cryptpad) === "undefined") { return $titleContainer; }
var $input = $('<input>', {
type: 'text',