diff --git a/cmd/drone-server/static/index.html b/cmd/drone-server/static/index.html index 70cd89d7e..16cf68cd7 100644 --- a/cmd/drone-server/static/index.html +++ b/cmd/drone-server/static/index.html @@ -3,24 +3,25 @@ - + - + -
+
+ diff --git a/cmd/drone-server/static/scripts/controllers/builds.js b/cmd/drone-server/static/scripts/controllers/builds.js index be12fea17..514d95fe2 100644 --- a/cmd/drone-server/static/scripts/controllers/builds.js +++ b/cmd/drone-server/static/scripts/controllers/builds.js @@ -4,10 +4,9 @@ * BuildsCtrl responsible for rendering the repo's * recent build history. */ - function BuildsCtrl($scope, $routeParams, builds, repos, users, logs) { - - var owner = $routeParams.owner; - var name = $routeParams.name; + function BuildsCtrl($scope, $stateParams, builds, repos, users, logs) { + var owner = $stateParams.owner; + var name = $stateParams.name; var fullName = owner+'/'+name; // Gets the currently authenticated user @@ -64,11 +63,11 @@ /** * BuildCtrl responsible for rendering a build. */ - function BuildCtrl($scope, $routeParams, $window, logs, builds, repos, users) { + function BuildCtrl($scope, $stateParams, $window, logs, builds, repos, users) { - var number = $routeParams.number; - var owner = $routeParams.owner; - var name = $routeParams.name; + var number = $stateParams.number; + var owner = $stateParams.owner; + var name = $stateParams.name; var fullName = owner+'/'+name; // Gets the currently authenticated user @@ -104,12 +103,12 @@ /** * BuildOutCtrl responsible for rendering a build output. */ - function BuildOutCtrl($scope, $routeParams, $window, logs, builds, repos, users) { + function BuildOutCtrl($scope, $stateParams, $window, logs, builds, repos, users) { - var step = parseInt($routeParams.step) || 1; - var number = $routeParams.number; - var owner = $routeParams.owner; - var name = $routeParams.name; + var step = parseInt($stateParams.step) || 1; + var number = $stateParams.number; + var owner = $stateParams.owner; + var name = $stateParams.name; var fullName = owner+'/'+name; var streaming = false; var tail = false; diff --git a/cmd/drone-server/static/scripts/controllers/commits.js b/cmd/drone-server/static/scripts/controllers/commits.js index 12ee8bc71..b513cf5d9 100644 --- a/cmd/drone-server/static/scripts/controllers/commits.js +++ b/cmd/drone-server/static/scripts/controllers/commits.js @@ -4,10 +4,10 @@ * CommitsCtrl responsible for rendering the repo's * recent commit history. */ - function CommitsCtrl($scope, $routeParams, builds, repos, users, logs) { + function CommitsCtrl($scope, $stateParams, builds, repos, users, logs) { - var owner = $routeParams.owner; - var name = $routeParams.name; + var owner = $stateParams.owner; + var name = $stateParams.name; var fullName = owner+'/'+name; // Gets the currently authenticated user diff --git a/cmd/drone-server/static/scripts/controllers/repos.js b/cmd/drone-server/static/scripts/controllers/repos.js index 849f432bd..e499949f6 100644 --- a/cmd/drone-server/static/scripts/controllers/repos.js +++ b/cmd/drone-server/static/scripts/controllers/repos.js @@ -4,8 +4,7 @@ * ReposCtrl responsible for rendering the user's * repository home screen. */ - function ReposCtrl($scope, $routeParams, repos, users) { - + function ReposCtrl($scope, $stateParams, repos, users) { // Gets the currently authenticated user users.getCached().then(function(payload){ $scope.user = payload.data; @@ -43,9 +42,9 @@ /** * RepoEditCtrl responsible for editing a repository. */ - function RepoEditCtrl($scope, $window, $location, $routeParams, repos, users) { - var owner = $routeParams.owner; - var name = $routeParams.name; + function RepoEditCtrl($scope, $window, $location, $stateParams, repos, users) { + var owner = $stateParams.owner; + var name = $stateParams.name; var fullName = owner+'/'+name; // Inject window for composing url diff --git a/cmd/drone-server/static/scripts/drone.js b/cmd/drone-server/static/scripts/drone.js index 95393c837..bfcad6f68 100644 --- a/cmd/drone-server/static/scripts/drone.js +++ b/cmd/drone-server/static/scripts/drone.js @@ -7,7 +7,8 @@ */ angular.module('drone', [ 'ngRoute', - 'ui.filters' + 'ui.filters', + 'ui.router' ]); /** @@ -37,7 +38,7 @@ * Defines the route configuration for the * main application. */ - function Config ($routeProvider, $httpProvider, $locationProvider) { + function Config ($stateProvider, $httpProvider, $locationProvider) { // Resolver that will attempt to load the currently // authenticated user prior to loading the page. @@ -47,61 +48,136 @@ } } - $routeProvider - .when('/', { - templateUrl: '/static/scripts/views/repos.html', - controller: 'ReposCtrl', - resolve: resolveUser - }) - .when('/login', { - templateUrl: '/static/scripts/views/login.html', - controller: 'UserLoginCtrl' - }) - .when('/profile', { - templateUrl: '/static/scripts/views/user.html', - controller: 'UserCtrl', - resolve: resolveUser - }) - .when('/users', { - templateUrl: '/static/scripts/views/users.html', - controller: 'UsersCtrl', - resolve: resolveUser - }) - .when('/new', { - templateUrl: '/static/scripts/views/repos_add.html', - controller: 'RepoAddCtrl', - resolve: resolveUser - }) - .when('/:owner/:name', { - templateUrl: '/static/scripts/views/builds.html', - controller: 'BuildsCtrl', - resolve: resolveUser - }) - .when('/:owner/:name/edit', { - templateUrl: '/static/scripts/views/repos_edit.html', - controller: 'RepoEditCtrl', - resolve: resolveUser - }) - .when('/:owner/:name/edit/env', { - templateUrl: '/static/scripts/views/repos_env.html', - controller: 'RepoEditCtrl', - resolve: resolveUser - }) - .when('/:owner/:name/delete', { - templateUrl: '/static/scripts/views/repos_del.html', - controller: 'RepoEditCtrl', - resolve: resolveUser - }) - .when('/:owner/:name/:number', { - templateUrl: '/static/scripts/views/build.html', - controller: 'BuildCtrl', - resolve: resolveUser - }) - .when('/:owner/:name/:number/:step', { - templateUrl: '/static/scripts/views/build_out.html', - controller: 'BuildOutCtrl', - resolve: resolveUser - }); + $stateProvider + .state('app', { + abstract: true, + views: { + 'layout': { + templateUrl: '/static/scripts/views/layout.html', + controller: function ($scope, $routeParams, repos, users) { + users.getCached().then(function(payload){ + $scope.user = payload.data; + console.log(repos.list()); + }); + } + } + }, + resolve: resolveUser + }) + .state('app.index', { + url: '/', + views: { + 'toolbar': { + templateUrl: '/static/scripts/views/repos/index/toolbar.html' + }, + 'content': { + templateUrl: '/static/scripts/views/repos/index/content.html', + controller: 'ReposCtrl', + resolve: resolveUser + } + }, + title: 'Dashboard' + }) + .state('login', { + url: '/login', + templateUrl: '/static/scripts/views/login.html', + title: 'Login', + controller: 'UserLoginCtrl' + }) + .state('app.profile', { + url: '/profile', + views: { + 'toolbar': { templateUrl: '/static/scripts/views/profile/toolbar.html' }, + 'content': { + templateUrl: '/static/scripts/views/profile/content.html', + controller: 'UserCtrl', + resolve: resolveUser + } + }, + title: 'Profile' + }) + .state('app.users', { + url: '/users', + views: { + 'toolbar': { templateUrl: '/static/scripts/views/users/toolbar.html' }, + 'content': { + templateUrl: '/static/scripts/views/users/content.html', + controller: 'UsersCtrl', + resolve: resolveUser + } + }, + title: 'Users' + }) + .state('app.new_repo', { + url: '/new', + views: { + 'toolbar': { templateUrl: '/static/scripts/views/repos/add/toolbar.html' }, + 'content': { + templateUrl: '/static/scripts/views/repos/add/content.html', + controller: 'RepoAddCtrl', + resolve: resolveUser + } + }, + title: 'Add Repository' + }) + .state('app.builds', { + url: '/:owner/:name', + views: { + 'toolbar': { + templateUrl: '/static/scripts/views/builds/index/toolbar.html', + controller: 'BuildsCtrl' + }, + 'content': { + templateUrl: '/static/scripts/views/builds/index/content.html', + controller: 'BuildsCtrl' + } + } + }) + .state('app.repo_edit', { + url: '/:owner/:name/edit', + views: { + 'toolbar': { templateUrl: '/static/scripts/views/repos/toolbar.html' }, + 'content': { templateUrl: '/static/scripts/views/repos/edit.html' } + }, + controller: 'RepoEditCtrl', + resolve: resolveUser + }) + .state('app.repo.env', { + url: '/:owner/:name/edit/env', + views: { + 'toolbar': { templateUrl: '/static/scripts/views/repos/toolbar.html' }, + 'content': { templateUrl: '/static/scripts/views/repos/env.html' } + }, + controller: 'RepoEditCtrl', + resolve: resolveUser + }) + .state('app.repo.del', { + url: '/:owner/:name/delete', + views: { + 'toolbar': { templateUrl: '/static/scripts/views/repos/toolbar.html' }, + 'content': { templateUrl: '/static/scripts/views/repos/del.html' } + }, + controller: 'RepoEditCtrl', + resolve: resolveUser + }) + .state('app.build', { + url: '/:owner/:name/:number', + views: { + 'toolbar': { templateUrl: '/static/scripts/views/builds/show/toolbar.html' }, + 'content': { templateUrl: '/static/scripts/views/builds/show/content.html' } + }, + controller: 'BuildCtrl', + resolve: resolveUser + }) + .state('app.build_step', { + url: '/:owner/:name/:number/:step', + views: { + 'toolbar': { templateUrl: '/static/scripts/views/builds/step/toolbar.html' }, + 'content': { templateUrl: '/static/scripts/views/builds/step/content.html' } + }, + controller: 'BuildOutCtrl', + resolve: resolveUser + }) // Enables html5 mode $locationProvider.html5Mode(true) @@ -130,14 +206,14 @@ function RouteChange($rootScope, repos, logs) { - $rootScope.$on('$routeChangeStart', function (event, next) { + $rootScope.$on('$stateChangeStart', function () { repos.unsubscribe(); logs.unsubscribe(); }); - $rootScope.$on('$routeChangeSuccess', function (event, current, previous) { - if (current.$$route.title) { - document.title = current.$$route.title + ' · drone'; + $rootScope.$on('$stateChangeSuccess', function (event, current, previous) { + if (current.title) { + document.title = current.title + ' · drone'; } }); } diff --git a/cmd/drone-server/static/scripts/views/build.html b/cmd/drone-server/static/scripts/views/build.html deleted file mode 100644 index d7a51a92a..000000000 --- a/cmd/drone-server/static/scripts/views/build.html +++ /dev/null @@ -1,64 +0,0 @@ -
- - - - - {{ "+"+user.login }} -
- -
- -
- - {{ repo.owner }} / {{ repo.name }} - - {{ build.number }} -
- -
- - - - -
- -
- - - -
- -
-
-
-
-
-
-

{{ build.head_commit.message }}

-

{{ build.head_commit.author.login }} pushed to {{ build.head_commit.branch }} {{ build.started_at | fromNow }}

-
# {{build.number}}
-
-
-
- -
- -
-
-
-
-

-
- {{ key.toUpperCase() }}={{ value }} -
-

-
# {{job.number}}
-
- -
-
- - - - - diff --git a/cmd/drone-server/static/scripts/views/build_out.html b/cmd/drone-server/static/scripts/views/build_out.html deleted file mode 100644 index a62a43770..000000000 --- a/cmd/drone-server/static/scripts/views/build_out.html +++ /dev/null @@ -1,68 +0,0 @@ -
- - - - - {{ "+"+user.login }} -
- -
- -
- - {{ repo.owner }} / {{ repo.name }} - - {{ build.sequence }} - - {{ task.sequence }} -
- -
- - - -
- -
- - - -
- -
-
-
-
-
-
-
-

{{ build.head_commit.message }}

-

{{ build.head_commit.author.login }} pushed to {{ build.head_commit.branch }} {{ build.started_at | fromNow }}

-
-
- -
-
- -
-
-

-
- {{ key.toUpperCase() }}={{ value }} -
-

-
-
-
- - - - - 

-		
-	

-
-
-
-	
-	
diff --git a/cmd/drone-server/static/scripts/views/builds.html b/cmd/drone-server/static/scripts/views/builds.html
deleted file mode 100644
index 0ef2e9726..000000000
--- a/cmd/drone-server/static/scripts/views/builds.html
+++ /dev/null
@@ -1,39 +0,0 @@
-

-	
-	
-	
-	
-	{{ "+"+user.login }}
-

-
-

-
-	

-		
-		{{ repo.owner }} / {{ repo.name }}
-	

-
-	

-		
-		
-		
-	

-
-

-
-
-
-

-	

-		
-			

-				

-			

-			

-				
{{ build.head_commit.message }}

-				
{{ build.head_commit.author.login }} pushed to {{ build.head_commit.branch }} {{ build.started_at | fromNow }}

-				
# {{build.number}}

-			

-		
-	

-

diff --git a/cmd/drone-server/static/scripts/views/builds/index/content.html b/cmd/drone-server/static/scripts/views/builds/index/content.html
new file mode 100644
index 000000000..c469202b9
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/builds/index/content.html
@@ -0,0 +1,14 @@
+

+    

+    	
+    		

+    			

+    		

+    		

+    			
{{ build.head_commit.message }}

+    			
{{ build.head_commit.author.login }} pushed to {{ build.head_commit.branch }} {{ build.started_at | fromNow }}

+    			
# {{build.number}}

+    		

+    	
+    

+

\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/builds/index/toolbar.html b/cmd/drone-server/static/scripts/views/builds/index/toolbar.html
new file mode 100644
index 000000000..968a7f4b5
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/builds/index/toolbar.html
@@ -0,0 +1,18 @@
+

+	
+	  home
+	
+	{{ repo.owner }} / {{ repo.name }}
+

+
+

+	
+	  edit
+	
+	
+	
+

\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/builds/show/content.html b/cmd/drone-server/static/scripts/views/builds/show/content.html
new file mode 100644
index 000000000..3fd4fc313
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/builds/show/content.html
@@ -0,0 +1,36 @@
+

+
+		

+			

+				

+					

+				

+				

+					
{{ build.head_commit.message }}

+					
{{ build.head_commit.author.login }} pushed to {{ build.head_commit.branch }} {{ build.started_at | fromNow }}

+					
# {{build.number}}

+				

+			

+		

+
+		

+			
+				

+					

+				

+				

+					

+						

+							{{ key.toUpperCase() }}={{ value }}
+						

+					

+					
# {{job.number}}

+				

+			
+		

+

+
+
+
+
+
\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/builds/show/toolbar.html b/cmd/drone-server/static/scripts/views/builds/show/toolbar.html
new file mode 100644
index 000000000..60e280371
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/builds/show/toolbar.html
@@ -0,0 +1,15 @@
+

+	
+	  home
+	
+	{{ repo.owner }} / {{ repo.name }}
+	
+	{{ build.number }}
+

+
+

+	
+	
+	
+	
+

\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/builds/step/content.html b/cmd/drone-server/static/scripts/views/builds/step/content.html
new file mode 100644
index 000000000..9ec5fb7cf
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/builds/step/content.html
@@ -0,0 +1,39 @@
+

+
+		

+			

+				

+					

+					

+				

+				

+					
{{ build.head_commit.message }}

+					
{{ build.head_commit.author.login }} pushed to {{ build.head_commit.branch }} {{ build.started_at | fromNow }}

+				

+			

+
+			

+				

+
+				

+				

+					

+						

+							{{ key.toUpperCase() }}={{ value }}
+						

+					

+				

+			

+		

+
+
+
+
+	

+	
+

+
+
+
+
+
\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/builds/step/toolbar.html b/cmd/drone-server/static/scripts/views/builds/step/toolbar.html
new file mode 100644
index 000000000..b2d193cee
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/builds/step/toolbar.html
@@ -0,0 +1,14 @@
+

+	
+	{{ repo.owner }} / {{ repo.name }}
+	
+	{{ build.sequence }}
+	
+	{{ task.sequence }}
+

+
+

+	
+	
+	
+

\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/layout.html b/cmd/drone-server/static/scripts/views/layout.html
new file mode 100644
index 000000000..82fd25a6c
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/layout.html
@@ -0,0 +1,15 @@
+

+    
+    
+       help
+    
+    
+        supervisor_account
+    
+    
+       settings
+    
+    {{ "+"+user.login }}
+

+

+

\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/user.html b/cmd/drone-server/static/scripts/views/profile/content.html
similarity index 66%
rename from cmd/drone-server/static/scripts/views/user.html
rename to cmd/drone-server/static/scripts/views/profile/content.html
index 7d2f27e85..4dd819d6c 100644
--- a/cmd/drone-server/static/scripts/views/user.html
+++ b/cmd/drone-server/static/scripts/views/profile/content.html
@@ -1,19 +1,3 @@
-

-	
-	
-	
-	
-	{{ "+"+user.login }}
-

-
-

-
-	

-		
-		Profile
-	

-

-
 

 	

 		
Login info

@@ -34,8 +18,12 @@
 	

 		
Tokens

 		

-			
+		    

+			    
+			

+			

 			
+			

 		

 
 		
No Personal Tokens Exist

diff --git a/cmd/drone-server/static/scripts/views/profile/toolbar.html b/cmd/drone-server/static/scripts/views/profile/toolbar.html
new file mode 100644
index 000000000..6c829800f
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/profile/toolbar.html
@@ -0,0 +1,6 @@
+

+	
+        home
+	
+	Profile
+

\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/repos.html b/cmd/drone-server/static/scripts/views/repos.html
deleted file mode 100644
index ceb9be6de..000000000
--- a/cmd/drone-server/static/scripts/views/repos.html
+++ /dev/null
@@ -1,34 +0,0 @@
-

-	
-	
-	
-	
-	{{ "+"+user.login }}
-

-
-

-	

-		Dashboard
-	

-
-	

-		
-	

-

-
-

-
-
-	

-		
-			

-				

-			

-			

-				
{{ repo.owner }} / {{ repo.name }}

-				
{{ repo.clone_url }}

-			

-		
-
-	

-

diff --git a/cmd/drone-server/static/scripts/views/repos_add.html b/cmd/drone-server/static/scripts/views/repos/add/content.html
similarity index 67%
rename from cmd/drone-server/static/scripts/views/repos_add.html
rename to cmd/drone-server/static/scripts/views/repos/add/content.html
index 74b2c3b06..f16e1bda1 100644
--- a/cmd/drone-server/static/scripts/views/repos_add.html
+++ b/cmd/drone-server/static/scripts/views/repos/add/content.html
@@ -1,18 +1,3 @@
-

-	
-	
-	
-	
-	{{ "+"+user.login }}
-

-
-

-	

-		
-		Add Repository
-	

-

-
 

 		

 			
Register your repository with Drone to enable automated testing. Note that Drone
diff --git a/cmd/drone-server/static/scripts/views/repos/add/toolbar.html b/cmd/drone-server/static/scripts/views/repos/add/toolbar.html
new file mode 100644
index 000000000..1d8420982
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/repos/add/toolbar.html
@@ -0,0 +1,6 @@
+

+	
+        home
+	
+	Add Repository
+

\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/repos/del.html b/cmd/drone-server/static/scripts/views/repos/del.html
new file mode 100644
index 000000000..56c36d09a
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/repos/del.html
@@ -0,0 +1,17 @@
+

+
+
+	

+		
+Warning: this action cannot be undone.
+	

+
+

\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/repos_edit.html b/cmd/drone-server/static/scripts/views/repos/edit.html
similarity index 66%
rename from cmd/drone-server/static/scripts/views/repos_edit.html
rename to cmd/drone-server/static/scripts/views/repos/edit.html
index 5243bb361..c0338a79e 100644
--- a/cmd/drone-server/static/scripts/views/repos_edit.html
+++ b/cmd/drone-server/static/scripts/views/repos/edit.html
@@ -1,28 +1,3 @@
-

-	
-	
-	
-	
-	{{ "+"+user.login }}
-

-
-

-
-	

-		
-		{{ repo.owner }} / {{ repo.name }}
-	

-
-	

-		
-		
-		
-		
-	

-
-

-
-
 

 	

 		
Settings

@@ -92,4 +67,4 @@
 			
{{ repo.keypair.public }}

 		
 	

-

+

\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/repos_env.html b/cmd/drone-server/static/scripts/views/repos/env.html
similarity index 54%
rename from cmd/drone-server/static/scripts/views/repos_env.html
rename to cmd/drone-server/static/scripts/views/repos/env.html
index 508530a1d..b4913c42b 100644
--- a/cmd/drone-server/static/scripts/views/repos_env.html
+++ b/cmd/drone-server/static/scripts/views/repos/env.html
@@ -1,25 +1,3 @@
-

-	
-	
-	
-	
-	{{ "+"+user.login }}
-

-
-

-
-	

-		
-		{{ repo.owner }} / {{ repo.name }}
-	

-
-	

-		
-		
-		
-	

-
-

 

 	

 		
add
 		
 	

-

+

\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/repos/index/content.html b/cmd/drone-server/static/scripts/views/repos/index/content.html
new file mode 100644
index 000000000..4e4169579
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/repos/index/content.html
@@ -0,0 +1,14 @@
+

+    

+    	
+    		

+    			

+    		

+    		

+    			
{{ repo.owner }} / {{ repo.name }}

+    			
{{ repo.clone_url }}

+    		

+    	
+
+    

+

\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/repos/index/toolbar.html b/cmd/drone-server/static/scripts/views/repos/index/toolbar.html
new file mode 100644
index 000000000..851e529aa
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/repos/index/toolbar.html
@@ -0,0 +1,9 @@
+

+	Dashboard
+

+
+

+	
+	   add
+	
+

\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/repos/toolbar.html b/cmd/drone-server/static/scripts/views/repos/toolbar.html
new file mode 100644
index 000000000..3430cfd6e
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/repos/toolbar.html
@@ -0,0 +1,10 @@
+

+	
+	{{ repo.owner }} / {{ repo.name }}
+

+
+

+	
+	
+	
+

\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/repos_del.html b/cmd/drone-server/static/scripts/views/repos_del.html
deleted file mode 100644
index 1a1e48967..000000000
--- a/cmd/drone-server/static/scripts/views/repos_del.html
+++ /dev/null
@@ -1,42 +0,0 @@
-

-	
-	
-	
-	
-	{{ "+"+user.login }}
-

-
-

-
-	

-		
-		{{ repo.owner }} / {{ repo.name }}
-	

-
-	

-		
-		
-		
-	

-
-

-
-
-

-
-
-	

-		
-Warning: this action cannot be undone.
-	

-
-
-

diff --git a/cmd/drone-server/static/scripts/views/users.html b/cmd/drone-server/static/scripts/views/users/content.html
similarity index 55%
rename from cmd/drone-server/static/scripts/views/users.html
rename to cmd/drone-server/static/scripts/views/users/content.html
index ad5eda52d..82b4051e9 100644
--- a/cmd/drone-server/static/scripts/views/users.html
+++ b/cmd/drone-server/static/scripts/views/users/content.html
@@ -1,18 +1,3 @@
-

-	
-	
-	
-	
-	{{ "+"+user.login }}
-

-
-

-	

-		
-		Users
-	

-

-
 

 
 	

@@ -31,11 +16,15 @@
 			

 				
{{ user.login }} Admin

 				
{{ user.email }}

-				
-				
+				
+				
 			

 		
 	

 
 
-

+
\ No newline at end of file
diff --git a/cmd/drone-server/static/scripts/views/users/toolbar.html b/cmd/drone-server/static/scripts/views/users/toolbar.html
new file mode 100644
index 000000000..d9f4c8e9e
--- /dev/null
+++ b/cmd/drone-server/static/scripts/views/users/toolbar.html
@@ -0,0 +1,6 @@
+

+	
+	   home
+	
+	Users
+

\ No newline at end of file
diff --git a/cmd/drone-server/static/styles/drone.css b/cmd/drone-server/static/styles/drone.css
index 250cf3245..8dc35319e 100644
--- a/cmd/drone-server/static/styles/drone.css
+++ b/cmd/drone-server/static/styles/drone.css
@@ -778,9 +778,7 @@
               opacity: 1;
           }
 
-          .nav-item:after,
-          .nav-item:before {
-              font-family: "Material-Design-Iconic-Font";
+          .nav-item i {
               color: rgba(255,255,255,0.749);
           }
 
@@ -791,12 +789,6 @@
               text-decoration:none;
           }
 
-          .nav-item.settings:before {
-              font-size: 22px;
-              content: '\f060';
-          }
-
-
           .nav-item.unstar,
           .nav-item.star {
             font-size:14px;
@@ -804,21 +796,6 @@
             line-height:20px;
           }
 
-          .nav-item.star:after {
-            font-size: 24px;
-            content: "\f2e7";
-          }
-          .nav-item.unstar:after {
-            font-size: 24px;
-            content: "\f2e5";
-          }
-
-          .nav-item.add:after {
-            font-size: 24px;
-            content: "\f0fd";
-
-          }
-
           input.nav-item {
               position: relative;
               height: 59px;
@@ -938,6 +915,11 @@
         }
         */
 
+				.material-icons.md-18 { font-size: 18px; }
+				.material-icons.md-24 { font-size: 24px; }
+				.material-icons.md-36 { font-size: 36px; }
+				.material-icons.md-48 { font-size: 48px; }
+
         .menu-item {
             margin-right: 0;
             height: auto;
@@ -948,8 +930,7 @@
             opacity: 1;
         }
 
-        .menu-item:before {
-            font-family: "Material-Design-Iconic-Font";
+        .menu-item i {
             color: #2f2f2f;
         }
 
@@ -967,26 +948,6 @@
             padding: 10px 0;
         }
 
-        .menu-item.settings:before {
-            font-size: 20px;
-            content: "\f060";
-        }
-
-        .menu-item.users:before {
-            font-size: 20px;
-            content: "\f006";
-        }
-
-        .menu-item.help:before {
-            font-size: 20px;
-            content: '\f033';
-        }
-
-        .menu-item.plugins:before {
-            font-size: 23px;
-            content: '\f292';
-        }
-
         .menu-item.user-name {
             height: 50px;
             font-size: 14px;
@@ -998,15 +959,12 @@
             padding: 20px 0 18px 0;
         }
 
-
-
-
-    .subnav {
-      background:rgba(255,255,255,0.8);
-      padding:0px 25px;
-      height:70px;
-      position:relative;
-    }
+	    .subnav {
+	      background:rgba(255,255,255,0.8);
+	      padding:0px 25px;
+	      height:70px;
+	      position:relative;
+	    }
 
       .subnav .icon {
         display:inline-block;
@@ -1018,10 +976,10 @@
         margin-left:10px;
       }
 
-        .subnav .icon.icon-settings:before {
-          content: "\f060";
-          font-family: "Material-Design-Iconic-Font";
-        }
+      .subnav .icon.icon-settings:before {
+        content: "\f060";
+        font-family: "Material-Design-Iconic-Font";
+      }
 
       .subnav .menu {
         position: absolute;
@@ -1271,12 +1229,10 @@ header .logo {
     position: absolute;
     left: -50px;
 }
-.breadcrumb a.icon-home:after {
-    font-family: "Material-Design-Iconic-Font";
-    line-height:56px;
+.breadcrumb a.icon-home i {
+    /* line-height:56px; */
     color: rgba(255,255,255,0.749);
-    content: "\f297";
-    font-size:24px;
+    /* font-size:24px; */
     vertical-align: middle;
 }
 
@@ -1629,6 +1585,14 @@ http://codepen.io/batazor/pen/KwKryj
 .switch:active::before {
   box-shadow: 0 2px 10.416666666666668px rgba(0,0,0,0.28), 0 0 0 25px rgba(0,0,0,0.1);
 }
+input {
+	font-size:14px;
+	padding:10px 20px;
+	width:400px;
+	border: 1px solid #d9d9d9;
+	outline:none;
+}
+
 input:checked + .switch {
   background: rgba(0,150,136,0.5);
   background: rgba(102, 187, 106, 0.5);
@@ -1712,33 +1676,11 @@ input:checked + .switch:active::before {
     background: #EF5350;
     color: #FFF;
 }
-.btn-remove:before {
-    content: "\f102";
-    font-family:"Material-Design-Iconic-Font";
-    /*line-height:25px;
-    width:25px;*/
-    vertical-align: middle;
-    text-align: center;
-    display:inline-block;
-    font-size:16px;
-}
 .btn-admin.btn-checked,
 .btn-admin:hover {
     background: #4CAF50;
     color: #FFF;
 }
-.btn-admin:before {
-    content: "\f08e";
-    font-family:"Material-Design-Iconic-Font";
-    /*line-height:25px;
-    width:25px;*/
-    vertical-align: middle;
-    text-align: center;
-    display:inline-block;
-    font-size:16px;
-}
-
-
 
 .row-env .btn-remove {
     position: absolute;