diff options
Diffstat (limited to 'views/default/canvas/layouts')
| -rw-r--r-- | views/default/canvas/layouts/one_column.php | 12 | ||||
| -rw-r--r-- | views/default/canvas/layouts/one_column_with_sidebar.php | 23 | ||||
| -rw-r--r-- | views/default/canvas/layouts/two_column_left_sidebar.php | 30 | ||||
| -rw-r--r-- | views/default/canvas/layouts/widgets.php | 224 |
4 files changed, 148 insertions, 141 deletions
diff --git a/views/default/canvas/layouts/one_column.php b/views/default/canvas/layouts/one_column.php index c71c2def6..68a75f784 100644 --- a/views/default/canvas/layouts/one_column.php +++ b/views/default/canvas/layouts/one_column.php @@ -8,10 +8,8 @@ * @link http://elgg.org/ */ ?> - -<!-- main content --> -<div id="one_column"> - -<?php echo $vars['area1']; ?> - -</div><!-- /one_column -->
\ No newline at end of file +<div id="elgg_content" class="clearfloat"> + <div id="elgg_page_contents" class="clearfloat one_column"> + <?php echo $vars['area1']; ?> + </div> +</div>
\ No newline at end of file diff --git a/views/default/canvas/layouts/one_column_with_sidebar.php b/views/default/canvas/layouts/one_column_with_sidebar.php new file mode 100644 index 000000000..f7fff4d08 --- /dev/null +++ b/views/default/canvas/layouts/one_column_with_sidebar.php @@ -0,0 +1,23 @@ +<?php +/** + * Elgg 2 column left sidebar canvas layout + * + * @package Elgg + * @subpackage Core + * @author Curverider Ltd + * @link http://elgg.org/ + */ +?> +<div id="elgg_content" class="clearfloat sidebar"> + <div id="elgg_sidebar"> + <?php + echo elgg_view('page_elements/owner_block'); + if (isset($vars['area1'])) echo $vars['area1']; + if (isset($vars['area3'])) echo $vars['area3']; + ?> + </div> + + <div id="elgg_page_contents" class="clearfloat"> + <?php if (isset($vars['area2'])) echo $vars['area2']; ?> + </div> +</div> diff --git a/views/default/canvas/layouts/two_column_left_sidebar.php b/views/default/canvas/layouts/two_column_left_sidebar.php deleted file mode 100644 index 40eb77b1a..000000000 --- a/views/default/canvas/layouts/two_column_left_sidebar.php +++ /dev/null @@ -1,30 +0,0 @@ -<?php -/** - * Elgg 2 column left sidebar canvas layout - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ -?> -<!-- left sidebar --> -<div id="two_column_left_sidebar"> - - <?php - - echo elgg_view('page_elements/owner_block',array('content' => $vars['area1'])); - - ?> - - <?php if (isset($vars['area3'])) echo $vars['area3']; ?> - -</div><!-- /two_column_left_sidebar --> - -<!-- main content --> -<div id="two_column_left_sidebar_maincontent"> - -<?php if (isset($vars['area2'])) echo $vars['area2']; ?> - -</div><!-- /two_column_left_sidebar_maincontent --> - diff --git a/views/default/canvas/layouts/widgets.php b/views/default/canvas/layouts/widgets.php index 7b3470dd2..fa0d2ab0c 100644 --- a/views/default/canvas/layouts/widgets.php +++ b/views/default/canvas/layouts/widgets.php @@ -1,42 +1,52 @@ <?php -/** - * Elgg widget layout - * - * @package Elgg - * @subpackage Core - * @author Curverider Ltd - * @link http://elgg.org/ - */ -$widgettypes = get_widget_types(); - -$owner = page_owner_entity(); - -$area1widgets = get_widgets(page_owner(),get_context(),1); -$area2widgets = get_widgets(page_owner(),get_context(),2); -$area3widgets = get_widgets(page_owner(),get_context(),3); - -if (empty($area1widgets) && empty($area2widgets) && empty($area3widgets)) { - if (isset($vars['area3'])) { - $vars['area1'] = $vars['area3']; - } - if (isset($vars['area4'])) { - $vars['area2'] = $vars['area4']; - } -} - -if ($owner && $owner->canEdit()) { - -?> + /** + * Elgg widget layout + */ + + $widgettypes = get_widget_types(); + + $owner = page_owner_entity(); + + $area1widgets = get_widgets(page_owner(),get_context(),1); + $area2widgets = get_widgets(page_owner(),get_context(),2); + $area3widgets = get_widgets(page_owner(),get_context(),3); + + if (empty($area1widgets) && empty($area2widgets) && empty($area3widgets)) { + + if (isset($vars['area3'])) $vars['area1'] = $vars['area3']; + if (isset($vars['area4'])) $vars['area2'] = $vars['area4']; + + } + + if (is_array($widgettypes) && sizeof($widgettypes) > 0 && $owner && $owner->canEdit()) { + + + + if($_SESSION['user']->guid == page_owner() || ($owner instanceof ElggGroup && $owner->canEdit())){ + + if(get_context() == "profile") { + ?> + <!-- add remove widget button --> + <div class="add_widgets" style="margin:-18px 0 10px;"> + <a href="javascript:void(0);" class="action_button toggle_customise_edit_panel"><?php echo(elgg_echo('dashboard:configure')); ?></a> + </div><div class="clearfloat"></div> + <?php + } + } + ?> -<div id="customise_editpanel"> +<div id="customise_editpanel" class="hidden"> <div id="customise_editpanel_rhs"> <h2><?php echo elgg_echo("widgets:gallery"); ?></h2> <div id="widget_picker_gallery"> + <?php + foreach($widgettypes as $handler => $widget) { + ?> <table class="draggable_widget" cellspacing="0"><tr><td> @@ -45,8 +55,8 @@ if ($owner && $owner->canEdit()) { <input type="hidden" name="multiple" value="<?php if ((isset($widget->handler)) && (isset($widgettypes[$widget->handler]->multiple))) echo $widgettypes[$widget->handler]->multiple; ?>" /> <input type="hidden" name="side" value="<?php if ((isset($widget->handler)) && (isset($widgettypes[$widget->handler])) && (is_array($widgettypes[$widget->handler]->positions))) echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" /> <input type="hidden" name="main" value="<?php if ((isset($widget->handler)) && (isset($widgettypes[$widget->handler])) && (is_array($widgettypes[$widget->handler]->positions))) echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" /> - <input type="hidden" name="handler" value="<?php echo htmlentities($handler, ENT_QUOTES, 'UTF-8'); ?>" /> - <input type="hidden" name="description" value="<?php echo htmlentities($widget->description, ENT_QUOTES, 'UTF-8'); ?>" /> + <input type="hidden" name="handler" value="<?php echo htmlentities($handler); ?>" /> + <input type="hidden" name="description" value="<?php echo htmlentities($widget->description, null, 'UTF-8'); ?>" /> <input type="hidden" name="guid" value="0" /> </h3> </td> @@ -64,6 +74,7 @@ if ($owner && $owner->canEdit()) { </div><!-- /#customise_editpanel_rhs --> </div><!-- /#widget_picker_gallery --> + <div class="customise_editpanel_instructions"> <h2><?php echo elgg_echo('widgets:add'); ?></h2> <?php echo elgg_view('output/longtext', array('value' => elgg_echo('widgets:add:description'))); ?> @@ -73,25 +84,28 @@ if ($owner && $owner->canEdit()) { <div id="customise_page_view"> <table cellspacing="0"> -<tr> - <td colspan="2" align="left" valign="top"> + <tr> + <td colspan="2" align="left" valign="top"> + + <?php +if(get_context() != "profile"){ /* on groups */ + ?> - <?php - if(get_context() == "profile"){ - ?> <h2 class="profile_box"><?php echo elgg_echo("widgets:profilebox"); ?></h2> - <div id="profile_box_widgets"> - <p><small><?php echo elgg_echo('widgets:position:fixed'); ?></small></p> - </div> - <?php - } - ?> - - </td> - - <td rowspan="2" align="left" valign="top"> + <div id="profile_box_widgets"> + <p><small><?php echo elgg_echo('widgets:position:fixed'); ?></small></p> + </div> + + <?php + } + ?> + + </td> + + + <td rowspan="2" align="left" valign="top"> <h2><?php echo elgg_echo("widgets:rightcolumn"); ?></h2> - <div id="rightcolumn_widgets" <?php if(get_context() == "profile")echo "class=\"long\""; ?>> + <div id="rightcolumn_widgets" <?php if(get_context() != "profile")echo "class=\"long\""; ?> > <?php $rightcolumn_widgets = ""; if (is_array($area3widgets) && sizeof($area3widgets) > 0) { @@ -101,17 +115,17 @@ if ($owner && $owner->canEdit()) { } $rightcolumn_widgets .= "{$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="handler" value="<?php + echo $widget->handler; ?>" /> <input type="hidden" name="multiple" value="<?php echo $widgettypes[$widget->handler]->multiple; ?>" /> <input type="hidden" name="side" value="<?php echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" /> <input type="hidden" name="main" value="<?php echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" /> - <input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description, ENT_QUOTES, 'UTF-8'); ?>" /> + <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> @@ -119,19 +133,19 @@ if ($owner && $owner->canEdit()) { <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="14px" height="14px" class="more_info" /></a></td> <td width="17px" align="right"><a href="#"><img src="<?php echo $vars['url']; ?>_graphics/spacer.gif" width="15px" height="15px" class="drag_handle" /></a></td> </tr></table> - + <?php - + } } ?> - + </div> - </td><!-- /rightcolumn td --> - -</tr> - -<tr> + </td><!-- /rightcolumn td --> + + </tr> + + <tr> <td> <h2><?php echo elgg_echo("widgets:leftcolumn"); ?></h2> @@ -150,13 +164,13 @@ if ($owner && $owner->canEdit()) { <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="handler" value="<?php + echo $widget->handler; ?>" /> <input type="hidden" name="multiple" value="<?php echo $widgettypes[$widget->handler]->multiple; ?>" /> <input type="hidden" name="side" value="<?php echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" /> <input type="hidden" name="main" value="<?php echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" /> - <input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description, ENT_QUOTES, 'UTF-8'); ?>" /> + <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> @@ -166,7 +180,7 @@ if ($owner && $owner->canEdit()) { </tr></table> <?php - + } } ?> @@ -191,13 +205,13 @@ if ($owner && $owner->canEdit()) { <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="handler" value="<?php + echo $widget->handler; ?>" /> <input type="hidden" name="multiple" value="<?php echo $widgettypes[$widget->handler]->multiple; ?>" /> <input type="hidden" name="side" value="<?php echo in_array('side',$widgettypes[$widget->handler]->positions); ?>" /> <input type="hidden" name="main" value="<?php echo in_array('main',$widgettypes[$widget->handler]->positions); ?>" /> - <input type="hidden" name="description" value="<?php echo htmlentities($widgettypes[$widget->handler]->description, ENT_QUOTES, 'UTF-8'); ?>" /> + <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> @@ -207,7 +221,7 @@ if ($owner && $owner->canEdit()) { </tr></table> <?php - + } } ?> @@ -226,98 +240,100 @@ if ($owner && $owner->canEdit()) { </div><!-- /#customise_page_view --> <form action="<?php echo $vars['url']; ?>action/widgets/reorder" method="post"> +<?php echo elgg_view('input/securitytoken'); ?> <textarea type="textarea" value="Left widgets" style="display:none" name="debugField1" id="debugField1" /><?php echo $leftcolumn_widgets; ?></textarea> <textarea type="textarea" value="Middle widgets" style="display:none" name="debugField2" id="debugField2" /><?php echo $middlecolumn_widgets; ?></textarea> <textarea type="textarea" value="Right widgets" style="display:none" name="debugField3" id="debugField3" /><?php echo $rightcolumn_widgets; ?></textarea> <input type="hidden" name="context" value="<?php echo get_context(); ?>" /> <input type="hidden" name="owner" value="<?php echo page_owner(); ?>" /> - -<?php -$ts = time(); -$token = generate_action_token($ts); -?> -<input type="hidden" name="__elgg_ts" value="<?php echo $ts; ?>" /> -<input type="hidden" name="__elgg_token" value="<?php echo $token; ?>" /> - -<input type="submit" value="<?php echo elgg_echo('save'); ?>" class="submit_button" onclick="$('a.toggle_customise_edit_panel').click();" /> -<input type="button" value="<?php echo elgg_echo('cancel'); ?>" class="cancel_button" onclick="$('a.toggle_customise_edit_panel').click();" /> +<input type="submit" onfocus="blur()" value="<?php echo elgg_echo('save'); ?>" class="submit_button" onclick="$('a.Action_Button.toggle_customise_edit_panel').click();" /> +<input type="button" onfocus="blur()" value="<?php echo elgg_echo('cancel'); ?>" class="cancel_button" onclick="$('a.Action_Button.toggle_customise_edit_panel').click();" /> </form> </div><!-- /customise_editpanel --> <?php - + } - + ?> + <table cellspacing="0" id="widget_table"> -<tr> - <td colspan="2" align="left" valign="top" height="1px"> + <tr> + <td colspan="2" align="left" valign="top" height="1px"> <!-- profile box or 'dashboard info' notice --> <?php if (isset($vars['area1'])) echo $vars['area1']; ?> </td> - <td rowspan="2" align="left" valign="top" height="100%"> - <?php - if($_SESSION['user']->guid == page_owner()){ + <td rowspan="2" align="left" valign="top" height="100%"> + + <?php + if($_SESSION['user']->guid == page_owner() || ($owner instanceof ElggGroup && $owner->canEdit())){ + + if(get_context() != "profile") { ?> - <!-- customise page button --> - <a href="javascript:void(0);" class="toggle_customise_edit_panel"><?php echo(elgg_echo('dashboard:configure')); ?></a> - <!-- <div style="clear:both;"></div> --> + <!-- customise page button appears in different place on groups widgets --> + <div class="add_widgets"> + <a href="javascript:void(0);" class="action_button toggle_customise_edit_panel"><?php echo(elgg_echo('dashboard:configure')); ?></a> + </div> <?php + } } ?> + <div id="widgets_right"> <?php - + if (is_array($area3widgets) && sizeof($area3widgets) > 0) foreach($area3widgets as $widget) { echo elgg_view_entity($widget); } ?> - - </div><!-- /#widgets_right --> - </td> -</tr> -<tr> + + </div><!-- /#widgets_right --> + </td> + </tr> + <tr> <td align="left" valign="top"> - + <!-- left widgets --> <div id="widgets_left"> - + <?php - + if (is_array($area1widgets) && sizeof($area1widgets) > 0) foreach($area1widgets as $widget) { echo elgg_view_entity($widget); } ?> - + </div><!-- /#widgets_left --> - + </td> <td align="left" valign="top"> - + <!-- widgets middle --> <div id="widgets_middle"> - + <?php if (isset($vars['area2'])) echo $vars['area2']; ?> <?php - + if (is_array($area2widgets) && sizeof($area2widgets) > 0) foreach($area2widgets as $widget) { echo elgg_view_entity($widget); } - + ?> - + </div><!-- /#widgets_middle --> - + </td> </tr> </table> + + |