diff options
Diffstat (limited to 'views')
-rw-r--r-- | views/default/canvas/layouts/widgets.php | 143 | ||||
-rw-r--r-- | views/default/input/access.php | 2 |
2 files changed, 72 insertions, 73 deletions
diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php index 2b4600c2f..2c9783148 100644 --- a/views/default/canvas/layouts/widgets.php +++ b/views/default/canvas/layouts/widgets.php @@ -15,7 +15,11 @@ $owner = page_owner_entity(); + $area1widgets = get_widgets(page_owner(),get_context(),1); + $area2widgets = get_widgets(page_owner(),get_context(),2); + if (is_array($widgettypes) && sizeof($widgettypes) > 0 && $owner->canEdit()) { + ?> @@ -60,60 +64,74 @@ <div id="main_widgets"> <h2>Main content area widgets</h2> -<table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 1 Title<input type="hidden" name="handler" value="placeholder1" /> - <input type="hidden" name="guid" value="01" /></h3></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td> -</tr></table> -<table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 2 Title megacalculatorextrodinaire<input type="hidden" name="handler" value="placeholder2" /> - <input type="hidden" name="guid" value="02" /></h3></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td> -</tr></table> -<table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 3 Title<input type="hidden" name="handler" value="placeholder3" /> - <input type="hidden" name="guid" value="03" /></h3></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td> -</tr></table> -<table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 4 Title<input type="hidden" name="handler" value="placeholder4" /> - <input type="hidden" name="guid" value="04" /></h3></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td> -</tr></table> -<table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 5 Title<input type="hidden" name="handler" value="placeholder5" /> - <input type="hidden" name="guid" value="05" /></h3></td> +<?php + $mainwidgetstring = ""; + if (is_array($area1widgets) && sizeof($area1widgets) > 0) { + foreach($area1widgets as $widget) { + if (!empty($mainwidgetstring)) { + $mainwidgetstring .= "::"; + } + $mainwidgetstring .= "{$widget->handler}::{$widget->getGUID()}"; +?> + +<table class="draggable_widget" cellspacing="0"><tr><td width="149px"> + <h3> + <?php echo $widgettypes[$widget->handler]->name; ?> + <input type="hidden" name="handler" value="<?php + echo $widget->handler; + ?>" /> + <input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description); ?>" /> + <input type="hidden" name="guid" value="<?php echo $widget->getGUID(); ?>" /> + </h3> +</td> <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td> <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td> <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td> </tr></table> + +<?php + + } + } +?> </div> </td> <td width="240px"> <div id="rightsidebar_widgets"> <h2>Right sidebar widgets</h2> -<table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 6 Title<input type="hidden" name="handler" value="placeholder6" /> - <input type="hidden" name="guid" value="06" /></h3></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td> -</tr></table> -<table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 7 Title<input type="hidden" name="handler" value="placeholder7" /> - <input type="hidden" name="guid" value="07" /></h3></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td> -<td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td> -</tr></table> -<table class="draggable_widget" cellspacing="0"><tr><td width="149px"><h3>Widget 8 Title<input type="hidden" name="handler" value="placeholder8" /> - <input type="hidden" name="guid" value="08" /></h3></td> + +<?php + $sidebarwidgetstring = ""; + if (is_array($area2widgets) && sizeof($area2widgets) > 0) { + foreach($area2widgets as $widget) { + if (!empty($sidebarwidgetstring)) { + $sidebarwidgetstring .= "::"; + } + $sidebarwidgetstring .= "{$widget->handler}::{$widget->getGUID()}"; +?> + +<table class="draggable_widget" cellspacing="0"><tr><td width="149px"> + <h3> + <?php echo $widgettypes[$widget->handler]->name; ?> + <input type="hidden" name="handler" value="<?php + echo $widget->handler; + ?>" /> + <input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description); ?>" /> + <input type="hidden" name="guid" value="<?php echo $widget->getGUID(); ?>" /> + </h3> +</td> <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_remove.gif" class="remove_me" /></a></td> <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_info.gif" class="more_info" /></a></td> <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/icon_customise_drag.gif" class="drag_handle" /></a></td> </tr></table> + +<?php + + } + } +?> + </div> </td> @@ -122,33 +140,18 @@ </div><!-- /#customise_page_view --> -<textarea type="textarea" value="Main widgets" style="width:400px;height:70px;" id="debugField1" /></textarea> -<textarea type="textarea" value="Right widgets" style="width:400px;height:70px;" id="debugField2" /></textarea> - +<form action="<?php echo $vars['url']; ?>action/widgets/reorder" method="post"> +<textarea type="textarea" value="Main widgets" style="display:none" name="debugField1" id="debugField1" /><?php echo $mainwidgetstring; ?></textarea> +<textarea type="textarea" value="Right widgets" style="display:none" name="debugField2" id="debugField2" /><?php echo $sidebarwidgetstring; ?></textarea> +<input type="hidden" name="context" value="<?php echo get_context(); ?>" /> +<input type="hidden" name="owner" value="<?php echo page_owner(); ?>" /> <input type="submit" value="Save changes" class="submit_button" /> - +</form> </div><!-- /customise_editpanel --> <!-- temporary customise button here --> <a href="javascript:void(0);" class="toggle_customise_edit_panel">Customise Layout</a> - <p> - <b>Temporarily, add a widget to this page:</b><br /> - -<?php - - foreach($widgettypes as $handler => $widgettype) { - $url = $vars['url'] . "action/widgets/add"; - $url .= "?handler=" . $handler; - $url .= "&context=" . get_context(); - $url .= "&user=" . page_owner(); - $url .= "&column=1"; - echo "<a href=\"{$url}\">{$widgettype->name}</a><br />"; - } - -?> - </p> - <?php } @@ -160,14 +163,12 @@ <div id="wrapper_sidebar_right"> - <?php echo $vars['area2']; ?> + <?php if (isset($vars['area2'])) echo $vars['area2']; ?> <?php - if ($widgets = get_widgets(page_owner(),get_context(),2)) { - if (is_array($widgets) && sizeof($widgets) > 0) - foreach($widgets as $widget) { - echo elgg_view_entity($widget); - } + if (is_array($area2widgets) && sizeof($area2widgets) > 0) + foreach($area2widgets as $widget) { + echo elgg_view_entity($widget); } ?> @@ -185,11 +186,9 @@ <?php echo $vars['area1']; ?> <?php - if ($widgets = get_widgets(page_owner(),get_context(),1)) { - if (is_array($widgets) && sizeof($widgets) > 0) - foreach($widgets as $widget) { - echo elgg_view_entity($widget); - } + if (is_array($area1widgets) && sizeof($area1widgets) > 0) + foreach($area1widgets as $widget) { + echo elgg_view_entity($widget); } ?> diff --git a/views/default/input/access.php b/views/default/input/access.php index cbabf3cc4..91ee2cca8 100644 --- a/views/default/input/access.php +++ b/views/default/input/access.php @@ -24,7 +24,7 @@ ?>
-<select name="<?php echo $vars['internalname']; ?>" <?php echo $vars['js']; ?>>
+<select name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['js'])) echo $vars['js']; ?>>
<?php
foreach($vars['options'] as $key => $option) {
|