FAQ prop added, ABOUT with funny credits extension, scroling Testvers…

…ion Disclaimer, Background removed

README.md

@@ -3,28 +3,31 @@ hmmm
 
 Course-Organization-Platform built with [Meteor.js](http://meteor.com) 
 
-- Concept description: [news.schuel.ch](news.schuel.ch)
-- Demo: [hmmm.schuel.ch](hmmm.schuel.ch)
-- Contact: schueldev_ät_lists.xiala.net
+- Concept description: [news.schuel.ch](news.schuel.ch "our blog")
+- Demo: [hmmm.schuel.ch](hmmm.schuel.ch "runing here")
+- Contact: [schueldev_ät_lists.xiala.net](mailto:schueldev_ät_lists.xiala.net "write us")
 
-# Features
-- voting system
+## Features
+- voting system / fix a date schedule
 - dicussion board
 - hierarcical categories
 - simple chat
 
-# Coming sooner or later
+## Coming sooner or later
 - email notification
-- advanced search autocompletion 
+- progressindicator
+- advanced search autocompletion with full-text search
 - privat messages
+- privacy/security
+- file upload
 
-# Installation
+## Installation
 - Install [Meteor](http://meteor.com) and components
-'$ curl https://install.meteor.com | sh'
-'$ sudo apt-get install npm nodejs'
-'$ sudo npm install -g n'
-'$ sudo n 0.10.12'
-'$ sudo npm install -g meteorite'
+    - ` curl https://install.meteor.com | sh`
+    - ` apt-get install npm nodejs`
+    - ` npm install -g n`
+    - ` n 0.10.12`
+    - ` npm install -g meteorite`
 - Download or clone Hmmm into /some/path
 - cd /some/path
 - Run `mrt`

client/css/screen.css

@@ -12,32 +12,49 @@ body {
     -moz-user-select: none;
     -o-user-select: none;
     user-select: none;
-
+/*
+    background-image: url('/AchtungTestseite_01.gif');
+    background-position: -20px -20px;
+*/
+}
+    /*
     background-image: url(http://news.schuel.ch/wp-content/uploads/2013/07/AchtungTestseite_01.gif);
-
-    /*background-image: url(http://www.changethethought.com/wp-content/tumblr_lad3eouzez1qzt4vjo1_500.gif);
+    background-image: url(http://www.changethethought.com/wp-content/tumblr_lad3eouzez1qzt4vjo1_500.gif);
     */
 
-}
-
 b{font-weight: bold}
 
 div{
 
-margin-top: 35px;
+margin-top: 25px;
 }
 
 p{
 margin: 15px;	
 }
 
+.static_content {
+    clear: none;
+    position: relative;
+    left: 160px;
+    top: -20px;
+    width: 35em;
+    font-size: 0.95em;
+
+    /*
+    font-family: Arial,Helvetica,sans-serif;
+    
+    line-height: 1em;
+    */
+  }
+
 #container{
     background-color:rgba(255, 255, 255, 0.95);
     position:absolute;
     top:0px;
     left: 30px;
-    right: 30px;
-    bottom:50px;
+    right: 50px;
+    bottom:40px;
 
 }
 
@@ -51,13 +68,13 @@ margin: 15px;
 
 #login {
     position: absolute;
-    right: 2px;
-    top: 5px;
+    right: 20px;
+    top: -25px;
 }
 
 #login_info {
 	position: absolute;
-	top: -35px;
+	top: -50px;
 	left: 0px;
 	right: 0px;
 	width:100%;

client/main.js

@@ -4,7 +4,6 @@
 
 // allgemeine praktische funktionen
 
-
 Template.maincontent.route_is = function (data,options) {
 // strube funktion, die irgendwas macht, aber es tut
 // macht, dass das routing im template "maincontent" funtkioniert
@@ -13,6 +12,3 @@ Template.maincontent.route_is = function (data,options) {
     }
     return options.inverse( this );
 };
-
-
-

client/views/login/login.html

@@ -27,5 +27,9 @@
       </form> /
       <input type="button" class="show_login" value="Login" />
     {{/if}}
-  {{/if}} 
+  {{/if}}
+<marquee hspace = "30" width = "270" bgcolor = "000000" direction="left" scrollamount="5" scrolldelay="1">
+Achtung: Dies ist nur eine <b>Testseite</b>. Daten werden regelmässig gelöscht.  
+&nbsp; &nbsp; &nbsp; &nbsp; &nbsp;This is only a <b>Testpage</b>. Data will be erased regularly.
+</marquee>
 </template> 

client/views/main.html

@@ -23,10 +23,9 @@
 	<span><a href="/">Home</a>  </span>
 	<span><a href="/courselist/">Kursliste</a>  </span>
 	<span><a href="/locations/">Räume</a>  </span>
-  <span><a href="/categorylist/">Kategorien</a>  </span>
-	<span><a href="/page/warum">Warum</a>  </span>      
+  <span><a href="/categorylist/">Kategorien</a>  </span>  
 	<span><a href="/page/about">About</a>  </span>
-	<span><a href="/page/links">Funny Links</a>  </span>
+	<span><a href="/page/FAQ">FAQ</a>  </span>
 	<span><a href="/profile/">Mein Profil</a>  </span>
 </template>
 
@@ -67,15 +66,10 @@
       {{> about}}
     {{/route_is}}
 
-    {{#route_is "warum"}}
-             waruum
+    {{#route_is "FAQ"}}
+      {{> FAQ}}
     {{/route_is}}
-
-    {{#route_is "links"}}
-             yaaaah
-    {{/route_is}}
-
-
+
     {{#route_is "profile"}}
     	{{> profile}}
     {{/route_is}}