From a291ee69913f02a4b6b337b65dd1c7e48e050eca Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 1 Nov 2018 12:31:37 +0100 Subject: [PATCH 1/6] Remove unnecessary 'Delete' title from 'Revoke' menu entry Signed-off-by: Jan-Christoph Borchardt --- settings/js/templates/authtoken.handlebars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/js/templates/authtoken.handlebars b/settings/js/templates/authtoken.handlebars index 7c222d863f..979cd142ff 100644 --- a/settings/js/templates/authtoken.handlebars +++ b/settings/js/templates/authtoken.handlebars @@ -18,7 +18,7 @@ {{/if}} {{#if canDelete}}
  • - {{revokeText}} + {{revokeText}}
    • {{/if}} From cf3768718bad230b51f7e8d8fd9b91208e296525 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 1 Nov 2018 12:32:53 +0100 Subject: [PATCH 2/6] Remove tooltip from sessions, just wrap lines for simplicity and no duplication Signed-off-by: Jan-Christoph Borchardt --- settings/css/settings.scss | 18 +++++++++++------- settings/js/templates/authtoken.handlebars | 4 ++-- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/settings/css/settings.scss b/settings/css/settings.scss index a028a62d2b..d37cc2e2a1 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -424,11 +424,22 @@ table.nostyle { } } .token-list td { + border-top: 1px solid var(--color-border); + max-width: 200px; + white-space: normal; + vertical-align: middle; + position: relative; + &%icon { overflow: visible; position: relative; width: 16px; } + + &.token-name { + padding: 10px 0; + } + &.more { @extend %icon; } @@ -441,13 +452,6 @@ table.nostyle { height: 44px; } } - border-top: 1px solid var(--color-border); - text-overflow: ellipsis; - max-width: 200px; - white-space: nowrap; - overflow: hidden; - vertical-align: middle; - position: relative; } tr > *:nth-child(3) { text-align: right; diff --git a/settings/js/templates/authtoken.handlebars b/settings/js/templates/authtoken.handlebars index 979cd142ff..3653c3246e 100644 --- a/settings/js/templates/authtoken.handlebars +++ b/settings/js/templates/authtoken.handlebars @@ -2,8 +2,8 @@
    - - {{name}} + + {{name}} {{lastActivity}} From dfa862673d27af2d11d5f6200b5560c0dcb8981e Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 1 Nov 2018 12:35:20 +0100 Subject: [PATCH 3/6] Fix double tr creation in session list Signed-off-by: Jan-Christoph Borchardt --- settings/js/templates/authtoken.handlebars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings/js/templates/authtoken.handlebars b/settings/js/templates/authtoken.handlebars index 3653c3246e..2a6067b1ac 100644 --- a/settings/js/templates/authtoken.handlebars +++ b/settings/js/templates/authtoken.handlebars @@ -23,4 +23,4 @@ {{/if}}
    - + From 0f89354035e7feba3014b077f395cbc965a39d96 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 1 Nov 2018 12:39:29 +0100 Subject: [PATCH 4/6] Fix missing keyboard focus ability and feedback for sessions action menu Signed-off-by: Jan-Christoph Borchardt --- settings/css/settings.scss | 5 +++-- settings/js/templates/authtoken.handlebars | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/settings/css/settings.scss b/settings/css/settings.scss index d37cc2e2a1..a7dbe0e7d8 100644 --- a/settings/css/settings.scss +++ b/settings/css/settings.scss @@ -458,7 +458,7 @@ table.nostyle { } .token-list { td > a.icon-more { - transition: opacity 0.5s; + transition: opacity var(--animation-quick); } a.icon-more { padding: 14px; @@ -469,8 +469,9 @@ table.nostyle { } tr { &:hover td > a.icon, + td > a.icon:focus, &.active td > a.icon { - opacity: 0.7; + opacity: 1; } } } diff --git a/settings/js/templates/authtoken.handlebars b/settings/js/templates/authtoken.handlebars index 2a6067b1ac..3051268699 100644 --- a/settings/js/templates/authtoken.handlebars +++ b/settings/js/templates/authtoken.handlebars @@ -8,7 +8,7 @@ {{lastActivity}} - {{#if showMore}}{{/if}} + {{#if showMore}}{{/if}}
    {{#if canScope}}
  • From 19beccc735ea77fefd3ae897d7276cedd53c2671 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 1 Nov 2018 12:59:03 +0100 Subject: [PATCH 5/6] Add device settings tooltip for accessibility Signed-off-by: Jan-Christoph Borchardt --- settings/js/authtoken_view.js | 1 + settings/js/templates.js | 22 +++++++++++----------- settings/js/templates/authtoken.handlebars | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/settings/js/authtoken_view.js b/settings/js/authtoken_view.js index 76c6c8c0f6..0aa67bad90 100644 --- a/settings/js/authtoken_view.js +++ b/settings/js/authtoken_view.js @@ -33,6 +33,7 @@ template: function (data) { data.disconnectText = t('settings', 'Disconnect'); data.revokeText = t('settings', 'Revoke'); + data.settingsTitle = t('settings', 'Device settings'); data.allowFSAccess = t('settings', 'Allow filesystem access'); return OC.Settings.Templates['authtoken'](data); }, diff --git a/settings/js/templates.js b/settings/js/templates.js index ea703c40c8..87c05bdefd 100644 --- a/settings/js/templates.js +++ b/settings/js/templates.js @@ -1,7 +1,11 @@ (function() { var template = Handlebars.template, templates = OC.Settings.Templates = OC.Settings.Templates || {}; templates['authtoken'] = template({"1":function(container,depth0,helpers,partials,data) { - return ""; + var helper; + + return ""; },"3":function(container,depth0,helpers,partials,data) { var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; @@ -17,12 +21,10 @@ templates['authtoken'] = template({"1":function(container,depth0,helpers,partial },"4":function(container,depth0,helpers,partials,data) { return "checked"; },"6":function(container,depth0,helpers,partials,data) { - var helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; + var helper; - return "
  • \n " - + alias4(((helper = (helper = helpers.revokeText || (depth0 != null ? depth0.revokeText : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"revokeText","hash":{},"data":data}) : helper))) + return "
  • \n " + + container.escapeExpression(((helper = (helper = helpers.revokeText || (depth0 != null ? depth0.revokeText : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"revokeText","hash":{},"data":data}) : helper))) + "\n
    • \n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; @@ -31,11 +33,9 @@ templates['authtoken'] = template({"1":function(container,depth0,helpers,partial + alias4(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"id","hash":{},"data":data}) : helper))) + "\">\n \n
    \n \n \n " + + "\" />\n \n \n " + alias4(((helper = (helper = helpers.name || (depth0 != null ? depth0.name : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"name","hash":{},"data":data}) : helper))) - + "\n \n \n \n \n " + alias4(((helper = (helper = helpers.lastActivity || (depth0 != null ? depth0.lastActivity : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"lastActivity","hash":{},"data":data}) : helper))) @@ -44,7 +44,7 @@ templates['authtoken'] = template({"1":function(container,depth0,helpers,partial + "\n
    \n" + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.canScope : depth0),{"name":"if","hash":{},"fn":container.program(3, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") + ((stack1 = helpers["if"].call(alias1,(depth0 != null ? depth0.canDelete : depth0),{"name":"if","hash":{},"fn":container.program(6, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "
    \n \n\n"; + + "
    \n \n\n"; },"useData":true}); templates['federationscopemenu'] = template({"1":function(container,depth0,helpers,partials,data) { var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=helpers.helperMissing, alias3="function", alias4=container.escapeExpression; diff --git a/settings/js/templates/authtoken.handlebars b/settings/js/templates/authtoken.handlebars index 3051268699..c2f1f26207 100644 --- a/settings/js/templates/authtoken.handlebars +++ b/settings/js/templates/authtoken.handlebars @@ -8,7 +8,7 @@ {{lastActivity}} - {{#if showMore}}{{/if}} + {{#if showMore}}{{/if}}
    {{#if canScope}}
  • From 0a7fa3229001fd4af6bcce7c599243703c0b2ca7 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 1 Nov 2018 13:26:06 +0100 Subject: [PATCH 6/6] Sessions: Make delete and filesystem access options tabbable Signed-off-by: Jan-Christoph Borchardt --- settings/js/templates.js | 4 ++-- settings/js/templates/authtoken.handlebars | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/settings/js/templates.js b/settings/js/templates.js index 87c05bdefd..c9931fed41 100644 --- a/settings/js/templates.js +++ b/settings/js/templates.js @@ -13,7 +13,7 @@ templates['authtoken'] = template({"1":function(container,depth0,helpers,partial + alias4(((helper = (helper = helpers.id || (depth0 != null ? depth0.id : depth0)) != null ? helper : alias2),(typeof helper === alias3 ? helper.call(alias1,{"name":"id","hash":{},"data":data}) : helper))) + "_filesystem\" " + ((stack1 = helpers["if"].call(alias1,((stack1 = (depth0 != null ? depth0.scope : depth0)) != null ? stack1.filesystem : stack1),{"name":"if","hash":{},"fn":container.program(4, data, 0),"inverse":container.noop,"data":data})) != null ? stack1 : "") - + "/>\n
  • \n " + return "
  • \n " + container.escapeExpression(((helper = (helper = helpers.revokeText || (depth0 != null ? depth0.revokeText : depth0)) != null ? helper : helpers.helperMissing),(typeof helper === "function" ? helper.call(depth0 != null ? depth0 : (container.nullContext || {}),{"name":"revokeText","hash":{},"data":data}) : helper))) + "\n
    • \n"; },"compiler":[7,">= 4.0.0"],"main":function(container,depth0,helpers,partials,data) { diff --git a/settings/js/templates/authtoken.handlebars b/settings/js/templates/authtoken.handlebars index c2f1f26207..b6d81780e8 100644 --- a/settings/js/templates/authtoken.handlebars +++ b/settings/js/templates/authtoken.handlebars @@ -12,13 +12,13 @@
    {{#if canScope}}
  • - +
    • {{/if}} {{#if canDelete}}
  • - {{revokeText}} + {{revokeText}}
    • {{/if}}