various late commits

system ajax for google: first prototype working
js optimization
This commit is contained in:
Naeltard 2015-01-29 01:11:04 +01:00
parent 9cac37ded0
commit 495a7867f9
7 changed files with 22 additions and 19 deletions

View File

@ -9,5 +9,5 @@ require_once 'config.php';
\SYSTEM\system::register_errorhandler_dbwriter();
\SYSTEM\system::register_errorhandler_jsonoutput();
echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_neopolimatrix', array_merge($_POST,$_GET), 1, false, true)->html();
echo \SYSTEM\API\api::run('\SYSTEM\API\verify', 'page_neopolimatrix', array_merge($_POST,$_GET), 1, true, true)->html();
new \SYSTEM\LOG\COUNTER("Page was called sucessfully.");

View File

@ -35,7 +35,7 @@ class default_list extends \SYSTEM\PAGE\Page {
private function switch_list_title($filter){
switch($filter){
case 1:
return 'Neuheiten - Hier erscheinen alle neuen Artikel auf dem Blog';
return 'Neuheiten';
case 2:
return 'Überwachungsstaat';
case 3:

View File

@ -1,2 +1,5 @@
<div style="width: 750px; margin: auto; margin-bottom: 50px; padding: 20px; text-align: left;"><h4>${title}</h4></div>
<div style="width: 750px; margin: auto; padding-top: 5px;">
<h3><b>${title}</b></h3>
<hr>
</div>
${list}

View File

@ -1,5 +1,5 @@
$(document).ready(function() {
new SYSTEM('./api.php',1,'start;filter.8');
new SYSTEM('./api.php',1,'start;filter.1');
tabs();
impressum();
search();

View File

@ -31,30 +31,27 @@
<div style="position: absolute; right: 0; top: 30; text-align: left; width: 350px;">
<div class="fb-like" data-href="https://www.neopolimatrix.eu/" data-layout="standard" data-action="like" data-show-faces="true" data-share="true"></div>
<a href="http://www.mojotrollz.eu/web/Neopolimatrix">Blog</a>&nbsp;&nbsp;
<a href="#" id="btn_impressum">Impressum</a>
<a href="#!impressum" id="btn_impressum">Impressum</a>
</div>
</div>
</div>
<div style="clear: both;"></div>
<div class="tabbable" style="margin-bottom: 20px;">
<p style="padding-top: 10px; font-size: 13pt; margin-right: 30px; margin-left: 7px; float: left;">Nach Themen</p>
<ul class="nav nav-tabs" id="tabs_user_list">
<li class="active"><a href="#start;filter.1" filter="1">Neu</a></li>
<li><a href="#start;filter.7" filter="7">Serie: FoF</a></li>
<li><a href="#start;filter.6" filter="6">Demokratie</a></li>
<li><a href="#start;filter.2" filter="2">Überwachung</a></li>
<li><a href="#start;filter.3" filter="3">Ungleichheit</a></li>
<li><a href="#start;filter.4" filter="4">Korruption</a></li>
<li><a href="#start;filter.5" filter="5">Polizei</a></li>
<li class="active"><a href="#!start;filter.1" filter="1">Neu</a></li>
<li><a href="#!start;filter.7" filter="7">Serie: FoF</a></li>
<li><a href="#!start;filter.6" filter="6">Demokratie</a></li>
<li><a href="#!start;filter.2" filter="2">Überwachung</a></li>
<li><a href="#!start;filter.3" filter="3">Ungleichheit</a></li>
<li><a href="#!start;filter.4" filter="4">Korruption</a></li>
<li><a href="#!start;filter.5" filter="5">Polizei</a></li>
<button style="float: right; margin-top: 7px; margin-right: 7px; padding: 2px;"class="btn btn-info" id="nav_search_btn">los geht's!</button>
<input style="float: right; margin-top: 7px; margin-right: 7px;" type="text" id="nav_search" placeholder="Suchbegriff eingeben">
</ul>
</div>
<div id="contentframe" style="margin: auto;">
test
<div id="contentframe">
</div>
<div id="bottombar" style="width: 100%; min-height: 30px; background: black; position: relative; bottom: 0;">
</div>

View File

@ -1,2 +1,5 @@
<div style="width: 750px; margin: auto; margin-bottom: 50px; padding: 20px; text-align: left;">du hast gesucht nach: ${title}</div>
<div style="width: 750px; margin: auto; margin-bottom: 50px; padding: 20px; text-align: left;">
<h3><b>du hast gesucht nach: ${title}</b></h3>
<hr>
</div>
${search}

2
system

@ -1 +1 @@
Subproject commit dd3393ba7c9c5f7df76cde3a00b11d6361d1e897
Subproject commit 5ebb40d49d315440680f19430f3d50790736ba0b