Repository: cxf-fediz Updated Branches: refs/heads/master def5708ef -> b63d8dd0c
Removing table borders around action buttons Project: http://git-wip-us.apache.org/repos/asf/cxf-fediz/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf-fediz/commit/b63d8dd0 Tree: http://git-wip-us.apache.org/repos/asf/cxf-fediz/tree/b63d8dd0 Diff: http://git-wip-us.apache.org/repos/asf/cxf-fediz/diff/b63d8dd0 Branch: refs/heads/master Commit: b63d8dd0c2bfab1db66ca0051993917dbb8ec5fd Parents: def5708 Author: Sergey Beryozkin <sberyoz...@gmail.com> Authored: Thu Jan 14 17:05:41 2016 +0000 Committer: Sergey Beryozkin <sberyoz...@gmail.com> Committed: Thu Jan 14 17:05:41 2016 +0000 ---------------------------------------------------------------------- .../src/main/webapp/WEB-INF/views/client.jsp | 18 +++++++++-- .../webapp/WEB-INF/views/clientCodeGrants.jsp | 4 +-- .../main/webapp/WEB-INF/views/clientTokens.jsp | 32 ++++++++++++++------ 3 files changed, 39 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b63d8dd0/services/oidc/src/main/webapp/WEB-INF/views/client.jsp ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp index 95f7cb7..90dd1de 100644 --- a/services/oidc/src/main/webapp/WEB-INF/views/client.jsp +++ b/services/oidc/src/main/webapp/WEB-INF/views/client.jsp @@ -33,6 +33,18 @@ border-width: 1px; padding: 3px 4px; } + + + +.table_no_border { + border-collapse: collapse; +} +.table_no_border .td_no_border { + padding: 0; + border-width: 0px; +} + + .form { max-width: 425px; @@ -99,12 +111,12 @@ </table> <br/> -<table border="0"> +<table class="table_no_border"> <tr> <% if (client.getClientSecret() != null) { %> -<td> +<td class="td_no_border"> <form action="/fediz-oidc/clients/<%= client.getClientId() + "/reset"%>" method="POST"> <div data-type="control_button" class="form-line"> <button class="form-submit-button" type="submit">Reset Secret</button> @@ -114,7 +126,7 @@ <% } %> -<td> +<td class="td_no_border"> <form action="/fediz-oidc/clients/<%= client.getClientId() + "/remove"%>" method="POST"> <div data-type="control_button" class="form-line"> <button class="form-submit-button" type="submit">Delete Client</button> http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b63d8dd0/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp b/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp index 59a8d1d..5afb966 100644 --- a/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp +++ b/services/oidc/src/main/webapp/WEB-INF/views/clientCodeGrants.jsp @@ -44,7 +44,7 @@ <h1>Code Grants issued to <%= client.getApplicationName() + "(" + client.getClientId() + ")"%></h1> <br/> <table border="1"> - <tr><th>Identifier</th><th>Issue Date</th><th>Expiry Date</th></tr> + <tr><th>ID</th><th>Issue Date</th><th>Expiry Date</th></tr> <% SimpleDateFormat dateFormat = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss", Locale.US); dateFormat.setTimeZone(TimeZone.getTimeZone("GMT")); @@ -52,7 +52,7 @@ for (ServerAuthorizationCodeGrant token : tokens.getCodeGrants()) { %> <tr> - <td><input type="text" name="tokenId" size="15" readonly="readonly" value="<%= token.getCode() %>" /></td> + <td><%= token.getCode() %></td> <td> <% Date issuedDate = new Date(token.getIssuedAt() * 1000); http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/b63d8dd0/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp ---------------------------------------------------------------------- diff --git a/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp b/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp index 8a74b22..ca58329 100644 --- a/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp +++ b/services/oidc/src/main/webapp/WEB-INF/views/clientTokens.jsp @@ -59,12 +59,20 @@ <% } %> + <% + if (!tokens.getAccessTokens().isEmpty()) { + %> + <th>Action</th> + <% + } + %> + </tr> <% for (ServerAccessToken token : tokens.getAccessTokens()) { %> <tr> - <td><input type="text" name="tokenId" readonly="readonly" value="<%= token.getTokenKey() %>" /></td> + <td><%= token.getTokenKey() %></td> <td> <% Date issuedDate = new Date(token.getIssuedAt() * 1000); @@ -84,15 +92,13 @@ %> <td> <%= token.getRefreshToken() %> - <td> + </td> <% } %> <td> <form action="/fediz-oidc/clients/<%= client.getClientId() + "/at/" + token.getTokenKey() + "/revoke"%>" method="POST"> - <div data-type="control_button" class="form-line"> - <button class="form-submit-button" type="submit">Delete</button> - </div> + <input type="submit" value="Delete"/> </form> </td> </tr> @@ -105,12 +111,20 @@ <h2>Refresh Tokens</h2> <br/> <table border="1"> - <tr><th>ID</th><th>Issue Date</th><th>Expiry Date</th><th>Access Token</th></tr> + <tr><th>ID</th><th>Issue Date</th><th>Expiry Date</th><th>Access Token</th> + <% + if (!tokens.getRefreshTokens().isEmpty()) { + %> + <th>Action</th> + <% + } + %> + </tr> <% for (RefreshToken token : tokens.getRefreshTokens()) { %> <tr> - <td><input type="text" name="tokenId" readonly="readonly" value="<%= token.getTokenKey() %>" /></td> + <td><%= token.getTokenKey() %></td> <td> <% Date issuedDate = new Date(token.getIssuedAt() * 1000); @@ -137,9 +151,7 @@ <td> <form action="/fediz-oidc/clients/<%= client.getClientId() + "/rt/" + token.getTokenKey() + "/revoke"%>" method="POST"> - <div data-type="control_button" class="form-line"> - <button class="form-submit-button" type="submit">Delete</button> - </div> + <input type="submit" value="Delete"/> </form> </td> </tr>