Builds UI fixes

cmd/drone-server/static/scripts/controllers/builds.js

@@ -64,7 +64,6 @@
    * BuildCtrl responsible for rendering a build.
    */
   function BuildCtrl($scope, $stateParams, $window, logs, builds, repos, users) {
-
     var number = $stateParams.number;
     var owner = $stateParams.owner;
     var name = $stateParams.name;
@@ -97,6 +96,27 @@
       $scope.build = event;
       $scope.$apply();
     });
+
+    $scope.restart = function () {
+      console.log('restart');
+      builds.restart(fullName, number).then(function (payload) {
+        $scope.build = payload.data;
+      }).catch(function (err) {
+        $scope.error = err;
+      });
+    };
+
+    $scope.cancel = function () {
+      builds.cancel(fullName, number).then(function (payload) {
+        $scope.build = payload.data;
+      }).catch(function (err) {
+        $scope.error = err;
+      });
+    };
+
+    $scope.tail = function () {
+      tail = !tail;
+    };
   }
 
 
@@ -172,6 +192,7 @@
     });
 
     $scope.restart = function () {
+      console.log('restart');
       builds.restart(fullName, number).then(function (payload) {
         $scope.build = payload.data;
         $scope.task = payload.data.builds[step - 1];
@@ -212,7 +233,6 @@
     });
   }
 
-
   angular
     .module('drone')
     .controller('BuildOutCtrl', BuildOutCtrl)

cmd/drone-server/static/scripts/drone.js

@@ -78,9 +78,14 @@
       })
       .state('login', {
         url: '/login',
+        views: {
+          'layout': {
             templateUrl: '/static/scripts/views/login.html',
-        title: 'Login',
+            controller: 'UserLoginCtrl',
-        controller: 'UserLoginCtrl'
+            resolve: resolveUser
+          }
+        },
+        title: 'Login'
       })
       .state('app.profile', {
         url: '/profile',
@@ -123,13 +128,15 @@
         views: {
           'toolbar': {
             templateUrl: '/static/scripts/views/builds/index/toolbar.html',
-            controller: 'BuildsCtrl'
+            controller: 'RepoEditCtrl',
+            resolve: resolveUser
           },
           'content': {
             templateUrl: '/static/scripts/views/builds/index/content.html',
             controller: 'BuildsCtrl'
           }
-        }
+        },
+        title: 'Builds'
       })
       .state('app.repo_edit', {
         url: '/:owner/:name/edit',
@@ -168,20 +175,33 @@
       .state('app.build', {
         url: '/:owner/:name/:number',
         views: {
-          'toolbar': {templateUrl: '/static/scripts/views/builds/show/toolbar.html'},
+          'toolbar': {
-          'content': {templateUrl: '/static/scripts/views/builds/show/content.html'}
+            templateUrl: '/static/scripts/views/builds/show/toolbar.html',
-        },
             controller: 'BuildCtrl',
             resolve: resolveUser
+          },
+          'content': {
+            templateUrl: '/static/scripts/views/builds/show/content.html',
+            controller: 'BuildCtrl',
+            resolve: resolveUser
+          }
+        },
+        title: 'Build'
       })
       .state('app.build_step', {
         url: '/:owner/:name/:number/:step',
         views: {
-          'toolbar': {templateUrl: '/static/scripts/views/builds/step/toolbar.html'},
+          'toolbar': {
-          'content': {templateUrl: '/static/scripts/views/builds/step/content.html'}
+            templateUrl: '/static/scripts/views/builds/step/toolbar.html',
-        },
             controller: 'BuildOutCtrl',
             resolve: resolveUser
+          },
+          'content': {
+            templateUrl: '/static/scripts/views/builds/step/content.html',
+            controller: 'BuildOutCtrl',
+            resolve: resolveUser
+          }
+        }
       });
 
     // Enables html5 mode
@@ -211,8 +231,8 @@
 
   function RouteChange($rootScope, repos, logs) {
     $rootScope.$on('$stateChangeStart', function () {
-      // repos.unsubscribe();
+      repos.unsubscribe();
-      // logs.unsubscribe();
+      logs.unsubscribe();
     });
 
     $rootScope.$on('$stateChangeSuccess', function (event, current) {

cmd/drone-server/static/scripts/views/builds/index/content.html

@@ -1,12 +1,16 @@
 <article>
   <section>
-    	<a class="row build-row" ng-repeat="build in builds | orderBy:'-number'" ng-href="/{{ repo.full_name }}/{{ build.number }}">
+    <a class="row build-row" ng-repeat="build in builds | orderBy:'-number'"
+       ng-href="/{{ repo.full_name }}/{{ build.number }}">
       <div>
         <div ng-class="[ 'build-num', build.status ]"></div>
       </div>
       <div>
         <h3>{{ build.head_commit.message }}</h3>
-    			<p><strong>{{ build.head_commit.author.login }}</strong> pushed to <strong>{{ build.head_commit.branch }}</strong> {{ build.started_at | fromNow }}</p>
+
+        <p><strong>{{ build.head_commit.author.login }}</strong> pushed to <strong>{{ build.head_commit.branch
+          }}</strong> {{ build.started_at | fromNow }}</p>
+
         <div style="position:absolute;top:30px;right:30px;color:#CCC;"># {{build.number}}</div>
       </div>
     </a>

cmd/drone-server/static/scripts/views/builds/show/content.html

@@ -7,14 +7,18 @@
       </div>
       <div>
         <h3>{{ build.head_commit.message }}</h3>
-					<p><strong>{{ build.head_commit.author.login }}</strong> pushed to <strong>{{ build.head_commit.branch }}</strong> {{ build.started_at | fromNow }}</p>
+
+        <p><strong>{{ build.head_commit.author.login }}</strong> pushed to <strong>{{ build.head_commit.branch
+          }}</strong> {{ build.started_at | fromNow }}</p>
+
         <div style="position:absolute;top:30px;right:30px;color:#CCC;"># {{build.number}}</div>
       </div>
     </div>
   </section>
 
   <section>
-			<a class="row build-row sub-build-row" ng-repeat="job in build.jobs" ng-href="{{ repo.full_name }}/{{ build.number }}/{{ job.number }}">
+    <a class="row build-row sub-build-row" ng-repeat="job in build.jobs"
+       ng-href="{{ repo.full_name }}/{{ build.number }}/{{ job.number }}">
       <div>
         <div ng-class="[ 'build-num', build.status ]"></div>
       </div>
@@ -31,6 +35,5 @@
 </article>
 
 
-
 <button ng-if="build.status !== 'pending' && build.status !== 'running'" ng-click="restart()">Restart</button>
 <button ng-if="build.status === 'pending' || build.status === 'running'" ng-click="cancel()">Cancel</button>

cmd/drone-server/static/scripts/views/builds/show/toolbar.html

@@ -4,12 +4,17 @@
   </a>
   <a ng-href="/{{ repo.full_name }}">{{ repo.owner }} / {{ repo.name }}</a>
   <span class="spacer"></span>
-	<a ng-href="#">{{ build.number }}</a>
+  <a ng-href="#">#{{ build.number }}</a>
 </div>
 
 <div class="menu">
-	<a href="settings.html" class="icon icon-settings"></a>
+  <a ng-href="/{{ repo.full_name }}/edit" class="nav-item settings float-right" ng-if="repo.permissions.pull">
-	<a ng-href="/{{ repo.full_name }}/edit" class="nav-item settings float-right"></a>
+    <i class="material-icons md-18">edit</i>
-	<button ng-click="watch(repo)"   ng-if="!repo.starred" class="nav-item star float-right"></button>
+  </a>
-	<button ng-click="unwatch(repo)" ng-if="repo.starred"  class="nav-item unstar float-right"></button>
+  <button ng-click="watch(repo)" ng-if="!repo.starred && user" class="nav-item star float-right">
+    <i class="material-icons md-18">star_border</i>
+  </button>
+  <button ng-click="unwatch(repo)" ng-if="repo.starred && user" class="nav-item unstar float-right">
+    <i class="material-icons md-18">star</i>
+  </button>
 </div>

cmd/drone-server/static/scripts/views/builds/step/content.html

@@ -8,7 +8,9 @@
       </div>
       <div>
         <h3>{{ build.head_commit.message }}</h3>
-					<p><strong>{{ build.head_commit.author.login }}</strong> pushed to <strong>{{ build.head_commit.branch }}</strong> {{ build.started_at | fromNow }}</p>
+
+        <p><strong>{{ build.head_commit.author.login }}</strong> pushed to <strong>{{ build.head_commit.branch
+          }}</strong> {{ build.started_at | fromNow }}</p>
       </div>
     </div>
 
@@ -27,13 +29,10 @@
   </section>
 
 
-
-
   <pre id="term" ng-if="task && task.status !== 'pending'"></pre>
   <button class="fab" ng-if="build.status === 'running'" ng-click="tail()"></button>
 </article>
 
 
-
 <button ng-if="build.status !== 'pending' && build.status !== 'running'" ng-click="restart()">Restart</button>
 <button ng-if="build.status === 'pending' || build.status === 'running'" ng-click="cancel()">Cancel</button>

cmd/drone-server/static/scripts/views/builds/step/toolbar.html

@@ -1,5 +1,7 @@
 <div class="breadcrumb" style="position:relative;top:0px;">
-	<a ng-href="/{{ repo.full_name }}/{{ build.sequence }}" class="icon icon-home"></a>
+  <a ng-href="/{{ repo.full_name }}/{{ build.sequence }}" class="icon icon-home">
+    <i class="material-icons md-18">home</i>
+  </a>
   <a ng-href="/{{ repo.full_name }}">{{ repo.owner }} / {{ repo.name }}</a>
   <span class="spacer"></span>
   <a ng-href="/{{ repo.full_name }}/{{ build.sequence }}">{{ build.sequence }}</a>
@@ -8,7 +10,13 @@
 </div>
 
 <div class="menu">
-	<a ng-href="/{{ repo.full_name }}/edit" class="nav-item settings float-right"></a>
+  <a ng-href="/{{ repo.full_name }}/edit" class="nav-item settings float-right" ng-if="repo.permissions.pull">
-	<button ng-click="watch(repo)"   ng-if="!repo.starred" class="nav-item star float-right"></button>
+    <i class="material-icons md-18">edit</i>
-	<button ng-click="unwatch(repo)" ng-if="repo.starred"  class="nav-item unstar float-right"></button>
+  </a>
+  <button ng-click="watch(repo)" ng-if="!repo.starred && user" class="nav-item star float-right">
+    <i class="material-icons md-18">star_border</i>
+  </button>
+  <button ng-click="unwatch(repo)" ng-if="repo.starred && user" class="nav-item unstar float-right">
+    <i class="material-icons md-18">star</i>
+  </button>
 </div>

cmd/drone-server/static/scripts/views/repos/toolbar.html

@@ -6,7 +6,13 @@
 </div>
 
 <div class="menu">
-  <a ng-href="/{{ repo.full_name }}/edit" class="nav-item settings float-right"></a>
+  <a ng-href="/{{ repo.full_name }}/edit" class="nav-item settings float-right" ng-if="repo.permissions.pull">
-  <button ng-click="watch(repo)" ng-if="!repo.starred" class="nav-item star float-right"></button>
+    <i class="material-icons md-18">edit</i>
-  <button ng-click="unwatch(repo)" ng-if="repo.starred" class="nav-item unstar float-right"></button>
+  </a>
+  <button ng-click="watch(repo)" ng-if="!repo.starred && user" class="nav-item star float-right">
+    <i class="material-icons md-18">star_border</i>
+  </button>
+  <button ng-click="unwatch(repo)" ng-if="repo.starred && user" class="nav-item unstar float-right">
+    <i class="material-icons md-18">star</i>
+  </button>
 </div>