From 0d91cc5f111fac882f1bb375c2bf426195c9cae2 Mon Sep 17 00:00:00 2001 From: MaZderMind Date: Sun, 8 Nov 2015 16:31:29 +0100 Subject: finish overview-page --- assets/css/_allconferences.less | 25 +++++++++++++++++++++++++ assets/css/_structure.less | 1 + configs/conferences/31c3/main.less | 21 +++++++++++++++++++++ index.php | 31 +++++++++++++++---------------- model/Conferences.php | 32 ++++++++++++++++++++++++-------- template/about.phtml | 2 +- template/allconferences.phtml | 33 +++++++++++++++++++++++++++++++++ view/allconferences.php | 8 ++++++++ 8 files changed, 128 insertions(+), 25 deletions(-) create mode 100644 assets/css/_allconferences.less create mode 100644 configs/conferences/31c3/main.less create mode 100644 template/allconferences.phtml create mode 100644 view/allconferences.php diff --git a/assets/css/_allconferences.less b/assets/css/_allconferences.less new file mode 100644 index 0000000..d8a14aa --- /dev/null +++ b/assets/css/_allconferences.less @@ -0,0 +1,25 @@ +body.allconferences { + text-align: center; + + .conference { + a { + font-size: @jumbo-font-size; + line-height: @jumbo-line-height; + + @media (max-width: @screen-xs-min) { + font-size: @jumbo-font-size-xs; + } + + display: block; + text-align: center; + + &:hover { + text-decoration: none; + } + } + + p { + margin-top: @line-height-computed; + } + } +} diff --git a/assets/css/_structure.less b/assets/css/_structure.less index 2082e38..d6e4257 100644 --- a/assets/css/_structure.less +++ b/assets/css/_structure.less @@ -88,3 +88,4 @@ body { @import "_closed.less"; @import "_embed.less"; @import "_feedback.less"; +@import "_allconferences.less"; diff --git a/configs/conferences/31c3/main.less b/configs/conferences/31c3/main.less new file mode 100644 index 0000000..a60d3b4 --- /dev/null +++ b/configs/conferences/31c3/main.less @@ -0,0 +1,21 @@ +@import "../../../assets/css/_structure.less"; + +// conference specific styles here + +// often configured values (and their defaults): +// +// @brand-primary: #337ab7; +// @text-color: @gray-dark; +// +// @link-color: @brand-primary; +// @link-hover-color: darken(@link-color, 15%); +// +// @navbar-default-color: #777777; +// @navbar-default-bg: #f8f8f8; +// +// @navbar-default-link-color: #777; +// @navbar-default-link-hover-color: #333; + +body { + background-color: red; +} diff --git a/index.php b/index.php index cdd58a7..a26f391 100644 --- a/index.php +++ b/index.php @@ -34,22 +34,23 @@ if($route == 'gen/main.css') exit; } +// generic template +$tpl = new PhpTemplate('template/page.phtml'); +$tpl->set(array( + 'baseurl' => forceslash(baseurl()), + 'route' => $route, + 'canonicalurl' => forceslash(baseurl()).forceslash($route), + 'assemblies' => './template/assemblies/', + 'assets' => 'assets/', + + 'conference' => new GenericConference(), +)); + @list($mandator, $route) = explode('/', $route, 2); if(!$mandator) { // root requested - $tpl = new PhpTemplate('template/page.phtml'); - $tpl->set(array( - 'baseurl' => forceslash(baseurl()), - 'route' => $route, - 'canonicalurl' => forceslash(baseurl()).forceslash($route), - 'assemblies' => './template/assemblies/', - 'assets' => 'assets/', - - 'conference' => new GenericConference(), - )); - if(Conferences::getActiveConferencesCount() == 0) { // no clients @@ -72,10 +73,7 @@ if(!$mandator) // multiple clients // show overview - // TODO Template - $clients = Conferences::getActiveConferences(); - var_dump('multiple clients'); - var_dump($clients); + require('view/allconferences.php'); exit; } } @@ -83,7 +81,8 @@ else if(!Conferences::exists($mandator)) { // old url OR wrong client OR // -> error - die('unknown conference '.$mandator); + require('view/404.php'); + exit; } Conferences::load($mandator); diff --git a/model/Conferences.php b/model/Conferences.php index 9f87388..10a3172 100644 --- a/model/Conferences.php +++ b/model/Conferences.php @@ -5,9 +5,16 @@ class Conferences extends ModelBase const MANDATOR_DIR = 'configs/conferences/'; public static function getConferences() { - return array_values(array_filter(scandir(forceslash(Conferences::MANDATOR_DIR)), function($el) { - return $el[0] != '.'; - })); + $conferences = []; + foreach(scandir(forceslash(Conferences::MANDATOR_DIR)) as $el) + { + if($el[0] == '.') + continue; + + $conferences[$el] = Conferences::getConferenceInformation($el); + } + + return $conferences; } public static function getConferencesCount() { return count(Conferences::getConferences()); @@ -15,7 +22,10 @@ class Conferences extends ModelBase public static function getActiveConferences() { return array_values(array_filter( - Conferences::getConferences(), ['Conferences', 'isActive'] + Conferences::getConferences(), + function($info) { + return $info['active']; + } )); } @@ -24,22 +34,28 @@ class Conferences extends ModelBase } public static function exists($mandator) { - return in_array($mandator, Conferences::getConferences()); + return array_key_exists($mandator, Conferences::getConferences()); } - public static function isActive($mandator) { + public static function getConferenceInformation($mandator) { if(isset($GLOBALS['CONFIG'])) $saved_config = $GLOBALS['CONFIG']; Conferences::load($mandator); $conf = new Conference(); - $active = !$conf->isClosed(); + $info = [ + 'slug' => $mandator, + 'link' => forceslash($mandator), + 'active' => !$conf->isClosed(), + 'title' => $conf->getTitle(), + 'description' => $conf->getDescription(), + ]; unset($GLOBALS['CONFIG']); if(isset($saved_config)) $GLOBALS['CONFIG'] = $saved_config; - return $active; + return $info; } public static function hasCustomStyles($mandator) { diff --git a/template/about.phtml b/template/about.phtml index 68aa2fb..eee4896 100644 --- a/template/about.phtml +++ b/template/about.phtml @@ -6,7 +6,7 @@

If you like what we're doing, you can flattr us:

- Flattr this + Flattr this

diff --git a/template/allconferences.phtml b/template/allconferences.phtml new file mode 100644 index 0000000..2d47b82 --- /dev/null +++ b/template/allconferences.phtml @@ -0,0 +1,33 @@ +
+

+

We are currently active on multiple Conferences. Please choose which one you want access.

+ +

+ +
+ + $info): ?> + + +
+
+
+ +

+
+
+
+ +
+
diff --git a/view/allconferences.php b/view/allconferences.php new file mode 100644 index 0000000..8cce073 --- /dev/null +++ b/view/allconferences.php @@ -0,0 +1,8 @@ +render(array( + 'page' => 'allconferences', + 'title' => 'Multiple Conferences', + + 'conferences' => Conferences::getActiveConferences(), +)); -- cgit v1.2.3