diff options
| author | Erling Aaby <erlinaa@stud.hist.no> | 2013-05-02 10:50:07 +0200 |
|---|---|---|
| committer | Erling Aaby <erlinaa@stud.hist.no> | 2013-05-02 10:50:07 +0200 |
| commit | 8340e3889256e63d6300e663126f76df3cd52fb9 (patch) | |
| tree | 15754d355f58d3a4b04b2134063e5d4caca4253a /views | |
| parent | Changes to navbar, home, and faq (diff) | |
| parent | Changes in text in home.ejs (diff) | |
| download | Divid-8340e3889256e63d6300e663126f76df3cd52fb9.tar.gz | |
Merge branch 'master' of github.com:dennisse/Dv
Behind master branch
Diffstat (limited to 'views')
| -rw-r--r-- | views/home.ejs | 11 | ||||
| -rw-r--r-- | views/project.ejs | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/views/home.ejs b/views/home.ejs index 6d134c8..a473017 100644 --- a/views/home.ejs +++ b/views/home.ejs @@ -104,10 +104,19 @@ <iframe src="http://player.vimeo.com/video/41974181" width="500" height="281" frameborder="0" webkitAllowFullScreen mozallowfullscreen allowFullScreen></iframe> </div> </div> - <div class="span5 sectionright"> +<<<<<<< HEAD + <div class="span5 sectionright"> + <a href="https://itunes.apple.com/us/genre/ios-finance/id6015?mt=8" title="Appstore"> + <div id="app" class="apple"> <img src="/img/iph.png" class="apple"> + </a> + <a href="https://play.google.com/store"><img src="/img/android.png" id="android" class="infoimg"></a> + <a href="http://www.windowsphone.com/nb-no/store"><img src="/img/win.png" id="windows" class="infoimg"></a> +======= + <div class="span5 sectionright"> <a href="https://itunes.apple.com/us/genre/ios-finance/id6015?mt=8"><img src="/img/iph.png" onmouseover="this.src='/img/iphoneA.png'" onmouseout="this.src='/img/iph.png'"></a> <a href="https://play.google.com/store"><img src="/img/android.png" onmouseover="this.src='/img/androidA.png'" onmouseout="this.src='/img/android.png'"></a> <a href="http://www.windowsphone.com/nb-no/store"><img src="/img/win.png" onmouseover="this.src='/img/winA.png'" onmouseout="this.src='/img/win.png'"></a> +>>>>>>> a935f29043c48063839c5f139dbbde6817b213f6 </div> </div> </div> diff --git a/views/project.ejs b/views/project.ejs index 4bee9fd..e9978d5 100644 --- a/views/project.ejs +++ b/views/project.ejs @@ -35,7 +35,7 @@ Robert Joramo<br /> Dennis Eriksen<br /> Helene Apelort<br /> - <small><a href="/ppl">Legg til flere deltakere</a></small> + <small><a href="/project/fEyMe3/participants">Legg til flere deltakere</a></small> </div> </div> <div class="row-fluid"> |