From 460f7c822603b89140015fb77beddca1696df1fc Mon Sep 17 00:00:00 2001
From: Steffen Hansen <steffen@kdab.com>
Date: Wed, 26 Jan 2005 01:37:00 +0100
Subject: added "favicon" and made the Version menu-entry boldface to make it
 stand out from the other items on the about page

---
 Makefile.am                     |  10 ++++++++--
 php/admin/include/menu.php      |   4 ++--
 php/admin/templates/en/page.tpl |   4 ++--
 www/favicon.ico                 | Bin 0 -> 1406 bytes
 4 files changed, 12 insertions(+), 6 deletions(-)
 create mode 100644 www/favicon.ico

diff --git a/Makefile.am b/Makefile.am
index 7148ea5..5fe7fb1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,9 +10,14 @@ do_subst = sed \
 
 noinst_HEADERS = @PACKAGE@.spec
 
+WSTOPLEVEL_FILES = www/favicon.ico
+
+wstopleveldir = $(wsdocrootdir)
+wstoplevel_DATA = $(WSTOPLEVEL_FILES)
+
 WSADMIN_FILES = www/admin/index.php \
 	www/admin/logout.php \
-	www/admin/style.css
+	www/admin/style.css 
 
 wsadmindir = $(wsdocrootdir)/admin
 wsadmin_DATA = $(WSADMIN_FILES)
@@ -137,7 +142,8 @@ phptemplatesdir = $(phpadmindir)/templates
 phptemplatesendir = $(phptemplatesdir)/en
 phptemplatesen_DATA = $(PHP_TEMPLATES_EN)
 
-EXTRA_DIST += $(WSADMIN_FILES) \
+EXTRA_DIST += $(WSTOPLEVEL_FILES) \
+	$(WSADMIN_FILES) \
 	$(WSADDRESSBOOK_FILES) \
 	$(WSADMINISTRATOR_FILES) \
 	$(WSDISTRIBUTIONLIST_FILES) \
diff --git a/php/admin/include/menu.php b/php/admin/include/menu.php
index b742853..dc68083 100644
--- a/php/admin/include/menu.php
+++ b/php/admin/include/menu.php
@@ -96,7 +96,7 @@ $menuitems['about'] = array( 'name' => _('About Kolab'),
 													   'url'  => 'erfrakon.php' ),
 												array( 'name' => _('Intevation'),
 													   'url'  => 'intevation.php' ),
-												array( 'name' => _('Klarälvdalens Datakonsult'),
+												array( 'name' => _('Klar&auml;lvdalens Datakonsult'),
 													   'url'  => 'kdab.php' ),
 												array( 'name' => _('Code Fusion'),
 													   'url'  => 'codefusion.php' ),
@@ -104,7 +104,7 @@ $menuitems['about'] = array( 'name' => _('About Kolab'),
 													   'url'  => 'kde.php' )
 												));
 if( $auth->group() == 'admin' || $auth->group() == 'maintainer' ) {
-  $menuitems['about']['submenu'][] = array( 'name' => _('Versions'),
+  $menuitems['about']['submenu'][] = array( 'name' => _('<b>Versions</b>'),
 											'url'  => 'versions.php' );
 }
 
diff --git a/php/admin/templates/en/page.tpl b/php/admin/templates/en/page.tpl
index 86b421e..b8dc41a 100644
--- a/php/admin/templates/en/page.tpl
+++ b/php/admin/templates/en/page.tpl
@@ -32,7 +32,7 @@ Not logged in
 <div id="topmenu">
 {foreach from=$menuitems item=menuitem}
 <a href="{$menuitem.url}">
-	<span class="topmenuitem{$menuitem.selected}">&nbsp;{$menuitem.name|escape:"html"}&nbsp;</span>
+	<span class="topmenuitem{$menuitem.selected}">&nbsp;{$menuitem.name}&nbsp;</span>
 </a>
 {/foreach}
 </div>
@@ -42,7 +42,7 @@ Not logged in
 {strip}
 {section name=id loop=$submenuitems}
 <a href="{$submenuitems[id].url}">
-	<span class="submenuitem{$submenuitems[id].selected}">{$submenuitems[id].name|escape:"html"}</span>
+	<span class="submenuitem{$submenuitems[id].selected}">{$submenuitems[id].name}</span>
 </a>&nbsp;|&nbsp;
 {/section}
 {/strip}
diff --git a/www/favicon.ico b/www/favicon.ico
new file mode 100644
index 0000000..0f8fa08
Binary files /dev/null and b/www/favicon.ico differ
-- 
cgit v0.12