From: cajus Date: Mon, 7 Nov 2005 16:26:22 +0000 (+0000) Subject: Included changes done in the train X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a020ba6adbd8ffc77331a29e503dd4d5860be238;p=gosa.git Included changes done in the train git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1855 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/html/images/list_new_conference.png b/html/images/list_new_conference.png new file mode 100644 index 000000000..ee9cf5f54 Binary files /dev/null and b/html/images/list_new_conference.png differ diff --git a/html/images/select_conference.png b/html/images/select_conference.png new file mode 100644 index 000000000..f331bfe0b Binary files /dev/null and b/html/images/select_conference.png differ diff --git a/plugins/admin/departments/generic.tpl b/plugins/admin/departments/generic.tpl index 819e5aa3e..fc54d4cea 100644 --- a/plugins/admin/departments/generic.tpl +++ b/plugins/admin/departments/generic.tpl @@ -1,6 +1,6 @@ -
+

{t}Properties{/t}

@@ -41,7 +41,7 @@

{t}Location{/t}

- +
@@ -52,7 +52,7 @@ - diff --git a/plugins/admin/groups/class_groupMail.inc b/plugins/admin/groups/class_groupMail.inc index 520eade9e..133c43287 100644 --- a/plugins/admin/groups/class_groupMail.inc +++ b/plugins/admin/groups/class_groupMail.inc @@ -359,6 +359,7 @@ class mailgroup extends plugin /* Show dialog */ $smarty->assign("search_image", get_template_path('images/search.png')); + $smarty->assign("usearch_image", get_template_path('images/search_user.png')); $smarty->assign("tree_image", get_template_path('images/tree.png')); $smarty->assign("infoimage", get_template_path('images/info.png')); $smarty->assign("launchimage", get_template_path('images/small_filter.png')); diff --git a/plugins/admin/groups/generic.tpl b/plugins/admin/groups/generic.tpl index e6e786044..136a54615 100644 --- a/plugins/admin/groups/generic.tpl +++ b/plugins/admin/groups/generic.tpl @@ -2,7 +2,7 @@
+
- +
{$must} @@ -86,12 +86,12 @@ - +
- diff --git a/plugins/admin/groups/mail.tpl b/plugins/admin/groups/mail.tpl index 34d7d9315..7729169c4 100644 --- a/plugins/admin/groups/mail.tpl +++ b/plugins/admin/groups/mail.tpl @@ -3,7 +3,7 @@ - - -
+
- {html_options options=$members} diff --git a/plugins/admin/groups/group_objects.tpl b/plugins/admin/groups/group_objects.tpl index 661d6a57a..bb58eceaa 100644 --- a/plugins/admin/groups/group_objects.tpl +++ b/plugins/admin/groups/group_objects.tpl @@ -1,6 +1,6 @@ -
+

{$hint} @@ -8,7 +8,7 @@

- {html_options options=$users} @@ -25,11 +25,9 @@

- -
- -   - + + +  
- -
 {t}Display users matching{/t}
+ +
{$apply}
+

{t}Generic{/t}

@@ -40,12 +40,9 @@
-   - +

{t}Alternative addresses{/t}

- {html_options values=$gosaMailAlternateAddress output=$gosaMailAlternateAddress} @@ -62,7 +59,7 @@ - - - - + +
+

{t}IMAP shared folders{/t}

@@ -87,12 +84,9 @@
-   - +

{t}Forward messages to non group members{/t}

- {html_options values=$gosaMailForwardingAddress output=$gosaMailForwardingAddress} diff --git a/plugins/admin/groups/mail_locals.tpl b/plugins/admin/groups/mail_locals.tpl index 94be4bc09..621669e47 100644 --- a/plugins/admin/groups/mail_locals.tpl +++ b/plugins/admin/groups/mail_locals.tpl @@ -1,6 +1,6 @@ -
+


@@ -8,7 +8,7 @@

- {html_options options=$mailusers} @@ -28,10 +28,8 @@

- -
-  {t}Display addresses of department{/t} - + +   @@ -40,21 +38,21 @@
-
-  {t}Display addresses matching{/t} + + - +
-
-  {t}Display addresses of user{/t} + + - +
diff --git a/plugins/admin/ogroups/generic.tpl b/plugins/admin/ogroups/generic.tpl index 5e64cb34b..6a8a7b3a8 100644 --- a/plugins/admin/ogroups/generic.tpl +++ b/plugins/admin/ogroups/generic.tpl @@ -15,8 +15,9 @@
 
{$must} @@ -31,7 +32,7 @@  ({$combinedObjects})
- {$members}
diff --git a/plugins/admin/ogroups/ogroup_objects.tpl b/plugins/admin/ogroups/ogroup_objects.tpl index abe6a141b..cf248fe78 100644 --- a/plugins/admin/ogroups/ogroup_objects.tpl +++ b/plugins/admin/ogroups/ogroup_objects.tpl @@ -1,6 +1,6 @@ -
+

{t}Select objects to add{/t} {$hint} @@ -8,7 +8,7 @@

- {$objects} @@ -34,12 +34,12 @@ {t}Show printers{/t}
{t}Show phones{/t}

- - diff --git a/plugins/admin/systems/class_selectUserToPrinterDialog.inc b/plugins/admin/systems/class_selectUserToPrinterDialog.inc index 4321e412d..d07f482da 100644 --- a/plugins/admin/systems/class_selectUserToPrinterDialog.inc +++ b/plugins/admin/systems/class_selectUserToPrinterDialog.inc @@ -82,7 +82,7 @@ class selectUserToPrinterDialog extends plugin $smarty->assign("search_image" , get_template_path('images/search.png')); $smarty->assign("tree_image" , get_template_path('images/tree.png')); $smarty->assign("infoimage" , get_template_path('images/info.png')); - $smarty->assign("launchimage" , get_template_path('images/launch.png')); + $smarty->assign("launchimage" , get_template_path('images/small_filter.png')); $smarty->assign("deplist" , $this->config->idepartments); $display.= $smarty->fetch(get_template_path('selectUserToPrinterDialog.tpl', TRUE,dirname(__FILE__))); diff --git a/plugins/admin/systems/component.tpl b/plugins/admin/systems/component.tpl index a4952887d..ce04d6ffe 100644 --- a/plugins/admin/systems/component.tpl +++ b/plugins/admin/systems/component.tpl @@ -1,6 +1,6 @@
 {t}Display objects of department{/t}
  +
- -
 {t}Display objects matching{/t}
+ +
{$apply}
-
+ diff --git a/plugins/admin/systems/phone.tpl b/plugins/admin/systems/phone.tpl index 76a0c8703..a431d4c85 100644 --- a/plugins/admin/systems/phone.tpl +++ b/plugins/admin/systems/phone.tpl @@ -1,6 +1,6 @@
{$must}
-
+ diff --git a/plugins/admin/systems/phonesettings.tpl b/plugins/admin/systems/phonesettings.tpl index 45cec1b5d..310f204bf 100644 --- a/plugins/admin/systems/phonesettings.tpl +++ b/plugins/admin/systems/phonesettings.tpl @@ -1,29 +1,26 @@ -

{t}Specific Phone settings{/t}

+

{t}Advanced phone settings{/t}

-
{$must}
+
- - {if $selected_categorie eq '0'} - - -
- - - -
- {$staticAddress} - - -
+ 		+ {$staticAddress} + + +
+
+
- + -
+
{$staticAddress} - + +
- +
@@ -64,8 +61,6 @@
-
{/if} @@ -73,7 +68,7 @@ {if $selected_categorie eq '1'}
+ @@ -171,7 +166,7 @@ -
@@ -158,7 +153,7 @@ - {html_options options=$goFonTrunks selected=$goFonTrunk}

-

-
+
diff --git a/plugins/admin/systems/printerPPDSelectionDialog.tpl b/plugins/admin/systems/printerPPDSelectionDialog.tpl index d0f0c25e5..5c628e11d 100644 --- a/plugins/admin/systems/printerPPDSelectionDialog.tpl +++ b/plugins/admin/systems/printerPPDSelectionDialog.tpl @@ -1,6 +1,6 @@ -
+

{t}Select objects to add{/t} @@ -28,20 +28,11 @@

- - -
- -  {t}Display objects of department{/t} -
- - - diff --git a/plugins/admin/systems/selectUserToPrinterDialog.tpl b/plugins/admin/systems/selectUserToPrinterDialog.tpl index d20c56bae..aefe36130 100644 --- a/plugins/admin/systems/selectUserToPrinterDialog.tpl +++ b/plugins/admin/systems/selectUserToPrinterDialog.tpl @@ -2,7 +2,7 @@
- -  {t}Display objects matching{/t} + + -
-
+

@@ -10,7 +10,7 @@

- {html_options values=$gotoPrinterKeys output=$gotoPrinters}
@@ -18,18 +18,8 @@

-
-

[i]{t}Information{/t}

-
-
-

- {t}This menu allows you to select one or multiple entries to be added to the printer object for specific tasks. Having a great number of entries, you may want to use the range selectors below.{/t} -

-
-
- -
-

[F]{t}Filters{/t}

+
+

[F]{t}Filters{/t}

diff --git a/plugins/admin/systems/terminalStartup.tpl b/plugins/admin/systems/terminalStartup.tpl index f544c44e2..32e6e948e 100644 --- a/plugins/admin/systems/terminalStartup.tpl +++ b/plugins/admin/systems/terminalStartup.tpl @@ -52,7 +52,7 @@

{t}Kernel modules (format: name parameters){/t}

- {html_options values=$gotoModules output=$gotoModules} @@ -62,12 +62,12 @@ -
+

 

- {html_options values=$gotoShareKeys output=$gotoShares} diff --git a/plugins/gofax/blocklists/generic.tpl b/plugins/gofax/blocklists/generic.tpl index 8d7dddb4b..d2e80aae0 100644 --- a/plugins/gofax/blocklists/generic.tpl +++ b/plugins/gofax/blocklists/generic.tpl @@ -1,5 +1,5 @@

{t}Generic{/t}

- +
@@ -50,11 +50,11 @@

 

- +
- +
+

{t}Blocked numbers{/t}

- {html_options values=$goFaxBlocklist output=$goFaxBlocklist} @@ -63,6 +63,9 @@   		+   +

{t}Information{/t}

diff --git a/plugins/gofax/faxaccount/class_gofaxAccount.inc b/plugins/gofax/faxaccount/class_gofaxAccount.inc index 12221b6e7..2ec35c9ea 100644 --- a/plugins/gofax/faxaccount/class_gofaxAccount.inc +++ b/plugins/gofax/faxaccount/class_gofaxAccount.inc @@ -315,6 +315,7 @@ class gofaxAccount extends plugin /* Show dialog */ $smarty->assign("search_image", get_template_path('images/search.png')); + $smarty->assign("usearch_image", get_template_path('images/search_user.png')); $smarty->assign("tree_image", get_template_path('images/tree.png')); $smarty->assign("infoimage", get_template_path('images/info.png')); $smarty->assign("launchimage", get_template_path('images/small_filter.png')); diff --git a/plugins/gofax/faxaccount/generic.tpl b/plugins/gofax/faxaccount/generic.tpl index 89b027704..e35352bf2 100644 --- a/plugins/gofax/faxaccount/generic.tpl +++ b/plugins/gofax/faxaccount/generic.tpl @@ -65,25 +65,21 @@ - - - - - +
+

{t}Alternate fax numbers{/t}

- {html_options values=$facsimileAlternateTelephoneNumber output=$facsimileAlternateTelephoneNumber} -
- -   -   - - 		-   - + +
+ +   +   + +

{t}Blocklists{/t}

- +
{t}Blocklists for incoming fax{/t} diff --git a/plugins/gofax/faxaccount/locals.tpl b/plugins/gofax/faxaccount/locals.tpl index 0eafe0a45..4182f7a08 100644 --- a/plugins/gofax/faxaccount/locals.tpl +++ b/plugins/gofax/faxaccount/locals.tpl @@ -1,6 +1,6 @@ -
+

{t}Select numbers to add{/t} {$hint}
@@ -8,7 +8,7 @@

- {html_options options=$list}

@@ -24,10 +24,8 @@
- -
-  {t}Display numbers of department{/t} - + +   @@ -36,20 +34,20 @@
- +
-  {t}Display numbers matching{/t} + + -
- +
-  {t}Display numbers of user{/t} + + -
{$apply} diff --git a/plugins/gofon/conference/class_phoneConferenceManagment.inc b/plugins/gofon/conference/class_phoneConferenceManagment.inc index 4a5e95ab8..68c9d2129 100644 --- a/plugins/gofon/conference/class_phoneConferenceManagment.inc +++ b/plugins/gofon/conference/class_phoneConferenceManagment.inc @@ -292,7 +292,7 @@ class phoneConferenceManagment extends plugin "  ". "  ". "  ". - "  ". + "  ". "  ". _("Current base")." ". "  ". @@ -343,7 +343,7 @@ class phoneConferenceManagment extends plugin } /* Image shown in divlist */ - $userimg = "User"; + $userimg = "User"; /* Edit entry link*/ $editlink = "%s"; diff --git a/plugins/gofon/phoneaccount/generic.tpl b/plugins/gofon/phoneaccount/generic.tpl index 43ad90d25..23663bf57 100644 --- a/plugins/gofon/phoneaccount/generic.tpl +++ b/plugins/gofon/phoneaccount/generic.tpl @@ -2,7 +2,7 @@

{t}Phone numbers{/t}

- {html_options options=$phoneNumbers}