[reclaim-ui] 414/459: replace table

[gnunet]

This is an automated email from the git hooks/post-receive script.

martin-schanzenbach pushed a commit to branch master
in repository reclaim-ui.

commit fe62fe3559abca13760eb4e1042052e0d6c5fa49
Author: Martin Schanzenbach <schanzen@gnunet.org>
AuthorDate: Tue Jan 5 23:34:16 2021 +0900

    replace table
---
 .../edit-authorizations.component.html             |  2 +-
 .../edit-credentials.component.html                | 98 +++++++++++++---------
 .../edit-credentials/edit-credentials.component.ts |  1 +
 src/app/identity-list/identity-list.component.html |  6 +-
 src/locales/de/messages.json                       |  1 +
 src/locales/en/messages.json                       |  1 +
 6 files changed, 65 insertions(+), 44 deletions(-)

diff --git a/src/app/edit-authorizations/edit-authorizations.component.html 
b/src/app/edit-authorizations/edit-authorizations.component.html
index 64b351f..6a6d6a0 100644
--- a/src/app/edit-authorizations/edit-authorizations.component.html
+++ b/src/app/edit-authorizations/edit-authorizations.component.html
@@ -46,7 +46,7 @@
                   <span class="fa fa-check"></span> {{getMessage("Yes")}}
                 </button>
                 <button class="btn btn-primary m-2" 
(click)="hideConfirmRevoke()">
-                  <span class="fa fa-close"></span> {{getMessage("No")}}
+                  <span class="fa fa-times"></span> {{getMessage("No")}}
                 </button>
               </div>
             </td>
diff --git a/src/app/edit-credentials/edit-credentials.component.html 
b/src/app/edit-credentials/edit-credentials.component.html
index c5d7705..354187d 100644
--- a/src/app/edit-credentials/edit-credentials.component.html
+++ b/src/app/edit-credentials/edit-credentials.component.html
@@ -12,47 +12,65 @@
     </div>
     <h3 *ngIf="credentials.length > 
0">{{getMessage("edit_credentials_html@credentials")}}</h3>
     <!-- Requested credential -->
-    <table class="table pb-1" style="" *ngIf="credentials.length > 0">
-      <thead>
-        <tr>
-          <th >{{getMessage("edit_credentials_html@issuer")}}</th>
-          <th >{{getMessage("edit_credentials_html@type")}}</th>
-          <th >{{getMessage("edit_credentials_html@expires")}}</th>
-          <th >{{getMessage("edit_credentials_html@name")}}</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr [class.alert-danger]="newCredential.name === credential.name"
-          [class.alert-warning]="!isCredentialValid(credential)" *ngFor="let 
credential of credentials">
-          <td>
-            <div style="min-width: 15em">{{getIssuerName(credential)}}</div>
-          </td>
-          <td>
-            <div>{{credential.type}}</div>
-          </td>
-          <td>
-            <div>{{getExpiration(credential)}}</div>
-          </td>
-          <!--ISSUER          <td>
-            <div style="min-width: 15em">
-            </div>
-</td>-->
-          <td>
-            <div style="min-width: 15em">{{credential.name}}</div>
-          </td>
-          <td>
-            <button class="btn btn-primary" 
(click)="deleteCredential(credential)">
-              <span class="fa fa-trash"></span> {{ getMessage("Delete") }}
+    <div class="table pb-1" style="" *ngIf="credentials.length > 0">
+      <div class="row head">
+        <div class="col-sm">
+          {{getMessage("edit_credentials_html@issuer")}}
+        </div>
+        <div class="col-sm" >
+          {{getMessage("edit_credentials_html@type")}}
+        </div>
+          <div class="col-sm">
+            {{getMessage("edit_credentials_html@expires")}}
+          </div>
+          <div class="col-sm">
+            {{getMessage("edit_credentials_html@name")}}
+          </div>
+          <div class="col-sm"></div>
+      </div>
+      <div class="row"
+           [class.alert-danger]="newCredential.name === credential.name"
+           [class.alert-warning]="!isCredentialValid(credential)" *ngFor="let 
credential of credentials">
+        <div class="col-sm">
+          <div>{{getIssuerName(credential)}}</div>
+        </div>
+        <div class="col-sm">
+          {{credential.type}}
+        </div>
+        <div class="col-sm">
+          {{getExpiration(credential)}}
+        </div>
+        <!--ISSUER          <td>
+          <div style="min-width: 15em">
+          </div>
+          </td>-->
+          <div class="col-sm">
+            <div>{{credential.name}}</div>
+          </div>
+          <div class="col-sm">
+            <button class="btn btn-primary" 
+                    *ngIf="showConfirmDelete != credential"
+                    (click)="showConfirmDelete = credential">
+              <span class="fa fa-trash"></span> {{getMessage("Delete")}}
             </button>
-          </td>
-          <td>
-            <div *ngIf="!isCredentialValid(credential)"> <span 
style="color:#f00" > {{getMessage("edit_credentials_html@expired")}} </span> 
<span
-                class="fa fa-times"></span> </div>
-          </td>
-        </tr>
-        <!-- FIXME implement adding plain text credentials -->
-      </tbody>
-    </table>
+            <div class="alert alert-danger fade show" *ngIf="showConfirmDelete 
== credential">
+              
{{getMessage("edit_credentials_html@deleteCredential")}}<br/><br/>
+              <button class="btn btn-primary m-2"
+                      (click)="deleteCredential(credential)">
+                <span class="fa fa-check"></span> {{getMessage("Yes")}}
+              </button>
+              <button class="btn btn-primary m-2" (click)="showConfirmDelete = 
null">
+                <span class="fa fa-times"></span> {{getMessage("No")}}
+              </button>
+            </div>
+          </div>
+          <!--<div class="col-sm">
+            <div *ngIf="!isCredentialValid(credential)">
+              <span style="color:#f00" > 
{{getMessage("edit_credentials_html@expired")}} </span> <span class="fa 
fa-times"></span>
+            </div>
+          </div>-->
+      </div>
+    </div>
 
     <!-- Edit card buttons -->
     <div>
diff --git a/src/app/edit-credentials/edit-credentials.component.ts 
b/src/app/edit-credentials/edit-credentials.component.ts
index e316d12..dfc3865 100644
--- a/src/app/edit-credentials/edit-credentials.component.ts
+++ b/src/app/edit-credentials/edit-credentials.component.ts
@@ -23,6 +23,7 @@ export class EditCredentialsComponent implements OnInit {
   identity: Identity;
   credentials: Credential[];
   newCredential: Credential;
+  showConfirmDelete: Credential = null;
 
   constructor(private reclaimService: ReclaimService,
               private identityService: IdentityService,
diff --git a/src/app/identity-list/identity-list.component.html 
b/src/app/identity-list/identity-list.component.html
index 3f951ec..a4c60f0 100644
--- a/src/app/identity-list/identity-list.component.html
+++ b/src/app/identity-list/identity-list.component.html
@@ -100,11 +100,11 @@
         <img src="assets/reclaim_icon.png" style="width: 4em;opacity: 0.3;">
 
         <button class="btn btn-primary" *ngIf="showConfirmDelete != identity" 
(click)="confirmDelete(identity)">
-          <i class="fa fa-trash"></i>
+          <i class="fa fa-trash"></i> {{ getMessage("Delete") }}
         </button>
         <button class="btn btn-primary" *ngIf="showConfirmDelete != identity"
           [routerLink]="['/edit-identity', identity.name]">
-          <i class="fa fa-edit"></i>
+          <i class="fa fa-edit"></i> {{ getMessage("Edit") }}
         </button>
       </div>
     </div>
@@ -115,7 +115,7 @@
         <span class="fa fa-trash"></span> {{ getMessage("Delete") }}
       </button>
       <button class="btn btn-primary" (click)="hideConfirmDelete()">
-        <span class="fa fa-close"></span> {{ getMessage("Cancel") }}
+        <span class="fa fa-ban"></span> {{ getMessage("Cancel") }}
       </button>
     </div>
     <!-- Maybe add some info to identities? - dialog -->
diff --git a/src/locales/de/messages.json b/src/locales/de/messages.json
index d64d1c2..0f779df 100644
--- a/src/locales/de/messages.json
+++ b/src/locales/de/messages.json
@@ -37,6 +37,7 @@
     "edit_authorizations_html@BackTo": "Zurück zu {{IDENTITYNAME}}",
     "edit_authorizations_ts@unknown": "Unbekannt",
     "edit_credentials_html@credentialsFor": "Attestierungen durch Dritte für",
+     "edit_credentials_html@deleteCredential": "Diese Attestierung wirklich 
löschen?",
     "edit_credentials_html@linkAccount": "Konto verbinden:",
     "edit_credentials_html@notCompatible": "Dieses Konto ist nicht mit 
re:claimID kompatibel.",
     "edit_credentials_html@info": "INFO",
diff --git a/src/locales/en/messages.json b/src/locales/en/messages.json
index 9ec97cf..e82f5b3 100644
--- a/src/locales/en/messages.json
+++ b/src/locales/en/messages.json
@@ -37,6 +37,7 @@
     "edit_authorizations_html@BackTo": "Back to {{IDENTITYNAME}}",
     "edit_authorizations_ts@unknown": "Unknown",
     "edit_credentials_html@credentialsFor": "Third party credentials for",
+    "edit_credentials_html@deleteCredential": "Do you really want to delete 
this credential?",
     "edit_credentials_html@linkAccount": "Link account:",
     "edit_credentials_html@notCompatible": "This account is not compatible 
with re:claimID.",
     "edit_credentials_html@info": "INFO",

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.