included flexslider & font_awesome libs, stylefixes, new background, facebook fixes
This commit is contained in:
parent
0fd4058df5
commit
8088166c0b
6
.gitmodules
vendored
6
.gitmodules
vendored
@ -1,3 +1,9 @@
|
||||
[submodule "lib/system"]
|
||||
path = lib/system
|
||||
url = git@mojotrollz.eu:webcraft/system.git
|
||||
[submodule "lib/font_awesome"]
|
||||
path = lib/font_awesome
|
||||
url = git@mojotrollz.eu:webcraft/lib_font_awesome.git
|
||||
[submodule "lib/flexslider"]
|
||||
path = lib/flexslider
|
||||
url = git@mojotrollz.eu:webcraft/host_flexslider.git
|
||||
|
||||
2
api.php
2
api.php
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
|
||||
require_once 'lib/autoload.inc'; //SYSTEM Classes
|
||||
require_once 'redestoff/autoload.inc'; //Project Classes
|
||||
require_once '/home/web/web/config/get_config.php';
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?php
|
||||
require_once 'lib/system/autoload.inc'; //SYSTEM Classes
|
||||
require_once 'lib/autoload.inc'; //SYSTEM Classes
|
||||
require_once 'redestoff/autoload.inc'; //Project Classes
|
||||
require_once '/home/web/web/config/get_config.php';
|
||||
|
||||
|
||||
3
lib/autoload.inc
Normal file
3
lib/autoload.inc
Normal file
@ -0,0 +1,3 @@
|
||||
<?php
|
||||
require_once dirname(__FILE__).'/system/autoload.inc';
|
||||
require_once dirname(__FILE__).'/font_awesome/autoload.inc';
|
||||
1
lib/flexslider
Submodule
1
lib/flexslider
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit c25a1106e6867bc3d738eeb2d9b908f85ffa5769
|
||||
1
lib/font_awesome
Submodule
1
lib/font_awesome
Submodule
@ -0,0 +1 @@
|
||||
Subproject commit 895ccfb0b94ee4c2242ea4dd211f24bc83f3eb53
|
||||
@ -1,6 +1,8 @@
|
||||
<?php
|
||||
class default_artist extends \SYSTEM\PAGE\Page {
|
||||
var $id = null;
|
||||
public static function js(){
|
||||
return array(\SYSTEM\WEBPATH(new PPAGE(),'default_artist/js/default_artist.js'));}
|
||||
public function __construct($id) {
|
||||
$this->id = $id;}
|
||||
|
||||
|
||||
3
redestoff/page/default_artist/js/default_artist.js
Normal file
3
redestoff/page/default_artist/js/default_artist.js
Normal file
@ -0,0 +1,3 @@
|
||||
function init_artist(){
|
||||
FB.XFBML.parse(document.getElementById('social-facebook'));
|
||||
}
|
||||
@ -10,9 +10,9 @@
|
||||
<h3>${artist_name}</h3>
|
||||
${artist_text}
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="col-md-4" style="text-align: right;">
|
||||
<div class="fb-page" data-href="https://www.facebook.com/${artist_fb}/" data-tabs="timeline" data-height="800" data-small-header="false" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true"><div class="fb-xfbml-parse-ignore"><blockquote cite="https://www.facebook.com/${artist_fb}/"><a href="https://www.facebook.com/${artist_fb}/">${artist_fb}</a></blockquote></div></div>
|
||||
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<hr style="color: white">
|
||||
|
||||
@ -2,6 +2,7 @@ body{
|
||||
font-size: 16pt;
|
||||
}
|
||||
nav{
|
||||
padding-left: 70px;
|
||||
background: none !important;
|
||||
border: 0 !important;
|
||||
}
|
||||
@ -12,6 +13,7 @@ nav{
|
||||
padding-left: 0 !important;
|
||||
}
|
||||
.dropdown-menu{
|
||||
|
||||
background: url(http://www.mojotrollz.eu/web/test/redestoff/redestoff/page/default_page/img/trans2.png);
|
||||
}
|
||||
.navbar .nav li.dropdown.open>.dropdown-toggle{
|
||||
@ -72,12 +74,12 @@ nav{
|
||||
}
|
||||
}
|
||||
h3{
|
||||
color: #500;
|
||||
color: #039;
|
||||
font-size: 19pt;
|
||||
}
|
||||
|
||||
p{
|
||||
color: #500;
|
||||
color: whitesmoke;
|
||||
}
|
||||
p:hover{
|
||||
color: whitesmoke;
|
||||
|
||||
BIN
redestoff/page/default_page/img/new_bg.gif
Normal file
BIN
redestoff/page/default_page/img/new_bg.gif
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 256 KiB |
@ -9,13 +9,20 @@
|
||||
${js}
|
||||
|
||||
</head>
|
||||
<body style="background: url(${IMG_PATH}bg.gif)no-repeat; background-size: cover; background-attachment: fixed">
|
||||
|
||||
<body style="background: url(${IMG_PATH}new_bg.gif)no-repeat; background-size: cover; background-attachment: fixed">
|
||||
<div id="fb-root"></div>
|
||||
<script>(function(d, s, id) {
|
||||
var js, fjs = d.getElementsByTagName(s)[0];
|
||||
if (d.getElementById(id)) return;
|
||||
js = d.createElement(s); js.id = id;
|
||||
js.src = "//connect.facebook.net/de_DE/sdk.js#xfbml=1&version=v2.5";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}(document, 'script', 'facebook-jssdk'));</script>
|
||||
<!--<div class="row" style="max-width: 1200px; margin: auto;">
|
||||
|
||||
|
||||
</div>-->
|
||||
<nav class="navbar navbar-default" style="max-width: 1200px; margin:0; margin: auto; padding-top: 20px;">
|
||||
<nav class="navbar navbar-default" style="max-width: 1200px; margin:0; padding-top: 20px;">
|
||||
<div class="container-fluid">
|
||||
<div class="navbar-header" style="">
|
||||
<button type="button" style="position: relative; background: #666666;" class="navbar-toggle" data-toggle="collapse" data-target="#myNavbar">
|
||||
@ -42,30 +49,28 @@
|
||||
<li data-toggle="collapse" data-target=".nav-collapse.in" id="shop_link" style="display: inline-block;"><a href="#!shop" class="nav_btn"><span class="glyphicon glyphicon-heart"></span> Merch</a></li>
|
||||
</ul>
|
||||
<ul class="nav navbar-nav pull-right">
|
||||
<div><a href="http://www.youtube.com/user/RedestoffMusik" target="_blank"><img src="${IMG_PATH}youtube_icon.png" width="60" /></a></div>
|
||||
</li>
|
||||
<li><img width="220" src="${IMG_PATH}sp.png" class="img-responsive"></li>
|
||||
<li><a href="http://www.youtube.com/user/RedestoffMusik" target="_blank"><i class="fa fa-facebook fa-lg"></i></a></li>
|
||||
<li><a href="http://www.youtube.com/user/RedestoffMusik" target="_blank"><i class="fa fa-youtube fa-lg"></i></a></li>
|
||||
|
||||
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
<div id="fb-root"></div>
|
||||
<script>(function(d, s, id) {
|
||||
var js, fjs = d.getElementsByTagName(s)[0];
|
||||
if (d.getElementById(id)) return;
|
||||
js = d.createElement(s); js.id = id;
|
||||
js.src = "//connect.facebook.net/de_DE/sdk.js#xfbml=1&version=v2.5";
|
||||
fjs.parentNode.insertBefore(js, fjs);
|
||||
}(document, 'script', 'facebook-jssdk'));</script>
|
||||
|
||||
|
||||
<div class="row" style="max-width: 1200px; margin:0; margin: auto; padding: 20px; padding-top: 0">
|
||||
<hr style="color: white">
|
||||
<div class="row" style="padding: 5px; margin: 0px; background: url(${IMG_PATH}trans2.png)">
|
||||
<div id="midframe" class="row" style="padding: 15px; margin: 0px; background: url(${IMG_PATH}trans2.png)"></div>
|
||||
|
||||
<div class="row" style="max-width: 1350px; margin:0; padding: 20px; padding-left: 70px; padding-top: 0">
|
||||
|
||||
<div class="row" style="padding: 20px; margin: 0px;">
|
||||
<hr style="color: white">
|
||||
<div id="midframe" class="row" style="margin: 0px;"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div id="footer" style="position: fixed; bottom: 0; text-align: right; width: 100%; background: url(${IMG_PATH}trans.png)">
|
||||
<div id="impressum_link"><a style="font-size: 0.7em;" href="#" >Impressum </a></div>
|
||||
<div id="impressum_link"><a style="font-size: 0.7em;" href="#!impressum" >Impressum </a></div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
function init_start(){
|
||||
|
||||
FB.XFBML.parse(document.getElementById('social-facebook'));
|
||||
}
|
||||
@ -1,9 +1,6 @@
|
||||
<div class="row">
|
||||
<div class="col-md-8">
|
||||
<div class="row">
|
||||
<img src="${IMG_PATH}sp.png" class="img-responsive">
|
||||
<hr style="color: white">
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
|
||||
@ -35,7 +32,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="col-md-4" style="text-align: right;">
|
||||
<div class="fb-page" data-href="https://www.facebook.com/Redestoff/" data-tabs="timeline" data-height="1000" data-small-header="true" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true"><div class="fb-xfbml-parse-ignore"><blockquote cite="https://www.facebook.com/Redestoff/"><a href="https://www.facebook.com/Redestoff/">Redestoff Musik</a></blockquote></div></div>
|
||||
<hr style="color:white;">
|
||||
</div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user