From b4f04212361dc4664d9ee4149bbaf103dee79360 Mon Sep 17 00:00:00 2001
From: Ralf Meyer <ralf.meyer@mail.de>
Date: Sun, 6 Aug 2017 19:23:50 +0200
Subject: [PATCH 1/7] V3.17.1

---
 einsatzkomponente.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/einsatzkomponente.xml b/einsatzkomponente.xml
index 0ee583f..5211579 100644
--- a/einsatzkomponente.xml
+++ b/einsatzkomponente.xml
@@ -7,7 +7,7 @@
     <author>Ralf Meyer</author>
     <authorEmail>ralf.meyer@mail.de</authorEmail>
     <authorUrl>https://einsatzkomponente.de</authorUrl>
-    <version>3.17</version> 
+    <version>3.17.1_beta</version> 
 	
     <description>
             <![CDATA[

From d15bd01be6c682133af2f6106bf2a16c50a8e091 Mon Sep 17 00:00:00 2001
From: Ralf Meyer <ralf.meyer@mail.de>
Date: Sun, 13 Aug 2017 21:56:52 +0200
Subject: [PATCH 2/7] Bugfixes

---
 administrator/CHANGELOG.php                 | 5 +++++
 administrator/config.xml                    | 6 +++---
 administrator/helpers/article.php           | 3 +--
 administrator/helpers/einsatzkomponente.php | 4 ++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/administrator/CHANGELOG.php b/administrator/CHANGELOG.php
index 733c120..1533b05 100644
--- a/administrator/CHANGELOG.php
+++ b/administrator/CHANGELOG.php
@@ -11,6 +11,11 @@
 <?php defined('_JEXEC') or die(); ?>
 <h1>Einsatzkomponente für das Joomla-CMS</h1>
 
+<h3>Changelog <small>Version 3.18</small></h3>
+<ul>
+# Option Streckenverlauf Farbe der Auswahlbuttons rot-grün
+</ul>
+
 <h3>Changelog <small>Version 3.17</small></h3>
 <ul>
 + Presselinkinfo in Übersicht als Icon möglich
diff --git a/administrator/config.xml b/administrator/config.xml
index 3392962..7740d76 100644
--- a/administrator/config.xml
+++ b/administrator/config.xml
@@ -1456,13 +1456,13 @@
 				type="radio"
 				showon="gmap_action:1,2"
 				class="btn-group"
-				default="true"
+				default="1"
 				label="COM_EINSATZKOMPONENTE_OPTION_EINSATZBERICHT_EINSATZART_MAP_STRECKENVERLAUF"
 				description="Hier können Sie die Anzeige des Streckenverlauf von der erstgenanneten Organisation zum Einsatzort anzeigen lassen. (nur für GoogleMaps)">
 					<option
-						value="false">JNO</option>
+						value="0">JNO</option>
 					<option
-						value="true">JYES</option>
+						value="1">JYES</option>
 			</field>
 	  		<field
 				name="display_detail_einsatzgebiet"
diff --git a/administrator/helpers/article.php b/administrator/helpers/article.php
index cd4c21a..9840d06 100644
--- a/administrator/helpers/article.php
+++ b/administrator/helpers/article.php
@@ -113,8 +113,7 @@
 			// Store the row.
 			if (!$row->store())
 			{
-				JError::raiseNotice(500, $row->getError());
-
+			JFactory::getApplication()->enqueueMessage(JText::_($this->text_prefix . ' '), 'error');
 				return false;
 			}
 //print_r ($row);exit;
diff --git a/administrator/helpers/einsatzkomponente.php b/administrator/helpers/einsatzkomponente.php
index a706913..fd321df 100644
--- a/administrator/helpers/einsatzkomponente.php
+++ b/administrator/helpers/einsatzkomponente.php
@@ -402,7 +402,7 @@ public static function getFahrzeuge_mission_image ($array_vehicle ='',$orga_id='
         return $vehicles_images;
 	}
 	
-public static function getGmap($marker1_title='',$marker1_lat='1',$marker1_lng='1',$marker1_image='circle.png',$marker2_title='',$marker2_lat='1',$marker2_lng='1',$marker2_image='icon.png',$center_lat='1',$center_lng='1',$gmap_zoom_level='1',$gmap_onload='HYBRID',$zoom_control = 'false',$organisationen='[["",1,1,0,"images/com_einsatzkomponente/images/map/icons/haus_rot.png"],["",1,1,1,"images/com_einsatzkomponente/images/map/icons/haus_rot.png"] ]',$orga_image='haus_rot.png',$einsatzgebiet='[53.28071418254047,7.416630163574155],[53.294772929932165,7.4492458251952485],[53.29815865222114,7.4767116455077485],[53.31313468829642,7.459888830566342],[53.29949234792138,7.478256597900327],[53.29815865222114,7.506409063720639],[53.286461382800795,7.521686926269467],[53.26726681991669,7.499027624511655]',$display_detail_popup='false',$standort,$display_map_route="false")
+public static function getGmap($marker1_title='',$marker1_lat='1',$marker1_lng='1',$marker1_image='circle.png',$marker2_title='',$marker2_lat='1',$marker2_lng='1',$marker2_image='icon.png',$center_lat='1',$center_lng='1',$gmap_zoom_level='1',$gmap_onload='HYBRID',$zoom_control = 'false',$organisationen='[["",1,1,0,"images/com_einsatzkomponente/images/map/icons/haus_rot.png"],["",1,1,1,"images/com_einsatzkomponente/images/map/icons/haus_rot.png"] ]',$orga_image='haus_rot.png',$einsatzgebiet='[53.28071418254047,7.416630163574155],[53.294772929932165,7.4492458251952485],[53.29815865222114,7.4767116455077485],[53.31313468829642,7.459888830566342],[53.29949234792138,7.478256597900327],[53.29815865222114,7.506409063720639],[53.286461382800795,7.521686926269467],[53.26726681991669,7.499027624511655]',$display_detail_popup='false',$standort,$display_map_route="0")
  {
 $params = JComponentHelper::getParams('com_einsatzkomponente');
 $gmap ='function initialize() {
@@ -474,7 +474,7 @@ public static function getGmap($marker1_title='',$marker1_lat='1',$marker1_lng='
   
 // Route anzeigen ANFANG ------------------------------------------------------------------
   var route = "'.$display_map_route.'";
-  if (route == "true") {
+  if (route == "1") {
 		directionsService = new google.maps.DirectionsService();
 		directionsDisplay = new google.maps.DirectionsRenderer(
 		{

From 4e2c272aca3582f59342ef2ad52f7468d03f5c41 Mon Sep 17 00:00:00 2001
From: Ralf Meyer <ralf.meyer@mail.de>
Date: Wed, 16 Aug 2017 22:31:23 +0200
Subject: [PATCH 3/7] Bugfix: Frontendeintrag Organisationen

---
 administrator/CHANGELOG.php        | 1 +
 file.script.php                    | 2 +-
 site/models/einsatzberichtform.php | 6 +-----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/administrator/CHANGELOG.php b/administrator/CHANGELOG.php
index 1533b05..e510681 100644
--- a/administrator/CHANGELOG.php
+++ b/administrator/CHANGELOG.php
@@ -13,6 +13,7 @@
 
 <h3>Changelog <small>Version 3.18</small></h3>
 <ul>
+# Fehler Frontendeintrag,-bearbeitung: fehlende Organisationen
 # Option Streckenverlauf Farbe der Auswahlbuttons rot-grün
 </ul>
 
diff --git a/file.script.php b/file.script.php
index f98b943..78418ce 100644
--- a/file.script.php
+++ b/file.script.php
@@ -74,7 +74,7 @@ function preflight( $type, $parent ) {
 		
 endif;
  
-	echo '<p>' . JText::_('Einsatzkomponente ' . $type . ' ' . $rel) . '</p>';
+	//echo '<p>' . JText::_('Einsatzkomponente ' . $type . ' ' . $rel) . '</p>';
 }
 
 
diff --git a/site/models/einsatzberichtform.php b/site/models/einsatzberichtform.php
index d217407..da7ee77 100644
--- a/site/models/einsatzberichtform.php
+++ b/site/models/einsatzberichtform.php
@@ -180,12 +180,8 @@ protected function loadFormData()
 	{
 		$data = $this->getData(); 
         
-			$data->auswahl_orga = implode(',',$array);
+		//	$data->auswahl_orga = implode(',',$array);
 			if ($data->auswahl_orga == '') : // Vorbelegung Organisationen
-				//$db = JFactory::getDbo();
-				//$db->setQuery('SELECT id,ffw FROM #__eiko_organisationen WHERE ffw="1" LIMIT 1');
-				//$standard = $db->loadResult();
-				//$data->auswahl_orga = $standard['id'];
 			$params = JComponentHelper::getParams('com_einsatzkomponente');
 			$data->auswahl_orga = 	$params->get('pre_auswahl_orga','');
 			endif;

From 9a355bd7384ad6e2d58eab2ac95c7b5dd03ecbdc Mon Sep 17 00:00:00 2001
From: Ralf Meyer <ralf.meyer@mail.de>
Date: Sun, 10 Sep 2017 08:41:59 +0200
Subject: [PATCH 4/7] some Bugfixes

---
 administrator/models/forms/einsatzbericht.xml | 86 +++++++++++--------
 .../views/einsatzbericht/tmpl/edit.php        |  1 +
 .../views/organisation/tmpl/edit.php          |  1 +
 einsatzkomponente.xml                         |  4 +-
 site/models/forms/einsatzbericht.xml          |  2 +-
 site/models/forms/einsatzberichtform.xml      | 68 +++++++++++----
 6 files changed, 107 insertions(+), 55 deletions(-)

diff --git a/administrator/models/forms/einsatzbericht.xml b/administrator/models/forms/einsatzbericht.xml
index 9c8a6de..f3f3528 100644
--- a/administrator/models/forms/einsatzbericht.xml
+++ b/administrator/models/forms/einsatzbericht.xml
@@ -87,50 +87,68 @@
 				<option
 					value="1">Anzeigen</option>
 	   </field>
-       <field name="date1" type="calendar" class="inputbox"
-            required="true" 
-		    format="%Y-%m-%d %H:%M:00"
-            default="NOW" 
-			singleheader ="true"
-			todaybutton="true"
-			weeknumbers="false"
-			filltable="true"   
-			showtime="true"
-            label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_DATE1"
-            description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE1" 
+		
+    <field name="date1" 
+			default="NOW" 
+			class="inputbox" 
+			format="%Y-%m-%d %H:%M:00" 
+			timeformat="24" 
+			showtime="true" 
+			singleheader="true" 
+			todaybutton="true" 
+			weeknumbers="true" 
+			filltable="true" 
+			type="calendar" 
+			required="true" 
+			message="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE1" 
+			label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_DATE1" 
+			description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE1" 
+			hint="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE1"
 			filter="safehtml"
-		/> 
-			
-       <field name="date2" type="calendar" class="inputbox"
-	   	    format="%Y-%m-%d %H:%M:00"
+/>
+
+    <field name="date2" 
+			class="inputbox" 
+			format="%Y-%m-%d %H:%M:00" 
             default="0000-00-00 00:00:00" 
-			singleheader ="true"
-			todaybutton="true"
-			weeknumbers="false"
-			filltable="true"
-			showtime="true"
-            label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_DATE2"
-            description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE2"  
+			timeformat="24" 
+			showtime="true" 
+			singleheader="true" 
+			todaybutton="true" 
+			weeknumbers="true" 
+			filltable="true" 
+			type="calendar" 
+			required="false" 
+			message="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE2" 
+			label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_DATE2" 
+			description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE2" 
+			hint="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE2"
 			filter="safehtml"
-		/> 
+/>
 		 
-       <field name="date3" type="calendar" class="inputbox"
-            format="%Y-%m-%d %H:%M:00"
+    <field name="date3" 
+			class="inputbox" 
             default="0000-00-00 00:00:00" 
-			singleheader ="true"
-			todaybutton="true"
-			weeknumbers="false"
-			filltable="true"    
-			showtime="true"
-            label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_DATE3"
-            description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE3"  
+			timeformat="24" 
+			format="%Y-%m-%d %H:%M:00" 
+			showtime="true" 
+			singleheader="true" 
+			todaybutton="true" 
+			weeknumbers="true" 
+			filltable="true" 
+			type="calendar" 
+			required="false" 
+			message="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE3" 
+			label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_DATE3" 
+			description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE3" 
+			hint="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE3"
 			filter="safehtml"
-		/> 
+/>
 		
        <field name="summary" type="summary"
             label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_SUMMARY"
             description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_SUMMARY" 
-            required="true" 
+            required="false" 
             class="eiko_summary"
             filter="string"
             size="60"
diff --git a/administrator/views/einsatzbericht/tmpl/edit.php b/administrator/views/einsatzbericht/tmpl/edit.php
index 4410c4b..73beca0 100644
--- a/administrator/views/einsatzbericht/tmpl/edit.php
+++ b/administrator/views/einsatzbericht/tmpl/edit.php
@@ -507,6 +507,7 @@ function initialize() {
             marker2 = null;
          }
 	 marker = createMarker(event.latLng, "name", "<b>Location</b><br>"+event.latLng);
+	 map.panTo(latLng);
   });
 }
     
diff --git a/administrator/views/organisation/tmpl/edit.php b/administrator/views/organisation/tmpl/edit.php
index dd6e99f..191188e 100644
--- a/administrator/views/organisation/tmpl/edit.php
+++ b/administrator/views/organisation/tmpl/edit.php
@@ -255,6 +255,7 @@ function initialize() {
                           marker2 = null;
                        }
                    marker = createMarker(event.latLng, "name", "<b>Location</b><br>"+event.latLng);
+				   map.panTo(latLng);
                 });
               }
                   
diff --git a/einsatzkomponente.xml b/einsatzkomponente.xml
index 5211579..0018921 100644
--- a/einsatzkomponente.xml
+++ b/einsatzkomponente.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2.0" method="upgrade">
     <name>com_einsatzkomponente</name>
-    <creationDate>2017-08-06</creationDate>
+    <creationDate>2017-09-10</creationDate>
     <copyright>Copyright (C) 2017 by Ralf Meyer. All rights reserved.</copyright>
     <license>GNU General Public License version 2 or later</license>
     <author>Ralf Meyer</author>
     <authorEmail>ralf.meyer@mail.de</authorEmail>
     <authorUrl>https://einsatzkomponente.de</authorUrl>
-    <version>3.17.1_beta</version> 
+    <version>3.17.2_beta</version> 
 	
     <description>
             <![CDATA[
diff --git a/site/models/forms/einsatzbericht.xml b/site/models/forms/einsatzbericht.xml
index e595dc8..a9e7e72 100644
--- a/site/models/forms/einsatzbericht.xml
+++ b/site/models/forms/einsatzbericht.xml
@@ -106,7 +106,7 @@
        <field name="summary" type="summary"
             label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_SUMMARY"
             description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_SUMMARY" 
-            required="true" 
+            required="false" 
             class="eiko_summary"
             filter="string"
             size="60"
diff --git a/site/models/forms/einsatzberichtform.xml b/site/models/forms/einsatzberichtform.xml
index f6c4f40..df5a6b2 100644
--- a/site/models/forms/einsatzberichtform.xml
+++ b/site/models/forms/einsatzberichtform.xml
@@ -73,34 +73,66 @@
             maxlength="100" /> 
 			
 
-       <field name="date1" type="calendar" class="inputbox"
-            required="true" 
-		    format="%Y-%m-%d %H:%M:00"
-            default="NOW" 
-            label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_DATE1"
-            description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE1" 
+    <field name="date1" 
+			default="NOW" 
+			class="inputbox" 
+			format="%Y-%m-%d %H:%M:00" 
+			timeformat="24" 
+			showtime="true" 
+			singleheader="true" 
+			todaybutton="true" 
+			weeknumbers="true" 
+			filltable="true" 
+			type="calendar" 
+			required="true" 
+			message="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE1" 
+			label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_DATE1" 
+			description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE1" 
+			hint="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE1"
 			filter="safehtml"
-			/> 
-       <field name="date2" type="calendar" class="inputbox"
-	   	    format="%Y-%m-%d %H:%M:00"
+/>
+    <field name="date2" 
+			class="inputbox" 
+			format="%Y-%m-%d %H:%M:00" 
             default="0000-00-00 00:00:00" 
-            label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_DATE2"
-            description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE2" 
+			timeformat="24" 
+			showtime="true" 
+			singleheader="true" 
+			todaybutton="true" 
+			weeknumbers="true" 
+			filltable="true" 
+			type="calendar" 
+			required="false" 
+			message="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE2" 
+			label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_DATE2" 
+			description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE2" 
+			hint="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE2"
 			filter="safehtml"
-			/> 
+/>
 		 
-       <field name="date3" type="calendar" class="inputbox"
-            format="%Y-%m-%d %H:%M:00"
+    <field name="date3" 
+			class="inputbox" 
             default="0000-00-00 00:00:00" 
-            label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_DATE3"
-            description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE3" 
+			timeformat="24" 
+			format="%Y-%m-%d %H:%M:00" 
+			showtime="true" 
+			singleheader="true" 
+			todaybutton="true" 
+			weeknumbers="true" 
+			filltable="true" 
+			type="calendar" 
+			required="false" 
+			message="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE3" 
+			label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_DATE3" 
+			description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE3" 
+			hint="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_DATE3"
 			filter="safehtml"
-			/> 
+/>
 		
        <field name="summary" type="summary"
             label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_SUMMARY"
             description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBERICHT_SUMMARY" 
-            required="true" 
+            required="false" 
             class="eiko_summary"
             filter="string"
             size="60"

From c56463ba45fd7e815d044f21c893bcde1d8c2f12 Mon Sep 17 00:00:00 2001
From: Ralf Meyer <ralf.meyer@mail.de>
Date: Sun, 17 Sep 2017 10:51:36 +0200
Subject: [PATCH 5/7] added: System-Read more in Artikelexport

---
 administrator/helpers/article.php | 16 +++++++++++-----
 einsatzkomponente.xml             |  4 ++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/administrator/helpers/article.php b/administrator/helpers/article.php
index 9840d06..947ecfa 100644
--- a/administrator/helpers/article.php
+++ b/administrator/helpers/article.php
@@ -47,15 +47,21 @@
 		
 		$user = JFactory::getUser(); 
 			
+		$alias = '';
+		$intro = '';
+		$fulltext = '';
 		
-		
+		if ($result[0]->summary) {
 		$alias = strtolower($result[0]->summary);
 		$alias = str_replace(" ", "-", $alias).'_'.date("Y-m-d", strtotime($result[0]->date1));
+		}
 		
+		if ($result[0]->desc) {
 		$intro = $result[0]->desc;
+		$intro = strstr($intro, '<hr id="system-readmore" />', true) ; 
 		$intro = preg_replace("#(?<=.{".$params->get('article_max_intro','400')."}?\\b)(.*)#is", " ...", $intro, 1);
-		
-		
+		$fulltext = str_replace('<hr id="system-readmore" />', '', $result[0]->desc);
+		}
 
 		
    
@@ -84,9 +90,9 @@
 
 					$orgas 		 = str_replace(",", " +++ ", $auswahl_orga);
 		$orgas       = '<br/><div class=\"eiko_article_orga\">Eingesetzte Kräfte: '.$orgas.'</div>';
-		$data['fulltext'] = $result[0]->desc.$orgas;
+		$data['fulltext'] = $fulltext.$orgas;
 		else:
-		$data['fulltext'] = $result[0]->desc;
+		$data['fulltext'] = $fulltext;
 		endif;
 
 $data['state'] 			= 1;
diff --git a/einsatzkomponente.xml b/einsatzkomponente.xml
index 0018921..f58b3e6 100644
--- a/einsatzkomponente.xml
+++ b/einsatzkomponente.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2.0" method="upgrade">
     <name>com_einsatzkomponente</name>
-    <creationDate>2017-09-10</creationDate>
+    <creationDate>2017-09-17</creationDate>
     <copyright>Copyright (C) 2017 by Ralf Meyer. All rights reserved.</copyright>
     <license>GNU General Public License version 2 or later</license>
     <author>Ralf Meyer</author>
     <authorEmail>ralf.meyer@mail.de</authorEmail>
     <authorUrl>https://einsatzkomponente.de</authorUrl>
-    <version>3.17.2_beta</version> 
+    <version>3.18.1_beta</version> 
 	
     <description>
             <![CDATA[

From 76d5f447afcdfd720c723e8a79409d304d143cdb Mon Sep 17 00:00:00 2001
From: Ralf Meyer <ralf.meyer@mail.de>
Date: Tue, 31 Oct 2017 13:42:43 +0100
Subject: [PATCH 6/7] Bugfix: PDF Zeilenumbruch

---
 administrator/CHANGELOG.php                    |  2 ++
 administrator/helpers/einsatzkomponente.php    | 18 ++++++++++++------
 .../language/de-DE.com_einsatzkomponente.ini   |  4 ++--
 einsatzkomponente.xml                          |  6 +++---
 site/controllers/einsatzbericht.php            |  8 ++++++--
 5 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/administrator/CHANGELOG.php b/administrator/CHANGELOG.php
index e510681..2c039d1 100644
--- a/administrator/CHANGELOG.php
+++ b/administrator/CHANGELOG.php
@@ -13,6 +13,8 @@
 
 <h3>Changelog <small>Version 3.18</small></h3>
 <ul>
+# PDF Zeilenumbruch bei Organisationen und Fahrzeugen
++ System-Read more in Artikelexport hinzugefügt
 # Fehler Frontendeintrag,-bearbeitung: fehlende Organisationen
 # Option Streckenverlauf Farbe der Auswahlbuttons rot-grün
 </ul>
diff --git a/administrator/helpers/einsatzkomponente.php b/administrator/helpers/einsatzkomponente.php
index fd321df..fcab385 100644
--- a/administrator/helpers/einsatzkomponente.php
+++ b/administrator/helpers/einsatzkomponente.php
@@ -1066,9 +1066,10 @@ public function pdf($cid)
 			
 			//Header-Image
 			if (!$params->get('pdf_header') == '') {
-				$img = "../media/com_einsatzkomponente/images/pdf/".$params->get('pdf_header');
+				$img = "../images/com_einsatzkomponente/pdf/".$params->get('pdf_header');
 				list($width, $height) = $pdf->resizeToFit($img);
-				$pdf->resizeImage($img,0,0);
+				//$pdf->resizeImage($img,0,0);
+				$pdf->Image($img,0, 0,210,$height);
 				//Setze Abstand von der Oberkante des Blatts die der Höhe des Bilds entspricht
 				$pdf->Ln($height);
 			}
@@ -1136,24 +1137,29 @@ public function pdf($cid)
 				$pdf->Cell($breite_inhalt,$hoehe,$mannschaft,0,1);
 			}}
 			
+			$pdf->Ln(5);
+
 			if ($params->get('pdf_show_orgas') == 1) {
 				if ($organisationen) {
 				$pdf->Cell($breite_beschriftung,$hoehe,utf8_decode(JText::_('COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_AUSWAHLORGA').':'));
-				$pdf->Cell($breite_inhalt,$hoehe,utf8_decode($organisationen),0,1);
+				//$pdf->Cell($breite_inhalt,$hoehe,utf8_decode($organisationen),0,1);
+				$pdf->MultiCell(140,$hoehe,utf8_decode($organisationen),0,'LR',false);
 			}}
 			
 			if ($params->get('pdf_show_fahrzeuge') == 1) {
 				if ($fahrzeuge) {
 				$pdf->Cell($breite_beschriftung,$hoehe,utf8_decode(JText::_('COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_VEHICLES').':'));
-				$pdf->Cell($breite_inhalt,$hoehe,utf8_decode($fahrzeuge),0,1);
-			}}
+				//$pdf->Cell($breite_inhalt,$hoehe,utf8_decode($fahrzeuge),0,1);
+				$pdf->MultiCell(140,$hoehe,utf8_decode($fahrzeuge),0,'LR',false);
+		}}
 			
 			if ($params->get('pdf_show_ausruestung') == 1) {
 				if ($ausruest) {
 				$pdf->Cell($breite_beschriftung,$hoehe,utf8_decode(JText::_('COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBERICHT_AUSRUESTUNG').':'));
-				$pdf->Cell($breite_inhalt,$hoehe,utf8_decode($ausruest),0,1);
+				$pdf->Cell($breite_inhalt,$hoehe,utf8_decode($ausruest),0,1); 
 			}}
 			
+			$pdf->Ln(5);
 			
 			if ($params->get('pdf_show_langbericht') == 1) {
 				if ($bericht) {
diff --git a/administrator/language/de-DE.com_einsatzkomponente.ini b/administrator/language/de-DE.com_einsatzkomponente.ini
index 71d4c58..1ee30c9 100644
--- a/administrator/language/de-DE.com_einsatzkomponente.ini
+++ b/administrator/language/de-DE.com_einsatzkomponente.ini
@@ -639,8 +639,8 @@ COM_EINSATZKOMPONENTE_EMAIL_AUTOMATISCH = "Email - automatisch"
 COM_EINSATZKOMPONENTE_EMAILADRESSEN_AUTO = "Emailadressen (automatisch)"
 COM_EINSATZKOMPONENTE_ORGA_EMAIL = "Organisationen in Email"
 COM_EINSATZKOMPONENTE_KATEGORIE_EMAIL = "Einsatzkategorie in Email"
-COM_EINSATZKOMPONENTE_TITELBILD_EMAIL = "Titelbil in Email"
-COM_EINSATZKOMPONENTE_DETAIL_LINK_EMAIL = "Detailink in Email"
+COM_EINSATZKOMPONENTE_TITELBILD_EMAIL = "Titelbild in Email"
+COM_EINSATZKOMPONENTE_DETAIL_LINK_EMAIL = "Detail-Link in Email"
 COM_EINSATZKOMPONENTE_BERICHT_EMAIL = "Bericht in Email"
 COM_EINSATZKOMPONENTE_EINSTELLUNG_FUER_SOZIALE_NETZWERKE = "Einstellungen für die sozialen Netzwerke"
 COM_EINSATZKOMPONENTE_TWITTER_BUTTON = "Twitter Button"
diff --git a/einsatzkomponente.xml b/einsatzkomponente.xml
index f58b3e6..4010426 100644
--- a/einsatzkomponente.xml
+++ b/einsatzkomponente.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2.0" method="upgrade">
     <name>com_einsatzkomponente</name>
-    <creationDate>2017-09-17</creationDate>
+    <creationDate>2017-10-31</creationDate>
     <copyright>Copyright (C) 2017 by Ralf Meyer. All rights reserved.</copyright>
     <license>GNU General Public License version 2 or later</license>
     <author>Ralf Meyer</author>
     <authorEmail>ralf.meyer@mail.de</authorEmail>
     <authorUrl>https://einsatzkomponente.de</authorUrl>
-    <version>3.18.1_beta</version> 
+    <version>3.18.2_beta</version> 
 	
     <description>
             <![CDATA[
@@ -103,7 +103,7 @@
 <!-- UPDATESERVER DEFINITION -->
 	<updateservers>
 		<!-- Note: No spaces or linebreaks allowed between the server tags -->
-		<server type="extension" priority="1" name="Einsatzkomponente">http://www.feuerwehr-veenhusen.de/update/com_einsatzkomponente-update.xml</server>
+		<server type="extension" priority="1" name="Einsatzkomponente">https://www.feuerwehr-veenhusen.de/update/com_einsatzkomponente-update.xml</server>
 	</updateservers>
 
 	
diff --git a/site/controllers/einsatzbericht.php b/site/controllers/einsatzbericht.php
index bbb866c..9e72a0b 100644
--- a/site/controllers/einsatzbericht.php
+++ b/site/controllers/einsatzbericht.php
@@ -174,7 +174,7 @@ public function save()
         $app->setUserState('com_einsatzkomponente.edit.einsatzbericht.id', null);
         // Redirect to the list screen.
         $this->setMessage(JText::_('Einsatzdaten erfolgreich gepeichert'));
-        $menu = & JFactory::getApplication()->getMenu();
+        $menu = JFactory::getApplication()->getMenu();
         $item = $menu->getActive()->id; //print_r ($item);break;
 //echo 'View :'.JFactory::getApplication()->input->get('view').'<br/>';
 //echo 'Layout :'.JFactory::getApplication()->input->get('layout').'<br/>';
@@ -188,7 +188,11 @@ public function save()
     
     
     public function cancel() {
-		$menu = & JFactory::getApplication()->getMenu();
+		
+		$app = JFactory::getApplication();
+		$app->setUserState('com_einsatzkomponente.edit.einsatzbericht.id', null);
+
+		$menu = JFactory::getApplication()->getMenu();
         $item = $menu->getActive()->id;
 		$params = JComponentHelper::getParams('com_einsatzkomponente');
         $this->setMessage(JText::_('Einsatzeingabe abgebrochen'));

From 8c917c0bd01cb3f4da219769bd9b1359122c1dd7 Mon Sep 17 00:00:00 2001
From: Ralf Meyer <ralf.meyer@mail.de>
Date: Mon, 13 Nov 2017 05:18:46 +0100
Subject: [PATCH 7/7] Bugfixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# exportierter Joomla-Artikel war trotz abwählter Option immer
Haupteintrag
# exportierter Joomla-Artikel wird bei Bearbeitung des
Einsatzberichtes geupdatet
# Fehlerhafter Image-Upload seit J!3.8.2
#
PDF Zeilenumbruch bei Organisationen und Fahrzeugen
+ System-Read more
in Artikelexport hinzugefügt
# Fehler Frontendeintrag,-bearbeitung:
fehlende Organisationen
# Option Streckenverlauf Farbe der
Auswahlbuttons rot-grün
---
 administrator/CHANGELOG.php                   |   3 +
 .../assets/css/einsatzkomponente.css          |   3 +
 administrator/config.xml                      |  59 ++-
 administrator/helpers/article.php             |   2 +-
 .../language/de-DE.com_einsatzkomponente.ini  |   6 +
 .../language/en-GB.com_einsatzkomponente.ini  |   4 +
 administrator/models/forms/einsatzart.xml     |   3 -
 administrator/models/forms/einsatzbericht.xml |   2 -
 .../models/forms/einsatzbilderbearbeiten.xml  |   2 -
 .../models/forms/einsatzfahrzeug.xml          |   1 -
 administrator/models/forms/organisation.xml   |   1 -
 einsatzkomponente.xml                         |   4 +-
 site/controllers/einsatzberichte.php          |  26 -
 site/models/einsatzberichte.php               | 229 ---------
 site/models/forms/einsatzbericht.xml          |   1 -
 site/models/forms/einsatzberichtform.xml      |   2 -
 site/models/forms/einsatzfahrzeug.xml         |   1 -
 site/models/forms/einsatzfahrzeugform.xml     |   1 -
 site/models/forms/organisation.xml            |   1 -
 site/views/einsatzarchiv/tmpl/default.xml     |   2 +-
 site/views/einsatzarchiv/view.feed.php        |  32 +-
 site/views/einsatzberichte/index.html         |   1 -
 site/views/einsatzberichte/tmpl/default.php   |  30 --
 site/views/einsatzberichte/tmpl/default.xml   | 117 -----
 site/views/einsatzberichte/tmpl/index.html    |   1 -
 .../einsatzberichte/tmpl/main_layout_1.php    | 482 ------------------
 .../einsatzberichte/tmpl/main_layout_2.php    | 210 --------
 .../einsatzberichte/tmpl/main_layout_3.php    |  88 ----
 .../einsatzberichte/tmpl/main_layout_4.php    | 449 ----------------
 .../tmpl/main_layout_minimal.php              | 128 -----
 site/views/einsatzberichte/view.feed.php      | 133 -----
 site/views/einsatzberichte/view.html.php      | 378 --------------
 32 files changed, 96 insertions(+), 2306 deletions(-)
 delete mode 100644 site/controllers/einsatzberichte.php
 delete mode 100644 site/models/einsatzberichte.php
 delete mode 100644 site/views/einsatzberichte/index.html
 delete mode 100644 site/views/einsatzberichte/tmpl/default.php
 delete mode 100644 site/views/einsatzberichte/tmpl/default.xml
 delete mode 100644 site/views/einsatzberichte/tmpl/index.html
 delete mode 100644 site/views/einsatzberichte/tmpl/main_layout_1.php
 delete mode 100644 site/views/einsatzberichte/tmpl/main_layout_2.php
 delete mode 100644 site/views/einsatzberichte/tmpl/main_layout_3.php
 delete mode 100644 site/views/einsatzberichte/tmpl/main_layout_4.php
 delete mode 100644 site/views/einsatzberichte/tmpl/main_layout_minimal.php
 delete mode 100644 site/views/einsatzberichte/view.feed.php
 delete mode 100644 site/views/einsatzberichte/view.html.php

diff --git a/administrator/CHANGELOG.php b/administrator/CHANGELOG.php
index 2c039d1..8e138d3 100644
--- a/administrator/CHANGELOG.php
+++ b/administrator/CHANGELOG.php
@@ -13,6 +13,9 @@
 
 <h3>Changelog <small>Version 3.18</small></h3>
 <ul>
+# exportierter Joomla-Artikel war trotz abwählter Option immer Haupteintrag
+# exportierter Joomla-Artikel wird bei Bearbeitung des Einsatzberichtes geupdatet 
+# Fehlerhafter Image-Upload seit J!3.8.2
 # PDF Zeilenumbruch bei Organisationen und Fahrzeugen
 + System-Read more in Artikelexport hinzugefügt
 # Fehler Frontendeintrag,-bearbeitung: fehlende Organisationen
diff --git a/administrator/assets/css/einsatzkomponente.css b/administrator/assets/css/einsatzkomponente.css
index 7456377..ec4acbf 100644
--- a/administrator/assets/css/einsatzkomponente.css
+++ b/administrator/assets/css/einsatzkomponente.css
@@ -1,4 +1,7 @@
 
+
+.controls input {width:380px!important;}
+
 .div_side_filter {margin-left:15px;}
 
 #jform_einsatzart_logo_preview {
diff --git a/administrator/config.xml b/administrator/config.xml
index 7740d76..d7a4582 100644
--- a/administrator/config.xml
+++ b/administrator/config.xml
@@ -144,7 +144,6 @@
        <field name="watermark_image" type="media"
 			label="COM_EINSATZKOMPONENTE_OPTION_WASSERZEICHEN_WAEHLEN" 
 			description="Sie können Wasserzeichen hinzufügen. Die Datei muss zwingend eine PNG-Datei sein !!" 
-            filter="raw"
 		    preview="true"
 	        preview_height="200px"
 			showon="watermark_show:true"
@@ -338,7 +337,6 @@
 		    <field name="standard_share_image" type="media"
             label="COM_EINSATZKOMPONENTE_EINSTELLUNG_SOCIAL_SHARE_IMAGE"
             description="Sie können hier ein Bild hinterlegen, wenn immer nur dieses als Standardbild geteilt werden soll." 
-            filter="raw"
 		    preview="true"
 	        preview_height="200px"
 			id="share_image_klein"
@@ -509,6 +507,62 @@
 						value="1">JYES</option>
 			</field>
 		
+			<field
+				name="display_rss_orgas"
+				type="radio"
+				showon ="display_home_rss:1"
+				class="btn-group"
+				default="1"
+				label="COM_EINSATZKOMPONENTE_ANZEIGE_RSS_ORGAS" 
+				description="">
+					<option
+						value="0">JNO</option>
+					<option
+						value="1">JYES</option>
+			</field>
+			
+			<field
+				name="display_rss_vehicles"
+				type="radio"
+				showon ="display_home_rss:1"
+				class="btn-group"
+				default="0"
+				label="COM_EINSATZKOMPONENTE_ANZEIGE_RSS_VEHICLES" 
+				description="">
+					<option
+						value="0">JNO</option>
+					<option
+						value="1">JYES</option>
+			</field>
+			
+			<field
+				name="display_rss_people"
+				type="radio"
+				showon ="display_home_rss:1"
+				class="btn-group"
+				default="0"
+				label="COM_EINSATZKOMPONENTE_ANZEIGE_RSS_PEOPLE" 
+				description="">
+					<option
+						value="0">JNO</option>
+					<option
+						value="1">JYES</option>
+			</field>
+		
+			<field
+				name="display_rss_time"
+				type="radio"
+				showon ="display_home_rss:1"
+				class="btn-group"
+				default="0"
+				label="COM_EINSATZKOMPONENTE_ANZEIGE_RSS_TIME" 
+				description="">
+					<option
+						value="0">JNO</option>
+					<option
+						value="1">JYES</option>
+			</field>
+		
 			<field name="rss_image_width" 
 				type="text" 
 				showon ="display_home_rss:1"
@@ -1016,7 +1070,6 @@
        <field name="presse_image" type="media"
 			label="COM_EINSATZKOMPONENTE_OPTION_PRESSEIMAGE_WAEHLEN" 
 			description="Sie können hier ein Bild als Presselink auswählen" 
-            filter="raw"
 		    preview="true"
 	        preview_height="80px"
 			showon="display_home_presse:1"
diff --git a/administrator/helpers/article.php b/administrator/helpers/article.php
index 947ecfa..00273f4 100644
--- a/administrator/helpers/article.php
+++ b/administrator/helpers/article.php
@@ -108,7 +108,7 @@
 $data['metadesc'] = $params->get('article_meta_desc','Einsatzbericht');
 $data['metadata	'] 		= '{"page_title":"","author":"","robots":""}';
 $data['access'] 		= 1;
-$data['featured'] 		= '1';
+$data['featured'] 		= $params->get('article_frontpage','1');
 $data['language'] 		= '*';
 
    
diff --git a/administrator/language/de-DE.com_einsatzkomponente.ini b/administrator/language/de-DE.com_einsatzkomponente.ini
index 1ee30c9..9db3221 100644
--- a/administrator/language/de-DE.com_einsatzkomponente.ini
+++ b/administrator/language/de-DE.com_einsatzkomponente.ini
@@ -893,3 +893,9 @@ COM_EINSATZKOMPONENTE_ARTIKEL_JOOMLA_LINK = "verlinker Joomla-Artikel"
 COM_EINSATZKOMPONENTE_OPTION_EINSATZ_DETAILANSICHT_DESC = "Zeige Einsatzbericht-Text"
 COM_EINSATZKOMPONENTE_OPTION_EINSATZBERICHT_LINK_DETAILBERICHT_AUF_BILD ="Detaillink auf Bild"
 COM_EINSATZKOMPONENTE_OPTION_PRESSEIMAGE_WAEHLEN ="Bild Presselink"
+
+COM_EINSATZKOMPONENTE_ANZEIGE_RSS_ORGAS = "Einsatzkräfte"
+COM_EINSATZKOMPONENTE_ANZEIGE_RSS_VEHICLES = "Einsatzfahrzeuge"
+COM_EINSATZKOMPONENTE_ANZEIGE_RSS_PEOPLE = "Mannschaftsstärke"
+COM_EINSATZKOMPONENTE_ANZEIGE_RSS_TIME = "Einsatzdauer"
+
diff --git a/administrator/language/en-GB.com_einsatzkomponente.ini b/administrator/language/en-GB.com_einsatzkomponente.ini
index 045c2fa..323cfe0 100644
--- a/administrator/language/en-GB.com_einsatzkomponente.ini
+++ b/administrator/language/en-GB.com_einsatzkomponente.ini
@@ -926,6 +926,10 @@ COM_EINSATZKOMPONENTE_OPTION_EINSATZ_DETAILANSICHT_DESC = "Show Mission-Descript
 COM_EINSATZKOMPONENTE_OPTION_EINSATZBERICHT_LINK_DETAILBERICHT_AUF_BILD ="Detaillink on Image"
 COM_EINSATZKOMPONENTE_OPTION_PRESSEIMAGE_WAEHLEN ="Image Presslink"
 
+COM_EINSATZKOMPONENTE_ANZEIGE_RSS_ORGAS = "Organization"
+COM_EINSATZKOMPONENTE_ANZEIGE_RSS_VEHICLES = "Vehicles"
+COM_EINSATZKOMPONENTE_ANZEIGE_RSS_PEOPLE = "People"
+COM_EINSATZKOMPONENTE_ANZEIGE_RSS_TIME = "Duration"
 
 
 
diff --git a/administrator/models/forms/einsatzart.xml b/administrator/models/forms/einsatzart.xml
index 93241de..1e74c49 100644
--- a/administrator/models/forms/einsatzart.xml
+++ b/administrator/models/forms/einsatzart.xml
@@ -24,7 +24,6 @@
             label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZART_BESCHR"
             description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZART_BESCHR" 
             required="true" 
-            filter="raw"
 			hide_none="1"
 			preview ="true"
 			preview_height="80px"
@@ -34,7 +33,6 @@
                 
             label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZART_ICON"
             description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZART_ICON" 
-            filter="raw"
 			preview ="true"
 			preview_height="80px"
 			hide_none="1"
@@ -44,7 +42,6 @@
                 
             label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZART_LIST_ICON"
             description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZART_LIST_ICON" 
-            filter="raw"
 			preview ="true"
 			preview_height="80px"
 			hide_none="1"
diff --git a/administrator/models/forms/einsatzbericht.xml b/administrator/models/forms/einsatzbericht.xml
index f3f3528..0b92af0 100644
--- a/administrator/models/forms/einsatzbericht.xml
+++ b/administrator/models/forms/einsatzbericht.xml
@@ -55,7 +55,6 @@
        <field name="image" type="media"
             label="Titelbild"
             description="Weitere Bilder können Sie über den Mehrfachbild-Uploader hinzufügen" 
-            filter="raw"
 		    preview="true"
 			id="einsatzbericht_image_klein"
             directory="com_einsatzkomponente/einsatzbilder" />   
@@ -70,7 +69,6 @@
        <field name="watermark_image" type="media"
 			label="COM_EINSATZKOMPONENTE_OPTION_WASSERZEICHEN_WAEHLEN" 
 			description="Sie können Wasserzeichen hinzufügen. Die Datei muss zwingend eine PNG-Datei sein !!" 
-            filter="raw"
 		    preview="true"
 			default ="images/com_einsatzkomponente/watermark/watermark.png"
             directory="com_einsatzkomponente/watermark" />   
diff --git a/administrator/models/forms/einsatzbilderbearbeiten.xml b/administrator/models/forms/einsatzbilderbearbeiten.xml
index 6eb60ce..db26a6e 100644
--- a/administrator/models/forms/einsatzbilderbearbeiten.xml
+++ b/administrator/models/forms/einsatzbilderbearbeiten.xml
@@ -22,7 +22,6 @@
             	label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBILDERBEARBEITEN_IMAGE"
             	description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBILDERBEARBEITEN_IMAGE" 
                 required="true" 
-         	    filter="raw"
 			    id="einsatzbildbearbeiten_image_gross"
 				preview="true"
             	directory="/images/com_einsatzkomponente/einsatzbilder" /> 
@@ -30,7 +29,6 @@
             	label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZBILDERBEARBEITEN_THUMB"
             	description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZBILDERBEARBEITEN_THUMB" 
                 required="false" 
-            	filter="raw"
 			    id="einsatzbildbearbeiten_image_klein"
 				preview="true"
             	directory="/images/com_einsatzkomponente/einsatzbilder/thumbs" /> 
diff --git a/administrator/models/forms/einsatzfahrzeug.xml b/administrator/models/forms/einsatzfahrzeug.xml
index 5604433..0dfd1f2 100644
--- a/administrator/models/forms/einsatzfahrzeug.xml
+++ b/administrator/models/forms/einsatzfahrzeug.xml
@@ -167,7 +167,6 @@
     <field name="image" type="media"
             label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZFAHRZEUG_IMAGE"
             description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZFAHRZEUG_IMAGE" 
-            filter="raw"
 			preview="true"
 			preview_height="170px"
             directory="/media/com_einsatzkomponente/images/vehicles" />
diff --git a/administrator/models/forms/organisation.xml b/administrator/models/forms/organisation.xml
index 40e38c7..bfa5218 100644
--- a/administrator/models/forms/organisation.xml
+++ b/administrator/models/forms/organisation.xml
@@ -18,7 +18,6 @@
                 
             label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZART_ICON"
             description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZART_ICON" 
-            filter="raw"
 			preview ="true"
 	        preview_height="80px"
 			hide_none="1"
diff --git a/einsatzkomponente.xml b/einsatzkomponente.xml
index 4010426..f85458e 100644
--- a/einsatzkomponente.xml
+++ b/einsatzkomponente.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <extension type="component" version="3.2.0" method="upgrade">
     <name>com_einsatzkomponente</name>
-    <creationDate>2017-10-31</creationDate>
+    <creationDate>2017-11-13</creationDate>
     <copyright>Copyright (C) 2017 by Ralf Meyer. All rights reserved.</copyright>
     <license>GNU General Public License version 2 or later</license>
     <author>Ralf Meyer</author>
     <authorEmail>ralf.meyer@mail.de</authorEmail>
     <authorUrl>https://einsatzkomponente.de</authorUrl>
-    <version>3.18.2_beta</version> 
+    <version>3.18.0</version> 
 	
     <description>
             <![CDATA[
diff --git a/site/controllers/einsatzberichte.php b/site/controllers/einsatzberichte.php
deleted file mode 100644
index 1737560..0000000
--- a/site/controllers/einsatzberichte.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * @version     3.15.0
- * @package     com_einsatzkomponente
- * @copyright   Copyright (C) 2017 by Ralf Meyer. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- * @author      Ralf Meyer <ralf.meyer@mail.de> - https://einsatzkomponente.de
- */
-// No direct access.
-defined('_JEXEC') or die;
-require_once JPATH_COMPONENT.'/controller.php';
-/**
- * Einsatzberichte list controller class.
- */
-class EinsatzkomponenteControllerEinsatzberichte extends EinsatzkomponenteController
-{
-	/**
-	 * Proxy for getModel.
-	 * @since	1.6
-	 */
-	public function &getModel($name = 'Einsatzarchiv', $prefix = 'EinsatzkomponenteModel', $config = array())
-	{
-		$model = parent::getModel($name, $prefix, array('ignore_request' => true));
-		return $model;
-	}
-}
\ No newline at end of file
diff --git a/site/models/einsatzberichte.php b/site/models/einsatzberichte.php
deleted file mode 100644
index 196b4f4..0000000
--- a/site/models/einsatzberichte.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php
-/**
- * @version     3.15.0
- * @package     com_einsatzkomponente
- * @copyright   Copyright (C) 2017 by Ralf Meyer. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- * @author      Ralf Meyer <ralf.meyer@mail.de> - https://einsatzkomponente.de
- */
-defined('_JEXEC') or die;
-jimport('joomla.application.component.modellist');
-/**
- * Methods supporting a list of Einsatzkomponente records.
- */
-class EinsatzkomponenteModelEinsatzberichte extends JModelList {
-    /**
-     * Constructor.
-     *
-     * @param    array    An optional associative array of configuration settings.
-     * @see        JController
-     * @since    1.6
-     */
-    public function __construct($config = array()) {
-        parent::__construct($config);
-    }
-    /**
-     * Method to auto-populate the model state.
-     *
-     * Note. Calling getState in this method will result in recursion.
-     *
-     * @since	1.6
-     */
-    protected function populateState($ordering = null, $direction = null)
-    {
-
-
-        // Initialise variables.
-        $app = JFactory::getApplication();
-		$params = $app->getParams('com_einsatzkomponente');
-		$page_limit = $params->get('display_home_pagination_limit','5');
-		if (!$page_limit) : $page_limit = $app->getCfg('list_limit'); endif;
-
-        // List state information
-        $limit = $app->getUserStateFromRequest('global.list.limit', 'limit', $page_limit);
-        $this->setState('list.limit', $limit);
-		
-if ($limit != '0') :   
-        $limitstart = $app->input->getInt('limitstart', 0);
-        $this->setState('list.start', $limitstart);
-else:  	$limitstart = '0';
-		$this->setState('list.start', $limitstart);
-endif;
-
-//echo 'limit:'.$limit.'<br/>limitstart:'.$limitstart;
-        if ($list = $app->getUserStateFromRequest($this->context . '.list', 'list', array(), 'array'))
-        {
-            foreach ($list as $name => $value)
-            {
-                // Extra validations
-                switch ($name)
-                {
-                    case 'fullordering':
-                        $orderingParts = explode(' ', $value);
-
-                        if (count($orderingParts) >= 2)
-                        {
-                            // Latest part will be considered the direction
-                            $fullDirection = end($orderingParts);
-
-                            if (in_array(strtoupper($fullDirection), array('ASC', 'DESC', '')))
-                            {
-                                $this->setState('list.direction', $fullDirection);
-                            }
-
-                            unset($orderingParts[count($orderingParts) - 1]);
-
-                            // The rest will be the ordering
-                            $fullOrdering = implode(' ', $orderingParts);
-
-                            if (in_array($fullOrdering, $this->filter_fields))
-                            {
-                                $this->setState('list.ordering', $fullOrdering);
-                            }
-                        }
-                        else
-                        {
-                            $this->setState('list.ordering', $ordering);
-                            $this->setState('list.direction', $direction);
-                        }
-                        break;
-
-                    case 'ordering':
-                        if (!in_array($value, $this->filter_fields))
-                        {
-                            $value = $ordering;
-                        }
-                        break;
-
-                    case 'direction':
-                        if (!in_array(strtoupper($value), array('ASC', 'DESC', '')))
-                        {
-                            $value = $direction;
-                        }
-                        break;
-
-                    case 'limit':
-                        $limit = $value;
-                        break;
-
-                    // Just to keep the default case
-                    default:
-                        $value = $value;
-                        break;
-                }
-
-                $this->setState('list.' . $name, $value);
-            }
-        }
-
-        // Receive & set filters
-        if ($filters = $app->getUserStateFromRequest($this->context . '.filter', 'filter', array(), 'array'))
-        {
-            foreach ($filters as $name => $value)
-            {
-                $this->setState('filter.' . $name, $value);
-            }
-        }
-
-        $this->setState('list.ordering', $app->input->get('filter_order'));
-        $this->setState('list.direction', $app->input->get('filter_order_Dir'));
-    }
-    /**
-     * Build an SQL query to load the list data.
-     *
-     * @return	JDatabaseQuery
-     * @since	1.6
-     */
-    protected function getListQuery() {
-        // Create a new query object.
-        $db = $this->getDbo();
-        $query = $db->getQuery(true);
-        // Select the required fields from the table.
-        $query->select(
-                $this->getState(
-                        'list.select', 'a.*'
-                )
-        );
-        
-        $query->from('#__eiko_einsatzberichte AS a');
-        
-		// Join over the foreign key 'auswahl_orga'
-		$query->select('dep.id AS mission_orga');
-		$query->select('dep.ordering AS department_ordering');
-		$query->join('LEFT', '#__eiko_organisationen AS dep ON dep.id = a.auswahl_orga');
-		// Join over the foreign key 'tickerkat'
-		$query->select('tic.title AS mission_kat');
-		$query->select('tic.ordering AS kat_ordering');
-		$query->join('LEFT', '#__eiko_tickerkat AS tic ON tic.id = a.tickerkat');
-		// Join over the foreign key 'vehicles'
-		$query->select('veh.name AS mission_car');
-		$query->select('veh.ordering AS vehicle_ordering');
-		$query->join('LEFT', '#__eiko_fahrzeuge AS veh ON veh.id = a.vehicles');
-		// Join over the foreign key 'ausruestung'
-		$query->select('#__eiko_ausruestung_1662678.name AS ausruestung_name_1662678');
-		$query->join('LEFT', '#__eiko_ausruestung AS #__eiko_ausruestung_1662678 ON #__eiko_ausruestung_1662678.id = a.ausruestung');
-		// Join over the user field 'created_by'
-		$query->select('created_by.name AS created_by');
-		$query->join('LEFT', '#__users AS created_by ON created_by.id = a.created_by');
-		// Join over the user field 'modified_by'
-		$query->select('modified_by.name AS modified_by');
-		$query->join('LEFT', '#__users AS modified_by ON modified_by.id = a.modified_by');
-		// Filter by search in title
-		$search = $this->getState('filter.search');
-		if (!empty($search)) {
-			if (stripos($search, 'id:') === 0) {
-				$query->where('a.id = '.(int) substr($search, 3));
-			} else {
-				$search = $db->Quote('%'.$db->escape($search, true).'%');
-                $query->where('( a.address LIKE '.$search.'  OR  a.summary LIKE '.$search.' OR  a.ausruestung LIKE '.$search.' OR  a.boss LIKE '.$search.'  OR  a.boss2 LIKE '.$search.'  OR  a.desc LIKE '.$search.' )');
-			}
-		}
-        
-		//Filtering data1
-		//Filtering alerting
-		
-		//Filtering updatedate
-		$filter_updatedate_from = $this->state->get("filter.updatedate.from");
-		if ($filter_updatedate_from) {
-			$query->where("a.updatedate >= '".$filter_updatedate_from."'");
-		}
-		$filter_updatedate_to = $this->state->get("filter.updatedate.to");
-		if ($filter_updatedate_to) {
-			$query->where("a.updatedate <= '".$filter_updatedate_to."'");
-		}
-		
-		//Filtering createdate
-		$filter_createdate_from = $this->state->get("filter.createdate.from");
-		if ($filter_createdate_from) {
-			$query->where("a.createdate >= '".$filter_createdate_from."'");
-		}
-		$filter_createdate_to = $this->state->get("filter.createdate.to");
-		if ($filter_createdate_to) {
-			$query->where("a.createdate <= '".$filter_createdate_to."'");
-		}
-
-		//Filtering auswahl_orga
-		$filter_auswahl_orga = $this->state->get("filter.auswahl_orga");
-		if ($filter_auswahl_orga) {
-			$query->where("a.auswahl_orga = '".$filter_auswahl_orga."'");
-		}
-		//Filtering ausruestung
-		$filter_ausruestung = $this->state->get("filter.ausruestung");
-		if ($filter_ausruestung) {
-			$query->where("a.ausruestung = '".$filter_ausruestung."'");
-		}
-		//Filtering created_by
-		$filter_created_by = $this->state->get("filter.created_by");
-		if ($filter_created_by) {
-			$query->where("a.created_by = '".$filter_created_by."'");
-		}      
-		
-		//Filtering modified_by
-		$filter_modified_by = $this->state->get("filter.modified_by");
-		if ($filter_modified_by) {
-			$query->where("a.modified_by = '".$filter_modified_by."'");
-		}        
-
-        return $query;
-    }
-}
diff --git a/site/models/forms/einsatzbericht.xml b/site/models/forms/einsatzbericht.xml
index a9e7e72..227844a 100644
--- a/site/models/forms/einsatzbericht.xml
+++ b/site/models/forms/einsatzbericht.xml
@@ -41,7 +41,6 @@
        <field name="image" type="media"
             label="Titelbild"
             description="Weitere Bilder können Sie über den Flash-Uploader hinzufügen" 
-            filter="raw"
 		    preview="true"
 			id="einsatzbericht_image_klein"
             directory="com_einsatzkomponente/einsatzbilder" />   
diff --git a/site/models/forms/einsatzberichtform.xml b/site/models/forms/einsatzberichtform.xml
index df5a6b2..5a1c62a 100644
--- a/site/models/forms/einsatzberichtform.xml
+++ b/site/models/forms/einsatzberichtform.xml
@@ -50,7 +50,6 @@
        <field name="image" type="media"
             label="Titelbild"
             description="Weitere Bilder können Sie über den Flash-Uploader hinzufügen" 
-            filter="raw"
 		    preview="true"
 			id="einsatzbericht_image_klein"
             directory="com_einsatzkomponente/einsatzbilder" 
@@ -59,7 +58,6 @@
        <field name="watermark_image" type="media"
 			label="COM_EINSATZKOMPONENTE_OPTION_WASSERZEICHEN_WAEHLEN" 
 			description="Sie können Wasserzeichen hinzufügen. Die Datei muss zwingend eine PNG-Datei sein !!" 
-            filter="raw"
 		    preview="true"
 			default ="images/com_einsatzkomponente/watermark/watermark.png"
             directory="com_einsatzkomponente/watermark" />   
diff --git a/site/models/forms/einsatzfahrzeug.xml b/site/models/forms/einsatzfahrzeug.xml
index d6f548b..88afdc0 100644
--- a/site/models/forms/einsatzfahrzeug.xml
+++ b/site/models/forms/einsatzfahrzeug.xml
@@ -168,7 +168,6 @@
     <field name="image" type="media"
             label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZFAHRZEUG_IMAGE"
             description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZFAHRZEUG_IMAGE" 
-            filter="raw"
 			preview="true"
             directory="/media/com_einsatzkomponente/images/vehicles" />
     <field name="desc" type="editor"
diff --git a/site/models/forms/einsatzfahrzeugform.xml b/site/models/forms/einsatzfahrzeugform.xml
index 4755a02..d5e14d4 100644
--- a/site/models/forms/einsatzfahrzeugform.xml
+++ b/site/models/forms/einsatzfahrzeugform.xml
@@ -169,7 +169,6 @@
     <field name="image" type="media"
             label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZFAHRZEUG_IMAGE"
             description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZFAHRZEUG_IMAGE" 
-            filter="raw"
 			preview="true"
             directory="/media/com_einsatzkomponente/images/vehicles" />
     <field name="desc" type="editor"
diff --git a/site/models/forms/organisation.xml b/site/models/forms/organisation.xml
index 5664757..3efc492 100644
--- a/site/models/forms/organisation.xml
+++ b/site/models/forms/organisation.xml
@@ -17,7 +17,6 @@
                 
             label="COM_EINSATZKOMPONENTE_FORM_LBL_EINSATZART_ICON"
             description="COM_EINSATZKOMPONENTE_FORM_DESC_EINSATZART_ICON" 
-            filter="raw"
 			preview ="true"
 			hide_none="1"
 			id="organisation_icon"
diff --git a/site/views/einsatzarchiv/tmpl/default.xml b/site/views/einsatzarchiv/tmpl/default.xml
index 3a0588d..0aba0fa 100644
--- a/site/views/einsatzarchiv/tmpl/default.xml
+++ b/site/views/einsatzarchiv/tmpl/default.xml
@@ -2,7 +2,7 @@
 <metadata>
 	<layout title="Einsatzarchiv" option="View">
         <message>
-                        <![CDATA[(*NeueVersion mit neuen Filtern* Layout und Filtereinstellungen auswählbar)]]>
+                        <![CDATA[(*Übersicht aller Einsatzberichte* Layout und Filtereinstellungen auswählbar)]]>
         </message>
 	</layout>
 
diff --git a/site/views/einsatzarchiv/view.feed.php b/site/views/einsatzarchiv/view.feed.php
index e911213..3a1cdbc 100644
--- a/site/views/einsatzarchiv/view.feed.php
+++ b/site/views/einsatzarchiv/view.feed.php
@@ -49,10 +49,14 @@ public function display($tpl = null) {
 		// Because the application sets a default page title,
 		// we need to get it from the menu item itself
 		$menu = $menus->getActive();
-		$this->document->link = JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzarchiv&Itemid='.$menu->id);;
+		$this->document->link = JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzarchiv&Itemid='.$menu->id);
+		$i=0;
 		foreach ( $this->items as $item )
 		{
-					
+			if ($this->params->get('rss_items','2') == $i ) : break;endif;
+			$i++;
+			
+			
 			//$item->auswahl_orga = str_replace(",", " +++ ", $this->auswahl_orga);
 			$summary = $this->escape( $item->summary );
 			$title = html_entity_decode( $summary );
@@ -77,10 +81,23 @@ public function display($tpl = null) {
 
 			$rss_item->description 	.= '<table>';
 			
-			if ($item->auswahl_orga) :
+			if ($item->auswahl_orga and $this->params->get('display_rss_orgas','1')) :
 			$rss_item->description 	.= '<tr><td><b>Einsatzkräfte</b>: +++ '.$item->auswahl_orga.' +++</td></tr>';
 			endif;
 			
+			if ($item->vehicles and $this->params->get('display_rss_vehicles','0')) :
+			$rss_item->description 	.= '<tr><td><b>Einsatzfahrzeuge</b>: +++ '.$item->vehicles.' +++</td></tr>';
+			endif;
+			
+			if ($item->people and $this->params->get('display_rss_people','0')) :
+			$rss_item->description 	.= '<tr><td><b>Mannschaftsstärke</b>: '.$item->people.'</td></tr>';
+			endif;
+			
+			if ($item->date3 >1 and $this->params->get('display_rss_time','0')) : 
+			$einsatzdauer = EinsatzkomponenteHelper::getEinsatzdauer(date('d.m.Y H:i', $item->date1),$item->date3);
+			$rss_item->description 	.= '<tr><td><b>Einsatzdauer</b>: '.$einsatzdauer.'</td></tr>';
+			endif;
+
 			if ($desc) :
 			$rss_item->description 	.= '<tr><td>'.$desc.'</td></tr>';
 			endif;
@@ -96,15 +113,6 @@ public function display($tpl = null) {
 			
 			$rss_item->description 	.= '</table>';
 			
-			/*$rss_item->category   	= $item->category;
-			$rss_item->author		= $author;
-			if ($feedEmail == 'site') {
-				$rss_item->authorEmail = $siteEmail;
-			}
-			else {
-				$rss_item->authorEmail = $item->author_email;
-			}
-*/
 			// loads item info into rss array
 			$this->document->addItem( $rss_item );
 		}
diff --git a/site/views/einsatzberichte/index.html b/site/views/einsatzberichte/index.html
deleted file mode 100644
index 42682b4..0000000
--- a/site/views/einsatzberichte/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><body></body></html>
\ No newline at end of file
diff --git a/site/views/einsatzberichte/tmpl/default.php b/site/views/einsatzberichte/tmpl/default.php
deleted file mode 100644
index 5eedef3..0000000
--- a/site/views/einsatzberichte/tmpl/default.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * @version     3.15.0
- * @package     com_einsatzkomponente
- * @copyright   Copyright (C) 2017 by Ralf Meyer. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- * @author      Ralf Meyer <ralf.meyer@mail.de> - https://einsatzkomponente.de
- */
-// no direct access
-defined('_JEXEC') or die;
-
-//Load admin language file
-$lang = JFactory::getLanguage();
-$lang->load('com_einsatzkomponente', JPATH_ADMINISTRATOR);
-
-
-JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');
-
-$user = JFactory::getUser();
-$userId = $user->get('id');
-$canCreate = $user->authorise('core.create', 'com_einsatzkomponente');
-$canEdit = $user->authorise('core.edit', 'com_einsatzkomponente');
-$canCheckin = $user->authorise('core.manage', 'com_einsatzkomponente');
-$canChange = $user->authorise('core.edit.state', 'com_einsatzkomponente');
-$canDelete = $user->authorise('core.delete', 'com_einsatzkomponente');
-
-
-require_once JPATH_SITE.'/components/com_einsatzkomponente/views/einsatzberichte/tmpl/'.$this->params->get('main_layout','main_layout_1.php').''; 
-
-?> 
\ No newline at end of file
diff --git a/site/views/einsatzberichte/tmpl/default.xml b/site/views/einsatzberichte/tmpl/default.xml
deleted file mode 100644
index 745da05..0000000
--- a/site/views/einsatzberichte/tmpl/default.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<metadata>
-	<layout title="Einsatzberichte" option="View">
-        <message>
-                        <![CDATA[(*AlteVersion* Layout und Filtereinstellungen auswählbar)]]>
-        </message>
-	</layout>
-	<fields name="params">
-		<fieldset 
-            name="basic"
-			label="Parametereinstellungen">
-			
-<field name="note22" 
-type="note" 
-class="alert alert-info" 
-label="Eigene Layouts verwenden" 
-description="In der Einsatzkomponente V3 ist es möglich auch eigene Layouts zu verwenden, die bei einem Update nicht überschrieben werden. Weitere Informationen hierzu gibt es im Forum http://www.einsatzkomponente.de" 
-/>
-
-		 <field name="note_main_layout" 
-		  type="note" 
-		  class="alert alert-grey"
-		  label="Auswahl des Layout für die Einsatzübersicht :" 
-		  description="Hier können Sie jetzt das Aussehen der Einsatzübericht festlegen. Die Option Layout 5 und 6 sind für eigene Layouts reserviert. Nähere Informationen darüber gibt es im Forum."
-		  />	
-
-			
-			<field name="main_layout" 
-			type="list" 
-			default="main_layout_1.php" 
-			label="Bitte wählen Sie ein Layout für die Einsatzübersicht aus :" 
-			description="Layout 5+6 sind in der Standard-Installation nicht enthalten und für eigene Layout reseveriert !!">
-  				<option value="main_layout_1.php">main_layout_1</option>
-  				<option value="main_layout_2.php">main_layout_2</option>
-				<option value="main_layout_3.php">main_layout_3</option>
-				<option value="main_layout_4.php">main_layout_4</option>
-				<option value="main_layout_5.php">main_layout_5</option>
-				<option value="main_layout_6.php">main_layout_6</option>
-			</field>			
-			
-		<field
-			name="spacer1"
-			type="spacer"
-			hr="true"
-		/>
-		
-		 <field name="note_detail_layout" 
-		  type="note" 
-		  class="alert alert-grey"
-		  label="Auswahl des Layout für die Detailansicht :" 
-		  description="Hier können Sie jetzt das Aussehen der Detailansicht festlegen. Die Option Layout 5 und 6 ist für ein eigenes Layout reserviert. Nähere Informationen darüber gibt es im Forum."
-		  />	
-		
-			<field name="detail_layout" 
-			type="list" 
-			default="detail_layout_1.php" 
-			label="Bitte wählen Sie ein Layout für die Detailansicht aus :" 
-			description="Layout 5 und sind in der Standard-Installation nicht enthalten und für ein eigenes Layout reseveriert !!">
-  				<option value="detail_layout_1.php">detail_layout_1</option>
-  				<option value="detail_layout_2.php">detail_layout_2</option>
-				<option value="detail_layout_3.php">detail_layout_3</option>
-				<option value="detail_layout_4.php">detail_layout_4</option>
-				<option value="detail_layout_5.php">detail_layout_5</option>
-				<option value="detail_layout_6.php">detail_layout_6</option>
-			</field>			
-			
-		<field
-			name="spacer12"
-			type="spacer"
-			hr="true"
-		/>
-		
-		
-		
-		
-
-
-		 <field name="note_custom" 
-		  type="note" 
-		  class="alert alert-grey"
-		  label="Diverse Einstellungen :" 
-		  description="Hier kann festgelegt werden, ob z.b. nur die Daten eines bestimmten Jahres angezeigt werden sollen, oder nur die Daten einer bestimmten Organisation in der Ausgabe erfasst werden sollen. "
-		  />	
-
-
-			
-			<field name="anzeigejahr" type="text" size="5" default="" label="Welches Jahr soll angezeigt werden ?" description="Wenn das aktuelle Jahr angezeigt werden soll, dann Feld bitte leer lassen." />
-
-		<field
-			name="spacer2"
-			type="spacer"
-			hr="true"
-		/>
-
-
-		<field name="abfragewehr" 
-			class="btn-group"
-			type="radio" 
-			default="0" 
-			label="Nur Daten einer bestimmten Organisation anzeigen ?" 
-			description="">
-        <option value="0">nein</option>
-        <option value="1">ja</option> 
-		</field>
-
-
-			<field name="anzeigewehr" type="sql" default="" label="Wenn Ja, bitte hier w&#228;hlen" query="SELECT id AS value, name AS anzeigewehr FROM #__eiko_organisationen WHERE state=1 ORDER BY name" />
-
-		<field
-			name="spacer3"
-			type="spacer"
-			hr="true"
-		/>
-
-		</fieldset>
-	</fields>
-</metadata>
diff --git a/site/views/einsatzberichte/tmpl/index.html b/site/views/einsatzberichte/tmpl/index.html
deleted file mode 100644
index 42682b4..0000000
--- a/site/views/einsatzberichte/tmpl/index.html
+++ /dev/null
@@ -1 +0,0 @@
-<html><body></body></html>
\ No newline at end of file
diff --git a/site/views/einsatzberichte/tmpl/main_layout_1.php b/site/views/einsatzberichte/tmpl/main_layout_1.php
deleted file mode 100644
index 020843b..0000000
--- a/site/views/einsatzberichte/tmpl/main_layout_1.php
+++ /dev/null
@@ -1,482 +0,0 @@
-<?php
-/**
- * @version     3.15.0
- * @package     com_einsatzkomponente
- * @copyright   Copyright (C) 2017 by Ralf Meyer. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- * @author      Ralf Meyer <ralf.meyer@mail.de> - https://einsatzkomponente.de
- */
-// no direct access
-defined('_JEXEC') or die;
-
-
-//print_r ($this->organisationen);
-
-//echo $this->selectedYear;
-?>
-
-<div>
-
-<!--RSS-Feed Imag-->
-<?php if ($this->params->get('display_home_rss','1')) : ?>
-<div class="eiko_rss_main_1" ><a href="<?php JURI::base();?>index.php?option=com_einsatzkomponente&view=einsatzberichte&format=feed&type=rss"><span class="icon-feed" style="color:#cccccc;font-size:24px;"> </span> </a></div>
-<?php endif;?>
-
-
-<!--Page Heading-->
-<?php if ($this->params->get('show_page_heading', 1)) : ?>
-<div class="page-header eiko_header_main_1">
-<h1> <?php echo $this->escape($this->params->get('page_heading')); ?> </h1> 
-</div>
-<?php endif;?>
-
-
-<?php // Filter ------------------------------------------------------------------------------------
-	
-
-?>
-<form action="<?php echo JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzberichte&list=1'); ?>" method="post" name="adminForm" id="adminForm">
-<?php
-
-
-if (!$this->params->get('anzeigejahr','0') and $this->params->get('display_filter_jahre','1')) : 
-	$years[] = JHTML::_('select.option', '', JTEXT::_('COM_EINSATZKOMPONENTE_JAHR')  , 'id', 'title');
-	$years[] = JHTML::_('select.option', '9999', JTEXT::_('COM_EINSATZKOMPONENTE_ALLE_EINSAETZE')  , 'id', 'title');
-	$years = array_merge($years, (array)$this->years);
-	 
-	echo JHTML::_('select.genericlist',  $years, 'year', ' class="eiko_select_jahr_main_1" onchange=submit(); ', 'id', 'title', $this->selectedYear, $translate=true);?>
-	
-    <?php
-endif;
-if ($this->params->get('display_filter_einsatzarten','1')) : 
-	$einsatzarten[] = JHTML::_('select.option', '', JTEXT::_('COM_EINSATZKOMPONENTE_ALLE_EINSATZARTEN')  , 'id', 'title');
-	$einsatzarten = array_merge($einsatzarten, (array)$this->einsatzarten);
-	?><?php  
-	echo JHTML::_('select.genericlist',  $einsatzarten, 'selectedEinsatzart', ' class="eiko_select_einsatzart_main_1" onchange=submit(); ', 'id', 'title', $this->selectedEinsatzart, $translate=true);?>
-    <?php
-	endif;
-	if (!$this->params->get('abfragewehr','0') and $this->params->get('display_filter_organisationen','1')) : 
-	$organisationen[] = JHTML::_('select.option', '', JTEXT::_('COM_EINSATZKOMPONENTE_ALLE_ORGANISATIONEN')  , 'id', 'name');
-	$organisationen = array_merge($organisationen, (array)$this->organisationen);
-	?><?php 
-	echo JHTML::_('select.genericlist',  $organisationen, 'selectedOrga', ' class="eiko_select_organisation_main_1" onchange=submit(); ', 'id', 'name', $this->selectedOrga, $translate=true);
-	endif;?>
-</div>
-<?php // Filter ENDE   -------------------------------------------------------------------------------
- 
-  
-echo '<span class="mobile_hide_320">'.$this->modulepos_2.'</span>';
-
-?>
-<?php if(JFactory::getUser()->authorise('core.create','com_einsatzkomponente.einsatzbericht')): ?><div class="eiko_neu"><a href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzberichtform&layout=edit&id=0'); ?>" class="eiko_btn2">Einsatz eintragen</a></div>
-	<?php endif; ?>
-<table width="100%" class="table table-striped table-bordered eiko_table_main_1" border="0" cellspacing="0" cellpadding="0">
-    <thead>
-        <tr>
-           <?php $col ='0';?>
-           <?php if ($this->params->get('display_home_number','1') or $this->params->get('display_home_alertimage_num','0')) : ?>
-		   <?php if ($this->params->get('display_home_number','1')):?>
-            <th class="eiko_th_einsatznummer_main_1" width=""><?php echo JTEXT::_('COM_EINSATZKOMPONENTE_NR');?></th>
-           <?php else:?>
-            <th class="eiko_th_einsatznummer_main_1" width=""></th>
-           <?php endif;?>
-           <?php $col =$col+1;?>
-           <?php endif;?>
-           <?php if ($this->params->get('display_home_alertimage','0')) : ?>
-            <th class="eiko_th_alarmierungsart_main_1 mobile_hide_480" width=""><?php echo JTEXT::_('COM_EINSATZKOMPONENTE_ALARM_UEBER');?></th>
-           <?php $col =$col+1;?>
-           <?php endif;?>
-            <th class="eiko_th_datum_main_1 mobile_hide_320" width=""><?php echo JTEXT::_('COM_EINSATZKOMPONENTE_DATUM');?></th>
-           <?php $col =$col+1;?>
-            <th class="eiko_th_einsatzart_main_1" width=""><?php echo JTEXT::_('COM_EINSATZKOMPONENTE_EINSATZART_ORT');?></th>
-           <?php $col =$col+1;?>
-            <th class="eiko_th_kurzbericht_main_1 mobile_hide_480" width=""><?php echo JTEXT::_('COM_EINSATZKOMPONENTE_DESC');?></th>
-           <?php $col =$col+1;?>
-           <?php if ($this->params->get('display_home_orga','0')) : ?>
-            <th class="eiko_th_organisationen_main_1 mobile_hide_480" width=""><?php echo JTEXT::_('COM_EINSATZKOMPONENTE_ORGANISATIONEN');?></th>
-           <?php $col =$col+1;?>
-           <?php endif;?>
-           <?php if ($this->params->get('display_home_image')) : ?>
-            <th class="eiko_th_einsatzbild_main_1 mobile_hide_480" width=""><?php echo JTEXT::_('COM_EINSATZKOMPONENTE_EINSATZFOTOS');?></th>
-           <?php $col =$col+1;?>
-           <?php endif;?>
-           <?php if ($this->params->get('display_home_presse')) : ?>
-            <th class="eiko_th_presse_main_1 mobile_hide_480" width=""><?php echo JTEXT::_('COM_EINSATZKOMPONENTE_PRESSELINK');?></th>
-           <?php $col =$col+1;?>
-           <?php endif;?>
-		   <?php if ($this->params->get('display_home_counter','1')) : ?>
-		   <th class="eiko_th_counter mobile_hide_480" width=""><?php echo JTEXT::_('COM_EINSATZKOMPONENTE_ZUGRIFFE');?></th>
-		   <?php $col =$col+1;?>
-		   <?php endif;?>
-        </tr>
-        <!--<tr><th colspan="6"><hr /></th></tr>-->
-    </thead>
-    
- <tbody>
-	 <?php 
-$show = false;	 
-if ($this->params->get('display_home_pagination')) :
-     $i=$this->pagination->total - $this->pagination->limitstart+1;
-	 else:
-     $i=count($this->reports)+1;
-	 endif;
-	 $m = '';
-	 $hide=0;
-     foreach ($this->reports as $item) :
-	 
-	 	// Funktion : Einsatzkategorie
-		$db = JFactory::getDBO();
-		$query = $db->getQuery(true);
-					$query
-						->select('*')
-						->from('#__eiko_tickerkat')
-						->where('id = "' .$item->tickerkat.'"  AND state = "1" ');
-					$db->setQuery($query);
-					$tickerkat = $db->loadObject();
-
-?>
-          <!-- Filter State-->
-		  <?php if($item->state == '1'): ?>
-		  <?php
-		   $i--; //print_r ($item);
-		   $curTime = strtotime($item->date1); 
-			?>
-		   <!-- Filter Einsatzart--!>
-		  <?php if(preg_match('/\b'.$this->selectedOrga.'\b/',$item->auswahl_orga)==true or $this->selectedOrga == '0'): ?>
-		  <?php if ($this->selectedEinsatzart == $item->data1 or $this->selectedEinsatzart == '' ) : ?>
-          <?php $show = true;?>
-          
-           <!--Anzeige des Monatsnamen-->
-		   <?php if ($this->params->get('display_home_monat','1')) : ?>
-           <?php if (date('n', $curTime) != $m) : ?>
-		   <tr style="border-bottom:1px #666666  dotted;"><td colspan="<?php echo $col;?>" class="eiko_td_month_main_1">
-           <?php $m=date('n', $curTime);?>
-		   <?php echo '<h3>';?>
-           <?php echo $this->monate[$m];?>
-		   <?php if ($this->selectedYear == '9999') : echo date('Y', $curTime); endif;?>
-           <?php echo '</h3>';?>
-           </td></tr>
-           <?php endif;?>
-           <?php endif;?>
-           <!--Anzeige des Monatsnamen ENDE-->
-           
-		   <tr class="eiko_tr_main_1">
-           
-           <?php if ($this->params->get('display_home_number','1') or $this->params->get('display_home_alertimage_num','0')) : ?>
-           <?php if ($this->params->get('display_home_marker','1')) : ?>
-		   <td class="eiko_td_marker_main_1" style="background-color:<?php echo $item->marker;?>;" >
-           <?php else:?>
-		   <td class="eiko_td_marker_main_1">
-           <?php endif;?>
-		   
-           <?php if ($this->params->get('display_home_number','2') == '1') : ?>
-           <?php if ($hide) :?>
-           <?php echo $i.' - '.($i + $hide);$hide =0;?>
-           <?php else:?>
-           <?php echo $i;?>
-           <?php endif;?>
-           <?php endif;?>
-		   
-			
-           <?php if ($this->params->get('display_home_number','2') == '2') : 
-				$item->date_11 		= strtotime($item->date1);
-				$item->date1_year 	= date('Y', $item->date_11);
-				echo '<span style="white-space: nowrap;" class="eiko_span_marker_main_1">Nr. '.EinsatzkomponenteHelper::ermittle_einsatz_nummer($item->date_11,$item->data1).' / '.$item->date1_year.'</span>';
-				endif;?>
-		   
-           <?php if ($this->params->get('display_home_alertimage_num','0')) : ?>
-           <br/><img class="eiko_icon hasTooltip" src="<?php echo JURI::Root();?><?php echo $item->image;?>" title="<?php echo $item->alarmierungsart;?>" />
-           <?php endif;?>
-            </td>
-           <?php endif;?>
-           
-           <?php if ($this->params->get('display_home_alertimage','0')) : ?>
-		   <td class="eiko_td_alarmierungsart_main_1 mobile_hide_480"> 
-           <img class="eiko_icon hasTooltip" src="<?php echo JURI::Root();?><?php echo $item->image;?>" title="<?php echo $item->alarmierungsart;?>" />
-           </td>
-           <?php endif;?>
-           
-           <?php if ($this->params->get('display_home_date_image','1')=='1') : ?>
-		   <td class="eiko_td_kalender_main_1 mobile_hide_320"> 
-			<div class="home_cal_icon">
-			<div class="home_cal_monat"><?php echo date('M', $curTime);?></div>
-			<div class="home_cal_tag"><?php echo date('d', $curTime);?></div>
-			<div class="home_cal_jahr"><span style="font-size:10px;"><?php echo date('Y', $curTime);?></span></div>
-			</div>
-           </td>
-           <?php endif;?>
-           <?php if ($this->params->get('display_home_date_image','1')=='3') : ?>
-		   <td class="eiko_td_kalender_main_1 mobile_hide_320"> 
-			<div class="home_cal_icon">
-			<div class="home_cal_monat"><?php echo date('M', $curTime);?></div>
-			<div class="home_cal_tag"><?php echo date('d', $curTime);?></div>
-			<div class="home_cal_jahr"><span style="font-size:10px;"><?php echo date('Y', $curTime);?></span></div>
-			<?php echo '<span style="font-size:smaller;white-space: nowrap;" class="">'.date('H:i ', $curTime).'Uhr</span>'; ?>
-			</div>
-           </td>
-           <?php endif;?>
-           <?php if ($this->params->get('display_home_date_image','1')=='2') : ?>
-		   <td class="eiko_td_datum_main_1 mobile_hide_320"> <?php echo date('d.m.Y ', $curTime);?><br /><?php echo date('H:i ', $curTime); ?>Uhr</td>
-           <?php endif;?>
-           <?php if ($this->params->get('display_home_date_image','1')=='0') : ?>
-		   <td class="eiko_td_datum_main_1 mobile_hide_320"> <?php echo date('d.m.Y ', $curTime);?></td>
-           <?php endif;?>
-
-		   <td class="eiko_td_einsatzart_main_1">
-           
-		   <?php if ($this->params->get('display_list_icon')) : ?>
-		   <?php if (isset($item->list_icon)) :?>
-           <img class="eiko_icon hasTooltip" style="float:<?php echo $this->params->get('float_list_icon');?>;" src="<?php echo JURI::Root();?><?php echo $item->list_icon;?>" title="<?php echo JTEXT::_('COM_EINSATZKOMPONENTE_EINSATZART');?>: <?php echo $item->einsatzart;?>" />
-           <?php endif;?>
-           <?php endif;?>
-
-		   <?php if ($this->params->get('display_tickerkat_icon')) : ?>
-		   <?php if (isset($tickerkat->image)) :?>
-           <img class="eiko_icon hasTooltip mobile_hide_480" style="float:<?php echo $this->params->get('float_tickerkat_icon');?>;" src="<?php echo JURI::Root();?><?php echo $tickerkat->image;?>" title="<?php echo JTEXT::_('COM_EINSATZKOMPONENTE_KATEGORIE');?>: <?php echo $tickerkat->title;?>" />
-		   <?php endif;?>
-           <?php endif;?>
-		   
-			<?php if ($this->params->get('display_home_links_2')) : ?>
-           <a href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente'.$this->layout_detail_link.'&view=einsatzbericht&id=' . (int)$item->id); ?>">
-		   <?php endif; ?>
-		   <?php echo ''.$item->einsatzart; ?>
-			<?php if ($this->params->get('display_home_links_2','1')) : ?>
-           </a>
-		   <?php endif; ?>
-           <br />
-
-<?php echo '<span class="eiko_address_main_1"><i class="icon-location" ></i> '.$item->address.'</span>';?>
-
-			<?php if ($this->params->get('display_home_info','1') or $this->params->get('display_home_links','1')) : ?>
-			<div class="eiko_td_buttons_main_1">
-			<?php endif;?>
-
-			<?php if ($this->params->get('display_home_info','1')) : ?>
-			<input type="button" class="btn-home" onClick="jQuery.toggle<?php echo $item->id;?>(div<?php echo $item->id;?>)" value="<?php echo JTEXT::_('COM_EINSATZKOMPONENTE_KURZINFO');?>"></input>
-            <script type="text/javascript">
-			jQuery.toggle<?php echo $item->id;?> = function(query)
-				{
-        		jQuery(query).slideToggle("5000");
-				jQuery("#tr<?php echo $item->id;?>").fadeToggle("fast");
-				}   
-			</script>
-            <?php endif;?>
-			
-			<?php if ($this->params->get('display_home_links','1')) : ?>
-            <span class="mobile_hide_320"><a class="btn-home" href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente'.$this->layout_detail_link.'&view=einsatzbericht&id=' . (int)$item->id); ?>"><?php echo JTEXT::_('COM_EINSATZKOMPONENTE_DETAILS');?></a></span>
-           <?php endif;?>   
-		   
-			<?php if ($this->params->get('display_home_info','1') or $this->params->get('display_home_links','1')) : ?>
-			</div>
-			<?php endif;?>
-           </td>
-		   
-		   <td class="mobile_hide_480 eiko_td_kurzbericht_main_1"> <?php echo $item->summary;?></td>
-           
-           <?php if ($this->params->get('display_home_orga','0')) : ?>
-           <?php 					
-					$data = array();
-					foreach(explode(',',$item->auswahl_orga) as $value):
-						$db = JFactory::getDbo();
-						$query	= $db->getQuery(true);
-						$query
-							->select('name')
-							->from('#__eiko_organisationen')
-							->where('id = "' .$value.'"');
-						$db->setQuery($query);
-						$results = $db->loadObjectList();
-						if(count($results)){
-							$data[] = '<!-- <span class="label label-info"> --!>'.$results[0]->name.'<!-- </span>--!>'; 
-						}
-					endforeach;
-					$auswahl_orga=  implode('</br>',$data); 
-?>
-		   <td nowrap class="eiko_td_organisationen_main_1 mobile_hide_480"> <?php echo $auswahl_orga;?></td>
-           <?php endif;?>
-
-           <?php if ($this->params->get('display_home_image')) : ?>
-		   <?php if ($item->foto) : ?>
-		   <td class="mobile_hide_480 eiko_td_einsatzbild_main_1"> 
-		   
-			<?php if ($this->params->get('display_home_links_3','0')) : ?>
-			<a href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzbericht&id='.(int) $item->id); ?>">
-			<?php endif; ?> 
-		   <img  class="img-rounded eiko_img_einsatzbild_main_1" style="width:<?php echo $this->params->get('display_home_image_width','80px');?>;" src="<?php echo JURI::Root();?><?php echo $item->foto;?>"/>
-			<?php if ($this->params->get('display_home_links_3','0')) : ?>
-			</a>
-			<?php endif;?>
-		   
-		   </td>
-           <?php endif;?>
-		   <?php if (!$item->foto) : ?>
-           <?php if ($this->params->get('display_home_image_nopic','0')) : ?>
-		   <td class="mobile_hide_480 eiko_td_einsatzbild_main_1"> <img  class="img-rounded eiko_img_einsatzbild_main_1" style="width:<?php echo $this->params->get('display_home_image_width','80px');?>;" src="<?php echo JURI::Root().'images/com_einsatzkomponente/einsatzbilder/nopic.png';?>"/></td>
-           <?php else:?>
-			<td class="mobile_hide_480">&nbsp;</td>
-		   <?php endif;?>
-           <?php endif;?>
-           <?php endif;?>
-		   
-			<?php if ($this->params->get('display_home_presse','0')) : ?>
-				<td class="mobile_hide_480 mobile_hide_presse">
-					<?php if ($item->presse or $item->presse2 or $item->presse3) : ?>
-					<?php if ($this->params->get('presse_image','')) : ?>					
-					<img class="eiko_icon_press" src="<?php echo JURI::Root();?><?php echo $this->params->get('presse_image','');?>" title="" />
-					<?php else:?>
-					<?php echo JText::_('COM_EINSATZKOMPONENTE_PRESSELINK'); ?>
-					<?php endif;?>
-					<?php endif;?>
-				</td>
-			<?php endif; ?>
-
-				<?php if ($this->params->get('display_home_counter','1')) : ?>
-		   <?php echo '<td class="mobile_hide_480 mobile_hide_counter"">';?>
-		   <?php echo $item->counter;?>
-		   <?php echo '</td>';?>
-		   <?php endif;?>
-		   </tr>
-           
-           <!-- Zusatzinformation -->
-			<?php if ($this->params->get('display_home_info','1')) : ?>
-			<?php		$data = array();
-					foreach(explode(',',$item->auswahl_orga) as $value):
-						$db = JFactory::getDbo();
-						$query	= $db->getQuery(true);
-						$query
-							->select('name')
-							->from('#__eiko_organisationen')
-							->where('id = "' .$value.'"');
-						$db->setQuery($query);
-						$results = $db->loadObjectList();
-						if(count($results)){
-							$data[] = '<!-- <span class="label label-info"> --!>'.$results[0]->name.'<!-- </span>--!>'; 
-						}
-					endforeach;
-					$auswahl_orga=  implode(' +++ ',$data); ?> 
-            <tr id="tr<?php echo $item->id;?>" class="eiko_tr_zusatz_main_1" style=" display:none;" >
-            
-           <?php if ($this->params->get('display_home_marker','1')) : ?>
-           <?php $rgba = hex2rgba($item->marker,0.7);?>
-            <style>
-				.td<?php echo $item->id;?> {
-				background: -moz-linear-gradient(top,  <?php echo $rgba;?> 0%, rgba(125,185,232,0) 100%); /* FF3.6+ */
-				background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,<?php echo $rgba;?>), color-stop(100%,rgba(125,185,232,0))); /* Chrome,Safari4+ */
-				background: -webkit-linear-gradient(top,  <?php echo $rgba;?> 0%,rgba(125,185,232,0) 100%); /* Chrome10+,Safari5.1+ */
-				background: -o-linear-gradient(top,  <?php echo $rgba;?> 0%,rgba(125,185,232,0) 100%); /* Opera 11.10+ */
-				background: -ms-linear-gradient(top,  <?php echo $rgba;?> 0%,rgba(125,185,232,0) 100%); /* IE10+ */
-				background: linear-gradient(to bottom,  <?php echo $rgba;?> 0%,rgba(125,185,232,0) 100%); /* W3C */
-				filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='<?php echo $item->marker;?>', endColorstr='#007db9e8',GradientType=0 ); /* IE6-9 */
-				}
-			</style>
-		   <td class="td<?php echo $item->id;?>" >
-           <?php else:?>
-		   <td>
-           <?php endif;?>
-            </td>
-            <td colspan="<?php echo $col;?>" class="eiko_td_zusatz_main_1">
-			<div id ="div<?php echo $item->id;?>" style="display:none;">
-            <h3><?php echo JText::_('COM_EINSATZKOMPONENTE_ALARMIERUNGSZEIT');?> :</h3><?php echo date('d.m.Y', $curTime);?> um <?php echo date('H:i', $curTime);?> Uhr
-            <h3><?php echo JText::_('COM_EINSATZKOMPONENTE_EINSATZKRAEFTE');?> :</h3><?php echo $auswahl_orga;?><br/>
-		   <?php if ($item->desc) : ?>
-			<?php jimport('joomla.html.content'); ?>  
-			<?php $Desc = JHTML::_('content.prepare', $item->desc); ?>
-			<h3><?php echo JText::_('COM_EINSATZKOMPONENTE_TITLE_MAIN_3');?> :</h3><?php echo $Desc;?>
-            <?php endif;?>
-            <br /><input type="button" class="btn-home" onClick="jQuery.toggle<?php echo $item->id;?>(div<?php echo $item->id;?>)" value="<?php echo JText::_('COM_EINSATZKOMPONENTE_INFO_SCHLIESSEN');?>"></input>
-           <?php if ($this->params->get('display_home_links','1')) : ?>
-            <a class="btn-home" href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente'.$this->layout_detail_link.'&view=einsatzbericht&id=' . (int)$item->id); ?>"><?php echo JText::_('COM_EINSATZKOMPONENTE_DETAILS');?></a>
-           <?php endif;?>
-           </div> 
-           </td>
-           </tr>
-           <?php endif;?>
-           <?php endif;?><?php endif;?><!-- Filter Einsatzart-->
-           <?php endif;?><!-- Filter State-->
-		  <?php if($item->state == '2'): ?>
-          <?php $hide++;$i--;?>
-          <?php endif;?> 
-		  
-    <?php endforeach; ?>
-    
-<?php if(!$this->reports or !$show): ?>
-<span class="label label-info"><b>Es können zu dieser Auswahl keine Daten in der Datenbank gefunden werden</b></span>
-<?php endif; ?>
-
-    
-    <?php if ($this->params->get('display_home_map')) : ?>
-    <tr><td colspan="<?php echo $col;?>" class="eiko_td_gmap_main_1">
-    <h4><?php echo JText::_('COM_EINSATZKOMPONENTE_EINSATZGEBIET');?></h4>
-			<?php if ($this->params->get('gmap_action','0') == '1') :?>
-  			<div id="map-canvas" style="width:100%; height:<?php echo $this->params->get('home_map_height','300px');?>;">
-    		<noscript>Dieser Teil der Seite erfordert die JavaScript Unterstützung Ihres Browsers!</noscript>
-			</div>
-            <?php endif;?>
-			<?php if ($this->params->get('gmap_action','0') == '2') :?>
-<body onLoad="drawmap();">
-				<!--<div id="descriptionToggle" onClick="toggleInfo()">Informationen zur Karte anzeigen</div>
-				<div id="description" class="">Einsatzkarte</div>-->
-   				<div id="map" style="width:100%; height:<?php echo $this->params->get('home_map_height','300px');?>;"></div> 
-    		<noscript>Dieser Teil der Seite erfordert die JavaScript Unterstützung Ihres Browsers!</noscript>
-            <?php endif;?>
-            </td></tr>
-    <?php endif;?>
- </tbody>   
-    
-    
-    <tfoot>
-    				<!--Prüfen, ob Pagination angezeigt wrden soll-->
-    				<?php if ($this->params->get('display_home_pagination')) : ?>
-					<tr><td colspan="<?php echo $col;?>">
-                    	<form action="#" method=post>
-						<?php echo $this->pagination->getListFooter(); ?><!--Pagination anzeigen-->
-						</form> 
-					</td></tr>
-		   			<?php endif;?><!--Prüfen, ob Pagination angezeigt wrden soll   ENDE -->
-
-<?php if (!$this->params->get('eiko')) : ?>
-        <tr><!-- Bitte das Copyright nicht entfernen. Danke. -->
-            <th colspan="<?php echo $col;?>"><span class="copyright">Einsatzkomponente V<?php echo $this->version; ?>  (C) 2017 by Ralf Meyer ( <a class="copyright_link" href="http://einsatzkomponente.de" target="_blank">www.einsatzkomponente.de</a> )</span></th>
-        </tr>
-	<?php endif; ?>
-    
-</tfoot>
-</table>
-	</form> 
-
-<?php
-echo '<span class="mobile_hide_320">'.$this->modulepos_1.'</span>';
-?>
-
-    <?php function hex2rgba($color, $opacity = false) {  // Farbe von HEX zu RGBA umwandeln 
-
-	$default = 'rgb(0,0,0)';
-	//Return default if no color provided
-	if(empty($color))
-          return $default; 
-	//Sanitize $color if "#" is provided 
-        if ($color[0] == '#' ) {
-        	$color = substr( $color, 1 );
-        }
-        //Check if color has 6 or 3 characters and get values
-        if (strlen($color) == 6) {
-                $hex = array( $color[0] . $color[1], $color[2] . $color[3], $color[4] . $color[5] );
-        } elseif ( strlen( $color ) == 3 ) {
-                $hex = array( $color[0] . $color[0], $color[1] . $color[1], $color[2] . $color[2] );
-        } else {
-                return $default;
-        }
-        //Convert hexadec to rgb
-        $rgb =  array_map('hexdec', $hex);
-        //Check if opacity is set(rgba or rgb)
-        if($opacity){
-        	if(abs($opacity) > 1)
-        		$opacity = 1.0;
-        	$output = 'rgba('.implode(",",$rgb).','.$opacity.')';
-        } else {
-        	$output = 'rgb('.implode(",",$rgb).')';
-        }
-        //Return rgb(a) color string
-        return $output; 
-		
-}
-?> 
diff --git a/site/views/einsatzberichte/tmpl/main_layout_2.php b/site/views/einsatzberichte/tmpl/main_layout_2.php
deleted file mode 100644
index c9617ba..0000000
--- a/site/views/einsatzberichte/tmpl/main_layout_2.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * @version     3.15.0
- * @package     com_einsatzkomponente
- * @copyright   Copyright (C) 2017 by Ralf Meyer. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- * @author      Ralf Meyer <ralf.meyer@mail.de> - https://einsatzkomponente.de
- */
-// no direct access
-defined('_JEXEC') or die;
-
-//print_r($this->pagination);
-//echo $this->selectedYear;
-?>
-
-<div>
-
-<!--RSS-Feed Imag-->
-<?php if ($this->params->get('display_home_rss','1')) : ?>
-<div style="float:right;" ><a href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente'.$this->layout_detail_link.'&task=einsatzberichte'); ?>&format=feed&type=rss"><span class="icon-feed" style="color:#cccccc;font-size:24px;"> </span> </a></div>
-<?php endif; ?>
-
-<!--Page Heading-->
-<?php if ($this->params->get('show_page_heading', 1)) : ?>
-<div class="page-header">
-<h1> <?php echo $this->escape($this->params->get('page_heading')); ?> </h1>
-</div>
-<?php endif;?>
-
-
-
-<?php // Filter ------------------------------------------------------------------------------------
-	
-
-?>
-<form action="<?php echo JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzberichte&list=1'); ?>" method="post" name="adminForm" id="adminForm">
-<?php
-if (!$this->params->get('anzeigejahr')) : 
-	$years[] = JHTML::_('select.option', '', JTEXT::_('Bitte das Jahr auswählen')  , 'id', 'title');
-	$years[] = JHTML::_('select.option', '9999', JTEXT::_('Alle Einsätze anzeigen')  , 'id', 'title');
-	$years = array_merge($years, (array)$this->years);
-	 
-	echo JHTML::_('select.genericlist',  $years, 'year', ' onchange=submit(); ', 'id', 'title', $this->selectedYear);?>
-	
-    <?php
-endif;
-	$einsatzarten[] = JHTML::_('select.option', '', JTEXT::_('alle Einsatzarten')  , 'id', 'title');
-	$einsatzarten = array_merge($einsatzarten, (array)$this->einsatzarten);
-	?><?php 
-	echo JHTML::_('select.genericlist',  $einsatzarten, 'selectedEinsatzart', ' onchange=submit(); ', 'id', 'title', $this->selectedEinsatzart);?> 
-    <?php
-	if (!$this->params->get('abfragewehr','0') and $this->params->get('display_filter_organisationen','1')) : 
-	$organisationen[] = JHTML::_('select.option', '', JTEXT::_('alle Organisationen')  , 'id', 'name');
-	$organisationen = array_merge($organisationen, (array)$this->organisationen);
-	?><?php 
-	echo JHTML::_('select.genericlist',  $organisationen, 'selectedOrga', ' class="eiko_select_organisation_main_1" onchange=submit(); ', 'id', 'name', $this->selectedOrga);
-	endif;?>
-</div>
-<?php // Filter ENDE   -------------------------------------------------------------------------------
- 
-$show = true;
-
-echo $this->modulepos_2;
-
-?>
-<br />
-<br />
-
-<table width="100%" class="table table-striped table-bordered" id="example" border="0" cellspacing="0" cellpadding="0">
-    
- <tbody>
-	 <?php 
-if ($this->params->get('display_home_pagination')) :
-     $i=$this->pagination->total - $this->pagination->limitstart+1;
-	 else:
-     $i=count($this->reports)+1;
-	 endif;
-
-	 $hide=0;
-     foreach ($this->reports as $item) :
-		   $i--; 
-		   $curTime = strtotime($item->date1);
-
-		   ?>
-          <!-- Filter State-->
-		  <?php if($item->state == '1'): ?>
-          <!-- Filter Einsatzart-->
-		  <?php if(preg_match('/\b'.$this->selectedOrga.'\b/',$item->auswahl_orga)==true or $this->selectedOrga == '0'): ?>
-		  <?php if ($this->selectedEinsatzart == $item->data1 or $this->selectedEinsatzart == '' ) : ?>
-          
-          
-<h2>
-
-           <?php if ($this->params->get('display_home_date_image','1')=='1') : ?>
-			<div class="home_cal_icon">
-			<div class="home_cal_monat"><?php echo date('M', $curTime);?></div>
-			<div class="home_cal_tag"><?php echo date('d', $curTime);?></div>
-			<div class="home_cal_jahr"><span style="font-size:10px;"><?php echo date('Y', $curTime);?></span></div>
-			</div>
-           <?php endif;?>
-           <?php if ($this->params->get('display_home_date_image','1')=='2') : ?>
-		   <?php echo date('d.m.Y ', $curTime);?><br /><?php echo date('H:i ', $curTime).' Uhr || '; ?>
-           <?php endif;?>
-           <?php if ($this->params->get('display_home_date_image','1')=='0') : ?>
-		   <?php echo date('d.m.Y ', $curTime).' || ';?>
-           <?php endif;?>
-
-		   
-
-<?php echo $item->summary;?>
-</h2>
-<hr align="left" />
-
-       	   <?php if ($this->params->get('display_home_image')) : ?>
-<div class="eiko_sidepicture_layout1">
-		   <?php if ($item->foto) : ?>
-		   <?php if ($this->params->get('display_home_links')) : ?>
-			<a href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente'.$this->layout_detail_link.'&view=einsatzbericht&id=' . (int)$item->id); ?>">
-           <?php endif;?>
-		   <img  class="img-rounded" style="width:<?php echo $this->params->get('display_home_image_width','120px');?>;" src="<?php echo JURI::Root();?><?php echo $item->foto;?>"/>
-		   <?php if ($this->params->get('display_home_links')) : ?>
-		   </a>
-           <?php endif;?>
-           <?php endif;?>
-		   <?php if (!$item->foto) : ?>
-           <?php if (!$this->params->get('display_home_image_nopic','0')) : ?>
-           <?php else:?>
-		   <?php if ($this->params->get('display_home_links_3','0')) : ?>
-		   <a href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente'.$this->layout_detail_link.'&view=einsatzbericht&id=' . (int)$item->id); ?>">
-           <?php endif;?>
-           <img  class="img-rounded" style="width:<?php echo $this->params->get('display_home_image_width','120px');?>;" src="<?php echo JURI::Root().'images/com_einsatzkomponente/einsatzbilder/nopic.png';?>"/>
-		   <?php if ($this->params->get('display_home_links_3','0')) : ?>
-           </a>
-           <?php endif;?>
-           <?php endif;?>
-           <?php endif;?>
-</div>
-           <?php endif;?>
-<p>
-<?php
-$string = $item->desc;
-//$rSummary = mb_strlen($rSummarylong) > '40' ? mb_strlen($rSummarylong, 0, '40').'...' : $rSummarylong;
-$string = preg_replace("/[^ ]*$/", '', substr($string, 0, 200));
-echo $string;
-?>
-    </p>
-    <?php if ($this->params->get('display_home_links')) : ?>
-    <a href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente'.$this->layout_detail_link.'&view=einsatzbericht&id=' . (int)$item->id); ?>">
-    [weiterlesen]
-    </a>
-    <?php endif;?>
-    <br /><br />
-           
-		   
-		   
-		   
-		   <?php endif;?><?php endif;?><!-- Filter Einsatzart-->
-           <?php endif;?><!-- Filter State-->
-		   <?php if($item->state == '2'): ?>
-           <?php $hide++;$i--;?>
-           <?php endif;?> 
-		  
-    <?php endforeach; ?>
-
-    <?php if ($this->params->get('display_home_map')) : ?> 
-    <h4>Einsatzgebiet</h4>
-			<?php if ($this->params->get('gmap_action','0') == '1') :?>
-  			<div id="map-canvas" style="width:100%; height:<?php echo $this->params->get('home_map_height','300px');?>;">
-    		<noscript>Dieser Teil der Seite erfordert die JavaScript Unterstützung Ihres Browsers!</noscript>
-			</div>
-            <?php endif;?>
-			<?php if ($this->params->get('gmap_action','0') == '2') :?> 
-				<body onLoad="drawmap();">
-				<!--<div id="descriptionToggle" onClick="toggleInfo()">Informationen zur Karte anzeigen</div>
-				<div id="description" class="">Einsatzkarte</div>-->
-   				<div id="map" style="width:100%; height:<?php echo $this->params->get('home_map_height','300px');?>;"></div> 
-    		<noscript>Dieser Teil der Seite erfordert die JavaScript Unterstützung Ihres Browsers!</noscript>
-            <?php endif;?>
-    <?php endif;?>
-    
- </tbody>   
-    
-    
-    <tfoot>
-    				<!--Prüfen, ob Pagination angezeigt wrden soll-->
-    				<?php if ($this->params->get('display_home_pagination')) : ?>
-    				<!--Prüfen, ob Einsatzart ausgwählt ist -->
-                    <?php if ($this->selectedEinsatzart == '' or $this->selectedEinsatzart == 'alle Einsatzarten') : ?>
-					<tr><td colspan="10">
-                    	<form action="#" method=post>
-						<?php echo $this->pagination->getListFooter(); ?><!--Pagination anzeigen-->
-						</form>
-					</td></tr>
-		   			<?php endif;?><!--Prüfen, ob Einsatzart ausgwählt ist ENDE-->
-		   			<?php endif;?><!--Prüfen, ob Pagination angezeigt wrden soll   ENDE -->
-   
-<?php if (!$this->params->get('eiko')) : ?>
-        <tr><!-- Bitte das Copyright nicht entfernen. Danke. -->
-            <th colspan="6"><span class="copyright">Einsatzkomponente V<?php echo $this->version; ?>  (C) 2017 by Ralf Meyer ( <a class="copyright_link" href="http://einsatzkomponente.de" target="_blank">www.einsatzkomponente.de</a> )</span></th>
-        </tr>
-<?php endif;?>
-
-    </tfoot>
-</table>
-	</form>
-<?php echo $this->modulepos_1;?>
-
-
-<?php if(JFactory::getUser()->authorise('core.create','com_einsatzkomponente.einsatzbericht'.$item->id)): ?><a href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzberichtform&layout=edit&id=0'); ?>">Einsatz eintragen</a>
-	<?php endif; ?>
diff --git a/site/views/einsatzberichte/tmpl/main_layout_3.php b/site/views/einsatzberichte/tmpl/main_layout_3.php
deleted file mode 100644
index 0c89cb9..0000000
--- a/site/views/einsatzberichte/tmpl/main_layout_3.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-/**
- * @version     3.15.0
- * @package     com_einsatzkomponente
- * @copyright   Copyright (C) 2017 by Ralf Meyer. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- * @author      Ralf Meyer <ralf.meyer@mail.de> - https://einsatzkomponente.de
- */
-// no direct access
-defined('_JEXEC') or die;
-
-
-//print_r ($this->organisationen);
-
-//echo $this->selectedYear;
-?>
-
-<div>
-
-
-<?php // Filter ------------------------------------------------------------------------------------
-	
-
-?>
-<form action="<?php echo JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzberichte&list=1'); ?>" method="post" name="adminForm" id="adminForm">
-
-
- 
-  
-
-<table width="100%" class="table table-striped table-bordered eiko_table_main_1" border="0" cellspacing="0" cellpadding="0">
-    <thead>
-        <tr>
-           <?php $col ='0';?>
-           <?php if ($this->params->get('display_home_number','1') or $this->params->get('display_home_alertimage_num','0')) : ?>
-		   <?php if ($this->params->get('display_home_number','1')):?>
-            <th class="eiko_th_einsatznummer_main_1" width="">Nr.</th>
-           <?php else:?>
-            <th class="eiko_th_einsatznummer_main_1" width=""></th>
-           <?php endif;?>
-           <?php $col =$col+1;?>
-           <?php endif;?>
-        </tr>
-        <!--<tr><th colspan="6"><hr /></th></tr>-->
-    </thead>
-    
- <tbody>
-
- <?php
- 		$query = 'SELECT COUNT(r.id) as total,r.id,r.image as foto,rd.marker,r.address,r.summary,r.date1,r.data1,r.counter,r.alerting,r.presse,r.gmap_report_latitude,r.gmap_report_longitude,re.image,re.title as alarmierungsart,rd.list_icon,rd.icon,r.desc,r.auswahl_orga,r.ausruestung,r.state,rd.title as einsatzart,r.tickerkat FROM #__eiko_einsatzberichte r JOIN #__eiko_einsatzarten rd ON r.data1 = rd.id LEFT JOIN #__eiko_alarmierungsarten re ON re.id = r.alerting WHERE (r.state = "1" OR r.state = "2") and rd.state = "1" and re.state ="1" GROUP BY r.id ORDER BY r.date1 DESC ' ;
-		$db	= JFactory::getDBO();
-		$db->setQuery( $query );
-		$result = $db->loadObjectList();
-?>
- 
-	 <?php 
-	 $show = false;	 
-     $i=count($result)+1;
-	 $hide=0;
-	 
-     foreach ($result as $item) :
-?>
-
-	 <tr>
-
-		  <?php if($item->state == '1'): ?>
-		  <?php $i--;?>
-          <?php echo '<td>ID.Nr. '.$item->id.'</td><td>'.$i.'</td><td></td>';$hide =0;?>
-          <?php endif;?> 
-		  
-		  
-		  <?php if($item->state == '2'): ?>
-          <?php $hide++;$i--;?>
-          <?php echo '<td>ID.Nr. '.$item->id.'</td><td></td><td>'.($i + $hide).'</td>';?>
-          <?php endif;?> 
-		  
-		  </tr>
-    <?php endforeach; ?>
-    
-
-    
- </tbody>   
-    
-    
-</table>
-	</form> 
-
-
diff --git a/site/views/einsatzberichte/tmpl/main_layout_4.php b/site/views/einsatzberichte/tmpl/main_layout_4.php
deleted file mode 100644
index c37ea26..0000000
--- a/site/views/einsatzberichte/tmpl/main_layout_4.php
+++ /dev/null
@@ -1,449 +0,0 @@
-<?php
-/**
- * @version     3.15.0
- * @package     com_einsatzkomponente
- * @copyright   Copyright (C) 2017 by Ralf Meyer. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- * @author      Ralf Meyer <ralf.meyer@mail.de> - https://einsatzkomponente.de
- */
-// no direct access
-defined('_JEXEC') or die;
-
-
-//print_r ($this->organisationen);
-
-//echo $this->selectedYear;
-?>
-
-<style type="text/css">
-	.hover {
-		a:hover {
-			color: black;
-			background-color: yellow;
-		}
-	}
-</style>
-
-<div>
-
-<!--RSS-Feed Imag-->
-<?php if ($this->params->get('display_home_rss','1')) : ?>
-<div style="float:right;" class="eiko_rss" ><a href="<?php JURI::base();?>index.php?option=com_einsatzkomponente&view=einsatzberichte&format=feed&type=rss"><span class="icon-feed" style="color:#cccccc;font-size:24px;"> </span> </a></div>
-<?php endif; ?>
-
-
-<!--Page Heading-->
-<?php if ($this->params->get('show_page_heading', 1)) : ?>
-<div class="page-header">
-<h1> <?php echo $this->escape($this->params->get('page_heading')); ?> </h1>
-</div>
-<?php endif;?>
-
-
-<?php // Filter ------------------------------------------------------------------------------------
-	if ($this->selectedYear == '9999') {
-		$year = 0;
-		$year_text = 'aller Jahre';
-	}
-	else {
-		$year = $this->selectedYear;
-		$year_text = $this->selectedYear;
-	}
-	
-	//echo '<div style="text-align:center;margin-bottom:20px;"><img src="'.JURI::Root().'images/com_einsatzkomponente/images/years/home'.$year.'.png" title="Eins&auml;tze '.$year_text.'" /></div>';
-
-?>
-<form action="<?php echo JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzberichte&list=1'); ?>" method="post" name="adminForm" id="adminForm">
-<?php
-	echo 'Jahr: ';
-
-if (!$this->params->get('anzeigejahr','0') and $this->params->get('display_filter_jahre','1')) : 
-	$years[] = JHTML::_('select.option', '', JTEXT::_('Bitte das Jahr auswählen')  , 'id', 'title');
-	$years[] = JHTML::_('select.option', '9999', JTEXT::_('Alle Einsätze anzeigen')  , 'id', 'title');
-	$years = array_merge($years, (array)$this->years);
-	 
-	echo JHTML::_('select.genericlist',  $years, 'year', ' onchange=submit(); ', 'id', 'title', $this->selectedYear);?>
-		
-    <?php
-endif;
-if ($this->params->get('display_filter_einsatzarten','1')) : 
-	$einsatzarten[] = JHTML::_('select.option', '', JTEXT::_('alle Einsatzarten')  , 'id', 'title');
-	$einsatzarten = array_merge($einsatzarten, (array)$this->einsatzarten);
-	?><?php 
-	echo JHTML::_('select.genericlist',  $einsatzarten, 'selectedEinsatzart', ' onchange=submit(); ', 'id', 'title', $this->selectedEinsatzart);?>
-    <?php
-	endif;
-	if (!$this->params->get('abfragewehr','0') and $this->params->get('display_filter_organisationen','1')) : 
-	$organisationen[] = JHTML::_('select.option', '', JTEXT::_('alle Organisationen')  , 'id', 'name');
-	$organisationen = array_merge($organisationen, (array)$this->organisationen);
-	?><?php 
-	echo JHTML::_('select.genericlist',  $organisationen, 'selectedOrga', ' class="eiko_select_organisation_main_1" onchange=submit(); ', 'id', 'name', $this->selectedOrga);
-	endif;?>
-</div>
-<?php // Filter ENDE   -------------------------------------------------------------------------------
-
-echo $this->modulepos_2;
-?>
-
-<table width="100%" class="table table-striped table-bordered eiko_detail_4_table" id="example" border="1" cellspacing="0" cellpadding="0" style="margin-top:20px;">
-    <thead>
-        <tr class="eiko_detail_4_tr">
-           <?php $col ='0';?>
-           <?php if ($this->params->get('display_home_number','1') or $this->params->get('display_home_alertimage_num','0')) : ?>
-		   <?php if ($this->params->get('display_home_number','1')):?>            
-           <?php else:?>            
-           <?php endif;?>
-           <?php $col =$col+1;?>
-           <?php endif;?>            
-           <?php $col =$col+1;?>            
-           <?php $col =$col+1;?>		               
-           <?php $col =$col+1;?>
-           <?php if ($this->params->get('display_home_orga','0')) : ?>            
-           <?php $col =$col+1;?>
-           <?php endif;?>
-           <?php if ($this->params->get('display_home_image')) : ?>            
-           <?php $col =$col+1;?>
-           <?php endif;?>
-        </tr>
-        <!--<tr><th colspan="6"><hr /></th></tr>-->
-    </thead>
-    
- <tbody>
-	 <?php 
-$show = false;	 
-if ($this->params->get('display_home_pagination')) :
-     $i=$this->pagination->total - $this->pagination->limitstart+1;
-	 else:
-     $i=count($this->reports)+1;
-	 endif;
-	 $m = '';
-	 $hide=0;
-	 $z = 0;
-     foreach ($this->reports as $item) :
-		$z += 1;
-?>
-          <!-- Filter State-->
-		  <?php if($item->state == '1'): ?>
-		  <?php
-		   $i--; //print_r ($item);
-		   $curTime = strtotime($item->date1); 
-		   ?>
-          <!-- Filter Einsatzart-->
-		  <?php if(preg_match('/\b'.$this->selectedOrga.'\b/',$item->auswahl_orga)==true or $this->selectedOrga == '0'): ?>
-		  <?php if ($this->selectedEinsatzart == $item->data1 or $this->selectedEinsatzart == '' ) : ?>
-          <?php $show = true;?>
-          
-           <!--Anzeige des Monatsnamen-->
-		   <?php if ($this->params->get('display_home_monat','1')) : ?>
-           <?php if (date('n', $curTime) != $m) : ?>
-		   <?php if ($z <> 1) { ?>
-			   <tr style="height:20px;">				
-			   </tr>	
-		   <?php } ?>
-		   <tr style="border-bottom:1px #666666  dotted;text-align:center;" class="eiko_detail_4_tr_1"><td colspan="<?php echo $col;?>">
-           <?php $m=date('n', $curTime);?>
-		   <?php echo '<h3 style="margin:10px;">';?>
-           <?php echo $this->monate[$m];?>
-		   <?php echo date('Y', $curTime);?>
-           <?php echo '</h3>';?>
-           </td></tr>
-			<tr class="eiko_detail_4_tr_2">
-			   <?php $col ='0';?>
-			   <?php if ($this->params->get('display_home_number','1') or $this->params->get('display_home_alertimage_num','0')) : ?>
-			   <?php if ($this->params->get('display_home_number','1')):?>
-				<th class="eiko_th_nr" width="">Nr.</th>
-			   <?php else:?>
-				<th class="eiko_th_nr" width=""></th>
-			   <?php endif;?>
-			   <?php $col =$col+1;?>
-			   <?php endif;?>
-				<th class="eiko_th_date" width="">Alarmierung</th>
-			   <?php $col =$col+1;?>
-				<th class="eiko_th_summary mobile_hide_summary" width="">Beschreibung</th>
-			   <?php $col =$col+1;?>		   
-				<th class="eiko_th_data" width="250px">Einsatzort</th>
-			   <?php $col =$col+1;?>
-			   <?php if ($this->params->get('display_home_orga','0')) : ?>
-				<th class="eiko_th_orga" width="">Organisationen</th>
-			   <?php $col =$col+1;?>
-			   <?php endif;?>
-			   <?php if ($this->params->get('display_home_image')) : ?>
-				<th class="eiko_th_image mobile_hide_image" width="">Bild</th>
-			   <?php $col =$col+1;?>
-			   <?php endif;?>
-			   <?php if ($this->params->get('display_home_counter','1')) : ?>
-				<th class="eiko_th_counter mobile_hide_counter" width="">Zugriffe</th>
-			   <?php $col =$col+1;?>
-			   <?php endif;?>
-			</tr>		   
-           <?php endif;?>
-           <?php endif;?>
-           <!--Anzeige des Monatsnamen ENDE-->
-           
-		   <tr class="eiko_detail_4_tr_3">
-           
-           <?php if ($this->params->get('display_home_number','1') or $this->params->get('display_home_alertimage_num','0')) : ?>
-           <?php if ($this->params->get('display_home_marker','1')) : ?>
-		   <td style="text-align:center;color:#000000;font-weight:bold;font-size:larger;background-color:<?php echo $item->marker;?>;" >
-           <?php else:?>
-		   <td style="text-align:center;color:#000000;font-weight:bold;font-size:larger;" >
-           <?php endif;?>
-		   
-           <?php if ($this->params->get('display_home_number','2') == '1') : ?>
-           <?php if ($hide) :?>
-           <?php echo $i.' - '.($i + $hide);$hide =0;?>
-           <?php else:?>
-           <?php echo $i;?>
-           <?php endif;?>
-           <?php endif;?>
-		   
-           <?php if ($this->params->get('display_home_number','2') == '2') : 
-				$item->date_11 		= strtotime($item->date1);
-				$item->date1_year 	= date('Y', $item->date_11);
-				echo '<span style="white-space: nowrap;" class="eiko_span_marker_main_1">Nr. '.EinsatzkomponenteHelper::ermittle_einsatz_nummer($item->date_11,$item->data1).' / '.$item->date1_year.'</span>';
-				endif;?>
-
-		<?php if ($this->params->get('display_home_alertimage_num','0')) : ?>
-           <br/><img class="img-rounded" style="width:30px; height:30px;" src="<?php echo JURI::Root();?><?php echo $item->image;?>" title="<?php echo $item->alarmierungsart;?>" />
-           <?php endif;?>
-            </td>
-           <?php endif;?>
-           
-
-          
-		   <td align="center"> 
-		   
-			<?php $wochentage = explode(',','So.,Mo.,Di.,Mi.,Do.,Fr.,Sa.');
-				$date2 = $wochentage[date('w', $curTime)];?>
-  
-			<?php if ($this->params->get('display_home_date_image','1')=='1') : ?>
-			<div class="home_cal_icon">
-			<div class="home_cal_monat"><?php echo date('M', $curTime);?></div>
-			<div class="home_cal_tag"><?php echo date('d', $curTime);?></div>
-			<div class="home_cal_jahr"><span style="font-size:10px;"><?php echo date('Y', $curTime);?></span></div>
-			</div>
-           <?php endif;?>
-           <?php if ($this->params->get('display_home_date_image','1')=='2') : ?>
-		   <?php echo $date2.', '.date('d.m.Y ', $curTime);?><br /><?php echo date('H:i ', $curTime).' Uhr'; ?>
-           <?php endif;?>
-           <?php if ($this->params->get('display_home_date_image','1')=='0') : ?>
-		   <?php echo $date2.', '.date('d.m.Y ', $curTime).'';?>
-           <?php endif;?>
-
-		   
-
-			   <?php if ($this->params->get('display_home_alertimage','0')) : ?>			   
-					<br /><img class="img-rounded" style="width:32px; height:32px;margin-right:2px;" src="<?php echo JURI::Root();?><?php echo $item->image;?>" title="<?php echo $item->alarmierungsart;?>" />			   
-			   <?php endif;?>			
-           </td>
-
-		   <td align="center">         		   
-				<?php if ($this->params->get('display_home_links')) : ?>
-			   <a class="hover" href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente'.$this->layout_detail_link.'&view=einsatzbericht&id=' . (int)$item->id); ?>" style="font-weight:bold;color:<?php echo $item->marker;?>;">
-			   <?php endif; ?>
-			   <?php echo ''.$item->einsatzart; ?>
-				<?php if ($this->params->get('display_home_links','1')) : ?>
-			   </a>
-			   <?php endif; ?>
-			   <br />		
-			   <?php echo $item->summary;?>		   
-
-				<?php if ($this->params->get('display_home_info','1')) : ?>
-				<!--<br /><button class="btn-home" onClick="jQuery.toggle<?php echo $item->id;?>(div<?php echo $item->id;?>)">Kurzinfo</button>-->
-				<br />
-			   <?php if ($this->params->get('display_home_links','1')) : ?>
-				<a class="btn-home" href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente'.$this->layout_detail_link.'&view=einsatzbericht&id=' . (int)$item->id); ?>">Details</a>
-			   <?php endif;?>
-
-				<script type="text/javascript">
-				jQuery.toggle<?php echo $item->id;?> = function(query)
-					{
-					jQuery(query).slideToggle("5000");
-					jQuery("#tr<?php echo $item->id;?>").fadeToggle("fast"); 
-					}   
-				</script>
-				<?php endif;?>            
-           </td>		   		   
-		   <td align="center"><?php echo '<i class="icon-location" ></i> '.$item->address;?></td>
-           
-           <?php if ($this->params->get('display_home_orga','0')) : ?>
-           <?php 					$data = array();
-					foreach(explode(',',$item->auswahl_orga) as $value):
-						$db = JFactory::getDbo();
-						$query	= $db->getQuery(true);
-						$query
-							->select('name')
-							->from('#__eiko_organisationen')
-							->where('id = "' .$value.'"');
-						$db->setQuery($query);
-						$results = $db->loadObjectList();
-						if(count($results)){
-							$data[] = '<!-- <span class="label label-info"> --!>'.$results[0]->name.'<!-- </span>--!>'; 
-						}
-					endforeach;
-					$auswahl_orga=  implode('</br>',$data); 
-?>
-		   <td nowrap> <?php echo $auswahl_orga;?></td>
-           <?php endif;?>
-
-           <?php if ($this->params->get('display_home_image')) : ?>
-		   <?php if ($item->foto) : ?>	
-		   <td class="mobile_image" style="text-align:center;vertical-align:center;padding-top:5px;">
-			<?php if ($this->params->get('display_home_links_3','0')) : ?>
-			<a href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzbericht&id='.(int) $item->id); ?>">
-			<?php endif; ?> 
-		   <img  class="img-rounded" style="width:<?php echo $this->params->get('display_home_image_width','80px');?>;" src="<?php echo JURI::Root();?><?php echo $item->foto;?>"/>
-			<?php if ($this->params->get('display_home_links_3','0')) : ?>
-			</a>
-			<?php endif;?>
-		   </td>
-		   
-           <?php endif;?>
-		   <?php if (!$item->foto) : ?>
-           <?php if ($this->params->get('display_home_image_nopic','0')) : ?>
-		   <td class="mobile_image"> <img  class="img-rounded" style="width:<?php echo $this->params->get('display_home_image_width','80px');?>;" src="<?php echo JURI::Root().'images/com_einsatzkomponente/einsatzbilder/nopic.png';?>"/></td>
-           <?php else:?>
-			<td class="mobile_image">&nbsp;</td>
-		   <?php endif;?>
-           <?php endif;?>
-           <?php endif;?>
-		   
-           <?php if ($this->params->get('display_home_counter','1')) : ?>
-		   <?php echo '<td class="mobile_hide_counter"">';?>
-		   <?php echo $item->counter;?>
-		   <?php echo '</td>';?>
-		   <?php endif;?>
-		   </tr>
-           
-           <!-- Zusatzinformation -->
-			<?php if ($this->params->get('display_home_info','1')) : ?>
-            <?php $auswahl_orga = str_replace(",", " +++ ", $item->auswahl_orga);?>
-            <tr id="tr<?php echo $item->id;?>" style=" display:none;" >
-            
-           <?php if ($this->params->get('display_home_marker','1')) : ?>
-           <?php $rgba = hex2rgba($item->marker,0.7);?>
-            <style>
-				.td<?php echo $item->id;?> {
-				background: -moz-linear-gradient(top,  <?php echo $rgba;?> 0%, rgba(125,185,232,0) 100%); /* FF3.6+ */
-				background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,<?php echo $rgba;?>), color-stop(100%,rgba(125,185,232,0))); /* Chrome,Safari4+ */
-				background: -webkit-linear-gradient(top,  <?php echo $rgba;?> 0%,rgba(125,185,232,0) 100%); /* Chrome10+,Safari5.1+ */
-				background: -o-linear-gradient(top,  <?php echo $rgba;?> 0%,rgba(125,185,232,0) 100%); /* Opera 11.10+ */
-				background: -ms-linear-gradient(top,  <?php echo $rgba;?> 0%,rgba(125,185,232,0) 100%); /* IE10+ */
-				background: linear-gradient(to bottom,  <?php echo $rgba;?> 0%,rgba(125,185,232,0) 100%); /* W3C */
-				filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='<?php echo $item->marker;?>', endColorstr='#007db9e8',GradientType=0 ); /* IE6-9 */
-				}
-			</style>
-		   <td class="td<?php echo $item->id;?>" >
-           <?php else:?>
-		   <td>
-           <?php endif;?>
-            </td>
-            <td colspan="<?php echo $col;?>">
-			<div id ="div<?php echo $item->id;?>" style="display:none;">
-            <h3>Alarmierungszeit :</h3><?php echo date('d.m.Y', $curTime);?> um <?php echo date('H:i', $curTime);?> Uhr
-            <h3>alarmierte Organisationen :</h3><?php echo $auswahl_orga;?><br/>
-		   <?php if ($item->desc) : ?>
-			<h3>Einsatzbericht :</h3><?php echo $item->desc;?>
-            <?php endif;?>
-            <br /><button class="btn-home" onClick="jQuery.toggle<?php echo $item->id;?>(div<?php echo $item->id;?>)">Info schliessen</button>
-           <?php if ($this->params->get('display_home_links','1')) : ?>
-            <a class="btn-home" href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente'.$this->layout_detail_link.'&view=einsatzbericht&id=' . (int)$item->id); ?>">zur Detailansicht</a>
-           <?php endif;?>
-           </div> 
-           </td>
-           </tr>
-           <?php endif;?>
-           <?php endif;?><?php endif;?><!-- Filter Einsatzart-->
-           <?php endif;?><!-- Filter State-->
-		  <?php if($item->state == '2'): ?>
-          <?php $hide++;$i--;?>
-          <?php endif;?> 
-		  
-    <?php endforeach; ?>
-    
-<?php if(!$this->reports or !$show): ?>
-<span class="label label-info"><b>Es können zu dieser Auswahl keine Daten in der Datenbank gefunden werden</b></span>
-<?php endif; ?>
-
-    
-    <?php if ($this->params->get('display_home_map')) : ?>
-    <tr class="eiko_detail_4_tr_4"><td colspan="<?php echo $col;?>">
-    <h4>Einsatzgebiet</h4>
-			<?php if ($this->params->get('gmap_action','0') == '1') :?>
-  			<div id="map-canvas" style="width:100%; height:<?php echo $this->params->get('home_map_height','300px');?>;">
-    		<noscript>Dieser Teil der Seite erfordert die JavaScript Unterstützung Ihres Browsers!</noscript>
-			</div>
-            <?php endif;?>
-			<?php if ($this->params->get('gmap_action','0') == '2') :?>
-<body onLoad="drawmap();">
-				<!--<div id="descriptionToggle" onClick="toggleInfo()">Informationen zur Karte anzeigen</div>
-				<div id="description" class="">Einsatzkarte</div>-->
-   				<div id="map" style="width:100%; height:<?php echo $this->params->get('home_map_height','300px');?>;"></div> 
-    		<noscript>Dieser Teil der Seite erfordert die JavaScript Unterstützung Ihres Browsers!</noscript>
-            <?php endif;?>
-            </td></tr>
-    <?php endif;?>
- </tbody>   
-    
-    
-    <tfoot>
-    				<!--Prüfen, ob Pagination angezeigt wrden soll-->
-    				<?php if ($this->params->get('display_home_pagination')) : ?>
-    				<!--Prüfen, ob Einsatzart ausgwählt ist -->
-                    <?php if ($this->selectedEinsatzart == '' or $this->selectedEinsatzart == 'alle Einsatzarten') : ?>
-					<tr><td colspan="<?php echo $col;?>">
-                    	<form action="#" method=post>
-						<?php echo $this->pagination->getListFooter(); ?><!--Pagination anzeigen-->
-						</form> 
-					</td></tr>
-		   			<?php endif;?><!--Prüfen, ob Einsatzart ausgwählt ist ENDE-->
-		   			<?php endif;?><!--Prüfen, ob Pagination angezeigt wrden soll   ENDE -->
-
-<?php if (!$this->params->get('eiko')) : ?>
-        <tr><!-- Bitte das Copyright nicht entfernen. Danke. -->
-            <th colspan="<?php echo $col;?>"><span class="copyright">Einsatzkomponente V<?php echo $this->version; ?>  (C) 2017 by Ralf Meyer (<a class="copyright_link" href="http://einsatzkomponente.de" target="_blank">www.einsatzkomponente.de</a>)</span></th>
-        </tr>
-	<?php endif; ?>
-    
-</tfoot>
-</table>
-	</form>
-<?php echo $this->modulepos_1;?>
-
-
-<?php if(JFactory::getUser()->authorise('core.create','com_einsatzkomponente.einsatzbericht'.$item->id)): ?><a href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzberichtform&layout=edit&id=0'); ?>">Einsatz eintragen</a>
-	<?php endif; ?>
-	
-    
-    <?php function hex2rgba($color, $opacity = false) {  // Farbe von HEX zu RGBA umwandeln 
-
-	$default = 'rgb(0,0,0)';
-	//Return default if no color provided
-	if(empty($color))
-          return $default; 
-	//Sanitize $color if "#" is provided 
-        if ($color[0] == '#' ) {
-        	$color = substr( $color, 1 );
-        }
-        //Check if color has 6 or 3 characters and get values
-        if (strlen($color) == 6) {
-                $hex = array( $color[0] . $color[1], $color[2] . $color[3], $color[4] . $color[5] );
-        } elseif ( strlen( $color ) == 3 ) {
-                $hex = array( $color[0] . $color[0], $color[1] . $color[1], $color[2] . $color[2] );
-        } else {
-                return $default;
-        }
-        //Convert hexadec to rgb
-        $rgb =  array_map('hexdec', $hex);
-        //Check if opacity is set(rgba or rgb)
-        if($opacity){
-        	if(abs($opacity) > 1)
-        		$opacity = 1.0;
-        	$output = 'rgba('.implode(",",$rgb).','.$opacity.')';
-        } else {
-        	$output = 'rgb('.implode(",",$rgb).')';
-        }
-        //Return rgb(a) color string
-        return $output;
-		
-}?> 
\ No newline at end of file
diff --git a/site/views/einsatzberichte/tmpl/main_layout_minimal.php b/site/views/einsatzberichte/tmpl/main_layout_minimal.php
deleted file mode 100644
index 89238e2..0000000
--- a/site/views/einsatzberichte/tmpl/main_layout_minimal.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-/**
- * @version     3.15.0
- * @package     com_einsatzkomponente
- * @copyright   Copyright (C) 2017 by Ralf Meyer. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- * @author      Ralf Meyer <ralf.meyer@mail.de> - https://einsatzkomponente.de
- */
-// no direct access
-defined('_JEXEC') or die;
-?>
-<div class="items">
-    <ul class="items_list">
-        <?php $show = false; ?>
-        <?php foreach ($this->items as $item) :?>
-                
-				<?php
-					if($item->state == 1 || ($item->state == 0 && JFactory::getUser()->authorise('core.edit.own',' com_einsatzkomponente.einsatzbericht.'.$item->id))):
-						$show = true;
-						?>
-							<li>
-								<a href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzbericht&id=' . (int)$item->id); ?>"><?php echo $item->einsatzart; ?></a>
-								<?php
-									if(JFactory::getUser()->authorise('core.edit.state','com_einsatzkomponente.einsatzbericht'.$item->id)):
-									?>
-										<a href="javascript:document.getElementById('form-einsatzbericht-state-<?php echo $item->id; ?>').submit()"><?php if($item->state == 1):?>Unpublish<?php else:?>Publish<?php endif; ?></a>
-										<form id="form-einsatzbericht-state-<?php echo $item->id ?>" style="display:inline" action="<?php echo JRoute::_('index.php?option=com_einsatzkomponente&task=einsatzbericht.save'); ?>" method="post" class="form-validate" enctype="multipart/form-data">
-											<input type="hidden" name="jform[id]" value="<?php echo $item->id; ?>" />
-											<input type="hidden" name="jform[ordering]" value="<?php echo $item->ordering; ?>" />
-											<input type="hidden" name="jform[data1]" value="<?php echo $item->data1; ?>" />
-											<input type="hidden" name="jform[image]" value="<?php echo $item->image; ?>" />
-											<input type="hidden" name="jform[address]" value="<?php echo $item->address; ?>" />
-											<input type="hidden" name="jform[date1]" value="<?php echo $item->date1; ?>" />
-											<input type="hidden" name="jform[date2]" value="<?php echo $item->date2; ?>" />
-											<input type="hidden" name="jform[date3]" value="<?php echo $item->date3; ?>" />
-											<input type="hidden" name="jform[summary]" value="<?php echo $item->summary; ?>" />
-											<input type="hidden" name="jform[boss]" value="<?php echo $item->boss; ?>" />
-											<input type="hidden" name="jform[boss2]" value="<?php echo $item->boss2; ?>" />
-											<input type="hidden" name="jform[people]" value="<?php echo $item->people; ?>" />
-											<input type="hidden" name="jform[department]" value="<?php echo $item->department; ?>" />
-											<input type="hidden" name="jform[desc]" value="<?php echo $item->desc; ?>" />
-											<input type="hidden" name="jform[alerting]" value="<?php echo $item->alerting; ?>" />
-											<input type="hidden" name="jform[gmap_report_latitude]" value="<?php echo $item->gmap_report_latitude; ?>" />
-											<input type="hidden" name="jform[gmap_report_longitude]" value="<?php echo $item->gmap_report_longitude; ?>" />
-											<input type="hidden" name="jform[counter]" value="<?php echo $item->counter; ?>" />
-											<input type="hidden" name="jform[gmap]" value="<?php echo $item->gmap; ?>" />
-											<input type="hidden" name="jform[presse]" value="<?php echo $item->presse; ?>" />
-											<input type="hidden" name="jform[presse2]" value="<?php echo $item->presse2; ?>" />
-											<input type="hidden" name="jform[presse3]" value="<?php echo $item->presse3; ?>" />
-											<input type="hidden" name="jform[updatedate]" value="<?php echo $item->updatedate; ?>" />
-											<input type="hidden" name="jform[einsatzticker]" value="<?php echo $item->einsatzticker; ?>" />
-											<input type="hidden" name="jform[notrufticker]" value="<?php echo $item->notrufticker; ?>" />
-											<input type="hidden" name="jform[tickerkat]" value="<?php echo $item->tickerkat; ?>" />
-											<input type="hidden" name="jform[auswahl_orga]" value="<?php echo $item->auswahl_orga; ?>" />
-											<input type="hidden" name="jform[vehicles]" value="<?php echo $item->vehicles; ?>" />
-											<input type="hidden" name="jform[status]" value="<?php echo $item->status; ?>" />
-											<input type="hidden" name="jform[state]" value="<?php echo (int)!((int)$item->state); ?>" />
-											<input type="hidden" name="option" value="com_einsatzkomponente" />
-											<input type="hidden" name="task" value="einsatzbericht.save" />
-											<?php echo JHtml::_('form.token'); ?>
-										</form>
-									<?php
-									endif;
-									if(JFactory::getUser()->authorise('core.delete','com_einsatzkomponente.einsatzbericht'.$item->id)):
-									?>
-										<a href="javascript:document.getElementById('form-einsatzbericht-delete-<?php echo $item->id; ?>').submit()">Delete</a>
-										<form id="form-einsatzbericht-delete-<?php echo $item->id; ?>" style="display:inline" action="<?php echo JRoute::_('index.php?option=com_einsatzkomponente&task=einsatzbericht.remove'); ?>" method="post" class="form-validate" enctype="multipart/form-data">
-											<input type="hidden" name="jform[id]" value="<?php echo $item->id; ?>" />
-											<input type="hidden" name="jform[ordering]" value="<?php echo $item->ordering; ?>" />
-											<input type="hidden" name="jform[data1]" value="<?php echo $item->data1; ?>" />
-											<input type="hidden" name="jform[image]" value="<?php echo $item->image; ?>" />
-											<input type="hidden" name="jform[address]" value="<?php echo $item->address; ?>" />
-											<input type="hidden" name="jform[date1]" value="<?php echo $item->date1; ?>" />
-											<input type="hidden" name="jform[date2]" value="<?php echo $item->date2; ?>" />
-											<input type="hidden" name="jform[date3]" value="<?php echo $item->date3; ?>" />
-											<input type="hidden" name="jform[summary]" value="<?php echo $item->summary; ?>" />
-											<input type="hidden" name="jform[boss]" value="<?php echo $item->boss; ?>" />
-											<input type="hidden" name="jform[boss2]" value="<?php echo $item->boss2; ?>" />
-											<input type="hidden" name="jform[people]" value="<?php echo $item->people; ?>" />
-											<input type="hidden" name="jform[department]" value="<?php echo $item->department; ?>" />
-											<input type="hidden" name="jform[desc]" value="<?php echo $item->desc; ?>" />
-											<input type="hidden" name="jform[alerting]" value="<?php echo $item->alerting; ?>" />
-											<input type="hidden" name="jform[gmap_report_latitude]" value="<?php echo $item->gmap_report_latitude; ?>" />
-											<input type="hidden" name="jform[gmap_report_longitude]" value="<?php echo $item->gmap_report_longitude; ?>" />
-											<input type="hidden" name="jform[counter]" value="<?php echo $item->counter; ?>" />
-											<input type="hidden" name="jform[gmap]" value="<?php echo $item->gmap; ?>" />
-											<input type="hidden" name="jform[presse]" value="<?php echo $item->presse; ?>" />
-											<input type="hidden" name="jform[presse2]" value="<?php echo $item->presse2; ?>" />
-											<input type="hidden" name="jform[presse3]" value="<?php echo $item->presse3; ?>" />
-											<input type="hidden" name="jform[updatedate]" value="<?php echo $item->updatedate; ?>" />
-											<input type="hidden" name="jform[einsatzticker]" value="<?php echo $item->einsatzticker; ?>" />
-											<input type="hidden" name="jform[notrufticker]" value="<?php echo $item->notrufticker; ?>" />
-											<input type="hidden" name="jform[tickerkat]" value="<?php echo $item->tickerkat; ?>" />
-											<input type="hidden" name="jform[auswahl_orga]" value="<?php echo $item->auswahl_orga; ?>" />
-											<input type="hidden" name="jform[vehicles]" value="<?php echo $item->vehicles; ?>" />
-											<input type="hidden" name="jform[status]" value="<?php echo $item->status; ?>" />
-											<input type="hidden" name="jform[state]" value="<?php echo $item->state; ?>" />
-											<input type="hidden" name="jform[created_by]" value="<?php echo $item->created_by; ?>" />
-											<input type="hidden" name="option" value="com_einsatzkomponente" />
-											<input type="hidden" name="task" value="einsatzbericht.remove" />
-											<?php echo JHtml::_('form.token'); ?>
-										</form>
-									<?php
-									endif;
-								?>
-							</li>
-						<?php endif; ?>
-        <?php endforeach; ?>
-        <?php if(!$show): ?>
-            There are no items in the list
-        <?php endif; ?>
-    </ul>
-</div>
-<?php if($show): ?>
-    <div class="pagination">
-        <p class="counter">
-            <?php echo $this->pagination->getPagesCounter(); ?>
-        </p>
-        <?php echo $this->pagination->getPagesLinks(); ?>
-    </div>
-<?php endif; ?>
-									<?php if(JFactory::getUser()->authorise('core.create','com_einsatzkomponente.einsatzbericht'.$item->id)): ?><a href="<?php echo JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzberichtform&layout=edit&id=0'); ?>">Add</a>
-	<?php endif; ?>
-    
-	<?php if (!$this->params->get('eiko')) : ?>
-        <!-- Bitte das Copyright nicht entfernen. Danke. -->
-            <span class="copyright">Einsatzkomponente V<?php echo $this->version; ?>  (C) 2017 by Ralf Meyer ( <a class="copyright_link" href="http://einsatzkomponente.de" target="_blank">www.einsatzkomponente.de</a> )</span>
-<?php endif;?>
diff --git a/site/views/einsatzberichte/view.feed.php b/site/views/einsatzberichte/view.feed.php
deleted file mode 100644
index 2ddba06..0000000
--- a/site/views/einsatzberichte/view.feed.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * @version     3.15.0
- * @package     com_einsatzkomponente
- * @copyright   Copyright (C) 2017 by Ralf Meyer. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- * @author      Ralf Meyer <ralf.meyer@mail.de> - https://einsatzkomponente.de
- */
-// No direct access
-defined('_JEXEC') or die;
-jimport('joomla.application.component.view');
-/**
- * View class for a list of Einsatzkomponente.
- */
- 
-class EinsatzkomponenteViewEinsatzberichte extends JViewLegacy
-{
-	
-	protected $pagination;
-
-	
-	
-	/**
-	 * Display the view
-	 */
-	public function display($tpl = null)
-	{
-		$app                = JFactory::getApplication();
-        $this->params       = $app->getParams('com_einsatzkomponente');
-        $this->pagination	= $this->get('Pagination');
-
-		
-		
-		require_once JPATH_SITE.'/administrator/components/com_einsatzkomponente/helpers/einsatzkomponente.php'; // Helper-class laden
-		
-
-		$layout_detail = $this->params->get('layout_detail',''); // Detailbericht Layout
-		$this->layout_detail_link = '';  
-		if ($layout_detail) : $this->layout_detail_link = '&layout='.$layout_detail;  endif; // Detailbericht Layout 'default' ?
-
-		
-		$rows 		= EinsatzkomponenteHelper::letze_x_einsatzdaten ($this->params->get('rss_items','10'));
-		$years = EinsatzkomponenteHelper::getYear();
-		foreach ($years as $year) {
-                        $yeararray[$year->id] = EinsatzkomponenteHelper::einsatz_daten_bestimmtes_jahr($year->id,9999,0);
-                        $eicount[$year->id] = count($yeararray[$year->id]);
-		}
-		$app	= JFactory::getApplication();
-		$menus	= $app->getMenu();
-		$title	= null;
-		// Because the application sets a default page title,
-		// we need to get it from the menu item itself
-		$menu = $menus->getActive();
-		$this->document->link = JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzberichte&Itemid='.$menu->id);;
-		foreach ( $rows as $row )
-		{
-					$data = array();
-					foreach(explode(',',$row->auswahl_orga) as $value):
-						$db = JFactory::getDbo();
-						$query	= $db->getQuery(true);
-						$query
-							->select('name')
-							->from('#__eiko_organisationen')
-							->where('id = "' .$value.'"');
-						$db->setQuery($query);
-						$results = $db->loadObjectList();
-						if(count($results)){
-							$data[] = ''.$results[0]->name.''; 
-						}
-					endforeach;
-					$auswahl_orga=  implode(',',$data); 
-					
-			$auswahl_orga = str_replace(",", " +++ ", $auswahl_orga);
-			$title = html_entity_decode( $title );
-			$summary = $this->escape( $row->summary );
-			$title = html_entity_decode( $summary );
-			$desc = strip_tags( $row->desc);
-			$desc = (strlen($desc) > $this->params->get('rss_chars','1000')) ? substr($desc,0,strrpos(substr($desc,0,$this->params->get('rss_chars','1000')+1),' ')).' ...' : $desc;
-
-			// url link to article
-			// & used instead of &amp; as this is converted by feed creator
-			$link = JRoute::_('index.php?option=com_einsatzkomponente&view=einsatzbericht'.$this->layout_detail_link.'&id='.$row->id);
-
-			// strip html from feed item description text
-			/*$description	= ($params->get('feed_summary', 0) ? $row->introtext.$row->fulltext : $row->introtext);
-			$author			= $row->created_by_alias ? $row->created_by_alias : $row->author;
-*/
-			// load individual item creator class
-			$item = new JFeedItem();
-			$itemyear = date("Y", strtotime($row->date1));
-			$rssnr = $eicount[$itemyear];
-			$item->title = "+++ Einsatz Nr: " . $rssnr . " - " . $title . " +++";
-			$item->link 		= $link;
-
-			$item->description 	.= '<table>';
-
-			if ($this->params->get('display_rss_image','1')) :
-			if ($row->foto) :
-			$item->description 	.= '<tr><td><img src="'.JURI::base().$row->foto.'" width="'.$this->params->get('rss_image_width','250px').'" height="'.$this->params->get('rss_image_height','').'" /></td></tr>';
-			endif;
-			endif;
-			if ($row->desc) :
-			$item->description 	.= '<tr><td>'.$desc.'</td></tr>';
-			endif;
-			if ($row->auswahl_orga) :
-			$item->description 	.= '<tr><td><b>Einsatzkräfte</b>: +++ '.$auswahl_orga.'</td></tr>';
-			endif;
-		    $item->date = date('r', strtotime($row->date1));
-			$item->description 	.= '</table>';
-			/*$item->category   	= $row->category;
-			$item->author		= $author;
-			if ($feedEmail == 'site') {
-				$item->authorEmail = $siteEmail;
-			}
-			else {
-				$item->authorEmail = $row->author_email;
-			}
-*/
-			// loads item info into rss array
-			$this->document->addItem( $item );
-			$eicount[$itemyear]--;
-		}
-		
-		
-		 // Check for errors.
-        if (count($errors = $this->get('Errors'))) {;
-            throw new Exception(implode("\n", $errors));
-        }
-        parent::display($tpl);
-	}
-	
-	}
-	
diff --git a/site/views/einsatzberichte/view.html.php b/site/views/einsatzberichte/view.html.php
deleted file mode 100644
index 23ab583..0000000
--- a/site/views/einsatzberichte/view.html.php
+++ /dev/null
@@ -1,378 +0,0 @@
-<?php
-/**
- * @version     3.15.0
- * @package     com_einsatzkomponente
- * @copyright   Copyright (C) 2017 by Ralf Meyer. All rights reserved.
- * @license     GNU General Public License version 2 or later; see LICENSE.txt
- * @author      Ralf Meyer <ralf.meyer@mail.de> - https://einsatzkomponente.de
- */
-// No direct access
-defined('_JEXEC') or die;
-jimport('joomla.application.component.view');
-/**
- * View class for a list of Einsatzkomponente.
- */
- 
-class EinsatzkomponenteViewEinsatzberichte extends JViewLegacy
-{
-	
-	
-	
-	protected $items;
-	protected $pagination;
-	protected $state;
-    protected $params;
-    protected $reports;
-    protected $years;
-    protected $selectedYear;
-    protected $version;
-    protected $einsatzarten;
-    protected $selectedEinsatzart;
-	protected $selectedOrga;
-    protected $layout_detail_link;
-    protected $gmap_config;
-    protected $monate;
-	protected $modulepos_1;
-	protected $modulepos_2;
-	/**
-	 * Display the view
-	 */
-	public function display($tpl = null)
-	{
-		require_once JPATH_SITE.'/administrator/components/com_einsatzkomponente/helpers/einsatzkomponente.php'; // Helper-class laden
-		$app                = JFactory::getApplication();
-        $this->state		= $this->get('State');
-        $this->items		= $this->get('Items');
-        $this->pagination	= $this->get('Pagination');
-        $this->params       = $app->getParams('com_einsatzkomponente');
-		$this->gmap_config = EinsatzkomponenteHelper::load_gmap_config(); // GMap-Config aus helper laden 
-		//print_r ($this->params);break;
-		
-		
-		require_once JPATH_SITE.'/administrator/components/com_einsatzkomponente/helpers/einsatzkomponente.php'; // Helper-class laden
-		
-		$aktuelles_Datum = getdate(); 
-		$selectedYear = '';
-		if (!$app->input->getInt('list', 0)) : // Prüfen ob zurück aus Detailansicht
-		$selectedYear = $aktuelles_Datum["year"];
-		endif;
-		
-		$selectedEinsatzart = '';
-		//if (!$app->input->get(year)) :
-		//if ($this->params->get('anzeigejahr')) : $selectedYear = $this->params->get('anzeigejahr'); endif;
-		//endif;
-		//if ($app->input->get(year)) : $selectedYear = $app->input->get(year); endif;
-		//if ($app->input->get(year)) :
-		
-		
-		  //----Modulposition laden ----
-		$this->modulepos_1 = '<div class="mod_eiko1">'.EinsatzkomponenteHelper::module ('eiko1').'</div>'; 
-		$this->modulepos_2 = '<div class="mod_eiko2">'.EinsatzkomponenteHelper::module ('eiko2').'</div>'; 
-		
-if ($app->input->getInt('list', 0)) : // Prüfen ob zurück aus Detailansicht
-		$selectedYear = $app->getUserStateFromRequest( "com_einsatzkomponente.selectedYear", 'year', $selectedYear );
-		$selectedEinsatzart = '';
-		$selectedEinsatzart = $app->getUserStateFromRequest( "com_einsatzkomponente.selectedEinsatzart", 'selectedEinsatzart', '' );
-		$selectedOrga = '';
-		$selectedOrga = $app->getUserStateFromRequest( "com_einsatzkomponente.selectedOrga", 'selectedOrga', '0' );
-endif;		
-		//print_r ($selectedEinsatzart);
-		//endif;
-		if ($this->params->get('anzeigejahr')) : $selectedYear = $this->params->get('anzeigejahr'); endif;
-		$this->selectedYear  = $selectedYear;	
-		$this->selectedEinsatzart  = $selectedEinsatzart;	
-		$app->setUserState( "com_einsatzkomponente.selectedYear", $selectedYear );
-		$app->setUserState( "com_einsatzkomponente.selectedEinsatzart", $selectedEinsatzart );
-		
-		if ($this->params->get('abfragewehr','1')) :
-		if ($this->params->get('anzeigewehr')) : $selectedOrga = $this->params->get('anzeigewehr'); endif;
-		$this->selectedOrga  = $selectedOrga;	
-		$this->selectedOrga  = $app->setUserState( "com_einsatzkomponente.selectedOrga", $selectedOrga );
-		else:
-		$selectedOrga = $app->getUserStateFromRequest( "com_einsatzkomponente.selectedOrga", 'selectedOrga', '0' );
-		$this->selectedOrga  = $selectedOrga;	
-		endif;
-		
-		//Komponentenversion aus Datenbank lesen
-		$this->version 		= EinsatzkomponenteHelper::getVersion (); 
-
-		//Limitstart und Limit für Pagination
-        if ($this->params->get('display_home_pagination')) :
-		$limitstart = $this->pagination->limitstart;
-		$limitstart = $app->getUserStateFromRequest( "com_einsatzkomponente.limitstart", 'limitstart', $limitstart );
-		$limit = $this->pagination->limit;
-		else:
-		$limitstart = '0';
-		$limit = '10000';
-		endif;
-		
-		//Einsatzdaten aus der Datenbank holen
-		$count = EinsatzkomponenteHelper::count_einsatz_daten_bestimmtes_jahr ($selectedYear); 
-		$this->pagination->total = count($count);
-		$this->pagination->pagesTotal = ceil(count($count)/$limit);
-		$this->pagination->pagesStop = ceil(count($count)/$limit);
-		$this->reports 		= EinsatzkomponenteHelper::einsatz_daten_bestimmtes_jahr ($selectedYear,$limit,$limitstart); 
-		if ($selectedYear == '9999' ) :
-		$count = EinsatzkomponenteHelper::count_einsatz_daten_bestimmtes_jahr (''); 
-		$this->pagination->total = count($count);
-		$this->pagination->pagesTotal = ceil(count($count)/$limit);
-		$this->pagination->pagesStop = ceil(count($count)/$limit);
-		$this->reports = EinsatzkomponenteHelper::einsatz_daten_bestimmtes_jahr ('',$limit,$limitstart); 
-		endif;
-		if (!$this->reports) : 
-		$count = EinsatzkomponenteHelper::count_einsatz_daten_bestimmtes_jahr ($aktuelles_Datum["year"]-1); 
-		$this->pagination->total = count($count);
-		$this->pagination->pagesTotal = ceil(count($count)/$limit);
-		$this->pagination->pagesStop = ceil(count($count)/$limit);
-		$this->reports = EinsatzkomponenteHelper::einsatz_daten_bestimmtes_jahr ($aktuelles_Datum["year"]-1,$limit,$limitstart); 
-				// Falls Jahr ohne Einsatz per Menülink aufgerufen wird, dann kein anderes Jahr anzeigen
-				if ($this->params->get('anzeigejahr') == $selectedYear) : 
-				$this->reports='';
-				endif;
-		endif;
-		
-		//print_r ($this->reports);break;
-		
-		
-
-		$this->years 				= EinsatzkomponenteHelper::getYear (); // Alle Jahre der Einsatzdaten ermitteln
-		$this->einsatzarten 		= EinsatzkomponenteHelper::getEinsatzarten (); // Alle Einsatzarten der Einsatzdaten ermitteln
-		$this->organisationen 		= EinsatzkomponenteHelper::getOrganisationen (); // Alle Einsatzarten der Einsatzdaten ermitteln
-		//print_r ($this->einsatzarten);
-		
-
-		$layout_detail = $this->params->get('layout_detail',''); // Detailbericht Layout
-		$this->layout_detail_link = ''; 
-		if ($layout_detail) : $this->layout_detail_link = '&layout='.$layout_detail;  endif; // Detailbericht Layout 'default' ?
-		
-
-		$document = JFactory::getDocument();
-        // Import CSS
-		$document->addStyleSheet('components/com_einsatzkomponente/assets/css/einsatzkomponente.css');
-		$document->addStyleSheet('components/com_einsatzkomponente/assets/css/responsive.css');
-		
-		
-		// Bootstrap laden
-		JHtml::_('behavior.framework', true);
-		
-		if ($this->params->get('display_home_bootstrap','0') == '1') :
-		JHtml::_('bootstrap.framework');
-		$document->addStyleSheet($this->baseurl . '/media/jui/css/bootstrap.min.css');
-		$document->addStyleSheet($this->baseurl.'/media/jui/css/icomoon.css');
-		endif;
-		if ($this->params->get('display_home_bootstrap','0') == '2') :
-		$document->addStyleSheet('components/com_einsatzkomponente/assets/css/bootstrap/bootstrap.min.css');
-		$document->addStyleSheet('components/com_einsatzkomponente/assets/css/bootstrap/bootstrap-responsive.min.css');
-		endif;
-		
-		
-		// Import CSS aus Optionen
-		$document->addStyleDeclaration($this->params->get('main_css',''));  
-
-		
-		if ($this->params->get('gmap_action','0') == '1') :
-			
-			$standort = new StdClass;
-			$standort->gmap_latitude = '0';
-			$standort->gmap_longitude= '0';
-			$orga = EinsatzkomponenteHelper::getOrganisationen(); 
-		if ($this->params->get('display_detail_organisationen','1')) :
-			$orga = EinsatzkomponenteHelper::getOrganisationen(); 
-	  		$organisationen='['; // Feuerwehr Details  ------>
-	  		$n=0;
-	  		for($i = 0; $i < count($orga); $i++) {
-			$orga_image 	= $orga[$i]->gmap_icon_orga;
-			if (!$orga_image) : $orga_image= 'images/com_einsatzkomponente/images/map/icons/'.$this->params->get('einsatzkarte_orga_image','haus_rot.png'); endif;
-		  	if($i==$n-1){
-			$organisationen=$organisationen.'["'.$orga[$i]->name.'",'.$orga[$i]->gmap_latitude.','.$orga[$i]->gmap_longitude.','.$i.',"'.$orga_image.'"]';
-		 	}else {
-			$organisationen=$organisationen.'["'.$orga[$i]->name.'",'.$orga[$i]->gmap_latitude.','.$orga[$i]->gmap_longitude.','.$i.',"'.$orga_image.'"';
-			$organisationen=$organisationen.'],';
-		    }
-	        }
-	  		$organisationen=substr($organisationen,0,strlen($organisationen)-1);
-	  		$organisationen=$organisationen.' ];';
-		else:
-			$organisationen	 = '[["",1,1,0,"images/com_einsatzkomponente/images/map/icons/'.$this->params->get('einsatzkarte_orga_image','haus_rot.png').'"],["",1,1,0,"images/com_einsatzkomponente/images/map/icons/'.$this->params->get('einsatzkarte_orga_image','haus_rot.png').'"] ]';	
-			endif;
-		 $display_map_route		= 'false';	
-
-	  	 $alarmareas1  = $this->gmap_config->gmap_alarmarea;  // Einsatzgebiet  ---->
-	 	 $alarmareas = explode('|', $alarmareas1);
-	     $einsatzgebiet='[ ';
-		  for($i = 0; $i < count($alarmareas)-1; $i++)
-		  {
-			  	  $areas = explode(',', $alarmareas[$i]);
-				  $einsatzgebiet=$einsatzgebiet.'new google.maps.LatLng('.$areas[0].','.$areas[1].'),';
-		  }
-		$areas = explode(',', $alarmareas[0]);
-		$einsatzgebiet=$einsatzgebiet.'new google.maps.LatLng('.$areas[0].','.$areas[1].'),';
-	    $einsatzgebiet=substr($einsatzgebiet,0,strlen($einsatzgebiet)-1);
-	    $einsatzgebiet=$einsatzgebiet.' ]';	
-		if (!$this->params->get('display_home_einsatzgebiet','1')) :
-		$einsatzgebiet='[[0,0]]';
-		endif;
-			
-        $display_detail_popup = 'false';
-		$marker1_title 		= ''; // leer
-		$marker1_lat  		= '1'; // leer
-		$marker1_lng 		= '1'; // leer
-		$marker1_image 		= '../../images/com_einsatzkomponente/images/map/icons/'.$this->params->get('detail_pointer1_image','circle.png');
-		$marker2_title 		= ''; // leer
-		$marker2_lat  		= ''; // leer
-		$marker2_lng 		= '';// leer
-		$marker2_image 		= ''; // leer
-		$marker2_lat  		= '';// leer
-		$marker2_lng 		= '';// leer
-		$center_lat  		= $this->gmap_config->start_lat; 
-		$center_lng 		= $this->gmap_config->start_lang;
-		$gmap_zoom_level 	= $this->gmap_config->gmap_zoom_level; 
-		$gmap_onload 		= $this->gmap_config->gmap_onload;
-		$zoom_control 		= 'true';
-		$document->addScript('//maps.googleapis.com/maps/api/js?key='.$this->params->get ("gmapkey","AIzaSyAuUYoAYc4DI2WBwSevXMGhIwF1ql6mV4E"));			
-		$document->addScriptDeclaration( EinsatzkomponenteHelper::getGmap($marker1_title,$marker1_lat,$marker1_lng,$marker1_image,$marker2_title,$marker2_lat,$marker2_lng,$marker2_image,$center_lat,$center_lng,$gmap_zoom_level,$gmap_onload,$zoom_control,$organisationen,$orga_image,$einsatzgebiet,$display_detail_popup,$standort,$display_map_route) );		
-		endif;
-
-		if ($this->params->get('gmap_action','0') == '2') :
-		
-			$standort = new StdClass;
-			$standort->gmap_latitude = '0';
-			$standort->gmap_longitude= '0';
-
-			$orga = EinsatzkomponenteHelper::getOrganisationen(); 
-		if ($this->params->get('display_detail_organisationen','1')) :
-			$orga = EinsatzkomponenteHelper::getOrganisationen(); 
-	  		$organisationen='['; // Feuerwehr Details  ------>
-	  		$n=0;
-	  		for($i = 0; $i < count($orga); $i++) {
-			$orga_image 	= $orga[$i]->gmap_icon_orga;
-			if (!$orga_image) : $orga_image= 'images/com_einsatzkomponente/images/map/icons/'.$this->params->get('einsatzkarte_orga_image','haus_rot.png'); endif;
-		  	if($i==$n-1){
-			$organisationen=$organisationen.'["'.$orga[$i]->name.'",'.$orga[$i]->gmap_latitude.','.$orga[$i]->gmap_longitude.','.$i.',"'.$orga_image.'"]';
-		 	}else {
-			$organisationen=$organisationen.'["'.$orga[$i]->name.'",'.$orga[$i]->gmap_latitude.','.$orga[$i]->gmap_longitude.','.$i.',"'.$orga_image.'"';
-			$organisationen=$organisationen.'],';
-		    }
-	        }
-	  		$organisationen=substr($organisationen,0,strlen($organisationen)-1);
-	  		$organisationen=$organisationen.' ];';
-		else:
-			$organisationen	 = '[["",1,1,0,"images/com_einsatzkomponente/images/map/icons/'.$this->params->get('einsatzkarte_orga_image','haus_rot.png').'"],["",1,1,0,"images/com_einsatzkomponente/images/map/icons/'.$this->params->get('einsatzkarte_orga_image','haus_rot.png').'"] ]';	
-			endif;
-			
-	  	 $alarmareas1  = $this->gmap_config->gmap_alarmarea;  // Einsatzgebiet  ---->
-	 	 $alarmareas = explode('|', $alarmareas1);
-	     $einsatzgebiet='[ ';
-		  for($i = 0; $i < count($alarmareas)-1; $i++)
-		  {
-			  	  $areas = explode(',', $alarmareas[$i]);
-				  $einsatzgebiet=$einsatzgebiet.'['.$areas[1].','.$areas[0].'],';
-		  }
-		$areas = explode(',', $alarmareas[0]);
-		$einsatzgebiet=$einsatzgebiet.'['.$areas[1].','.$areas[0].'],';
-	    $einsatzgebiet=substr($einsatzgebiet,0,strlen($einsatzgebiet)-1);
-	    $einsatzgebiet=$einsatzgebiet.' ]';	
-		if (!$this->params->get('display_home_einsatzgebiet','1')) :
-		$einsatzgebiet='[[0,0]]';
-		endif;
-		
-		$display_map_route		= 'false';	
-		
-        $display_detail_popup = 'false';
-		$marker1_title 		= '1'; // leer
-		$marker1_lat  		= '1'; // leer
-		$marker1_lng 		= '1'; // leer
-		$marker1_image 		= '../../images/com_einsatzkomponente/images/map/icons/'.$this->params->get('detail_pointer1_image','circle.png');
-		$marker2_title 		= ''; // leer
-		$marker2_lat  		= ''; // leer
-		$marker2_lng 		= '';// leer
-		$marker2_image 		= ''; // leer
-		$marker2_lat  		= '';// leer
-		$marker2_lng 		= '';// leer
-		$center_lat  		= $this->gmap_config->start_lat;
-		$center_lng 		= $this->gmap_config->start_lang;
-		$gmap_zoom_level 	= $this->gmap_config->gmap_zoom_level; 
-		$gmap_onload 		= $this->gmap_config->gmap_onload;
-		$zoom_control 		= 'true';
- 		$document->addScript('components/com_einsatzkomponente/assets/osm/util.js');
-   		$document->addScript('https://openlayers.org/api/OpenLayers.js');				
-   		$document->addScript('https://openstreetmap.org/openlayers/OpenStreetMap.js');	
- 		$document->addStyleSheet('components/com_einsatzkomponente/assets/osm/map.css');		
- 		$document->addStyleSheet('components/com_einsatzkomponente/assets/osm/ie_map.css');	
- 		$document->addScript('components/com_einsatzkomponente/assets/osm/OpenLayers_Map_minZoom_maxZoom_Patch.js');
-		$document->addScriptDeclaration( EinsatzkomponenteHelper::getOsm($marker1_title,$marker1_lat,$marker1_lng,$marker1_image,$marker2_title,$marker2_lat,$marker2_lng,$marker2_image,$center_lat,$center_lng,$gmap_zoom_level,$gmap_onload,$zoom_control,$organisationen,$orga_image,$einsatzgebiet,$display_detail_popup,$standort,$display_map_route) );											
- 		endif;
-		
-        if ($this->params->get('display_home_rss','1')) : 
-		// RSS-Feed in den Dokumenten-Header einfügen
-		$href = 'index.php?option=com_einsatzkomponente&view=einsatzberichte&format=feed&type=rss'; 
-		$attribs = array('type' => 'application/rss+xml', 'title' => 'RSS 2.0'); 
-		$document->addHeadLink( $href, 'alternate', 'rel', $attribs );
-		endif;
-
-
-$this->monate = array(1=>"Januar",
-                2=>"Februar",
-                3=>"M&auml;rz",
-                4=>"April",
-                5=>"Mai",
-                6=>"Juni",
-                7=>"Juli",
-                8=>"August",
-                9=>"September",
-                10=>"Oktober",
-                11=>"November",
-                12=>"Dezember");
-				
-		
-		 // Check for errors.
-        if (count($errors = $this->get('Errors'))) {;
-            throw new Exception(implode("\n", $errors));
-        }
-        
-        $this->_prepareDocument();
-        parent::display($tpl);
-	}
-	/**
-	 * Prepares the document
-	 */
-	protected function _prepareDocument()
-	{
-		$app	= JFactory::getApplication();
-		$menus	= $app->getMenu();
-		$title	= null;
-		// Because the application sets a default page title,
-		// we need to get it from the menu item itself
-		$menu = $menus->getActive();
-		if($menu)
-		{
-			$this->params->def('page_heading', $this->params->get('page_title', $menu->title));
-		} else {
-			$this->params->def('page_heading', JText::_('com_einsatzkomponente_DEFAULT_PAGE_TITLE'));
-		}
-		$title = $this->params->get('page_title', '');
-		if (empty($title)) {
-			$title = $app->getCfg('sitename');
-		}
-		elseif ($app->getCfg('sitename_pagetitles', 0) == 1) {
-			$title = JText::sprintf('JPAGETITLE', $app->getCfg('sitename'), $title);
-		}
-		elseif ($app->getCfg('sitename_pagetitles', 0) == 2) {
-			$title = JText::sprintf('JPAGETITLE', $title, $app->getCfg('sitename'));
-		}
-		$this->document->setTitle($title);
-		if ($this->params->get('menu-meta_description'))
-		{
-			$this->document->setDescription($this->params->get('menu-meta_description'));
-		}
-		if ($this->params->get('menu-meta_keywords'))
-		{
-			$this->document->setMetadata('keywords', $this->params->get('menu-meta_keywords'));
-		}
-		if ($this->params->get('robots'))
-		{
-			$this->document->setMetadata('robots', $this->params->get('robots'));
-		}
-	}    
-    	
-}