Fix for settings-layout and updated info.xml

Signed-off-by: fnuesse <felix.nuesse@t-online.de>
This commit is contained in:
fnuesse 2018-09-30 23:06:36 +02:00
parent 3306fce7bf
commit 2ed63a2e4c
No known key found for this signature in database
GPG key ID: 2089A3431243E819
4 changed files with 34 additions and 39 deletions

View file

@ -19,7 +19,7 @@ Features:
- Import from various password managers (KeePass, LastPass, DashLane, ZOHO, Clipperz.is )
For an demo of this app visit [https://demo.passman.cc](https://demo.passman.cc)
]]></description>
<version>2.1.5</version>
<version>2.2.0</version>
<licence>agpl</licence>
<author homepage="https://github.com/brantje">Sander Brand</author>
<author homepage="https://github.com/animalillo">Marcos Zuriaga</author>
@ -37,13 +37,13 @@ For an demo of this app visit [https://demo.passman.cc](https://demo.passman.cc)
<screenshot small-thumbnail="https://img.passman.cc/thumbs/share_credential.png">https://img.passman.cc/share_credential.png</screenshot>
<screenshot small-thumbnail="https://img.passman.cc/thumbs/password_audit.png">https://img.passman.cc/password_audit.png</screenshot>
<dependencies>
<php min-version="5.6"/>
<php min-version="7.0"/>
<database>sqlite</database>
<database>pgsql</database>
<database min-version="5.5">mysql</database>
<lib>openssl</lib>
<owncloud min-version="9" max-version="15" />
<nextcloud min-version="9" max-version="15" />
<owncloud min-version="14" max-version="14" />
<nextcloud min-version="14" max-version="14" />
</dependencies>
<background-jobs>

View file

@ -552,7 +552,8 @@
}
.btn-danger {
color: #fff;
color: #000000;
background-color: #ff0000;
}
.icon-label {

View file

@ -133,9 +133,6 @@ style('passman', 'app');
</tags-input>
</a>
</li>
<li ng-repeat="tag in available_tags | orderBy:'text'" ng-class="{'active': tagSelected(tag)}">
<a class="icon-tag svg" ng-click="tagClicked(tag)" ng-class="{'icon-toggle': tagSelected(tag)}">{{tag.text}}</a>
</li>
@ -143,11 +140,7 @@ style('passman', 'app');
<a href="#" ng-click="toggleDeleteTime()" ng-class="{'active': delete_time > 0}" class="icon-delete svg">
{{ 'deleted.credentials' | translate }}
</a>
</li>
</ul>
<div id="app-settings" ng-init="settingsShown = false;">
@ -160,7 +153,7 @@ style('passman', 'app');
<div id="app-settings-content" ng-show="settingsShown">
<div class="settings-container">
<button ng-href="#/vault/{{active_vault.guid}}/settings"><a class="link" >{{ 'settings' | translate }}</a></button>
<a ng-href="#/vault/{{active_vault.guid}}/settings" class="link" ><button>{{ 'settings' | translate }}</button></a>
</div>
<div class="settings-container">
<button ng-click="logout()"><span class="link" >{{'logout' | translate }}</span></button>

View file

@ -1,29 +1,30 @@
<div id="controls">
<div class="actions creatable">
<div class="breadcrumb">
<div class="crumb svg ui-droppable" >
<a ng-click="logout()"><i class="fa fa-home"></i></a>
</div>
<div class="crumb svg">
<a ng-click="cancel()">{{active_vault.name}}</a>
</div>
<div class="crumb svg last">
<a>{{ 'settings' | translate}}</a>
</div>
</div>
</div>
</div>
<ul class="tab_header">
<li ng-repeat="tab in tabs track by $index" class="tab"
ng-class="{active:isActiveTab(tab)}"
ng-click="onClickTab(tab)" use-theme color="'true'">{{tab.title}}
<div class="indicator" use-theme negative="'true'"></div>
</li>
</ul>
<div class="tab_container settings edit_credential">
<div ng-include="currentTab.url"></div>
<div id="passman-controls">
<div class="breadcrumb">
<div class="breadcrumb">
<div class="crumb svg ui-droppable" data-dir="/">
<a ng-click="logout()"><i class="fa fa-home"></i></a>
</div>
<div class="crumb svg">
<a ng-click="cancel()">{{active_vault.name}}</a>
</div>
<div class="crumb svg last">
<a>{{ 'settings' | translate}}</a>
</div>
</div>
</div>
</div>
<div>
<ul class="tab_header">
<li ng-repeat="tab in tabs track by $index" class="tab"
ng-class="isActiveTab(tab)? 'active' : 'inactive'"
ng-click="onClickTab(tab)" use-theme color="'true'">{{tab.title | translate}}
<div class="indicator" use-theme negative="'true'"></div>
</li>
</ul>
<div class="tab_container settings edit_credential" use-theme type="'border-top-color'">
<div ng-include="currentTab.url"></div>
</div>
</div>