finished designing dashboard template

3 files changed, 98 insertions, 19 deletions

diff --git a/public/css/styles.less b/public/css/styles.less
index a1e149f..5fa7705 100644
--- a/public/css/styles.less
+++ b/public/css/styles.less
@@ -97,6 +97,21 @@ section.content {
     background-color: @grayLighter;
 }
 
+section.status table {
+    width: 80%;
+    margin-bottom: 0;
+    float: left;
+}
+section.status table tr td {
+    text-align: center;
+}
+section.status table tr td.success {
+    background-color: @successBackground;
+}
+section.status table tr td.error {
+    background-color: @errorBackground;
+}
+section.status i { margin: 5px; }
 
 section.projects section.project {
     margin: 10px 0;
@@ -115,8 +130,8 @@ section.projects section.project h1 {
     font-weight: normal;
     line-height: @baseLineHeight;
 }
-section.projects section.project .row-fluid {
-    min-height: 50px;
+section.projects section.project .row-fluid [class*="span"] {
+    min-height: 0;
 }
 section.projects section.project .span11 {
     padding: 5px;
@@ -135,12 +150,6 @@ section.projects a.btn-large {
     border: 2px solid @grayLight;
 }
 
-section.projects section.project h1 .username {
-    color: @grayLight;
-}
-section.projects section.project .participants {
-    font-size: @fontSizeSmall;
-}
 
 section.overview .lastactivity {
     background-color: @grayLighter;
diff --git a/router.js b/router.js
index 2b414c1..f551f38 100644
--- a/router.js
+++ b/router.js
@@ -74,6 +74,16 @@ module.exports = function(app) {
         })(req, res, next);
     });
 
+    /*
+     * GET project page
+     *
+     * '/project'
+    */
+
+
+
+
+
 
 
     /*
diff --git a/views/dashboard.ejs b/views/dashboard.ejs
index 2ea0942..c6b596a 100644
--- a/views/dashboard.ejs
+++ b/views/dashboard.ejs
@@ -7,16 +7,23 @@
     <!-- Wrapper
     ================================================== -->
     <div class="container" id="wrapper">
-    <div class="row-fluid row">
+    <div class="row-fluid">
 
-        <div class="span5 pid22">
+        <div class="span5">
             <h1>Prosjekter</h1>
             <section class="projects">
                 <section class="project">
                     <div class="row-fluid">
                         <div class="span11">
-                            <h1><a href="/dennisse/hyttetur">dennisse/<strong>hyttetur</strong></a></h1>
-                            <span class="participants">Meg, Robert, Turid-Laila</span>
+                            <h1><a href="/dennisse/hyttetur">dennisse/<strong>hytteturskogentilfrank</strong></a></h1>
+                            <div class="row-fluid">
+                                <div class="span8">
+                                    <small>Meg, Robert, Turid-Laila, Kurt, Stian, Aleksander, Frank, Olav, Heidi, Anette, Kristine</small>
+                                </div>
+                                <div class="span4">
+                                    <small>Oppgjør: <span class="text-error">-200 kr</span></small>
+                                </div>
+                            </div>
                         </div>
                         <div class="span1">
                                 <p>+</p>
@@ -24,20 +31,73 @@
                     </div>
                 </section>
                 <section class="project">
-                    <h1><a href="/kurt/Kollektivet">kurt/<strong>Kollektivet</strong></a></h1>
-                    <span class="participants">Meg, Kurt, Stian</span>
+                    <div class="row-fluid">
+                        <div class="span11">
+                            <h1><a href="/kurt/Kollektivet">kurt/<strong>Kollektivet</strong></a></h1>
+                            <div class="row-fluid">
+                                <div class="span8">
+                                    <small>Meg, Robert, Heidi, Anette, Kristine</small>
+                                </div>
+                                <div class="span4">
+                                    <small>Oppgjør: <span class="text-error">-2314 kr</span></small>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="span1">
+                            <p>+</p>
+                        </div>
+                    </div>
                 </section>
                 <section class="project">
-                    <h1><a href="/turidl/Kosekveldene">turidl/<strong>Kosekveldene</strong></a></h1>
-                    <span class="participants">Meg, Turid-Laila</span>
-                    <a class="btn" type="button">+</a>
+                    <div class="row-fluid">
+                        <div class="span11">
+                            <h1><a href="/turidl/Kosekveldene">turidl/<strong>Kosekveldene</strong></a></h1>
+                              <div class="row-fluid">
+                                <div class="span8">
+                                    <small>Meg, Turid-Laila</small>
+                                </div>
+                                <div class="span4">
+                                    <small>Oppgjør: <span class="text-success">551 kr</span></small>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="span1">
+                            <p>+</p>
+                        </div>
+                    </div>
                 </section>
                 <a class="btn btn-large btn-block" type="button">+</a>
             </section>
         </div><!-- /div.span5 -->
+
+
+
+
+
+
+
+
         <div class="span7">
-            <section class="chart">
-                <h1>Status total</h1>
+            <section class="status">
+                <div class="row-fluid">
+                    <div class="span6">
+                        <h1>Status total</h1>
+                    </div>
+                    <div class="span6">
+                        <div class="row-fluid">
+                                <table class="table table-bordered table-condensed">
+                                    <tr>
+                                        <td class="success">3000</td>
+                                        <td class="error">4000</td>
+                                        <td>1000</td>
+                                    </tr>
+                                </table><a href="#table-info" class="accordion-toggle" data-toggle="collapse"><i class="icon-info-sign"></i></a>
+                        </div>
+                        <div class="row-fluid accordion collapse" id="table-info">
+                            <p class="text-info"><small>Her vises hvor mye andre skylder deg totalt, hvor mye du skylder andre totalt, og differansen mellom disse to tallene</small></p>
+                        </div>
+                    </div>
+                </div>
                 <canvas id="myChart" width="530" height="200"></canvas>
             </section>
             <section class="overview">