Merge branch 'master' into looksirdroids

static/directives/billing-options.html

@@ -36,4 +36,22 @@
       </div>
     </div>
   </div>
+
+  <!-- Modal message dialog -->
+  <div class="modal fade" id="cannotchangecardModal">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h4 class="modal-title">Cannot change credit card</h4>
+        </div>
+        <div class="modal-body">
+          Your credit card could not be changed
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        </div>
+      </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+  </div><!-- /.modal -->
 </div>

static/directives/header-bar.html

@@ -0,0 +1,59 @@
+<!-- Quay -->
+<div class="navbar-header">
+  <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-ex1-collapse">
+    <span class="sr-only">Toggle navigation</span>
+    <span class="fa-bar"></span>
+    <span class="fa-bar"></span>
+    <span class="fa-bar"></span>
+  </button>
+  <a class="navbar-brand" href="/" target="{{ appLinkTarget() }}">
+    <img src="/static/img/quay-logo.png">
+  </a>
+</div>
+
+<!-- Collapsable stuff -->
+<div class="collapse navbar-collapse navbar-ex1-collapse">
+  <ul class="nav navbar-nav">
+    <li><a ng-href="/repository/" target="{{ appLinkTarget() }}">Repositories</a></li>
+    <li><a ng-href="/guide/" target="{{ appLinkTarget() }}">Guide</a></li>
+    <li><a ng-href="/plans/" target="{{ appLinkTarget() }}">Pricing</a></li>
+    <li><a ng-href="/organizations/" target="{{ appLinkTarget() }}">Organizations</a></li>
+  </ul>
+
+  
+  <ul class="nav navbar-nav navbar-right" ng-switch on="user.anonymous">
+    <li>  
+      <form class="navbar-form navbar-left" role="search">
+        <div class="form-group">
+          <span class="repo-search"></span>
+        </div>
+      </form>
+      
+      <span class="navbar-left user-tools" ng-show="!user.anonymous">
+        <a href="/new/"><i class="fa fa-upload user-tool" bs-tooltip="tooltip.title" data-placement="bottom" title="Create new repository"></i></a>
+      </span>
+    </li>
+
+    <li class="dropdown" ng-switch-when="false">
+      <a href="javascript:void(0)" class="dropdown-toggle user-dropdown" data-toggle="dropdown">
+        <img src="//www.gravatar.com/avatar/{{ user.gravatar }}?s=32&d=identicon" />
+        {{ user.username }}
+        <span class="badge user-notification notification-animated" ng-show="user.askForPassword">1</span>
+        <b class="caret"></b>
+      </a>
+      <ul class="dropdown-menu">
+        <li>
+          <a href="/user/" target="{{ appLinkTarget() }}">
+            Account Settings
+            <span class="badge user-notification" ng-show="user.askForPassword">1</span>
+          </a>
+        </li>
+        <li><a ng-href="/organizations/" target="{{ appLinkTarget() }}">Organizations</a></li>
+        <li><a href="javascript:void(0)" ng-click="signout()">Sign out</a></li>
+      </ul>
+    </li>
+    <li ng-switch-default>
+      <a href="/signin/" target="{{ appLinkTarget() }}">Sign in</a>
+    </li>
+  </ul>
+</div><!-- /.navbar-collapse -->

static/directives/markdown-view.html

@@ -1 +1 @@
-<span class="markdown-view-content" ng-bind-html-unsafe="getMarkedDown(content, firstLineOnly)"></span>
+<span class="markdown-view-content" ng-bind-html="getMarkedDown(content, firstLineOnly)"></span>

static/directives/repo-search.html

@@ -0,0 +1 @@
+<input type="text" class="form-control repo-search-box" placeholder="Find Repo">