From c6544acc7394699d88e0a7b3ad52ca69f7ac5422 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Sat, 18 Nov 2017 23:55:11 +0100 Subject: [PATCH] speed optimizations, updated system reference --- .htaccess | 11 +++++ democracy/files/images/startnext_logo.png | Bin 4095 -> 2913 bytes democracy/files/org/startnext_logo.org.png | Bin 0 -> 4095 bytes democracy/page/default_ceta/default_ceta.php | 2 +- democracy/page/default_euro/default_euro.php | 2 +- democracy/page/default_gez/default_gez.php | 2 +- democracy/page/default_help/default_help.php | 2 +- .../page/default_medien/default_medien.php | 2 +- democracy/page/default_page/css/font.css | 41 ++++++++++++++++ democracy/page/default_page/default_page.php | 7 ++- .../page/default_page/tpl/default_page.tpl | 44 ------------------ .../default_prototyp/default_prototyp.php | 2 +- .../default_staatstrojaner.php | 2 +- .../page/default_start/default_start.php | 2 +- .../page/default_start/tpl/default_start.tpl | 18 +++---- democracy/page/default_wir/default_wir.php | 2 +- lib/system | 2 +- 17 files changed, 76 insertions(+), 65 deletions(-) create mode 100644 democracy/files/org/startnext_logo.org.png create mode 100644 democracy/page/default_page/css/font.css 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 ad3db35fe6487570266fcff4a79dd7fbbb6c3284..53e9eda494dbefc0a3bb174bb831faa580d8e0cc 100644 GIT binary patch delta 2907 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 FV1kj)od^H` literal 4095 zcma)9c{r49+aJa{jVIZPtYZn888fntEsSN9rLiWKdvmC@Rtj^0!|UXTM{HL*)O4 z&;pDg{}P3>b&xkFQ;G80Fm0%}CgPC1u09N*jX0!-(2z%JBDCO|T5yCG6oEu(>Z1_a z^1mMlCmNODgTkUMf5+mSj39nA8U+Q1M?^%xBD7#+sxKU&udff+M8c6sCTyyqfgBO4wo}>PLWxvTIFVpU zB?rm>T^bbW|AgO>PVn&|>gXNvf^vi+p+v7kdQd$df)`W=c}UmW3xU_x(f5Y@<`e!y z>i;i3oFfXp)8GHq?>{Ea5bbRLnO@G}pZO;SbB3PEnQq?_eI5V+9Ed@iIz>*f-2`b) zW0G6G7!^U+qa|$1aAKaba9Qtt0Vgruz{2S3x0}TMssPo7D+aH zsx&~>1Vmmie>Sb_Y#VZF4^9XdB67lzOEJ~lV@e?@^+i<%2aEA>-6UK()LnO zbA40AATjrj*%?(Deem;;v71P*BI97D&lD{;c8WkP3r<@@K96e{j7hfZn4d8tXH)?4 zeyrq)gax3I+KTmj4=w1|D#iPNWLR<2R(=J8lh(UHSpA&rmMX_tOsD@t)K%Bi?oFZR zV~!uBSofj!dHSDhp-`y7^Sj%wKZu4N;<5HbK?eAag6xe4j;HL zFIhCM^@HvQ*hp7NdMuKP5c8Ff{3{=iwmafYDF%)-njlnT3}w4y0fk%4DB@7z27j zJ3^WUQ>$Hjc%?_!H905qt64$w28zdb$16uU9lUIR!&IMFucvUr**0J+V{B~CR!TeE+-VQR!Erx^Nn8&U|ch!Cl{OB%*wD9itx8KB&xNOMM`!BEiNe0 zE)JT!oV8|s`LqTt zbFdmVqBlujcf6_jYt^DPX6(*GsrDa3CeX#l!t4Aj6SZ~3>k?pLnfqf|A+vCbym?`>W6@_&@gS_CMvMl9{rq`h5 zqS1-M_Q8oCNU)uuU;L`<@d^LCo%X=j`$olZeW1C3=?KxgV!390sT5m;PFQ$X9mxKm z_^<1DGvsYM8LzR-YTT)Zl%R5Uw8BKgs92y4DD{pwdT^d6z9b7`zom{bYfW!l2db`M zvxzw+518C90`^rGSTiLeoo8^E!N~OB^Y27L54bIQ0iows_l?f=015!t?>u2&1Jyum z==Kdj7x3i1Z8sTaHQ)ZE`x@Cx(%JM`IB0XXvkJ9*%s_oLjAxf~M$KT9Q;W0pS4MTm z=lks|D;hsOi;ZrJRC{p$gkGQIx&T{^q0A1~%k5oP?`v8ZIWc;0!6akrly`Fk3Trj3 z?N*o&kO-Y@nLN3c(g)tT>NOUo?)mTF$){~{=#S(S((if>`L$H~3;E!sfD>aB3##L^ zNmiy_N`MF@wUJs@c;fs@kDs~UiR`&!^|yG9UToKnAv5{mc3f_YYj>v|7|wvNbzB+4 z(7Ce)zjTjE4nN$=iL)c*&L|mI`ae4)QsC`)Mrta?>N%r^ZJdP^UVrtwh3~Q?WFx)IACUz<_X;99R)gqyXtdw<+5BA^s?gN!5i=PJSm|-lAmroCspHUkpK0u1Q7>4P&9J5Jjq_ETKlQ}?GjdR#qOEX zPI0hP64hC(2$We9>3aO~lFw}AJLjOUA(y&qzDWb@zkOTNksiMR3{ZBMI(x}wF?BDC z3D?}!komeHp{4iXvF2L~T<-{I@dzf9x3zcS%h0v9BeY-DX{W=R!Ei;Hb1%=;CY=sK zqRp4*4sS~H{1R@b?rSi)EM5IjRb#wUNUi@p5=@JrG}{Y@^oQT77o@>D9luzU8Se!< z)Ayf0<=@N8?4cuP7PDUtJV!oKCoUh&N0q;d1n+S{&B}Nb3^?eY(&(#X%BT#LxG=0n znz-B0nCrd?RTA|8g<*{dlsnrH7lNsH6^}gBL~)Hy!o7-89EmXXVI^kt+Z=h$g_#NW z(`5*3rXY6*kTM#EDqJQr;KJ4$;KGf)NZD1@BWi4~vS5iwE3lq3sPkK^DN1=dx?rwm zojLH=NNIhn&A9-x2wI$Zb2p#1WcI227WMJDI!dL=-YMDnVXw!l+kVYk)0Ti5zubYo zE;oi)8LWpM?v2IRYh_+*v;p2WR(*MM=qwWtwj5M9jTTFUjlU>Pjxi)2>(yv3$OMe| z=>UqpM5#$h)2qznx<%e$i)-@{EL~`RjM-821L{*A&(ppk_x6~@IQ zL->wtX)ZX1b&D%(r(6C?1I*%!nk>GsLp73@bxM0O_pL>^#+TX`l#B%yn6l(DQ(kdt z(p$Rkus1HT+YrdNvbjZhE!XAno(-J|Hhb1WdG%@UhuvFWA(zeEEejMx+cfvI=gxeK zd9o?vITNd2=$Y7|Z99Beaom02?plqCK;&ju;3tNqjU-@r4@KMe@+X((R_y3Cf<|(9 z^*c|<>yDcb&Iw*myrztW2aDE%m}AP|KL5g$TlgWtTR7(SNLpJ@qDgsT*>p-;nPTs{ zJy&DlZNAj}@&gGV8`$vstFGbjuZ9LoJXxO;$BfQ>567=9Us-#HtRC8(OA<{EKPinD zodalWK$L7-cw+#EU6!;n_iR&=+{UKm^lQ$uqu~21dFbtCGCw1?Y>s@Cw(Q&x==pvk z`^Iyti**;;S3Lbie6&utWsHT2Sdk=~I#&iXe{O%aUZ_5Me4t8ZDcK3ZmG!7Km8Gp5z2&2Q2!@lqj^G-_VKXtz5IgR;eNR8lyKFYvI^jxM zh8fH&hN;gmy_i#7hSn0hCb4RbLDm&HQ@+Ga?l@4&amgKH^; zKiHV{T1)c70RIG;U$`If%EpxlmqPwJaI7Mh8F$<1@cVJ=w0=cMmz&M1vg7miks0e) za1m&%ZX2x=0eNanO_GL*6)C zcX`Z2$aT$EXqBZ!wJ&`6W}&48EdAOq2DTnyIU79^!uXh{jsd)dL0^yZxgY$?-TrHR zBCK$mk@FC8&nHY4$rkMvPk(!D^-uoTQQLWvYGtNbj`7LXUsTO!4i zw<_Gvp7LYP+^p)I{mxtgjvbW4@no%f!U$rK8A@G_Tq<6ZW*B}SnDUwRzmjuJ7J1&> zNvOHr%}$a^VrPyb&JnIola?zH)>>e6qi(UQ#x1_*+U%FU!a|vyTCsWW`IcKwJ#`p0 z@eEnGExU*SdLENt9B`Z~C|KX#HE=tr;KG=|D_xZN8vs4^`+{(^y_wUGJ*_uOfy8@W zT!xqWvNp1&N(Y~PlnIGl2 bcWDB|>LlpYwUL;eUvi9v9r~u3=h^=Oi3LBT diff --git a/democracy/files/org/startnext_logo.org.png b/democracy/files/org/startnext_logo.org.png new file mode 100644 index 0000000000000000000000000000000000000000..ad3db35fe6487570266fcff4a79dd7fbbb6c3284 GIT binary patch literal 4095 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 bcWDB|>LlpYwUL;eUvi9v9r~u3=h^=Oi3LBT literal 0 HcmV?d00001 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
  		•