Merge branch 'master' into nolurk

static/directives/build-logs-view.html

@@ -3,6 +3,12 @@
     <i class="fa fa-clipboard"></i>Copy Logs
   </button>
 
+  <a id="downloadButton" class="btn btn-primary download-button"
+     ng-href="/buildlogs/{{ currentBuild.id }}"
+     target="_blank">
+    <i class="fa fa-download"></i>Download Logs
+  </a>
+
   <span class="cor-loader" ng-if="!logEntries"></span>
 
   <span class="no-logs" ng-if="!logEntries.length && currentBuild.phase == 'waiting'">

static/directives/config/config-map-field.html

@@ -0,0 +1,20 @@
+<div class="config-map-field-element">
+  <table class="table" ng-show="hasValues(binding)">
+    <tr class="item" ng-repeat="(key, value) in binding">
+      <td class="item-title">{{ key }}</td>
+      <td class="item-value">{{ value }}</td>
+      <td class="item-delete">
+        <a href="javascript:void(0)" ng-click="removeKey(key)">Remove</a>
+      </td>
+    </tr>
+  </table>
+  <span class="empty" ng-if="!hasValues(binding)">No entries defined</span>
+  <form class="form-control-container" ng-submit="addEntry()">
+    Add Key-Value:
+    <select ng-model="newKey">
+      <option ng-repeat="key in keys" value="{{ key }}">{{ key }}</option>
+    </select>
+    <input type="text" class="form-control" placeholder="Value" ng-model="newValue">
+    <button class="btn btn-default" style="display: inline-block">Add Entry</button>
+  </form>
+</div>

static/directives/config/config-setup-tool.html

@@ -112,6 +112,11 @@
                  A valid SSL certificate and private key files are required to use this option.
               </div>
 
+              <div class="co-alert co-alert-info" ng-if="config.PREFERRED_URL_SCHEME == 'https'">
+                Enabling SSL also enables <a href="https://en.wikipedia.org/wiki/HTTP_Strict_Transport_Security">HTTP Strict Transport Security</a>.<br/>
+                This prevents downgrade attacks and cookie theft, but browsers will reject all future insecure connections on this hostname.
+              </div>
+
               <table class="config-table"  ng-if="config.PREFERRED_URL_SCHEME == 'https'">
                 <tr>
                   <td class="non-input">Certificate:</td>
@@ -198,6 +203,7 @@
                   <option value="S3Storage">Amazon S3</option>
                   <option value="GoogleCloudStorage">Google Cloud Storage</option>
                   <option value="RadosGWStorage">Ceph Object Gateway (RADOS)</option>
+                  <option value="SwiftStorage">OpenStack Storage (Swift)</option>
                 </select>
               </td>
             </tr>
@@ -206,10 +212,15 @@
             <tr ng-repeat="field in STORAGE_CONFIG_FIELDS[config.DISTRIBUTED_STORAGE_CONFIG.local[0]]">
               <td>{{ field.title }}:</td>
               <td>
+                <span class="config-map-field"
+                      binding="config.DISTRIBUTED_STORAGE_CONFIG.local[1][field.name]"
+                      ng-if="field.kind == 'map'"
+                      keys="field.keys"></span>
                 <span class="config-string-field"
                       binding="config.DISTRIBUTED_STORAGE_CONFIG.local[1][field.name]"
                       placeholder="{{ field.placeholder }}"
-                      ng-if="field.kind == 'text'"></span>
+                      ng-if="field.kind == 'text'"
+                      is-optional="field.optional"></span>
                 <div class="co-checkbox" ng-if="field.kind == 'bool'">
                   <input id="dsc-{{ field.name }}" type="checkbox"
                          ng-model="config.DISTRIBUTED_STORAGE_CONFIG.local[1][field.name]">
@@ -849,4 +860,4 @@
     </div><!-- /.modal -->
 
   </div>
-</div>
+</div>

static/directives/config/config-string-field.html

@@ -2,7 +2,7 @@
   <form name="fieldform" novalidate>
     <input type="text" class="form-control" placeholder="{{ placeholder || '' }}"
            ng-model="binding" ng-trim="false" ng-minlength="1"
-           ng-pattern="getRegexp(pattern)" required>
+           ng-pattern="getRegexp(pattern)" ng-required="!isOptional">
     <div class="alert alert-danger" ng-show="errorMessage">
         {{ errorMessage }}
     </div>

static/directives/repo-view/repo-panel-settings.html

@@ -63,6 +63,12 @@
 
         <!-- Build Status Badge -->
         <div class="panel-body panel-section hidden-xs">
+
+          <!-- Token Info Banner -->
+          <div class="co-alert co-alert-info" ng-if="!repository.is_public">
+             Note: This badge contains a token so the badge can be seen by external users. The token does not grant any other access and is safe to share!
+          </div>
+
           <!-- Status Image -->
           <a ng-href="/repository/{{ repository.namespace }}/{{ repository.name }}">
             <img ng-src="/repository/{{ repository.namespace }}/{{ repository.name }}/status?token={{ repository.status_token }}"

static/directives/repository-events-table.html

@@ -15,10 +15,10 @@
 
           <div class="empty" ng-if="!notifications.length">
             <div class="empty-primary-msg">No notifications have been setup for this repository.</div>
-            <div class="empty-secondary-msg hidden-xs" ng-if="repository.can_write">
+            <div class="empty-secondary-msg hidden-sm hidden-xs" ng-if="repository.can_write">
               Click the "Create Notification" button above to add a new notification for a repository event.
             </div>
-            <div class="empty-secondary-msg visible-xs" ng-if="repository.can_write">
+            <div class="empty-secondary-msg visible-sm visible-xs" ng-if="repository.can_write">
               <a href="javascript:void(0)" ng-click="askCreateNotification()">Click here</a> to add a new notification for a repository event.
             </div>
           </div>