From: cajus Date: Wed, 16 Apr 2008 06:24:25 +0000 (+0000) Subject: Moved images X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=98f066e37590ad553ed6e8c10b9351a609ed5a43;p=gosa.git Moved images git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@10484 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-plugins/addressbook/addons/addressbook/remove.tpl b/gosa-plugins/addressbook/addons/addressbook/remove.tpl index 146091eab..a764605cc 100644 --- a/gosa-plugins/addressbook/addons/addressbook/remove.tpl +++ b/gosa-plugins/addressbook/addons/addressbook/remove.tpl @@ -1,5 +1,5 @@
-  {t}Warning{/t} +  {t}Warning{/t}

{$info} diff --git a/gosa-plugins/connectivity/personal/connectivity/class_connectivity.inc b/gosa-plugins/connectivity/personal/connectivity/class_connectivity.inc index 7da84e1b8..63d31d931 100644 --- a/gosa-plugins/connectivity/personal/connectivity/class_connectivity.inc +++ b/gosa-plugins/connectivity/personal/connectivity/class_connectivity.inc @@ -71,7 +71,7 @@ class connectivity extends plugin } } if (!$enabled){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension().""; $display.= back_to_main(); return ($display); diff --git a/gosa-plugins/connectivity/personal/connectivity/main.inc b/gosa-plugins/connectivity/personal/connectivity/main.inc index c2e337d91..c4b438009 100644 --- a/gosa-plugins/connectivity/personal/connectivity/main.inc +++ b/gosa-plugins/connectivity/personal/connectivity/main.inc @@ -108,7 +108,7 @@ if (!$remove_lock){ $info= "\"\" ".$ui->dn." "; - $info.= "\"\"".msgPool::clickEditToChange(); $display.= "\n"; $display.= "\n"; diff --git a/gosa-plugins/dfs/addons/godfs/class_dfsManagment.inc b/gosa-plugins/dfs/addons/godfs/class_dfsManagment.inc index 492f78613..06409a633 100644 --- a/gosa-plugins/dfs/addons/godfs/class_dfsManagment.inc +++ b/gosa-plugins/dfs/addons/godfs/class_dfsManagment.inc @@ -213,7 +213,7 @@ class dfsManagment extends plugin { "  ". "  ". _("Base")." ". - "  "; diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc index 29689bb49..219fa5f87 100644 --- a/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc +++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/class_servDHCP.inc @@ -321,10 +321,10 @@ class servdhcp extends goService /* Add entries to divlist */ - $editImgIns = "". + $editImgIns = "". "". ""; - $editImgInsNoDel = "". + $editImgInsNoDel = "". ""; $editImg = "". ""; diff --git a/gosa-plugins/dhcp/admin/systems/services/dhcp/remove_dhcp.tpl b/gosa-plugins/dhcp/admin/systems/services/dhcp/remove_dhcp.tpl index 852fe037b..1f8773ba1 100644 --- a/gosa-plugins/dhcp/admin/systems/services/dhcp/remove_dhcp.tpl +++ b/gosa-plugins/dhcp/admin/systems/services/dhcp/remove_dhcp.tpl @@ -1,5 +1,5 @@

- {t}Warning{/t} + {t}Warning{/t}

{$warning} diff --git a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc index 589bd74d3..60fad07f1 100644 --- a/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc +++ b/gosa-plugins/dns/admin/systems/services/dns/class_servDNSeditZoneEntries.inc @@ -448,7 +448,7 @@ class servDNSeditZoneEntries extends plugin - + "; diff --git a/gosa-plugins/fai/admin/fai/class_divListFai.inc b/gosa-plugins/fai/admin/fai/class_divListFai.inc index e736ee08a..01384a069 100644 --- a/gosa-plugins/fai/admin/fai/class_divListFai.inc +++ b/gosa-plugins/fai/admin/fai/class_divListFai.inc @@ -121,7 +121,7 @@ class divListFai extends MultiSelectWindow } $s = ".|"._("Actions")."|\n"; - $s .= "..|". + $s .= "..|". " "._("Create")."|\n"; $acl = $ui->get_permissions($this->parent->fai_base,"fai/faiProfile"); diff --git a/gosa-plugins/fai/admin/fai/remove.tpl b/gosa-plugins/fai/admin/fai/remove.tpl index 752e0fdd2..d63f86d14 100644 --- a/gosa-plugins/fai/admin/fai/remove.tpl +++ b/gosa-plugins/fai/admin/fai/remove.tpl @@ -1,5 +1,5 @@

- {t}Warning{/t} + {t}Warning{/t}

diff --git a/gosa-plugins/fai/admin/fai/remove_branch.tpl b/gosa-plugins/fai/admin/fai/remove_branch.tpl index 50d2d69ec..1fb1d9f3d 100644 --- a/gosa-plugins/fai/admin/fai/remove_branch.tpl +++ b/gosa-plugins/fai/admin/fai/remove_branch.tpl @@ -1,5 +1,5 @@

-  {t}Warning{/t} +  {t}Warning{/t}

{$info} diff --git a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc index c5878d3bf..8baf3a5d5 100644 --- a/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc +++ b/gosa-plugins/glpi/admin/systems/services/glpi/class_glpiSelectUser.inc @@ -177,7 +177,7 @@ class glpiSelectUser extends plugin "  ". "  "._("Base")." ". " ". - "  ". ""; diff --git a/gosa-plugins/glpi/admin/systems/services/glpi/remove_glpi.tpl b/gosa-plugins/glpi/admin/systems/services/glpi/remove_glpi.tpl index 589ec97b7..d08c1525b 100644 --- a/gosa-plugins/glpi/admin/systems/services/glpi/remove_glpi.tpl +++ b/gosa-plugins/glpi/admin/systems/services/glpi/remove_glpi.tpl @@ -1,5 +1,5 @@

- {t}Warning{/t} + {t}Warning{/t}

{$warning} diff --git a/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc b/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc index bf149b6a1..1f3c8702d 100644 --- a/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc +++ b/gosa-plugins/gofax/gofax/blocklists/class_divListBlocklists.inc @@ -132,12 +132,12 @@ class divListBlocklist extends MultiSelectWindow /* Append department selector */ $listhead .= " "._("Base")." ". - "  "; /* Create Layers menu */ $s = ".|"._("Actions")."|\n"; - $s .= "..|". + $s .= "..|". " "._("Create")."|\n"; /* Append create options */ diff --git a/gosa-plugins/gofax/gofax/blocklists/remove.tpl b/gosa-plugins/gofax/gofax/blocklists/remove.tpl index ae670ddc6..861e377ba 100644 --- a/gosa-plugins/gofax/gofax/blocklists/remove.tpl +++ b/gosa-plugins/gofax/gofax/blocklists/remove.tpl @@ -1,5 +1,5 @@

-  {t}Warning{/t} +  {t}Warning{/t}

{$info} diff --git a/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc b/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc index 23b42ab42..a743f0aa4 100644 --- a/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc +++ b/gosa-plugins/gofax/gofax/faxaccount/class_gofaxAccount.inc @@ -160,7 +160,7 @@ class gofaxAccount extends plugin /* Do we represent a valid account? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("GOfax")).""; $display.= back_to_main(); return ($display); diff --git a/gosa-plugins/gofax/gofax/faxaccount/main.inc b/gosa-plugins/gofax/gofax/faxaccount/main.inc index 77e137d8b..f12766376 100644 --- a/gosa-plugins/gofax/gofax/faxaccount/main.inc +++ b/gosa-plugins/gofax/gofax/faxaccount/main.inc @@ -97,7 +97,7 @@ if (!$remove_lock){ $info= "\"\" ".$ui->dn." "; if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/gofaxAccount"))){ - $info.= "\"\""._("Click the 'Edit' button below to change informations in this dialog"); + $info.= "\"\""._("Click the 'Edit' button below to change informations in this dialog"); $display.= ""; } $display.= "\n"; diff --git a/gosa-plugins/gofon/admin/ogroups/gofon/phonequeue.tpl b/gosa-plugins/gofon/admin/ogroups/gofon/phonequeue.tpl index 8a5801e8b..f08204302 100644 --- a/gosa-plugins/gofon/admin/ogroups/gofon/phonequeue.tpl +++ b/gosa-plugins/gofon/admin/ogroups/gofon/phonequeue.tpl @@ -1,5 +1,5 @@

- ! {t}Only users with the same asterisk home server will be included to this queue.{/t} + ! {t}Only users with the same asterisk home server will be included to this queue.{/t}

diff --git a/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc b/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc index 379fc42e0..6508cac91 100644 --- a/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc +++ b/gosa-plugins/gofon/admin/systems/gofon/class_phoneGeneric.inc @@ -115,7 +115,7 @@ class phoneGeneric extends plugin /* Do we represent a valid phone? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("phone")).""; return($display); } diff --git a/gosa-plugins/gofon/gofon/conference/class_divListConferences.inc b/gosa-plugins/gofon/gofon/conference/class_divListConferences.inc index 3c58ffea7..9341c386d 100644 --- a/gosa-plugins/gofon/gofon/conference/class_divListConferences.inc +++ b/gosa-plugins/gofon/gofon/conference/class_divListConferences.inc @@ -129,12 +129,12 @@ class divListConference extends MultiSelectWindow /* Add the rest (base select ....)*/ $listhead .= _("Base")." ". - "  "; /* Create Layers menu */ $s = ".|"._("Actions")."|\n"; - $s .= "..|". + $s .= "..|". " "._("Create")."|\n"; /* Append create options */ diff --git a/gosa-plugins/gofon/gofon/conference/remove.tpl b/gosa-plugins/gofon/gofon/conference/remove.tpl index fa3a46c74..7f4b8f1e6 100644 --- a/gosa-plugins/gofon/gofon/conference/remove.tpl +++ b/gosa-plugins/gofon/gofon/conference/remove.tpl @@ -1,5 +1,5 @@
-  {t}Warning{/t} +  {t}Warning{/t}
{$info}

diff --git a/gosa-plugins/gofon/gofon/macro/class_divListMacros.inc b/gosa-plugins/gofon/gofon/macro/class_divListMacros.inc index 47495a767..00c258c63 100644 --- a/gosa-plugins/gofon/gofon/macro/class_divListMacros.inc +++ b/gosa-plugins/gofon/gofon/macro/class_divListMacros.inc @@ -125,12 +125,12 @@ class divListMacro extends MultiSelectWindow /* Add default header */ $listhead = MultiSelectWindow::get_default_header(); $listhead .= _("Base")." ". - "  "; /* Create Layers menu */ $s = ".|"._("Actions")."|\n"; - $s .= "..|". + $s .= "..|". " "._("Create")."|\n"; /* Append create options */ diff --git a/gosa-plugins/gofon/gofon/macro/class_gofonMacroParameters.inc b/gosa-plugins/gofon/gofon/macro/class_gofonMacroParameters.inc index b1d2ede9b..d8d2898a5 100644 --- a/gosa-plugins/gofon/gofon/macro/class_gofonMacroParameters.inc +++ b/gosa-plugins/gofon/gofon/macro/class_gofonMacroParameters.inc @@ -196,7 +196,7 @@ class macroParameter extends plugin /* Do we represent a valid group? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("Phone macro")).""; return ($display); } diff --git a/gosa-plugins/gofon/gofon/macro/remove.tpl b/gosa-plugins/gofon/gofon/macro/remove.tpl index e708bc10d..e4c851f14 100644 --- a/gosa-plugins/gofon/gofon/macro/remove.tpl +++ b/gosa-plugins/gofon/gofon/macro/remove.tpl @@ -1,5 +1,5 @@

-  {t}Warning{/t} +  {t}Warning{/t}

{$intro} diff --git a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc index 33ea306b5..c725a3617 100644 --- a/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc +++ b/gosa-plugins/gofon/gofon/phoneaccount/class_phoneAccount.inc @@ -845,7 +845,7 @@ class phoneAccount extends plugin /* Do we represent a valid account? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("Phone")).""; $display.= back_to_main(); return ($display); @@ -858,7 +858,7 @@ class phoneAccount extends plugin /* Do we represent a valid account? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("Phone")).""; $display.= back_to_main(); return($display); diff --git a/gosa-plugins/gofon/gofon/phoneaccount/main.inc b/gosa-plugins/gofon/gofon/phoneaccount/main.inc index b9fa644e2..04318a13a 100644 --- a/gosa-plugins/gofon/gofon/phoneaccount/main.inc +++ b/gosa-plugins/gofon/gofon/phoneaccount/main.inc @@ -110,7 +110,7 @@ if (!$remove_lock){ $info= "\"\" ".$ui->dn." "; if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/phoneAccount"))){ - $info.= "\"\""._("Click the 'Edit' button below to change informations in this dialog"); + $info.= "\"\""._("Click the 'Edit' button below to change informations in this dialog"); $display.= "\n"; } $display.= "\n"; diff --git a/gosa-plugins/goto/addons/goto/class_gotomasses.inc b/gosa-plugins/goto/addons/goto/class_gotomasses.inc index 059d41895..3b2921301 100644 --- a/gosa-plugins/goto/addons/goto/class_gotomasses.inc +++ b/gosa-plugins/goto/addons/goto/class_gotomasses.inc @@ -293,7 +293,7 @@ class gotomasses extends plugin $divlist->EnableSaveButton(FALSE); $divlist->SetHeadpageMode(); $s = ".|"._("Actions")."|\n"; - $s.= "..| "._("Create")."\n"; + $s.= "..| "._("Create")."\n"; foreach($this->events['SCHEDULED'] as $name => $event){ $s.= "...|".$event['MenuImage']." ".$event['s_Menu_Name']."|add_event_".$name."\n"; @@ -453,7 +453,7 @@ class gotomasses extends plugin /* Show activation? */ if ($percent == "goto-activation"){ - $status = " "._("Locked"); + $status = " "._("Locked"); /* Show hardware detect? */ } elseif ($percent == "goto-hardware-detection") { diff --git a/gosa-plugins/goto/addons/goto/class_target_list.inc b/gosa-plugins/goto/addons/goto/class_target_list.inc index 446176256..8ad881301 100644 --- a/gosa-plugins/goto/addons/goto/class_target_list.inc +++ b/gosa-plugins/goto/addons/goto/class_target_list.inc @@ -150,7 +150,7 @@ class target_list extends MultiSelectWindow /* Add department selector */ $listhead .= _("Base")." ". - "  "; $listhead .=""; diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_halt.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_halt.inc index f743f009b..d7b572d69 100644 --- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_halt.inc +++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_halt.inc @@ -33,8 +33,8 @@ class DaemonEvent_halt extends DaemonEvent $this->s_Schedule_Action = "job_trigger_action_halt"; $this->s_Trigger_Action= "gosa_trigger_action_halt"; $this->s_Queued_Action= "trigger_action_halt"; - $this->s_Menu_Image = "images/status_stopped.png"; - $this->s_List_Image = "images/status_stopped.png"; + $this->s_Menu_Image = "images/lists/off.png"; + $this->s_List_Image = "images/lists/off.png"; } public function execute() diff --git a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_wakeup.inc b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_wakeup.inc index 729d945fa..5dc417920 100644 --- a/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_wakeup.inc +++ b/gosa-plugins/goto/addons/goto/events/class_DaemonEvent_wakeup.inc @@ -31,8 +31,8 @@ class DaemonEvent_wakeup extends DaemonEvent $this->s_Schedule_Action= "job_trigger_action_wake"; $this->s_Trigger_Action = "gosa_trigger_action_wake"; $this->s_Queued_Action = "trigger_action_wake"; - $this->s_Menu_Image = "images/status_running.png"; - $this->s_List_Image = "images/status_running.png"; + $this->s_Menu_Image = "images/lists/on.png"; + $this->s_List_Image = "images/lists/on.png"; } public function execute() diff --git a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc index b908ddd68..e8837d720 100644 --- a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc +++ b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddList.inc @@ -159,7 +159,7 @@ class EventTargetAddList extends MultiSelectWindow /* Add base selection */ $listhead .= _("Base")."  ". - "  "; $this->SetListHeader($listhead); diff --git a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddUsersList.inc b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddUsersList.inc index e4c93a6b2..73c962278 100644 --- a/gosa-plugins/goto/addons/goto/events/class_EventTargetAddUsersList.inc +++ b/gosa-plugins/goto/addons/goto/events/class_EventTargetAddUsersList.inc @@ -128,7 +128,7 @@ class EventTargetAddUserList extends MultiSelectWindow /* Add base selection */ $listhead .= _("Base")."  ". - "  "; $this->SetListHeader($listhead); diff --git a/gosa-plugins/goto/addons/goto/remove.tpl b/gosa-plugins/goto/addons/goto/remove.tpl index d4862da36..975c107c0 100644 --- a/gosa-plugins/goto/addons/goto/remove.tpl +++ b/gosa-plugins/goto/addons/goto/remove.tpl @@ -1,5 +1,5 @@

-  {t}Warning{/t} +  {t}Warning{/t}

{$info} diff --git a/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc b/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc index d56913279..623f14f61 100644 --- a/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc +++ b/gosa-plugins/goto/admin/applications/class_applicationGeneric.inc @@ -112,7 +112,7 @@ class application extends plugin /* Do we represent a valid group? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("application")).""; return ($display); } diff --git a/gosa-plugins/goto/admin/applications/class_divListApplication.inc b/gosa-plugins/goto/admin/applications/class_divListApplication.inc index 0ffdec859..99771d277 100644 --- a/gosa-plugins/goto/admin/applications/class_divListApplication.inc +++ b/gosa-plugins/goto/admin/applications/class_divListApplication.inc @@ -137,7 +137,7 @@ class divListApplication extends MultiSelectWindow /* And the rest, a base selection box */ $listhead .= _("Base")." ". - "  "; } @@ -148,7 +148,7 @@ class divListApplication extends MultiSelectWindow /* Create Layers menu */ $s = ".|"._("Actions")."|\n"; - $s .= "..|". + $s .= "..|". " "._("Create")."|\n"; /* Append create options */ diff --git a/gosa-plugins/goto/admin/applications/generic.tpl b/gosa-plugins/goto/admin/applications/generic.tpl index 72118aeaf..c4c044cda 100644 --- a/gosa-plugins/goto/admin/applications/generic.tpl +++ b/gosa-plugins/goto/admin/applications/generic.tpl @@ -89,7 +89,7 @@

 

-

{t}Options{/t} {t}Options{/t}

+

{t}Options{/t} {t}Options{/t}

diff --git a/gosa-plugins/goto/admin/applications/remove.tpl b/gosa-plugins/goto/admin/applications/remove.tpl index 49fc92f50..7fef781fc 100644 --- a/gosa-plugins/goto/admin/applications/remove.tpl +++ b/gosa-plugins/goto/admin/applications/remove.tpl @@ -1,5 +1,5 @@
-  {t}Warning{/t} +  {t}Warning{/t}

{$intro} diff --git a/gosa-plugins/goto/admin/devices/class_divListDevices.inc b/gosa-plugins/goto/admin/devices/class_divListDevices.inc index 79dd39e94..f0db08e8d 100644 --- a/gosa-plugins/goto/admin/devices/class_divListDevices.inc +++ b/gosa-plugins/goto/admin/devices/class_divListDevices.inc @@ -128,12 +128,12 @@ class divListDevices extends MultiSelectWindow /* And at least add a department selection box */ $listhead .= _("Base")." ". - "  "; /* Create Layers menu */ $s = ".|"._("Actions")."|\n"; - $s .= "..|". + $s .= "..|". " "._("Create")."|\n"; /* Append create options */ diff --git a/gosa-plugins/goto/admin/devices/remove.tpl b/gosa-plugins/goto/admin/devices/remove.tpl index f1f99f506..10f738a38 100644 --- a/gosa-plugins/goto/admin/devices/remove.tpl +++ b/gosa-plugins/goto/admin/devices/remove.tpl @@ -1,5 +1,5 @@

-  {t}Warning{/t} +  {t}Warning{/t}

{$intro} diff --git a/gosa-plugins/goto/admin/mimetypes/class_divListMimeTypes.inc b/gosa-plugins/goto/admin/mimetypes/class_divListMimeTypes.inc index c9ab0cc0c..820ae1e2b 100644 --- a/gosa-plugins/goto/admin/mimetypes/class_divListMimeTypes.inc +++ b/gosa-plugins/goto/admin/mimetypes/class_divListMimeTypes.inc @@ -141,7 +141,7 @@ class divListMimeTypes extends MultiSelectWindow /* And at least add a department selection box */ $listhead .= _("Base")." ". - "  "; } @@ -165,7 +165,7 @@ class divListMimeTypes extends MultiSelectWindow /* Create Layers menu */ $s = ".|"._("Actions")."|\n"; - $s .= "..|". + $s .= "..|". " "._("Create")."|\n"; /* Append create options */ diff --git a/gosa-plugins/goto/admin/mimetypes/remove.tpl b/gosa-plugins/goto/admin/mimetypes/remove.tpl index 1ee931f3c..68e79ad52 100644 --- a/gosa-plugins/goto/admin/mimetypes/remove.tpl +++ b/gosa-plugins/goto/admin/mimetypes/remove.tpl @@ -1,5 +1,5 @@

-  {t}Warning{/t} +  {t}Warning{/t}

{$intro} diff --git a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc index d2febbb8d..3d76f8bfc 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_printGeneric.inc @@ -310,7 +310,7 @@ class printgeneric extends plugin /* Do we represent a valid printer? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("printer")).""; return($display); } diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc index 1971c76a8..05caf3468 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalGeneric.inc @@ -216,7 +216,7 @@ class termgeneric extends plugin /* Do we represent a valid terminal? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("terminal")).""; return($display); } diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalInfo.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalInfo.inc index ebab65764..071c99bf6 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalInfo.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalInfo.inc @@ -64,7 +64,7 @@ class terminfo extends plugin /* Do we represent a valid terminal? */ if (!$this->is_account && $this->parent === NULL){ - return("\"\" ". + return("\"\" ". msgPool::noValidExtension(_("terminal")).""); } diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc index 89fe14d2d..286b07cdb 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalService.inc @@ -303,7 +303,7 @@ class termservice extends plugin /* Do we represent a valid terminal? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". _("This 'dn' has no terminal features.").""; return ($display); } diff --git a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc index 369029488..32176e7d0 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_terminalStartup.inc @@ -161,7 +161,7 @@ class termstartup extends plugin /* Do we represent a valid terminal? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("terminal")).""; return ($display); } diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc index aa7059da1..1c834f9ba 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationGeneric.inc @@ -213,7 +213,7 @@ class workgeneric extends plugin /* Do we represent a valid terminal? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("workstation")).""; return($display); } diff --git a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc index 9ce6197b7..4dee273cb 100644 --- a/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc +++ b/gosa-plugins/goto/admin/systems/goto/class_workstationStartup.inc @@ -329,7 +329,7 @@ class workstartup extends plugin /* Do we represent a valid terminal? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("workstation")).""; return ($display); } diff --git a/gosa-plugins/goto/admin/systems/goto/info.tpl b/gosa-plugins/goto/admin/systems/goto/info.tpl index edeafe2e6..02260dbb8 100644 --- a/gosa-plugins/goto/admin/systems/goto/info.tpl +++ b/gosa-plugins/goto/admin/systems/goto/info.tpl @@ -84,7 +84,7 @@ {if $active eq "true"}
-

{t}System status{/t}

+

{t}System status{/t}

diff --git a/gosa-plugins/goto/admin/systems/ppd/printerPPDDialog.tpl b/gosa-plugins/goto/admin/systems/ppd/printerPPDDialog.tpl index 6bb2352ea..6fd8477df 100644 --- a/gosa-plugins/goto/admin/systems/ppd/printerPPDDialog.tpl +++ b/gosa-plugins/goto/admin/systems/ppd/printerPPDDialog.tpl @@ -14,7 +14,7 @@
{if $showOptions eq 1}

 

-

L {t}Options{/t}

+

L {t}Options{/t}

{$properties} {/if}

diff --git a/gosa-plugins/goto/admin/systems/ppd/remove_ppd.tpl b/gosa-plugins/goto/admin/systems/ppd/remove_ppd.tpl index b160b61ea..508b1b925 100644 --- a/gosa-plugins/goto/admin/systems/ppd/remove_ppd.tpl +++ b/gosa-plugins/goto/admin/systems/ppd/remove_ppd.tpl @@ -1,5 +1,5 @@

- {t}Warning{/t} + {t}Warning{/t}

{$warning} diff --git a/gosa-plugins/goto/personal/environment/environment.tpl b/gosa-plugins/goto/personal/environment/environment.tpl index f78beb804..afb1f64dc 100644 --- a/gosa-plugins/goto/personal/environment/environment.tpl +++ b/gosa-plugins/goto/personal/environment/environment.tpl @@ -1,5 +1,5 @@ {if $is_account ne 'true'} - + {t}The environment extension is currently disabled.{/t} {else} diff --git a/gosa-plugins/goto/personal/environment/main.inc b/gosa-plugins/goto/personal/environment/main.inc index cd86705c9..23f97b23a 100644 --- a/gosa-plugins/goto/personal/environment/main.inc +++ b/gosa-plugins/goto/personal/environment/main.inc @@ -108,7 +108,7 @@ if (!$remove_lock){ $info= "\"\" ".$ui->dn." "; if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/environment"))){ - $info.= "\"\" ".msgPool::clickEditToChange(); $display.= "\n"; } diff --git a/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc b/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc index 76f3abd59..1c95c9f87 100644 --- a/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc +++ b/gosa-plugins/kolab/personal/connectivity/kolab/class_kolabAccount.inc @@ -280,7 +280,7 @@ class kolabAccount extends plugin /* Assign buttons */ $button= ""; if ($nr == count($this->kolabInvitationPolicy)-1){ - $button= ""; + $button= ""; } if ($nr != 0) { $button.= ""; diff --git a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc index 2c27cae0b..375dc9042 100644 --- a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc +++ b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc @@ -352,7 +352,7 @@ class mailgroup extends plugin /* Do we represent a valid account? */ if (!$this->is_account && $this->parent === NULL){ - $display.= "\"\" ".msgPool::noValidExtension(_("mail")).""; + $display.= "\"\" ".msgPool::noValidExtension(_("mail")).""; return ($display); } diff --git a/gosa-plugins/mail/personal/mail/class_mailAccount.inc b/gosa-plugins/mail/personal/mail/class_mailAccount.inc index 3f1a07d78..318d83a8d 100644 --- a/gosa-plugins/mail/personal/mail/class_mailAccount.inc +++ b/gosa-plugins/mail/personal/mail/class_mailAccount.inc @@ -285,7 +285,7 @@ class mailAccount extends plugin /* Do we represent a valid account? */ if(!$this->multiple_support_active){ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("Mail")).""; $display.= back_to_main(); diff --git a/gosa-plugins/mail/personal/mail/main.inc b/gosa-plugins/mail/personal/mail/main.inc index efbaf2212..153199cbb 100644 --- a/gosa-plugins/mail/personal/mail/main.inc +++ b/gosa-plugins/mail/personal/mail/main.inc @@ -110,7 +110,7 @@ if (!$remove_lock){ $info= "\"\" ".$ui->dn." "; - $info.= "\"\" ".msgPool::clickEditToChange(); if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/mailAccount"))){ diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/remove_script.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/remove_script.tpl index 000dfcde5..7dbca7ca8 100644 --- a/gosa-plugins/mail/personal/mail/sieve/templates/remove_script.tpl +++ b/gosa-plugins/mail/personal/mail/sieve/templates/remove_script.tpl @@ -1,5 +1,5 @@

- {t}Warning{/t} + {t}Warning{/t}

{$Warning}
diff --git a/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc b/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc index 0129427c9..d434ec4e4 100644 --- a/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc +++ b/gosa-plugins/nagios/personal/nagios/class_nagiosAccount.inc @@ -101,7 +101,7 @@ class nagiosAccount extends plugin /* Do we represent a valid account? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\"src=\"images/stop.png\" ". + $display= "\"\"src=\"images/small-error.png\" ". msgPool::noValidextension(_("Nagios")).""; $display.= back_to_main(); diff --git a/gosa-plugins/nagios/personal/nagios/main.inc b/gosa-plugins/nagios/personal/nagios/main.inc index 7a6315db7..a564dd77f 100644 --- a/gosa-plugins/nagios/personal/nagios/main.inc +++ b/gosa-plugins/nagios/personal/nagios/main.inc @@ -112,7 +112,7 @@ if (!$remove_lock){ "\"> ".$ui->dn." "; if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/nagiosAccount"))){ - $info.= "\"\" ".msgPool::clickEditToChange(); $display.= "\n"; } diff --git a/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc b/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc index 5de5b9d01..5a79b94ef 100644 --- a/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc +++ b/gosa-plugins/netatalk/personal/netatalk/class_netatalk.inc @@ -167,7 +167,7 @@ class netatalk extends plugin { /* Do we represent a valid account? */ if (!$this->is_account && $this->parent === NULL) { - $display = "\"\"src=\"images/stop.png\" ".msgPool::noValidExtension(_("netatalk")).""; + $display = "\"\"src=\"images/small-error.png\" ".msgPool::noValidExtension(_("netatalk")).""; $display .= back_to_main(); return ($display); diff --git a/gosa-plugins/netatalk/personal/netatalk/main.inc b/gosa-plugins/netatalk/personal/netatalk/main.inc index a4c698a54..df6423800 100644 --- a/gosa-plugins/netatalk/personal/netatalk/main.inc +++ b/gosa-plugins/netatalk/personal/netatalk/main.inc @@ -100,7 +100,7 @@ if (!$remove_lock) { } else { $info = "\"\" ".$ui->dn." "; if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/netatalk"))){ - $info .= "\"\" ".msgPool::clickEditToChange(); + $info .= "\"\" ".msgPool::clickEditToChange(); $display .= "\n"; } diff --git a/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc b/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc index 6b202bd38..19d5cb933 100644 --- a/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc +++ b/gosa-plugins/samba/admin/systems/samba/class_winGeneric.inc @@ -87,7 +87,7 @@ class wingeneric extends plugin /* Do we represent a valid phone? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("network")).""; return($display); } diff --git a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc index 593263262..3082335e8 100644 --- a/gosa-plugins/samba/personal/samba/class_sambaAccount.inc +++ b/gosa-plugins/samba/personal/samba/class_sambaAccount.inc @@ -213,7 +213,7 @@ class sambaAccount extends plugin } /* Do we represent a valid account? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\"src=\"images/stop.png\" ". + $display= "\"\"src=\"images/small-error.png\" ". msgPool::noValidExtension(_("Samba")).""; $display.= back_to_main(); return ($display); diff --git a/gosa-plugins/samba/personal/samba/main.inc b/gosa-plugins/samba/personal/samba/main.inc index 7ce7e1774..2252bebcb 100644 --- a/gosa-plugins/samba/personal/samba/main.inc +++ b/gosa-plugins/samba/personal/samba/main.inc @@ -112,7 +112,7 @@ if (!$remove_lock){ if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/sambaAccount"))){ - $info.= "\"\" ". + $info.= "\"\" ". msgPool::clickEditToChange(); $display.= "\n"; } diff --git a/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc b/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc index 7961bbf3c..aa7268016 100644 --- a/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc +++ b/gosa-plugins/scalix/personal/scalix/class_scalixAccount.inc @@ -116,7 +116,7 @@ class scalixAccount extends plugin /* Do we represent a valid account? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". _("This account has no scalix extensions.").""; $display.= back_to_main(); diff --git a/gosa-plugins/scalix/personal/scalix/main.inc b/gosa-plugins/scalix/personal/scalix/main.inc index c1403417a..a18086ab2 100644 --- a/gosa-plugins/scalix/personal/scalix/main.inc +++ b/gosa-plugins/scalix/personal/scalix/main.inc @@ -108,7 +108,7 @@ if (!$remove_lock){ "\"> ".$ui->dn." "; if(preg_match("/w/",$ui->get_permissions($ui->dn,"users/scalix"))){ - $info.= "\"\" ". + $info.= "\"\" ". _("Click the 'Edit' button below to change informations in this dialog"); $display.= "\n"; diff --git a/gosa-plugins/sudo/admin/sudo/class_divListSudo.inc b/gosa-plugins/sudo/admin/sudo/class_divListSudo.inc index 0031a6e5a..e1746a987 100644 --- a/gosa-plugins/sudo/admin/sudo/class_divListSudo.inc +++ b/gosa-plugins/sudo/admin/sudo/class_divListSudo.inc @@ -106,7 +106,7 @@ class divListSudo extends MultiSelectWindow /* Create Layers menu */ $s = ".|"._("Actions")."|\n"; - $s .= "..|". + $s .= "..|". " "._("Create")."|\n"; /* Append create options */ diff --git a/gosa-plugins/sudo/admin/sudo/class_target_list_systems.inc b/gosa-plugins/sudo/admin/sudo/class_target_list_systems.inc index 247c50165..26206cba8 100644 --- a/gosa-plugins/sudo/admin/sudo/class_target_list_systems.inc +++ b/gosa-plugins/sudo/admin/sudo/class_target_list_systems.inc @@ -141,7 +141,7 @@ class target_list_systems extends MultiSelectWindow /* Add department selector */ $listhead .= _("Base")." ". - "  "; $listhead .=""; diff --git a/gosa-plugins/sudo/admin/sudo/class_target_list_users.inc b/gosa-plugins/sudo/admin/sudo/class_target_list_users.inc index a3ced3292..3edfd6852 100644 --- a/gosa-plugins/sudo/admin/sudo/class_target_list_users.inc +++ b/gosa-plugins/sudo/admin/sudo/class_target_list_users.inc @@ -138,7 +138,7 @@ class target_list_users extends MultiSelectWindow /* Add department selector */ $listhead .= _("Base")." ". - "  "; $listhead .=""; diff --git a/gosa-plugins/sudo/admin/sudo/remove.tpl b/gosa-plugins/sudo/admin/sudo/remove.tpl index 17c0be82b..0af6a99ed 100644 --- a/gosa-plugins/sudo/admin/sudo/remove.tpl +++ b/gosa-plugins/sudo/admin/sudo/remove.tpl @@ -1,5 +1,5 @@

-  {t}Warning{/t} +  {t}Warning{/t}

{$info} diff --git a/gosa-plugins/systems/admin/systems/class_componentGeneric.inc b/gosa-plugins/systems/admin/systems/class_componentGeneric.inc index 15aeaef4d..4fca7029c 100644 --- a/gosa-plugins/systems/admin/systems/class_componentGeneric.inc +++ b/gosa-plugins/systems/admin/systems/class_componentGeneric.inc @@ -68,7 +68,7 @@ class componentGeneric extends plugin /* Do we represent a valid phone? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("component")).""; return($display); } diff --git a/gosa-plugins/systems/admin/systems/class_divListSystem.inc b/gosa-plugins/systems/admin/systems/class_divListSystem.inc index e2418d1c6..48299a140 100644 --- a/gosa-plugins/systems/admin/systems/class_divListSystem.inc +++ b/gosa-plugins/systems/admin/systems/class_divListSystem.inc @@ -200,12 +200,12 @@ class divListSystem extends MultiSelectWindow /* Add base selection */ $listhead .= _("Base")."  ". - "  "; /* Handle create icons */ $s = ".|"._("Actions")."|\n"; - $s.= "..|". + $s.= "..|". " "._("Create")."|\n"; if(preg_match("/c/",$ui->get_permissions($this->selectedBase,"terminal/termgeneric"))){ $s.= "...|". diff --git a/gosa-plugins/systems/admin/systems/class_divListSystemService.inc b/gosa-plugins/systems/admin/systems/class_divListSystemService.inc index 121acec27..8fc4e1cda 100644 --- a/gosa-plugins/systems/admin/systems/class_divListSystemService.inc +++ b/gosa-plugins/systems/admin/systems/class_divListSystemService.inc @@ -96,8 +96,8 @@ class divListSystemService extends MultiSelectWindow switch($entry['Status']){ case '' : $str =" ";break; - case SERVICE_STOPPED : $str =""; break; - case SERVICE_STARTED : $str =""; break; + case SERVICE_STOPPED : $str =""; break; + case SERVICE_STARTED : $str =""; break; case SERVICE_RESTARTED : $str ="R"; break; default: $str= "".$entry["; } diff --git a/gosa-plugins/systems/admin/systems/class_servGeneric.inc b/gosa-plugins/systems/admin/systems/class_servGeneric.inc index 603e110af..57e50c016 100644 --- a/gosa-plugins/systems/admin/systems/class_servGeneric.inc +++ b/gosa-plugins/systems/admin/systems/class_servGeneric.inc @@ -124,7 +124,7 @@ class servgeneric extends plugin /* Do we represent a valid server? */ if (!$this->is_account && $this->parent === NULL){ - $display= "\"\" ". + $display= "\"\" ". msgPool::noValidExtension(_("server")).""; return($display); } diff --git a/gosa-plugins/systems/admin/systems/network.tpl b/gosa-plugins/systems/admin/systems/network.tpl index 23a4001eb..c9e9cf291 100644 --- a/gosa-plugins/systems/admin/systems/network.tpl +++ b/gosa-plugins/systems/admin/systems/network.tpl @@ -16,7 +16,7 @@ {/foreach} - + {render acl=$ipHostNumberACL} {if $DNS_is_account == true} diff --git a/gosa-plugins/systems/admin/systems/remove.tpl b/gosa-plugins/systems/admin/systems/remove.tpl index 7fa5338a4..7db0f84ca 100644 --- a/gosa-plugins/systems/admin/systems/remove.tpl +++ b/gosa-plugins/systems/admin/systems/remove.tpl @@ -1,5 +1,5 @@

- {t}Warning{/t} + {t}Warning{/t}

{$warning}