From 3c08ab4276a770a9d3298b2ce4a4179e52b05419 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Wed, 27 Nov 2013 03:12:54 +0000
Subject: [PATCH] refs #4338 format date, fixed some positions

---
 plugins/CorePluginsAdmin/Marketplace.php           |  9 +++++++++
 .../CorePluginsAdmin/stylesheets/marketplace.less  | 14 ++++++++++++--
 plugins/CorePluginsAdmin/templates/macros.twig     |  6 +++---
 .../CorePluginsAdmin/templates/pluginDetails.twig  |  4 ++--
 .../CorePluginsAdmin/templates/pluginOverview.twig |  4 ++--
 .../CorePluginsAdmin/templates/themeOverview.twig  |  4 ++--
 6 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/plugins/CorePluginsAdmin/Marketplace.php b/plugins/CorePluginsAdmin/Marketplace.php
index 93d1cfbb7a6..5afa42c085f 100644
--- a/plugins/CorePluginsAdmin/Marketplace.php
+++ b/plugins/CorePluginsAdmin/Marketplace.php
@@ -133,6 +133,15 @@ private function enrichPluginInformation($plugin)
             $plugin['activity']['lastCommitDate'] = null;
         }
 
+        if (!empty($plugin['versions'])) {
+
+            $dateFormat = Piwik::translate('CoreHome_DateFormat');
+            
+            foreach ($plugin['versions'] as $index => $version) {
+                $plugin['versions'][$index]['release'] = Date::factory($version['release'])->getLocalized($dateFormat);
+            }
+        }
+
         return $plugin;
     }
 
diff --git a/plugins/CorePluginsAdmin/stylesheets/marketplace.less b/plugins/CorePluginsAdmin/stylesheets/marketplace.less
index 28dbecda13c..1e23fb17f2d 100644
--- a/plugins/CorePluginsAdmin/stylesheets/marketplace.less
+++ b/plugins/CorePluginsAdmin/stylesheets/marketplace.less
@@ -84,6 +84,8 @@
       display: inline-block;
       background-color: #ffffe0;
       border-radius: 3px;
+      margin-top: 1px;
+      margin-bottom: 16px;
 
       a {
         color: #9b7a44;
@@ -103,10 +105,14 @@
       &.even {
         padding-right: 0px;
         width: 140px;
+        overflow: hidden;
+        white-space: nowrap;
       }
       &.odd {
         padding-right: 0px;
         width: 130px;
+        overflow: hidden;
+        white-space: nowrap;
       }
     }
 
@@ -149,7 +155,7 @@
 
     .footer {
       position: absolute;
-      bottom: 6px;
+      bottom: 4px;
       left: 0px;
       right: 0px;
       cursor: pointer;
@@ -221,7 +227,7 @@
   line-height: 20px;
   
   h3, h4, h5, h6 {
-    margin: 10px 0px;
+    margin: 20px 0px 10px 0px;
     color: #000000;
   }
 
@@ -318,6 +324,10 @@
     text-decoration: none;
   }
 
+  .install:hover {
+    text-decoration: underline;
+  }
+
   dt {
     font-weight: bold;
     line-height: 20px;
diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
index 8af6daed1bd..483d680d602 100644
--- a/plugins/CorePluginsAdmin/templates/macros.twig
+++ b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -15,13 +15,13 @@
             {% for name,plugin in pluginsHavingUpdate %}
                 <tr {% if plugin.isActivated %}class="highlighted"{% endif %}>
                     <td class="name">
-                        <a href="javascript:return;" data-pluginName="{{ plugin.name|e('html_attr') }}">
+                        <a href="javascript:false;" data-pluginName="{{ plugin.name|e('html_attr') }}">
                             {{ plugin.name }}
                         </a>
                     </td>
                     <td class="vers">
                         {% if plugin.repositoryChangelogUrl %}
-                            <a href="javascript:return;" title="Changelog" data-activePluginTab="changelog" data-pluginName="{{ plugin.name|e('html_attr') }}">{{ plugin.currentVersion }} => {{ plugin.latestVersion }}</a>
+                            <a href="javascript:false;" title="Changelog" data-activePluginTab="changelog" data-pluginName="{{ plugin.name|e('html_attr') }}">{{ plugin.currentVersion }} => {{ plugin.latestVersion }}</a>
                         {% else %}
                             {{ plugin.currentVersion }} => {{ plugin.latestVersion }}
                         {% endif %}
@@ -117,7 +117,7 @@
                         {% if plugin.isCorePlugin or plugin.info.version == 'Unknown'|translate %}
                             {{ name }}
                         {% else %}
-                            <a href="javascript:return;" data-pluginName="{{ name|e('html_attr') }}">
+                            <a href="javascript:false;" data-pluginName="{{ name|e('html_attr') }}">
                                 {{ name }}
                             </a>
                         {% endif %}
diff --git a/plugins/CorePluginsAdmin/templates/pluginDetails.twig b/plugins/CorePluginsAdmin/templates/pluginDetails.twig
index 18e6280767b..dff4fab3abd 100644
--- a/plugins/CorePluginsAdmin/templates/pluginDetails.twig
+++ b/plugins/CorePluginsAdmin/templates/pluginDetails.twig
@@ -75,7 +75,7 @@
                             <h3>History</h3>
 
                             <ul>
-                                {% for version in plugin.versions %}
+                                {% for version in plugin.versions|reverse %}
                                     <li>
                                         <strong>
                                             {% if version.repositoryChangelogUrl %}
@@ -84,7 +84,7 @@
                                                 {{ version.name }}
                                             {% endif %}
                                         </strong>
-                                        from {{ version.release|date }}</li>
+                                        from {{ version.release }}</li>
                                 {% endfor %}
                             </ul>
                         </div>
diff --git a/plugins/CorePluginsAdmin/templates/pluginOverview.twig b/plugins/CorePluginsAdmin/templates/pluginOverview.twig
index 0d8e603a4d7..e889d9e81b9 100644
--- a/plugins/CorePluginsAdmin/templates/pluginOverview.twig
+++ b/plugins/CorePluginsAdmin/templates/pluginOverview.twig
@@ -15,11 +15,11 @@
 
 
 <h3 class="header" title="Click for more details">
-    <a href="javascript:return;" class="more">{{ plugin.name }}</a>
+    <a href="javascript:false;" class="more">{{ plugin.name }}</a>
 </h3>
 <p class="description">{{ plugin.description }}
     <br />
-    <a href="javascript:return;" title="Click for more details" class="more">&gt;&gt; more</a>
+    <a href="javascript:false;" title="Click for more details" class="more">&gt;&gt; more</a>
 </p>
 {% if plugin.canBeUpdated %}
     <p class="updateAvailableNotice" data-activePluginTab="changelog">You can update this plugin from version {{ plugin.currentVersion }} to {{ plugin.latestVersion }}</p>
diff --git a/plugins/CorePluginsAdmin/templates/themeOverview.twig b/plugins/CorePluginsAdmin/templates/themeOverview.twig
index e0d425eb922..896727a2c99 100644
--- a/plugins/CorePluginsAdmin/templates/themeOverview.twig
+++ b/plugins/CorePluginsAdmin/templates/themeOverview.twig
@@ -14,12 +14,12 @@
 {% endif %}
 
 <h3 class="header" title="Click for more details">
-    <a href="javascript:return;" class="more">{{ plugin.name }}</a>
+    <a href="javascript:false;" class="more">{{ plugin.name }}</a>
 </h3>
 
 <p class="description">{% if plugin.featured %}{{ plugins.featuredIcon('right') }}{% endif %}{{ plugin.description }}</p>
 
-<a href="javascript:return;" class="more"><img  title="Click for more details"
+<a href="javascript:false;" class="more"><img  title="Click for more details"
             class="preview" src="{{ plugin.screenshots|first }}?w=250&h=250"/></a>
 
 {% if plugin.canBeUpdated %}