dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging' into hackathon-2021

This commit is contained in:
ansuz 2021-08-05 17:04:08 +05:30
parent ed8c2f4319 acd7148967
commit 34aa959a10
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server.js
View File

@ -311,7 +311,7 @@ var httpServer = Env.httpServer = Http.createServer(app);
nThen(function (w) {
Fs.exists(__dirname + "/customize", w(function (e) {
if (e) { return; }
console.log("Cryptpad is customizable, see customize.dist/readme.md for details");
console.log("CryptPad is customizable, see customize.dist/readme.md for details");
}));
}).nThen(function (w) {
httpServer.listen(config.httpPort,config.httpAddress,function(){

8
www/common/toolbar.js
View File

@ -460,7 +460,11 @@ MessengerUI, Messages, Pages) {
Messages.ui_expand = "Expand"; // XXX
createCollapse = function (toolbar) {
var icon = h('i.fa.fa-caret-up');
var up = 'fa-chevron-up';
var down = 'fa-chevron-down';
var both = up + ' ' + down;
var icon = h('i.fa.' + up);
var $icon = $(icon);
var text = h('span', Messages.ui_collapse);
var $text = $(text);
@ -472,7 +476,7 @@ MessengerUI, Messages, Pages) {
$button.click(function () {
toolbar.$top.toggleClass('toolbar-hidden');
var hidden = toolbar.$top.hasClass('toolbar-hidden');
$icon.toggleClass('fa-caret-down fa-caret-up'); //.toggleClass('fa-caret-up');
$icon.toggleClass(both);
$button.toggleClass('cp-toolbar-button-active');
$text.text(Messages[(hidden ? 'ui_expand': 'ui_collapse')]);
});