tonyair
/
silverstripe-reports
mirror of https://github.com/silverstripe/silverstripe-reports
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

mujma: 

(merged from branches/gsoc)


git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@41874 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2007-09-15 01:09:25 +00:00
parent 6ae57bdb46
commit 65e0686fa0
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/ImageEditor.php
View File

@ -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,

8
javascript/ImageEditor/ImageTransformation.js
View File

@ -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);
}
}

4
templates/ImageEditor.ss
View File

@ -4,7 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<% base_tag %>
<title>Untitled Document</title>
<link rel="stylesheet" type="text/css" media="all" href="/css/main.css" />
<link rel="stylesheet" type="text/css" media="all" href="css/main.css" />
</head>
<body id="body">
<div id="mainContainer">
@ -41,7 +41,7 @@
<div id="cropBox"></div>
</div>
<div id="loadingIndicatorContainer">
<img id="loadingIndicator" alt="indicator" src="/cms/images/ImageEditor/indicator.gif">
<img id="loadingIndicator" alt="indicator" src="cms/images/ImageEditor/indicator.gif">
</div>
</div>
</div>