cleanup text, div structure

This commit is contained in:
Ulf Gebhardt 2016-01-04 04:23:52 +01:00
parent 68959fdcff
commit d6ce8f6219
13 changed files with 120 additions and 134 deletions

View File

@ -5,9 +5,7 @@ class default_article extends \SYSTEM\PAGE\Page {
$this->id = $id;}
public function html(){
$element = \SYSTEM\PAGE\text::get_adv($this->id);
$element['published'] = date_format(new DateTime($element['time_create']), 'H:i d-m-Y');
$element['ago'] = \SYSTEM\time::time_ago_string(strtotime($element['time_create']));
$element = array('text' => \SYSTEM\PAGE\text::get($this->id));
$element = array_merge($element,\SYSTEM\PAGE\text::tag('time'));
return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_article/tpl/article.tpl'), $element);
}

View File

@ -1,15 +1,8 @@
<div class="row-fluid">
<div class="col-md-12 mojotrollz_col mojotrollz_col_content">
<div class="list_element" text_id="${id}" style="text-align: justify;">
<p style="float: left; font-size: 10pt; margin-top: 7px;">Author: <i>${author_name}</i></p>
<p style="float: right; font-size: 10pt; margin-top: 7px;">${ago}</p>
<div style="clear: both;"></div>
<div style="border-top: solid 1px black; width: 100%;"></div>
${text}
<p style="float: right; font-size: 10pt; margin-top: 7px;">Published: ${published}</p>
</div>
<br>
<button class="btn btn-primary" onclick="system.back();">zurück</button>
<br>
</div>
<div class="mojotrollz_col_content">
<br>
${text}
<br>
<br>
<button class="btn btn-primary" onclick="system.back();">zurück</button>
<br>
</div>

View File

@ -1,16 +1,14 @@
<div class="row-fluid">
<div class="col-md-12 mojotrollz_col mojotrollz_col_content">
<div class="row">
<div class="col-md-8">
<h2>Mojotrollz Beta</h2>
${invalid_key}
</div>
<div class="col-md-8">
${mojotrollz_progressive}
</div>
<div class="col-md-4">
${beta_area}
</div>
<div class="mojotrollz_col_content">
<div class="row">
<div class="col-md-8">
<h2>Mojotrollz Beta</h2>
${invalid_key}
</div>
<div class="col-md-8">
${mojotrollz_progressive}
</div>
<div class="col-md-4">
${beta_area}
</div>
</div>
</div>

View File

@ -70,13 +70,12 @@ mojotrollz_download_first{
#content_home{}
#content_teamspeak{
}
#content_teamspeak{}
.mojotrollz_col_content{
padding-left: 50px;
padding-right: 50px;
padding-bottom: 15px;
padding-left: 35px;
padding-right: 35px;
padding-bottom: 25px;
}
.ontop{

View File

@ -49,7 +49,7 @@
<ul class="nav navbar-nav navbar-left">
<li class="active ontop"><a href="#content_home">${mojotrollz_mojotrollz}</a></li>
<li class="ontop"><a href="#content_servers">${mojotrollz_servers}</a></li>
<li class="ontop"><a href="#!beta">BETA !</a></li>
<li class="ontop"><a href="#!beta">${mojotrollz_beta}</a></li>
<!--<li><a href="#content_tshirts" onClick="">${mojotrollz_tshirts}</a></li>-->
<!--<li><a href="#content_addons">${mojotrollz_addons}</a></li>-->
</ul>
@ -75,14 +75,17 @@
</div>
</div>
<!-- Content -->
<div id="content"></div>
<div class="row-fluid">
<div id="content" class="col-md-12 mojotrollz_col">
</div>
</div>
<!-- Content More -->
<div class="row-fluid">
<div id="content_more" class="col-md-12">
<div class="col-md-4">
<a href="#content_home">${mojotrollz_mojotrollz}</a><br><br>
<a href="#content_servers">${mojotrollz_servers}</a><br><br>
<a href="#!beta">BETA !</a><br><br>
<a href="#!beta">${mojotrollz_beta}</a><br><br>
<!--<a href="#content_tshirts">${mojotrollz_tshirts}</a><br><br>-->
<!--<a href="#content_addons">${mojotrollz_addons}</a><br><br>-->
</div>

View File

@ -1,5 +1,5 @@
<hr>
<h3>${mojotrollz_servers}</h3>
<hr style="width: 100%;">
${mojotrollz_servers_text}
<table class="mojotrollz_table">
<tr>
<th class="col-md-2" style="padding: 0;">${basic_name}</th>

View File

@ -6,8 +6,6 @@ class default_start extends \SYSTEM\PAGE\Page {
public function html(){
$vars = array();
$vars['content_client'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_client.tpl'));
$vars['content_server'] = \SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_server.tpl'));
$vars['content_tshirt'] = '';//\SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_tshirt.tpl'));
$vars['content_addons'] = '';//\SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_start/tpl/content_addons.tpl'));

View File

@ -1,17 +1,15 @@
<div class="row-fluid">
<div id="content_addons" class="col-md-12 mojotrollz_col mojotrollz_col_content">
<hr>
<h3>${mojotrollz_addons}</h3>
<table style="width: 100%;" class="mojotrollz_table">
<tr>
<th class="col-md-2" style="padding: 0;">Name</th>
<th class="col-md-1" style="padding: 0;">Version</th>
<th class="col-md-6" style="padding: 0;">Description</th>
<th class="col-md-1" style="padding: 0;">Download</th>
<th class="col-md-1"></th>
<th class="col-md-1"></th>
</tr>
${addon_list}
</table>
</div>
<div id="content_addons" class="mojotrollz_col_content">
<hr>
<h3>${mojotrollz_addons}</h3>
<table style="width: 100%;" class="mojotrollz_table">
<tr>
<th class="col-md-2" style="padding: 0;">Name</th>
<th class="col-md-1" style="padding: 0;">Version</th>
<th class="col-md-6" style="padding: 0;">Description</th>
<th class="col-md-1" style="padding: 0;">Download</th>
<th class="col-md-1"></th>
<th class="col-md-1"></th>
</tr>
${addon_list}
</table>
</div>

View File

@ -1,64 +0,0 @@
<div class="row-fluid">
<div id="content_client" class="col-md-12 mojotrollz_col">
<h3 style="padding-left: 35px;">DOWNLOAD WOW CLIENTS 1.12.1 CLASSIC, 2.4.3 TBC, 3.3.5a WOTLK</h3>
<div class="col-md-3 mojotrollz_download_first">
<a href="${link_wow_1_12_1}">
<div class="mojotrollz_download_text">
<img class="mojotrollz_download_img" data-pyroimage="true" src="./api.php?call=files&amp;cat=content&amp;id=wow_1_12_1.png" alt="Windows" height="44" width="44"/>
<div><a href="${link_wow_1_12_1}">${mojotrollz_wow_1_12_1}</a></div>
<div class="mojotrollz_download_subtext">${mojotrollz_download_qbittorrent}</div>
</div>
</a>
</div>
<div class="col-md-3 mojotrollz_download">
<a href="${link_wow_2_4_3}">
<div class="mojotrollz_download_text">
<img class="mojotrollz_download_img" data-pyroimage="true" src="./api.php?call=files&amp;cat=content&amp;id=wow_2_4_3.png" alt="Windows" height="44" width="44"/>
<div><a href="${link_wow_2_4_3}">${mojotrollz_wow_2_4_3}</a></div>
<div class="mojotrollz_download_subtext">${mojotrollz_download_qbittorrent}</div>
</div>
</a>
</div>
<div class="col-md-3 mojotrollz_download">
<a href="${link_wow_3_3_5a}">
<div class="mojotrollz_download_text">
<img class="mojotrollz_download_img" data-pyroimage="true" src="./api.php?call=files&amp;cat=content&amp;id=wow_3_3_5a.png" alt="Windows" height="44" width="44"/>
<div><a href="${link_wow_3_3_5a}">${mojotrollz_wow_3_3_5a}</a></div>
<div class="mojotrollz_download_subtext">${mojotrollz_download_qbittorrent}</div>
</div>
</a>
</div>
<div class="col-md-3 mojotrollz_download">
<a href="${link_ts3}">
<div class="mojotrollz_download_text">
<img class="mojotrollz_download_img" data-pyroimage="true" src="./api.php?call=files&amp;cat=content&amp;id=ts.png" alt="Windows" height="44" width="44"/>
<div><a href="${link_ts3}">${mojotrollz_teamspeak3}</a></div>
<div class="mojotrollz_download_subtext">${mojotrollz_connect_ts}</div>
</div>
</a>
</div>
</div>
<div id="content_teamspeak" class="col-md-12 mojotrollz_col">
<div style="padding-left: 35px; padding-top: 25px;" class="col-md-9">
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- mojotrollz -->
<ins class="adsbygoogle"
style="display:inline-block;width:728px;height:90px"
data-ad-client="ca-pub-3504070649672819"
data-ad-slot="2848666885"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
</div>
<div class="col-md-3">
<h3>
<b>${ts_players}</b> ${mojotrollz_players_online}
<br><br>
<button type="submit" class="btn-lg btn btn-success" onClick="location.href='ts3server://mojotrollz.eu'">
<span class="glyphicon glyphicon-globe" aria-hidden="true"></span>
&nbsp;&nbsp;${basic_connect}
</button>
</h3>
</div>
</div>
</div>

View File

@ -1,3 +0,0 @@
<div class="row-fluid">
<div id="content_servers" class="col-md-12 mojotrollz_col mojotrollz_col_content"></div>
</div>

View File

@ -1,6 +1,4 @@
<div class="row-fluid">
<div id="content_tshirts" class="col-md-12 mojotrollz_col mojotrollz_col_content">
<hr>
<h3>${mojotrollz_tshirts}</h3>
</div>
<div id="content_tshirts" class="mojotrollz_col_content">
<hr>
<h3>${mojotrollz_tshirts}</h3>
</div>

View File

@ -1,4 +1,65 @@
${content_client}
${content_server}
<div id="content_client">
${mojotrollz_client_text}
<div class="col-md-3 mojotrollz_download_first">
<a href="${link_wow_1_12_1}">
<div class="mojotrollz_download_text">
<img class="mojotrollz_download_img" data-pyroimage="true" src="./api.php?call=files&amp;cat=content&amp;id=wow_1_12_1.png" alt="Windows" height="44" width="44"/>
<div><a href="${link_wow_1_12_1}">${mojotrollz_wow_1_12_1}</a></div>
<div class="mojotrollz_download_subtext">${mojotrollz_download_qbittorrent}</div>
</div>
</a>
</div>
<div class="col-md-3 mojotrollz_download">
<a href="${link_wow_2_4_3}">
<div class="mojotrollz_download_text">
<img class="mojotrollz_download_img" data-pyroimage="true" src="./api.php?call=files&amp;cat=content&amp;id=wow_2_4_3.png" alt="Windows" height="44" width="44"/>
<div><a href="${link_wow_2_4_3}">${mojotrollz_wow_2_4_3}</a></div>
<div class="mojotrollz_download_subtext">${mojotrollz_download_qbittorrent}</div>
</div>
</a>
</div>
<div class="col-md-3 mojotrollz_download">
<a href="${link_wow_3_3_5a}">
<div class="mojotrollz_download_text">
<img class="mojotrollz_download_img" data-pyroimage="true" src="./api.php?call=files&amp;cat=content&amp;id=wow_3_3_5a.png" alt="Windows" height="44" width="44"/>
<div><a href="${link_wow_3_3_5a}">${mojotrollz_wow_3_3_5a}</a></div>
<div class="mojotrollz_download_subtext">${mojotrollz_download_qbittorrent}</div>
</div>
</a>
</div>
<div class="col-md-3 mojotrollz_download">
<a href="${link_ts3}">
<div class="mojotrollz_download_text">
<img class="mojotrollz_download_img" data-pyroimage="true" src="./api.php?call=files&amp;cat=content&amp;id=ts.png" alt="Windows" height="44" width="44"/>
<div><a href="${link_ts3}">${mojotrollz_teamspeak3}</a></div>
<div class="mojotrollz_download_subtext">${mojotrollz_connect_ts}</div>
</div>
</a>
</div>
</div>
<div id="content_teamspeak">
<div style="padding-left: 35px; padding-top: 25px;" class="col-md-9">
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
<!-- mojotrollz -->
<ins class="adsbygoogle"
style="display:inline-block;width:728px;height:90px"
data-ad-client="ca-pub-3504070649672819"
data-ad-slot="2848666885"></ins>
<script>
(adsbygoogle = window.adsbygoogle || []).push({});
</script>
</div>
<div class="col-md-3" style="text-align: right; padding-right: 35px;">
<h3>
<b>${ts_players}</b> ${mojotrollz_players_online}
<button style="margin-top: 20px; width: 80%;" type="submit" class="btn-lg btn btn-success" onClick="location.href='ts3server://mojotrollz.eu'">
<span class="glyphicon glyphicon-globe" aria-hidden="true"></span>
&nbsp;&nbsp;${basic_connect}
</button>
</h3>
</div>
</div>
<div id="content_servers" class="mojotrollz_col_content"></div>
${content_tshirt}
${content_addons}

File diff suppressed because one or more lines are too long