new access token UI

1 files changed, 80 insertions, 51 deletions

diff --git a/templates/user/settings/applications.tmpl b/templates/user/settings/applications.tmpl
index 2e766a3dc7..eb7c0e89d4 100644
--- a/templates/user/settings/applications.tmpl
+++ b/templates/user/settings/applications.tmpl
@@ -1,56 +1,85 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
-<div id="setting-wrapper" class="main-wrapper">
-    <div id="user-profile-setting" class="container clear">
-        {{template "user/settings/nav" .}}
-        <div class="grid-4-5 left">
-            <div class="setting-content">
-                {{template "ng/base/alert" .}}
-                <div id="setting-content">
-                    <div id="user-applications-panel" class="panel panel-radius">
-                        <div class="panel-header">
-                        	<a class="show-form-btn" data-target-form="#access-add-form">
-                        		<button class="btn btn-medium btn-black btn-radius right">{{.i18n.Tr "settings.generate_new_token"}}</button>
-                        	</a>
-                        	<strong>{{.i18n.Tr "settings.manage_access_token"}}</strong>
-                        </div>
-                        <ul class="panel-body setting-list">
-                            <li>{{.i18n.Tr "settings.tokens_desc"}}</li>
-                            {{range .Tokens}}
-                            <li class="ssh clear">
-                                <span class="active-icon left label label-{{if .HasRecentActivity}}green{{else}}gray{{end}} label-radius"></span>
-                                <i class="fa fa-send fa-2x left"></i>
-                                <div class="ssh-content left">
-                                    <p><strong>{{.Name}}</strong></p>
-                                    <p class="activity"><i>{{$.i18n.Tr "settings.add_on"}} <span title="{{DateFmtLong .Created}}">{{DateFmtShort .Created}}</span> —  <i class="octicon octicon-info"></i>{{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} {{DateFmtShort .Updated}}{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i></p>
-                                </div>
-                                <a href="{{AppSubUrl}}/user/settings/applications?remove={{.Id}}">
-                                	<button class="btn btn-small btn-red btn-radius ssh-btn right">{{$.i18n.Tr "settings.delete_token"}}</button>
-                                </a>
-                            </li>
-                            {{end}}
-                        </ul>
-                    </div>
-                    <br>
-                    <form class="panel panel-radius form form-align form-settings-add hide" id="access-add-form" action="{{AppSubUrl}}/user/settings/applications" method="post">
-                        {{.CsrfTokenHtml}}
-                        <p class="panel-header"><strong>{{.i18n.Tr "settings.generate_new_token"}}</strong></p>
-                        <div class="panel-body">
-                        	<div class="text-center panel-desc">{{.i18n.Tr "settings.new_token_desc"}}</div>
-                        	<input type="hidden" name="type" value="token">
-                            <p class="field">
-                                <label class="req" for="token-name">{{.i18n.Tr "settings.token_name"}}</label>
-                                <input class="ipt ipt-radius" id="token-name" name="name" required />
-                            </p>
-                            <p class="field">
-                                <label></label>
-                                <button class="btn btn-green btn-medium btn-radius" id="ssh-add-btn">{{.i18n.Tr "settings.generate_token"}}</button>
-                            </p>
-                        </div>
-                    </form>
+{{template "base/head" .}}
+<div class="user settings">
+  <div class="ui container">
+    <div class="ui grid">
+      {{template "user/settings/navbar" .}}
+      <div class="twelve wide column content">
+        {{template "base/alert" .}}
+        <h4 class="ui top attached header">
+          {{.i18n.Tr "settings.manage_access_token"}}
+          <div class="ui right">
+            <div class="ui blue tiny show-panel button" data-panel="#add-access-token-panel">{{.i18n.Tr "settings.generate_new_token"}}</div>
+          </div>
+        </h4>
+        <div class="ui attached segment">
+          <div class="ui key list">
+            <div class="desc item">
+              {{.i18n.Tr "settings.tokens_desc"}}
+            </div>
+            {{range .Tokens}}
+            <div class="item ui grid">
+              <div class="one wide column">
+                <i class="ssh-key-state-indicator fa fa-circle{{if .HasRecentActivity}} active invert poping up{{else}}-o{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted"{{end}}></i>
+              </div>
+              <div class="one wide column">
+                <i class="fa fa-send fa-2x left"></i>
+              </div>
+              <div class="eleven wide column">
+                <strong>{{.Name}}</strong>
+                <div class="activity meta">
+                  <i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> —  <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i>
                 </div>
+              </div>
+              <div class="two wide column">
+                <button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}">
+                  {{$.i18n.Tr "settings.delete_token"}}
+                </button>
+              </div>
             </div>
+            {{end}}
+          </div>  
+        </div>
+        <br>
+        <div {{if not .HasError}}class="hide"{{end}} id="add-access-token-panel">
+          <h4 class="ui top attached header">
+            {{.i18n.Tr "settings.generate_new_token"}}
+          </h4>
+          <div class="ui attached segment">
+            <form class="ui form" action="{{.Link}}" method="post">
+              {{.CsrfTokenHtml}}
+              <p>{{.i18n.Tr "settings.new_token_desc"}}</p>
+              <div class="field {{if .Err_Name}}error{{end}}">
+                <label for="name">{{.i18n.Tr "settings.token_name"}}</label>
+                <input id="name" name="name" value="{{.name}}" autofocus required>
+              </div>
+              <button class="ui green button">
+                {{.i18n.Tr "settings.generate_token"}}
+              </button>
+            </form>
+          </div>
         </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="ui small basic delete modal">
+  <div class="ui icon header">
+    <i class="trash icon"></i>
+    {{.i18n.Tr "settings.access_token_deletion"}}
+  </div>
+  <div class="content">
+    <p>{{.i18n.Tr "settings.access_token_deletion_desc"}}</p>
+  </div>
+  <div class="actions">
+    <div class="ui red basic inverted cancel button">
+      <i class="remove icon"></i>
+      {{.i18n.Tr "modal.no"}}
+    </div>
+    <div class="ui green basic inverted ok button">
+      <i class="checkmark icon"></i>
+      {{.i18n.Tr "modal.yes"}}
     </div>
+  </div>
 </div>
-{{template "ng/base/footer" .}}
\ No newline at end of file
+{{template "base/footer" .}}
\ No newline at end of file