Merge 59034f4 into f8c1d11

mozilla · Apr 25, 2015 · 82191c2 · 82191c2
2 parents f8c1d11 + 59034f4
commit 82191c2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/relengapi/blueprints/tokenauth/__init__.py b/relengapi/blueprints/tokenauth/__init__.py
@@ -124,6 +124,7 @@ def can_access_token(access, typ, user):
 def root():
     return angular.template('tokens.html',
                             url_for('.static', filename='tokens.js'),
+                            url_for('.static', filename='tokens.css'),
                             tokens=api.get_data(list_tokens))
 
 

diff --git a/relengapi/blueprints/tokenauth/static/tokens.css b/relengapi/blueprints/tokenauth/static/tokens.css
@@ -0,0 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+pre.token {
+    font-size: 80%;
+}
diff --git a/relengapi/blueprints/tokenauth/static/tokens.html b/relengapi/blueprints/tokenauth/static/tokens.html
@@ -75,7 +75,7 @@ <h3 class="panel-title">Issue New Token</h3>
                         <input ng-model="newtoken.description" ng-required="true" class="form-control"
                             placeholder="Bug 1234567: Frobnicator access to update and delete frobs" />
                         <button class="btn btn-primary btn-block"
-                                ng-hide="form.$invalid"
+                                ng-disabled="form.$invalid"
                                 ng-click="issueToken()">Issue</button>
                     </form>
                 </div>