[Aplaws-commit] r2394 - in trunk/ccm-cms: src/com/arsdigita/cms/ui web/assets/xinha/plugins web/assets/xinha/plugins/OpenCCM/images

[<pb...@fe...>]

Author: pboy
Date: 2012-12-17 07:52:47 +0000 (Mon, 17 Dec 2012)
New Revision: 2394

Removed:
   trunk/ccm-cms/web/assets/xinha/plugins/CCMInsertImage/
   trunk/ccm-cms/web/assets/xinha/plugins/CCMInsertLink/
Modified:
   trunk/ccm-cms/src/com/arsdigita/cms/ui/ImageSelectResultComponent.java
   trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.html
   trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.js
Log:
Fixed path entry, OpenCCM Plugin, preview works, unused directores removed. (on behalf of quasimodo)

Modified: trunk/ccm-cms/src/com/arsdigita/cms/ui/ImageSelectResultComponent.java
===================================================================
--- trunk/ccm-cms/src/com/arsdigita/cms/ui/ImageSelectResultComponent.java	2012-12-17 07:47:37 UTC (rev 2393)
+++ trunk/ccm-cms/src/com/arsdigita/cms/ui/ImageSelectResultComponent.java	2012-12-17 07:52:47 UTC (rev 2394)
@@ -9,12 +9,13 @@
 import com.arsdigita.bebop.SimpleContainer;
 import com.arsdigita.cms.ImageAsset;
 import com.arsdigita.cms.Service;
+import com.arsdigita.web.URL;
 import com.arsdigita.xml.Element;
 
 /**
- * A component which will insert a javascript to the xml output with the 
+ * A component which will insert a javascript to the xml output with the
  * image information for the OpenCCM plugin for Xinha editor.
- * 
+ *
  * @author Sören Bernstein (quasimodo) <sbe...@ze...>
  */
 public class ImageSelectResultComponent extends SimpleContainer implements Resettable {
@@ -28,7 +29,7 @@
 
     /**
      * Save image imformation
-     * 
+     *
      * @param iamge an {@link ImageAsset}
      */
     public void setResult(final ImageAsset image/*, final String name, final BigDecimal id, final BigDecimal width, final BigDecimal height*/) {
@@ -48,9 +49,10 @@
         if (m_valid) {
 
             script.append("if(button.id == \"save\" ) {");
-            
+
             script.append("window.opener.openCCM.imageSet({");
             script.append("      src    : \"");
+            script.append(URL.getDispatcherPath());
             script.append(Service.getImageURL(m_image));
             script.append("\", ");
             script.append("      name   : \"");
@@ -75,7 +77,7 @@
 
     /**
      * Reset this component.
-     * 
+     *
      * @param state Page state
      */
     public void reset(PageState state) {

Modified: trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.html
===================================================================
--- trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.html	2012-12-17 07:47:37 UTC (rev 2393)
+++ trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.html	2012-12-17 07:52:47 UTC (rev 2394)
@@ -111,7 +111,7 @@
 -->
     <input type="hidden" name="[src]" id="[src]"/>
 
-    <fieldset>
+    <fieldset id="[layout]">
       <legend>
         <l10n>Layout</l10n>
       </legend>
@@ -146,7 +146,7 @@
       </div>
     </fieldset>
 
-    <fieldset>
+    <fieldset id="[dimensions]">
       <legend>
         <l10n>Dimension</l10n>
       </legend>

Modified: trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.js
===================================================================
--- trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.js	2012-12-17 07:47:37 UTC (rev 2393)
+++ trunk/ccm-cms/web/assets/xinha/plugins/OpenCCM/images/images.js	2012-12-17 07:52:47 UTC (rev 2394)
@@ -87,14 +87,7 @@
   // OnResize 
   this.dialogs["images"].onresize = function ()
   {
-    var newHeightForPreview = 
-    parseInt(this.height, 10) 
-//    - this.getElementById("h1").offsetHeight 
-//    - this.getElementById("buttons").offsetHeight
-//    - this.getElementById("inputs").offsetHeight 
-    - parseInt(this.rootElem.style.paddingBottom, 10);
-    this.getElementById("preview").style.height = ((newHeightForPreview > 0) ? newHeightForPreview : 0) + "px";
-    this.getElementById("preview").style.width = "98%";
+    self.resizePreview(this);
   };
 
   this.imageDialogReady = true;
@@ -299,19 +292,32 @@
 
 OpenCCM.prototype.imageSet = function(imageData)
 {
-  var dialog = this.dialogs["images"];
+  var dialog = this.dialogs["images"]
   dialog.getElementById(dialog.id["src"]).value = imageData.src;
   dialog.getElementById(dialog.id["ipreview"]).src = imageData.src;
   dialog.getElementById(dialog.id["width"]).value = imageData.width;
   dialog.getElementById(dialog.id["height"]).value = imageData.height;
   dialog.getElementById(dialog.id["name"]).value = imageData.name;
   dialog.getElementById(dialog.id["aspect"]).value = dialog.getElementById(dialog.id["width"]).value / dialog.getElementById(dialog.id["height"]).value;
+
+  this.resizePreview(dialog);
+
   if(imageData.src != "")
   {
     dialog.getElementById(dialog.id["preview"]).style.display = "block";
+  } else {
+    dialog.getElementById(dialog.id["preview"]).style.display = "none";
   }
 };
 
+OpenCCM.prototype.resizePreview = function(dialog) {
+  var aspect = dialog.getElementById(dialog.id["aspect"]).value;
+  var previewWidth = dialog.width - 22;
+
+  dialog.getElementById(dialog.id["ipreview"]).style.height = Math.round(previewWidth / aspect) + "px";
+  dialog.getElementById(dialog.id["ipreview"]).style.width = previewWidth + "px";
+};
+
 OpenCCM.prototype.calcWidth = function()
 {
     var dialog = this.dialogs["images"];