Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -N -r1.148.2.24 -r1.148.2.25
--- openacs-4/packages/xowiki/xowiki.info	9 Feb 2015 09:17:12 -0000	1.148.2.24
+++ openacs-4/packages/xowiki/xowiki.info	11 Feb 2015 12:31:40 -0000	1.148.2.25
@@ -10,10 +10,10 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.158" url="http://openacs.org/repository/download/apm/xowiki-0.158.apm">
+    <version name="0.159" url="http://openacs.org/repository/download/apm/xowiki-0.159.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
-        <release-date>2015-02-09</release-date>
+        <release-date>2015-02-11</release-date>
         <vendor url="http://wu.ac.at">WU Vienna</vendor>
         <description format="text/html">&lt;pre&gt;
 XoWiki is a Wiki implementation for OpenACS in XOTcl. Instead of
@@ -55,14 +55,14 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="0.158"/>
+        <provides url="xowiki" version="0.159"/>
         <requires url="acs-datetime" version="5.8.1"/>
         <requires url="acs-kernel" version="5.8.1"/>
         <requires url="acs-subsite" version="5.8.1"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="5.8.1"/>
         <requires url="general-comments" version="5.8.1"/>
-        <requires url="xotcl-core" version="0.132"/>
+        <requires url="xotcl-core" version="0.135"/>
 
         <callbacks>
             <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
Index: openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml,v
diff -u -N -r1.64.2.3 -r1.64.2.4
--- openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	1 Feb 2015 16:47:23 -0000	1.64.2.3
+++ openacs-4/packages/xowiki/catalog/xowiki.en_US.ISO-8859-1.xml	11 Feb 2015 12:31:40 -0000	1.64.2.4
@@ -223,4 +223,12 @@
   <msg key="year">year</msg>
   <msg key="years">years</msg>
   <msg key="your_tags_label">Your Tags</msg>
+  <msg key="attached_images">Attached images</msg>
+  <msg key="attached_media">Attached media</msg>
+  <msg key="choose_file">Choose file</msg>
+  <msg key="upload_file">Upload file</msg>
+  <msg key="width">Width</msg>
+  <msg key="height">Height</msg>
+  <msg key="image_width_hint">The width and height are calculated in pixels (proportions might get lost).</msg>
+  <msg key="insert_image">Insert image</msg>
 </message_catalog>
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -N -r1.239.2.28 -r1.239.2.29
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	9 Feb 2015 09:38:09 -0000	1.239.2.28
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	11 Feb 2015 12:31:40 -0000	1.239.2.29
@@ -1799,19 +1799,21 @@
   Class create richtext::ckeditor4 -superclass richtext -parameter {
     {editor ckeditor4}
     {mode wysiwyg}
-    {skin moono}
+    {skin bootstrapck}
     {toolbar Full}
     {CSSclass xowiki-ckeditor}
     {uiColor ""}
     {CSSclass xowiki-ckeditor}
     {customConfig "config.js"}
     {callback "/* callback code */"}
     {destroy_callback "/* callback code */"}
-    {extraPlugins ""}
+    {submit_callback ""}
+    {extraPlugins "xowikiimage"}
     {templatesFiles ""}
     {templates ""}
     {contentsCss /resources/xowiki/ck_contents.css}
     {imageSelectorDialog /xowiki/ckeditor-images/}
+    {additionalConfigOptions ""}
   }
   richtext::ckeditor4 set editor_mixin 1
   richtext::ckeditor4 instproc initialize {} {
@@ -1856,12 +1858,13 @@
       }
       
       function calc_image_tags_to_wiki_image_links_inline (e) {
-        var data = $('<div>'+e.editor.getData()+'</div>');
+        var data = $('<div>'+CKEDITOR.instances[e].getData()+'</div>');
         data.find('img[type="wikilink"]').each( function() {
           var wiki_link = $(this).attr('alt');
           $(this).replaceWith('[['+wiki_link+']]');
         });
-        document.getElementById(e.editor.config.textarea_id).innerHTML=data.html();
+        CKEDITOR.instances[e].setData(data.html());
+        CKEDITOR.instances[e].updateElement();
       }
       
       function calc_wiki_image_links_to_image_tags (data) {
@@ -1904,26 +1907,26 @@
       ::xo::Page requireJS "/resources/xowiki/jquery/jquery.min.js"
       ::xo::Page requireJS "/resources/xowiki/ckeditor4/ckeditor.js"
       ::xo::Page requireJS "/resources/xowiki/ckeditor4/adapters/jquery.js"
-      ::xo::Page requireJS "/resources/xowiki/jquery-ui-1.8.17.custom.min.js"
-      ::xo::Page requireCSS "/resources/xowiki/jquery-ui-1.8.17.custom.css"
-      
+      #::xo::Page requireJS "/resources/xowiki/jquery-ui-1.8.17.custom.min.js"
+      #::xo::Page requireCSS "/resources/xowiki/jquery-ui-1.8.17.custom.css"
+
       # In contrary to the doc, ckeditor4 names instances after the id,
       # not the name. 
       set id [my id]
       set name [my name] 
       set package_id [[my object] package_id]
-      #my extraPlugins {xowikiimage tlflrn}
-      #my extraPlugins {}
       if {[my set displayMode] eq "inline"} {my lappend extraPlugins sourcedialog}
+      
       if {"xowikiimage" in [my extraPlugins]} {
         my js_image_helper
         set ready_callback {xowiki_image_callback(e.editor);}
       } else {
         set ready_callback "/*none*/;"
-        set blur_callback "/*none*/;"
+        set submit_callback "/*none*/;"
       }
       
       set options [subst {
+        [my set additionalConfigOptions]
         toolbar : '[my toolbar]',
         uiColor: '[my uiColor]',
         language: '[lang::conn::language]',
@@ -1975,40 +1978,40 @@
       } elseif {[my set displayMode] eq "inline"} {
         if {!$is_repeat_template} {
           if {"xowikiimage" in [my extraPlugins]} {
-            set ready_callback "xowiki_image_callback(CKEDITOR.instances\['ckinline_$id'\]);"
-            set blur_callback "calc_image_tags_to_wiki_image_links_inline(e);"
+            set ready_callback "xowiki_image_callback(CKEDITOR.instances\['$id'\]);"
+            set submit_callback "calc_image_tags_to_wiki_image_links_inline('$id');"
           }
-          
-          ::xo::Page requireJS [subst -nocommands {
-            function load_ckinline_$id () {
-              CKEDITOR.inline('ckinline_$id', {
+
+          set submit_callback "$submit_callback [my submit_callback]"
+          ::xo::Page requireJS [subst {
+            function load_$id () {
+              CKEDITOR.inline('$id', {
                 on: {
-                  blur: function(e) {
-                    $blur_callback
+                  instanceReady: function(e) {
+                    \$(e.editor.element.\$).attr('title', '[my set label]');
+                    \$(e.editor.element.\$.form).submit(function(e) {
+                      $submit_callback
+                    });
                   }
                 },
                 $options
               });
             }
             \$(document).ready(function() {
-              load_ckinline_$id ();
+              load_$id ();
               $ready_callback
-            });            
+            });
           }]
         }
-        my set style "display:none;"
         next
-        ::html::div "id ckinline_[my set id] name [my set name] class xowiki-ckeditor contenteditable true" {
-          ::html::t -disableOutputEscaping [my value]
-        }
       } else {
         if {!$is_repeat_template} {
           set callback [my callback]
           ::xo::Page requireJS [subst -nocommands {
             function load_$id () {
               \$( '#$id' ).ckeditor(function() { $callback }, {
                 $options
-              });        
+              });
             }
             \$(document).ready(function() {
               load_$id ();
@@ -2019,7 +2022,7 @@
         next
       }
     }
-  }  
+  }
   
   ###########################################################
   #
Index: openacs-4/packages/xowiki/www/ckeditor-images/image.png
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/ckeditor-images/image.png,v
diff -u -N -r1.1 -r1.1.2.1
Binary files differ
Index: openacs-4/packages/xowiki/www/ckeditor-images/index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/ckeditor-images/index.adp,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/xowiki/www/ckeditor-images/index.adp	13 Sep 2012 16:05:34 -0000	1.3
+++ openacs-4/packages/xowiki/www/ckeditor-images/index.adp	11 Feb 2015 12:31:41 -0000	1.3.2.1
@@ -1,111 +1,144 @@
 <html>
 <head>
-
+<script type="text/javascript" src="/resources/xowiki/jquery/jquery.min.js"></script>
 <script type="text/javascript">
-//var selector_window;
-function Init() {
-    window.outerWidth = '720px';
-    window.outerHeight = '850px';
-    window.resizeTo(720,850);
-    if (window.scrollbars) {
-	window.scrollbars.visible = true;
+
+    $(document).ready(function() {
+        hideImageHolder();
+    });
+
+    function loadImage(url) {
+        $('#imageHolder').attr('src',url);
+        showImageHolder();
     }
 
-    var param = window.dialogArguments;
-    if (param) {
-	document.getElementById("f_url").value = param["f_url"];
-	document.getElementById("f_alt").value = param["f_alt"];
-	window.preview.location.replace(param.f_url);
+    function hideImageHolder() {
+        $("#imageHolder").hide();
     }
-    document.getElementById("f_url").focus();
-};
 
-function setLink () {
-    var f_url = document.getElementById("f_url");
-    var url = f_url.value
-    window.opener.CKEDITOR.tools.callFunction("@CKEditorFuncNum;noquote@", url);
-    window.close();
-}
+    function showImageHolder() {
+        $("#imageHolder").show()
+    }
+
+    //var selector_window;
+    function Init() {
+        window.outerWidth = '720px';
+        window.outerHeight = '850px';
+        window.resizeTo(720,850);
+        if (window.scrollbars) {
+            window.scrollbars.visible = true;
+        }
+
+        var param = window.dialogArguments;
+        if (param) {
+            document.getElementById("f_url").value = param["f_url"];
+            document.getElementById("f_alt").value = param["f_alt"];
+            document.getElementById("f_mime").value = param["f_mime"];
+            window.preview.location.replace(param.f_url);
+        }
+        document.getElementById("f_url").focus();
+    };
+
+    function setLink () {
+        var f_url = document.getElementById("f_url");
+        var url = f_url.value
+        window.opener.CKEDITOR.tools.callFunction("@CKEditorFuncNum;noquote@", url);
+        window.close();
+    }
 </script>
 
 <style type="text/css">
-.xowiki_image_body {
-    background: ButtonFace;
-    color: ButtonText;
-    font: 11px Tahoma,Verdana,sans-serif;
-    margin: 0px;
-    padding: 5px;
-}
+    .xowiki_image_body {
+        background: ButtonFace;
+        color: ButtonText;
+        font: 11px Tahoma,Verdana,sans-serif;
+        margin: 0px;
+        padding: 5px;
+    }
 
-table {
-    font: 11px Tahoma,Verdana,sans-serif;
-}
+    table {
+        font: 11px Tahoma,Verdana,sans-serif;
+    }
 
-form p {
-    margin-top: 5px;
-    margin-bottom: 5px;
-}
+    form p {
+        margin-top: 5px;
+        margin-bottom: 5px;
+    }
 
-.fl { width: 9em; float: left; padding: 2px 5px; text-align: right; }
-.fr { width: 6em; float: left; padding: 2px 5px; text-align: right; }
-fieldset { padding: 0px 10px 5px 5px; }
-select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
-.space { padding: 2px; }
-	
-.title { 
-    background: #ddf; color: #000; font-weight: bold; font-size: 120%; padding: 3px 10px; margin-bottom: 10px;
-    border-bottom: 1px solid black; letter-spacing: 2px;
-}
-form { padding: 0px; margin: 0px; }
+    .fl { width: 9em; float: left; padding: 2px 5px; text-align: right; }
+    .fr { width: 6em; float: left; padding: 2px 5px; text-align: right; }
+    fieldset { padding: 0px 10px 5px 5px; }
+    select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
+    .space { padding: 2px; }
+
+    .title {
+        background: #ddf; color: #000; font-weight: bold; font-size: 120%; padding: 3px 10px; margin-bottom: 10px;
+        border-bottom: 1px solid black; letter-spacing: 2px;
+    }
+    form { padding: 0px; margin: 0px; }
 </style>
 </head>
-<body onload="Init();" style="background-color: #e2e2e2;overflow: scroll;" class="xowiki_image_body">
 
+<!-- BODY -->
+<body onload="Init();" style="background-color: white; overflow: hidden;" class="xowiki_image_body">
 
-<b>#xowiki.attached_images#:</b>
+<b>#xowiki.attached_media#:</b>
+
+<!-- UPLOAD ELEMENT -->
+<iframe name="upload" src="@image_browser_url@/upload_image?parent_id=@parent_id@" frameborder=0 width="680px" height="110px"></iframe>
+
 <center>
 <table><tr><td>
 <div style="border: none;"><fieldset style="border: none; padding: 4px;">
 <div style="float:left; border: none;">
-<iframe name="thumbs" src ="@image_browser_url@/thumb-view?parent_id=@item_id@" frameborder=1 width="150px" height="400px"  scrolling="auto">
+
+<!-- THUMBNAILS ELEMENT -->
+<iframe name="thumbs" src="@image_browser_url@/thumb-view?parent_id=@item_id@" frameborder=0 width="180px" height="400px"  scrolling="auto">
 </iframe>
 </div>
 </fieldset>
-</td><td><fieldset style="border: none; padding: 4px;">
-<iframe name="preview" id="preview" src="@image_browser_url@/resources/blank.gif" frameborder=1 width="500px" height="400px"  ></iframe>
+</td><td><fieldset style="border: none; padding: 4px;width:500px;height:400px;">
+
+<!-- PREVIEW ELEMENT -->
+<div name="preview" id="preview">
+    <!-- IMAGE PLACEHOLDER -->
+    <img id="imageHolder" height="250" src="" type="image" />
+</div>
+
 </fieldset>
 </div>
 </td></tr></table>
 </center>
 
-
-<iframe name="upload" src="@image_browser_url@/upload_image?parent_id=@parent_id@" frameborder=0 width="680px" height="110px"  ></iframe>
-
-<hr>
 <div style="clear:both;">
 <form action="" method="get" name="form" id="insert_form">
 <table width="100%">
+<tr><td>
+</tr></td>
 <tr style="display:none">
- 	<td width="100px" style="text-align: right" nowrap>URL: </td>
-	<td >
-		<input type="text" value="@bild_url@" onChange="ChangeImageSrc();" name="url" id="f_url" style="width:75%" title="#acs-templating.HTMLArea_ImageURLToolTip#" />
-	    	
-		<input type="hidden" id="f_id" value=""/>
-	    	
-	</td>
+    <td width="100px" style="text-align: right" nowrap>URL: </td>
+    <td >
+        <input type="text" value="@bild_url@" onChange="ChangeImageSrc();" name="url" id="f_url" style="width:75%" title="#acs-templating.HTMLArea_ImageURLToolTip#" />
+        <input type="text" value="" onChange="ChangeImageSrc();" name="mimetype" id="f_mime" style="width:75%" title="#acs-templating.HTMLArea_ImageURLToolTip#" />
+        <input type="text" value="100%" onChange="ChangeImageSrc();" name="f_width" id="f_width" style="width:75%" title="#xowiki.width#" />
+        <input type="text" value="100%" onChange="ChangeImageSrc();" name="f_height" id="f_height" style="width:75%" title="#xowiki.height#" />
+        <input type="hidden" id="f_id" value=""/>
+    </td>
 <tr style="display:none">
 <td align="right">Alternativtext:</td>
-	<td>
-	<input type="text"" name="alt" id="f_alt" style="width:300px" title="#acs-templating.HTMLArea_ImageURLToolTip#" />
-	</td>
-	<td></td>
+    <td>
+    <input type="text" name="alt" id="f_alt" style="width:300px" title="#acs-templating.HTMLArea_ImageURLToolTip#" />
+    </td>
+    <td></td>
 </tr>
 <tr>
+<!--
 <td><input type="submit" name="ok" value="#xowiki.insert_image#"/></td>
-<td><button type="button" name="cancel" onclick="xowiki_image_dialog.dialog('close');" >#xowiki.cancel#</button></td>
+<td><button type="button" name="cancel" onclick="xowiki_image_dialog.dialog('close');" >#acs-kernel.common_cancel#</button></td>
+-->
 </form>
 </table>
 </div>
 
 </body>
-</html>
\ No newline at end of file
+</html>
Index: openacs-4/packages/xowiki/www/ckeditor-images/index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/ckeditor-images/index.tcl,v
diff -u -N -r1.4.2.1 -r1.4.2.2
--- openacs-4/packages/xowiki/www/ckeditor-images/index.tcl	5 Aug 2014 13:10:50 -0000	1.4.2.1
+++ openacs-4/packages/xowiki/www/ckeditor-images/index.tcl	11 Feb 2015 12:31:41 -0000	1.4.2.2
@@ -3,7 +3,7 @@
 } {
   parent_id:notnull,naturalnum
   {bild_url ""}
-} 
+}
 set package_url [ad_conn package_url]
 set image_browser_url $package_url/ckeditor-images
 set fs_package_id $parent_id
Index: openacs-4/packages/xowiki/www/ckeditor-images/thumb-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/ckeditor-images/thumb-view.adp,v
diff -u -N -r1.4 -r1.4.2.1
--- openacs-4/packages/xowiki/www/ckeditor-images/thumb-view.adp	13 Sep 2012 16:05:34 -0000	1.4
+++ openacs-4/packages/xowiki/www/ckeditor-images/thumb-view.adp	11 Feb 2015 12:31:41 -0000	1.4.2.1
@@ -1,25 +1,41 @@
 <html>
 <head>
-<script src='/resources/xowiki/jquery/jquery.js' type='text/javascript'></script>
+<script type="text/javascript" src="/resources/xowiki/jquery/jquery.min.js"></script>
 <script type="text/javascript">
-function changePreview(url,name) {
-  $("#preview", top.document).attr('src',url);
-  parent.document.getElementById('f_url').value = name ;
+
+function changePreview(url,name,mime) {
+  $("#preview", parent.document).append(function() {
+        switch(mime) {
+            case 'image/png':
+                window.parent.loadImage(url);
+                break;
+            case 'image/jpeg':
+                window.parent.loadImage(url);
+                break;
+            case 'image/gif':
+                window.parent.loadImage(url);
+                break;
+        }
+  });
+  parent.document.getElementById('f_url').value = name;
+  parent.document.getElementById('f_mime').value = mime ;
 }
 </script>
 </head>
 <body>
 <multiple name="sub_files">
 <div style="border: 1px solid black;background-color: #cfcfcf;padding-top: 5px;">
-	<center>
-	<!-- <a href="preview?revision=@sub_files.revision_id@" target="preview"> -->
-
-	<img src="@sub_files.url@?m=download" height="60" width="100" onClick="changePreview('@sub_files.url@?m=download','@sub_files.name@')"></a>
-	
-<small><br>@sub_files.date@ </small><a href="@sub_files.url@?m=delete&return_url=@return_url;noquote@"><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0" alt="Löschen" title="Löschen" ></a> 
+    <center>
+    <!-- <a href="preview?revision=@sub_files.revision_id@" target="preview"> -->
+    @sub_files.title@
+    @sub_files.mime_type@
+    <if @sub_files.mime_type@ in "image/jpeg" "image/png" "image/gif">
+        <img src="@sub_files.url@?m=download" height="60" width="100" onClick="changePreview('@sub_files.url@?m=download','@sub_files.name@', '@sub_files.mime_type@')"></a>
+    </if>
+<small><br>@sub_files.date@ </small><a href="@sub_files.url@?m=delete&return_url=@return_url;noquote@"><img src="/resources/acs-subsite/Delete16.gif" width="16" height="16" border="0" alt="Löschen" title="Löschen" ></a>
 </center>
 </div>
 <br/>
 </multiple>
 </body>
-</html>
\ No newline at end of file
+</html>
Index: openacs-4/packages/xowiki/www/ckeditor-images/thumb-view.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/ckeditor-images/thumb-view.tcl,v
diff -u -N -r1.4.2.2 -r1.4.2.3
--- openacs-4/packages/xowiki/www/ckeditor-images/thumb-view.tcl	5 Aug 2014 13:10:50 -0000	1.4.2.2
+++ openacs-4/packages/xowiki/www/ckeditor-images/thumb-view.tcl	11 Feb 2015 12:31:41 -0000	1.4.2.3
@@ -1,27 +1,27 @@
 ad_page_contract {
 	
 } {
-  {parent_id:naturalnum ""}
+    {parent_id:naturalnum ""}
 } -validate {
-  parent_id_exists -requires {parent_id} {
-    if {[xo::dc 0or1row object_exists "select item_id from cr_items where item_id =:parent_id"] == 0} {
-      #ad_complain "Das angegebene Objekt existiert nicht."
+    parent_id_exists -requires {parent_id} {
+	if {[xo::dc 0or1row object_exists "select item_id from cr_items where item_id = :parent_id"] == 0} {
+	    ad_complain "Specified item does not exist"
+	}
     }
-  }	 
 }
 
 set output ""
 set return_url [ns_urlencode "[ad_conn url]?parent_id=$parent_id"]
 db_multirow -extend url sub_files get_children "
-select package_id,name,cr.item_id ,revision_id,mime_type, to_char(publish_date, 'yyyy-mm-dd, HH:MM') as date 
+select package_id,name,cr.title,cr.item_id,revision_id,mime_type, to_char(publish_date, 'yyyy-mm-dd, HH:MM') as date 
 from cr_items ci inner join cr_revisions cr on (ci.item_id = cr.item_id)
 join acs_objects o on o.object_id=cr.item_id
 	where parent_id = :parent_id and revision_id = ci.live_revision 
-	AND cr.mime_type LIKE 'image/%'
+        AND cr.mime_type LIKE 'image/%'
 	ORDER BY publish_date DESC" {
-		::xowiki::Package initialize -package_id $package_id
-		set item [::xowiki::File get_instance_from_db -item_id $item_id]
-		set url "[$item pretty_link]"
+          ::xowiki::Package initialize -package_id $package_id
+          set item [::xowiki::File get_instance_from_db -item_id $item_id]
+	  set url [$item pretty_link]
 	}
 
 set server_url ""
Index: openacs-4/packages/xowiki/www/ckeditor-images/upload_image.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/ckeditor-images/upload_image.adp,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/xowiki/www/ckeditor-images/upload_image.adp	13 Sep 2012 16:05:34 -0000	1.3
+++ openacs-4/packages/xowiki/www/ckeditor-images/upload_image.adp	11 Feb 2015 12:31:41 -0000	1.3.2.1
@@ -19,7 +19,7 @@
 	fieldset { padding: 0px 10px 5px 5px; }
 	select, input, button { font: 11px Tahoma,Verdana,sans-serif; }
 	.space { padding: 2px; }
-	
+
 	.title { background: #ddf; color: #000; font-weight: bold; font-size: 120%; padding: 3px 10px; margin-bottom: 10px;
 	border-bottom: 1px solid black; letter-spacing: 2px;
 	}
@@ -36,15 +36,15 @@
 <table>
 <tr>
 <td colspan=3>
-#xowiki.choose_image#: <formwidget id="upload_file" onchange="document.getElementById('subm_upld').removeAttribute('disabled')">
+#xowiki.choose_file#: <formwidget id="upload_file" onchange="document.getElementById('subm_upld').removeAttribute('disabled')">
 </td>
 </tr>
 <tr>
-<td>#xowiki.width#: <formwidget id="width"></td><td>#xowiki.height#: <formwidget id="height"></td><td><input id='subm_upld' disabled='disabled' type='submit' name='save' value='#xowiki.upload_file#' /></td>
+<td><input id='subm_upld' disabled='disabled' type='submit' name='save' value="#xowiki.upload_file#" /></td>
 </tr>
 <tr>
 <td colspan=3>
-#xowiki.image_width_hint#
+<!-- #xowiki.image_width_hint# -->
 </td>
 </tr>
 </table>
@@ -55,4 +55,4 @@
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
Index: openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl,v
diff -u -N -r1.7.2.3 -r1.7.2.4
--- openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl	5 Aug 2014 13:10:50 -0000	1.7.2.3
+++ openacs-4/packages/xowiki/www/ckeditor-images/upload_image.tcl	11 Feb 2015 12:31:41 -0000	1.7.2.4
@@ -10,9 +10,9 @@
     -html { enctype multipart/form-data } \
     -mode edit \
     -form {
-      {upload_file:file(file),optional {label "Bild zum Hochladen auswählen"}}
-      {width:text(text),optional {label "Breite in Pixel"}}
-      {height:text(text),optional {label "Höhe in Pixel"}}
+      {upload_file:file(file),optional {label #xowiki.choose_file#}}
+      {width:text(text),optional {label #xowiki.width_in_pixel}}
+      {height:text(text),optional {label #xowiki.height_in_pixel}}
     } -on_submit {
       set width [template::element::get_values upload_form width]
       set height [template::element::get_values upload_form height]
@@ -22,36 +22,33 @@
 
       set file_name [template::util::file::get_property filename $upload_file]
       set upload_tmpfile [template::util::file::get_property tmp_filename $upload_file]
-      set mime_type [template::util::file::get_property mime_type $upload_file]
-      #ds_comment $upload_tmpfile
+      set mime_type [::xowiki::guesstype $file_name]
+      set tmp_size [file size $upload_tmpfile]
+
       if {$size ne ""} {exec convert -resize $size $upload_tmpfile $upload_tmpfile}
+      if {![regexp (image/*|audio/mpeg|application/x-shockwave-flash|video/mp4) $mime_type]} {
+        #template::form::set_error "upload_image" "upload_file" "[_ tlf-resource-integrator.HTMLArea_SelectImageUploadNoImage]"
+        break
+      }    
 
-      if {![string match "image/*" $mime_type]} {
-	# File is no image
-	template::form::set_error "upload_image" "upload_file" "[_ acs-templating.HTMLArea_SelectImageUploadNoImage]"
-	break
-      }
-
-      #set parent_id  [xo::dc get_value _ "select parent_id from cr_items where item_id=:fs_package_id"]
       set title $file_name
-      
       set existing_filenames [xo::dc list _ "select name from cr_items  where parent_id = :parent_id" ]
-      ns_log notice "util_text_to_url  -text ${title} -existing_urls \"$existing_filenames\" -replacement \"_\""	
-      set filename [util_text_to_url  -text "${title}" -existing_urls "$existing_filenames" -replacement "_"]
+      set filename [util_text_to_url  -text $title -existing_urls $existing_filenames -replacement "_"]
       set package_id [xo::dc get_value _ "select package_id from acs_objects where object_id=:parent_id"]
+
       ::xowiki::Package initialize -package_id $package_id
       set file_object [::xowiki::File new -destroy_on_cleanup \
                            -title $title \
                            -name file:$filename \
                            -parent_id $parent_id \
                            -package_id $package_id \
-                           -mime_type [::xowiki::guesstype $title] \
+                           -mime_type $mime_type \
                            -creation_user [ad_conn user_id]]
       $file_object set import_file $upload_tmpfile
       $file_object save_new
       set revision_id [$file_object set revision_id]
 
       set bild_url "[$file_object pretty_link]?m=download"
       set image_browser_url [ad_conn package_url]/ckeditor-images
-      set js_update "parent.frames\['thumbs'\].location='$image_browser_url/thumb-view?parent_id=${parent_id}';"
+      set js_update "parent.frames\['thumbs'\].location='$image_browser_url/thumb-view?parent_id=$parent_id';"
     }