diff options
| author | Dennis Eriksen <dennis.se@gmail.com> | 2013-04-29 10:15:51 +0200 |
|---|---|---|
| committer | Dennis Eriksen <dennis.se@gmail.com> | 2013-04-29 10:15:51 +0200 |
| commit | 0967d9efaba1639f49caaacb3af097881d1172f4 (patch) | |
| tree | 0ce2ba2a2d6d0b9604e44536b441b7617af9c1c2 /views | |
| parent | fixed a testlink (diff) | |
| parent | changed text divid home (diff) | |
| download | Divid-0967d9efaba1639f49caaacb3af097881d1172f4.tar.gz | |
Merge branch 'master' of github.com:dennisse/Divid
Diffstat (limited to 'views')
| -rw-r--r-- | views/faq.ejs | 7 | ||||
| -rw-r--r-- | views/home.ejs | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/views/faq.ejs b/views/faq.ejs index 00fae05..0118d08 100644 --- a/views/faq.ejs +++ b/views/faq.ejs @@ -180,7 +180,7 @@ </div>
<div id="collapseThirteen" class="accordion-body collapse">
<div class="accordion-inner">
- <p><i class="icon-info-sign"></i> Det er mulig å nå oss på denne mailen ####</p>
+ <p><i class="icon-info-sign"></i> Konakt oss via pr(a)divid.no</p>
</div>
</div>
</div>
@@ -188,13 +188,12 @@ <div class="accordion-group">
<div class="accordion-heading">
<a class="accordion-toggle" data-toggle="collapse" data-parent="#accordion14" href="#collapseFourteen">
- <p><i class="icon-question-sign"></i> Det er fredag</p>
+ <p><i class="icon-question-sign"></i> jeg vil ikke at mine data skal være lagret på serveren lengre. Kan jeg slette selv eller gjør dere det?</p>
</a>
</div>
<div id="collapseFourteen" class="accordion-body collapse">
<div class="accordion-inner">
- <p><i class="icon-info-sign"></i> </p>
- <iframe width="560" height="315" src="http://www.youtube.com/embed/kfVsfOSbJY0?autoplay=1" frameborder="0" allowfullscreen></iframe>
+ <p><i class="icon-info-sign"></i> Du har muligheten til å slette selv.</p>
</div>
</div>
</div>
diff --git a/views/home.ejs b/views/home.ejs index a764d54..0b7ee5d 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -19,11 +19,13 @@ <div class="span5 pitch"> <div class="span12 row"> <h1>Samarbeid om utgifter</h1> + <p>Dette er en delingstjeneste som regner ut hva folk skylder hverandre</p> <ul> - </li><h4><i class="icon-play"></i> Opprett prosjekt og inviter deltakere</h4></li> + </li><h4><i class="icon-play"></i> Registrer deg gratis</h4></li> + </li><h4><i class="icon-play"></i> Opprett prosjekt</h4></li> </li><h4><i class="icon-user"></i> Inviter deltakere</h4></li> </li><h4><i class="icon-barcode"></i> Før inn utgiftene</h4></li> - + </li><h4><i class="icon-ok"></i> Ta et oppgjør</h4></li> </ul> <hr class="divideLine"/> </div> |