Merge pull request #160 from aismail/f/#159-create-layout-for-dashboa…

…rd-page F/#159 create layout for dashboard page
aismail · May 17, 2013 · 8f35ded · 8f35ded
2 parents ae04615 + 6abc6b6
commit 8f35ded
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 11 deletions.
diff --git a/app/index.html b/app/index.html
@@ -6,6 +6,7 @@
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
         <meta name="description" content="">
         <meta name="author" content="">
+        <link href="http://twitter.github.com/bootstrap/assets/css/bootstrap.css" rel="stylesheet">
         <link href='http://fonts.googleapis.com/css?family=Oxygen' rel='stylesheet' type='text/css'>
         <script type="text/javascript" src="conf/general.js"></script>
         <script type="text/javascript" src="conf/general.user.js"></script>

diff --git a/app/templates/assignment_controller.hjs b/app/templates/assignment_controller.hjs
@@ -1,2 +1,11 @@
-<div class="mozaic-widget" data-widget="breadcrumbs" data-params="{{breadcrumbs_params}}"></div>
-<div class="mozaic-widget" data-widget="assignment_details" data-params="{{assignments_params}}"></div>
+<div class="container">
+    <div class="mozaic-widget" data-widget="header"></div>
+    <div class="mozaic-widget" data-widget="breadcrumbs" data-params="{{breadcrumbs_params}}"></div>
+    <div class="row"><br>
+        <div class="span8"><br>
+            <div class="mozaic-widget" data-widget="assignment_details" data-params="{{assignments_params}}"></div>
+        <div><br>
+        <div class="span4"><br>
+        </div><br>
+    </div>
+</div>
diff --git a/app/templates/assignments_list_widget.hjs b/app/templates/assignments_list_widget.hjs
@@ -1,4 +1,7 @@
-{{url}}
+<tr>
+    <th>Assignment</th>
+    <th>Deadline</th>
+</tr>
 {{#each assignments}}
     <tr>
         <td><a href="{{../url}}{{id}}">{{name}}</a></td>

diff --git a/app/templates/dashboard_controller.hjs b/app/templates/dashboard_controller.hjs
@@ -1,3 +1,9 @@
-<h1>Dashboard</h1>
-<div class="mozaic-widget" data-widget="breadcrumbs" data-params="{{breadcrumbs_params}}"></div>
-<table class="mozaic-widget" data-widget="list" data-params="{{list_params}}"></table>
+<div class="container">
+    <div class="mozaic-widget" data-widget="header"></div>
+    <div class="mozaic-widget" data-widget="breadcrumbs" data-params="{{breadcrumbs_params}}"></div>
+    <div class="row"><br>
+        <div class="span12"><br>
+            <table class="mozaic-widget" data-widget="list" data-params="{{list_params}}"></table>
+        </div><br>
+    </div>
+</div>
diff --git a/app/templates/page.hjs b/app/templates/page.hjs
@@ -1,4 +1,2 @@
-<div class="mozaic-widget" data-widget="header">
-</div>
 <div id="controller-container">
 </div>
diff --git a/app/templates/subject_controller.hjs b/app/templates/subject_controller.hjs
@@ -1,3 +1,17 @@
-<div class="mozaic-widget" data-widget="breadcrumbs" data-params="{{breadcrumbs_params}}"></div>
-<div class="mozaic-widget" data-widget="subject_details" data-params="{{subjects_params}}"></div>
-<table class="mozaic-widget" data-widget="assignments" data-params="{{assignments_params}}"></table>
+<div class = "container">
+    <div class="mozaic-widget" data-widget="header"></div>
+    <div class="mozaic-widget" data-widget="breadcrumbs" data-params="{{breadcrumbs_params}}"></div>
+    <div class="row"><br>
+        <div class="span8"><br>
+            <div class="mozaic-widget" data-widget="subject_details" data-params="{{subjects_params}}"></div>
+        </div><br>
+        <div class="span4"><br>
+            <table class="mozaic-widget" data-widget="assignments" data-params="{{assignments_params}}">
+                <tr>
+                    <td>Assignment</td>
+                    <td>Deadline</td>
+                </tr>
+            </table>
+        </div><br>
+    </div>
+</div>