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

Merge pull request #1 from dio5/master

Browse Source 
SS Hack Day
This commit is contained in:
Ed 2012-06-29 11:10:28 -07:00
commit 5ade9048ca
3 changed files with 8 additions and 6 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()) {
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');
return $this->renderWith("WidgetAreaEditor");
}

9
css/WidgetAreaEditor.css
View File

@ -34,7 +34,12 @@ div.availableWidgets div.Widget {
width: 98%;
border: 1px solid #ddd;
border-top: none;
margin-bottom: 5px;
margin-bottom: 10px;
background: #F0F3F4 url('../../cms/images/textures/bg_cms_main_content.png') repeat top left;
}
div.widgetDescription{
padding: 10px 0;
}
div.widgetDescription p,
div.widgetFields {
@ -44,7 +49,7 @@ div.widgetFields {
}
p.deleteWidget {
margin: 0;
margin: 0 0 4px;
height: 22px;
line-height: 2.2;
font-size: 12px;

2
javascript/WidgetAreaEditor.js
View File

@ -127,7 +127,7 @@
insertWidgetEditor: function(response) {
// Remove placeholder text
if($('#NoWidgets-'+$(this).attr('name')).length>0) {
$('#usedWidgets-'+$(this).attr('name')).remove($('#NoWidgets-'+$(this).attr('name')));
$('#NoWidgets-'+$(this).attr('name')).remove();
}
var usedWidgets = $('#usedWidgets-'+$(this).attr('name')).children();