diff --git a/democracy/files/wir/manuel_ruck.jpg b/democracy/files/wir/manuel_ruck.jpg new file mode 100644 index 0000000..4dbf287 Binary files /dev/null and b/democracy/files/wir/manuel_ruck.jpg differ diff --git a/democracy/page/default_faq/default_faq.php b/democracy/page/default_faq/default_faq.php index 4501d58..c7c0dc0 100644 --- a/democracy/page/default_faq/default_faq.php +++ b/democracy/page/default_faq/default_faq.php @@ -11,10 +11,12 @@ class default_faq implements SYSTEM\PAGE\Page { public function html(){ $vars = array(); $vars['questions'] = ''; + $vars['in_css'] = 'transform: rotate(180deg);'; + $vars['in'] = 'show'; $faqs = \SYSTEM\PAGE\text::tag('faq'); $i = 0; while(array_key_exists('faq_q_'. ($i < 9 ? sprintf("%02d", ++$i) : ++$i), $faqs)){ - $question = array( 'n' => $i, 'in' => $i == 1 ? 'in' : '', 'in_css' => $i == 1 ? 'transform: rotate(180deg)' : '', + $question = array( 'n' => $i, 'in' => $i == 1 ? 'show' : '', 'in_css' => $i == 1 ? 'transform: rotate(180deg);' : '', 'question' => '${faq_q_'.($i <= 9 ? sprintf("%02d", $i) : $i).'}', //${faq_q_0n} ${faq_q_nn} 'answer' => '${faq_a_'.($i <= 9 ? sprintf("%02d", $i) : $i).'}'); //${faq_a_0n} ${faq_a_nn} $vars['questions'] .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_faq/tpl/question.tpl'))->SERVERPATH(), $question); diff --git a/democracy/page/default_faq/tpl/default_faq.tpl b/democracy/page/default_faq/tpl/default_faq.tpl index 6dc1c60..d319af2 100644 --- a/democracy/page/default_faq/tpl/default_faq.tpl +++ b/democracy/page/default_faq/tpl/default_faq.tpl @@ -7,11 +7,11 @@

-   Eine Frage stellen +     Eine Frage stellen

-
+
diff --git a/democracy/page/default_faq/tpl/question.tpl b/democracy/page/default_faq/tpl/question.tpl index e976abc..283373d 100644 --- a/democracy/page/default_faq/tpl/question.tpl +++ b/democracy/page/default_faq/tpl/question.tpl @@ -1,10 +1,10 @@

-   ${question} +     ${question}

-
${answer}
+
${answer}
\ No newline at end of file diff --git a/democracy/page/default_help/tpl/default_help.tpl b/democracy/page/default_help/tpl/default_help.tpl index 2008f33..060ccd4 100644 --- a/democracy/page/default_help/tpl/default_help.tpl +++ b/democracy/page/default_help/tpl/default_help.tpl @@ -1,99 +1,93 @@
-
-
-
-
- - +
+
+ +
+
+
+ + +
+
+
+
+ + +
+
+
+
+ + +
+
-
-
-
- - +
+
+
+ Ich möchte Demokratie gestalten als: +

+
+ + + + + + + + +
+
+
+
+ + +
+
-
-
-
- - +
+
+
  Mitmischen!
+
-
-
-
-
- ich möchte Demokratie gestalten als: -

- -
- -
- -
- -
- -
- -
- -
- -
-
-
- - -
-
-
-
  Mitmischen!
-
- -
-
- - - +
+ + + + +
- -
\ No newline at end of file diff --git a/democracy/page/default_medien/default_medien.php b/democracy/page/default_medien/default_medien.php index f77fdb2..6c0c753 100644 --- a/democracy/page/default_medien/default_medien.php +++ b/democracy/page/default_medien/default_medien.php @@ -8,6 +8,45 @@ class default_medien implements SYSTEM\PAGE\Page { return array( new PPAGE('default_medien/js/default_medien.js'));} public static function css(){ return array();}// new PPAGE('default_medien/css/default_medien.css'));} + + public static function wp_entries(){ + $path = (new \SYSTEM\PROOT('../httpdocs/blog/wp-load.php'))->SERVERPATH(); + $autoloadFuncs = spl_autoload_functions(); + foreach($autoloadFuncs as $unregisterFunc){ + $unregisterFunc[0] = '\\'.$unregisterFunc[0]; + spl_autoload_unregister($unregisterFunc); + } + require $path; + $autoloadFuncs2 = spl_autoload_functions(); + foreach($autoloadFuncs2 as $unregisterFunc){ + spl_autoload_unregister($unregisterFunc); + } + foreach($autoloadFuncs as $registerFunc){ + spl_autoload_register($registerFunc);} + $wp_query = new \WP_Query(); + + + $result = ''; + $posts = wp_get_recent_posts(array( + 'numberposts' => 3, + 'orderby' => 'post_date', + 'order' => 'DESC', + 'post_type' => 'post', + 'post_status' => 'publish', + ),ARRAY_A); + + foreach($posts as $post) { + $p = array(); + $p['link'] = get_post_permalink($post['ID']); + $p['title'] = $post['post_title']; + //$p['exerpt'] = get_the_excerpt($post['ID']); + $p['thumbnail'] = get_the_post_thumbnail_url($post['ID'], 'website_blog_thumbnail'); + $p['date'] = date_i18n( get_option( 'date_format' ), strtotime( $post['post_date'] ) ); + $p['content'] = wp_trim_words($post['post_content'], 25); + $result .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_medien/tpl/wp_entry.tpl'))->SERVERPATH(), $p); + } + return $result; + } public function html(){ $vars = array(); @@ -88,6 +127,7 @@ class default_medien implements SYSTEM\PAGE\Page { $vars['articles'] .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_medien/tpl/article.tpl'))->SERVERPATH(), $article); $i++; } + $vars['wp_entries'] = self::wp_entries(); $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('democracy')); return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_medien/tpl/default_medien.tpl'))->SERVERPATH(), $vars); diff --git a/democracy/page/default_medien/tpl/default_medien.tpl b/democracy/page/default_medien/tpl/default_medien.tpl index 79b8919..cfac16b 100644 --- a/democracy/page/default_medien/tpl/default_medien.tpl +++ b/democracy/page/default_medien/tpl/default_medien.tpl @@ -1,5 +1,6 @@

Medien

+
${wp_entries}
${articles}


diff --git a/democracy/page/default_medien/tpl/wp_entry.tpl b/democracy/page/default_medien/tpl/wp_entry.tpl new file mode 100644 index 0000000..776f48a --- /dev/null +++ b/democracy/page/default_medien/tpl/wp_entry.tpl @@ -0,0 +1,9 @@ +
+ +
+
${title}
+

+ ${content} weiterlesen +

+
+
\ No newline at end of file diff --git a/democracy/page/default_page/css/default_page.css b/democracy/page/default_page/css/default_page.css index c8b8b38..e2cc29b 100644 --- a/democracy/page/default_page/css/default_page.css +++ b/democracy/page/default_page/css/default_page.css @@ -385,11 +385,11 @@ body { .panel-faq{margin-bottom: 12px !important; box-shadow: 0 2px 4px rgba(0, 0, 0, 0.5); border: 0; border-radius: 0;} .panel-faq>.panel-heading{border-radius: 0; background-color: #fff; border-color: #000;} -.panel-faq>.panel-heading+.panel-collapse>.panel-body{border-color: grey} +.panel-faq>.panel-heading+.panel-collapse>.panel-body{border-color: grey; background-color: #fff;} .panel-faq>.panel-heading .badge{color:#d9edf7;background-color:#4494d3} .panel-faq>.panel-footer+.panel-collapse>.panel-body{border-bottom-color:#4f81bd} -.panel-faq>.panel-heading>.panel-title{color: #333; font-size: 22px; padding-top: 15px; padding-bottom: 15px;} -.panel-faq>.panel-heading>.panel-title>a{} +.panel-faq>.panel-heading>.panel-title{color: #333; font-size: 22px; padding-top: 15px; padding-bottom: 15px;margin-bottom: 3px;} +.panel-faq>.panel-heading>.panel-title>a{color: #333;} .panel-faq>.panel-heading>.panel-title>a:hover{text-decoration: none;} .panel-faq>.panel-heading>.panel-title>a:active{text-decoration: none;} .panel-faq>.panel-heading>.panel-title>a:visited{text-decoration: none;} diff --git a/democracy/page/default_page/css/style.css b/democracy/page/default_page/css/style.css index 3d7963e..8ac52eb 100644 --- a/democracy/page/default_page/css/style.css +++ b/democracy/page/default_page/css/style.css @@ -26,7 +26,7 @@ body { .header-left { text-align:center; - margin-top:20px; + padding-top:20px; } .w3layouts-logo h1 { diff --git a/democracy/page/default_page/default_page.php b/democracy/page/default_page/default_page.php index f54eeaf..a9a7249 100644 --- a/democracy/page/default_page/default_page.php +++ b/democracy/page/default_page/default_page.php @@ -3,6 +3,7 @@ class default_page implements \SYSTEM\PAGE\DefaultPage { public static function js(){ return \SYSTEM\HTML\html::script(\SYSTEM\CACHE\cache_js::minify(array( \LIB\lib_jquery::js(), + new PPAGE('default_page/js/popper.min.js'), \LIB\lib_bootstrap::js(), \LIB\lib_system::js(), new PLIB('responsiveslides/responsiveslides.min.js'), diff --git a/democracy/page/default_page/js/default_page.js b/democracy/page/default_page/js/default_page.js index 9feb29f..0afa8ea 100644 --- a/democracy/page/default_page/js/default_page.js +++ b/democracy/page/default_page/js/default_page.js @@ -15,5 +15,7 @@ $(document).ready(function() { $().UItoTop({ easingType: 'easeOutQuart' }); - // + $('.navbar-nav>li>a').on('click', function(){ + $('.navbar-collapse').collapse('hide'); + }); }); \ No newline at end of file diff --git a/democracy/page/default_page/js/popper.min.js b/democracy/page/default_page/js/popper.min.js new file mode 100644 index 0000000..95e9ef5 --- /dev/null +++ b/democracy/page/default_page/js/popper.min.js @@ -0,0 +1,5 @@ +/* + Copyright (C) Federico Zivolo 2017 + Distributed under the MIT License (license terms are at http://opensource.org/licenses/MIT). + */(function(e,t){'object'==typeof exports&&'undefined'!=typeof module?module.exports=t():'function'==typeof define&&define.amd?define(t):e.Popper=t()})(this,function(){'use strict';function e(e){return e&&'[object Function]'==={}.toString.call(e)}function t(e,t){if(1!==e.nodeType)return[];var o=window.getComputedStyle(e,null);return t?o[t]:o}function o(e){return'HTML'===e.nodeName?e:e.parentNode||e.host}function n(e){if(!e||-1!==['HTML','BODY','#document'].indexOf(e.nodeName))return window.document.body;var i=t(e),r=i.overflow,p=i.overflowX,s=i.overflowY;return /(auto|scroll)/.test(r+s+p)?e:n(o(e))}function r(e){var o=e&&e.offsetParent,i=o&&o.nodeName;return i&&'BODY'!==i&&'HTML'!==i?-1!==['TD','TABLE'].indexOf(o.nodeName)&&'static'===t(o,'position')?r(o):o:window.document.documentElement}function p(e){var t=e.nodeName;return'BODY'!==t&&('HTML'===t||r(e.firstElementChild)===e)}function s(e){return null===e.parentNode?e:s(e.parentNode)}function d(e,t){if(!e||!e.nodeType||!t||!t.nodeType)return window.document.documentElement;var o=e.compareDocumentPosition(t)&Node.DOCUMENT_POSITION_FOLLOWING,i=o?e:t,n=o?t:e,a=document.createRange();a.setStart(i,0),a.setEnd(n,0);var f=a.commonAncestorContainer;if(e!==f&&t!==f||i.contains(n))return p(f)?f:r(f);var l=s(e);return l.host?d(l.host,t):d(e,s(t).host)}function a(e){var t=1=o.clientWidth&&i>=o.clientHeight}),f=0i[e]&&!t.escapeWithReference&&(n=z(p[o],i[e]-('right'===e?p.width:p.height))),pe({},o,n)}};return n.forEach(function(e){var t=-1===['left','top'].indexOf(e)?'secondary':'primary';p=se({},p,s[t](e))}),e.offsets.popper=p,e},priority:['left','right','top','bottom'],padding:5,boundariesElement:'scrollParent'},keepTogether:{order:400,enabled:!0,fn:function(e){var t=e.offsets,o=t.popper,i=t.reference,n=e.placement.split('-')[0],r=V,p=-1!==['top','bottom'].indexOf(n),s=p?'right':'bottom',d=p?'left':'top',a=p?'width':'height';return o[s]r(i[s])&&(e.offsets.popper[d]=r(i[s])),e}},arrow:{order:500,enabled:!0,fn:function(e,t){if(!F(e.instance.modifiers,'arrow','keepTogether'))return e;var o=t.element;if('string'==typeof o){if(o=e.instance.popper.querySelector(o),!o)return e;}else if(!e.instance.popper.contains(o))return console.warn('WARNING: `arrow.element` must be child of its popper element!'),e;var i=e.placement.split('-')[0],n=e.offsets,r=n.popper,p=n.reference,s=-1!==['left','right'].indexOf(i),d=s?'height':'width',a=s?'top':'left',f=s?'left':'top',l=s?'bottom':'right',m=O(o)[d];p[l]-mr[l]&&(e.offsets.popper[a]+=p[a]+m-r[l]);var h=p[a]+p[d]/2-m/2,g=h-c(e.offsets.popper)[a];return g=_(z(r[d]-m,g),0),e.arrowElement=o,e.offsets.arrow={},e.offsets.arrow[a]=Math.round(g),e.offsets.arrow[f]='',e},element:'[x-arrow]'},flip:{order:600,enabled:!0,fn:function(e,t){if(W(e.instance.modifiers,'inner'))return e;if(e.flipped&&e.placement===e.originalPlacement)return e;var o=w(e.instance.popper,e.instance.reference,t.padding,t.boundariesElement),i=e.placement.split('-')[0],n=L(i),r=e.placement.split('-')[1]||'',p=[];switch(t.behavior){case fe.FLIP:p=[i,n];break;case fe.CLOCKWISE:p=K(i);break;case fe.COUNTERCLOCKWISE:p=K(i,!0);break;default:p=t.behavior;}return p.forEach(function(s,d){if(i!==s||p.length===d+1)return e;i=e.placement.split('-')[0],n=L(i);var a=e.offsets.popper,f=e.offsets.reference,l=V,m='left'===i&&l(a.right)>l(f.left)||'right'===i&&l(a.left)l(f.top)||'bottom'===i&&l(a.top)l(o.right),g=l(a.top)l(o.bottom),b='left'===i&&h||'right'===i&&c||'top'===i&&g||'bottom'===i&&u,y=-1!==['top','bottom'].indexOf(i),w=!!t.flipVariations&&(y&&'start'===r&&h||y&&'end'===r&&c||!y&&'start'===r&&g||!y&&'end'===r&&u);(m||b||w)&&(e.flipped=!0,(m||b)&&(i=p[d+1]),w&&(r=j(r)),e.placement=i+(r?'-'+r:''),e.offsets.popper=se({},e.offsets.popper,S(e.instance.popper,e.offsets.reference,e.placement)),e=N(e.instance.modifiers,e,'flip'))}),e},behavior:'flip',padding:5,boundariesElement:'viewport'},inner:{order:700,enabled:!1,fn:function(e){var t=e.placement,o=t.split('-')[0],i=e.offsets,n=i.popper,r=i.reference,p=-1!==['left','right'].indexOf(o),s=-1===['top','left'].indexOf(o);return n[p?'left':'top']=r[t]-(s?n[p?'width':'height']:0),e.placement=L(t),e.offsets.popper=c(n),e}},hide:{order:800,enabled:!0,fn:function(e){if(!F(e.instance.modifiers,'hide','preventOverflow'))return e;var t=e.offsets.reference,o=T(e.instance.modifiers,function(e){return'preventOverflow'===e.name}).boundaries;if(t.bottomo.right||t.top>o.bottom||t.right
-