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

Add links to the teams APP

Browse Source
This commit is contained in:
yflory 2019-10-01 10:57:46 +02:00
parent 0b542f6be8
commit 1a69a0cab7
6 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
customize.dist/src/less2/include/colortheme.less
View File

@ -96,9 +96,9 @@
@colortheme_drive-color: #fff; @colortheme_drive-color: #fff;
@colortheme_drive-warn: #cd2532; @colortheme_drive-warn: #cd2532;
@colortheme_team-bg: #0b0061; @colortheme_teams-bg: #0b0061;
@colortheme_team-color: #fff; @colortheme_teams-color: #fff;
@colortheme_team-warn: #cd2532; @colortheme_teams-warn: #cd2532;
@colortheme_file-bg: #cd2532; @colortheme_file-bg: #cd2532;
@colortheme_file-color: #fff; @colortheme_file-color: #fff;

2
customize.dist/src/less2/include/icon-colors.less
View File

@ -21,6 +21,7 @@
.cp-icon-color-sheet { color: @colortheme_oocell-bg; } .cp-icon-color-sheet { color: @colortheme_oocell-bg; }
.cp-icon-color-kanban { color: @colortheme_kanban-bg; } .cp-icon-color-kanban { color: @colortheme_kanban-bg; }
.cp-icon-color-admin { color: @colortheme_admin-bg; } .cp-icon-color-admin { color: @colortheme_admin-bg; }
.cp-icon-color-teams { color: @colortheme_teams-bg; }
.cp-border-color-pad { border-color: @colortheme_pad-bg !important; } .cp-border-color-pad { border-color: @colortheme_pad-bg !important; }
.cp-border-color-code { border-color: @colortheme_code-bg !important; } .cp-border-color-code { border-color: @colortheme_code-bg !important; }
@ -39,5 +40,6 @@
.cp-border-color-sheet { border-color: @colortheme_oocell-bg !important; } .cp-border-color-sheet { border-color: @colortheme_oocell-bg !important; }
.cp-border-color-kanban { border-color: @colortheme_kanban-bg !important; } .cp-border-color-kanban { border-color: @colortheme_kanban-bg !important; }
.cp-border-color-admin { border-color: @colortheme_admin-bg !important; } .cp-border-color-admin { border-color: @colortheme_admin-bg !important; }
.cp-border-color-teams { border-color: @colortheme_teams-bg !important; }
} }

1
www/common/application_config_internal.js
View File

@ -106,6 +106,7 @@ define(function() {
ooslide: 'fa-file-powerpoint-o', ooslide: 'fa-file-powerpoint-o',
sheet: 'fa-file-excel-o', sheet: 'fa-file-excel-o',
drive: 'fa-hdd-o', drive: 'fa-hdd-o',
teams: 'fa-users',
}; };
// Ability to create owned pads and expiring pads through a new pad creation screen. // Ability to create owned pads and expiring pads through a new pad creation screen.

13
www/common/common-ui-elements.js
View File

@ -2499,7 +2499,18 @@ define([
'href': origin+'/drive/', 'href': origin+'/drive/',
'class': 'fa fa-hdd-o' 'class': 'fa fa-hdd-o'
}, },
content: h('span', Messages.login_accessDrive) content: h('span', Messages.type.drive)
});
}
if (padType !== 'teams' && accountName) {
options.push({
tag: 'a',
attributes: {
'target': '_blank',
'href': origin+'/teams/',
'class': 'fa fa-users'
},
content: h('span', Messages.type.teams)
}); });
} }
options.push({ tag: 'hr' }); options.push({ tag: 'hr' });

6
www/teams/app-team.less
View File

@ -7,9 +7,9 @@
&.cp-app-team { &.cp-app-team {
.framework_min_main( .framework_min_main(
@bg-color: @colortheme_team-bg, @bg-color: @colortheme_teams-bg,
@warn-color: @colortheme_team-warn, @warn-color: @colortheme_teams-warn,
@color: @colortheme_team-color @color: @colortheme_teams-color
); );
.drive_main(); .drive_main();

4
www/teams/inner.js
View File

@ -838,7 +838,7 @@ define([
driveAPP.loggedIn = common.isLoggedIn(); driveAPP.loggedIn = common.isLoggedIn();
if (!driveAPP.loggedIn) { throw new Error('NOT_LOGGED_IN'); } if (!driveAPP.loggedIn) { throw new Error('NOT_LOGGED_IN'); }
common.setTabTitle(Messages.type.team); common.setTabTitle(Messages.type.teams);
// Drive data // Drive data
if (privateData.newSharedFolder) { if (privateData.newSharedFolder) {
@ -850,7 +850,7 @@ define([
var $bar = $('#cp-toolbar'); var $bar = $('#cp-toolbar');
var configTb = { var configTb = {
displayed: ['useradmin', 'pageTitle', 'newpad', 'limit', 'notifications'], displayed: ['useradmin', 'pageTitle', 'newpad', 'limit', 'notifications'],
pageTitle: Messages.type.team, pageTitle: Messages.type.teams,
metadataMgr: metadataMgr, metadataMgr: metadataMgr,
readOnly: privateData.readOnly, readOnly: privateData.readOnly,
sfCommon: common, sfCommon: common,