diff options
author | Dennis Eriksen <dennis.se@gmail.com> | 2013-04-17 12:09:57 +0200 |
---|---|---|
committer | Dennis Eriksen <dennis.se@gmail.com> | 2013-04-17 12:09:57 +0200 |
commit | f3154039d3d49f23e72fa6e88cb17ef0fc8c98df (patch) | |
tree | 688642f73a9fc63bd58c1d2b8b978c0ff70fe6f3 /views/dashboard.ejs | |
parent | followup on last commit (diff) | |
download | Divid-f3154039d3d49f23e72fa6e88cb17ef0fc8c98df.tar.gz |
been working on the dashboard design
Diffstat (limited to 'views/dashboard.ejs')
-rw-r--r-- | views/dashboard.ejs | 213 |
1 files changed, 208 insertions, 5 deletions
diff --git a/views/dashboard.ejs b/views/dashboard.ejs index f424e8e..60e7725 100644 --- a/views/dashboard.ejs +++ b/views/dashboard.ejs @@ -7,9 +7,9 @@ <!-- Wrapper ================================================== --> <div class="container" id="wrapper"> - <div class="row-fluid row" style="background-color: #f99"> + <div class="row-fluid row"> - <div class="span5 pid22" style="background-color: #fff"> + <div class="span5 pid22"> <h1>Prosjekter</h1> <section class="projects"> <section class="project"> @@ -37,9 +37,212 @@ </div><!-- /div.span5 --> <div class="span7"> <section class="chart"> - <canvas id="myChart" width="400" height="400"></canvas> + <h1>CHART MOTHERF******</h1> + <canvas id="myChart" width="530" height="200"></canvas> </section> - <section calss="overview"> + <section class="overview"> + <h1>Siste aktivitet</h1> + <div class="lastactivity"> + <div class="row-fluid act443 activity"> + <div class="span8"> + <div class="row-fluid"> + <div class="span2 info text-right">prosjekt</div> + <div class="span10"><a href="/turidl/Kosekveldene">turidl/<strong>Kosekveldene</strong></a></div> + </div> + <div class="row-fluid"> + <div class="span2 info text-right">av</div> + <div class="span10">Turid Laila</div> + </div> + <div class="row-fluid"> + <div class="span2 info text-right">hva</div> + <div class="span10">Mer kaviar</div> + </div> + </div> + <div class="span4"> + <div class="row-fluid"> + <div class="span3 info text-right">når</div> + <div class="span9">2013-04-15 22:45</div> + </div> + <div class="row-fluid"> + <div class="span12"> </div> + </div> + <div class="row-fluid"> + <div class="span1"> </div> + <div class="span4 info text-right">sum</div> + <div class="span7">24 kr</div> + </div> + </div> + </div> + + + + + <div class="row-fluid act443 activity"> + <div class="span8"> + <div class="row-fluid"> + <div class="span2 info text-right">prosjekt</div> + <div class="span10"><a href="/kurt/Kollektivet">kurt/<strong>Kollektivet</strong></a></div> + </div> + <div class="row-fluid"> + <div class="span2 info text-right">av</div> + <div class="span10">Dennis Eriksen</div> + </div> + <div class="row-fluid"> + <div class="span2 info text-right">hva</div> + <div class="span10">Stol!</div> + </div> + </div> + <div class="span4"> + <div class="row-fluid"> + <div class="span3 info text-right">når</div> + <div class="span9">2013-04-12 15:11</div> + </div> + <div class="row-fluid"> + <div class="span12"> </div> + </div> + <div class="row-fluid"> + <div class="span1"><a href="http://i.imgur.com/PZzttmu.png" gtarget="_blank"><i class="icon-picture"></i></a></div> + <div class="span4 info text-right">sum</div> + <div class="span7">105 kr</div> + </div> + </div> + </div> + + + + + <div class="row-fluid act443 activity"> + <div class="span8"> + <div class="row-fluid"> + <div class="span2 info text-right">prosjekt</div> + <div class="span10"><a href="/kurt/Kollektivet">kurt/<strong>Kollektivet</strong></a></div> + </div> + <div class="row-fluid"> + <div class="span2 info text-right">av</div> + <div class="span10">Kurt Iversen</div> + </div> + <div class="row-fluid"> + <div class="span2 info text-right">hva</div> + <div class="span10">Kjøpte no iskrem</div> + </div> + </div> + <div class="span4"> + <div class="row-fluid"> + <div class="span3 info text-right">når</div> + <div class="span9">2013-04-10 15:22</div> + </div> + <div class="row-fluid"> + <div class="span12"> </div> + </div> + <div class="row-fluid"> + <div class="span1"> </div> + <div class="span4 info text-right">sum</div> + <div class="span7">55 kr</div> + </div> + </div> + </div> + + + + + <div class="row-fluid act443 activity"> + <div class="span8"> + <div class="row-fluid"> + <div class="span2 info text-right">prosjekt</div> + <div class="span10"><a href="/dennisse/hyttetur">dennisse/<strong>hyttetur</strong></a></div> + </div> + <div class="row-fluid"> + <div class="span2 info text-right">av</div> + <div class="span10">Dennis Eriksen</div> + </div> + <div class="row-fluid"> + <div class="span2 info text-right">hva</div> + <div class="span10">En halvspist osteskive med kaviar</div> + </div> + </div> + <div class="span4"> + <div class="row-fluid"> + <div class="span3 info text-right">når</div> + <div class="span9">2013-04-04 22:39</div> + </div> + <div class="row-fluid"> + <div class="span12"> </div> + </div> + <div class="row-fluid"> + <div class="span1"> </div> + <div class="span4 info text-right">sum</div> + <div class="span7">23 kr</div> + </div> + </div> + </div> + + + + + <div class="row-fluid act443 activity"> + <div class="span8"> + <div class="row-fluid"> + <div class="span2 info text-right">prosjekt</div> + <div class="span10"><a href="/dennisse/hyttetur">dennisse/<strong>hyttetur</strong></a></div> + </div> + <div class="row-fluid"> + <div class="span2 info text-right">av</div> + <div class="span10">Robert Joramo</div> + </div> + <div class="row-fluid"> + <div class="span2 info text-right">hva</div> + <div class="span10">kaviar</div> + </div> + </div> + <div class="span4"> + <div class="row-fluid"> + <div class="span3 info text-right">når</div> + <div class="span9">2013-04-04 22:37</div> + </div> + <div class="row-fluid"> + <div class="span12"> </div> + </div> + <div class="row-fluid"> + <div class="span1"> </div> + <div class="span4 info text-right">sum</div> + <div class="span7">5433 kr</div> + </div> + </div> + </div> + + + + <div class="row-fluid act443 activity"> + <div class="span8"> + <div class="row-fluid"> + <div class="span2 info text-right">prosjekt</div> + <div class="span10"><a href="/turidl/Kosekveldene">turidl/<strong>Kosekveldene</strong></a></div> + </div> + <div class="row-fluid"> + <div class="span2 info text-right">av</div> + <div class="span10">Kurt Sanandreas</div> + </div> + <div class="row-fluid"> + <div class="span2 info text-right">hva</div> + <div class="span10">Tok med Turiid på restaurant og hadde det kjempekoselig. Var litt dyrt, men verdt det!</div> + </div> + </div> + <div class="span4"> + <div class="row-fluid"> + <div class="span3 info text-right">når</div> + <div class="span9">2013-03-05 11:48</div> + </div> + <div class="row-fluid"> + <div class="span12"> </div> + </div> + <div class="row-fluid"> + <div class="span1"><a href="http://i.imgur.com/qYL2mLb.jpg" target="_blank"><i class="icon-picture"></i></a></div> + <div class="span4 info text-right">sum</div> + <div class="span7">534 kr</div> + </div> + </div> + </div> + </div> </section> </div><!-- /div.span7 --> @@ -66,7 +269,7 @@ strokeColor : "rgba(151,187,205,1)", pointColor : "rgba(151,187,205,1)", pointStrokeColor : "#fff", - data : [28,48,40,19,96,27,100] + data : [0,25,10,100,10,25,0] } ] } |