atlas alpha release

tnovo · Jul 30, 2015 · 6cce535 · 6cce535
1 parent ffc0224
commit 6cce535
Show file tree

Hide file tree

Showing 27 changed files with 7,929 additions and 404 deletions.
diff --git a/images/favicon.ico b/images/favicon.ico
diff --git a/index.html b/index.html
@@ -8,51 +8,34 @@
 	<meta name="description" content="">
 	<meta name="author" content="">
 
+	<link rel="shortcut icon" href="images/favicon.ico" type="image/x-icon" />
 	<link rel="stylesheet" type="text/css" href="js/styles/font-awesome.min.css">
 	<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
 	<link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
 	<link rel="stylesheet" type="text/css" href="js/styles/atlas.css">
+	<link rel="stylesheet" type="text/css" href="js/styles/chart.css">
 
-	<script data-main="js/main" src="js/require.js"></script>
 	<title>ATLAS</title>
 	<!--Adobe Edge Runtime-->
 	<meta http-equiv="X-UA-Compatible" content="IE=Edge">
-	<script type="text/javascript" charset="utf-8" src="http://animate.adobe.com/runtime/5.0.1/edge.5.0.1.min.js"></script>
-	<style>
-		.edgeLoad-EDGE-8182598 {
-			visibility: hidden;
-		}
-	</style>
-	<script>
-		AdobeEdge.loadComposition('atlas%20animation', 'EDGE-8182598', {
-			scaleToFit: "none",
-			centerStage: "none",
-			minW: "0",
-			maxW: "undefined",
-			width: "400px",
-			height: "400px"
-		}, {
-			"dom": {}
-		}, {
-			"dom": {}
-		});
-	</script>
-	<!--Adobe Edge Runtime End-->
 </head>
 
 <body>
-
 	<div id="splash">
+		<div id="stage" class="EDGE-8182598">
+		</div>
 		<div id="heading">
-			<div>ATLAS</div>
+			<a href="#/search">ATLAS</a>
 		</div>
-		<div id="stage" class="EDGE-8182598">
+		<div data-bind="text:applicationStatus" id="status"></div>
+		<div id="activityTimeline" data-bind="if:applicationStatus=='running'">
 		</div>
-		<div id="status">initializing</div>
 	</div>
 
-	<div id="wrapperLeftMenu">
-		<div id="wrapperLogo"><img src="images/atlas.png">ATLAS</div>
+	<div data-bind="if:currentView() != 'splash'" id="wrapperLeftMenu">
+		<div id="wrapperLogo">
+			<a href="#/splash"><img src="images/atlas.png">ATLAS</a>
+		</div>
 		<ul>
 			<li>
 				<a href="#/search"><i class="fa fa-search"></i>Vocabulary Search</a>
@@ -70,14 +53,14 @@
 					<a data-bind="text: CONCEPT_NAME, attr: { href: '#/concept/' + CONCEPT_ID}"></a>
 				</li>
 			</ul>
-			<li data-bind="click: function() {currentView('conceptset'); document.location='#';}">
-				<a href="#"><i class="fa fa-shopping-cart"></i>Concept Set</a>
+			<li>
+				<a href="#/conceptset"><i class="fa fa-shopping-cart"></i>Concept Set</a>
 				<span data-bind="if: selectedConcepts().length > 0">
 					<span class="badge" data-bind="text:pageModel.selectedConcepts().length"></span>
 				</span>
 			</li>
-			<li data-bind="click: function() { currentView('import'); document.location='#' }">
-				<a href="#"><i class="fa fa-upload"></i>Import</a>
+			<li>
+				<a href="#/import"><i class="fa fa-upload"></i>Import</a>
 			</li>
 			<li>
 				<a href="#/cohortdefinitions"><i class="fa fa-language"></i>Cohort Definitions</a>
@@ -86,7 +69,7 @@
 				<a href="#/reports"><i class="fa fa-area-chart"></i>Cohort Reporting</a>
 			</li>
 			<li>
-				<a href="#/calculations"><i class="fa fa-calculator"></i>Analytics</a>
+				<a href="#/analytics"><i class="fa fa-calculator"></i>Analytics</a>
 			</li>
 			<li>
 				<a href="#/jobs"><i class="fa fa-tasks"></i>Jobs</a>
@@ -96,25 +79,31 @@
 			</li>
 		</ul>
 	</div>
-	<div id="wrapperMainWindow">
+	<div data-bind="if:currentView() != 'splash'" id="wrapperMainWindow">
 		<div id="wrapperMainWindowContainer">
-
-			<div id="wrapperInitializing" data-bind="if: currentView() == 'initializing'">
-				<div class="wrapperTitle">
-					<i class="fa fa-refresh fa-spin"></i> Initializing...
-				</div>
-			</div>
-
 			<div id="wrapperLoading" data-bind="if: currentView() == 'loading'">
 				<div class="wrapperTitle">
 					<i class="fa fa-refresh fa-spin"></i> Loading...
 				</div>
 			</div>
 
+			<importer params="{model: pageModel}"></importer>
+
+			<conceptset-manager params="{model: pageModel}"></conceptset-manager>
+
 			<atlas-search params="{model: pageModel}"></atlas-search>
 
 			<concept-manager params="{model: pageModel, currentConceptId: pageModel.currentConceptId}"></concept-manager>
 
+			<job-manager params="{model: pageModel}"></job-manager>
+
+			<cohort-definitions params="{model: pageModel}"></cohort-definitions>
+
+			<cohort-definition-manager params="{model: pageModel}"></cohort-definition-manager>
+
+			<report-manager params="{model: pageModel}"></report-manager>
+			<analytics-manager params="{model: pageModel}"></analytics-manager>
+
 			<div data-bind="if: currentView() == 'configure'">
 				<div class="wrapperTitle">
 					Configure
@@ -132,6 +121,23 @@
 
 		</div>
 	</div>
+	<script data-main="js/main" src="js/require.js"></script>
+	<script type="text/javascript" charset="utf-8" src="http://animate.adobe.com/runtime/5.0.1/edge.5.0.1.min.js"></script>
+	<script>
+		AdobeEdge.loadComposition('atlas%20animation', 'EDGE-8182598', {
+			scaleToFit: "none",
+			centerStage: "none",
+			minW: "0",
+			maxW: "undefined",
+			width: "400px",
+			height: "400px"
+		}, {
+			"dom": {}
+		}, {
+			"dom": {}
+		});
+	</script>
+	<!--Adobe Edge Runtime End-->
 </body>
 
 </html>