Merge pull request #556 from bradrydzewski/master

fix for #554 and #552

README.md

@@ -117,7 +117,7 @@ Or you can use environment variables
 
 ```sh
 
-# custom database settings
+# custom http server settings
 export DRONE_SERVER_PORT=""
 export DRONE_SERVER_SSL_KEY=""
 export DRONE_SERVER_SSL_CERT=""

server/app/styles/drone.less

@@ -961,6 +961,27 @@ nav {
             padding:10px 20px;
             margin-top:20px;
         }
+        select,
+		input[type="number"] {
+			.border_box();
+			padding:8px;
+			font-size:14px;
+			margin-bottom:15px;
+			border: 1px solid #DDD;
+		}
+		span.seconds {
+			color:#212121;
+			margin-left:10px;
+		}
+		span.minutes {
+			color:#212121;
+			&:before {
+				content:'(';
+			}
+			&:after {
+				content:')';
+			}
+		}
 	}
 }
 

server/app/views/repo_edit.html

@@ -34,6 +34,7 @@
 						<label for="privileged"></label>
 						<span>Enable Privileged mode</span>
 					</div>
+
 					<button ng-click="save()" class="pure-button pure-button-primary ladda-button expand-right" data-loading='{{ saving }}' ng-model="button" ng-disabled='saving'>
 						Save Flags
 					</button>
@@ -42,6 +43,26 @@
 		</div>
 	</section>
 
+	<section  ng-if="user.admin == true">
+		<div class="pure-g">
+			<div class="pure-u-1">
+				<div>
+					<h2>Build Timeout</h2>
+					<div>
+						<input type="number" ng-model="repo.timeout" id="timeout" integer />
+						<span ng-if="repo.timeout > 0" class="seconds">Seconds</span>
+						<span ng-if="repo.timeout > 0" class="minutes">{{ repo.timeout / 60 | number:0 }} minutes</span>
+					</div>
+
+					<button ng-click="save()" class="pure-button pure-button-primary ladda-button expand-right" data-loading='{{ saving }}' ng-model="button" ng-disabled='saving'>
+						Save Timeout
+					</button>
+				</div>
+			</div>
+		</div>
+	</section>
+
+
 	<section>
 		<div class="pure-g">
 			<div class="pure-u-1">