This commit is contained in:
Felix Nüsse 2018-09-29 19:06:54 +02:00 коммит произвёл fnuesse
Родитель 3e050c9a15
Коммит 9f3814320a
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 2089A3431243E819
8 изменённых файлов: 86 добавлений и 58 удалений

Просмотреть файл

@ -484,7 +484,8 @@
font-size: 19px;
float: left;
margin-right: 5px;
margin-left: 3px; }
margin-left: 3px;
}
#app-content #app-content-wrapper .credential-table tr td .icon-more {
display: inline-block;
float: right;
@ -765,6 +766,7 @@
cursor: pointer;
/* "hand" cursor */ }
.btn-danger {
color: #fff; }

Просмотреть файл

@ -34,6 +34,18 @@
.controller('MainCtrl', ['$scope', '$rootScope', '$location', 'SettingsService', '$window', '$interval', '$filter', function ($scope, $rootScope, $location, SettingsService, $window, $interval, $filter) {
$scope.selectedVault = false;
var native_search = document.getElementById("searchbox");
var old_search = document.getElementById("searchBox");
native_search.classList.remove('hidden');
native_search.classList.add('searchbox','ng-valid','ng-touched','ng-dirty','ng-valid-parse','ng-empty');
native_search.setAttribute("ng-model","filterOptions.filterText");
native_search.addEventListener("change", function(){
old_search.value=native_search.innerText;
});
$scope.http_warning_hidden = true;
if ($location.$$protocol === 'http' && $location.$$host !== 'localhost' && $location.$host !== '127.0.0.1') {
$scope.using_http = true;

Просмотреть файл

@ -58,6 +58,7 @@
//
#app-content #app-content-wrapper #passman-controls {
border-bottom: 1px solid #c9c9c9;
margin-top: 5px;
}
@ -86,8 +87,8 @@
}
@media only screen and (min-width: 768px){
#app-navigation+#app-content #passman-controls {
left: 250px;
width: calc( 100% - 250px ) !important;
left: 300px;
width: calc( 100% - 300px ) !important;
}
}
#passman-controls .button, #passman-controls, #passman-controls input[type='submit'], #passman-controls input[type='text'], #passman-controls input[type='password'], #passman-controls select {

Просмотреть файл

@ -22,8 +22,10 @@
#app-content {
overflow-x: hidden;
width: 100%;
#app-content-wrapper {
min-height: 95%;
width: 100%;
#passman-controls {
text-align: center;
&.sidebar-shown {
@ -53,6 +55,9 @@
display: none;
}
}
.breadcrumb {
float: left;
}
.actions.creatable {
float: left;
overflow: hidden;
@ -137,8 +142,9 @@
}
}
.credential-table {
width: 100%;
/*width: 100%;
margin-top: 44px;
*/
tr:hover {
background-color: darken(#fff, 4%);
}

Просмотреть файл

@ -26,7 +26,7 @@
padding: 12px;
font-weight: bold;
text-align: center;
z-index: 800;
z-index: 1800;
background-color: red;
color: white;
.fa-times{

Просмотреть файл

@ -1,4 +1,6 @@
<div id="controls">
<div id="passman-controls">
<div id="controls" class="breadcrumb">
<div class="actions creatable">
<div class="breadcrumb">
<div class="crumb svg ui-droppable" data-dir="/">
@ -15,6 +17,8 @@
</div>
</div>
</div>
</div>
<div>
<ul class="tab_header">
<li ng-repeat="tab in tabs track by $index" class="tab"
ng-class="{active:isActiveTab(tab)}"
@ -29,3 +33,4 @@
<button ng-click="saveCredential()" ng-disabled="saving"><i class="fa fa-spinner fa-spin" ng-show="saving"></i> {{ 'save' | translate}}</button>
<button ng-click="cancel()">{{ 'cancel' | translate}}</button>
</div>
</div>

Просмотреть файл

@ -16,8 +16,8 @@
{{ 'deleted.since' | translate }}:
<span ng-if="delete_time == 1">All time</span>
<span ng-if="delete_time > 1">{{delete_time | date:'dd-MM-yyyy @ HH:mm:ss'}}</span>
</span> -->
<div class="searchboxContainer" ng-init="filterOptionShown = false;" off-click="filterOptionShown = false;">
<input type="text" ng-model="filterOptions.filterText" class="searchbox" id="searchBox"
placeholder="{{'search.credential' | translate}}" select-on-click clear-btn ng-click="filterOptionShown = true;">
@ -86,59 +86,62 @@
</li>
</ul>
</div>
<div id="app-sidebar" class="app-sidebar"
ng-show="selectedCredential">
<h2>{{selectedCredential.label}}</h2>
<span class="close icon-close" ng-click="closeSelected()"
alt="Close"></span>
<div credential-template="selectedCredential">
</div>
<div ng-show="selectedCredential">
<div>
<button class="button"
ng-click="editCredential(selectedCredential)"
ng-if="selectedCredential.delete_time == 0 && hasPermission(selectedCredential.acl.permissions, permissions.permissions.WRITE)">
<span class="fa fa-edit"></span> {{ 'edit' | translate}}
</button>
<button class="button"
ng-click="deleteCredential(selectedCredential)"
ng-if="selectedCredential.delete_time == 0 && hasPermission(selectedCredential.acl.permissions, permissions.permissions.WRITE)">
<span class="fa fa-trash"></span> {{ 'delete' | translate}}
</button>
<button class="button"
ng-click="shareCredential(selectedCredential)"
ng-if="selectedCredential.delete_time == 0 && selectedCredential.acl === undefined &&
(settings.user_sharing_enabled === 1 || settings.user_sharing_enabled === '1' || settings.link_sharing_enabled === 1 || settings.link_sharing_enabled === '1')">
<span class="fa fa-share"></span> {{ 'share' | translate}}
</button>
<button class="button"
ng-click="getRevisions(selectedCredential)"
ng-if="selectedCredential.delete_time == 0 && hasPermission(selectedCredential.acl.permissions, permissions.permissions.HISTORY)">
<span class="fa fa-undo"></span> {{ 'revisions' | translate}}
</button>
<button class="button"
ng-if="selectedCredential.delete_time > 0"
ng-click="recoverCredential(selectedCredential) && hasPermission(selectedCredential.acl.permissions, permissions.permissions.WRITE)">
<span class="fa fa-recycle"></span> {{'recover' | translate}}
</button>
<button class="button"
ng-if="selectedCredential.delete_time > 0"
ng-click="destroyCredential(selectedCredential)">
<span class="fa fa-bomb"></span> {{'destroy' | translate}}
</button>
</div>
</div>
</div>
</div>
<div id="app-sidebar" class="app-sidebar"
ng-show="selectedCredential">
<h2>{{selectedCredential.label}}</h2>
<span class="close icon-close" ng-click="closeSelected()"
alt="Close"></span>
<div credential-template="selectedCredential">
</div>
<div ng-show="selectedCredential">
<div>
<button class="button"
ng-click="editCredential(selectedCredential)"
ng-if="selectedCredential.delete_time == 0 && hasPermission(selectedCredential.acl.permissions, permissions.permissions.WRITE)">
<span class="fa fa-edit"></span> {{ 'edit' | translate}}
</button>
<button class="button"
ng-click="deleteCredential(selectedCredential)"
ng-if="selectedCredential.delete_time == 0 && hasPermission(selectedCredential.acl.permissions, permissions.permissions.WRITE)">
<span class="fa fa-trash"></span> {{ 'delete' | translate}}
</button>
<button class="button"
ng-click="shareCredential(selectedCredential)"
ng-if="selectedCredential.delete_time == 0 && selectedCredential.acl === undefined &&
(settings.user_sharing_enabled === 1 || settings.user_sharing_enabled === '1' || settings.link_sharing_enabled === 1 || settings.link_sharing_enabled === '1')">
<span class="fa fa-share"></span> {{ 'share' | translate}}
</button>
<button class="button"
ng-click="getRevisions(selectedCredential)"
ng-if="selectedCredential.delete_time == 0 && hasPermission(selectedCredential.acl.permissions, permissions.permissions.HISTORY)">
<span class="fa fa-undo"></span> {{ 'revisions' | translate}}
</button>
<button class="button"
ng-if="selectedCredential.delete_time > 0"
ng-click="recoverCredential(selectedCredential) && hasPermission(selectedCredential.acl.permissions, permissions.permissions.WRITE)">
<span class="fa fa-recycle"></span> {{'recover' | translate}}
</button>
<button class="button"
ng-if="selectedCredential.delete_time > 0"
ng-click="destroyCredential(selectedCredential)">
<span class="fa fa-bomb"></span> {{'destroy' | translate}}
</button>
</div>
</div>
</div>
<div class="share_popup" style="display: none">
{{ 'sharereq.title' | translate}}<br/>
<p>{{ 'sharereq.line1' | translate}}</p>

Просмотреть файл

@ -24,7 +24,6 @@
<li ng-if="vaults.length === 0">{{ 'no.vaults' | translate}}
</li>
</ul>
</div>
</div>
@ -58,7 +57,7 @@
ng-click="createVault(vault_name, vault_key, vault_key2)" ng-disabled="vault_key_score.score < minimal_value_key_strength || vault_key !== vault_key2 || vault_key === ''">
{{ 'new.vault.create' | translate }}
</button>
<div class="button" ng-if="creating_keys" >
<div class="button" ng-if="creating_keys">
<span>
<i class="fa fa-spinner fa-spin"></i>
{{creating_keys}}