From 1178b953342277a037cac9bc1757ba23ecb59323 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 25 Mar 2010 16:19:26 +0000 Subject: [PATCH] Basix addressbook update git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17300 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../addons/addressbook/class_addressbook.inc | 22 +- .../addons/addressbook/contents.tpl | 228 +++++++----------- .../addressbook/addons/addressbook/main.inc | 3 - 3 files changed, 97 insertions(+), 156 deletions(-) diff --git a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc index f9f0aa5fe..c466c255c 100644 --- a/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc +++ b/gosa-plugins/addressbook/addons/addressbook/class_addressbook.inc @@ -454,7 +454,7 @@ class addressbook extends plugin $this->telephone_list[$attrs['sn'][0].$attrs['dn']]= - " @@ -464,22 +464,22 @@ class addressbook extends plugin $attrs['sn'][0].", ".$attrs['givenName'][0]. "   - + ".$attrs['telephoneNumber'][0]."   - + ".$attrs['facsimileTelephoneNumber'][0]."   - + ".$attrs['mobile'][0]."   - + ".$attrs['homePhone'][0]."   - + \"vcf\" "; @@ -511,7 +511,7 @@ class addressbook extends plugin /* Create list of readable departments */ $deps = array(); foreach($this->config->idepartments as $dn => $name){ - if( $this->acl_is_readable($dn) || $dn == $this->config->current['BASE']){ + if(preg_match("/r/",$this->ui->get_permissions($dn,'users/user')) || $dn == $this->config->current['BASE']){ $deps[$dn] = $name; } } @@ -643,12 +643,8 @@ class addressbook extends plugin $mod++; break; } - if ( ($mod++) & 1){ - $col= "style=\"background-color: #FFFFFF;\""; - } else { - $col= "style=\"background-color: #F5F5F5;\""; - } - $output.= "\n$val\n"; + $mod++; + $output.= "\n$val\n"; } $smarty->assign("search_result", $output); diff --git a/gosa-plugins/addressbook/addons/addressbook/contents.tpl b/gosa-plugins/addressbook/addons/addressbook/contents.tpl index 9ff4648f8..4aef36f69 100644 --- a/gosa-plugins/addressbook/addons/addressbook/contents.tpl +++ b/gosa-plugins/addressbook/addons/addressbook/contents.tpl @@ -1,147 +1,95 @@ - - - - - -
- - - - - - - - - - - - - - - +
+
+

{t}System logs{/t} +

+
+
{t}Name{/t}{t}Phone{/t}{t}Fax{/t}{t}Mobile{/t}{t}Private{/t}{t}Contact{/t}
+ + + - {$search_result} -
{t}Search{/t} + + + + + {t}Show organizational entries{/t} +
- - - - + +
{$range_selector}{t}Display results for department{/t} + + + {t}Show addressbook entries{/t} +
- - {if $show_info eq 1} - {include file=$address_info} + + +
+

{t}Actions{/t} +

+
+ + {if $internal_createable} + {image path='images/lists/element.png[new]'} + {t}Add entry{/t} + {/if} - -
- -
-

{image path="{$infoimage}" align="right"}{t}Information{/t} -

-
-
-

- {t}The telephone list plugin provides list and search facilities for the people in your site. You may want to specify the asterisk [*] like in 'Go*us' to find 'Gonicus'. Use the filters below to narrow down your search.{/t} -

-
-
-
-

{image path="{$actionimage}" align="right"}{t}Actions{/t} -

-
-
-

-{if $internal_createable} - {image path="{$add_image}"}  - - {t}Add entry{/t}
-{/if} - -{if $internal eq 0} - {if $internal_editable} - {image path="{$edit_image}"}  - - {t}Edit entry{/t}
- {/if} - {if $internal_removeable} - {image path="{$delete_image}"}  - - {t}Remove entry{/t}
- {/if} -{/if} -

-
-
-
-

{image path="{$launchimage}" align="right"}{t}Filters{/t} -

-
-
- - - {$alphabet} -
+ + {if $internal eq 0} - - - - - -
-{t}Show organizational entries{/t}
- {t}Show addressbook entries{/t}
-
- - - - - - - -
- - - -
- - - - - - -
- - - -
- - - - - - -
- - -
- {$apply} -
-
- - - + {if $internal_editable} + {image path='images/lists/edit.png'} + {t}Edit entry{/t} + + {/if} + + {if $internal_removeable} + {image path='images/lists/trash.png'} + {t}Remove entry{/t} + + {/if} + + {/if} + + +
+ + + + + + + + + + + + + + {$search_result} + +
{t}Name{/t} + {t}Phone{/t} + {t}Fax{/t} + {t}Mobile{/t} + {t}Private{/t} + {t}Contact{/t} +
+
+
+ {$range_selector} +
+ + {if $show_info eq 1} + {include file=$address_info} + {/if} + +
+ diff --git a/gosa-plugins/addressbook/addons/addressbook/main.inc b/gosa-plugins/addressbook/addons/addressbook/main.inc index 8807c0018..0c795afc0 100644 --- a/gosa-plugins/addressbook/addons/addressbook/main.inc +++ b/gosa-plugins/addressbook/addons/addressbook/main.inc @@ -39,9 +39,6 @@ if ( $cleanup ){ $display= $addressbook->execute (); $display.= "\n"; - /* Page header*/ - $display= print_header(get_template_path('plugins/addressbook/images/plugin.png'), _("Addressbook")).$display; - /* Store changes in session */ session::set('addressbook',$addressbook); } -- 2.30.2