[
https://issues.apache.org/jira/browse/AIRAVATA-2279?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16238404#comment-16238404
]
ASF GitHub Bot commented on AIRAVATA-2279:
------------------------------------------
machristie commented on a change in pull request #75: [AIRAVATA-2279 & 2280]
FIXED.
URL:
https://github.com/apache/airavata-php-gateway/pull/75#discussion_r148895045
##########
File path: app/views/admin/manage-credentials.blade.php
##########
@@ -15,58 +15,79 @@
<div class="container-fluid">
<div class="col-md-12">
@if( Session::has("message"))
- <div class="row">
- <div class="alert alert-success alert-dismissible"
role="alert">
- <button type="button" class="close"
data-dismiss="alert"><span aria-hidden="true">×</span><span
- class="sr-only">Close</span></button>
- {{ Session::get("message") }}
- </div>
+ <div class="alert alert-success alert-dismissible"
role="alert">
+ <button type="button" class="close"
data-dismiss="alert"><span aria-hidden="true">×</span><span
+ class="sr-only">Close</span></button>
+ {{{ Session::get("message") }}}
</div>
{{ Session::forget("message") }}
@endif
+ @if( Session::has("error-message"))
+ <div class="alert alert-danger alert-dismissible" role="alert">
+ <button type="button" class="close"
data-dismiss="alert"><span aria-hidden="true">×</span><span
+ class="sr-only">Close</span></button>
+ {{{ Session::get("error-message") }}}
+ </div>
+ {{ Session::forget("error-message") }}
+ @endif
+
<h1 class="text-center">SSH Keys</h1>
+ <div class="error-alert"></div>
+
@if(Session::has("admin"))
- <table class="table">
- <tr class="text-center table-condensed">
- <td>
- <button class="btn btn-default
generate-ssh">Generate a new token</button>
- </td>
- </tr>
- </table>
- <div class="loading-img text-center hide">
- <img src="../../assets/ajax-loader.gif"/>
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3 class="panel-title">Generate New SSH Key</h3>
+ </div>
+ <div class="panel-body">
+ <form id="new-ssh-form-submit" class="form-inline"
action="{{URL::to('/')}}/admin/create-ssh-token" method="post">
+ <div id="credential-description-form-group"
class="form-group">
+ <label for="credential-description"
class="sr-only">Description for new SSH key</label>
+ <input type="text" id="credential-description"
name="description" class="form-control" placeholder="Description" required/>
+ </div>
+ <button type="submit" class="btn
btn-default">Generate</button>
+ </form>
+ </div>
</div>
@endif
- <table class="table table-bordered table-condensed"
style="word-wrap: break-word;">
- <tr>
- <th class="text-center">
- Token
- </th>
- <th class="text-center">Public Key</th>
- @if( Session::has("admin"))
- <th>Delete</th>
- @endif
- </tr>
- <tbody class="token-values-ssh">
- @foreach( $tokens as $token => $publicKey)
- <tr>
- <td class="">
- {{ $token }}
- </td>
- <td class="public-key">
- {{ $publicKey }}
- </td>
- @if( Session::has("admin"))
- <td>
- <span data-token="{{$token}}" class="glyphicon
glyphicon-trash remove-ssh-token"></span>
- </td>
- @endif
- </tr>
+
+ <ul class="list-group">
+ @foreach ($tokens as $val)
+ <li class="list-group-item credential-item">
+ <div class="row row_desc">
+ <div class="col-md-12 ssh_description">
+ @if($val->description!=null)
+ <p><strong>{{{ $val->description
}}}</strong></p>
+ @else
+ <p style="color:red"><strong>NO
DESCRIPTION!</strong></p>
+ @endif
+ </div>
+ </div><!-- .row -->
+ <div class="row row_details">
+ <div class="col-md-6">
+ <div class="input-group">
+ <input type="text" class="form-control
public-key" readonly
+
id="credential-publickey-{{$val->token}}"
+ value="{{ $val->publicKey }}">
+ <span class="input-group-btn">
+ <button type="button" class="btn
btn-default copy-credential"
+
data-clipboard-target="#credential-publickey-{{$val->token}}"
+ data-toggle="tooltip"
data-placement="bottom"
+ data-title="Copied!"
data-trigger="manual">
+ Copy
+ </button>
+ </span>
+ </div>
+ </div>
+ <div class="col-md-6">
+ <button data-token="{{$val->token}}"class="btn
btn-danger delete-credential"
+ @if(!Session::has("admin") ||
$val->description=="Default SSH Key") disabled @endif>Delete</button>
Review comment:
Likewise, don't need to do anything special with "Default SSH Key".
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
> Gateway credential store UI also to have the same format as individual user
> settings
> ------------------------------------------------------------------------------------
>
> Key: AIRAVATA-2279
> URL: https://issues.apache.org/jira/browse/AIRAVATA-2279
> Project: Airavata
> Issue Type: Bug
> Components: PGA PHP Web Gateway
> Environment: dev.seagrid.org
> Reporter: Eroma
> Assignee: Marcus Christie
> Priority: Major
> Fix For: 0.18
>
>
> Currently there are no description ora copy button to copy the public key in
> gateway credential store.
> Unifying the UI with User settings will make it easy for the gateway admins.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
