From 94d57445b30939b780c55d438debb5bf21e51f4a Mon Sep 17 00:00:00 2001
From: Vladimir Polyakov <nrd11k@gmail.com>
Date: Sat, 11 Jul 2015 21:09:28 +0300
Subject: [PATCH] fix sorting issue and header overflow

---
 resources/builds.js                         | 5 ++---
 static/css/sources/components/projects.less | 5 ++++-
 static/js/app/components/header/index.jade  | 6 ++++--
 static/js/app/components/header/index.js    | 3 ++-
 static/js/main.js                           | 6 +++++-
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/resources/builds.js b/resources/builds.js
index 6a110c9..cd401df 100644
--- a/resources/builds.js
+++ b/resources/builds.js
@@ -16,9 +16,8 @@ module.exports = function(app) {
 				if (data.projectName) {
 					start.projectName = data.projectName;
 				}
-				if (data.descCreateDate) {
-					start.descCreateDate = data.descCreateDate;
-				}
+
+				start.descCreateDate = data.descCreateDate || '';
 
 				var findParams = _(data).pick('offset', 'limit');
 				findParams.start = start;
diff --git a/static/css/sources/components/projects.less b/static/css/sources/components/projects.less
index 04decf6..b258b5c 100644
--- a/static/css/sources/components/projects.less
+++ b/static/css/sources/components/projects.less
@@ -3,6 +3,7 @@
 	width: 300px;
 	color: white;
 	cursor: pointer;
+
 	&_preview {
 		color: rgba(255, 255, 255, 0.5);
 		padding: 5px 25px 5px 5px;
@@ -38,7 +39,7 @@
 
 		&_link {
 			float: left;
-			display: block;
+			width: 90%;
 			color: white;
 			text-decoration: none;
 			&:hover {
@@ -48,7 +49,9 @@
 		}
 		&_run {
 			float: right;
+			width: 10%;
 			color: rgba(255, 255, 255, 0.5);
+			text-align: right;
 			&:hover {
 				color: white;
 				text-decoration: none;
diff --git a/static/js/app/components/header/index.jade b/static/js/app/components/header/index.jade
index 7199e32..0b058fb 100644
--- a/static/js/app/components/header/index.jade
+++ b/static/js/app/components/header/index.jade
@@ -3,5 +3,7 @@
 		.navbar-header
 			Link.navbar-brand(to="dashboard")
 				span NCI
-		.navbar-left.navbar-form(style={paddingTop: "11px"})
-			ProjectsSelector()
+
+		.collapse.navbar-collapse
+			.navbar-form.navbar-left(style={paddingTop: "11px"})
+				ProjectsSelector()
diff --git a/static/js/app/components/header/index.js b/static/js/app/components/header/index.js
index 62ac242..526032e 100644
--- a/static/js/app/components/header/index.js
+++ b/static/js/app/components/header/index.js
@@ -4,7 +4,8 @@ define([
 	'react',
 	'react-router',
 	'app/components/projects/selector/index',
-	'templates/app/components/header/index'
+	'templates/app/components/header/index',
+	'bootstrap/collapse'
 ], function(React, Router, ProjectsSelector, template) {
 	template = template.locals({
 		Link: Router.Link,
diff --git a/static/js/main.js b/static/js/main.js
index 7972e09..4cdc644 100644
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -10,6 +10,10 @@ require.config({
 		_dataio: '/data.io',
 		socketio: '/socket.io/socket.io.js',
 		jquery: 'libs/jquery/jquery',
-		ansi_up: 'libs/ansi_up/ansi_up'
+		ansi_up: 'libs/ansi_up/ansi_up',
+		'bootstrap/collapse': 'libs/bootstrap/js/collapse'
+	},
+	shim: {
+		'bootstrap/collapse': ['jquery']
 	}
 });