Merge branch 'ci' of https://github.com/FH-Complete/FHC-Core into ci

Conflicts:
	application/core/FHC_Model.php

application/widgets/navigation.php

@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * Demo widget
+ */
+class Navigation extends Widget {
+
+    public function display($data) {
+        
+        if (!isset($data['items'])) {
+            $data['items'] = array('Home', 'About', 'Contact');
+        }
+
+        $this->view('widgets/navigation', $data);
+    }
+    
+}

application/widgets/organisationseinheit_widget.php

@@ -0,0 +1,26 @@
+<?php
+
+/*
+ * OE widget
+ */
+class organisationseinheit_widget extends Widget 
+{
+    public function display($data) 
+	{
+		$this->load->model('organisation/Organisationseinheit_model');
+		$res = $this->Organisationseinheit_model->getRecursiveList();
+		var_dump($res);
+		foreach ($res->retval->result() as $obj)
+		{
+			$item = array('name' => $obj->name, 'value' => $obj->value);
+			if (isset($data['oe_kurzbz']) && $obj->value == $data['oe_kurzbz'])
+				$item['selected'] = true;
+			else
+				$item['selected'] = false;
+			$data['items'][] = $item;
+        }
+
+        $this->view('widgets/organisationseinheit', $data);
+    }
+    
+}