aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--views/home.ejs77
-rw-r--r--views/test.ejs79
2 files changed, 78 insertions, 78 deletions
diff --git a/views/home.ejs b/views/home.ejs
index 0e2aa77..4031b27 100644
--- a/views/home.ejs
+++ b/views/home.ejs
@@ -1,5 +1,6 @@
<% include header %>
<link rel="stylesheet" href="/css/devanim.css">
+<link href="/css/divanim.css" rel="stylesheet" media="screen">
</head>
<body>
@@ -62,6 +63,82 @@
<div class="container">
<h1>Situasjon</h1>
</div>
+ <div class="anim view-3D set-speed zoom-large">
+ <div id="scene" class="scale-stretched">
+ <div id="situation" class="divid">
+ <div id="activity1" class="orbit">
+ <div class="pos">
+ <div class="object">
+ </div>
+ </div>
+ </div>
+ <div id="activity2" class="orbit">
+ <div class="pos">
+ <div class="object">
+ </div>
+ </div>
+ </div>
+ <div id="activity3" class="orbit">
+ <div class="pos">
+ <div class="orbit">
+ <div class="pos">
+ <div class="satelite">
+ </div>
+ </div>
+ </div>
+ <div class="object">
+ </div>
+ </div>
+ </div>
+ <div id="activity4" class="orbit">
+ <div class="pos">
+ <div class="object">
+ </div>
+ </div>
+ </div>
+ <div id="activity5" class="orbit">
+ <div class="pos">
+ <div class="object">
+ </div>
+ </div>
+ </div>
+ <div id="activity6" class="orbit">
+ <div class="pos">
+ <div class="object">
+ <div class="ring">
+ </div>
+ </div>
+ </div>
+ </div>
+ <div id="activity7" class="orbit">
+ <div class="pos">
+ <div class="object">
+ </div>
+ </div>
+ </div>
+ <div id="activity8" class="orbit">
+ <div class="pos">
+ <div class="object">
+ </div>
+ </div>
+ </div>
+ <div id="activity9" class="orbit">
+ <div class="pos">
+ <div class="object">
+ </div>
+ </div>
+ </div>
+ <div id="activity10" class="orbit">
+ <div class="pos">
+ <div class="object">
+ </div>
+ </div>
+ </div>
+ <div id="divid">
+ </div>
+ </div>
+ </div>
+ </div>
</div>
<div class="span12 content">
<div class="container">
diff --git a/views/test.ejs b/views/test.ejs
index e5df683..24e8989 100644
--- a/views/test.ejs
+++ b/views/test.ejs
@@ -1,5 +1,4 @@
<% include header %>
-<link href="/css/divanim.css" rel="stylesheet" media="screen">
</head>
<body>
@@ -24,83 +23,7 @@
================================================== -->
<div class="span9 content">
<section class="content">
- <div class="anim view-3D set-speed zoom-large">
- <div id="scene" class="scale-stretched">
- <div id="situation" class="divid">
- <div id="activity1" class="orbit">
- <div class="pos">
- <div class="object">
- </div>
- </div>
- </div>
- <div id="activity2" class="orbit">
- <div class="pos">
- <div class="object">
- </div>
- </div>
- </div>
- <div id="activity3" class="orbit">
- <div class="pos">
- <div class="orbit">
- <div class="pos">
- <div class="satelite">
- </div>
- </div>
- </div>
- <div class="object">
- </div>
- </div>
- </div>
- <div id="activity4" class="orbit">
- <div class="pos">
- <div class="object">
- </div>
- </div>
- </div>
- <div id="activity5" class="orbit">
- <div class="pos">
- <div class="object">
- </div>
- </div>
- </div>
- <div id="activity6" class="orbit">
- <div class="pos">
- <div class="object">
- <div class="ring">
- </div>
- </div>
- </div>
- </div>
- <div id="activity7" class="orbit">
- <div class="pos">
- <div class="object">
- </div>
- </div>
- </div>
- <div id="activity8" class="orbit">
- <div class="pos">
- <div class="object">
- </div>
- </div>
- </div>
- <div id="activity9" class="orbit">
- <div class="pos">
- <div class="object">
- </div>
- </div>
- </div>
- <div id="activity10" class="orbit">
- <div class="pos">
- <div class="object">
- </div>
- </div>
- </div>
- <div id="divid">
- </div>
- </div>
- </div>
- </div>
- <h1><%= title %></h1>
+ <h1><%= title %></h1>
<p>Velkommen til <%= title %></p>
<p>Her kommer det <em>kanskje</em> mer senere.</p>
</section>