diff options
Diffstat (limited to 'mod/pages/views')
38 files changed, 562 insertions, 944 deletions
diff --git a/mod/pages/views/default/annotation/icon.php b/mod/pages/views/default/annotation/icon.php deleted file mode 100644 index 3e0195e5f..000000000 --- a/mod/pages/views/default/annotation/icon.php +++ /dev/null @@ -1,32 +0,0 @@ -<?php - /** - * Elgg Pages - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ - - - $annotation = $vars['annotation']; - $entity = get_entity($annotation->entity_guid); - - // Get size - if (!in_array($vars['size'],array('small','medium','large','tiny','master','topbar'))) - $vars['size'] = "medium"; - - // Get any align and js - if (!empty($vars['align'])) { - $align = " align=\"{$vars['align']}\" "; - } else { - $align = ""; - } - - -?> - -<div class="groupicon"> -<a href="<?php echo $entity->getURL() . "?rev=" . $annotation->id; ?>"><img src="<?php echo $entity->getIcon($vars['size']); ?>" border="0" <?php echo $align; ?> <?php echo $vars['js']; ?> /></a> -</div> diff --git a/mod/pages/views/default/annotation/page.php b/mod/pages/views/default/annotation/page.php index ecfd0a302..ecb289092 100644 --- a/mod/pages/views/default/annotation/page.php +++ b/mod/pages/views/default/annotation/page.php @@ -1,40 +1,60 @@ <?php - /** - * Elgg Pages - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ - - $annotation = $vars['annotation']; - $entity = get_entity($annotation->entity_guid); - - $icon = elgg_view( - "annotation/icon", array( - 'annotation' => $vars['annotation'], - 'size' => 'small', - ) - ); - - $owner_guid = $annotation->owner_guid; - $owner = get_entity($owner_guid); - - $rev = sprintf(elgg_echo('pages:revision'), - friendly_time($annotation->time_created), - - "<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>" - ); - - $link = $entity->getURL() . "?rev=" . $annotation->id; - - $info = <<< END - -<div><a href="$link">{$entity->title}</a></div> -<div>$rev</div> -END; - - echo elgg_view_listing($icon, $info); -?> +/** + * Revision view for history page + * + * @package ElggPages + */ + +$annotation = $vars['annotation']; +$page = get_entity($annotation->entity_guid); + +$icon = elgg_view("pages/icon", array( + 'annotation' => $annotation, + 'size' => 'small', +)); + +$owner_guid = $annotation->owner_guid; +$owner = get_entity($owner_guid); +if (!$owner) { + +} +$owner_link = elgg_view('output/url', array( + 'href' => $owner->getURL(), + 'text' => $owner->name, + 'is_trusted' => true, +)); + +$date = elgg_view_friendly_time($annotation->time_created); + +$title_link = elgg_view('output/url', array( + 'href' => $annotation->getURL(), + 'text' => $page->title, + 'is_trusted' => true, +)); + +$subtitle = elgg_echo('pages:revision:subtitle', array($date, $owner_link)); + +$body = <<< HTML +<h3>$title_link</h3> +<p class="elgg-subtext">$subtitle</p> +HTML; + +if (!elgg_in_context('widgets')) { + $menu = elgg_view_menu('annotation', array( + 'annotation' => $annotation, + 'sort_by' => 'priority', + 'class' => 'elgg-menu-hz float-alt', + )); +} + +$body = <<<HTML +<div class="mbn"> + $menu + <h3>$title_link</h3> + <span class="elgg-subtext"> + $subtitle + </span> +</div> +HTML; + +echo elgg_view_image_block($icon, $body);
\ No newline at end of file diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php index 2ad454073..e14ff19ec 100644 --- a/mod/pages/views/default/forms/pages/edit.php +++ b/mod/pages/views/default/forms/pages/edit.php @@ -1,106 +1,77 @@ <?php - /** - * Elgg Pages - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ +/** + * Page edit form body + * + * @package ElggPages + */ - $parent_guid = get_input('parent_guid'); - $container_guid = get_input('container_guid'); - if (!$container_guid) $container_guid = page_owner(); - - $new_page = false; - if (!$vars['entity']) { - $new_page = true; - - // bootstrap the access permissions in the entity array so we can use defaults - if (defined('ACCESS_DEFAULT')) { - $vars['entity']->access_id = ACCESS_DEFAULT; - $vars['entity']->write_access_id = ACCESS_DEFAULT; - } else { - $vars['entity']->access_id = 0; - $vars['entity']->write_access_id = 0; - } +$variables = elgg_get_config('pages'); +$user = elgg_get_logged_in_user_entity(); +$entity = elgg_extract('entity', $vars); +$can_change_access = true; +if ($user && $entity) { + $can_change_access = ($user->isAdmin() || $user->getGUID() == $entity->owner_guid); +} - // pull in sticky values from session - if (isset($_SESSION['page_description'])) { - $vars['entity']->description = $_SESSION['page_description']; - $vars['entity']->tags = $_SESSION['page_tags']; - $vars['entity']->access_id = $_SESSION['page_read_access']; - $vars['entity']->write_access_id = $_SESSION['page_write_access']; +foreach ($variables as $name => $type) { + // don't show read / write access inputs for non-owners or admin when editing + if (($type == 'access' || $type == 'write_access') && !$can_change_access) { + continue; + } + + // don't show parent picker input for top or new pages. + if ($name == 'parent_guid' && (!$vars['parent_guid'] || !$vars['guid'])) { + continue; + } - // clear them - unset($_SESSION['page_description']); - unset($_SESSION['page_tags']); - unset($_SESSION['page_read_access']); - unset($_SESSION['page_write_access']); - } + if ($type == 'parent') { + $input_view = "pages/input/$type"; + } else { + $input_view = "input/$type"; } + ?> -<div class="contentWrapper"> -<form action="<?php echo $vars['url']; ?>action/pages/edit" method="post"> +<div> + <label><?php echo elgg_echo("pages:$name") ?></label> + <?php + if ($type != 'longtext') { + echo '<br />'; + } + + echo elgg_view($input_view, array( + 'name' => $name, + 'value' => $vars[$name], + 'entity' => ($name == 'parent_guid') ? $vars['entity'] : null, + )); + ?> +</div> <?php - echo elgg_view('input/securitytoken'); - if (is_array($vars['config']->pages) && sizeof($vars['config']->pages) > 0) - foreach($vars['config']->pages as $shortname => $valtype) { - - $disabled = ""; - - if (!$new_page && ($shortname == 'title')) - { - $disabled = true; - } -?> +} - <p> - <label> - <?php echo elgg_echo("pages:{$shortname}") ?><br /> - <?php echo elgg_view("input/{$valtype}",array( - 'internalname' => $shortname, - 'value' => $vars['entity']->$shortname, - 'disabled' => $disabled - )); ?> - </label> - </p> +$cats = elgg_view('input/categories', $vars); +if (!empty($cats)) { + echo $cats; +} -<?php - - } - $cats = elgg_view('categories',$vars); - if (!empty($cats)) { - -?> - <p> - <?php - echo $cats; - ?> - </p> -<?php - - } -?> - <p> - <?php - if (!$new_page) - { - ?><input type="hidden" name="pages_guid" value="<?php echo $vars['entity']->getGUID(); ?>" /><?php - } - ?> - <?php - if ($container_guid) - { - ?><input type="hidden" name="container_guid" value="<?php echo $container_guid; ?>" /><?php - } - ?> - <input type="hidden" name="parent_guid" value="<?php if (!$new_page) echo $vars['entity']->parent_guid; else echo $parent_guid; ?>" /> - <input type="hidden" name="owner_guid" value="<?php if (!$new_page) echo $vars['entity']->owner_guid; else echo page_owner(); ?>" /> - <input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" /> - </p> +echo '<div class="elgg-foot">'; +if ($vars['guid']) { + echo elgg_view('input/hidden', array( + 'name' => 'page_guid', + 'value' => $vars['guid'], + )); +} +echo elgg_view('input/hidden', array( + 'name' => 'container_guid', + 'value' => $vars['container_guid'], +)); +if (!$vars['guid']) { + echo elgg_view('input/hidden', array( + 'name' => 'parent_guid', + 'value' => $vars['parent_guid'], + )); +} -</form> -</div> +echo elgg_view('input/submit', array('value' => elgg_echo('save'))); + +echo '</div>'; diff --git a/mod/pages/views/default/forms/pages/editwelcome.php b/mod/pages/views/default/forms/pages/editwelcome.php deleted file mode 100644 index 39d8d05ca..000000000 --- a/mod/pages/views/default/forms/pages/editwelcome.php +++ /dev/null @@ -1,59 +0,0 @@ -<?php - /** - * Elgg Pages Edit welcome page - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ - - //set some variables - if($vars['entity']){ - foreach($vars['entity'] as $welcome){ - $current_message = $welcome->description; - $object_guid = $welcome->guid; - $access_id = $welcome->access_id; - } - }else{ - $current_message = ''; - $object_guid = ''; - $access_id = ACCESS_PRIVATE; - } - - $page_owner = $vars['owner']->guid; - -?> -<form action="<?php echo $vars['url']; ?>action/pages/editwelcome" method="post"> - - <p class="longtext_inputarea"> - <label> - <?php echo elgg_view("input/longtext",array( - 'internalname' => "pages_welcome", - 'value' => $current_message, - 'disabled' => $disabled - )); ?> - </label> - </p> - <p> - <label> - <?php echo elgg_echo('access'); ?><br /> - <?php echo elgg_view('input/access', array('internalname' => 'access_id','value' => $access_id)); ?> - </label> - </p> - <input type="hidden" name="owner_guid" value="<?php echo $page_owner; ?>" /> - - <?php - echo elgg_view('input/securitytoken'); - - //if it is editing, include the object guid - if($object_guid != ''){ - ?> - <input type="hidden" name="object_guid" value="<?php echo $object_guid; ?>" /> - <?php - } - ?> - - <input type="submit" class="submit_button" value="<?php echo elgg_echo("save"); ?>" /> -</form> diff --git a/mod/pages/views/default/icon/object/page/medium.php b/mod/pages/views/default/icon/object/page/medium.php deleted file mode 100644 index 1e5c1538e..000000000 --- a/mod/pages/views/default/icon/object/page/medium.php +++ /dev/null @@ -1,3 +0,0 @@ -<?php - echo $vars['url'] . "mod/pages/images/pages_lrg.gif"; -?> diff --git a/mod/pages/views/default/icon/object/page/small.php b/mod/pages/views/default/icon/object/page/small.php deleted file mode 100644 index 3ccc859f3..000000000 --- a/mod/pages/views/default/icon/object/page/small.php +++ /dev/null @@ -1,3 +0,0 @@ -<?php - echo $vars['url'] . "mod/pages/images/pages.gif"; -?> diff --git a/mod/pages/views/default/icon/object/page_top/medium.php b/mod/pages/views/default/icon/object/page_top/medium.php deleted file mode 100644 index 1e5c1538e..000000000 --- a/mod/pages/views/default/icon/object/page_top/medium.php +++ /dev/null @@ -1,3 +0,0 @@ -<?php - echo $vars['url'] . "mod/pages/images/pages_lrg.gif"; -?> diff --git a/mod/pages/views/default/icon/object/page_top/small.php b/mod/pages/views/default/icon/object/page_top/small.php deleted file mode 100644 index 3ccc859f3..000000000 --- a/mod/pages/views/default/icon/object/page_top/small.php +++ /dev/null @@ -1,3 +0,0 @@ -<?php - echo $vars['url'] . "mod/pages/images/pages.gif"; -?> diff --git a/mod/pages/views/default/input/write_access.php b/mod/pages/views/default/input/write_access.php new file mode 100644 index 000000000..69277ca20 --- /dev/null +++ b/mod/pages/views/default/input/write_access.php @@ -0,0 +1,35 @@ +<?php +/** + * Write access + * + * Removes the public option found in input/access + * + * @uses $vars['value'] The current value, if any + * @uses $vars['options_values'] + * @uses $vars['name'] The name of the input field + * @uses $vars['entity'] Optional. The entity for this access control (uses write_access_id) + */ + +$options = get_write_access_array(); +unset($options[ACCESS_PUBLIC]); + +$defaults = array( + 'class' => 'elgg-input-access', + 'disabled' => FALSE, + 'value' => get_default_access(), + 'options_values' => $options, +); + +if (isset($vars['entity'])) { + $defaults['value'] = $vars['entity']->write_access_id; + unset($vars['entity']); +} + +$vars = array_merge($defaults, $vars); + +if ($vars['value'] == ACCESS_DEFAULT) { + $vars['value'] = get_default_access(); +} +$vars['value'] = ($vars['value'] == ACCESS_PUBLIC) ? ACCESS_LOGGED_IN : $vars['value']; + +echo elgg_view('input/dropdown', $vars); diff --git a/mod/pages/views/default/object/page.php b/mod/pages/views/default/object/page.php index 843209609..a5e56415d 100644 --- a/mod/pages/views/default/object/page.php +++ b/mod/pages/views/default/object/page.php @@ -1,21 +1,8 @@ <?php - /** - * Elgg Pages - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ +/** + * Page view + * + * @package ElggPages + */ - if ($vars['full']) { - echo elgg_view("pages/pageprofile",$vars); - } else { - if (get_input('search_viewtype') == "gallery") { - echo elgg_view('pages/pagegallery',$vars); - } else { - echo elgg_view("pages/pagelisting",$vars); - } - } -?> +echo elgg_view('object/page_top', $vars); diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php index 843209609..f35202993 100644 --- a/mod/pages/views/default/object/page_top.php +++ b/mod/pages/views/default/object/page_top.php @@ -1,21 +1,119 @@ <?php - /** - * Elgg Pages - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ - - if ($vars['full']) { - echo elgg_view("pages/pageprofile",$vars); +/** + * View for page object + * + * @package ElggPages + * + * @uses $vars['entity'] The page object + * @uses $vars['full_view'] Whether to display the full view + * @uses $vars['revision'] This parameter not supported by elgg_view_entity() + */ + + +$full = elgg_extract('full_view', $vars, FALSE); +$page = elgg_extract('entity', $vars, FALSE); +$revision = elgg_extract('revision', $vars, FALSE); + +if (!$page) { + return TRUE; +} + +// pages used to use Public for write access +if ($page->write_access_id == ACCESS_PUBLIC) { + // this works because this metadata is public + $page->write_access_id = ACCESS_LOGGED_IN; +} + + +if ($revision) { + $annotation = $revision; +} else { + $annotation = $page->getAnnotations('page', 1, 0, 'desc'); + if ($annotation) { + $annotation = $annotation[0]; + } +} + +$page_icon = elgg_view('pages/icon', array('annotation' => $annotation, 'size' => 'small')); + +$editor = get_entity($annotation->owner_guid); +$editor_link = elgg_view('output/url', array( + 'href' => "pages/owner/$editor->username", + 'text' => $editor->name, + 'is_trusted' => true, +)); + +$date = elgg_view_friendly_time($annotation->time_created); +$editor_text = elgg_echo('pages:strapline', array($date, $editor_link)); +$categories = elgg_view('output/categories', $vars); + +$comments_count = $page->countComments(); +//only display if there are commments +if ($comments_count != 0 && !$revision) { + $text = elgg_echo("comments") . " ($comments_count)"; + $comments_link = elgg_view('output/url', array( + 'href' => $page->getURL() . '#page-comments', + 'text' => $text, + 'is_trusted' => true, + )); +} else { + $comments_link = ''; +} + +$subtitle = "$editor_text $comments_link $categories"; + +// do not show the metadata and controls in widget view +if (!elgg_in_context('widgets')) { + // If we're looking at a revision, display annotation menu + if ($revision) { + $metadata = elgg_view_menu('annotation', array( + 'annotation' => $annotation, + 'sort_by' => 'priority', + 'class' => 'elgg-menu-hz float-alt', + )); } else { - if (get_input('search_viewtype') == "gallery") { - echo elgg_view('pages/pagegallery',$vars); - } else { - echo elgg_view("pages/pagelisting",$vars); - } + // Regular entity menu + $metadata = elgg_view_menu('entity', array( + 'entity' => $vars['entity'], + 'handler' => 'pages', + 'sort_by' => 'priority', + 'class' => 'elgg-menu-hz', + )); } -?> +} + +if ($full) { + $body = elgg_view('output/longtext', array('value' => $annotation->value)); + + $params = array( + 'entity' => $page, + 'metadata' => $metadata, + 'subtitle' => $subtitle, + ); + $params = $params + $vars; + $summary = elgg_view('object/elements/summary', $params); + + echo elgg_view('object/elements/full', array( + 'entity' => $page, + 'title' => false, + 'icon' => $page_icon, + 'summary' => $summary, + 'body' => $body, + )); + +} else { + // brief view + + $excerpt = elgg_get_excerpt($page->description); + + $params = array( + 'entity' => $page, + 'metadata' => $metadata, + 'subtitle' => $subtitle, + 'content' => $excerpt, + ); + $params = $params + $vars; + $list_body = elgg_view('object/elements/summary', $params); + + echo elgg_view_image_block($page_icon, $list_body); +} diff --git a/mod/pages/views/default/pages/breadcrumbs.php b/mod/pages/views/default/pages/breadcrumbs.php deleted file mode 100644 index a6626ca39..000000000 --- a/mod/pages/views/default/pages/breadcrumbs.php +++ /dev/null @@ -1,28 +0,0 @@ -<?php - - $page_owner = $vars['page_owner']; - $parent = $vars['parent']; - - $breadcrumbs = ''; - - $owner_url = $CONFIG->wwwroot . "pg/pages/owned/" . get_entity($page_owner)->username; - echo "<div id='breadcrumbs'><b><a href=\"{$owner_url}\">" . elgg_echo('pages:user') . "</a></b>"; - - //see if the new page's parent has a parent - $getparent = get_entity($parent->parent_guid); - while ($getparent instanceof ElggObject){ - - $breadcrumbs = " > <a href=\"{$getparent->getURL()}\">$getparent->title</a>" . $breadcrumbs; - $getparent = get_entity($getparent->parent_guid); - - } - - echo $breadcrumbs; - //if it is adding a page, make the last page a link, otherwise, don't - if($vars['add']){ - echo " > <a href=\"{$parent->getURL()}\">$parent->title</a></div>"; - }else{ - echo " > $parent->title</div>"; - } - -?> diff --git a/mod/pages/views/default/pages/css.php b/mod/pages/views/default/pages/css.php index c396d45f7..24e45cb9d 100644 --- a/mod/pages/views/default/pages/css.php +++ b/mod/pages/views/default/pages/css.php @@ -1,146 +1,19 @@ <?php - /** - * Elgg Pages - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ +/** + * Elgg Pages CSS + * + * @package ElggPages + */ ?> -.treeview, .treeview ul { - padding: 0; - margin: 0; - list-style: none; +.pages-nav.treeview ul { + background-color: transparent; } -.treeview ul { - background-color: white; - margin-top: 4px; +.pages-nav.treeview a.selected { + color: #555555; } -.treeview .hitarea { - background: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-default.gif) -64px -25px no-repeat; - height: 16px; - width: 16px; - margin-left: -16px; - float: left; - cursor: pointer; -} -/* fix for IE6 */ -* html .hitarea { - display: inline; - float:none; -} - -.treeview li { - margin: 0; - padding: 3px 0pt 3px 16px; -} - -.treeview a.selected { - background-color: #eee; -} - -#treecontrol { margin: 1em 0; display: none; } - -.treeview .hover { color: red; cursor: pointer; } - -.treeview li { background: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-default-line.gif) 0 0 no-repeat; } -.treeview li.collapsable, .treeview li.expandable { background-position: 0 -176px; } - -.treeview .expandable-hitarea { background-position: -80px -3px; } - -.treeview li.last { background-position: 0 -1766px } -.treeview li.lastCollapsable, .treeview li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-default.gif); } -.treeview li.lastCollapsable { background-position: 0 -111px } -.treeview li.lastExpandable { background-position: -32px -67px } - -.treeview div.lastCollapsable-hitarea, .treeview div.lastExpandable-hitarea { background-position: 0; } - -.treeview-red li { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-red-line.gif); } -.treeview-red .hitarea, .treeview-red li.lastCollapsable, .treeview-red li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-red.gif); } - -.treeview-black li { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-black-line.gif); } -.treeview-black .hitarea, .treeview-black li.lastCollapsable, .treeview-black li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-black.gif); } - -.treeview-gray li { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-gray-line.gif); } -.treeview-gray .hitarea, .treeview-gray li.lastCollapsable, .treeview-gray li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-gray.gif); } - -.treeview-famfamfam li { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-famfamfam-line.gif); } -.treeview-famfamfam .hitarea, .treeview-famfamfam li.lastCollapsable, .treeview-famfamfam li.lastExpandable { background-image: url(<?php echo $vars['url']; ?>mod/pages/images/treeview-famfamfam.gif); } - - -.filetree li { padding: 3px 0 2px 16px; } -.filetree span.folder, .filetree span.file { padding: 1px 0 1px 16px; display: block; } -.filetree span.folder { background: url(<?php echo $vars['url']; ?>mod/pages/images/folder.gif) 0 0 no-repeat; } -.filetree li.expandable span.folder { background: url(<?php echo $vars['url']; ?>mod/pages/images/folder-closed.gif) 0 0 no-repeat; } -.filetree span.file { background: url(<?php echo $vars['url']; ?>mod/pages/images/file.gif) 0 0 no-repeat; } - -.pagesTreeContainer { - margin:0; - min-height: 200px; -} - -#pages_page .strapline { - text-align:right; - border-top:1px solid #efefef; - margin:10px 0 10px 0; - color:#666666; -} -#pages_page .categories { - border:none !important; - padding:0 !important; -} - -#pages_page .tags { - padding:0 0 0 16px; - margin:10px 0 4px 0; - background:transparent url(<?php echo $vars['url']; ?>_graphics/icon_tag.gif) no-repeat scroll left 2px; -} - -#pages_page img[align="left"] { - margin: 10px 20px 10px 0; - float:left; -} -#pages_page img[align="right"] { - margin: 10px 0 10px 10px; - float:right; -} - -.pageswelcome p { - margin:0 0 5px 0; -} - -#sidebar_page_tree { - background:white; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - padding:10px; - margin:0 10px 10px 10px; -} -#sidebar_page_tree h3 { - background: none; - border-top: none; - border-bottom: 1px solid #cccccc; - font-size:1.25em; - line-height:1.2em; - margin:0 0 5px 0; - padding:0 0 5px 5px; - color:#0054A7; -} - -/* IE6 */ -* html #pages_welcome_tbl { width:676px !important;} - -.pages_widget_singleitem_more { - margin:0 10px 0 10px; - padding:5px; - display:block; - background:white; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; -} - - +.pages-nav.treeview .hover { + color: #0054a7; +}
\ No newline at end of file diff --git a/mod/pages/views/default/pages/group_module.php b/mod/pages/views/default/pages/group_module.php new file mode 100644 index 000000000..0d7df96ac --- /dev/null +++ b/mod/pages/views/default/pages/group_module.php @@ -0,0 +1,49 @@ +<?php +/** + * Group pages + * + * @package ElggPages + */ + + +$group = elgg_get_page_owner_entity(); + +if ($group->pages_enable == "no") { + return true; +} + +$all_link = elgg_view('output/url', array( + 'href' => "pages/group/$group->guid/all", + 'text' => elgg_echo('link:view:all'), + 'is_trusted' => true, +)); + + +elgg_push_context('widgets'); +$options = array( + 'type' => 'object', + 'subtype' => 'page_top', + 'container_guid' => elgg_get_page_owner_guid(), + 'limit' => 6, + 'full_view' => false, + 'pagination' => false, +); +$content = elgg_list_entities($options); +elgg_pop_context(); + +if (!$content) { + $content = '<p>' . elgg_echo('pages:none') . '</p>'; +} + +$new_link = elgg_view('output/url', array( + 'href' => "pages/add/$group->guid", + 'text' => elgg_echo('pages:add'), + 'is_trusted' => true, +)); + +echo elgg_view('groups/profile/module', array( + 'title' => elgg_echo('pages:group'), + 'content' => $content, + 'all_link' => $all_link, + 'add_link' => $new_link, +)); diff --git a/mod/pages/views/default/pages/groupprofile_pages.php b/mod/pages/views/default/pages/groupprofile_pages.php deleted file mode 100644 index 006a05877..000000000 --- a/mod/pages/views/default/pages/groupprofile_pages.php +++ /dev/null @@ -1,27 +0,0 @@ -<?php - - // pages on the group index page - - //check to make sure this group forum has been activated - if($vars['entity']->pages_enable != 'no'){ - -?> - -<div id="group_pages_widget"> -<h2><?php echo elgg_echo("pages:groupprofile"); ?></h2> -<?php - - $objects = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => 5, 'full_view' => FALSE)); - - if($objects) - echo $objects; - else - echo "<div class=\"forum_latest\">" . elgg_echo("pages:nogroup") . "</div>"; - -?> -<br class="clearfloat" /> -</div> - -<?php - } -?> diff --git a/mod/pages/views/default/pages/icon.php b/mod/pages/views/default/pages/icon.php new file mode 100644 index 000000000..cba034ec4 --- /dev/null +++ b/mod/pages/views/default/pages/icon.php @@ -0,0 +1,25 @@ +<?php +/** + * Page icon + * + * Uses a separate icon view due to dependency on annotation + * + * @package ElggPages + * + * @uses $vars['entity'] + * @uses $vars['annotation'] + */ + +$annotation = $vars['annotation']; +$entity = get_entity($annotation->entity_guid); + +// Get size +if (!in_array($vars['size'], array('small', 'medium', 'large', 'tiny', 'master', 'topbar'))) { + $vars['size'] = "medium"; +} + +?> + +<a href="<?php echo $annotation->getURL(); ?>"> + <img alt="<?php echo $entity->title; ?>" src="<?php echo $entity->getIconURL($vars['size']); ?>" /> +</a> diff --git a/mod/pages/views/default/pages/input/parent.php b/mod/pages/views/default/pages/input/parent.php new file mode 100644 index 000000000..c5ee3c3fb --- /dev/null +++ b/mod/pages/views/default/pages/input/parent.php @@ -0,0 +1,37 @@ +<?php +/** + * Parent picker + * + * @uses $vars['value'] The current value, if any + * @uses $vars['options_values'] + * @uses $vars['name'] The name of the input field + * @uses $vars['entity'] Optional. The child entity (uses container_guid) + */ + +elgg_load_library('elgg:pages'); + +if (empty($vars['entity'])) { + $container = elgg_get_page_owner_entity(); +} else { + $container = $vars['entity']->getContainerEntity(); +} + +$pages = pages_get_navigation_tree($container); +$options = array(); + +foreach ($pages as $page) { + $spacing = ""; + for ($i = 0; $i < $page['depth']; $i++) { + $spacing .= "--"; + } + $options[$page['guid']] = "$spacing " . $page['title']; +} + +$defaults = array( + 'class' => 'elgg-pages-input-parent-picker', + 'options_values' => $options, +); + +$vars = array_merge($defaults, $vars); + +echo elgg_view('input/dropdown', $vars); diff --git a/mod/pages/views/default/pages/metatags.php b/mod/pages/views/default/pages/metatags.php deleted file mode 100644 index 82b291e2c..000000000 --- a/mod/pages/views/default/pages/metatags.php +++ /dev/null @@ -1,22 +0,0 @@ -<?php - - $treeguid = get_input('treeguid'); - if (empty($treeguid)) { - $treeguid = get_input('page_guid'); - } - -?> - - <script type="text/javascript" src="<?php echo $vars['url']; ?>mod/pages/javascript/jquery.treeview.js" ></script> - <script type="text/javascript" src="<?php echo $vars['url']; ?>mod/pages/javascript/jquery.treeview.async.js" ></script> - <script type="text/javascript"> - - $(document).ready( function() { - - $("#pagesTree").treeview({ - url: "<?php echo $vars['url']; ?>mod/pages/pagesTree.php", - currentpage: "<?php echo get_input('page_guid'); ?>" - }, "<?php echo $treeguid; ?>") - - }); - </script> diff --git a/mod/pages/views/default/pages/pagegallery.php b/mod/pages/views/default/pages/pagegallery.php deleted file mode 100644 index 1ff32016d..000000000 --- a/mod/pages/views/default/pages/pagegallery.php +++ /dev/null @@ -1,37 +0,0 @@ -<?php - /** - * Elgg Pages - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ - - $icon = elgg_view( - "graphics/icon", array( - 'entity' => $vars['entity'], - 'size' => 'medium', - ) - ); - - $info = "<div><p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->title . "</a></b></p></div>"; - - - $latest = $vars['entity']->getAnnotations('page', 1, 0, 'desc'); - if ($latest) { - $latest = $latest[0]; - - $time_updated = $latest->time_created; - $owner_guid = $latest->owner_guid; - $owner = get_entity($owner_guid); - - - $info .= "<br /><div>". - strip_tags(substr($latest->value, 0, 100)) - . "</div>"; - } - - echo elgg_view_listing($icon, $info); -?> diff --git a/mod/pages/views/default/pages/pagelisting.php b/mod/pages/views/default/pages/pagelisting.php deleted file mode 100644 index 4da9fd4a2..000000000 --- a/mod/pages/views/default/pages/pagelisting.php +++ /dev/null @@ -1,38 +0,0 @@ -<?php - /** - * Elgg Pages - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ - - $icon = elgg_view( - "graphics/icon", array( - 'entity' => $vars['entity'], - 'size' => 'small', - ) - ); - - $info .= "<p><b><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->title . "</a></b></p>"; - - - $latest = $vars['entity']->getAnnotations('page', 1, 0, 'desc'); - if ($latest) { - $latest = $latest[0]; - - $time_updated = $latest->time_created; - $owner_guid = $latest->owner_guid; - $owner = get_entity($owner_guid); - - - $info .= "<p class=\"owner_timestamp\">".sprintf(elgg_echo("pages:strapline"), - friendly_time($time_updated), - "<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>" - ) . "</p>"; - } - - echo elgg_view_listing($icon, $info); -?> diff --git a/mod/pages/views/default/pages/pageprofile.php b/mod/pages/views/default/pages/pageprofile.php deleted file mode 100644 index b1081d9f7..000000000 --- a/mod/pages/views/default/pages/pageprofile.php +++ /dev/null @@ -1,83 +0,0 @@ -<?php - /** - * Elgg Pages - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ - - // Output body - $entity = $vars['entity']; - - $rev = (int)get_input('rev'); - - if ($rev) - { - $latest = get_annotation($rev); - } - else - { - $latest = $entity->getAnnotations('page', 1, 0, 'desc'); - if ($latest) $latest = $latest[0]; - } - -?> - <div class="contentWrapper"> - <div id="pages_page"> - -<?php - if ($entity) - { - echo elgg_view('output/longtext', array('value' => /*$entity->description*/ $latest->value)); - - $tags = $vars['entity']->tags; - if (!empty($tags)) { - -?> - <!-- display tags --> - <p class="tags"> - <?php - - echo elgg_view('output/tags', array('tags' => $tags)); - - ?> - </p> - -<?php - - } - $cats = elgg_view('categories/view',$vars); - if (!empty($cats)) { - -?> - <p class="categories"> - <?php echo $cats; ?> - </p> -<?php - - } - } - - // last edit & by whome -?> - - <p class="strapline"> - <?php - - $time_updated = $latest->time_created; - $owner_guid = $latest->owner_guid; - $owner = get_entity($owner_guid); - - echo sprintf(elgg_echo("pages:strapline"), - friendly_time($time_updated), - "<a href=\"" . $owner->getURL() . "\">" . $owner->name ."</a>" - ); - - ?> - </p> -</div> - -</div> diff --git a/mod/pages/views/default/pages/sidebar.php b/mod/pages/views/default/pages/sidebar.php new file mode 100644 index 000000000..16fc12de0 --- /dev/null +++ b/mod/pages/views/default/pages/sidebar.php @@ -0,0 +1,14 @@ +<?php +/** + * Pages sidebar + */ + +echo elgg_view('page/elements/comments_block', array( + 'subtypes' => array('page', 'page_top'), + 'owner_guid' => elgg_get_page_owner_guid(), +)); + +echo elgg_view('page/elements/tagcloud_block', array( + 'subtypes' => array('page', 'page_top'), + 'owner_guid' => elgg_get_page_owner_guid(), +));
\ No newline at end of file diff --git a/mod/pages/views/default/pages/sidebar/history.php b/mod/pages/views/default/pages/sidebar/history.php new file mode 100644 index 000000000..e0e8ed11a --- /dev/null +++ b/mod/pages/views/default/pages/sidebar/history.php @@ -0,0 +1,21 @@ +<?php +/** + * History of this page + * + * @uses $vars['page'] + */ + +$title = elgg_echo('pages:history'); + +if ($vars['page']) { + $options = array( + 'guid' => $vars['page']->guid, + 'annotation_name' => 'page', + 'limit' => 20, + 'reverse_order_by' => true + ); + elgg_push_context('widgets'); + $content = elgg_list_annotations($options); +} + +echo elgg_view_module('aside', $title, $content);
\ No newline at end of file diff --git a/mod/pages/views/default/pages/sidebar/navigation.php b/mod/pages/views/default/pages/sidebar/navigation.php new file mode 100644 index 000000000..65eb500c8 --- /dev/null +++ b/mod/pages/views/default/pages/sidebar/navigation.php @@ -0,0 +1,58 @@ +<?php +/** + * Navigation menu for a user's or a group's pages + * + * @uses $vars['page'] Page object if manually setting selected item + */ + +// add the jquery treeview files for navigation +elgg_load_js('jquery-treeview'); +elgg_load_css('jquery-treeview'); + + +$selected_page = elgg_extract('page', $vars, false); +if ($selected_page) { + $url = $selected_page->getURL(); +} + +$title = elgg_echo('pages:navigation'); + +pages_register_navigation_tree(elgg_get_page_owner_entity()); + +$content = elgg_view_menu('pages_nav', array('class' => 'pages-nav')); +if (!$content) { + $content = '<p>' . elgg_echo('pages:none') . '</p>'; +} + +echo elgg_view_module('aside', $title, $content); + +?><?php //@todo JS 1.8: no ?> +<script type="text/javascript"> +$(document).ready(function() { + $(".pages-nav").treeview({ + persist: "location", + collapsed: true, + unique: true + }); + +<?php +if ($selected_page) { + // if on a history page, we need to manually select the correct menu item + // code taken from the jquery.treeview library +?> + var current = $(".pages-nav a[href='<?php echo $url; ?>']"); + var items = current.addClass("selected").parents("ul, li").add( current.next() ).show(); + var CLASSES = $.treeview.classes; + items.filter("li") + .swapClass( CLASSES.collapsable, CLASSES.expandable ) + .swapClass( CLASSES.lastCollapsable, CLASSES.lastExpandable ) + .find(">.hitarea") + .swapClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea ) + .swapClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea ); +<?php +} +?> + +}); + +</script> diff --git a/mod/pages/views/default/pages/sidebar/sidebarthis.php b/mod/pages/views/default/pages/sidebar/sidebarthis.php deleted file mode 100644 index 1c8b77848..000000000 --- a/mod/pages/views/default/pages/sidebar/sidebarthis.php +++ /dev/null @@ -1,92 +0,0 @@ -[<?php - /** - * Elgg Pages - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ - - global $CONFIG; - $entity = $vars['entity']; - $parent = $vars['entity']->parent_guid; - - $currentpage = (int) get_input('currentpage'); - if ($currentpage) { - - $path = pages_get_path($currentpage); - $pathstring = implode(',',$path); - - } else { - $path = array(); - } - - function pages_draw_child($childentity, $path) { - - $child = "\n\t\t{\n"; - $child .= "\t\t\t\"text\": \"<a href=\\\"{$childentity->getURL()}\\\">" . addslashes($childentity->title) . "</a>\"\n"; - - $extras = ""; - $haschild = elgg_get_entities_from_metadata(array('metadata_name' => 'parent_guid', 'metadata_value' => $childentity->guid, 'limit' => 9999)); - if ($haschild) { - if (in_array($childentity->guid,$path)) { - $extras .= "\t\t\t,\"expanded\": true"; - $extras .= "\t\t\t,\"children\": [\n"; - - $childstring = ""; - foreach($haschild as $subchild) { - $childstringtemp = pages_draw_child($subchild,$path); - if (!empty($childstringtemp)) { - if (!empty($childstring)) $childstring .= ", "; - $childstring .= $childstringtemp; - } - } - - $extras .= $childstring . "\n\t\t\t]\n"; - } else { - $extras .= ",\t\t\t\"id\": \"{$childentity->getGUID()}\",\n\t\t\t\"hasChildren\": true\n"; - } - - } - $child .= $extras . "\t\t}"; - return $child; - } - - if (!$parent) { - echo "{\n"; - echo "\t\"text\": \"<a href=\\\"{$vars['entity']->getURL()}\\\">" . addslashes($vars['entity']->title) . "</a>\"\n"; - } - - $children = ""; - $temp = ""; - if (isset($vars['children']) && is_array($vars['children']) && (!isset($vars['fulltree']) || $vars['fulltree'] == 0)) { - if (!$parent) $temp .= "\t" . '"expanded": true,' . "\n"; - if (!$parent) $temp .= "\t" . '"children": [' . "\n"; - foreach($vars['children'] as $child) { - $childrentemp = pages_draw_child($child,$path); - if (!empty($childrentemp)) { - if (!empty($children)) $children .= ", \n"; - $children .= $childrentemp; - } - /* - $children .= "\n\t\t{\n"; - $children .= "\t\t\t\"text\": \"<a href=\\\"{$child->getURL()}\\\">{$child->title}</a>\",\n"; - - $haschild = get_entities_from_metadata('parent_guid',$child->guid,'','',0,10,0,'',0,true); - if ($haschild) { - $children .= "\t\t\t\"id\": \"{$child->getGUID()}\",\n\t\t\t\"hasChildren\": true\n"; - } - $children .= "\t\t}"; - */ - } - if (!empty($temp)) echo ',' . $temp; - echo $children; - if (!$parent) echo "\t\t" . ']' . "\n"; - - } - - if (!$parent) echo "}"; - -?>] diff --git a/mod/pages/views/default/pages/sidebar/starter.php b/mod/pages/views/default/pages/sidebar/starter.php deleted file mode 100644 index edc66e499..000000000 --- a/mod/pages/views/default/pages/sidebar/starter.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php - - if (isset($vars['entity']) && $vars['entity'] instanceof ElggEntity) { - -?> - -<script type="text/javascript"> - - $(document).ready( function() { - - $("#pagetree<?php echo $vars['entity']->getGUID(); ?>").click(); - - }); - -</script> - -<?php - - } - -?> diff --git a/mod/pages/views/default/pages/sidebar/tree.php b/mod/pages/views/default/pages/sidebar/tree.php deleted file mode 100644 index 07de1beb5..000000000 --- a/mod/pages/views/default/pages/sidebar/tree.php +++ /dev/null @@ -1,8 +0,0 @@ -<?php - -?> -<div id="sidebar_page_tree"> - <h3><?php echo elgg_echo("pages:navigation"); ?></h3> - <div id="pagesTree" class="pagesTreeContainer"></div> -</div> -<br class="clearfloat" /> diff --git a/mod/pages/views/default/pages/sidebar/wrapper.php b/mod/pages/views/default/pages/sidebar/wrapper.php deleted file mode 100644 index 2109188cf..000000000 --- a/mod/pages/views/default/pages/sidebar/wrapper.php +++ /dev/null @@ -1,7 +0,0 @@ -<?php - - echo "["; - echo $vars['body']; - echo "]"; - -?> diff --git a/mod/pages/views/default/pages/welcome.php b/mod/pages/views/default/pages/welcome.php deleted file mode 100644 index a390a9d65..000000000 --- a/mod/pages/views/default/pages/welcome.php +++ /dev/null @@ -1,29 +0,0 @@ -<?php - - /** - * Elgg Pages welcome message - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ - - if($vars['entity']){ - - foreach($vars['entity'] as $welcome){ - - echo "<div class=\"contentWrapper pageswelcome\">" . $welcome->description . "</div>"; - - } - - } else { - -?> - -<div class="contentWrapper pageswelcome"><p><?php echo sprintf(elgg_echo('pages:welcomemessage'), $vars['config']->sitename); ?></p></div> - -<?php - } -?> diff --git a/mod/pages/views/default/river/object/page/annotate.php b/mod/pages/views/default/river/object/page/annotate.php deleted file mode 100644 index 4bee26d81..000000000 --- a/mod/pages/views/default/river/object/page/annotate.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php - - $statement = $vars['statement']; - $performed_by = $statement->getSubject(); - $object = $statement->getObject(); - - $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = sprintf(elgg_echo("pages:river:posted"),$url) . " "; - $string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("pages:river:annotate:create") . "</a> " . $object->title; - //$string .= "<div class=\"river_content\">" . $object->title . "</div>"; - -?> - -<?php echo $string; ?> diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php index 00885d154..4c31def33 100644 --- a/mod/pages/views/default/river/object/page/create.php +++ b/mod/pages/views/default/river/object/page/create.php @@ -1,17 +1,13 @@ <?php +/** + * Page river view. + */ - $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); - $object = get_entity($vars['item']->object_guid); - $url = $object->getURL(); +$object = $vars['item']->getObjectEntity(); +$excerpt = strip_tags($object->description); +$excerpt = elgg_get_excerpt($excerpt); - - $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view - $string = sprintf(elgg_echo("pages:river:created"),$url) . " "; - $string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a> <span class='entity_subtext'>". friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>"; - $string .= elgg_view('likes/forms/link', array('entity' => $object)); - $string .= "<div class=\"river_content_display\">"; - $string .= elgg_make_excerpt($contents, 200); - $string .= "</div>"; - - echo $string; +echo elgg_view('river/elements/layout', array( + 'item' => $vars['item'], + 'message' => $excerpt, +));
\ No newline at end of file diff --git a/mod/pages/views/default/river/object/page/update.php b/mod/pages/views/default/river/object/page/update.php deleted file mode 100644 index 2b20a9ed8..000000000 --- a/mod/pages/views/default/river/object/page/update.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php - - $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); - $object = get_entity($vars['item']->object_guid); - $url = $object->getURL(); - - - $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = sprintf(elgg_echo("pages:river:updated"),$url) . " "; - $string .= elgg_echo("pages:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>"; - -?> - -<?php echo $string; ?> diff --git a/mod/pages/views/default/river/object/page_top/annotate.php b/mod/pages/views/default/river/object/page_top/annotate.php deleted file mode 100644 index f3a47e5d9..000000000 --- a/mod/pages/views/default/river/object/page_top/annotate.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php - - $statement = $vars['statement']; - $performed_by = $statement->getSubject(); - $object = $statement->getObject(); - - $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = sprintf(elgg_echo("pages:river:posted"),$url) . " "; - $string .= elgg_echo("pages:river:annotate:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>"; - //$string .= "<div class=\"river_content\">" . $object->title . "</div>"; - -?> - -<?php echo $string; ?> diff --git a/mod/pages/views/default/river/object/page_top/create.php b/mod/pages/views/default/river/object/page_top/create.php index 9427d5caa..b89eed195 100644 --- a/mod/pages/views/default/river/object/page_top/create.php +++ b/mod/pages/views/default/river/object/page_top/create.php @@ -1,14 +1,8 @@ <?php +/** + * Top page create river view. + * + * @package ElggPages + */ - $statement = $vars['statement']; - $performed_by = $statement->getSubject(); - $object = $statement->getObject(); - - $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = sprintf(elgg_echo("pages:river:created"),$url) . " "; - $string .= elgg_echo("pages:river:create") . "<a href=\"" . $object->getURL() . "\">" . $object->title . "</a>"; - //$string .= "<div class=\"river_content\">Page title: " . $object->title . "</div>"; - -?> - -<?php echo $string; ?> +echo elgg_view('river/object/page/create', $vars);
\ No newline at end of file diff --git a/mod/pages/views/default/river/object/page_top/update.php b/mod/pages/views/default/river/object/page_top/update.php deleted file mode 100644 index febe2965d..000000000 --- a/mod/pages/views/default/river/object/page_top/update.php +++ /dev/null @@ -1,14 +0,0 @@ -<?php - - $statement = $vars['statement']; - $performed_by = $statement->getSubject(); - $object = $statement->getObject(); - - $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; - $string = sprintf(elgg_echo("pages:river:updated"),$url) . " "; - $string .= elgg_echo("pages:river:update") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a>"; - //$string .= "<div class=\"river_content\">Title: " . $object->title . "</div>"; - -?> - -<?php echo $string; ?> diff --git a/mod/pages/views/default/widgets/pages/content.php b/mod/pages/views/default/widgets/pages/content.php new file mode 100644 index 000000000..f63777c09 --- /dev/null +++ b/mod/pages/views/default/widgets/pages/content.php @@ -0,0 +1,32 @@ +<?php +/** + * Elgg pages widget + * + * @package ElggPages + */ + +$num = (int) $vars['entity']->pages_num; + +$options = array( + 'type' => 'object', + 'subtype' => 'page_top', + 'container_guid' => $vars['entity']->owner_guid, + 'limit' => $num, + 'full_view' => FALSE, + 'pagination' => FALSE, +); +$content = elgg_list_entities($options); + +echo $content; + +if ($content) { + $url = "pages/owner/" . elgg_get_page_owner_entity()->username; + $more_link = elgg_view('output/url', array( + 'href' => $url, + 'text' => elgg_echo('pages:more'), + 'is_trusted' => true, + )); + echo "<span class=\"elgg-widget-more\">$more_link</span>"; +} else { + echo elgg_echo('pages:none'); +} diff --git a/mod/pages/views/default/widgets/pages/edit.php b/mod/pages/views/default/widgets/pages/edit.php index 6459a0373..f23514380 100644 --- a/mod/pages/views/default/widgets/pages/edit.php +++ b/mod/pages/views/default/widgets/pages/edit.php @@ -1,33 +1,24 @@ <?php +/** + * Elgg pages widget edit + * + * @package ElggPages + */ - /** - * Elgg pages widget edit - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd <info@elgg.com> - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ - +// set default value if (!isset($vars['entity']->pages_num)) { $vars['entity']->pages_num = 4; } -?> -<p> - <?php echo elgg_echo("pages:num"); ?>: - <select name="params[pages_num]"> -<?php +$params = array( + 'name' => 'params[pages_num]', + 'value' => $vars['entity']->pages_num, + 'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10), +); +$dropdown = elgg_view('input/dropdown', $params); -for ($i=1; $i<=10; $i++) { - $selected = ''; - if ($vars['entity']->pages_num == $i) { - $selected = "selected='selected'"; - } - - echo " <option value='{$i}' $selected >{$i}</option>\n"; -} ?> - </select> -</p> +<div> + <?php echo elgg_echo('pages:num'); ?>: + <?php echo $dropdown; ?> +</div> diff --git a/mod/pages/views/default/widgets/pages/view.php b/mod/pages/views/default/widgets/pages/view.php deleted file mode 100644 index d975dcdc0..000000000 --- a/mod/pages/views/default/widgets/pages/view.php +++ /dev/null @@ -1,32 +0,0 @@ -<style type="text/css"> -#pages_widget .pagination { - display:none; -} -</style> -<?php - - /** - * Elgg pages widget edit - * - * @package ElggPages - * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 - * @author Curverider Ltd <info@elgg.com> - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ - - $num_display = (int) $vars['entity']->pages_num; - if (!$num_display) { - $num_display = 4; - } - - $pages = elgg_list_entities(array('types' => 'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => $num_display, 'full_view' => FALSE)); - - if ($pages) { - $pagesurl = $vars['url'] . "pg/pages/owned/" . page_owner_entity()->username; - $pages .= "<div class=\"pages_widget_singleitem_more\"><a href=\"{$pagesurl}\">" . elgg_echo('pages:more') . "</a></div>"; - } - - echo "<div id=\"pages_widget\">" . $pages . "</div>"; - -?> |