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

MINOR Merge errors

This commit is contained in:
Ingo Schommer 2012-02-28 15:56:47 +01:00
parent 832d410303
commit 25d0196b04
4 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
admin/images/sprites-32x32-sa4e142f7f0.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

7
admin/javascript/LeftAndMain.EditForm.js
View File

@ -183,13 +183,6 @@
}
});
$('.cms-edit-form .ss-gridfield .action-edit').entwine({
onclick: function(e) {
$('.cms-container').loadPanel(this.attr('href'), '', {selector: '.cms-edit-form'});
e.preventDefault();
}
});
});
}(jQuery));

8
forms/gridfield/GridFieldPopupForms.php
View File

@ -214,12 +214,12 @@ class GridFieldPopupForm_ItemRequest extends RequestHandler {
// WARNING: The arguments passed here are a little arbitrary. This API will need cleanup
$this->record->getCMSFields($this->popupController, $this->popupFormName),
new FieldList(
$saveAction = new FormAction('doSave', _t('GridFieldDetailsForm.Save', 'Save')),
$deleteAction = new FormAction('doDelete', _t('GridFieldDetailsForm.Delete', 'Delete'))
FormAction::create('doSave', _t('GridFieldDetailsForm.Save', 'Save'))
->setUseButtonTag(true)->addExtraClass('ss-ui-action-constructive')->setAttribute('data-icon', 'accept'),
FormAction::create('doDelete', _t('GridFieldDetailsForm.Delete', 'Delete'))
->setUseButtonTag(true)->addExtraClass('ss-ui-action-destructive')
)
);
$saveAction->addExtraClass('ss-ui-action-constructive');
$deleteAction->addExtraClass('ss-ui-action-destructive');
$form->loadDataFrom($this->record);
return $form;
}

2
templates/Includes/GridFieldAction_Edit.ss
View File

@ -1 +1 @@
<a class="edit-link" href="$Link">edit</a>
<a class="action edit-link" href="$Link">edit</a>