diff --git a/website/agenda/planung/js/edit_image.js b/website/agenda/planung/js/edit_image.js
index f23ea97..525487c 100644
--- a/website/agenda/planung/js/edit_image.js
+++ b/website/agenda/planung/js/edit_image.js
@@ -1,45 +1,36 @@
-/*
-function hideImageDetails(id,filename){
-	try{$('#img_editor').dialog('close');}catch(e){}
-
-	$("#"+id).load('image.cgi?show='+filename+'&template=image_single.html');
-	return false;
+function updateCheckBox(selector, value){
+    $(selector).attr('value', value)
+    if (value==1){
+        $(selector).prop( "checked", true );
+    } else {
+        $(selector).prop( "checked", false );
+    }
 }
 
-function saveImage(id, filename) {
-	var url='image.cgi?save_image='+filename;
-	if (url!='') $.post(
-		url, 
-		$("#save_img_"+id).serialize(), 
-		function(data){
-			hideImageDetails('img_'+id, filename);
-			
-		} 
-	);
-	return false;
+function updatePublicCheckbox(elem){
+    console.log(elem.prop('checked'))
+    if (elem.prop('checked')){
+        console.log( 'set public' );
+        updateCheckBox(elem, 1);
+    }else{
+        console.log( 'unset public' );
+        updateCheckBox(elem, 0);
+    }
 }
 
-function deleteImage(id, filename) {
-	$("#"+id).load('image.cgi?delete_image='+filename);
-	hideImageDetails('img_'+id, filename);
-	$("#"+id).hide('drop');
-	return false;
-}
 
-function showImageUrl(id){
-	var el=document.getElementById(id);
-	var input_id=id+'_input';
-	var text='<input id="'+input_id+'" value="{{thumbs/'+id+'|title}}" title="3fach-Klick zum Markieren!">';
-	if (el.innerHTML==text){
-		el.innerHTML='';
-	}else{
-		el.innerHTML=text;
-		var input=document.getElementById(input_id);
-		input.focus();
-		input.select();
-		input.createTextRange().execCommand("Copy");
-	}
-	return false;
-}
+$(document).ready(
+    function(){
+        var publicCheckbox=$("#img_editor input[name='public']");
+
+        updatePublicCheckbox( publicCheckbox );
+        publicCheckbox.change(
+            function(){
+                updatePublicCheckbox($(this));
+            }
+        )        
+        console.log("image handler initialized");
+        pageLeaveHandler();
+    }
+);
 
-*/
diff --git a/website/agenda/planung/js/image.js b/website/agenda/planung/js/image.js
index 7502b3e..d99d191 100644
--- a/website/agenda/planung/js/image.js
+++ b/website/agenda/planung/js/image.js
@@ -22,7 +22,7 @@ function setActiveImage(elem){
 // open dialog to show or edit image properties
 function updateImageEditor(elem, filename, target, project_id, studio_id, series_id, event_id, pid){
 	var url='image.cgi?show='+filename;
-    url += '&template=image_edit.html';
+    url += '&template=edit_image.html';
     url += '&target=' + target;
     url += '&project_id='+project_id;
     url += '&studio_id='+studio_id;
diff --git a/website/agenda/planung/templates/imageUpload.html b/website/agenda/planung/templates/imageUpload.html
index 5e7af07..79d6c9b 100644
--- a/website/agenda/planung/templates/imageUpload.html
+++ b/website/agenda/planung/templates/imageUpload.html
@@ -1,4 +1,6 @@
-    <div>
+<script src="js/edit_image.js" type="text/javascript"></script>
+
+    <div class="editor">
         <TMPL_IF action>
             <TMPL_IF error>
 	            <div class="error">failed</div>
diff --git a/website/agenda/planung/templates/image_edit.html b/website/agenda/planung/templates/image_edit.html
deleted file mode 100644
index 7f7de82..0000000
--- a/website/agenda/planung/templates/image_edit.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<!--
-    <link type="text/css" href="css/admin.css" rel="stylesheet"/>
-    <link type="text/css" href="css/image_manager.css" rel="stylesheet"/>
--->
-
-<script>
-function updateCheckBox(selector, value){
-    $(selector).attr('value', value)
-    if (value==1){
-        $(selector).prop( "checked", true );
-    } else {
-        $(selector).prop( "checked", false );
-    }
-}
-
-function updatePublicCheckbox(elem){
-    console.log(elem.prop('checked'))
-    if (elem.prop('checked')){
-        console.log( 'set public' );
-        updateCheckBox(elem, 1);
-    }else{
-        console.log( 'unset public' );
-        updateCheckBox(elem, 0);
-    }
-}
-
-
-$(document).ready(
-    function(){
-        var publicCheckbox=$("#img_editor input[name='public']");
-
-        updatePublicCheckbox( publicCheckbox );
-        publicCheckbox.change(
-            function(){
-                updatePublicCheckbox($(this));
-            }
-        )        
-        console.log("image handler initialized");
-    }
-);
-
-</script>
-
-<TMPL_IF no_results>
-found no image
-</TMPL_IF>
-
-<TMPL_LOOP images>
-<TMPL_IF filename>
-<div id="imageEditor">
-    <button onclick="assignImage('<TMPL_VAR filename escape=0>', '<TMPL_VAR .target>', '<TMPL_VAR .project_id>', '<TMPL_VAR .studio_id>', '<TMPL_VAR .series_id>', '<TMPL_VAR .event_id>', '<TMPL_VAR .pid>'); return false"><TMPL_VAR .loc.select_image></button/>
-
-    <div class="panel-body">
-
-    <form id="save_img_<TMPL_VAR id>"
-	    method="post" 
-	    action="image.cgi" 
-	    onsubmit="saveImage('<TMPL_VAR id>','<TMPL_VAR filename>');return false;"
-    >   
-
-        <input type="hidden" name="project_id" value="<TMPL_VAR .project_id>">
-        <input type="hidden" name="studio_id" value="<TMPL_VAR .studio_id>">
-
-        <label><TMPL_VAR .loc.label_name></label><br>
-        <input value="<TMPL_VAR name escape=0>" name="update_name" class="field" placeholder="<TMPL_VAR .loc.label_name>"><br>
-
-        <label><TMPL_VAR .loc.label_description></label><br>
-        <textarea class="field" name="update_description" cols="50" rows=5 placeholder="<TMPL_VAR .loc.label_description>"><TMPL_VAR description escape=0></textarea><br>
-
-        <label><TMPL_VAR .loc.label_author>/<TMPL_VAR .loc.label_licence></label><br>
-        <input name="licence" value="<TMPL_VAR licence>" class="field<TMPL_IF missing_licence> error</TMPL_IF>" placeholder="<TMPL_VAR .loc.label_licence_missing>"/><br>
-
-        <label><TMPL_VAR .loc.label_public></label>
-        <input type="checkbox" name="public" <TMPL_IF public>checked="checked" value="1"<TMPL_ELSE>value="0"</TMPL_IF> /><br>
-
-        <TMPL_IF name="update_image">
-            <input type="hidden" name="save_image" value="<TMPL_VAR filename escape=0>" />
-            <button onclick="this.submit"><TMPL_VAR .loc.button_save></button/>
-        </TMPL_IF>
-
-        <TMPL_IF name="delete_image">
-            <button onclick="askDeleteImage('img_<TMPL_VAR id escape=0>','<TMPL_VAR filename escape=0>');return false;"><TMPL_VAR .loc.button_delete></button>
-        </TMPL_IF>
-
-        <div id="status" ></div>
-        <TMPL_VAR .loc.label_created_at> <TMPL_VAR created_at> <TMPL_VAR .loc.label_created_by> <TMPL_VAR created_by><br>
-        <TMPL_VAR .loc.label_modified_at> <TMPL_VAR modified_at> <TMPL_VAR .loc.label_modified_by> <TMPL_VAR modified_by><br>
-        <TMPL_VAR .loc.label_link>: {{<TMPL_VAR filename escape=0>|<TMPL_VAR name>}}<br>
-
-    </form>
-
-    </div>
-</div>
-</TMPL_IF>
-</TMPL_LOOP>
-
-</main>	    
-</body>
-</html>
-