From be88ff5e310c64c9ebcb91e6aea6284db89e66e3 Mon Sep 17 00:00:00 2001
From: redray <redray@ispconfig3>
Date: Fri, 29 Mar 2013 18:52:05 -0400
Subject: [PATCH] Updated 32xIcons and modified logout area.
---
interface/web/themes/default-304/icons/x32_sprite.png | 0
interface/web/themes/default/templates/main.tpl.htm | 2 +-
interface/lib/lang/en.lng | 1 +
interface/lib/lang/de.lng | 1 +
interface/web/themes/default-304/icons/x16_sprite.png | 0
interface/web/themes/default/icons/x16_sprite.png | 0
interface/web/themes/default/css/styles.css | 42 +++++++++++++++++++++---------------------
interface/web/themes/default/icons/x32_sprite.png | 0
8 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/interface/lib/lang/de.lng b/interface/lib/lang/de.lng
index 56b1c1b..e3ea4f6 100644
--- a/interface/lib/lang/de.lng
+++ b/interface/lib/lang/de.lng
@@ -70,6 +70,7 @@
$wb['monthnamesshort_dec'] = 'Dez';
$wb['datepicker_nextText'] = 'Vor';
$wb['datepicker_prevText'] = 'Zurück';
+$wb['activeuser_txt'] = 'Angemeldet als:';
$wb['logout_txt'] = 'Abmelden';
$wb['submit_confirmation'] = 'Wollen Sie diese Aktion wirlich ausführen?';
$wb['globalsearch_resultslimit_of_txt'] = 'von';
diff --git a/interface/lib/lang/en.lng b/interface/lib/lang/en.lng
index 60e9bd3..c823606 100644
--- a/interface/lib/lang/en.lng
+++ b/interface/lib/lang/en.lng
@@ -42,6 +42,7 @@
$wb['top_menu_vm'] = 'VServer';
$wb['toolsarea_head_txt'] = 'Tools';
$wb['latest_news_txt'] = 'Latest news';
+$wb['activeuser_txt'] = 'Logged in as:';
$wb['logout_txt'] = "Logout";
$wb['daynamesmin_su'] = "Su";
$wb['daynamesmin_mo'] = "Mo";
diff --git a/interface/web/themes/default-304/icons/x16_sprite.png b/interface/web/themes/default-304/icons/x16_sprite.png
index f64f7ce..3915a92 100644
--- a/interface/web/themes/default-304/icons/x16_sprite.png
+++ b/interface/web/themes/default-304/icons/x16_sprite.png
Binary files differ
diff --git a/interface/web/themes/default-304/icons/x32_sprite.png b/interface/web/themes/default-304/icons/x32_sprite.png
index 5c9f04f..2680bb8 100644
--- a/interface/web/themes/default-304/icons/x32_sprite.png
+++ b/interface/web/themes/default-304/icons/x32_sprite.png
Binary files differ
diff --git a/interface/web/themes/default/css/styles.css b/interface/web/themes/default/css/styles.css
index b8de084..95b5d94 100644
--- a/interface/web/themes/default/css/styles.css
+++ b/interface/web/themes/default/css/styles.css
@@ -522,9 +522,9 @@
margin: 5px;
background: url("../icons/device_sprite.png") no-repeat transparent;
}
-.systemmonitor-server div.icoDevice { background-position: 0 0; }
-.systemmonitor-ve div.icoDevice { background-position: -64px 0; }
-.systemmonitor-network div.icoDevice { background-position: -128px 0; }
+.systemmonitor-server div.icoDevice { background-position: 0 -128px; }
+.systemmonitor-ve div.icoDevice { background-position: 0 -64px; }
+.systemmonitor-network div.icoDevice { background-position: 0 0px; }
div.statusDevice,
div.statusMsg { float: left; }
div.statusMsg p {
@@ -600,17 +600,17 @@
width:60px;
text-decoration: none;
}
-.dashboard-modules.tools a { background-position: 12px -9px; }
-.dashboard-modules.admin a { background-position: 12px -73px; }
-.dashboard-modules.sites a { background-position: 12px -520px; }
-.dashboard-modules.monitor a { background-position: 13px -585px; }
-.dashboard-modules.help a { background-position: 13px -716px; }
-.dashboard-modules.mail a { background-position: 12px -776px; }
-.dashboard-modules.vm a { background-position: 14px -842px; }
-.dashboard-modules.domain a { background-position: 12px -905px; }
-.dashboard-modules.dns a { background-position: 12px -970px; }
-.dashboard-modules.client a { background-position: 13px -1096px; }
-.dashboard-modules.billing a { background-position: 14px -1162px; }
+.dashboard-modules.tools a { background-position: 14px -8px; }
+.dashboard-modules.admin a { background-position: 14px -72px; }
+.dashboard-modules.sites a { background-position: 14px -520px; }
+.dashboard-modules.monitor a { background-position: 14px -584px; }
+.dashboard-modules.help a { background-position: 14px -712px; }
+.dashboard-modules.mail a { background-position: 14px -776px; }
+.dashboard-modules.vm a { background-position: 14px -840px; }
+.dashboard-modules.domain a { background-position: 14px -904px; }
+.dashboard-modules.dns a { background-position: 14px -968px; }
+.dashboard-modules.client a { background-position: 14px -1096px; }
+.dashboard-modules.billing a { background-position: 14px -116px; }
.panel_dashboard h2 { font-size:20px; }
@@ -737,13 +737,13 @@
/* Button with icon and text */
.iconstxt { background: url("../icons/button_sprite.png") no-repeat transparent; }
.iconstxt span { padding-left: 20px; font-weight: bold; }
-.iconstxt.icoPositive { background-position: 6px -130px; }
-.iconstxt.icoNegative { background-position: 6px -98px; }
-.iconstxt.icoAdd { background-position: 6px -66px; }
-.iconstxt.icoKey { background-position: 6px -1px; }
-.iconstxt.icoDelete { background-position: 6px -34px; }
-.iconstxt.icoDownload { background-position: 6px -1px; }
-.iconstxt.icoRestore { background-position: 6px -1px; }
+.iconstxt.icoPositive { background-position: 0px -136px; }
+.iconstxt.icoNegative { background-position: 0px -104px; }
+.iconstxt.icoAdd { background-position: 0px -72px; }
+.iconstxt.icoKey { background-position: 0px -8px; }
+.iconstxt.icoDelete { background-position: 0px -40px; }
+.iconstxt.icoDownload { background-position: 0px -8px; }
+.iconstxt.icoRestore { background-position: 0px -8px; }
/* Button with icon and without text */
.icons16 { position: relative; }
diff --git a/interface/web/themes/default/icons/x16_sprite.png b/interface/web/themes/default/icons/x16_sprite.png
index 612c53b..3915a92 100644
--- a/interface/web/themes/default/icons/x16_sprite.png
+++ b/interface/web/themes/default/icons/x16_sprite.png
Binary files differ
diff --git a/interface/web/themes/default/icons/x32_sprite.png b/interface/web/themes/default/icons/x32_sprite.png
index 5c9f04f..2680bb8 100644
--- a/interface/web/themes/default/icons/x32_sprite.png
+++ b/interface/web/themes/default/icons/x32_sprite.png
Binary files differ
diff --git a/interface/web/themes/default/templates/main.tpl.htm b/interface/web/themes/default/templates/main.tpl.htm
index 4ccb70a..25fbcd5 100644
--- a/interface/web/themes/default/templates/main.tpl.htm
+++ b/interface/web/themes/default/templates/main.tpl.htm
@@ -137,7 +137,7 @@
<a class="skip" href="#content" title="skip link">Skip to the content</a><span class="hideme">.</span>
<!-- end: skip link navigation -->
<tmpl_if name="cpuser">
- <a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var format="strtoupper" name="logout_txt"> <tmpl_var format="strtoupper" name="cpuser"></a><!-- | <a href="#" onclick="capp('help')">Help</a> | <a href="#">Imprint</a>-->
+ <tmpl_var name="activeuser_txt"> <a href="#usersettings" onclick="loadContent('tools/user_settings.php');"><tmpl_var name="cpuser"></a> <a href="#logout" onclick="loadContent('login/logout.php');"><tmpl_var name="logout_txt"></a>
<tmpl_if name='usertype' op='==' value='normaluser'><input type="text" id="globalsearch" size="25" value="" /></tmpl_if>
</tmpl_if>
</nav>
--
Gitblit v1.9.1