From 2c0d4431501d331a8d0c11fc74d4c335451cf150 Mon Sep 17 00:00:00 2001 From: janw Date: Fri, 25 Nov 2005 14:24:16 +0000 Subject: [PATCH] [COSMETIC] Fixed alignment in newer browsers git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@2071 594d385d-05f5-0310-b6e9-bd551577e9d8 --- html/themes/default/style.css | 6 ++++ ihtml/themes/default/conflict.tpl | 4 +-- ihtml/themes/default/framework.tpl | 18 +++++----- ihtml/themes/default/help.tpl | 20 +++++------ ihtml/themes/default/islocked.tpl | 6 ++-- ihtml/themes/default/login.tpl | 8 ++--- include/class_divlist.inc | 16 +++++++-- .../class_applicationManagement.inc | 14 ++++---- .../class_departmentManagement.inc | 14 ++++---- plugins/admin/fai/class_faiManagement.inc | 28 +++++++-------- plugins/admin/fai/class_faiPackageEntry.inc | 1 + .../admin/groups/class_groupManagement.inc | 14 ++++---- plugins/admin/groups/headpage.tpl | 36 +++++++++---------- .../admin/ogroups/class_ogroupManagement.inc | 14 ++++---- .../admin/systems/class_systemManagement.inc | 24 ++++++------- plugins/admin/users/class_userManagement.inc | 16 ++++----- plugins/admin/users/headpage.tpl | 20 +++++------ plugins/admin/users/main.inc | 2 +- .../blocklists/class_blocklistManagement.inc | 14 ++++---- .../class_phoneConferenceManagment.inc | 14 ++++---- .../macro/class_gofonMacroManagement.inc | 14 ++++---- 21 files changed, 158 insertions(+), 145 deletions(-) diff --git a/html/themes/default/style.css b/html/themes/default/style.css index 0fedb77af..920a1e7c1 100644 --- a/html/themes/default/style.css +++ b/html/themes/default/style.css @@ -195,6 +195,8 @@ a.maintitlebar, div.maintitlebar { text-decoration:none; color:#00348B; font-size:12px; + text-align:center; + vertical-align:middle; } a.maintitlebar:hover { @@ -635,6 +637,7 @@ div.contentboxh { border:1px solid #b0b0b0; border-bottom-width:0px; height:26px; + vertical-align:middle; } p.contentboxh { @@ -642,17 +645,20 @@ p.contentboxh { font-family:arial,helvetica,sans-serif; font-size:16px; font-weight:bold; + vertical-align:middle; } div.contentboxb { border:1px solid #b0b0b0; border-top-width:0px; + vertical-align:middle; } p.contentboxb { padding-bottom:0px; margin:0px; border:4px solid #f8f8f8; + vertical-align:middle; } a.alphaselect:hover { diff --git a/ihtml/themes/default/conflict.tpl b/ihtml/themes/default/conflict.tpl index 8d5169578..af63fc3e2 100644 --- a/ihtml/themes/default/conflict.tpl +++ b/ihtml/themes/default/conflict.tpl @@ -7,10 +7,10 @@

- {t}Ignoring this message will change/destroy the data you're currently editing, so please close multiple windows and log in again.{/t} + {t}Ignoring this message will change/destroy the data you're currently editing, so please close multiple windows and log in again.{/t}

- +

diff --git a/ihtml/themes/default/framework.tpl b/ihtml/themes/default/framework.tpl index 2b068128a..cb18a3649 100644 --- a/ihtml/themes/default/framework.tpl +++ b/ihtml/themes/default/framework.tpl @@ -8,28 +8,28 @@ GOSA2 - +
-
- + + GOSA2 {t}Main{/t} - + GOSA2 {t}Help{/t} - + GOSA2 {t}Sign out{/t}
- -
+ + @@ -40,11 +40,11 @@
 
{$menu} -
+
- +
diff --git a/ihtml/themes/default/help.tpl b/ihtml/themes/default/help.tpl index 72b5d46fd..0109bc4f9 100644 --- a/ihtml/themes/default/help.tpl +++ b/ihtml/themes/default/help.tpl @@ -1,14 +1,14 @@ - + {$php_errors}
-
- +
+
- - -
+ {t}GOsa help viewer{/t} + {$backward}    @@ -17,17 +17,13 @@    {$forward} -   + +  
-
+
{$help_contents}
diff --git a/ihtml/themes/default/islocked.tpl b/ihtml/themes/default/islocked.tpl index cd62c2775..a76b61948 100644 --- a/ihtml/themes/default/islocked.tpl +++ b/ihtml/themes/default/islocked.tpl @@ -1,5 +1,5 @@
-  {t}Locking conflict detected{/t} +  {t}Locking conflict detected{/t}

@@ -10,9 +10,9 @@

- +   - +

diff --git a/ihtml/themes/default/login.tpl b/ihtml/themes/default/login.tpl index 94721fa07..ea540935e 100644 --- a/ihtml/themes/default/login.tpl +++ b/ihtml/themes/default/login.tpl @@ -6,9 +6,9 @@
- +
-
+

@@ -20,7 +20,7 @@ - +
diff --git a/include/class_divlist.inc b/include/class_divlist.inc index 91fe65e16..203d22984 100644 --- a/include/class_divlist.inc +++ b/include/class_divlist.inc @@ -18,6 +18,8 @@ class divlist { $this->i_currentPage = 0; $this->i_entriesPerPage = 10; + $this->s_height = "500"; + $this->s_width = "600"; $this->s_summary = ""; $this->a_entries = array(); $this->a_header = array(); @@ -42,6 +44,14 @@ class divlist { function SetHeader($a_headerdata) { $this->a_header[] = $a_headerdata ; } + + function SetHeight($s_height) { + $this->s_height= $s_height; + } + + function SetWidth($s_width) { + $this->s_width= $s_width; + } function SetEntriesPerPage($i_num){ $this->i_entriesPerPage=$i_num; @@ -49,7 +59,7 @@ class divlist { function DrawList(){ $s_return = ""; - $s_return.= "
{t}Username{/t} @@ -51,7 +51,7 @@
-
+
"; + $s_return.= "
"; $s_return.= $this->_generateHeader(); $s_return.=$this->_generatePage(); @@ -82,7 +92,7 @@ class divlist { // Using scrolltable? if($this->i_entriesPerPage == 0) { - $s_return .= "\n
"; + $s_return .= "\n
"; } $s_return .= "\n"; @@ -119,7 +129,7 @@ class divlist { $s_return = ""; // We need to construct a "body"-table that is width-of-scrollbar thinner than the "head"-table. - $s_return .= "\n
"; + $s_return .= "\n
"; // Only reduce width if we need a scrollbar (>19 Entries) if($this->_numEntries()>19) { diff --git a/plugins/admin/applications/class_applicationManagement.inc b/plugins/admin/applications/class_applicationManagement.inc index 465505913..6b70a3a57 100644 --- a/plugins/admin/applications/class_applicationManagement.inc +++ b/plugins/admin/applications/class_applicationManagement.inc @@ -323,14 +323,14 @@ class applicationManagement extends plugin // Managment $listhead = "
". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + "  ". _("Current base")." ". - "  ". + "  ". "
"; diff --git a/plugins/admin/departments/class_departmentManagement.inc b/plugins/admin/departments/class_departmentManagement.inc index fa2aa3bda..b062cd147 100644 --- a/plugins/admin/departments/class_departmentManagement.inc +++ b/plugins/admin/departments/class_departmentManagement.inc @@ -277,14 +277,14 @@ class departmentManagement extends plugin /* Generate list head */ $listhead = "
". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + "  ". _("Current base")." ". - "  ". + "  ". "
"; /* Show main page */ diff --git a/plugins/admin/fai/class_faiManagement.inc b/plugins/admin/fai/class_faiManagement.inc index 9d11242dc..a1b86f8ef 100644 --- a/plugins/admin/fai/class_faiManagement.inc +++ b/plugins/admin/fai/class_faiManagement.inc @@ -422,44 +422,44 @@ class faiManagement extends plugin $faihead = "
 ". - " ". - " ". - " ". - "\"\" ". + "\"\" ". - "  ". - "\"\" ". + "\"\" ". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". + "  ". _("Current base")." ". - "  ". + "  ". "
"; diff --git a/plugins/admin/fai/class_faiPackageEntry.inc b/plugins/admin/fai/class_faiPackageEntry.inc index 617de0f43..860b6707a 100644 --- a/plugins/admin/fai/class_faiPackageEntry.inc +++ b/plugins/admin/fai/class_faiPackageEntry.inc @@ -47,6 +47,7 @@ class faiPackageEntry extends plugin $divlist = new divlist("PackageEntry"); $divlist->SetSummary(_("This list displays all assigned package names for this repository settings.")); $divlist->SetEntriesPerPage(0); + $divlist->SetHeight("650px;"); $divlist->SetHeader(array(array("string" => " ", "attach" => "style='text-align:center;width:20px;'"), array("string" => "Name", "attach" => "style=''"), array("string" => "Version", "attach" => "style='width:100px;'"), diff --git a/plugins/admin/groups/class_groupManagement.inc b/plugins/admin/groups/class_groupManagement.inc index e982d2da8..78d37b445 100644 --- a/plugins/admin/groups/class_groupManagement.inc +++ b/plugins/admin/groups/class_groupManagement.inc @@ -348,14 +348,14 @@ class groupManagement extends plugin // Managment $listhead = "
". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + "  ". _("Current base")." ". - "  ". + "  ". "
"; diff --git a/plugins/admin/groups/headpage.tpl b/plugins/admin/groups/headpage.tpl index 5e2804f57..9ebf1d5a6 100644 --- a/plugins/admin/groups/headpage.tpl +++ b/plugins/admin/groups/headpage.tpl @@ -3,7 +3,7 @@

- {$hint} + {$hint}

@@ -36,33 +36,33 @@
- - -
- {t}Show primary groups{/t} +
+ - -
- {t}Show samba groups{/t} +
+ - -
- {t}Show application groups{/t} +
+ - -
- {t}Show mail groups{/t} +
+ - -
+ +
- + @@ -70,7 +70,7 @@
- +
diff --git a/plugins/admin/ogroups/class_ogroupManagement.inc b/plugins/admin/ogroups/class_ogroupManagement.inc index 68c8a370b..c90fa8ee7 100644 --- a/plugins/admin/ogroups/class_ogroupManagement.inc +++ b/plugins/admin/ogroups/class_ogroupManagement.inc @@ -356,16 +356,16 @@ class ogroupManagement extends plugin // Managment $listhead = "
". - "  ". - "  ". + "  ". - "  ". - "  ". - " ". - "  ". + "  ". + " ". + "  ". _("Current base")." ". - "  ". + "  ". "
"; diff --git a/plugins/admin/systems/class_systemManagement.inc b/plugins/admin/systems/class_systemManagement.inc index 61078cb99..85e3a1121 100644 --- a/plugins/admin/systems/class_systemManagement.inc +++ b/plugins/admin/systems/class_systemManagement.inc @@ -562,19 +562,19 @@ class systems extends plugin /* NEW LIST MANAGMENT */ $listhead = "
". - "  ". - "  ". - "  ". - "  ". - " ". - " ". - " ". - " ". - " ". - " ". - "  ". + "  ". + "  ". + "  ". + "  ". + " ". + " ". + " ". + " ". + " ". + " ". + "  ". _("Current base")." ". - "  ". + "  ". "
"; diff --git a/plugins/admin/users/class_userManagement.inc b/plugins/admin/users/class_userManagement.inc index 5226698b4..93b22ba45 100644 --- a/plugins/admin/users/class_userManagement.inc +++ b/plugins/admin/users/class_userManagement.inc @@ -667,15 +667,15 @@ class userManagement extends plugin /* NEW LIST MANAGMENT */ $listhead = "
". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + "  ". _("Current base")." ". - "  ". + "  ". "
"; $action= ""; diff --git a/plugins/admin/users/headpage.tpl b/plugins/admin/users/headpage.tpl index 736a67346..45a53c62a 100644 --- a/plugins/admin/users/headpage.tpl +++ b/plugins/admin/users/headpage.tpl @@ -1,9 +1,9 @@ - +

- {$hint} + {$hint}

@@ -12,7 +12,7 @@
{$userlist} - +
@@ -35,17 +35,17 @@
- {t}Show templates{/t}
- {t}Show functional users{/t}
- {t}Show unix users{/t}
- {t}Show mail users{/t}
- {t}Show samba users{/t}
- {t}Show proxy users{/t}
+ {t}Show templates{/t}
+ {t}Show functional users{/t}
+ {t}Show unix users{/t}
+ {t}Show mail users{/t}
+ {t}Show samba users{/t}
+ {t}Show proxy users{/t}
- +
{$apply} diff --git a/plugins/admin/users/main.inc b/plugins/admin/users/main.inc index 465ea979e..6c284053d 100644 --- a/plugins/admin/users/main.inc +++ b/plugins/admin/users/main.inc @@ -38,7 +38,7 @@ if ($remove_lock){ if (isset($_SESSION['objectinfo'])){ $display= print_header(get_template_path('images/user.png'), _("User administration"), - "\"\" ".$_SESSION['objectinfo']); } else { diff --git a/plugins/gofax/blocklists/class_blocklistManagement.inc b/plugins/gofax/blocklists/class_blocklistManagement.inc index 6786efdc6..546ab9953 100644 --- a/plugins/gofax/blocklists/class_blocklistManagement.inc +++ b/plugins/gofax/blocklists/class_blocklistManagement.inc @@ -291,13 +291,13 @@ class blocklist extends plugin /* NEW LIST MANAGMENT */ $listhead = "
". - "  ". - "  ". - "  ". - "  ". - "  ". - "  "._("Current base")." ". - "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + "  "._("Current base")." ". + "  ". "
"; $action= ""; diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc index e36036a5d..78391cf0e 100644 --- a/plugins/gofon/conference/class_phoneConferenceManagment.inc +++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc @@ -288,14 +288,14 @@ class phoneConferenceManagment extends plugin } $listhead = "
". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + "  ". _("Current base")." ". - "  ". + "  ". "
"; /* Images for delete / edit */ diff --git a/plugins/gofon/macro/class_gofonMacroManagement.inc b/plugins/gofon/macro/class_gofonMacroManagement.inc index 22a2a0235..ef7688e8e 100755 --- a/plugins/gofon/macro/class_gofonMacroManagement.inc +++ b/plugins/gofon/macro/class_gofonMacroManagement.inc @@ -324,14 +324,14 @@ class gofonMacro extends plugin /* NEW LIST MANAGMENT */ $listhead = "
". - "  ". - "  ". - "  ". - "  ". - "  ". - "  ". + "  ". + "  ". + "  ". + "  ". + "  ". + "  ". _("Current base")." ". - "  ". + "  ". "
"; -- 2.30.2