Update todos

This commit is contained in:
brantje
2016-09-15 00:11:59 +02:00
parent 506c22d36e
commit 7a30855030
9 changed files with 166 additions and 128 deletions

View File

@ -40,7 +40,7 @@ module.exports = function (grunt) {
}
},
//@TODO JSHint, comile sass
//@TODO JSHint
watch: {
scripts: {
files: ['Gruntfile.js', 'templates/views/{,*/}{,*/}{,*/}*.html', 'templates/views/*.html','sass/*','sass/partials/*'],

View File

@ -236,6 +236,8 @@
color: #fff; }
#app-content #app-content-wrapper .edit_credential .custom_fields table thead th.field_actions, #app-content #app-content-wrapper .edit_credential .files table thead th.field_actions {
width: 15%; }
#app-content #app-content-wrapper .edit_credential .custom_fields table tr:hover, #app-content #app-content-wrapper .edit_credential .files table tr:hover {
background-color: transparent; }
#app-content #app-content-wrapper .edit_credential .custom_fields table tr td.field_actions, #app-content #app-content-wrapper .edit_credential .files table tr td.field_actions {
font-size: 13px;
width: 15%; }
@ -267,9 +269,10 @@
height: 25%;
display: inline-block; }
#app-content #app-content-wrapper .app_sidebar table {
width: 100%; }
#app-content #app-content-wrapper .app_sidebar table tr td:first-child {
width: 15%; }
width: 100%;
margin-bottom: 10px; }
#app-content #app-content-wrapper .app_sidebar table tr:hover {
background-color: #fff; }
#app-content #app-content-wrapper .app_sidebar table tr td {
padding: 2px;
width: auto;

File diff suppressed because one or more lines are too long

View File

@ -33,7 +33,8 @@ angular.module('passmanApp')
$scope.editCredential = function(credential){
var credential = angular.copy(credential);
SettingsService.setSetting('edit_credential',credential);
$rootScope.$emit('app_menu', false);
SettingsService.setSetting('edit_credential', CredentialService.encryptCredential(credential));
$location.path('/vault/'+ $scope.active_vault.vault_id +'/edit/'+ credential.credential_id)
};
@ -73,6 +74,8 @@ angular.module('passmanApp')
});
};
//@TODO Download files
if ($scope.active_vault) {
$scope.$parent.selectedVault = true;
fetchCredentials();

View File

@ -180,7 +180,7 @@ angular.module('passmanApp')
};
$scope.saveCredential = function () {
//@TODO validation
delete $scope.storedCredential.password_repeat;
if(!$scope.storedCredential.credential_id){
$scope.storedCredential.vault_id = $scope.active_vault.vault_id;

View File

@ -20,8 +20,9 @@ angular.module('passmanApp')
$(el).attr('title', scope.tooltip);
$(el).tooltip();
$(el).attr('title', scope.tooltip).tooltip('fixTitle');
$('.tooltip-inner').text(scope.tooltip); // Dirty hack
if($(el).is(':visible')){
$(el).tooltip('show')
//$(el).tooltip('show')
}
}

View File

@ -47,7 +47,7 @@ angular.module('views/partials/password-meter.html', []).run(['$templateCache',
angular.module('views/show_vault.html', []).run(['$templateCache', function($templateCache) {
'use strict';
$templateCache.put('views/show_vault.html',
'<div id="controls"><div class="breadcrumb"></div><div class="actions creatable"><span ng-click="menuOpen = !menuOpen" class="button new" ng-init="menuOpen = false" off-click="menuOpen = false;"><span>New</span></span><div class="actionList popovermenu bubble menu" ng-show="menuOpen"><ul><li><span ng-click="addCredential()" class="menuitem action"><span class="icon icon-rename"></span> <span>New credential</span></span></li><li><span href="#" class="menuitem action"><span class="icon icon-shared"></span> <span>New shared credential</span></span></li></ul></div></div></div><table class="credential-table" ng-init="menuOpen = false;"><tr ng-repeat="credential in credentials" ng-if="credential.hidden == 0 && credential.delete_time == 0" ng-click="selectCredential(credential)" ng-class="{\'selected\': selectedCredential.credential_id == credential.credential_id}"><td><span class="label">{{credential.label}}</span> <span class="icon icon-more" ng-click="menuOpen = !menuOpen" off-click="menuOpen = false;"></span> <span class="tags"><span class="tag">Tag 1</span> <span class="tag">Tag 2</span> <span class="tag">Tag 4</span> <span class="tag">Tag 4</span> <span class="tag">Long tag xD</span></span><div class="actionList popovermenu bubble menu" ng-show="menuOpen"><ul><li ng-click="editCredential(credential)"><span class="menuitem action"><span class="icon icon-rename"></span><span>Edit</span></span></li><li><span href="#" class="menuitem action"><span class="icon icon-share"></span><span>Share</span></span></li><li><span class="menuitem action" data-action="Delete"><span class="icon icon-delete"></span><span>Delete</span></span></li></ul></div></td></tr></table><div id="app-sidebar" class="detailsView scroll-container app_sidebar" ng-show="selectedCredential"><table><tr ng-show="selectedCredential.label"><td>Label</td><td>{{selectedCredential.label}}</td></tr><tr ng-show="selectedCredential.username"><td>Account</td><td><span credential-field value="selectedCredential.username"></span></td></tr><tr ng-show="selectedCredential.password"><td>Password</td><td><span credential-field value="selectedCredential.password" secret="\'true\'"></span></td></tr><tr ng-show="selectedCredential.email"><td>E-mail</td><td><span credential-field value="selectedCredential.email"></span></td></tr><tr ng-show="selectedCredential.url"><td>URL</td><td><span credential-field value="selectedCredential.url"></span></td></tr><tr ng-show="selectedCredential.files.length > 0"><td>Files</td><td><div ng-repeat="file in selectedCredential.files" class="link">{{file.filename}} ({{file.size | bytes}})</div></td></tr><tr ng-repeat="field in selectedCredential.custom_fields"><td>{{field.label}}</td><td><span credential-field value="field.value" secret="field.secret"></span></td></tr><tr ng-show="selectedCredential.changed"><td>Changed</td><td>{{selectedCredential.changed * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</td></tr><tr ng-show="selectedCredential.created"><td>Created</td><td>{{selectedCredential.created * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</td></tr></table><span class="close icon-close" ng-click="closeSelected()" alt="Close"></span></div>');
'<div id="controls"><div class="breadcrumb"></div><div class="actions creatable"><span ng-click="menuOpen = !menuOpen" class="button new" ng-init="menuOpen = false" off-click="menuOpen = false;"><span>New</span></span><div class="actionList popovermenu bubble menu" ng-show="menuOpen"><ul><li><span ng-click="addCredential()" class="menuitem action"><span class="icon icon-rename"></span> <span>New credential</span></span></li><li><span href="#" class="menuitem action"><span class="icon icon-shared"></span> <span>New shared credential</span></span></li></ul></div></div></div><div off-click="closeSelected()"><table class="credential-table" ng-init="menuOpen = false;"><tr ng-repeat="credential in credentials" ng-if="credential.hidden == 0 && credential.delete_time == 0" ng-click="selectCredential(credential)" ng-class="{\'selected\': selectedCredential.credential_id == credential.credential_id}"><td><span class="label">{{credential.label}}</span> <span class="tags"><span class="tag">Tag 1</span> <span class="tag">Tag 2</span> <span class="tag">Tag 4</span> <span class="tag">Tag 4</span> <span class="tag">Long tag xD</span></span></td></tr></table><div id="app-sidebar" class="detailsView scroll-container app_sidebar" ng-show="selectedCredential"><span class="close icon-close" ng-click="closeSelected()" alt="Close"></span><table><tr ng-show="selectedCredential.label"><td>Label</td><td>{{selectedCredential.label}}</td></tr><tr ng-show="selectedCredential.username"><td>Account</td><td><span credential-field value="selectedCredential.username"></span></td></tr><tr ng-show="selectedCredential.password"><td>Password</td><td><span credential-field value="selectedCredential.password" secret="\'true\'"></span></td></tr><tr ng-show="selectedCredential.email"><td>E-mail</td><td><span credential-field value="selectedCredential.email"></span></td></tr><tr ng-show="selectedCredential.url"><td>URL</td><td><span credential-field value="selectedCredential.url"></span></td></tr><tr ng-show="selectedCredential.files.length > 0"><td>Files</td><td><div ng-repeat="file in selectedCredential.files" class="link">{{file.filename}} ({{file.size | bytes}})</div></td></tr><tr ng-repeat="field in selectedCredential.custom_fields"><td>{{field.label}}</td><td><span credential-field value="field.value" secret="field.secret"></span></td></tr><tr ng-show="selectedCredential.changed"><td>Changed</td><td>{{selectedCredential.changed * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</td></tr><tr ng-show="selectedCredential.created"><td>Created</td><td>{{selectedCredential.created * 1000 | date:\'dd-MM-yyyy @ HH:mm:ss\'}}</td></tr></table><div><span class="button" ng-click="editCredential(selectedCredential)"><span class="fa fa-edit"></span> Edit</span> <span class="button"><span class="fa fa-trash"></span> Delete</span> <span class="button"><span class="fa fa-share"></span> Share</span></div></div></div>');
}]);
angular.module('views/vaults.html', []).run(['$templateCache', function($templateCache) {

View File

@ -137,6 +137,9 @@
width: 15%;
}
}
tr:hover{
background-color: transparent;
}
tr {
td.field_actions {
font-size: 13px;
@ -185,9 +188,13 @@
overflow-y: auto;
table {
width: 100%;
margin-bottom: 10px;
tr:hover{
background-color: #fff;
}
tr {
td:first-child {
width: 15%;
}
td {
padding: 2px;
@ -198,6 +205,7 @@
}
}
}
}
}
}

View File

@ -7,141 +7,164 @@
<!--</div>-->
</div>
<div class="actions creatable">
<span ng-click="menuOpen = !menuOpen" class="button new" ng-init="menuOpen = false" off-click="menuOpen = false;">
<span ng-click="menuOpen = !menuOpen" class="button new"
ng-init="menuOpen = false" off-click="menuOpen = false;">
<span
>New</span></span>
<div class="actionList popovermenu bubble menu" ng-show="menuOpen">
<ul>
<li>
<span ng-click="addCredential()" class="menuitem action">
>New</span></span>
<div class="actionList popovermenu bubble menu" ng-show="menuOpen">
<ul>
<li>
<span ng-click="addCredential()"
class="menuitem action">
<span
class="icon icon-rename"></span>
class="icon icon-rename"></span>
<span>New credential</span>
</span>
</li>
<li>
</li>
<li>
<span href="#" class="menuitem action">
<span class="icon icon-shared"></span>
<span>New shared credential</span>
</span>
</li>
</ul>
</div>
</li>
</ul>
</div>
</div>
</div>
<table class="credential-table" ng-init="menuOpen = false;">
<tr ng-repeat="credential in credentials" ng-if="credential.hidden == 0 && credential.delete_time == 0" ng-click="selectCredential(credential)" ng-class="{'selected': selectedCredential.credential_id == credential.credential_id}">
<td>
<span class="label">{{credential.label}}</span>
<span class="icon icon-more" ng-click="menuOpen = !menuOpen"
off-click="menuOpen = false;"></span>
<span class="tags">
<div off-click="closeSelected()">
<table class="credential-table" ng-init="menuOpen = false;">
<tr ng-repeat="credential in credentials"
ng-if="credential.hidden == 0 && credential.delete_time == 0"
ng-click="selectCredential(credential)"
ng-class="{'selected': selectedCredential.credential_id == credential.credential_id}">
<td>
<span class="label">{{credential.label}}</span>
<span class="tags">
<span class="tag">Tag 1</span>
<span class="tag">Tag 2</span>
<span class="tag">Tag 4</span>
<span class="tag">Tag 4</span>
<span class="tag">Long tag xD</span>
</span>
<div class="actionList popovermenu bubble menu" ng-show="menuOpen">
<ul>
<li ng-click="editCredential(credential)"><span
class="menuitem action"
><span
class="icon icon-rename"></span><span>Edit</span></span>
</li>
<li><span href="#"
class="menuitem action"
><span
class="icon icon-share"></span><span>Share</span></span>
</li>
<li><span
class="menuitem action"
data-action="Delete"><span
class="icon icon-delete"></span><span>Delete</span></span>
</li>
</ul>
</div>
</td>
</tr>
</table>
<div id="app-sidebar" class="detailsView scroll-container app_sidebar"
ng-show="selectedCredential">
<table>
<tr ng-show="selectedCredential.label">
<td>
Label
</td>
<td>
{{selectedCredential.label}}
</td>
</tr>
<tr ng-show="selectedCredential.username">
<td>
Account
</td>
<td>
<span credential-field value="selectedCredential.username"></span>
</td>
</tr>
<tr ng-show="selectedCredential.password">
<td>
Password
</td>
<td>
<span credential-field value="selectedCredential.password" secret="'true'"></span>
</td>
</tr>
<tr ng-show="selectedCredential.email">
<td>
E-mail
</td>
<td>
<span credential-field value="selectedCredential.email"></span>
</td>
</tr>
<tr ng-show="selectedCredential.url">
<td>
URL
</td>
<td>
<span credential-field value="selectedCredential.url"></span>
</td>
</tr>
<tr ng-show="selectedCredential.files.length > 0">
<td>
Files
</td>
<td>
<div ng-repeat="file in selectedCredential.files" class="link">
{{file.filename}} ({{file.size | bytes}})
</div>
</td>
</tr>
<tr ng-repeat="field in selectedCredential.custom_fields">
<td>
{{field.label}}
</td>
<td>
<span credential-field value="field.value" secret="field.secret"></span>
</td>
</tr>
<tr ng-show="selectedCredential.changed">
<td>
Changed
</td>
<td>
{{selectedCredential.changed * 1000 | date:'dd-MM-yyyy @ HH:mm:ss'}}
</td>
</tr>
<tr ng-show="selectedCredential.created">
<td>
Created
</td>
<td>
{{selectedCredential.created * 1000 | date:'dd-MM-yyyy @ HH:mm:ss'}}
<!--<div class="actionList popovermenu bubble menu"
ng-show="menuOpen">
<ul>
<li><span
class="menuitem action"
></span>
</li>
<li><span href="#"
class="menuitem action"
><span
class="icon icon-share"></span><span>Share</span></span>
</li>
<li><span
class="menuitem action"
data-action="Delete"><span
class="icon icon-delete"></span><span>Delete</span></span>
</li>
</ul>
</div> -->
</td>
</tr>
</table>
<span class="close icon-close" ng-click="closeSelected()" alt="Close"></span>
<div id="app-sidebar" class="detailsView scroll-container app_sidebar"
ng-show="selectedCredential">
<span class="close icon-close" ng-click="closeSelected()"
alt="Close"></span>
<table>
<tr ng-show="selectedCredential.label">
<td>
Label
</td>
<td>
{{selectedCredential.label}}
</td>
</tr>
<tr ng-show="selectedCredential.username">
<td>
Account
</td>
<td>
<span credential-field
value="selectedCredential.username"></span>
</td>
</tr>
<tr ng-show="selectedCredential.password">
<td>
Password
</td>
<td>
<span credential-field value="selectedCredential.password"
secret="'true'"></span>
</td>
</tr>
<tr ng-show="selectedCredential.email">
<td>
E-mail
</td>
<td>
<span credential-field
value="selectedCredential.email"></span>
</td>
</tr>
<tr ng-show="selectedCredential.url">
<td>
URL
</td>
<td>
<span credential-field
value="selectedCredential.url"></span>
</td>
</tr>
<tr ng-show="selectedCredential.files.length > 0">
<td>
Files
</td>
<td>
<div ng-repeat="file in selectedCredential.files"
class="link">
{{file.filename}} ({{file.size | bytes}})
</div>
</td>
</tr>
<tr ng-repeat="field in selectedCredential.custom_fields">
<td>
{{field.label}}
</td>
<td>
<span credential-field value="field.value"
secret="field.secret"></span>
</td>
</tr>
<tr ng-show="selectedCredential.changed">
<td>
Changed
</td>
<td>
{{selectedCredential.changed * 1000 | date:'dd-MM-yyyy @ HH:mm:ss'}}
</td>
</tr>
<tr ng-show="selectedCredential.created">
<td>
Created
</td>
<td>
{{selectedCredential.created * 1000 | date:'dd-MM-yyyy @ HH:mm:ss'}}
</td>
</tr>
</table>
<div>
<span class="button" ng-click="editCredential(selectedCredential)">
<span class="fa fa-edit"></span> Edit
</span>
<span class="button">
<span class="fa fa-trash"></span> Delete
</span>
<span class="button">
<span class="fa fa-share"></span> Share
</span>
</div>
</div>
</div>