[Libreoffice-commits] online.git: loleaflet/admin
gokaysatir (via logerrit)
logerrit at kemper.freedesktop.org
Sun Jul 5 19:46:15 UTC 2020
loleaflet/admin/admin.html | 1
loleaflet/admin/adminAnalytics.html | 2 +
loleaflet/admin/admintemplate.html | 4 +--
loleaflet/admin/src/AdminSocketOverview.js | 33 ++++++++++++++++++-----------
4 files changed, 26 insertions(+), 14 deletions(-)
New commits:
commit 3b6ac9179cd506085e11ff958ff0955c3edaaff6
Author: gokaysatir <gokaysatir at collabora.com>
AuthorDate: Sun Jul 5 14:37:40 2020 +0300
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Sun Jul 5 21:45:56 2020 +0200
loleaflet: Admin panel does not have kill session button anymore.
Change-Id: I4cfa87dd2bc835281b0738628e88d824f0bcc4e9
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/98136
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/loleaflet/admin/admin.html b/loleaflet/admin/admin.html
index 9f5fc6886..82f3c0c41 100644
--- a/loleaflet/admin/admin.html
+++ b/loleaflet/admin/admin.html
@@ -54,6 +54,7 @@
<table id="docview" class="table is-fullwidth is-striped is-hoverable is-bordered">
<thead>
<tr>
+ <th></th><!--This header doesn't need text, this column will hold session closer buttons.-->
<th class="has-text-centered"><script>document.write(l10nstrings.strPid)</script></th>
<th class="has-text-centered"><script>document.write(l10nstrings.strDocument)</script></th>
<th class="has-text-centered"><script>document.write(l10nstrings.strNumberOfViews)</script></th>
diff --git a/loleaflet/admin/adminAnalytics.html b/loleaflet/admin/adminAnalytics.html
index b03c38777..a3a8e5a2e 100644
--- a/loleaflet/admin/adminAnalytics.html
+++ b/loleaflet/admin/adminAnalytics.html
@@ -43,6 +43,8 @@
document.getElementById('a-analytics-mobile').classList.add('is-active');
document.getElementById('a-analytics-tablet').classList.add('is-active');
+ window.location.href += '#memview';
+
// Switching tabs is done by css rules. We will set "is-active" classes here.
document.getElementById('button-memview').onclick = function() {
document.getElementById('button-memview').parentNode.className = 'is-active';
diff --git a/loleaflet/admin/admintemplate.html b/loleaflet/admin/admintemplate.html
index 9d6225b87..d87c78204 100644
--- a/loleaflet/admin/admintemplate.html
+++ b/loleaflet/admin/admintemplate.html
@@ -55,7 +55,7 @@
<div class="dropdown-item">
<div class="list is-hoverable" style="height:100%;">
<a id="a-overwiew-mobile" class="list-item" href="admin.html"><script>document.write(l10nstrings.strOverview)</script></a>
- <a id="a-analytics-mobile" class="list-item" href="adminAnalytics.html#memview"><script>document.write(l10nstrings.strAnalytics)</script></a>
+ <a id="a-analytics-mobile" class="list-item" href="adminAnalytics.html"><script>document.write(l10nstrings.strAnalytics)</script></a>
<a id="a-history-mobile" class="list-item" href="adminHistory.html"><script>document.write(l10nstrings.strHistory)</script></a>
<a id="a-log-mobile" class="list-item" href="adminLog.html"><script>document.write(l10nstrings.strLog)</script></a>
<a id="a-settings-mobile" class="list-item" href="adminSettings.html"><script>document.write(l10nstrings.strSettings)</script></a>
@@ -71,7 +71,7 @@
<div class="list is-hoverable" style="height:100%;">
<a class="list-item" id="button-admin-panel-collapse" href="#">←</a>
<a id="a-overwiew-tablet" class="list-item" href="admin.html"><script>document.write(l10nstrings.strOverview)</script></a>
- <a id="a-analytics-tablet" class="list-item" href="adminAnalytics.html#memview"><script>document.write(l10nstrings.strAnalytics)</script></a>
+ <a id="a-analytics-tablet" class="list-item" href="adminAnalytics.html"><script>document.write(l10nstrings.strAnalytics)</script></a>
<a id="a-history-tablet" class="list-item" href="adminHistory.html"><script>document.write(l10nstrings.strHistory)</script></a>
<a id="a-log-tablet" class="list-item" href="adminLog.html"><script>document.write(l10nstrings.strLog)</script></a>
</div>
diff --git a/loleaflet/admin/src/AdminSocketOverview.js b/loleaflet/admin/src/AdminSocketOverview.js
index 6f4f6c667..653045d04 100644
--- a/loleaflet/admin/src/AdminSocketOverview.js
+++ b/loleaflet/admin/src/AdminSocketOverview.js
@@ -2,9 +2,25 @@
/*
Socket to be intialized on opening the overview page in Admin console
*/
-/* global _ vex $ Util AdminSocketBase Admin */
-
-function appendDocRow(document, $rowContainer, $userContainer, sPid, sName, sViews, sMem, sDocTime, sDocIdle, modified) {
+/* global DlgYesNo _ vex $ Util AdminSocketBase Admin */
+
+function appendDocRow(document, $rowContainer, $userContainer, sPid, sName, sViews, sMem, sDocTime, sDocIdle, modified, socket) {
+ var $sessionCloseCell = $(document.createElement('td')).text('✖'); // This cell will open "Do you want to kill this session?" dialog.
+ $rowContainer.append($sessionCloseCell);
+ $sessionCloseCell.addClass('has-text-centered');
+ $sessionCloseCell.css('cursor', 'pointer');
+ $sessionCloseCell.click(function() {
+ var dialog = (new DlgYesNo())
+ .title(_('Confirmation'))
+ .text(_('Are you sure you want to terminate this session?'))
+ .yesButtonText(_('OK'))
+ .noButtonText(_('Cancel'))
+ .type('warning')
+ .yesFunction(function() {
+ socket.send('kill ' + sPid);
+ });
+ dialog.open();
+ });
var $pid = $(document.createElement('td')).text(sPid);
$pid.append($userContainer);
@@ -116,13 +132,6 @@ var AdminSocketOverview = AdminSocketBase.extend({
}
});
});
-
- $('.view-opt-button').on('click', function() {
- $('#docview-btn').toggleClass('selected-view-opt');
- $('#userview-btn').toggleClass('selected-view-opt');
- $('#docview').toggle();
- $('#userview').toggle();
- });
},
onSocketMessage: function(e) {
@@ -215,7 +224,7 @@ var AdminSocketOverview = AdminSocketBase.extend({
}
$userContainer.append($listContainer);
- appendDocRow(document, $rowContainer, $userContainer, sPid, sName, sViews, sMem, sDocTime, sDocIdle, modified);
+ appendDocRow(document, $rowContainer, $userContainer, sPid, sName, sViews, sMem, sDocTime, sDocIdle, modified, this.socket);
$('#doclist').append($rowContainer);
}
@@ -249,7 +258,7 @@ var AdminSocketOverview = AdminSocketBase.extend({
$listContainer.append($listLabel);
$userContainer.append($listContainer);
- appendDocRow(document, $rowContainer, $userContainer, sPid, sName, '0', sMem, '0', '0', '');
+ appendDocRow(document, $rowContainer, $userContainer, sPid, sName, '0', sMem, '0', '0', '', this.socket);
$('#doclist').append($rowContainer);
More information about the Libreoffice-commits
mailing list