From 44870defdcddbfceede437950fd9e3342f84ebf0 Mon Sep 17 00:00:00 2001
From: Horus3
Date: Tue, 28 Oct 2014 23:47:28 +0100
Subject: Added experimental CDN support.

---
 static/footer.php               |  2 +-
 static/header.php               | 24 ++++++++++++------------
 static/modal-delete-gallery.php |  2 +-
 static/modal-edit-gallery.php   |  2 +-
 static/modal-new-gallery.html   | 40 ----------------------------------------
 static/modal-new-gallery.php    | 40 ++++++++++++++++++++++++++++++++++++++++
 6 files changed, 55 insertions(+), 55 deletions(-)
 delete mode 100644 static/modal-new-gallery.html
 create mode 100644 static/modal-new-gallery.php

(limited to 'static')

diff --git a/static/footer.php b/static/footer.php
index 7c05018..f797d86 100755
--- a/static/footer.php
+++ b/static/footer.php
@@ -16,4 +16,4 @@
 		<script src="//code.jquery.com/jquery-1.11.1.min.js"></script>
 		<script src="//code.jquery.com/ui/1.11.1/jquery-ui.min.js" defer></script>
 		<script src="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/js/bootstrap.min.js" defer></script>
-		<script src="/js/functions.js" defer></script>
+		<script src="<?php echo CDN; ?>js/functions.js" defer></script>
diff --git a/static/header.php b/static/header.php
index 69a9c4b..824d4c1 100644
--- a/static/header.php
+++ b/static/header.php
@@ -7,20 +7,20 @@
                                         <span class="icon-bar"></span>
                                         <span class="icon-bar"></span>
                                 </button>
-                                <a class="navbar-brand effect" href="/?page=index" title="Startseite"><span class="glyphicon glyphicon-home"></span> Home</a>
+                                <a class="navbar-brand effect" href="<?php echo DOMAIN; ?>?page=index" title="Startseite"><span class="glyphicon glyphicon-home"></span> Home</a>
                         </div>
 <div class="collapse navbar-collapse" id="navbarCollapse">
                                 <ul class="nav navbar-nav navbar-left effect">
 					<li>
-						<!--a href="/?page=foto" title="Übersicht über alle Fotogalerien"><span class="fa fa-camera"></span> Bilder</a-->
-						<a href="/?page=foto" title="Übersicht über alle Fotogalerien"><span class="glyphicon glyphicon-picture"></span> Bilder</a>
+						<!--a href="<?php echo DOMAIN; ?>?page=foto" title="Übersicht über alle Fotogalerien"><span class="fa fa-camera"></span> Bilder</a-->
+						<a href="<?php echo DOMAIN; ?>?page=foto" title="Übersicht über alle Fotogalerien"><span class="glyphicon glyphicon-picture"></span> Bilder</a>
 					</li>
                                         <li class="dropdown">
-                                                <a href="/?page=liste" title="Liste aller JG-Mitglieder"><span class="glyphicon glyphicon-th-list"></span> Adressen <span class="caret"></span></a>
+                                                <a href="<?php echo DOMAIN; ?>?page=liste" title="Liste aller JG-Mitglieder"><span class="glyphicon glyphicon-th-list"></span> Adressen <span class="caret"></span></a>
 						<ul class="dropdown-menu" role="menu">
-							<li><a href="/?page=download&task=download&type=plain" title="Download: text/plain"><span class="glyphicon glyphicon-download"></span> Download als Text</a></li>
-							<!--li><a href="/?page=download&task=download&type=csv" title="Download: text/csv"><span class="glyphicon glyphicon-arrow-down"></span> Download als CSV</a></li-->
-							<li><a href="/?page=download&task=download&type=csv" title="Download: text/csv"><span class="fa fa-download"></span> Download als CSV</a></li>
+							<li><a href="<?php echo DOMAIN; ?>?page=download&task=download&type=plain" title="Download: text/plain"><span class="glyphicon glyphicon-download"></span> Download als Text</a></li>
+							<!--li><a href="<?php echo DOMAIN; ?>?page=download&task=download&type=csv" title="Download: text/csv"><span class="glyphicon glyphicon-arrow-down"></span> Download als CSV</a></li-->
+							<li><a href="<?php echo DOMAIN; ?>?page=download&task=download&type=csv" title="Download: text/csv"><span class="fa fa-download"></span> Download als CSV</a></li>
 						</ul>
                                         </li>
 					<li>
@@ -44,25 +44,25 @@
 							$_title = "Einloggen, registrieren, Profil";
 						}
 						?>
-                                                <a href="/?page=account" title="<?php echo $_title; ?>"><span class="glyphicon glyphicon-user"></span> <?php echo $_name; ?> <span class="caret"></span></a>
+                                                <a href="<?php echo DOMAIN; ?>?page=account" title="<?php echo $_title; ?>"><span class="glyphicon glyphicon-user"></span> <?php echo $_name; ?> <span class="caret"></span></a>
 						<ul class="dropdown-menu" role="menu">
 							<li>
 						<?php
 						if ( $user->isLoggedIn() ) {
 						?>
-                                                	<a href="/?page=account" title="Ändere dein Passwort"><span class="glyphicon glyphicon-user"></span> Profil</a>
+                                                	<a href="<?php echo DOMAIN; ?>?page=account" title="Ändere dein Passwort"><span class="glyphicon glyphicon-user"></span> Profil</a>
 							</li>
 							<li class="divider"></li>
 							<li>
-							<a href="/?page=logout" title="Beende die Session"><span class="glyphicon glyphicon-off"></span> Logout</a>
+							<a href="<?php echo DOMAIN; ?>?page=logout" title="Beende die Session"><span class="glyphicon glyphicon-off"></span> Logout</a>
 						<?php
 						} else  {
 						?>
-                                               		<a href="/?page=register&goto=index" title="Registriere dich für unbeschränkten Zugang"><span class="glyphicon glyphicon-share-alt"></span> Register</a>
+                                               		<a href="<?php echo DOMAIN; ?>?page=register&goto=index" title="Registriere dich für unbeschränkten Zugang"><span class="glyphicon glyphicon-share-alt"></span> Register</a>
 							</li>
 							<li class="divider"></li>
 							<li>
-							<a href="/?page=login&goto=index" title="Login"><span class="glyphicon glyphicon-log-in"></span> Login</a>
+							<a href="<?php echo DOMAIN; ?>?page=login&goto=index" title="Login"><span class="glyphicon glyphicon-log-in"></span> Login</a>
 						<?php
 						}
 						?>
diff --git a/static/modal-delete-gallery.php b/static/modal-delete-gallery.php
index 74471ac..df16d76 100644
--- a/static/modal-delete-gallery.php
+++ b/static/modal-delete-gallery.php
@@ -1,5 +1,5 @@
 <!-- Modal -->
-<form class="form-horizontal" method="POST" action="/?page=action&task=deleteGallery&gallery=<?php echo htmlentities($_SESSION['gallery']); ?>">
+<form class="form-horizontal" method="POST" action="<?php echo DOMAIN; ?>?page=action&task=deleteGallery&gallery=<?php echo htmlentities($_SESSION['gallery']); ?>">
 <div class="modal fade" id="modal-delete-gallery" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
diff --git a/static/modal-edit-gallery.php b/static/modal-edit-gallery.php
index d16e580..d44348c 100644
--- a/static/modal-edit-gallery.php
+++ b/static/modal-edit-gallery.php
@@ -1,5 +1,5 @@
 <!-- Modal -->
-<form class="form-horizontal" method="POST" action="/?page=action&amp;task=editGallery&amp;gallery=<?php echo htmlentities($_SESSION['gallery']); ?>">
+<form class="form-horizontal" method="POST" action="<?php echo DOMAIN; ?>?page=action&amp;task=editGallery&amp;gallery=<?php echo htmlentities($_SESSION['gallery']); ?>">
 <div class="modal fade" id="modal-edit-gallery" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
   <div class="modal-dialog">
     <div class="modal-content">
diff --git a/static/modal-new-gallery.html b/static/modal-new-gallery.html
deleted file mode 100644
index 3d0b3f9..0000000
--- a/static/modal-new-gallery.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<!-- Modal -->
-<form class="form-horizontal" method="POST" action="/?page=action&task=gallery">
-<div class="modal fade" id="modal-new-gallery" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-        <h4 class="modal-title" id="myModalLabel">Erstelle eine neue Galerie</h4>
-      </div>
-      <div class="modal-body">
-<fieldset>
-
-<!-- Text input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="name">Galerie Name</label>  
-  <div class="col-md-6">
-  <input id="name" name="name" placeholder="Wie heißt die neue Fotogalerie? (Pflicht)" class="form-control input-md" required="" type="text">
-    
-  </div>
-</div>
-
-<!-- Text input-->
-<div class="form-group">
-  <label class="col-md-4 control-label" for="desc">Beschreibung</label>  
-  <div class="col-md-6">
-  <input id="desc" name="desc" placeholder="Kurze Zusammenfassung. (Pflicht)" class="form-control input-md" required="" type="text">
-    
-  </div>
-</div>
-
-</fieldset>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">Schließen</button>
-        <button id="btn-send" type="submit" class="btn btn-primary" data-loading-text="Lade...">Erstellen</button>
-      </div>
-    </div>
-  </div>
-</div>
-</form>
diff --git a/static/modal-new-gallery.php b/static/modal-new-gallery.php
new file mode 100644
index 0000000..cf3f892
--- /dev/null
+++ b/static/modal-new-gallery.php
@@ -0,0 +1,40 @@
+<!-- Modal -->
+<form class="form-horizontal" method="POST" action="<?php echo DOMAIN; ?>?page=action&task=gallery">
+<div class="modal fade" id="modal-new-gallery" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
+        <h4 class="modal-title" id="myModalLabel">Erstelle eine neue Galerie</h4>
+      </div>
+      <div class="modal-body">
+<fieldset>
+
+<!-- Text input-->
+<div class="form-group">
+  <label class="col-md-4 control-label" for="name">Galerie Name</label>  
+  <div class="col-md-6">
+  <input id="name" name="name" placeholder="Wie heißt die neue Fotogalerie? (Pflicht)" class="form-control input-md" required="" type="text">
+    
+  </div>
+</div>
+
+<!-- Text input-->
+<div class="form-group">
+  <label class="col-md-4 control-label" for="desc">Beschreibung</label>  
+  <div class="col-md-6">
+  <input id="desc" name="desc" placeholder="Kurze Zusammenfassung. (Pflicht)" class="form-control input-md" required="" type="text">
+    
+  </div>
+</div>
+
+</fieldset>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Schließen</button>
+        <button id="btn-send" type="submit" class="btn btn-primary" data-loading-text="Lade...">Erstellen</button>
+      </div>
+    </div>
+  </div>
+</div>
+</form>
-- 
cgit v1.2.3