' +
'
' +
@@ -166,54 +174,49 @@ define([
var has_edit_users = count > 1 || count > 0 && appConfig && !appConfig.isEdit && !appConfig.isRestrictedEdit; // has other user(s) who edit document
if ( has_edit_users ) {
- $btnUsers
- .attr('data-toggle', 'dropdown')
- .addClass('dropdown-toggle')
- .menu = true;
+ // $btnUsers
+ // .attr('data-toggle', 'dropdown')
+ // .addClass('dropdown-toggle')
+ // .menu = true;
$panelUsers['show']();
+
+ $btnUsers.find('.caption')
+ // .css({'font-size': '12px',
+ // 'margin-top': '0'})
+ .html(originalCount);
} else {
- $btnUsers
- .removeAttr('data-toggle')
- .removeClass('dropdown-toggle')
- .menu = false;
-
- $panelUsers[(!_readonlyRights && appConfig && (appConfig.sharingSettingsUrl && appConfig.sharingSettingsUrl.length || appConfig.canRequestSharingSettings)) ? 'show' : 'hide']();
+ // $btnUsers
+ // .removeAttr('data-toggle')
+ // .removeClass('dropdown-toggle')
+ // .menu = false;
+ $panelUsers['hide']();
}
- $btnUsers.find('.caption')
- .css({'font-size': ((has_edit_users) ? '12px' : '14px'),
- 'margin-top': ((has_edit_users) ? '0' : '-1px')})
- .html((has_edit_users) ? originalCount : '+');
-
- var usertip = $btnUsers.data('bs.tooltip');
- if ( usertip ) {
- usertip.options.title = (has_edit_users) ? usertip.options.titleExt : usertip.options.titleNorm;
- usertip.setContent();
- }
}
function onLostEditRights() {
_readonlyRights = true;
- $panelUsers && $panelUsers.find('#tlb-change-rights').hide();
- $btnUsers && !$btnUsers.menu && $panelUsers.hide();
+ // $panelUsers && $panelUsers.find('#tlb-change-rights').hide();
+ // $btnUsers && !$btnUsers.menu && $panelUsers.hide();
+ $panelShare && $panelShare.hide();
}
function onUsersClick(e) {
- if ( !$btnUsers.menu ) {
- $panelUsers.removeClass('open');
- Common.NotificationCenter.trigger('collaboration:sharing');
- } else {
- var usertip = $btnUsers.data('bs.tooltip');
- if ( usertip ) {
- if ( usertip.dontShow===undefined)
- usertip.dontShow = true;
+ var usertip = $btnUsers.data('bs.tooltip');
+ if ( usertip ) {
+ if ( usertip.dontShow===undefined)
+ usertip.dontShow = true;
- usertip.hide();
- }
+ usertip.hide();
}
}
+ function onShareClick(e) {
+ $panelUsers.removeClass('open');
+ Common.NotificationCenter.trigger('collaboration:sharing');
+ }
+
function onAppShowed(config) {
//config.isCrypted =true; //delete fore merge!
if ( this.labelDocName ) {
@@ -276,23 +279,28 @@ define([
var editingUsers = storeUsers.getVisibleEditingCount();
$btnUsers.tooltip({
- title: (editingUsers > 1 || editingUsers>0 && !appConfig.isEdit && !appConfig.isRestrictedEdit) ? me.tipViewUsers : me.tipAccessRights,
- titleNorm: me.tipAccessRights,
- titleExt: me.tipViewUsers,
+ title: me.tipViewUsers,
placement: 'bottom',
html: true
});
-
$btnUsers.on('click', onUsersClick.bind(me));
- var $labelChangeRights = $panelUsers.find('#tlb-change-rights');
- $labelChangeRights.on('click', function(e) {
- $panelUsers.removeClass('open');
- Common.NotificationCenter.trigger('collaboration:sharing');
+ $btnShare.tooltip({
+ title: me.tipAccessRights,
+ placement: 'bottom',
+ html: true
});
+ $btnShare.on('click', onShareClick.bind(me));
- $labelChangeRights[(!mode.isOffline && (mode.sharingSettingsUrl && mode.sharingSettingsUrl.length || mode.canRequestSharingSettings))?'show':'hide']();
- $panelUsers[(editingUsers > 1 || editingUsers > 0 && !appConfig.isEdit && !appConfig.isRestrictedEdit || !mode.isOffline && (mode.sharingSettingsUrl && mode.sharingSettingsUrl.length || mode.canRequestSharingSettings)) ? 'show' : 'hide']();
+ // var $labelChangeRights = $panelUsers.find('#tlb-change-rights');
+ // $labelChangeRights.on('click', function(e) {
+ // $panelUsers.removeClass('open');
+ // Common.NotificationCenter.trigger('collaboration:sharing');
+ // });
+ //
+ // $labelChangeRights[(!mode.isOffline && (mode.sharingSettingsUrl && mode.sharingSettingsUrl.length || mode.canRequestSharingSettings))?'show':'hide']();
+ $panelShare[(!_readonlyRights && appConfig && (appConfig.sharingSettingsUrl && appConfig.sharingSettingsUrl.length || appConfig.canRequestSharingSettings)) ? 'show' : 'hide']();
+ $panelUsers[(editingUsers > 1 || editingUsers > 0 && !appConfig.isEdit && !appConfig.isRestrictedEdit) ? 'show' : 'hide']();
}
@@ -444,7 +452,7 @@ define([
id: 'btn-goback',
cls: 'btn-header',
iconCls: 'toolbar__icon icon--inverse btn-goback',
- split: true,
+ // split: true,
dataHint: '0',
dataHintDirection: 'bottom',
dataHintOffset: 'big'
@@ -523,7 +531,7 @@ define([
if ( role == 'right' ) {
var $html = $(_.template(templateRightBox)({
tipUsers: this.labelCoUsersDescr,
- txtAccessRights: this.txtAccessRights
+ textShare: this.textShare
}));
if ( !me.labelDocName ) {
@@ -577,9 +585,12 @@ define([
$userList = $html.find('.cousers-list');
$panelUsers = $html.find('.box-cousers');
- $btnUsers = $html.find('.btn-users');
+ $btnUsers = $panelUsers.find('> .btn-users');
+ $panelShare = $html.find('.box-share');
+ $btnShare = $panelShare.find('> .btn-users-share');
$panelUsers.hide();
+ $panelShare.hide();
return $html;
} else
if ( role == 'title' ) {
@@ -785,14 +796,20 @@ define([
return this.btnSave;
else if (type == 'users')
return $panelUsers;
+ else if (type == 'share')
+ return $panelShare;
},
lockHeaderBtns: function (alias, lock) {
var me = this;
if ( alias == 'users' ) {
- if ( lock )
- $btnUsers.addClass('disabled').attr('disabled', 'disabled'); else
+ if ( lock ) {
+ $btnUsers.addClass('disabled').attr('disabled', 'disabled');
+ $btnShare.addClass('disabled').attr('disabled', 'disabled');
+ } else {
$btnUsers.removeClass('disabled').removeAttr('disabled');
+ $btnShare.removeClass('disabled').removeAttr('disabled');
+ }
} else if ( alias == 'rename-user' ) {
if (me.labelUserName) {
if ( lock ) {
@@ -844,7 +861,7 @@ define([
txtAccessRights: 'Change access rights',
tipAccessRights: 'Manage document access rights',
labelCoUsersDescr: 'Document is currently being edited by several users.',
- tipViewUsers: 'View users and manage document access rights',
+ tipViewUsers: 'View users',
tipDownload: 'Download file',
tipPrint: 'Print file',
tipGoEdit: 'Edit current file',
@@ -859,7 +876,8 @@ define([
tipViewSettings: 'View Settings',
textRemoveFavorite: 'Remove from Favorites',
textAddFavorite: 'Mark as favorite',
- textHideNotes: 'Hide Notes'
+ textHideNotes: 'Hide Notes',
+ textShare: 'Share'
}
}(), Common.Views.Header || {}))
});
diff --git a/apps/common/main/resources/img/header/buttons.svg b/apps/common/main/resources/img/header/buttons.svg
index 3e4d0dbf8..25c94131f 100644
--- a/apps/common/main/resources/img/header/buttons.svg
+++ b/apps/common/main/resources/img/header/buttons.svg
@@ -178,4 +178,7 @@
+
+
+
diff --git a/apps/common/main/resources/less/header.less b/apps/common/main/resources/less/header.less
index db1633f71..9fd5b2c81 100644
--- a/apps/common/main/resources/less/header.less
+++ b/apps/common/main/resources/less/header.less
@@ -70,6 +70,7 @@
}
.btn-users,
+ .btn-users-share,
.btn-header {
&:hover {
&:not(.disabled):not(.icon) {
@@ -163,6 +164,43 @@
}
.btn-users {
+ display: flex;
+ align-items: center;
+ cursor: pointer;
+ padding: 0 10px 0 8px;
+ height: 100%;
+
+ .inner-box-icon {
+ width: 28px;
+ position: relative;
+
+ > svg {
+ position: absolute;
+ width: 28px;
+ height: 20px;
+ top: 50%;
+ margin-top: -10px;
+ fill: @icon-toolbar-header-ie;
+ fill: @icon-toolbar-header;
+ }
+ }
+
+ .caption {
+ cursor: pointer;
+ font-size: 9px;
+ margin-left: -18px;
+ width: 16px;
+ text-align: center;
+ overflow: hidden;
+ }
+
+ &.disabled {
+ opacity: @component-disabled-opacity;
+ pointer-events: none;
+ }
+}
+
+.btn-users-share {
display: flex;
align-items: center;
cursor: pointer;
@@ -184,7 +222,8 @@
.caption {
cursor: pointer;
- font-size: 14px;
+ font-size: 11px;
+ margin: 2px 0 0 2px;
}
&.disabled {
diff --git a/apps/common/main/resources/less/toolbar.less b/apps/common/main/resources/less/toolbar.less
index 8c9e8c6d0..7d39df986 100644
--- a/apps/common/main/resources/less/toolbar.less
+++ b/apps/common/main/resources/less/toolbar.less
@@ -461,7 +461,7 @@
}
// TODO: move to appropriate module
- .btn-header, .btn-users {
+ .btn-header, .btn-users, .btn-users-share {
&:not(:active) .icon--inverse {
background-position-x: 0;
background-position-x: @button-small-normal-icon-offset-x;
@@ -503,6 +503,14 @@
}
}
}
+ .btn-users {
+ .inner-box-icon {
+ > svg {
+ fill: @text-normal-ie;
+ fill: @text-normal;
+ }
+ }
+ }
.btn-current-user {
.icon--inverse {
diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js
index b46515549..68dfbb907 100644
--- a/apps/documenteditor/main/app/controller/Main.js
+++ b/apps/documenteditor/main/app/controller/Main.js
@@ -607,6 +607,7 @@ define([
this.api.asc_coAuthoringDisconnect();
appHeader.setCanRename(false);
appHeader.getButton('users') && appHeader.getButton('users').hide();
+ appHeader.getButton('share') && appHeader.getButton('share').hide();
this.getApplication().getController('LeftMenu').getView('LeftMenu').showHistory();
this.disableEditing(true);
this._renameDialog && this._renameDialog.close();
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 6bce19a56..2c310c3f2 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -293,7 +293,7 @@
"Common.Views.Header.tipSave": "Save",
"Common.Views.Header.tipUndo": "Undo",
"Common.Views.Header.tipViewSettings": "View settings",
- "Common.Views.Header.tipViewUsers": "View users and manage document access rights",
+ "Common.Views.Header.tipViewUsers": "View users",
"Common.Views.Header.txtAccessRights": "Change access rights",
"Common.Views.Header.txtRename": "Rename",
"Common.Views.History.textCloseHistory": "Close History",