ulfgebhardt/neopolimatrix.eu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of mojotrollz.eu:hosting

Browse Source 
Conflicts:
	.gitmodules
	ourworld/config.php
	ourworld/nbproject/project.properties
	ourworld/nbproject/project.xml
	ourworld/ourworld/api/api_ourworld.php
	ourworld/ourworld/api/autoload.inc
	ourworld/ourworld/autoload.inc
	ourworld/ourworld/lib/bootstrap/css/bootstrap.css
	ourworld/ourworld/page/default_page/js/default_page.js
	ourworld/system
This commit is contained in:
messerbill 2015-03-03 14:32:13 +01:00
commit 2743beba44
12 changed files with 75 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
index.php
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.");

1
nbproject/project.properties
View File

@ -1,3 +1,4 @@
auxiliary.org-netbeans-modules-php-smarty.smarty-framework=true
include.path=${php.global.include.path}
php.version=PHP_54
source.encoding=UTF-8

2
neopolimatrix/page/default_article/tpl/element.tpl
View File

@ -1,5 +1,5 @@
<button class="btn btn-default" id="backbtn">zurück</button><br><br>
<div class="list_element" text_id="${tag_id}" style="width: 750px; margin: auto; margin-bottom: 50px; padding: 20px;">
<div class="list_element" text_id="${tag_id}" style="width: 750px; margin: auto; margin-bottom: 50px; padding: 20px; text-align: justify;">
<p style="float: left; font-size: 10pt; margin-top: 7px;">Author: <i>${author}</i></p>
<p style="float: right; font-size: 10pt; margin-top: 7px;">${ago}</p>
<div style="clear: both;"></div>

2
neopolimatrix/page/default_list/default_list.php
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:

5
neopolimatrix/page/default_list/tpl/default_list.tpl
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}

5
neopolimatrix/page/default_list/tpl/element.tpl
View File

@ -1,4 +1,5 @@
<div class="list_element" text_id="${tag_id}" style="width: 750px; margin: auto; margin-bottom: 50px; padding: 20px;">
<div class ="list_element" text_id="${tag_id}" style="">
<div class="element_hover article" text_id="${tag_id}" style="border-bottom: 1px black solid; text-align: justify;">
<p style="float: left; font-size: 10pt; margin-top: 7px;">Author: <i>${author}</i></p>
<p style="float: right; font-size: 10pt; margin-top: 7px;">${ago}</p>
@ -9,4 +10,6 @@
${deDE}
<p style="float: right; font-size: 10pt; margin-top: 7px;">Veröffentlicht: ${published}</p>
<br>
</div>
<div class="btn btn-default" style="margin-top: 10px; width: 35%;">Weiterlesen...</div>
</div>

40
neopolimatrix/page/default_page/css/default_page.css
View File

@ -15,6 +15,42 @@ body{
margin: 0 auto;
}
.list_element:hover {
background-color: #EEE;
.list_element{
width: 750px;
margin: auto;
margin-bottom: 50px;
padding: 20px;
border: white solid 1px;
}
.list_element:hover{
/* background-color: #EEE;*/
border: #005fb3 solid 1px;
}
.article {
position: relative;
}
.article:after {
position: absolute;
bottom: 0;
left: 0;
height: 100%;
width: 100%;
content: "";
background: linear-gradient(to top,
rgba(255,255,255, 1) 1%,
rgba(255,255,255, 0) 20%
);
pointer-events: none; /* so the text is still selectable */
}
.element_hover{
max-height: 400px;
overflow-y: hidden;
}

10
neopolimatrix/page/default_page/js/default_page.js
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();
@ -15,7 +15,13 @@ function impressum(){
function search(){
$("#nav_search_btn").click(function(){
$('#contentframe').load('./?page=search&param='+$('#nav_search').val());
});
});
$(document).keypress(function(e) {
var hasFocus = $('#nav_search').is(':focus');
if(e.which === 13 && hasFocus) {
$('#contentframe').load('./?page=search&param='+$('#nav_search').val());
}
});
}
function tabs(){

25
neopolimatrix/page/default_page/tpl/default_page.tpl
View File

@ -7,7 +7,7 @@
${css}
${js}
</head>
<body>
<body style="width: 100%">
<div id="fb-root"></div>
<script>
window.fbAsyncInit = function() {
@ -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>

2
neopolimatrix/page/default_search/tpl/element.tpl
View File

@ -1,4 +1,4 @@
<div style="width: 750px; margin: auto; margin-bottom: 50px;">
<div style="width: 750px; margin: auto; margin-bottom: 50px; text-align: justify;">
<p style="float: left; font-size: 10pt; margin-top: 7px;">Author: <i>${author}</i></p>
<p style="float: right; font-size: 10pt; margin-top: 7px;">Veröffentlicht: ${timestamp}</p>
<div style="clear: both;"></div>

5
neopolimatrix/page/default_search/tpl/search.tpl
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