- select-widget now works even when no user selectwidget is present (was bug)

- some translation

resources/inc/class.resources_hooks.inc.php

@@ -37,6 +37,12 @@ class resources_hooks
 					'no_lang' => true,
 					'link' => false
 			);
+// 			$file[] = array(
+// 					'text' => lang('planer'),
+// 					'no_lang' => true,
+// 					'link' => $GLOBALS['egw']->link('/index.php',array('menuaction' => 'resources.ui_calviews.planer' )),
+// 					'icon' => 
+// 			);
 			display_sidebox($appname,$title,$file);
 		}
 

resources/inc/class.ui_resources.inc.php

@@ -33,6 +33,7 @@ class ui_resources
 // 		print_r($GLOBALS['egw_info']); die();
 		$this->tmpl	=& CreateObject('etemplate.etemplate','resources.show');
 		$this->bo	=& CreateObject('resources.bo_resources');
+// 		$this->calui	= CreateObject('resources.ui_calviews');
 		
 		if(!@is_object($GLOBALS['egw']->js))
 		{
@@ -382,13 +383,13 @@ class ui_resources
 					if (openerSelectBox.selectedIndex >= 0) {
 						selected = openerSelectBox.options[openerSelectBox.selectedIndex].value;
 						if (selected.slice(0,1) == ',') selected = selected.slice(1);
-						opener.addOption(openerid,'multiple*',selected,1);
+						opener.selectbox_add_option(openerid,'multiple*',selected,1);
 					}
 					else {
 						for (i=0; i < openerSelectBox.length; i++) {
 							with (openerSelectBox.options[i]) {
 								if (selected) {
-									opener.addOption(openerid,text,value,1);
+									opener.selectbox_add_option(openerid,text,value,1);
 									break;
 								}
 							}

resources/setup/phpgw_de.lang

@@ -2,7 +2,8 @@ accessories of	resources	de	Zubeh
 accessories:	resources	de	Zubehör:
 actions	resources	de	Aktionen
 add accessory	resources	de	Zubehör Hinzufügen
-add resources	resources	de	Resource hinzufügen
+add resource	resources	de	Resource hinzufügen
+add resources	resources	de	Resourcen hinzufügen
 administrator	resources	de	Verwalter
 all categories	resources	de	Alle Kategorien
 book this resource	resources	de	Buchen der Resource
@@ -29,6 +30,7 @@ how many of the resources are useable?	resources	de	St
 how many of them are useable?	resources	de	Stückzahl der benutzbaren Resourcen
 how many of this resource are usable	resources	de	Stückzahl der benutzbaren Resourcen
 how many of this resource exists	resources	de	Stückzahl der existierenden Resourcen
+implies booking permission	resources	de	Impliziert Buchungsberechtigung
 implies read permission	resources	de	Impliziert Leseberechtigung
 informations about the location of resource	resources	de	Informationen über den Lagerort der Resource
 is resource bookable?	resources	de	Ist diese Resource buchbar?
@@ -49,9 +51,11 @@ prizeing information for booking or buying	resources	de	Preisinformation f
 quantity	resources	de	Stückzahl
 quantity of resource	resources	de	Stückzahl der Resource
 quantity:	resources	de	Stückzahl:
+read calender permissions	resources	de	Kalender-Leseberechtigung
 read permissions	resources	de	Leseberechtigung
 related links	resources	de	Siehe auch
 resources	resources	de	Resourcen
+resources list	resources	de	Resourcen Liste
 responsible:	resources	de	Verantwortlich:
 saves entry and exits	resources	de	Speichern und Schließen
 select a category	resources	de	Wählen sie eine Kategorie

resources/setup/phpgw_en.lang

@@ -2,6 +2,7 @@ accessories of	resources	en	accessories of
 accessories:	resources	en	Accessories:
 actions	resources	en	Actions
 add accessory	resources	en	Add accessory
+add resource	resources	en	add resource
 add resources	resources	en	Add resources
 administrator	resources	en	Administrator
 all categories	resources	en	all categories
@@ -29,6 +30,7 @@ how many of the resources are useable?	resources	en	How many of the resources ar
 how many of them are useable?	resources	en	How many of them are useable?
 how many of this resource are usable	resources	en	How many of this resource are usable
 how many of this resource exists	resources	en	How many of this resource exists
+implies booking permission	resources	en	implies booking permission
 implies read permission	resources	en	implies read permission
 informations about the location of resource	resources	en	Informations about the location of resource
 is resource bookable?	resources	en	Is resource bookable?
@@ -45,13 +47,16 @@ picture	resources	en	Picture
 picture source	resources	en	picture source
 picture type is not supported, sorry!	resources	en	Picture type is not supported, sorry!
 pictures or resource	resources	en	Pictures or resource
+planer	resources	en	planer
 prizeing information for booking or buying	resources	en	Prizeing information for booking or buying
 quantity	resources	en	Quantity
 quantity of resource	resources	en	Quantity of resource
 quantity:	resources	en	Quantity:
+read calender permissions	resources	en	Read Calender permissions
 read permissions	resources	en	Read permissions
 related links	resources	en	Related links
 resources	resources	en	resources
+resources list	resources	en	resources list
 responsible:	resources	en	Responsible:
 saves entry and exits	resources	en	Saves entry and exits
 select a category	resources	en	Select a category

resources/templates/default/show.xet

@@ -61,7 +61,7 @@
 					</vbox>
 					<hbox align="right">
 						<vbox class="buttonbox">
-							<button image="bookable.gif" label="Book this resource" align="center" id="bookable[$row_cont[id]]" statustext="Book this resource" onclick="window.open(egw::link('/index.php','menuaction=calendar.uiforms.edit&amp;id=r$row_cont[id]'),'','dependent=yes,width=750,height=400,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes'); return false;"/>
+							<button image="bookable.gif" label="Book this resource" align="center" id="bookable[$row_cont[id]]" statustext="Book this resource" onclick="window.open(egw::link('/index.php','menuaction=calendar.uiforms.edit&amp;participants=r$row_cont[id]'),'','dependent=yes,width=750,height=400,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes'); return false;"/>
 							<button image="buyable.gif" label="Buy this resource" align="center" id="buyable[$row_cont[id]]" statustext="Buy this resource"/>
 						</vbox>
 						<vbox needed="1" align="right" class="buttonbox">
@@ -102,7 +102,7 @@
 						<rows>
 							<row>
 								<description/>
-								<button image="bookable" label="book selected resources" id="btn_book_selected" statustext="book selected resources" align="right"/>
+								<button image="bookable" label="book selected resources" id="btn_book_selected" statustext="book selected resources" align="right" onclick="window.open(egw::link('/index.php','menuaction=calendar.uiforms.edit&amp;participants=r$row_cont[id]'),'','dependent=yes,width=750,height=400,location=no,menubar=no,toolbar=no,scrollbars=yes,status=yes'); return false;"/>
 								<button label="buy selected resources" no_lang="1" image="buyable" id="btn_buy_selected" statustext="buy selected resources" align="right"/>
 								<button image="delete" label="delete selected resources" id="btn_delete_selected" statustext="delete selected resources" align="right" onclick="return confirm('Do you really want do delte the selected resources?');"/>
 								<vbox>