webcraftmedia/redestoffmusik.de
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of mojotrollz.eu:hosting

Browse Source 
Conflicts:
	Redestoffmusik/index.php
	Redestoffmusik/sai.php
This commit is contained in:
Naeltard 2014-06-03 16:39:11 +02:00
commit 9371ee18da
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.htaccess Normal file
View File

@ -0,0 +1,3 @@
RewriteEngine On
RewriteCond %{HTTP_HOST} !^www\.redestoffmusik\.de$ [NC]
RewriteRule ^(.*)$ http://www.redestoffmusik.de/$1 [R=301,L]

4
index.php
View File

@ -1,6 +1,6 @@
<?php
header('Access-Control-Allow-Origin: *');
require_once '../system/autoload.inc.php'; //SYSTEM Classes
require_once 'system/autoload.inc.php'; //SYSTEM Classes
require_once 'redestoff/autoload.inc.php'; //Project Classes
require_once 'config.php';

4
redestoff/page/default_page/redestoff.tpl
View File

@ -12,7 +12,7 @@
<img src="${IMG_PATH}redestoff_schrift.png" alt="redestoffmusik" style=""/>
</div>
<div class="hero-unit" style="margin-top: 10px; margin-left: 120px; padding: 0; margin-right: 120px; background-color: whitesmoke; background: url(${IMG_PATH}vid_leiste3.png);">
<div class="hero-unit" style="margin-top: 10px; margin-left: 120px; padding: 0; margin-right: 120px; width: 1360px; background-color: whitesmoke; background: url(${IMG_PATH}vid_leiste3.png);">
<!-- header -->
@ -50,7 +50,7 @@
<h3>WARNUNG!</h3>
<p>Die hier zum Download angebotene Musik kann Eskalation, Aufstand und exzessiven Alkoholkonsum verursachen. Redestoff übernimmt keinerlei Verantwortung oder Haftung für Schäden, die mit dem Konsum der Musik in Verbindung stehen. </p>
</div>
<div class="span4" style="padding-top: 35px; padding-left: 35px;">
<div class="span4" style="padding-top: 23px; padding-left: 36px;">
<iframe width="570" height="320" src="http://www.youtube.com/embed/kpavxOgpNkY?rel=0" frameborder="0" ></iframe>
</div>
</div>

3
sai.php
View File

@ -1,6 +1,5 @@
<?php
header('Access-Control-Allow-Origin: *');
require_once '../system/autoload.inc.php'; //SYSTEM Classes
require_once 'system/autoload.inc.php'; //SYSTEM Classes
require_once 'redestoff/autoload.inc.php'; //Project Classes
require_once 'config.php'; //Server config