From af3ea0fbbac30361d6b4f304b78653866bff77bb Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Mon, 22 Jan 2018 14:45:03 +0100 Subject: [PATCH] wir page redesign, demokratie.io -> prototype, removed blog menu entry --- .../page/default_page/tpl/default_page.tpl | 2 +- .../page/default_start/tpl/default_start.tpl | 6 +-- democracy/page/default_wir/default_wir.php | 40 ++++++++----------- .../page/default_wir/tpl/default_wir.tpl | 37 +++++++++-------- .../page/default_wir/tpl/network_member.tpl | 5 +++ .../page/default_wir/tpl/team_member.tpl | 2 +- 6 files changed, 46 insertions(+), 46 deletions(-) create mode 100644 democracy/page/default_wir/tpl/network_member.tpl diff --git a/democracy/page/default_page/tpl/default_page.tpl b/democracy/page/default_page/tpl/default_page.tpl index b1b8bcb..75d0b5d 100644 --- a/democracy/page/default_page/tpl/default_page.tpl +++ b/democracy/page/default_page/tpl/default_page.tpl @@ -88,7 +88,7 @@
  • Prototyp
  • Mithelfen
  • FAQ
    • -
  • Blog
    • +
    diff --git a/democracy/page/default_start/tpl/default_start.tpl b/democracy/page/default_start/tpl/default_start.tpl index e35b5d5..167bac7 100644 --- a/democracy/page/default_start/tpl/default_start.tpl +++ b/democracy/page/default_start/tpl/default_start.tpl @@ -60,8 +60,8 @@
    - - Demokratie IO Logo + + Prototype Fund Logo
    @@ -70,7 +70,7 @@
    -
    +
    Pressenza Logo diff --git a/democracy/page/default_wir/default_wir.php b/democracy/page/default_wir/default_wir.php index 146f867..36e55cb 100644 --- a/democracy/page/default_wir/default_wir.php +++ b/democracy/page/default_wir/default_wir.php @@ -35,14 +35,14 @@ class default_wir implements SYSTEM\PAGE\Page { $vars['testimonials'] .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_wir/tpl/testimonial.tpl'))->SERVERPATH(), $testimonial);} //team $vars['team'] = ''; - $team = array( array( 'name' => 'Marius Krüger', 'text' => 'Mädchen für alles
    Initiator', 'img' => './files/wir/marius_krueger.jpg', + $team = array( array( 'name' => 'Marius Krüger', 'text' => 'Mädchen für alles
    Initiator & UI', 'img' => './files/wir/marius_krueger.jpg', 'aktiv' => 'lightgreen', 'links' => array( array('icon' => 'fa-facebook', 'url' => 'https://www.facebook.com/kruegermarius'))), - array( 'name' => 'Magnus Rembold', 'text' => 'Teamgeist
    UX & Software Architektur', 'img' => './files/wir/magnus_rembold.jpg', + array( 'name' => 'Magnus Rembold', 'text' => 'Teamgeist
    UX & Software Architektur', 'img' => './files/wir/magnus_rembold.jpg', 'aktiv' => 'lightgreen', 'links' => array( array('icon' => 'fa-twitter', 'url' => 'https://twitter.com/magnusmunter'), array('icon' => 'fa-xing', 'url' => 'https://www.xing.com/profile/Magnus_Rembold'))), - array( 'name' => 'Manuel Ruck', 'text' => 'Arbeitstier
    React-Experte', 'img' => './files/wir/userdefault.jpg', //'./files/wir/manuel_ruck.jpg', + array( 'name' => 'Manuel Ruck', 'text' => 'React-Experte
    Baut den Code für die App', 'img' => './files/wir/userdefault.jpg', 'aktiv' => 'lightgreen',//'./files/wir/manuel_ruck.jpg', 'links' => array( array('icon' => 'fa-xing', 'url' => 'https://www.xing.com/profile/Manuel_Ruck'))), - array( 'name' => 'Ulf Gebhardt', 'text' => '笑い男
    Web-Entwicklung', 'img' => './files/wir/ulf_gebhardt.jpg', + array( 'name' => 'Ulf Gebhardt', 'text' => '笑い男
    Entwicklung & Planung', 'img' => './files/wir/ulf_gebhardt.jpg', 'aktiv' => 'lightgreen', 'links' => array( array('icon' => 'fa-globe', 'url' => 'https://www.webcraft-media.de/#!ulf_gebhardt')))); foreach($team as $member){ $links = $member['links']; @@ -52,15 +52,15 @@ class default_wir implements SYSTEM\PAGE\Page { $vars['team'] .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_wir/tpl/team_member.tpl'))->SERVERPATH(), $member);} $vars['contributors'] = ''; - $contributors = array( array( 'name' => 'Dr. Annika Götz', 'text' => 'Kommunikatorin
    Öffentlichkeitsarbeit', 'img' => './files/wir/annika_goetz.jpg', + $contributors = array( array( 'name' => 'Dr. Annika Götz', 'text' => 'Kommunikatorin
    Öffentlichkeitsarbeit', 'img' => './files/wir/annika_goetz.jpg', 'aktiv' => '#f44336', 'links' => array( array('icon' => 'fa-linkedin', 'url' => 'https://www.linkedin.com/in/annikagoetz'))), - array( 'name' => 'Julia Suciu', 'text' => 'Quotencoach
    Öffentlichkeitsarbeit', 'img' => './files/wir/julia_suciu.jpg', + array( 'name' => 'Julia Suciu', 'text' => 'Quotencoach
    Öffentlichkeitsarbeit', 'img' => './files/wir/julia_suciu.jpg', 'aktiv' => '#f44336', 'links' => array( array('icon' => 'fa-facebook', 'url' => 'https://www.facebook.com/julia.suciu'), array('icon' => 'fa-instagram', 'url' => 'https://www.instagram.com/mindset_architect/'))), - array( 'name' => 'Alexander Friedland', 'text' => 'Bastler
    Web-Entwicklung', 'img' => './files/wir/alexander_friedland.jpg', - 'links' => array()), + array( 'name' => 'Alex Friedland', 'text' => 'Bastler
    Web-Entwicklung', 'img' => './files/wir/alexander_friedland.jpg', 'aktiv' => 'orange', + 'links' => array())/*, array( 'name' => 'Du', 'text' => '... kannst dabei sein
    und mithelfen', 'img' => './files/wir/userdefault.jpg', - 'links' => array( array('icon' => 'fa-envelope', 'url' => '#!help')))); + 'links' => array( array('icon' => 'fa-envelope', 'url' => '#!help')))*/); foreach($contributors as $member){ $links = $member['links']; $member['links'] = ''; @@ -69,22 +69,14 @@ class default_wir implements SYSTEM\PAGE\Page { $vars['contributors'] .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_wir/tpl/team_member.tpl'))->SERVERPATH(), $member);} $vars['network'] = ''; - $network = array( array( 'name' => '4 Teammitglieder', 'text' => '', 'img' => './files/wir/userdefault.jpg',//'./files/wir/team.jpg', - 'links' => array()), - array( 'name' => '13 Unterstützer', 'text' => '', 'img' => './files/wir/userdefault.jpg',//'./files/wir/contributors.jpg', - 'links' => array()), - array( 'name' => '168 Prototyp-Tester', 'text' => '', 'img' => './files/wir/userdefault.jpg',//'./files/wir/prototypetesters.jpg', - 'links' => array()), - array( 'name' => '349 Fans', 'text' => '', 'img' => './files/wir/userdefault.jpg',//'./files/wir/fans.jpg', - 'links' => array()), - array( 'name' => '542 Spender', 'text' => '', 'img' => './files/wir/userdefault.jpg',//'./files/wir/donators.jpg', - 'links' => array())); + $network = array( /*array( 'name' => '4 Teammitglieder', 'text' => '', 'img' => './files/wir/userdefault.jpg',//'./files/wir/team.jpg', + 'links' => array()),*/ + array( 'name' => 'weitere Entwickler', 'number' => '13', 'icon' => 'fa-gear'), + array( 'name' => 'Prototyp-Tester', 'number' => '168', 'icon' => 'fa-eye'), + array( 'name' => 'Fans', 'number' => '349', 'icon' => 'fa-group'), + array( 'name' => 'Spender', 'number' => '545', 'icon' => 'fa-diamond')); foreach($network as $member){ - $links = $member['links']; - $member['links'] = ''; - foreach($links as $link){ - $member['links'] .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_wir/tpl/team_link.tpl'))->SERVERPATH(), $link);} - $vars['network'] .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_wir/tpl/team_member.tpl'))->SERVERPATH(), $member);} + $vars['network'] .= \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_wir/tpl/network_member.tpl'))->SERVERPATH(), $member);} $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('democracy')); return \SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_wir/tpl/default_wir.tpl'))->SERVERPATH(), $vars); diff --git a/democracy/page/default_wir/tpl/default_wir.tpl b/democracy/page/default_wir/tpl/default_wir.tpl index 4777cf7..8698191 100644 --- a/democracy/page/default_wir/tpl/default_wir.tpl +++ b/democracy/page/default_wir/tpl/default_wir.tpl @@ -2,12 +2,12 @@

    Unsere Mittel

    -
    +


    ${icons}
    -
    +

    ${heisenberg_cite}  –  @@ -41,26 +41,29 @@

    ${team}
    -
    -
    -

    Unterstützer

    -
    -
    -
    - ${contributors} +
    +
    +
    +
    -
    -
    -

    Netzwerk

    -
    -
    -
    - ${network} +
    + ${contributors}
    - +
    + +
    +
    +
    +
    + ${network} +
    +
    +
    +
    +
    diff --git a/democracy/page/default_wir/tpl/network_member.tpl b/democracy/page/default_wir/tpl/network_member.tpl new file mode 100644 index 0000000..f3d1bd8 --- /dev/null +++ b/democracy/page/default_wir/tpl/network_member.tpl @@ -0,0 +1,5 @@ +
    + +

    ${name}

    +

    ${number}

    +
    \ No newline at end of file diff --git a/democracy/page/default_wir/tpl/team_member.tpl b/democracy/page/default_wir/tpl/team_member.tpl index 6901060..4e798fc 100644 --- a/democracy/page/default_wir/tpl/team_member.tpl +++ b/democracy/page/default_wir/tpl/team_member.tpl @@ -8,7 +8,7 @@
    -

    ${name}

    +

    ${name} 

    ${text}

    \ No newline at end of file