From b6267dadb6717eae9f661d14dc083bd24fbc3c29 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 31 Jul 2012 10:37:50 -0400
Subject: [PATCH] Hide product version on login screen by default
---
CHANGELOG | 3 ++-
skins/classic/templates/login.html | 2 +-
config/main.inc.php.dist | 3 +++
skins/larry/templates/login.html | 2 +-
4 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 96003b1..1f1acd9 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,7 +1,8 @@
CHANGELOG Roundcube Webmail
===========================
-- Renamed old default' skin to 'classic'. Larry is the new default skin.
+- Don't show product version on login screen (can be enabled by config)
+- Renamed old default skin to 'classic'. Larry is the new default skin.
- Support connections to memcached socket file (#1488577)
- Enable TinyMCE inlinepopups plugin
- Update to TinyMCE 3.5.6
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 89f5966..8f69ca3 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -230,6 +230,9 @@
// Includes should be interpreted as PHP files
$rcmail_config['skin_include_php'] = false;
+// display software version on login screen
+$rcmail_config['display_version'] = false;
+
// Session lifetime in minutes
// must be greater than 'keep_alive'/60
$rcmail_config['session_lifetime'] = 10;
diff --git a/skins/classic/templates/login.html b/skins/classic/templates/login.html
index db5771f..63e09bb 100644
--- a/skins/classic/templates/login.html
+++ b/skins/classic/templates/login.html
@@ -25,7 +25,7 @@
</div>
<div id="login-bottomline">
- Roundcube Webmail <roundcube:object name="version" />
+ <roundcube:var name="config:product_name"> <roundcube:object name="version" condition="config:display_version" />
<roundcube:if condition="config:support_url" />
● <a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link"><roundcube:label name="support" /></a>
<roundcube:endif />
diff --git a/skins/larry/templates/login.html b/skins/larry/templates/login.html
index c0ceb5c..8aac930 100644
--- a/skins/larry/templates/login.html
+++ b/skins/larry/templates/login.html
@@ -24,7 +24,7 @@
</div>
<div id="bottomline">
- Roundcube Webmail <roundcube:object name="version" />
+ <roundcube:var name="config:product_name"> <roundcube:object name="version" condition="config:display_version" />
<roundcube:if condition="config:support_url" />
● <a href="<roundcube:var name='config:support_url' />" target="_blank" class="support-link"><roundcube:label name="support" /></a>
<roundcube:endif />
--
Gitblit v1.9.1