From b81e1a9efb6b869998d648b28e2d4041af6dbdd5 Mon Sep 17 00:00:00 2001
From: cfoe <cfoe@ispconfig3>
Date: Tue, 17 Jul 2012 03:21:18 -0400
Subject: [PATCH] changed topNav to min-width to accommodate longer lang strings for module names (FS#2308)
---
interface/web/themes/default/css/navigation/nav_top.css | 6 ++++--
interface/web/themes/default/templates/topnav.tpl.htm | 4 ++--
interface/web/themes/default-v2/templates/topnav.tpl.htm | 4 ++--
interface/web/themes/default-v2/css/styles.css | 7 +++++--
4 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/interface/web/themes/default-v2/css/styles.css b/interface/web/themes/default-v2/css/styles.css
index 6c1c19a..b011165 100644
--- a/interface/web/themes/default-v2/css/styles.css
+++ b/interface/web/themes/default-v2/css/styles.css
@@ -159,13 +159,14 @@
padding-top:37px;
text-align:center;
text-decoration:none;
- width:78px;
+ min-width:78px;
}
#topNav a:hover {
background-color: #eeeeee;
color: #000000;
}
+
#topNav #topNav_current a {
font-weight: bold;
color: black;
@@ -185,7 +186,9 @@
.topnav-dashboard { background-position: 22px -1035px !important; }
.topnav-client { background-position: 22px -1098px !important; }
.topnav-billing { background-position: 22px -1162px !important; }
-
+#topNav a span {
+ padding: 0 3px;
+ }
/* main
-------------------------------------------------------------- */
#main {
diff --git a/interface/web/themes/default-v2/templates/topnav.tpl.htm b/interface/web/themes/default-v2/templates/topnav.tpl.htm
index b86b9ab..4c68196 100644
--- a/interface/web/themes/default-v2/templates/topnav.tpl.htm
+++ b/interface/web/themes/default-v2/templates/topnav.tpl.htm
@@ -1,9 +1,9 @@
<ul id="topmenu">
<tmpl_loop name="nav_top">
<tmpl_if name="active">
- <li id="topNav_current"><a href="#" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
+ <li id="topNav_current"><a href="#" class="topnav topnav-<tmpl_var name='module'>"><span><tmpl_var name="title"></span></a></li>
<tmpl_else>
- <li><a href="#" onClick="capp('<tmpl_var name='module'>')" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
+ <li><a href="#" onClick="capp('<tmpl_var name='module'>')" class="topnav topnav-<tmpl_var name='module'>"><span><tmpl_var name="title"></span></a></li>
</tmpl_if>
</tmpl_loop>
</ul>
diff --git a/interface/web/themes/default/css/navigation/nav_top.css b/interface/web/themes/default/css/navigation/nav_top.css
index 3f4eb8b..573ebc6 100644
--- a/interface/web/themes/default/css/navigation/nav_top.css
+++ b/interface/web/themes/default/css/navigation/nav_top.css
@@ -38,14 +38,16 @@
padding-top:37px;
text-align:center;
text-decoration:none;
- width:78px;
+ min-width:78px;
}
#topNav a:hover {
background-color: #eeeeee;
color: #000000;
}
-
+ #topNav a span {
+ padding: 0 3px;
+ }
#topNav #topNav_current {
}
diff --git a/interface/web/themes/default/templates/topnav.tpl.htm b/interface/web/themes/default/templates/topnav.tpl.htm
index b86b9ab..4c68196 100644
--- a/interface/web/themes/default/templates/topnav.tpl.htm
+++ b/interface/web/themes/default/templates/topnav.tpl.htm
@@ -1,9 +1,9 @@
<ul id="topmenu">
<tmpl_loop name="nav_top">
<tmpl_if name="active">
- <li id="topNav_current"><a href="#" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
+ <li id="topNav_current"><a href="#" class="topnav topnav-<tmpl_var name='module'>"><span><tmpl_var name="title"></span></a></li>
<tmpl_else>
- <li><a href="#" onClick="capp('<tmpl_var name='module'>')" class="topnav topnav-<tmpl_var name='module'>"><tmpl_var name="title"></a></li>
+ <li><a href="#" onClick="capp('<tmpl_var name='module'>')" class="topnav topnav-<tmpl_var name='module'>"><span><tmpl_var name="title"></span></a></li>
</tmpl_if>
</tmpl_loop>
</ul>
--
Gitblit v1.9.1