From 65e0686fa0746fac672e8ba623d934ec399dc1c9 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Sat, 15 Sep 2007 01:09:25 +0000 Subject: [PATCH] mujma: (merged from branches/gsoc) git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41874 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/ImageEditor.php | 4 ++-- javascript/ImageEditor/ImageTransformation.js | 8 ++++---- templates/ImageEditor.ss | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/ImageEditor.php b/code/ImageEditor.php index 359acc7f..aea963eb 100644 --- a/code/ImageEditor.php +++ b/code/ImageEditor.php @@ -53,7 +53,7 @@ } $rand = md5(rand(1,100000)); $gd->writeTo('../assets/tmp/' . $rand . '.jpg'); - $this->returnImage($gd,'/assets/tmp/' . $rand . '.jpg'); + $this->returnImage($gd,'assets/tmp/' . $rand . '.jpg'); } public function save() { @@ -77,7 +77,7 @@ private function returnImage(GD $gd,$strFile) { - list($width, $height) = getimagesize('..' . $strFile); + list($width, $height) = getimagesize('../' . $strFile); echo json_encode(array( 'fileName' => $strFile, 'width' => $width, diff --git a/javascript/ImageEditor/ImageTransformation.js b/javascript/ImageEditor/ImageTransformation.js index b84fdecb..96e3ae24 100644 --- a/javascript/ImageEditor/ImageTransformation.js +++ b/javascript/ImageEditor/ImageTransformation.js @@ -26,7 +26,7 @@ var ImageTransformation = { }, }; imageBox.showIndicator(); - new Ajax.Request('/admin/ImageEditor/manipulate', options); + new Ajax.Request('admin/ImageEditor/manipulate', options); }, rotate: function(angle) { @@ -44,7 +44,7 @@ var ImageTransformation = { } }; imageBox.showIndicator(); - new Ajax.Request('/admin/ImageEditor/manipulate', options); + new Ajax.Request('admin/ImageEditor/manipulate', options); }, crop: function(top,left,width,height) { @@ -62,7 +62,7 @@ var ImageTransformation = { }, }; imageBox.showIndicator(); - new Ajax.Request('/admin/ImageEditor/manipulate', options); + new Ajax.Request('admin/ImageEditor/manipulate', options); }, save: function(originalFile,editedFile) { @@ -73,7 +73,7 @@ var ImageTransformation = { imageEditor.onClose(); }, }; - new Ajax.Request('/admin/ImageEditor/save', options); + new Ajax.Request('admin/ImageEditor/save', options); } } diff --git a/templates/ImageEditor.ss b/templates/ImageEditor.ss index 913df107..19f1d485 100644 --- a/templates/ImageEditor.ss +++ b/templates/ImageEditor.ss @@ -4,7 +4,7 @@ <% base_tag %> Untitled Document - +
@@ -41,7 +41,7 @@
- indicator + indicator