rearranged button layout to fit for egw stds

resources/TODO

@@ -9,10 +9,7 @@ TODO:
 	add show-calender button
 	
 - edit/add
-	bug: loose html and picture on tab-switch (eTemplate bug --> Ralf)
-	bug: inputvalidation on selectbox --> eTemplate --> Ralf
 	bug: accessories aren't moved to cat of master if it changes
-	add pictureupload for htmlarea
 
 - admin section
 	add configure picture size	

resources/inc/class.bo_resources.inc.php

@@ -441,7 +441,6 @@ class bo_resources
 		{
 			$src = $this->so->get_value('picture_src',$res_id);
 		}
-		
 		switch($src)
 		{
 			case 'own_src':

resources/inc/class.ui_resources.inc.php

@@ -319,9 +319,10 @@ class ui_resources
 				);
 		$sel_options = array();
 		$no_button = array(
-			'btn_buyable' => !$content['buyable'],
+			'btn_buy' => !$content['buyable'],
-			'btn_bookable' => !$content['bookable'],
+			'btn_book' => !$content['bookable'],
-			'btn_edit' => !$this->bo->acl->is_permitted($content['cat_id'],EGW_ACL_EDIT)
+			'btn_edit' => !$this->bo->acl->is_permitted($content['cat_id'],EGW_ACL_EDIT),
+			'btn_delete' => !$this->bo->acl->is_permitted($content['cat_id'],EGW_ACL_DELETE)
 			);
 		$preserv = $content;
 		$this->tmpl->read('resources.showdetails');
@@ -487,16 +488,15 @@ class ui_resources
 				$selectbox_content[$key] = $cat_name;
 			}
 		}
+		$link_array = array('menuaction' => $view_menuaction);
+		if($date != '') $link_array['date'] = $date;
 		$selectbox = $this->html->select(
 			'owner',
 			'uical_select_resource',
 			$selectbox_content,
 			$no_lang=true,
-			$options='style="width: 165px;" name="res_id" onchange="load_cal(\''.
+			$options='style="width: 165px;" onchange="load_cal(\''.
-				$GLOBALS['egw']->link('/index.php',array(
+				$GLOBALS['egw']->link('/index.php',$link_array).'\',\'uical_select_resource\');" id="uical_select_resource"',
-					'menuaction' => $view_menuaction,
-					'date' => $date,
-				)).'\',\'uical_select_resource\');" id="uical_select_resource"',
 			$multiple=0
 		);
 		return array(