From df8f2cdb2681b8d3529b8b8140afe979b82f2c7b Mon Sep 17 00:00:00 2001 From: Thomas Steur <thomas.steur@gmail.com> Date: Thu, 12 Sep 2013 15:46:32 +1200 Subject: [PATCH] renamed searchPlugin to browsePlugin, added browseThemes --- plugins/CorePluginsAdmin/Controller.php | 14 ++++- ...{search_plugin.twig => browsePlugins.twig} | 2 + .../templates/browseThemes.twig | 52 +++++++++++++++++++ 3 files changed, 66 insertions(+), 2 deletions(-) rename plugins/CorePluginsAdmin/templates/{search_plugin.twig => browsePlugins.twig} (96%) create mode 100644 plugins/CorePluginsAdmin/templates/browseThemes.twig diff --git a/plugins/CorePluginsAdmin/Controller.php b/plugins/CorePluginsAdmin/Controller.php index 996ffd3e19..e5a69e5aa5 100644 --- a/plugins/CorePluginsAdmin/Controller.php +++ b/plugins/CorePluginsAdmin/Controller.php @@ -23,9 +23,9 @@ use Piwik\Url; class Controller extends \Piwik\Controller\Admin { - function search_plugin() + function browsePlugins() { - $view = $this->configureView('@CorePluginsAdmin/search_plugin'); + $view = $this->configureView('@CorePluginsAdmin/browsePlugins'); $plugins = json_decode(file_get_contents('http://plugins.piwik.org/api/1.0/plugins')); $view->plugins = $plugins->plugins; @@ -33,6 +33,16 @@ class Controller extends \Piwik\Controller\Admin echo $view->render(); } + function browseThemes() + { + $view = $this->configureView('@CorePluginsAdmin/browseThemes'); + + $plugins = json_decode(file_get_contents('http://plugins.piwik.org/api/1.0/themes')); + $view->plugins = $plugins->plugins; + + echo $view->render(); + } + function extend() { $view = $this->configureView('@CorePluginsAdmin/extend'); diff --git a/plugins/CorePluginsAdmin/templates/search_plugin.twig b/plugins/CorePluginsAdmin/templates/browsePlugins.twig similarity index 96% rename from plugins/CorePluginsAdmin/templates/search_plugin.twig rename to plugins/CorePluginsAdmin/templates/browsePlugins.twig index f78cefe68f..5d11cccb8d 100644 --- a/plugins/CorePluginsAdmin/templates/search_plugin.twig +++ b/plugins/CorePluginsAdmin/templates/browsePlugins.twig @@ -20,6 +20,8 @@ <a href="#">popular</a> | <a href="#">newest</a> + | + <a href="#">alpha</a> </div> </div> diff --git a/plugins/CorePluginsAdmin/templates/browseThemes.twig b/plugins/CorePluginsAdmin/templates/browseThemes.twig new file mode 100644 index 0000000000..4b57149ac9 --- /dev/null +++ b/plugins/CorePluginsAdmin/templates/browseThemes.twig @@ -0,0 +1,52 @@ +{% extends 'admin.twig' %} + +{% block content %} + <style type="text/css"> + .plugin li { display: inline-block;padding-right: 10px;font-size: 90%; } + .plugin ul { list-style: none;margin-left: 0; } + .plugin .description { padding-bottom: 10px; } + .plugin .install { float: right; } + .plugin h3 { display: inline; } + .plugin { width: 300px; float: left; } + .pluginslist { margin-top: 20px;max-width:980px; } + </style> + + <div style="max-width:980px;"> + + <h2>Extend Piwik by installing a new plugin</h2> + + <div> + <input placeholder="Search" type="text" name="q"/> + <button type="submit">Search</button> + | + <a href="#">popular</a> + | + <a href="#">newest</a> + | + <a href="#">alpha</a> + </div> + </div> + + <div class="pluginslist" style=""> + + {% for plugin in plugins %} + + <div class="plugin"> + + <a href="#" class="install">Install</a> + + <h3>{{ plugin.name }}</h3> + <p class="description">{{ plugin.description }}</p> + <img src="" height="250" width="250"/> + <ul> + <li>Version {{ plugin.latestVersion }}</li> + <li>Updated {{ plugin.timestamp }}</li> + <li>Downloads {{ plugin.numDownloads }}</li> + </ul> + + </div> + + {% endfor %} + + </div> +{% endblock %} -- GitLab