Merge branch 'master' of https://git.wiai.de/server/landingpage

caddy.json

@@ -1,113 +1,120 @@
 [
 {"sitename":"wiai","sites":[
   {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://www.wiai.de/board",
     "name": "Forum"
   },
         {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://otrs.wiai.de/",
     "name": "OTRS"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://klausuren.wiai.de/",
     "name": "Klausuren"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://intern.wiai.de/extras/wiai.php",
     "name": "Mitglieder"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://survey.wiai.de/",
     "name": "Limesurvey"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://www.wiai.de/dashboard/",
     "name": "wiai.de"
   },
   
       {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://www.uni-bamberg.de/wiai/fs/",
     "name": "FS - Homepage"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://redmine.wiai.de/",
     "name": "Redmine"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://intern.wiai.de/list-pads/",
     "name": "Pad List"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://git.wiai.de",
     "name": "Git"
+  },
+  
+      {
+    "image": "pictures/platzhalter.jpg",
+    "button": "btn-primary",
+    "link": "https://pay.wiai.de/",
+    "name": "Strichliste"
   }
 ]  
 },
 
 {"sitename":"admin","sites":[
   {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://mailex.uni-bamberg.de",
     "name": "Email Account der Fachschaft"
   },
         {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "http://www.uni-bamberg.de/typo3",
     "name": "Typo3 der Uni-Hompage"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://phpmyadmin.wiai.de",
     "name": "PHPMyAdmin des Servers"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://survey.wiai.de/admin/",
     "name": "Limesurvey Login zur Administration"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://intern.wiai.de/extras/wiaikeys.php",
     "name": "Wiai-Schlüsselliste"
   },
   
       {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://intern.wiai.de/extras/sowikeys.php",
     "name": "Sowi-Schlüsselliste"
@@ -117,75 +124,75 @@
 
 {"sitename":"links","sites":[
   {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "http://www.uni-bamberg.de/",
     "name": "Otto-Friedrich-Universität"
   },
         {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "http://www.feki.de",
     "name": "Feki.de"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "http://www.uni-bamberg.de/leistungen/studium/online_dienste",
     "name": "Online Dienste"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://zul.zuv.uni-bamberg.de/FN2AUTH/FN2AuthServlet?op=Login",
     "name": "FlexNow2"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "http://vc.uni-bamberg.de/moodle",
     "name": "Virtueller Campus"
   },
         {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "http://www.uni-bamberg.de/auslandsamt",
     "name": "Akademisches Auslandsamt"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "http://univis.uni-bamberg.de/",
     "name": "Univis - Vorlesungsverzeichnis"
   },
 
       {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "http://www.uni-bamberg.de/service_einrichtungen/unibib",
     "name": "Bibliothek der Universität"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "http://mail.stud.uni-bamberg.de/",
     "name": "Mailserver für Studierende"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "http://www.studierendenvertretung-bamberg.de/",
     "name": "Studierendenvertretung"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "http://www.studentenwerk-wuerzburg.de/admin_open/upload/index.php?show=prev&loc=studentenhaus",
     "name": "Mensaplan"
@@ -195,27 +202,27 @@
 
 {"sitename":"sowi","sites":[
   {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://www.uni-bamberg.de/sowi/fs",
     "name": "SoWi Homepage"
   },
         {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://intern.wiai.de/extras/sowi.php",
     "name": "Mitglieder der Fachschaft SOWI"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://survey.wiai.de/",
     "name": "Limesurvey"
   },
   
     {
-    "image": "https://placehold.it/100x100",
+    "image": "pictures/platzhalter.jpg",
     "button": "btn-primary",
     "link": "https://intern.wiai.de/extras/sowikeys.php",
     "name": "Sowi-Schlüsselliste"

index.html

@@ -33,7 +33,9 @@
 <div class="container">
 
     <div class="jumbotron">
-         <h1>Fachschaft WIAI</h1>
+         <h1>Fachschaft WIAI
+		 <img src="pictures/fslogo.png" width="18%" height="auto" alt="Logo der Fachschaft">
+		 </h1>
          <p class="lead"></p>
     </div>
     <div class="container">