bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-15 15:53:27 +00:00
Code Issues Releases Wiki Activity

applying new style throughout controllers

Browse Source
This commit is contained in:
Kyle Spearrin
2016-09-08 21:13:54 -04:00
parent 583c6fcad6
commit ab9593a53a
11 changed files with 131 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/popup/app/app.js
View File

@@ -5,6 +5,7 @@
'bit.services', 'bit.services',
'bit.global',
'bit.accounts', 'bit.accounts',
'bit.current', 'bit.current',
'bit.vault', 'bit.vault',

45
src/popup/app/config.js
View File

@@ -50,39 +50,36 @@
}) })
.state('tabs.current', { .state('tabs.current', {
url: "/current", url: "/current",
views: { templateUrl: "app/current/views/current.html",
'current-tab': { controller: 'currentController'
templateUrl: "app/current/views/current.html",
controller: 'currentController'
}
}
}) })
.state('tabs.vault', { .state('tabs.vault', {
url: "/vault", url: "/vault",
views: { templateUrl: "app/vault/views/vault.html",
'vault-tab': { controller: 'vaultController'
templateUrl: "app/vault/views/vault.html",
controller: 'vaultController'
}
}
}) })
.state('tabs.settings', { .state('tabs.settings', {
url: "/settings", url: "/settings",
views: { templateUrl: "app/settings/views/settings.html",
'settings-tab': { controller: 'settingsController'
templateUrl: "app/settings/views/settings.html",
controller: 'settingsController'
}
}
}) })
.state('tabs.tools', { .state('tabs.tools', {
url: "/tools", url: "/tools",
views: { templateUrl: "app/tools/views/tools.html",
'tools-tab': { controller: 'toolsController'
templateUrl: "app/tools/views/tools.html", })
controller: 'toolsController' .state('empty', {
} url: "/empty",
} abstract: true,
templateUrl: "app/global/enoty.html",
data: {
authorize: true
}
})
.state('empty.viewSite', {
url: "/view-site",
templateUrl: "app/vault/views/vaultViewSite.html",
controller: 'vaultViewSiteController'
}); });
}) })
.run(function ($rootScope, userService, loginService, tokenService, $state) { .run(function ($rootScope, userService, loginService, tokenService, $state) {

2
src/popup/app/current/views/current.html
View File

@@ -1,6 +1,4 @@
<div class="header"> <div class="header">
<a href="#" class="left"><i class="fa fa-chevron-left"></i> Back</a>
<a href="#" class="right">Save</a>
<div class="title">Current Sites</div> <div class="title">Current Sites</div>
</div> </div>
<div class="content"> <div class="content">

1
src/popup/app/global/empty.html Normal file
View File

@@ -0,0 +1 @@
<div ui-view></div>

4
src/popup/app/services/cipherService.js
View File

@@ -23,7 +23,7 @@
}); });
}); });
}); });
} };
_service.decryptSite = function (site) { _service.decryptSite = function (site) {
var model = { var model = {
@@ -50,7 +50,7 @@
resolve(model); resolve(model);
}); });
}); });
} };
_service.decrypt = decrypt; _service.decrypt = decrypt;

47
src/popup/app/settings/views/settings.html
View File

@@ -1,24 +1,25 @@
<ion-view view-title="Settings"> <div class="header">
<ion-content> <div class="title">Settings</div>
<div class="list"> </div>
<div class="item item-divider"> <div class="content">
Manage <div class="list">
</div> <div class="list-divider">
<a class="item" href="#"> Manage
Folders
</a>
<a class="item" ng-click="sync()">
Sync
</a>
<div class="item item-divider">
Current Session
</div>
<a class="item" href="#">
Lock
</a>
<a class="item" ng-click="logOut()">
Log out
</a>
</div> </div>
</ion-content> <a class="list-item" href="#">
</ion-view> Folders
</a>
<a class="list-item" href="#" ng-click="sync()">
Sync
</a>
<div class="list-divider">
Current Session
</div>
<a class="list-item" href="#">
Lock
</a>
<a class="list-item" href="#" ng-click="logOut()">
Log out
</a>
</div>
</div>

13
src/popup/app/tools/views/tools.html
View File

@@ -1,7 +1,6 @@
<ion-view view-title="Tools"> <div class="header">
<ion-content class="padding"> <div class="title">Tools</div>
<p> </div>
Some content for your tools. <div class="content">
</p> Some content for your tools.
</ion-content> </div>
</ion-view>

4
src/popup/app/vault/vaultController.js
View File

@@ -7,9 +7,7 @@
$scope.folders = []; $scope.folders = [];
$scope.focusedSiteId = null; $scope.focusedSiteId = null;
$scope.$on('$ionicView.enter', function (event, data) { loadVault();
loadVault();
});
function loadVault() { function loadVault() {
var decSites = []; var decSites = [];

40
src/popup/app/vault/views/vault.html
View File

@@ -1,21 +1,19 @@
<ion-view view-title="My Vault"> <div class="header">
<ion-nav-buttons side="secondary"> <a href="#" class="left"><i class="fa fa-chevron-left"></i> Back</a>
<button class="button button-icon icon ion-ios-plus-empty" ng-click="addSite()"></button> <a class="right" ng-click="addSite()"><i class="fa fa-plus"></i></a>
</ion-nav-buttons> <div class="title">My Vault</div>
<ion-content> </div>
<div class="list"> <div class="content">
<ng-repeat ng-repeat="folder in folders | orderBy: folderSort" ng-show="folders.length"> <div class="list">
<div class="item item-divider"> <ng-repeat ng-repeat="folder in folders | orderBy: folderSort" ng-show="folders.length">
{{folder.name}} <div class="list-divider">
</div> <i class="fa fa-folder-open"></i> {{folder.name}}
<ng-repeat ng-repeat="site in folderSites = (sites | filter: { folderId: folder.id } | orderBy: ['name', 'username'])"> </div>
<a ng-click="viewSite(site)" class="item item-button-right"> <a ng-click="viewSite(site)" class="list-item" ng-repeat="site in folderSites = (sites | filter: { folderId: folder.id } | orderBy: ['name', 'username'])">
{{site.name}}<br /> <span class="text">{{site.name}}</span>
{{site.username}} <span class="detail">{{site.username}}</span>
<span class="button button-clear button-dark"><i class="icon ion-more"></i></span> <!--<span class="btn btn-link pull-right"><i class="fa fa-ellipsis-h"></i></span>-->
</a> </a>
</ng-repeat> </ng-repeat>
</ng-repeat> </div>
</div> </div>
</ion-content>
</ion-view>

71
src/popup/app/vault/views/vaultViewSite.html
View File

@@ -1,39 +1,34 @@
<ion-modal-view ng-controller="vaultViewSiteController"> <div class="header">
<ion-header-bar class="bar bar-header bar-positive"> <a ng-click="close()" class="left">Close</a>
<button class="button button-clear button-primary" ng-click="close()">Close</button> <a ng-click="editSite()" class="right">Edit</a>
<h1 class="title">View Site</h1> <div class="title">View Site</div>
<button class="button button-clear button-primary" ng-click="editSite()">Edit</button> </div>
</ion-header-bar> <div class="content">
<ion-content> <div class="list">
<div class="list"> <div class="list-divider">
<div class="item item-divider"> Site Information
Site Information
</div>
<div class="item">
<div>Name</div>
{{site.name}}
</div>
<div class="item">
<div>Website</div>
{{site.uri}}
</div>
<div class="item">
<div>Username</div>
{{site.username}}
</div>
<div class="item">
<div>Password</div>
{{site.password}}
</div>
<div class="item item-divider">
Notes
</div>
<div class="item">
{{site.notes}}
</div>
<div class="item item-divider">
&nbsp;
</div>
</div> </div>
</ion-content> <div class="list-item">
</ion-modal-view> <div>Name</div>
{{site.name}}
</div>
<div class="list-item">
<div>Website</div>
{{site.uri}}
</div>
<div class="list-item">
<div>Username</div>
{{site.username}}
</div>
<div class="list-item">
<div>Password</div>
{{site.password}}
</div>
<div class="list-divider">
Notes
</div>
<div class="list-item">
{{site.notes}}
</div>
</div>
</div>

14
src/popup/less/popup.less
View File

@@ -30,6 +30,7 @@ body {
background-color: rgba(255, 255, 255, 0.1); background-color: rgba(255, 255, 255, 0.1);
} }
} }
.title { .title {
font-weight: bold; font-weight: bold;
display: block; display: block;
@@ -38,11 +39,13 @@ body {
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
} }
.left { .left {
float: left; float: left;
display: block; display: block;
padding: 12px 10px; padding: 12px 10px;
} }
.right { .right {
float: right; float: right;
display: block; display: block;
@@ -121,17 +124,28 @@ body {
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
color: #333; color: #333;
text-decoration: none; text-decoration: none;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
&:last-child { &:last-child {
border: none; border: none;
} }
.text { .text {
display: block; display: block;
} }
.detail { .detail {
font-size: 12px; font-size: 12px;
color: #777; color: #777;
display: block; display: block;
} }
} }
.list-divider {
background-color: #eeeeee;
padding: 10px 10px;
border-bottom: 1px solid #ddd;
}
} }