From f555b62944b7d310bbd61bac9b9ec0744a8bc310 Mon Sep 17 00:00:00 2001 From: Dennis Eriksen Date: Fri, 19 Apr 2013 11:20:16 +0200 Subject: finished designing dashboard template --- public/css/styles.less | 25 ++++++++++----- router.js | 10 ++++++ views/dashboard.ejs | 82 +++++++++++++++++++++++++++++++++++++++++++------- 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 @@
-
+
-
+

Prosjekter

-

dennisse/hyttetur

- Meg, Robert, Turid-Laila +

dennisse/hytteturskogentilfrank

+
+
+ Meg, Robert, Turid-Laila, Kurt, Stian, Aleksander, Frank, Olav, Heidi, Anette, Kristine +
+
+ Oppgjør: -200 kr +
+

+

@@ -24,20 +31,73 @@
-

kurt/Kollektivet

- Meg, Kurt, Stian +
+
+

kurt/Kollektivet

+
+
+ Meg, Robert, Heidi, Anette, Kristine +
+
+ Oppgjør: -2314 kr +
+
+
+
+

+

+
+
-

turidl/Kosekveldene

- Meg, Turid-Laila - + +
+
+

turidl/Kosekveldene

+
+
+ Meg, Turid-Laila +
+
+ Oppgjør: 551 kr +
+
+
+
+

+

+
+
+
+ + + + + + + +
-
-

Status total

+
+
+
+

Status total

+
+
+
+ + + + + + +
300040001000
+
+
+

Her vises hvor mye andre skylder deg totalt, hvor mye du skylder andre totalt, og differansen mellom disse to tallene

+
+
+
-- cgit v1.2.3