From 8ab3083a52b2883cae8ce6dd45b22867305197c3 Mon Sep 17 00:00:00 2001
From: Pradeep CE (cep) <breathingcode@gmail.com>
Date: Jan 10 2017 16:08:52 +0000
Subject: [PATCH 1/4] Rename Add button in New Token page


---

diff --git a/pagure/templates/add_token.html b/pagure/templates/add_token.html
index 15bef0e..cf63d26 100644
--- a/pagure/templates/add_token.html
+++ b/pagure/templates/add_token.html
@@ -28,7 +28,7 @@
             {% endfor %}
           </table>
           <div class="p-t-2">
-            <input type="submit" class="btn btn-primary" value="Add">
+            <input type="submit" class="btn btn-primary" value="Create">
             <input type="button" value="Cancel" class="btn btn-secondary"
              onclick="history.back();">
             {{ form.csrf_token }}

From d732b05e1ea06cc0715b789548bcfd93fa63ece9 Mon Sep 17 00:00:00 2001
From: Pradeep CE (cep) <breathingcode@gmail.com>
Date: Jan 10 2017 16:08:52 +0000
Subject: [PATCH 2/4] Ask user to select permissions for new token


---

diff --git a/pagure/templates/add_token.html b/pagure/templates/add_token.html
index cf63d26..3ddae6e 100644
--- a/pagure/templates/add_token.html
+++ b/pagure/templates/add_token.html
@@ -13,6 +13,14 @@
           <strong>Create a new token</strong>
         </div>
         <div class="card-block">
+          <p>
+            From the list below, select one or more actions you want to
+            authorize this token for.
+          </p>
+          <p>
+            After that, click 'Create' to generate a token with the selected
+            permissions.
+          </p>
           <form action="{{
               url_for('.add_token', username=username,
                       repo=repo.name, namespace=repo.namespace)

From 9d305ffecfd9847fc63daee8019f4ae2a48d0c3e Mon Sep 17 00:00:00 2001
From: Pradeep CE (cep) <breathingcode@gmail.com>
Date: Jan 10 2017 16:08:52 +0000
Subject: [PATCH 3/4] Display error message on empty submission in new token page


---

diff --git a/pagure/templates/add_token.html b/pagure/templates/add_token.html
index 3ddae6e..11e9b31 100644
--- a/pagure/templates/add_token.html
+++ b/pagure/templates/add_token.html
@@ -37,8 +37,8 @@
           </table>
           <div class="p-t-2">
             <input type="submit" class="btn btn-primary" value="Create">
-            <input type="button" value="Cancel" class="btn btn-secondary"
-             onclick="history.back();">
+            <a class="btn btn-secondary" href="{{ url_for('.view_settings',
+                username=username, repo=repo.name, namespace=repo.namespace) }}">Cancel</a>
             {{ form.csrf_token }}
           </div>
         </form>
diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index 60d354c..9c7c14c 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -1805,6 +1805,10 @@ def add_token(repo, username=None, namespace=None):
             APP.logger.exception(err)
             flask.flash('User could not be added', 'error')
 
+    # When form is displayed after an empty submission, show an error.
+    if form.errors.get('acls'):
+        flask.flash('You must select atleast one permission.', 'error')
+
     return flask.render_template(
         'add_token.html',
         select='settings',

From 3b94c7d84b21f70bc91c1dc3b6c15f7fb287cc4d Mon Sep 17 00:00:00 2001
From: Pradeep CE (cep) <breathingcode@gmail.com>
Date: Jan 10 2017 16:10:31 +0000
Subject: [PATCH 4/4] Correct usage of atleast in string


---

diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py
index 9c7c14c..7a8c023 100644
--- a/pagure/ui/repo.py
+++ b/pagure/ui/repo.py
@@ -1807,7 +1807,7 @@ def add_token(repo, username=None, namespace=None):
 
     # When form is displayed after an empty submission, show an error.
     if form.errors.get('acls'):
-        flask.flash('You must select atleast one permission.', 'error')
+        flask.flash('You must select at least one permission.', 'error')
 
     return flask.render_template(
         'add_token.html',