Merge branch 'master' of git://git.neuf.no/inside

inside/Page.php

@@ -91,10 +91,6 @@ class Page {
 
     //Determine what page to display
       switch ($this->page) {
-        case "welcome":
-        $this->_displayWelcome();
-        break;
-
         case "home":
         $this->_displayHome();
         break;
@@ -582,26 +578,12 @@ class Page {
     $nav->display();
   }
 
-  public
-  function _displayWelcome(){
-    print "<p>Velkommen til Studentersamfundets intranett.</p>\n";
-  }
-
   public
   function _displayHome(){
     $user = new User(getCurrentUser());
 ?>
   <div class="text-column">
 
-    <div class="panel panel-default">
-      <div class="panel-heading">
-        <h3>Velkommen til Studentersamfundets medlemssider!</h3>
-      </div>
-      <div class="panel-body">
-        <p>Du er logget inn som <strong><?php print getCurrentUserName(); ?></strong>.</p>
-      </div>
-    </div>
-
     <?=$user->membershipStatus()?>
 
 <?php