diff --git a/.htaccess b/.htaccess index 3d9cc86..f6038d6 100644 --- a/.htaccess +++ b/.htaccess @@ -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] \ No newline at end of file diff --git a/democracy/files/images/startnext_logo.png b/democracy/files/images/startnext_logo.png index ad3db35..53e9eda 100644 Binary files a/democracy/files/images/startnext_logo.png and b/democracy/files/images/startnext_logo.png differ diff --git a/democracy/files/org/startnext_logo.org.png b/democracy/files/org/startnext_logo.org.png new file mode 100644 index 0000000..ad3db35 Binary files /dev/null and b/democracy/files/org/startnext_logo.org.png differ diff --git a/democracy/page/default_ceta/default_ceta.php b/democracy/page/default_ceta/default_ceta.php index 6f560ab..9370c32 100644 --- a/democracy/page/default_ceta/default_ceta.php +++ b/democracy/page/default_ceta/default_ceta.php @@ -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')); diff --git a/democracy/page/default_euro/default_euro.php b/democracy/page/default_euro/default_euro.php index e596c28..eb5bca9 100644 --- a/democracy/page/default_euro/default_euro.php +++ b/democracy/page/default_euro/default_euro.php @@ -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')); diff --git a/democracy/page/default_gez/default_gez.php b/democracy/page/default_gez/default_gez.php index e647993..9be09c2 100644 --- a/democracy/page/default_gez/default_gez.php +++ b/democracy/page/default_gez/default_gez.php @@ -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')); diff --git a/democracy/page/default_help/default_help.php b/democracy/page/default_help/default_help.php index 8c4d08d..4454049 100644 --- a/democracy/page/default_help/default_help.php +++ b/democracy/page/default_help/default_help.php @@ -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')); diff --git a/democracy/page/default_medien/default_medien.php b/democracy/page/default_medien/default_medien.php index 090e807..07d163c 100644 --- a/democracy/page/default_medien/default_medien.php +++ b/democracy/page/default_medien/default_medien.php @@ -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')); diff --git a/democracy/page/default_page/css/font.css b/democracy/page/default_page/css/font.css new file mode 100644 index 0000000..313612c --- /dev/null +++ b/democracy/page/default_page/css/font.css @@ -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; + } \ No newline at end of file diff --git a/democracy/page/default_page/default_page.php b/democracy/page/default_page/default_page.php index 37e6cdb..f54eeaf 100644 --- a/democracy/page/default_page/default_page.php +++ b/democracy/page/default_page/default_page.php @@ -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') ))); diff --git a/democracy/page/default_page/tpl/default_page.tpl b/democracy/page/default_page/tpl/default_page.tpl index 39d55af..83e209e 100644 --- a/democracy/page/default_page/tpl/default_page.tpl +++ b/democracy/page/default_page/tpl/default_page.tpl @@ -39,50 +39,6 @@ - - diff --git a/democracy/page/default_prototyp/default_prototyp.php b/democracy/page/default_prototyp/default_prototyp.php index dcac822..98b8002 100644 --- a/democracy/page/default_prototyp/default_prototyp.php +++ b/democracy/page/default_prototyp/default_prototyp.php @@ -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')); diff --git a/democracy/page/default_staatstrojaner/default_staatstrojaner.php b/democracy/page/default_staatstrojaner/default_staatstrojaner.php index 7a1edc5..b6f23c6 100644 --- a/democracy/page/default_staatstrojaner/default_staatstrojaner.php +++ b/democracy/page/default_staatstrojaner/default_staatstrojaner.php @@ -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')); diff --git a/democracy/page/default_start/default_start.php b/democracy/page/default_start/default_start.php index f3af15b..fab2234 100644 --- a/democracy/page/default_start/default_start.php +++ b/democracy/page/default_start/default_start.php @@ -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')); diff --git a/democracy/page/default_start/tpl/default_start.tpl b/democracy/page/default_start/tpl/default_start.tpl index 8cb6650..dd225db 100644 --- a/democracy/page/default_start/tpl/default_start.tpl +++ b/democracy/page/default_start/tpl/default_start.tpl @@ -17,7 +17,7 @@
- + DEMOCRACY App Story
@@ -82,35 +82,35 @@ - + - + - + - + - + - + - + - + diff --git a/democracy/page/default_wir/default_wir.php b/democracy/page/default_wir/default_wir.php index 3740ee5..841987c 100644 --- a/democracy/page/default_wir/default_wir.php +++ b/democracy/page/default_wir/default_wir.php @@ -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')); diff --git a/lib/system b/lib/system index 10fd286..ede84e2 160000 --- a/lib/system +++ b/lib/system @@ -1 +1 @@ -Subproject commit 10fd286b536b27a663927623b1043c376007c217 +Subproject commit ede84e2cb88371867b2db8b36adb625bbca0e25f
  • offene & barrierefreie Plattform
  		•
  • Push-Up-Information über aktuelle Bundestagsabstimmungen
  		•
  • nachträgliche 24h-Abstimmungsmöglichkeit über vergangene Abstimmungen
  		•
  • vorläufige 24h-Abstimmungsmöglichkeit über anstehende Abstimmungen
  		•
  • crowdmoderiertes Diskussionsforum zu jeder Abstimmung
  		•
  • Pro- & Contra-Bereich mit nutzerbasierter Bewertung der besten Argumente
  		•
  • Berücksichtigung Deiner Wahlstimme nach Login
  		•
  • & alle Funktionen auch für Nutzer*Inneninitiativen
  		•