diff options
| author | newhinton <felix.nuesse@t-online.de> | 2019-05-12 14:04:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-12 14:04:18 +0300 |
| commit | 626897bdfa6d861848bb13ac6ae10c6c28e0e126 (patch) | |
| tree | 34c7062dd17050030e206518a698d0f6e2cc8dcf /templates | |
| parent | 6f4ad6d5a9cfe7ad18e03ec56882809d21f0b2ed (diff) | |
| parent | 3b5c8e96dc8bddee0f4054021795247082898f99 (diff) | |
Merge branch 'master' into feature/540/markcredentialascompromisedfeature/540/markcredentialascompromised
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/main.php | 1 | ||||
| -rw-r--r-- | templates/views/partials/forms/settings/tool.html | 14 | ||||
| -rw-r--r-- | templates/views/partials/icon-picker.html | 11 |
3 files changed, 16 insertions, 10 deletions
diff --git a/templates/main.php b/templates/main.php index 0cae6042..4bc649a3 100644 --- a/templates/main.php +++ b/templates/main.php @@ -64,6 +64,7 @@ script('passman', 'app/services/iconservice'); script('passman', 'app/services/tagservice'); script('passman', 'app/services/notificationservice'); script('passman', 'app/services/shareservice'); +script('passman', 'app/services/searchboxexpanderservice'); script('passman', 'app/factory/sharingacl'); script('passman', 'app/directives/passwordgen'); script('passman', 'app/directives/fileselect'); diff --git a/templates/views/partials/forms/settings/tool.html b/templates/views/partials/forms/settings/tool.html index 0d79b362..4bb4f5fa 100644 --- a/templates/views/partials/forms/settings/tool.html +++ b/templates/views/partials/forms/settings/tool.html @@ -10,23 +10,23 @@ </div> <div class="row" ng-show="scan_result"> <div class="col-xs-12"> - <p>{{ 'scan.result.msg' | translate}}<br/> + <p class="spacer-top-30"><b>{{ 'scan.result.msg' | translate}}</b><br/> <span translate="scan.result" translate-values='{ scan_result: scan_result.length}'></span> <br/> </p> - <table class="table scan-result-table"> + <table class="table scan-result-table spacer-top-30"> <thead> <tr> - <td>{{ 'label' | translate}}</td> - <td>{{ 'score' | translate}}</td> - <td>{{ 'password' | translate}}</td> - <td>{{ 'action' | translate}}</td> + <td><b>{{ 'label' | translate}}</b></td> + <td><b>{{ 'score' | translate}}</b></td> + <td><b>{{ 'password' | translate}}</b></td> + <td><b>{{ 'action' | translate}}</b></td> </tr> </thead> <tbody> <tr ng-repeat="result in scan_result | orderBy:'password_zxcvbn_result.score'"> - <td>{{result.label}}</td> + <td class="label-audit">{{result.label}}</td> <td class="score"> <ng-password-meter password="result.password"></ng-password-meter> </td> diff --git a/templates/views/partials/icon-picker.html b/templates/views/partials/icon-picker.html index 00ff7031..22928f8a 100644 --- a/templates/views/partials/icon-picker.html +++ b/templates/views/partials/icon-picker.html @@ -2,9 +2,14 @@ <div style="display: none" id="iconPicker" title="{{ 'pick.icon' | translate }}"> <div class="iconList"> <div ng-repeat="(groupName, icons) in iconGroups"> - <h2 style="clear: both" id="{{groupName}}">{{groupName}}</h2> - <div class="icon" ng-repeat="icon in icons" ng-click="selectIcon(icon)"> - <img ng-src="{{icon.url}}" height="32"> + <div ng-click="expanded = !expanded" ng-init="expanded=true"> + <div class="icon-triangle-s arrow" ng-class="{ 'icon-triangle-e': !expanded , 'icon-triangle-s': expanded }"></div> + <div class="collapsible" id="{{groupName}}">{{groupName}}</div> + </div> + <div ng-class="{ 'content_show': expanded , 'content': !expanded }"> + <div class="icon" ng-repeat="icon in icons" ng-click="selectIcon(icon)"> + <img ng-src="{{icon.url}}" height="32"> + </div> </div> </div> </div> |