summaryrefslogtreecommitdiffstats
path: root/public_html
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-01-04 12:40:47 +0100
committerAleksander Machniak <alec@alec.pl>2012-01-04 12:40:47 +0100
commit20e4e049519119a27446f464769f788754f46426 (patch)
treee8e76ee71864de35860204c3900f997b69285ecb /public_html
parentc5ff76152f6d9efa4e28dc52d6261ce8feee2b04 (diff)
downloadwebadmin-20e4e049519119a27446f464769f788754f46426.tar.gz
Style improvements here and there, new logout button
Diffstat (limited to 'public_html')
-rw-r--r--public_html/skins/default/images/logout.pngbin624 -> 765 bytes
-rw-r--r--public_html/skins/default/style.css31
-rw-r--r--public_html/skins/default/templates/main.html2
-rw-r--r--public_html/skins/default/templates/user.html7
-rw-r--r--public_html/skins/default/ui.js3
5 files changed, 21 insertions, 22 deletions
diff --git a/public_html/skins/default/images/logout.png b/public_html/skins/default/images/logout.png
index b04feeb..a07e5cb 100644
--- a/public_html/skins/default/images/logout.png
+++ b/public_html/skins/default/images/logout.png
Binary files differ
diff --git a/public_html/skins/default/style.css b/public_html/skins/default/style.css
index 66d491b..8ea23e2 100644
--- a/public_html/skins/default/style.css
+++ b/public_html/skins/default/style.css
@@ -104,6 +104,7 @@ table.form tr.error input {
td.label {
width: 1%;
+ min-width: 120px;
text-align: right;
font-weight: bold;
white-space: nowrap;
@@ -114,8 +115,8 @@ td.label {
#topmenu {
text-align: right;
height: 20px;
- padding-top: 1px;
- margin: 0 15px;
+ padding: 0;
+ margin: 0 10px;
white-space: nowrap;
}
@@ -219,8 +220,9 @@ td.label {
}
#topmenu .logout {
- background: url(images/logout.png) center no-repeat;
- padding: 0 20px;
+ background: url(images/logout.png) center 10px no-repeat;
+ padding: 9px 16px;
+ margin: 0px 5px 0px 10px;
}
#topmenu .login {
@@ -381,6 +383,16 @@ td.label {
margin-top: 5px;
}
+#search td.label {
+ min-width: 0;
+}
+
+div.vsplitter {
+ float: left;
+ width: 10px;
+ min-height: 400px;
+}
+
/**** Common classes ****/
.watermark {
@@ -402,10 +414,6 @@ td.label {
color: #d0d0d0;
}
-td.label {
- min-width: 120px;
-}
-
.formtitle {
color: #ff9900;
font-size: 18px;
@@ -421,12 +429,6 @@ td.label {
margin: 5px;
}
-div.vsplitter {
- float: left;
- width: 10px;
- min-height: 400px;
-}
-
/***** tabbed interface elements *****/
div.tabsbar
@@ -452,6 +454,7 @@ span.tablink-selected
span.tablink
{
cursor: pointer;
+ text-shadow: white 1px 1px;
}
span.tablink-selected
diff --git a/public_html/skins/default/templates/main.html b/public_html/skins/default/templates/main.html
index e46c291..5fa0aea 100644
--- a/public_html/skins/default/templates/main.html
+++ b/public_html/skins/default/templates/main.html
@@ -13,7 +13,7 @@
<div id="logo"></div>
<div id="topmenu">
<span class="login">{$user.fullname}</span>
- <span class="logout link icon" title="{$engine->translate('Logout')}" onclick="kadm.main_logout()"></span>
+ <span class="logout link" title="{$engine->translate('Logout')}" onclick="kadm.main_logout()"></span>
</div>
<div id="navigation">{$main_menu}</div>
<div id="task_navigation">{$task_menu}</div>
diff --git a/public_html/skins/default/templates/user.html b/public_html/skins/default/templates/user.html
index 1729539..6813003 100644
--- a/public_html/skins/default/templates/user.html
+++ b/public_html/skins/default/templates/user.html
@@ -8,12 +8,7 @@
<span id="search-reset" title="{$engine->translate('search.reset')}" onclick="search_reset()"></span>
</span>
</div>
- <div class="searchdetails">
- <fieldset>
- <legend>{$engine->translate('search.criteria')}</legend>
- <label for="">{$engine->translate('search.field')}</label>
- </fieldset>
- </div>
+ <div class="searchdetails">{$engine->search_form()}</div>
</div>
<div id="userlist"></div>
</div>
diff --git a/public_html/skins/default/ui.js b/public_html/skins/default/ui.js
index 82038f4..c0bace5 100644
--- a/public_html/skins/default/ui.js
+++ b/public_html/skins/default/ui.js
@@ -94,7 +94,8 @@ function show_tab(id, index)
function form_loaded(data)
{
- init_tabs(data);
+ if (data != 'search-form')
+ init_tabs(data);
}
/**