tonyair/silverstripe-widgets
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-widgets synced 2024-10-22 17:05:54 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:UndefinedOffset/silverstripe-widgets

Browse Source
This commit is contained in:
Ed 2012-07-06 17:41:39 -03:00
commit b3b203735d
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
code/form/WidgetAreaEditor.php
View File

@ -21,10 +21,7 @@ class WidgetAreaEditor extends FormField {
function FieldHolder($properties = array()) { function FieldHolder($properties = array()) {
Requirements::css('widgets/css/WidgetAreaEditor.css'); Requirements::css('widgets/css/WidgetAreaEditor.css');
Requirements::javascript(THIRDPARTY_DIR . "/prototype/prototype.js");
Requirements::javascript(THIRDPARTY_DIR . '/behaviour/behaviour.js');
Requirements::javascript('widgets/javascript/WidgetAreaEditor.js'); Requirements::javascript('widgets/javascript/WidgetAreaEditor.js');
return $this->renderWith("WidgetAreaEditor"); return $this->renderWith("WidgetAreaEditor");
} }

9
css/WidgetAreaEditor.css
View File

@ -34,7 +34,12 @@ div.availableWidgets div.Widget {
width: 98%; width: 98%;
border: 1px solid #ddd; border: 1px solid #ddd;
border-top: none; border-top: none;
margin-bottom: 5px; margin-bottom: 10px;
background: #F0F3F4;
}
div.widgetDescription{
padding: 10px 0;
} }
div.widgetDescription p, div.widgetDescription p,
div.widgetFields { div.widgetFields {
@ -44,7 +49,7 @@ div.widgetFields {
} }
p.deleteWidget { p.deleteWidget {
margin: 0; margin: 0 0 4px;
height: 22px; height: 22px;
line-height: 2.2; line-height: 2.2;
font-size: 12px; font-size: 12px;

6
javascript/WidgetAreaEditor.js
View File

@ -125,11 +125,6 @@
}, },
insertWidgetEditor: function(response) { insertWidgetEditor: function(response) {
// Remove placeholder text
if($('#NoWidgets-'+$(this).attr('name')).length>0) {
$('#usedWidgets-'+$(this).attr('name')).remove($('#NoWidgets-'+$(this).attr('name')));
}
var usedWidgets = $('#usedWidgets-'+$(this).attr('name')).children(); var usedWidgets = $('#usedWidgets-'+$(this).attr('name')).children();
// Give the widget a unique id // Give the widget a unique id
@ -161,7 +156,6 @@
deleteWidget: function(widgetToRemove) { deleteWidget: function(widgetToRemove) {
// Remove a widget from the used widgets column // Remove a widget from the used widgets column
widgetToRemove.remove(); widgetToRemove.remove();
// TODO ... re-create NoWidgets div?
} }
}); });