From f4a10dd78b1c6951183180c10da181509be70e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= Date: Tue, 10 Feb 2015 09:48:53 +0100 Subject: [PATCH 1/2] - Fix the pods page --- app/controllers/PodsController.php | 7 ++--- app/views/pods.tpl | 18 +++++------- app/widgets/Pods/pods.tpl | 47 ++++++++++++++++-------------- 3 files changed, 34 insertions(+), 38 deletions(-) diff --git a/app/controllers/PodsController.php b/app/controllers/PodsController.php index 78e12710b..a379640ab 100755 --- a/app/controllers/PodsController.php +++ b/app/controllers/PodsController.php @@ -9,10 +9,7 @@ class PodsController extends BaseController { function dispatch() { $this->page->setTitle(__('title.discover', APP_TITLE)); - - $this->page->menuAddLink(__('page.home'), 'root'); - $this->page->menuAddLink(__('page.discover'), 'discover'); - $this->page->menuAddLink(__('page.pods'), 'pods', true); - $this->page->menuAddLink(__('page.about'), 'about'); + + $this->page->setColor('indigo'); } } diff --git a/app/views/pods.tpl b/app/views/pods.tpl index 4373e9176..761811e83 100755 --- a/app/views/pods.tpl +++ b/app/views/pods.tpl @@ -1,12 +1,8 @@ - - -
-
-
- -
- widget('Pods');?> -
-
+
+ widget('Header'); ?> +
+
+ widget('Pods');?> +
+
diff --git a/app/widgets/Pods/pods.tpl b/app/widgets/Pods/pods.tpl index 87feae7fd..a45f0a148 100755 --- a/app/widgets/Pods/pods.tpl +++ b/app/widgets/Pods/pods.tpl @@ -1,27 +1,30 @@ {if="isset($pods)"} - {loop="$pods->pods"} -
-
- - {function="parse_url($value->url, PHP_URL_HOST)"} +
-
{$value->description}
-
- {$value->geo_country} - • - {$c->countryName($value->geo_country)} - {if="$value->geo_city != ''"} - • {$value->geo_city} - {/if} - • - {$value->connected} • {$value->population} -
-
- {/loop} +

{$value->description}

+ + {$value->version} + +

+ {$value->geo_country} + {$c->countryName($value->geo_country)} + {if="$value->geo_city != ''"} + • {$value->geo_city} + {/if} +

+ + {/loop} + {else}
{$c->__('api.error')}
From 5760939f8e02ae6973ad9c32c1a707c5eaf5990b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= Date: Tue, 10 Feb 2015 09:50:15 +0100 Subject: [PATCH 2/2] - Add cards around the pods list --- app/widgets/Pods/pods.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/widgets/Pods/pods.tpl b/app/widgets/Pods/pods.tpl index a45f0a148..0d0b0d1c5 100755 --- a/app/widgets/Pods/pods.tpl +++ b/app/widgets/Pods/pods.tpl @@ -1,8 +1,8 @@ {if="isset($pods)"} -