From 12c1793b76bfa11988d8e417c17b99eb5122fb40 Mon Sep 17 00:00:00 2001 From: blavenie <benoit.lavenier@e-is.pro> Date: Fri, 7 Oct 2016 15:46:16 +0200 Subject: [PATCH] - Wot identity: display uid is self (even if not member) - Wot identity: display 'not-member' if not member yet --- www/templates/wot/view_certifications_lg.html | 6 ++++-- www/templates/wot/view_identity.html | 12 ++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/www/templates/wot/view_certifications_lg.html b/www/templates/wot/view_certifications_lg.html index 4fa06fc0f..27eb37b70 100644 --- a/www/templates/wot/view_certifications_lg.html +++ b/www/templates/wot/view_certifications_lg.html @@ -55,11 +55,13 @@ ui-sref="app.wot_view_identity({pubkey: formData.pubkey, uid: formData.name||formData.uid})"> <i class="avatar" ng-style="formData.avatarStyle" - ng-class="{'avatar-member': !formData.avatarStyle && formData.isMember}"> + ng-class="{'avatar-wallet': !formData.avatarStyle && !formData.isMember, 'avatar-member': !formData.avatarStyle && formData.isMember}"> </i> - <h4 class="positive text-center"> + <h4 class="text-center" + ng-class="{'positive': formData.isMember, 'gray': !formData.isMember}"> {{::formData.name||formData.uid}} </h4> + <h5 class="assertive" ng-if="(formData.name||formData.uid) && !formData.isMember" translate>WOT.NOT_MEMBER_PARENTHESIS</h5> </a> </div> <div class="col text-center no-padding gray" style="margin-top: 30px;"> diff --git a/www/templates/wot/view_identity.html b/www/templates/wot/view_identity.html index faf8e0510..75f857bf0 100644 --- a/www/templates/wot/view_identity.html +++ b/www/templates/wot/view_identity.html @@ -9,10 +9,14 @@ ng-style="formData.avatarStyle" ng-class="{'avatar-wallet': !formData.avatarStyle && walletData && !formData.isMember, 'avatar-member': !formData.avatarStyle && formData.isMember}"> </i> - <h3 class="light" ng-if="formData.name">{{::formData.name}}</h3> - <h3 class="light" ng-if="!formData.name && formData.isMember">{{formData.uid}}</h3> - <h3 class="light" ng-if="!formData.name && !formData.isMember">{{formData.pubkey | formatPubkey}}</h3> - <h4> </h4> + <ng-if ng-if="formData.name"> + <h3 class="light" ng-if="formData.name">{{::formData.name}}</h3> + </ng-if> + <ng-if ng-if="!formData.name"> + <h3 class="light" ng-if="formData.uid">{{formData.uid}}</h3> + <h3 class="light" ng-if="!formData.uid"><i class="ion-key"></i> {{formData.pubkey | formatPubkey}}</h3> + </ng-if> + <h4 class="assertive"><ng-if ng-if="(formData.name || formData.uid) && !formData.isMember" translate>WOT.NOT_MEMBER_PARENTHESIS</ng-if></h4> </div> <h4 class="content light" ng-if="loading"> <ion-spinner icon="android"></ion-spinner> -- GitLab