From 9ebda13ac54aaae34645d433dc8940486c62bdf2 Mon Sep 17 00:00:00 2001
From: Dominik Perpeet <dperpeet@redhat.com>
Date: Tue, 14 Feb 2017 11:34:20 +0100
Subject: [PATCH 2/3] Fix button tooltips

Don't force tooltip direction on privileged buttons.
Buttons may have an individual setting, e.g. via data-placement. When
applying security settings, don't force a specific direction.

Bug https://bugzilla.redhat.com/show_bug.cgi?id=1365372
Bug https://bugzilla.redhat.com/show_bug.cgi?id=1412036

Upstream commits:
6329f56d49154ecca860015517fe151783ed7621
    users: Don't force tooltip direction on privileged buttons
281018c1b987ab21562d86e2c4e993d000cbe80e
    users: Fix button tooltips
---
 dist/users/index.html       | Bin 13889 -> 14107 bytes
 dist/users/users.min.js     | Bin 95531 -> 95522 bytes
 dist/users/users.min.js.map | Bin 391146 -> 391099 bytes
 pkg/users/index.html        |  14 +++++++++++---
 pkg/users/local.js          |   3 +--
 dist/users/Makefile.deps    | Bin 2144 -> 2144 bytes
 6 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/dist/users/index.html b/dist/users/index.html
index 47148d04951ddeb6e44c4f811ad3372ff6d4fea1..904da4289b09f535337f6a63c5d58e6d5b4b279f 100644
GIT binary patch
delta 187
zcmX?@Gdpj?R(3Ikl*E!m-GZFN<kZ~Myb@cbqRjM+lFeJ#S29nI=V#?dlF3O;E7=^)
zeT{80qnPkyBOwhi9WA5+qJ`1T0ji$-UsQDRCu6b6(}YyPY7eNg3YL~+<QHXDrKad+
yr&j7Frld>~6JamOEXhf=RRS_4ODYS1tfbPClKea+J1zw{n0$dve)At8S7iY6Rz6Sw

delta 85
zcmV-b0IL6+ZozD@wFk4z2dD#+t_%#bmJ7%RlW-C#ldBRXlkFcDlOYo&A|PpGJtARs
rbZBpKX?kU3Eo)_YEn#G2A|P~WbZlikA|gJM&;}oqw;mg_@e?W|idG*_

diff --git a/dist/users/users.min.js b/dist/users/users.min.js
index 9a392c46a267dae96c6d6a7c1b44a8342cf57e4e..26b40a76bc7fe79f3a7396e93b18b598ef316357 100644
GIT binary patch
delta 18
acmZ4eignQ|)(vZ!nzu1+-^RpPS_A-9*a#f}

delta 36
scmZ4VigooX)(vZ!ICT`1iZatPN|Yw+GfPh9V&ZDPz_k4W6Jt;j0QtxaYybcN

diff --git a/dist/users/users.min.js.map b/dist/users/users.min.js.map
index f8035285ace9180c9326232b0adb3de58d91385f..83e9a2a612288a2431bc147665c4bcece0a417c3 100644
GIT binary patch
delta 390
zcmaF$UVQg^@d;rf<|zgSmZ_Ge28L#4rfKGeMkW@?lM5N8H?}HTZC-8llb^9<@=~ui
zjOm*vdA~JeG@RT}E2@=V>Flc$?C2Pr6{O?t=osi??dh3O>0IXItmEqF=;)#o3M3P)
z-Mxw@@2{0*%-VdnHZxD!0;bE*1ELE=276e0`c`dDeDi~mF?({<J1NGZ&86=?Ny=DQ
zx<l+R&TvLm9$2)!nS(KzGgCXm6QZQb59W;EtYS}8XIQ(3lomtPK@GC@3@yV{7G{Q~
z4CcIW^X>jZjL#$)i?^HUFy`~N@3v$FVy5l8Et#+9V-3OSj&oT>w(nZW%*MtMlcxX#
Zn%2_~tYemI|FxbOh*`G(TF?5y9RT~ze#rm;

delta 430
zcmdn}Ui{U2@d;rfMkc8yhGxdbmKMpziI$e;iAko0lM5N8H?}HTvFLa^I&WTT^^2de
zZ1MuHH;kE^d%fQpiW^rrmpM7>xH>vIy6A)g$?PC&caO};6KjRVvMSN!60P06N+<8C
zm1WG?e4{oqPg=Xu*;gmn(J|Q2L&x3GG0+7>276e0`WkMIdGmu&CfCdzszBQbRfT`a
z=7M*hBxSTMp(>0soKaN-mTa%%U`*x=NYC_y7*gd2QDN;FoKx(H>TYZIkn&=vI;cU`
zo}m?(%EBzB8wxQ>Fj{W+5@LKN$ymDGP=_&}S4<}+FQ!BR3SyLsGSf3kVwBn!STX`J
t)Aj|H%-8d=2Jv*eAl9JmcULl>U=;xxf@#Fk^~~){*RyP2x}H_c0{{@(g@XV9

diff --git a/pkg/users/index.html b/pkg/users/index.html
index 47148d0..904da42 100644
--- a/pkg/users/index.html
+++ b/pkg/users/index.html
@@ -49,7 +49,7 @@
   </div>
 
   <div id="accounts" class="container-fluid" hidden>
-    <button class="btn btn-default accounts-privileged" id="accounts-create" translatable="yes" data-container="body">Create New Account</button>
+    <button class="btn btn-default accounts-privileged" id="accounts-create" translatable="yes" data-container="body" data-placement="right">Create New Account</button>
     <div id="accounts-list">
     </div>
   </div>
@@ -74,7 +74,7 @@
       <div class="panel-heading">
         <div class="pull-right">
           <button translatable="yes" class="btn btn-default accounts-privileged" id="account-logout">Terminate Session</button>
-          <button translatable="yes" class="btn btn-danger accounts-privileged" id="account-delete">Delete</button>
+          <button translatable="yes" class="btn btn-danger accounts-privileged" data-placement="left" id="account-delete">Delete</button>
         </div>
         <span id="account-title"></span>
       </div>
@@ -123,7 +123,15 @@
     <div class="panel panel-default" id="account-authorized-keys">
       <div class="panel-heading">
         <div class="pull-right">
-          <button data-toggle="modal" data-target="#add-authorized-key-dialog" data-original-title="Add Public Key" class="btn btn-primary accounts-self-privileged fa fa-plus" id="authorized-key-add" title=""></button>
+          <button data-toggle="modal"
+                  data-target="#add-authorized-key-dialog"
+                  data-original-title="Add Public Key"
+                  data-placement="left"
+                  class="btn btn-primary accounts-self-privileged fa fa-plus"
+                  id="authorized-key-add"
+                  title=""
+                  type="button">
+          </button>
         </div>
         <span translatable="yes">Authorized Public SSH Keys</span>
       </div>
diff --git a/pkg/users/local.js b/pkg/users/local.js
index 55e25de..eaf17c3 100755
--- a/pkg/users/local.js
+++ b/pkg/users/local.js
@@ -39,8 +39,7 @@ function update_accounts_privileged() {
     $(".accounts-privileged:not('.accounts-current-account')").update_privileged(
         permission, cockpit.format(
             _("The user <b>$0</b> is not permitted to modify accounts"),
-            permission.user ? permission.user.name : ''),
-        "right"
+            permission.user ? permission.user.name : '')
     );
     $(".accounts-privileged").find("input")
         .attr('disabled', permission.allowed === false ||

diff --git a/dist/users/Makefile.deps b/dist/users/Makefile.deps
index 2fd3d24f3e6bf6cf4dcfaacce08d7b430412697b..dfe396dc9ce77ed8cdf8fcecc11c2d56f3e7a986 100644
GIT binary patch
delta 15
WcmaDL@IYXKBa5k(iSb5PX$}A^Qv{^|

delta 15
WcmaDL@IYXKBa4BRfyqW!X$}A^7zCXF

-- 
2.9.3