From 50d6e918e147b12a547d01b877c98b558d6cfd66 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 18 Jan 2012 06:50:17 -0500
Subject: [PATCH] Use <uri> value from package.xml to build download links in about screen; show links in default style
---
skins/larry/templates/about.html | 4 ++--
program/steps/settings/about.inc | 3 ++-
skins/larry/styles.css | 7 -------
skins/larry/mail.css | 7 +++++++
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/program/steps/settings/about.inc b/program/steps/settings/about.inc
index 5351dd8..a17b3c0 100644
--- a/program/steps/settings/about.inc
+++ b/program/steps/settings/about.inc
@@ -64,7 +64,7 @@
$table->add_header('source', rcube_label('source'));
foreach ($plugins as $name => $data) {
- $uri = $data['srcuri'];
+ $uri = $data['srcuri'] ? $data['srcuri'] : $data['uri'];
if ($uri && stripos($uri, 'http') !== 0) {
$uri = 'http://' . $uri;
}
@@ -90,6 +90,7 @@
'license' => 'string(//rc:package/rc:license)',
'license_uri' => 'string(//rc:package/rc:license/@uri)',
'srcuri' => 'string(//rc:package/rc:srcuri)',
+ 'uri' => 'string(//rc:package/rc:uri)',
);
$package = INSTALL_PATH . "/plugins/$name/package.xml";
diff --git a/skins/larry/mail.css b/skins/larry/mail.css
index b74a2f0..2e9f886 100644
--- a/skins/larry/mail.css
+++ b/skins/larry/mail.css
@@ -384,6 +384,13 @@
display: inline-block;
}
+#messagelist tbody td a {
+ color: #333;
+ text-decoration: none;
+ white-space: nowrap;
+ cursor: default;
+}
+
#messagelist tbody tr td.flag,
#messagelist tbody tr td.status,
#messagelist tbody tr td.subject span.status {
diff --git a/skins/larry/styles.css b/skins/larry/styles.css
index 4ca9ac7..3d090c0 100644
--- a/skins/larry/styles.css
+++ b/skins/larry/styles.css
@@ -958,13 +958,6 @@
border-left: 0;
}
-.records-table tbody td a {
- color: #333;
- text-decoration: none;
- white-space: nowrap;
- cursor: default;
-}
-
.records-table tr.selected td {
color: #fff !important;
background: #019bc6;
diff --git a/skins/larry/templates/about.html b/skins/larry/templates/about.html
index 04e308a..2236ba5 100644
--- a/skins/larry/templates/about.html
+++ b/skins/larry/templates/about.html
@@ -10,7 +10,7 @@
<roundcube:object name="aboutcontent" />
<h2 class="sysname">Roundcube Webmail <roundcube:object name="version" /></h2>
-<p class="copyright">Copyright © 2005-2011, The Roundcube Dev Team</p>
+<p class="copyright">Copyright © 2005-2012, The Roundcube Dev Team</p>
<p class="license">This program is free software; you can redistribute it and/or modify
it under the terms of the <a href="http://www.gnu.org/licenses/gpl.html" target="_blank">GNU General Public License</a>
as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
@@ -20,7 +20,7 @@
<div class="readtext">
<h3><roundcube:label name="installedplugins" en_US="Installed plugins" /></h3>
-<roundcube:object name="pluginlist" id="pluginlist" class="records-table" cellspacing="0" />
+<roundcube:object name="pluginlist" id="pluginlist" class="records-table" />
</div>
</body>
--
Gitblit v1.9.1