Permalink
Browse files

MINOR Merge errors

  • Loading branch information...
1 parent 832d410 commit 25d0196b044c3ece3f2d072ea1d70a371df06e4b @chillu chillu committed Feb 28, 2012
View
BIN admin/images/sprites-32x32-sa4e142f7f0.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
7 admin/javascript/LeftAndMain.EditForm.js
@@ -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));
View
8 forms/gridfield/GridFieldPopupForms.php
@@ -214,12 +214,12 @@ function ItemEditForm() {
// 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;
}
View
2 templates/Includes/GridFieldAction_Edit.ss
@@ -1 +1 @@
-<a class="edit-link" href="$Link">edit</a>
+<a class="action edit-link" href="$Link">edit</a>

0 comments on commit 25d0196

Please sign in to comment.