{if isset($title)}{$title}{else}GOsa{/if}

From 24e255e362a43d64765bd8cb4dedc1c37729e131 Mon Sep 17 00:00:00 2001 From: hickert Date: Mon, 1 Mar 2010 10:56:01 +0000 Subject: [PATCH] Updated alignment of html code. -Encreases readability -> let us find misplaced much faster. git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15792 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/ihtml/themes/modern/framework.tpl | 72 ++++++++--------- gosa-core/ihtml/themes/modern/headers.tpl | 89 ++++++++++----------- gosa-core/include/class_pluglist.inc | 74 +++++++++-------- gosa-core/include/class_tabs.inc | 29 ++++--- 4 files changed, 123 insertions(+), 141 deletions(-) diff --git a/gosa-core/ihtml/themes/modern/framework.tpl b/gosa-core/ihtml/themes/modern/framework.tpl index ad40fc5be..70f319002 100644 --- a/gosa-core/ihtml/themes/modern/framework.tpl +++ b/gosa-core/ihtml/themes/modern/framework.tpl @@ -1,45 +1,37 @@ - - {$php_errors} - - -

{$logo}
-
-
- - - -
+ {$php_errors} +
+
- {$logo}
- +
  +
  + + + +
  +
  +
- +
  {$loggedin}
  +
+
+
+ {$menu} + {$msg_dialogs} +
+ {$pathMenu} + {$contents}
-
-
{$loggedin}
-

- - - - {$menu} - - - {$msg_dialogs} - -

- {$pathMenu} - {$contents} -

+ {if $channel != ""} + + {/if} - {if $channel != ""} - - {/if} - {$errors} - {$focus} - - - + {$errors} + {$focus} + + + diff --git a/gosa-core/ihtml/themes/modern/headers.tpl b/gosa-core/ihtml/themes/modern/headers.tpl index c40aabccc..3edac053a 100644 --- a/gosa-core/ihtml/themes/modern/headers.tpl +++ b/gosa-core/ihtml/themes/modern/headers.tpl @@ -1,55 +1,48 @@ - - - {if isset($title)}{$title}{else}GOsa{/if} - - - - - - - - - - - - - - - - - - - - - - + + {if isset($title)}{$title}{else}GOsa{/if} + + + + + + + + + + + + + + + + + + {if $iePngWorkaround} - + {/if} - - + + {if $usePrototype == 'true'} - - - - - - + + + + + + {/if} - - + diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc index b0ce5a2cb..9166656b5 100644 --- a/gosa-core/include/class_pluglist.inc +++ b/gosa-core/include/class_pluglist.inc @@ -160,16 +160,16 @@ class pluglist */ function gen_menu() { - if ($this->menu == ""){ + if (1 || $this->menu == ""){ $cfg= $this->config->data['MENU']; - $menu = "\n

"; + $menu = "\n

"; foreach ($cfg as $headline => $plug){ if(!count($plug)) continue; - $menu.= "\n

"; - $menu.= "\n

"._($headline)."

"; + $menu.= "\n

"._($headline)."
".$title."
".$title."

"; - $menu.= "\n

\n"; - $menu.= "\n

"; + $menu.= "\n

\n"; + $menu.= "\n

"; + $menu.= "\n

\n"; } - $menu.= "\n

"; + $menu.= "\n

\n"; $this->menu = $menu; // Add javascript method to print out warning messages while leaving an unsaved form. // We do it in here to get the string translated. - $this->menu .= " - - "; + $this->menu .= + "\n \n"; } // Use javascript to mark the currently selected plugin. $menu = $this->menu; if(isset($_GET['plug'])){ - $menu.= " - - "; + $menu.= + "\n \n"; } // Return the generated/cached gosa menu. @@ -271,25 +269,25 @@ class pluglist function genPathMenu() { - if(empty($this->pathMenu)){ + if(1 || empty($this->pathMenu)){ $this->pathMenu = - "\n

". - "\n

". - "\n
". - "\n
Welcome to GOsa

". + "\n

". + "\n
". + "\n
Welcome to GOsa
{$title}
{$title}

"; - $this->pathMenu.= "\n

"; + $this->pathMenu.= "\n

"; } return($this->pathMenu); } diff --git a/gosa-core/include/class_tabs.inc b/gosa-core/include/class_tabs.inc index 36cad26d2..4acf06764 100644 --- a/gosa-core/include/class_tabs.inc +++ b/gosa-core/include/class_tabs.inc @@ -63,8 +63,10 @@ class tabs foreach ($data as &$tab){ if (!plugin_available($tab['CLASS'])){ + trigger_error(sprintf("Unknown class '%s'!", $tab['CLASS'])); continue; } + if ($this->current == "") $this->current= $tab['CLASS']; $this->by_name[$tab['CLASS']]= $tab['NAME']; @@ -79,11 +81,6 @@ class tabs $this->read_only |= $this->by_object[$tab['CLASS']]->read_only; $this->by_object[$tab['CLASS']]->parent= &$this; $this->by_object[$tab['CLASS']]->set_acl_category($this->acl_category); - - /* Initialize current */ - if ($this->current == ""){ - $this->current= $tab['CLASS']; - } } } @@ -112,10 +109,6 @@ class tabs function execute() { - - - echo "Do not render TABS while a sub-dialog is opened!
"; - // Ensure that the currently selected tab is valid. if(!isset($this->by_name[$this->current])) { $this->current = key($this->by_name); @@ -147,17 +140,21 @@ class tabs $display= $this->by_object[$this->current]->multiple_execute(); } $tabs= $this->gen_tabs(); - - $display = "{$tabs} - -

{$display} -

"; + $display = + "\n {$tabs}". + "\n ". + "\n

". + "\n {$display}". + "\n

"; return ($display); } function save_object($save_current= FALSE) { + + + /* Save last tab */ if ($this->last != ""){ @DEBUG (DEBUG_TRACE, __LINE__, __FUNCTION__, __FILE__, @@ -192,6 +189,8 @@ class tabs function gen_tabs() { + if($this->by_object[$this->current]->is_modal_dialog()) return(""); + $display = "\n

"; $display.= "\n

$title{$notify}
$title{$notify}

"; $display.="\n

"; -- 2.30.2