tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

compressed ImageField layout to fit in CTF-popup (removed "click here to remove" label)

Browse Source 
removed iframe-borders for IE

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@48848 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2008-01-30 20:12:19 +00:00
parent c89d0dc981
commit 21180f52bd
4 changed files with 9 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/model/Image.php
View File

@ -611,19 +611,7 @@ class Image_Uploader extends Controller {
new FieldSet(
new HiddenField("Class", null, $this->urlParams['Class']),
new HiddenField("ID", null, $this->urlParams['ID']),
new HiddenField("Field", null, $this->urlParams['Field']),
new HeaderField($title),
new LabelField(
sprintf(
_t(
'ImageUploader.CLICKREMOVE',
"Click the button below to remove this %s.",
PR_MEDIUM,
'... this image/file'
),
$type
)
)
new HiddenField("Field", null, $this->urlParams['Field'])
),
new FieldSet(
new ConfirmedFormAction(

2
forms/ImageField.php
View File

@ -31,7 +31,7 @@ class ImageField extends FileField {
$parentClass = $data->class;
$parentField = $this->name;
$iframe = "<iframe name=\"{$this->name}_iframe\" src=\"images/iframe/$parentClass/$parentID/$parentField\" style=\"height: 152px; width: 600px; border-style: none;\"></iframe>";
$iframe = "<iframe name=\"{$this->name}_iframe\" src=\"images/iframe/$parentClass/$parentID/$parentField\" style=\"height: 152px; width: 525px; border: none;\" frameborder=\"0\"></iframe>";
return $iframe . $hiddenField;
} else {

6
lang/en_US.php
View File

@ -25,12 +25,6 @@ $lang['en_US']['ImageUploader']['DELETE'] = array(
PR_MEDIUM,
'Delete file/image'
);
$lang['en_US']['ImageUploader']['CLICKREMOVE'] = array(
'Click the button below to remove this %s.',
PR_MEDIUM,
'... this image/file'
);
$lang['en_US']['ImageUploader']['REALLYDELETE'] = 'Do you really want to remove this %s?';
$lang['en_US']['RedirectorPage']['HEADER'] = 'This page will redirect users to another page';
$lang['en_US']['RedirectorPage']['REDIRECTTO'] = 'Redirect to';

16
templates/Image_iframe.ss
View File

@ -6,12 +6,6 @@
</head>
<body>
<% if Image.ID %>
<div class="mainblock" >
$Image.CMSThumbnail
</div>
<% end_if %>
<div class="mainblock" style="width: 290px;">
<% if UseSimpleForm %>
$EditImageSimpleForm
@ -19,9 +13,13 @@
$EditImageForm
<% end_if %>
</div>
<% if DeleteImageForm %>
<div class="mainblock" style="width: 150px;">
$DeleteImageForm
<% if Image.ID %>
<div class="mainblock" >
$Image.CMSThumbnail
<% if DeleteImageForm %>
$DeleteImageForm
<% end_if %>
</div>
<% end_if %>