[Rt-commit] rt branch, 5.0/core-rt-authentoken, repushed

[Craig Kaiser]

The branch 5.0/core-rt-authentoken was deleted and repushed:
       was 02d7803f944ca3e4f74b8f028b625f73bb9272b2
       now 0b60bb02603020a6a22c6bb9c1d1f5cafc11a58c

1: 02d7803f94 ! 1: 7043b5c06d Core RT::Authen::Token
    @@ -881,7 +881,7 @@
     +  <div class="auth-tokens col-12">
     +    <p><&|/l&>Authentication tokens allow other applications to use your user
     +        account without having to share your password, while allowing you to
    -+        revoke access on an application-specific basis. Changing your password
    ++       revoke access on an application-specific basis. Changing your password
     +        <em>does not</em> invalidate your auth tokens; you must revoke them here.</&>
     +    </p>
     +  </div>
    @@ -889,6 +889,7 @@
     +
     +<& /Elements/AuthToken/CreateButton, %ARGS, Owner => $UserObj->Id &>
     +<& /Elements/AuthToken/List, %ARGS, Owner => $UserObj->Id &>
    ++</div>
     +
     +<%ARGS>
     +$id => undef
    @@ -916,24 +917,24 @@
     +</%ARGS>
     +<%INIT>
     +</%INIT>
    -+
    -+<& /Elements/Modal, ModalId => "create-auth-token-modal", Method => 'POST', Action => RT->Config->Get('WebPath') . '/Admin/Users/Modify.html', Fields => [
    -+    { Label => loc("Create Auth Token") },
    -+    {
    -+        Label    => loc("Check to clear user custom fields") . ":",
    -+        Input    => 'checkbox',
    -+        Class    => 'checkbox',
    -+        Name     => 'clear_customfields',
    -+        Value    => 'On',
    -+    },
    -+]
    -+&>
    -+
    -+<div class="form-row">
    -+  <div class="col-12">
    -+    <a class="button btn btn-primary" href="#create-auth-token-modal" rel="modal:open" name="create_auth_token"><&|/l&>Create New Token</&></a>
    -+  </div>
    ++% if ($CreateToken) {
    ++  <&| /Widgets/TitleBox, title => loc("Create Auth Token") &>
    ++    <& /Elements/AuthToken/CreateResults, %ARGS &>
    ++  </&>
    ++% } elsif ($ShowCreateForm) {
    ++  <&| /Widgets/TitleBox, title => loc("Create Auth Token") &>
    ++    <& /Elements/AuthToken/CreateForm, Owner => $Owner &>
    ++  </&>
    ++% } else {
    ++<div class="authtoken-form-container">
    ++  <& /Elements/AuthToken/CreateForm, Owner => $Owner &>
     +</div>
    ++<form method="GET">
    ++  <input type="hidden" name="ShowCreateForm" value="1">
    ++  <input type="hidden" name="id" value="<% $Owner %>">
    ++  <button type="submit" class="authtoken-create">Create Auth Token</button>
    ++</form>
    ++% }
     
     diff --git a/share/html/Elements/AuthToken/CreateForm b/share/html/Elements/AuthToken/CreateForm
     new file mode 100644
    @@ -1229,9 +1230,15 @@
     +<& /Elements/Tabs &>
     +<& /Elements/ListActions, actions => \@results &>
     +
    -+<div class="auth-tokens">
    -+<p><&|/l&>Authentication tokens allow other applications to use your user account without having to share your password, while allowing you to revoke access on an application-specific basis. Changing your password <em>does not</em> invalidate your auth tokens; you must revoke them here.</&></p>
    -+<br>
    ++<div class="form-row">
    ++  <div class="auth-tokens col-12">
    ++    <p><&|/l&>Authentication tokens allow other applications to use your user
    ++        account without having to share your password, while allowing you to
    ++       revoke access on an application-specific basis. Changing your password
    ++        <em>does not</em> invalidate your auth tokens; you must revoke them here.
    ++    </&></p>
    ++  </div>
    ++</div>
     +
     +<& /Elements/AuthToken/CreateButton, %ARGS, Owner => $UserObj->Id &>
     +<& /Elements/AuthToken/List, %ARGS, Owner => $UserObj->Id &>
    @@ -1414,3 +1421,4 @@
     +    });
     +});
     +
    +
-:  ------- > 2: 6bc02ace62 Migrate to elevator theme
-:  ------- > 3: 0b60bb0260 Migrate Authen-Token code to work like other RT pages