[Fmsystem-commits] [9648]

[Torstein]

Revision: 9648
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9648
Author:   vator
Date:     2012-06-22 11:37:23 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicalendar.inc.php
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php       2012-06-22 11:22:35 UTC 
(rev 9647)
+++ trunk/controller/inc/class.uicalendar.inc.php       2012-06-22 11:37:23 UTC 
(rev 9648)
@@ -256,17 +256,17 @@
                        
                        // COMPONENTS
                        foreach($components_with_controls_array as $component){
-                               /*
-                               $location_id = 2295;//Eksempel:kunst
                                
+                               $location_id = 2295; //Eksempel: Valglokaler
+                               
                                //$location_id = $component->get_type();
                                $system_location = 
$GLOBALS['phpgw']->locations->get_name($location_id);
                                $attributes['attributes'] = 
$GLOBALS['phpgw']->custom_fields->find($system_location['appname'],$system_location['location'],
 0, '', 'ASC', 'attrib_sort', true, true);
                        
-                               print_r($attributes);
+                               print_r( $attributes['attributes'][1] );
                        
-                               $attributes['attributes'] = "short_description";
-                               
+                               $fields['attributes']= $attributes[0][0];
+                               //print_r($fields);
                                $params = array
                                (
                                        'location_id' => $component->get_type(),
@@ -274,8 +274,8 @@
                                );
                        
                                $prop_array = 
execMethod('property.soentity.read_single_eav', $params, $attributes);
-                               print_r($prop_array);
-*/
+                               //print_r($prop_array);
+
                                $controls_for_component_array = 
$component->get_controls_array(); 
                                $controls_components_calendar_array = array();
                                

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-06-22 11:22:35 UTC 
(rev 9647)
+++ trunk/controller/templates/base/css/base.css        2012-06-22 11:37:23 UTC 
(rev 9648)
@@ -1094,9 +1094,9 @@
 }
 
 #filters {
-  clear: left;
-  float: left;
-  margin-top: 2em;
+    clear: left;
+    float: left;
+    margin-top: 1em;
 }
 
 #filters.select-box {