webcraftmedia/host_democracy
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

speed optimizations, updated system reference

Browse Source
This commit is contained in:
Ulf Gebhardt 2017-11-18 23:55:11 +01:00
parent 1ec8152be8
commit c6544acc73
17 changed files with 76 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.htaccess
View File

@ -1,3 +1,14 @@
RewriteEngine On
#RewriteRule ^fonts/fontawesome-webfont\.ttf$ lib/font_awesome/lib/fonts/fontawesome-webfont.ttf$1 [L]
#RewriteRule ^fonts/fontawesome-webfont\.ttf$ lib/font_awesome/lib/fonts/fontawesome-webfont.ttf$1 [L]
#RewriteRule ^fonts/fontawesome-webfont\.woff$ lib/font_awesome/lib/fonts/fontawesome-webfont.woff$1 [L]
#RewriteRule ^fonts/fontawesome-webfont\.woff2$ lib/font_awesome/lib/fonts/fontawesome-webfont.woff2$1 [L]
#RewriteRule ^fonts/glyphicons-halflings-regular\.ttf$ lib/system/lib/bootstrap/lib/fonts/glyphicons-halflings-regular.ttf$1 [L]
#RewriteRule ^fonts/glyphicons-halflings-regular\.woff$ lib/system/lib/bootstrap/lib/fonts/glyphicons-halflings-regular.woff$1 [L]
#RewriteRule ^fonts/glyphicons-halflings-regular\.woff2$ lib/system/lib/bootstrap/lib/fonts/glyphicons-halflings-regular.woff2$1 [L]
RewriteRule ^(.*)/fonts/fontawesome-webfont(.*)$ lib/font_awesome/lib/fonts/fontawesome-webfont$2 [L]
RewriteRule ^(.*)/fonts/glyphicons-halflings-regular(.*)$ lib/system/lib/bootstrap/lib/fonts/glyphicons-halflings-regular$2 [L]
RewriteRule ^files/([^/]+)/([^/]+)$ api.php?call=files&cat=$1&id=$2 [L]
RewriteRule ^cache/([^/]+)/([^/]+)$ api.php?call=cache&id=$1&ident=$2 [L]

BIN
democracy/files/images/startnext_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

BIN
democracy/files/org/startnext_logo.org.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

2
democracy/page/default_ceta/default_ceta.php
View File

@ -7,7 +7,7 @@ class default_ceta implements SYSTEM\PAGE\Page {
public static function js(){
return array( new PPAGE('default_ceta/js/default_ceta.js'));}
public static function css(){
return array( new PPAGE('default_ceta/css/default_ceta.css'));}
return array();}// new PPAGE('default_ceta/css/default_ceta.css'));}
public function html(){
$vars = array();
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('democracy'));

2
democracy/page/default_euro/default_euro.php
View File

@ -7,7 +7,7 @@ class default_euro implements SYSTEM\PAGE\Page {
public static function js(){
return array( new PPAGE('default_euro/js/default_euro.js'));}
public static function css(){
return array( new PPAGE('default_euro/css/default_euro.css'));}
return array();}// new PPAGE('default_euro/css/default_euro.css'));}
public function html(){
$vars = array();
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('democracy'));

2
democracy/page/default_gez/default_gez.php
View File

@ -7,7 +7,7 @@ class default_gez implements SYSTEM\PAGE\Page {
public static function js(){
return array( new PPAGE('default_gez/js/default_gez.js'));}
public static function css(){
return array( new PPAGE('default_gez/css/default_gez.css'));}
return array();}// new PPAGE('default_gez/css/default_gez.css'));}
public function html(){
$vars = array();
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('democracy'));

2
democracy/page/default_help/default_help.php
View File

@ -7,7 +7,7 @@ class default_help implements SYSTEM\PAGE\Page {
public static function js(){
return array( new PPAGE('default_help/js/default_help.js'));}
public static function css(){
return array( new PPAGE('default_help/css/default_help.css'));}
return array();}// new PPAGE('default_help/css/default_help.css'));}
public function html(){
$vars = array();
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('democracy'));

2
democracy/page/default_medien/default_medien.php
View File

@ -7,7 +7,7 @@ class default_medien implements SYSTEM\PAGE\Page {
public static function js(){
return array( new PPAGE('default_medien/js/default_medien.js'));}
public static function css(){
return array( new PPAGE('default_medien/css/default_medien.css'));}
return array();}// new PPAGE('default_medien/css/default_medien.css'));}
public function html(){
$vars = array();
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('democracy'));

41
democracy/page/default_page/css/font.css Normal file
View File

@ -0,0 +1,41 @@
/*@font-face {
font-family: 'helvetica';
src: url('./files/font/HelveticaLt.ttf') format('truetype');
}*/
/* font-family: 'helvetica', serif; */
@font-face {
font-family: 'isabelle_layne';
src: url('../../files/font/Isabelle_Layne_Bold.ttf') format('truetype');
}
/* font-family: 'isabelle_layne', serif; */
/*@font-face {
font-family: 'raleway';
src: url('fonts/Raleway-Light.ttf') format('truetype');
}*/
/* font-family: 'raleway', serif; */
/*@font-face {
font-family: 'playfair_display';
src: url('./files/font/playfair_display.tff') format('truetype');
}*/
/* font-family: 'playfair_display', serif; */
@font-face {
font-family: 'edosz';
src: url('../../files/font/edosz.ttf') format('truetype');
}
/* font-family: 'edosz', serif; */
@font-face {
font-family: 'TravelingTypewriter';
src: url('../../files/font/TravelingTypewriter.ttf') format('truetype');
}
/* font-family: 'TravelingTypewriter', serif; */
.callbacks_nav {
background:transparent url(../../files/images/arrows.png) no-repeat right top;
}
#toTop {
background:url(../../files/images/arrow.png) no-repeat 0 0;
}

7
democracy/page/default_page/default_page.php
View File

@ -15,11 +15,14 @@ class default_page implements \SYSTEM\PAGE\DefaultPage {
}
public static function css(){
return \SYSTEM\HTML\html::link(\LIB\lib_bootstrap::css()->WEBPATH(false)).
\SYSTEM\HTML\html::link(\LIB\lib_font_awesome::css()->WEBPATH(false)).
return //\SYSTEM\HTML\html::link(->WEBPATH()).
//\SYSTEM\HTML\html::link(->WEBPATH()).
//\SYSTEM\HTML\html::link('//fonts.googleapis.com/css?family=Pacifico').
//\SYSTEM\HTML\html::link('//fonts.googleapis.com/css?family=Roboto:100,100i,300,300i,400,400i,500,500i,700,700i,900,900i').
\SYSTEM\HTML\html::link(\SYSTEM\CACHE\cache_css::minify(array(
\LIB\lib_bootstrap::css(),
\LIB\lib_font_awesome::css(),
new PPAGE('default_page/css/font.css'),
new PPAGE('default_page/css/style.css'),
new PPAGE('default_page/css/default_page.css')
)));

44
democracy/page/default_page/tpl/default_page.tpl
View File

@ -39,50 +39,6 @@
<meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
<meta name="theme-color" content="#ffffff">
<meta name="fragment" content="!">
<style>
/*@font-face {
font-family: 'helvetica';
src: url('./files/font/HelveticaLt.ttf') format('truetype');
}*/
/* font-family: 'helvetica', serif; */
@font-face {
font-family: 'isabelle_layne';
src: url('./files/font/Isabelle_Layne_Bold.ttf') format('truetype');
}
/* font-family: 'isabelle_layne', serif; */
/*@font-face {
font-family: 'raleway';
src: url('fonts/Raleway-Light.ttf') format('truetype');
}*/
/* font-family: 'raleway', serif; */
/*@font-face {
font-family: 'playfair_display';
src: url('./files/font/playfair_display.tff') format('truetype');
}*/
/* font-family: 'playfair_display', serif; */
@font-face {
font-family: 'edosz';
src: url('./files/font/edosz.ttf') format('truetype');
}
/* font-family: 'edosz', serif; */
@font-face {
font-family: 'TravelingTypewriter';
src: url('./files/font/TravelingTypewriter.ttf') format('truetype');
}
/* font-family: 'TravelingTypewriter', serif; */
.callbacks_nav {
background:transparent url(./files/images/arrows.png) no-repeat right top;
}
#toTop {
background:url(./files/images/arrow.png) no-repeat 0 0;
}
</style>
<link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
<link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">

2
democracy/page/default_prototyp/default_prototyp.php
View File

@ -7,7 +7,7 @@ class default_prototyp implements SYSTEM\PAGE\Page {
public static function js(){
return array( new PPAGE('default_prototyp/js/default_prototyp.js'));}
public static function css(){
return array( new PPAGE('default_prototyp/css/default_prototyp.css'));}
return array();}// new PPAGE('default_prototyp/css/default_prototyp.css'));}
public function html(){
$vars = array();
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('democracy'));

2
democracy/page/default_staatstrojaner/default_staatstrojaner.php
View File

@ -7,7 +7,7 @@ class default_staatstrojaner implements SYSTEM\PAGE\Page {
public static function js(){
return array( new PPAGE('default_staatstrojaner/js/default_staatstrojaner.js'));}
public static function css(){
return array( new PPAGE('default_staatstrojaner/css/default_staatstrojaner.css'));}
return array();}// new PPAGE('default_staatstrojaner/css/default_staatstrojaner.css'));}
public function html(){
$vars = array();
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('democracy'));

2
democracy/page/default_start/default_start.php
View File

@ -7,7 +7,7 @@ class default_start implements SYSTEM\PAGE\Page {
public static function js(){
return array( new PPAGE('default_start/js/default_start.js'));}
public static function css(){
return array( new PPAGE('default_start/css/default_start.css'));}
return array();}// new PPAGE('default_start/css/default_start.css'));}
public function html(){
$vars = array();
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('democracy'));

18
democracy/page/default_start/tpl/default_start.tpl
View File

@ -17,7 +17,7 @@
<div id="appinfobox" class="col-md-12 " >
<img src="./files/images/story_gesamt_2.png" width="100%" >
<img src="./files/images/story_gesamt_2.png" style="width:100%" alt="DEMOCRACY App Story">
</div>
@ -82,35 +82,35 @@
<table>
<tr>
<td><li style="margin-top: 2px"><span class="glyphicon glyphicon-menu-right"></span></li></td>
<td><li style="margin-top: 2px"><i class="fa fa-angle-right"></i></li></td>
<td><li>offene & barrierefreie Plattform<li></td>
</tr>
<tr>
<td><li style="margin-top: -19px"><span class="glyphicon glyphicon-menu-right"></span></li></td>
<td><li style="margin-top: -19px"><i class="fa fa-angle-right" style="padding-right: 1em;"></i></li></td>
<td><li>Push-Up-Information über aktuelle Bundestagsabstimmungen<li></td>
</tr>
<tr>
<td><li style="margin-top: -17px"><span class="glyphicon glyphicon-menu-right"></span></li></td>
<td><li style="margin-top: -17px"><i class="fa fa-angle-right" style="padding-right: 1em;"></i></li></td>
<td><li>nachträgliche 24h-Abstimmungsmöglichkeit über vergangene Abstimmungen<li></td>
</tr>
<tr>
<td><li style="margin-top: -17px"><span class="glyphicon glyphicon-menu-right"></span></li></td>
<td><li style="margin-top: -17px"><i class="fa fa-angle-right" style="padding-right: 1em;"></i></li></td>
<td><li>vorläufige 24h-Abstimmungsmöglichkeit über anstehende Abstimmungen<li></td>
</tr>
<tr>
<td><li style="margin-top: -17px"><span class="glyphicon glyphicon-menu-right"></span></li></td>
<td><li style="margin-top: -17px"><i class="fa fa-angle-right" style="padding-right: 1em;"></i></li></td>
<td><li>crowdmoderiertes Diskussionsforum zu jeder Abstimmung<li></td>
</tr>
<tr>
<td><li style="margin-top: -19px"><span class="glyphicon glyphicon-menu-right"></span></li></td>
<td><li style="margin-top: -19px"><i class="fa fa-angle-right" style="padding-right: 1em;"></i></li></td>
<td><li>Pro- & Contra-Bereich mit nutzerbasierter Bewertung der besten Argumente<li></td>
</tr>
<tr>
<td><li style="margin-top: -2px"><span class="glyphicon glyphicon-menu-right"></span></li></td>
<td><li style="margin-top: -2px"><i class="fa fa-angle-right" style="padding-right: 1em;"></i></li></td>
<td><li>Berücksichtigung Deiner Wahlstimme nach Login<li></td>
</tr>
<tr>
<td><li style="margin-top: -5px"><span class="glyphicon glyphicon-menu-right"></span></li></td>
<td><li style="margin-top: -5px"><i class="fa fa-angle-right" style="padding-right: 1em;"></i></li></td>
<td><li>& alle Funktionen auch für Nutzer*Inneninitiativen<li></td>
</tr>

2
democracy/page/default_wir/default_wir.php
View File

@ -7,7 +7,7 @@ class default_wir implements SYSTEM\PAGE\Page {
public static function js(){
return array( new PPAGE('default_wir/js/default_wir.js'));}
public static function css(){
return array( new PPAGE('default_wir/css/default_wir.css'));}
return array();}// new PPAGE('default_wir/css/default_wir.css'));}
public function html(){
$vars = array();
$vars = array_merge($vars, \SYSTEM\PAGE\text::tag('democracy'));

2
lib/system

@ -1 +1 @@
Subproject commit 10fd286b536b27a663927623b1043c376007c217
Subproject commit ede84e2cb88371867b2db8b36adb625bbca0e25f