Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/passman.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrantje <brantje@gmail.com>2016-10-07 17:13:28 +0300
committerbrantje <brantje@gmail.com>2016-10-07 17:13:28 +0300
commitbabf4113ee22231ed36b7db741a88c03c4200b1a (patch)
tree9966fd3bcf6d4f3b34062958a52280bd682017ed /templates
parent836d2f1410ae4d308b11afff81cf732f06d2b2de (diff)
Make sharing page pretty, closes #59
Diffstat (limited to 'templates')
-rw-r--r--templates/views/partials/forms/share_credential/basics.html7
-rw-r--r--templates/views/partials/forms/share_credential/link_sharing.html4
-rw-r--r--templates/views/share_credential.html2
3 files changed, 7 insertions, 6 deletions
diff --git a/templates/views/partials/forms/share_credential/basics.html b/templates/views/partials/forms/share_credential/basics.html
index d37609f2..b8c12547 100644
--- a/templates/views/partials/forms/share_credential/basics.html
+++ b/templates/views/partials/forms/share_credential/basics.html
@@ -35,7 +35,7 @@
</div>
</div>
</div>
- <div class="col-xs-12 col-md-6">
+ <div class="col-xs-12 col-md-6" ng-show="share_settings.cypher_progress.times.length > 0">
<table class="table">
<thead>
<tr>
@@ -70,9 +70,10 @@
</thead>
<tr ng-repeat="user in share_settings.credentialSharedWithUserAndGroup">
<td>
- <i class="fa fa-user" ng-if="user.type === 'user'"></i>
- <i class="fa fa-group" ng-if="user.type === 'group'"></i>
+ <i class="fa fa-user" ng-if="user.pending === false"></i>
+ <i class="fa fa-user-times" ng-if="user.pending === true"></i>
{{user.userId}}
+ <small ng-if="user.pending === true" class="pull-right col-xs-4">Pending</small>
</td>
<td><input type="checkbox" ng-click="setPermission(user.acl, default_permissions.permissions.READ)" ng-checked="hasPermission(user.acl, default_permissions.permissions.READ)"> </td>
<td><input type="checkbox" ng-click="setPermission(user.acl, default_permissions.permissions.WRITE)" ng-checked="hasPermission(user.acl, default_permissions.permissions.WRITE)"></td>
diff --git a/templates/views/partials/forms/share_credential/link_sharing.html b/templates/views/partials/forms/share_credential/link_sharing.html
index b3afe316..0cc1d1a7 100644
--- a/templates/views/partials/forms/share_credential/link_sharing.html
+++ b/templates/views/partials/forms/share_credential/link_sharing.html
@@ -1,7 +1,7 @@
<div class="row">
<div class="col-xs-12 col-md-6">
- <input type="checkbox" ng-model="share_settings.linkSharing.enabled">
- Enable link sharing.<br/>
+ <label><input type="checkbox" ng-model="share_settings.linkSharing.enabled">
+ Enable link sharing.</label><br/>
<input type="text" ng-model="share_link" select-on-click placeholder="Click share first!"
ng-if="share_settings.linkSharing.enabled">
<div ng-show="share_settings.linkSharing.enabled">
diff --git a/templates/views/share_credential.html b/templates/views/share_credential.html
index 31dc4d28..d5eb5c3b 100644
--- a/templates/views/share_credential.html
+++ b/templates/views/share_credential.html
@@ -20,7 +20,7 @@
ng-click="onClickTab(tab)" use-theme>{{tab.title}}</li>
</ul>
-<div class="tab_container edit_credential">
+<div class="tab_container share_credential">
<div ng-include="currentTab.url"></div>
<button ng-click="applyShare()">Share</button>