From bcfbbf1b7cf2a0c96af1dfe55c919c09eceac916 Mon Sep 17 00:00:00 2001 From: brettp Date: Thu, 15 Jul 2010 17:59:57 +0000 Subject: First pass at standardizing pages. git-svn-id: http://code.elgg.org/elgg/trunk@6716 36083f99-b078-4883-b0ff-0f9b5a30f544 --- mod/pages/views/default/annotation/icon.php | 42 +++--- mod/pages/views/default/annotation/page.php | 60 ++++---- mod/pages/views/default/forms/pages/edit.php | 168 ++++++++++----------- .../views/default/forms/pages/editwelcome.php | 102 ++++++------- .../views/default/icon/object/page/medium.php | 9 +- mod/pages/views/default/icon/object/page/small.php | 9 +- .../views/default/icon/object/page_top/medium.php | 8 +- .../views/default/icon/object/page_top/small.php | 9 +- mod/pages/views/default/object/page.php | 29 ++-- mod/pages/views/default/object/page_top.php | 29 ++-- mod/pages/views/default/pages/breadcrumbs.php | 50 +++--- mod/pages/views/default/pages/css.php | 57 ++++--- .../views/default/pages/groupprofile_pages.php | 23 +-- mod/pages/views/default/pages/metatags.php | 39 ++--- mod/pages/views/default/pages/pagegallery.php | 58 ++++--- mod/pages/views/default/pages/pagelisting.php | 62 ++++---- mod/pages/views/default/pages/pageprofile.php | 83 +++++----- .../views/default/pages/sidebar/sidebarthis.php | 166 ++++++++++---------- mod/pages/views/default/pages/sidebar/starter.php | 16 +- mod/pages/views/default/pages/sidebar/tree.php | 8 +- mod/pages/views/default/pages/sidebar/wrapper.php | 13 +- mod/pages/views/default/pages/welcome.php | 35 ++--- .../views/default/river/object/page/annotate.php | 23 +-- .../views/default/river/object/page/create.php | 31 ++-- .../views/default/river/object/page/update.php | 22 +-- .../default/river/object/page_top/annotate.php | 22 +-- .../views/default/river/object/page_top/create.php | 23 +-- .../views/default/river/object/page_top/update.php | 24 +-- mod/pages/views/default/widgets/pages/edit.php | 23 ++- mod/pages/views/default/widgets/pages/view.php | 46 +++--- 30 files changed, 627 insertions(+), 662 deletions(-) (limited to 'mod/pages/views/default') diff --git a/mod/pages/views/default/annotation/icon.php b/mod/pages/views/default/annotation/icon.php index 3e0195e5f..42d32b021 100644 --- a/mod/pages/views/default/annotation/icon.php +++ b/mod/pages/views/default/annotation/icon.php @@ -1,30 +1,24 @@ 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 = ""; +} - $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 = ""; - } - - ?>
diff --git a/mod/pages/views/default/annotation/page.php b/mod/pages/views/default/annotation/page.php index ecfd0a302..c59c80567 100644 --- a/mod/pages/views/default/annotation/page.php +++ b/mod/pages/views/default/annotation/page.php @@ -1,40 +1,34 @@ entity_guid); - - $icon = elgg_view( - "annotation/icon", array( +/** + * Default page listing? + * + * @package ElggPages + */ + +$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), - - "getURL() . "\">" . $owner->name ."" - ); - - $link = $entity->getURL() . "?rev=" . $annotation->id; - - $info = <<< END - + ) +); + +$owner_guid = $annotation->owner_guid; +$owner = get_entity($owner_guid); + +$rev = sprintf(elgg_echo('pages:revision'), + friendly_time($annotation->time_created), + "getURL() . "\">" . $owner->name ."" +); + +$link = $entity->getURL() . "?rev=" . $annotation->id; + +$info = <<< END +
{$entity->title}
$rev
END; - echo elgg_view_listing($icon, $info); -?> +echo elgg_view_listing($icon, $info); diff --git a/mod/pages/views/default/forms/pages/edit.php b/mod/pages/views/default/forms/pages/edit.php index 2ad454073..2095e4fd8 100644 --- a/mod/pages/views/default/forms/pages/edit.php +++ b/mod/pages/views/default/forms/pages/edit.php @@ -1,106 +1,100 @@ access_id = ACCESS_DEFAULT; - $vars['entity']->write_access_id = ACCESS_DEFAULT; - } else { - $vars['entity']->access_id = 0; - $vars['entity']->write_access_id = 0; - } +$parent_guid = get_input('parent_guid'); +$container_guid = get_input('container_guid'); +if (!$container_guid) { + $container_guid = page_owner(); +} - // 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']; +$new_page = false; +if (!$vars['entity']) { + $new_page = true; - // clear them - unset($_SESSION['page_description']); - unset($_SESSION['page_tags']); - unset($_SESSION['page_read_access']); - unset($_SESSION['page_write_access']); - } + // 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; + } + + // 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']; + + // clear them + unset($_SESSION['page_description']); + unset($_SESSION['page_tags']); + unset($_SESSION['page_read_access']); + unset($_SESSION['page_write_access']); } +} ?>
pages) && sizeof($vars['config']->pages) > 0) - foreach($vars['config']->pages as $shortname => $valtype) { - - $disabled = ""; - - if (!$new_page && ($shortname == 'title')) - { - $disabled = true; - } +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; + } ?> -

- -

+

+ +

-

- -

+

+ +

+

+ -

- - - - - " /> -

+ + + " /> +

-
+
\ No newline at end of file diff --git a/mod/pages/views/default/forms/pages/editwelcome.php b/mod/pages/views/default/forms/pages/editwelcome.php index 39d8d05ca..41721484b 100644 --- a/mod/pages/views/default/forms/pages/editwelcome.php +++ b/mod/pages/views/default/forms/pages/editwelcome.php @@ -1,59 +1,55 @@ description; - $object_guid = $welcome->guid; - $access_id = $welcome->access_id; - } - }else{ - $current_message = ''; - $object_guid = ''; - $access_id = ACCESS_PRIVATE; - } - - $page_owner = $vars['owner']->guid; - +/** + * Welcome page edit form + * + * @package ElggPages + */ + +//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; + ?>
-

- -

-

- -

- - - + +

+

+ +

+ + + + + - //if it is editing, include the object guid - if($object_guid != ''){ - ?> - - - - " /> +" />
diff --git a/mod/pages/views/default/icon/object/page/medium.php b/mod/pages/views/default/icon/object/page/medium.php index 1e5c1538e..bb81a9653 100644 --- a/mod/pages/views/default/icon/object/page/medium.php +++ b/mod/pages/views/default/icon/object/page/medium.php @@ -1,3 +1,8 @@ +/** + * Page icon override medium + * + * @package ElggPages + */ + +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 index 3ccc859f3..55466f539 100644 --- a/mod/pages/views/default/icon/object/page/small.php +++ b/mod/pages/views/default/icon/object/page/small.php @@ -1,3 +1,8 @@ +/** + * Page icon override small + * + * @package ElggPages + */ + +echo $vars['url'] . "mod/pages/images/pages.gif"; \ No newline at end of file diff --git a/mod/pages/views/default/icon/object/page_top/medium.php b/mod/pages/views/default/icon/object/page_top/medium.php index 1e5c1538e..bb5c367b2 100644 --- a/mod/pages/views/default/icon/object/page_top/medium.php +++ b/mod/pages/views/default/icon/object/page_top/medium.php @@ -1,3 +1,9 @@ diff --git a/mod/pages/views/default/icon/object/page_top/small.php b/mod/pages/views/default/icon/object/page_top/small.php index 3ccc859f3..5be6e578d 100644 --- a/mod/pages/views/default/icon/object/page_top/small.php +++ b/mod/pages/views/default/icon/object/page_top/small.php @@ -1,3 +1,8 @@ +/** + * Top Page icon override small + * + * @package ElggPages + */ + +echo $vars['url'] . "mod/pages/images/pages.gif"; diff --git a/mod/pages/views/default/object/page.php b/mod/pages/views/default/object/page.php index 843209609..5b4af5198 100644 --- a/mod/pages/views/default/object/page.php +++ b/mod/pages/views/default/object/page.php @@ -1,21 +1,16 @@ +} \ No newline at end of file diff --git a/mod/pages/views/default/object/page_top.php b/mod/pages/views/default/object/page_top.php index 843209609..6922118c1 100644 --- a/mod/pages/views/default/object/page_top.php +++ b/mod/pages/views/default/object/page_top.php @@ -1,21 +1,16 @@ +} \ No newline at end of file diff --git a/mod/pages/views/default/pages/breadcrumbs.php b/mod/pages/views/default/pages/breadcrumbs.php index a6626ca39..868a3eeb5 100644 --- a/mod/pages/views/default/pages/breadcrumbs.php +++ b/mod/pages/views/default/pages/breadcrumbs.php @@ -1,28 +1,30 @@ wwwroot . "pg/pages/owned/" . get_entity($page_owner)->username; - echo ""; - }else{ - echo " > $parent->title"; - } +$breadcrumbs = ''; -?> +$owner_url = $CONFIG->wwwroot . "pg/pages/owned/" . get_entity($page_owner)->username; +echo ""; +} else { + echo " > $parent->title"; +} \ No newline at end of file diff --git a/mod/pages/views/default/pages/css.php b/mod/pages/views/default/pages/css.php index c396d45f7..78298c6a1 100644 --- a/mod/pages/views/default/pages/css.php +++ b/mod/pages/views/default/pages/css.php @@ -1,15 +1,12 @@ -.treeview, .treeview ul { +.treeview, .treeview ul { padding: 0; margin: 0; list-style: none; @@ -34,7 +31,7 @@ float:none; } -.treeview li { +.treeview li { margin: 0; padding: 3px 0pt 3px 16px; } @@ -53,23 +50,23 @@ .treeview .expandable-hitarea { background-position: -80px -3px; } .treeview li.last { background-position: 0 -1766px } -.treeview li.lastCollapsable, .treeview li.lastExpandable { background-image: url(mod/pages/images/treeview-default.gif); } +.treeview li.lastCollapsable, .treeview li.lastExpandable { background-image: 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(mod/pages/images/treeview-red-line.gif); } -.treeview-red .hitarea, .treeview-red li.lastCollapsable, .treeview-red li.lastExpandable { background-image: url(mod/pages/images/treeview-red.gif); } +.treeview-red .hitarea, .treeview-red li.lastCollapsable, .treeview-red li.lastExpandable { background-image: url(mod/pages/images/treeview-red.gif); } .treeview-black li { background-image: url(mod/pages/images/treeview-black-line.gif); } -.treeview-black .hitarea, .treeview-black li.lastCollapsable, .treeview-black li.lastExpandable { background-image: url(mod/pages/images/treeview-black.gif); } +.treeview-black .hitarea, .treeview-black li.lastCollapsable, .treeview-black li.lastExpandable { background-image: url(mod/pages/images/treeview-black.gif); } .treeview-gray li { background-image: url(mod/pages/images/treeview-gray-line.gif); } -.treeview-gray .hitarea, .treeview-gray li.lastCollapsable, .treeview-gray li.lastExpandable { background-image: url(mod/pages/images/treeview-gray.gif); } +.treeview-gray .hitarea, .treeview-gray li.lastCollapsable, .treeview-gray li.lastExpandable { background-image: url(mod/pages/images/treeview-gray.gif); } .treeview-famfamfam li { background-image: url(mod/pages/images/treeview-famfamfam-line.gif); } -.treeview-famfamfam .hitarea, .treeview-famfamfam li.lastCollapsable, .treeview-famfamfam li.lastExpandable { background-image: url(mod/pages/images/treeview-famfamfam.gif); } +.treeview-famfamfam .hitarea, .treeview-famfamfam li.lastCollapsable, .treeview-famfamfam li.lastExpandable { background-image: url(mod/pages/images/treeview-famfamfam.gif); } .filetree li { padding: 3px 0 2px 16px; } @@ -84,19 +81,19 @@ } #pages_page .strapline { - text-align:right; - border-top:1px solid #efefef; - margin:10px 0 10px 0; - color:#666666; + text-align:right; + border-top:1px solid #efefef; + margin:10px 0 10px 0; + color:#666666; } #pages_page .categories { - border:none !important; - padding:0 !important; + border:none !important; + padding:0 !important; } #pages_page .tags { - padding:0 0 0 16px; - margin:10px 0 4px 0; + padding:0 0 0 16px; + margin:10px 0 4px 0; background:transparent url(_graphics/icon_tag.gif) no-repeat scroll left 2px; } @@ -115,10 +112,10 @@ #sidebar_page_tree { background:white; - -webkit-border-radius: 8px; + -webkit-border-radius: 8px; -moz-border-radius: 8px; - padding:10px; - margin:0 10px 10px 10px; + padding:10px; + margin:0 10px 10px 10px; } #sidebar_page_tree h3 { background: none; @@ -139,8 +136,6 @@ padding:5px; display:block; background:white; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; -} - - + -webkit-border-radius: 8px; + -moz-border-radius: 8px; +} \ No newline at end of file diff --git a/mod/pages/views/default/pages/groupprofile_pages.php b/mod/pages/views/default/pages/groupprofile_pages.php index 006a05877..17c1d87ed 100644 --- a/mod/pages/views/default/pages/groupprofile_pages.php +++ b/mod/pages/views/default/pages/groupprofile_pages.php @@ -1,27 +1,28 @@ pages_enable != 'no'){ +/** + * Page icon override medium + * + * @package ElggPages + */ +//check to make sure this group forum has been activated +if ($vars['entity']->pages_enable != 'no') { ?>

'object', 'subtypes' => 'page_top', 'container_guid' => page_owner(), 'limit' => 5, 'full_view' => FALSE)); - - if($objects) + $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 "
" . elgg_echo("pages:nogroup") . "
"; - + ?>
+ } diff --git a/mod/pages/views/default/pages/metatags.php b/mod/pages/views/default/pages/metatags.php index 82b291e2c..b803a32a5 100644 --- a/mod/pages/views/default/pages/metatags.php +++ b/mod/pages/views/default/pages/metatags.php @@ -1,22 +1,27 @@ - - - + + + diff --git a/mod/pages/views/default/pages/pagegallery.php b/mod/pages/views/default/pages/pagegallery.php index 1ff32016d..0dadb63c2 100644 --- a/mod/pages/views/default/pages/pagegallery.php +++ b/mod/pages/views/default/pages/pagegallery.php @@ -1,37 +1,31 @@ $vars['entity'], - 'size' => 'medium', - ) - ); +$icon = elgg_view( + "graphics/icon", array( + 'entity' => $vars['entity'], + 'size' => 'medium', + ) +); - $info = "

getUrl() . "\">" . $vars['entity']->title . "

"; +$info = "

getUrl() . "\">" . $vars['entity']->title . "

"; - - $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 .= "
". - strip_tags(substr($latest->value, 0, 100)) - . "
"; - } +$latest = $vars['entity']->getAnnotations('page', 1, 0, 'desc'); +if ($latest) { + $latest = $latest[0]; - echo elgg_view_listing($icon, $info); -?> + $time_updated = $latest->time_created; + $owner_guid = $latest->owner_guid; + $owner = get_entity($owner_guid); + + + $info .= "
". + strip_tags(substr($latest->value, 0, 100)) + . "
"; +} + +echo elgg_view_listing($icon, $info); \ No newline at end of file diff --git a/mod/pages/views/default/pages/pagelisting.php b/mod/pages/views/default/pages/pagelisting.php index 4da9fd4a2..4dc5dc3b3 100644 --- a/mod/pages/views/default/pages/pagelisting.php +++ b/mod/pages/views/default/pages/pagelisting.php @@ -1,38 +1,32 @@ $vars['entity'], - 'size' => 'small', - ) - ); +$icon = elgg_view( + "graphics/icon", array( + 'entity' => $vars['entity'], + 'size' => 'small', + ) + ); - $info .= "

getUrl() . "\">" . $vars['entity']->title . "

"; +$info .= "

getUrl() . "\">" . $vars['entity']->title . "

"; - - $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 .= "

".sprintf(elgg_echo("pages:strapline"), - friendly_time($time_updated), - "getURL() . "\">" . $owner->name ."" - ) . "

"; - } - - echo elgg_view_listing($icon, $info); -?> +$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 .= "

".sprintf(elgg_echo("pages:strapline"), + friendly_time($time_updated), + "getURL() . "\">" . $owner->name ."" + ) . "

"; +} + +echo elgg_view_listing($icon, $info); diff --git a/mod/pages/views/default/pages/pageprofile.php b/mod/pages/views/default/pages/pageprofile.php index b1081d9f7..cc3113b4e 100644 --- a/mod/pages/views/default/pages/pageprofile.php +++ b/mod/pages/views/default/pages/pageprofile.php @@ -1,83 +1,74 @@ getAnnotations('page', 1, 0, 'desc'); - if ($latest) $latest = $latest[0]; - } - -?> -
+/** + * Elgg Pages profile + * + * @package ElggPages + */ + +// 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]; +} +?> +
- - /*$entity->description*/ $latest->value)); - + $tags = $vars['entity']->tags; if (!empty($tags)) { - -?> + + ?>

$tags)); - + ?>

- - + + ?>

- + ?>

time_created; $owner_guid = $latest->owner_guid; $owner = get_entity($owner_guid); - + echo sprintf(elgg_echo("pages:strapline"), friendly_time($time_updated), "getURL() . "\">" . $owner->name ."" ); - + ?>

-
+
diff --git a/mod/pages/views/default/pages/sidebar/sidebarthis.php b/mod/pages/views/default/pages/sidebar/sidebarthis.php index 1c8b77848..173ddb91a 100644 --- a/mod/pages/views/default/pages/sidebar/sidebarthis.php +++ b/mod/pages/views/default/pages/sidebar/sidebarthis.php @@ -1,92 +1,88 @@ [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\": \"getURL()}\\\">" . addslashes($childentity->title) . "\"\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; - } +/** + * Side bar page tree. + * + * @package ElggPages + */ + +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\": \"getURL()}\\\">" . addslashes($childentity->title) . "\"\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\": \"getURL()}\\\">" . addslashes($vars['entity']->title) . "\"\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; + + $extras .= $childstring . "\n\t\t\t]\n"; + } else { + $extras .= ",\t\t\t\"id\": \"{$childentity->getGUID()}\",\n\t\t\t\"hasChildren\": true\n"; } - /* - $children .= "\n\t\t{\n"; - $children .= "\t\t\t\"text\": \"getURL()}\\\">{$child->title}\",\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}"; - */ + + } + $child .= $extras . "\t\t}"; + return $child; +} + +if (!$parent) { + echo "{\n"; + echo "\t\"text\": \"getURL()}\\\">" . addslashes($vars['entity']->title) . "\"\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; } - if (!empty($temp)) echo ',' . $temp; - echo $children; - if (!$parent) echo "\t\t" . ']' . "\n"; - + /* + $children .= "\n\t\t{\n"; + $children .= "\t\t\t\"text\": \"getURL()}\\\">{$child->title}\",\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 (!$parent) echo "}"; + if (!empty($temp)) echo ',' . $temp; + echo $children; + if (!$parent) echo "\t\t" . ']' . "\n"; + + } + +if (!$parent) echo "}"; -?>] +?>] \ No newline at end of file diff --git a/mod/pages/views/default/pages/sidebar/starter.php b/mod/pages/views/default/pages/sidebar/starter.php index edc66e499..f533356b3 100644 --- a/mod/pages/views/default/pages/sidebar/starter.php +++ b/mod/pages/views/default/pages/sidebar/starter.php @@ -1,21 +1,19 @@ +} \ No newline at end of file diff --git a/mod/pages/views/default/pages/sidebar/tree.php b/mod/pages/views/default/pages/sidebar/tree.php index 07de1beb5..399caf108 100644 --- a/mod/pages/views/default/pages/sidebar/tree.php +++ b/mod/pages/views/default/pages/sidebar/tree.php @@ -1,8 +1,12 @@
-

+


diff --git a/mod/pages/views/default/pages/sidebar/wrapper.php b/mod/pages/views/default/pages/sidebar/wrapper.php index 2109188cf..93b746eb0 100644 --- a/mod/pages/views/default/pages/sidebar/wrapper.php +++ b/mod/pages/views/default/pages/sidebar/wrapper.php @@ -1,7 +1,10 @@ +echo "["; +echo $vars['body']; +echo "]"; \ No newline at end of file diff --git a/mod/pages/views/default/pages/welcome.php b/mod/pages/views/default/pages/welcome.php index a390a9d65..7802fa5af 100644 --- a/mod/pages/views/default/pages/welcome.php +++ b/mod/pages/views/default/pages/welcome.php @@ -1,29 +1,16 @@ " . $welcome->description . ""; - - } - - } else { - +if($vars['entity']) { + foreach($vars['entity'] as $welcome){ + echo "
" . $welcome->description . "
"; + } +} else { ?> -

sitename); ?>

- +} diff --git a/mod/pages/views/default/river/object/page/annotate.php b/mod/pages/views/default/river/object/page/annotate.php index 4bee26d81..4f913dbaa 100644 --- a/mod/pages/views/default/river/object/page/annotate.php +++ b/mod/pages/views/default/river/object/page/annotate.php @@ -1,14 +1,17 @@ getSubject(); - $object = $statement->getObject(); - - $url = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("pages:river:posted"),$url) . " "; - $string .= "getURL() . "\">" . elgg_echo("pages:river:annotate:create") . " " . $object->title; - //$string .= "
" . $object->title . "
"; +$statement = $vars['statement']; +$performed_by = $statement->getSubject(); +$object = $statement->getObject(); -?> +$url = "getURL()}\">{$performed_by->name}"; +$string = sprintf(elgg_echo("pages:river:posted"),$url) . " "; +$string .= "getURL() . "\">" . elgg_echo("pages:river:annotate:create") . " " . $object->title; +//$string .= "
" . $object->title . "
"; - +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..dc4554404 100644 --- a/mod/pages/views/default/river/object/page/create.php +++ b/mod/pages/views/default/river/object/page/create.php @@ -1,17 +1,22 @@ subject_guid); // $statement->getSubject(); - $object = get_entity($vars['item']->object_guid); - $url = $object->getURL(); +$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); +$object = get_entity($vars['item']->object_guid); +$url = $object->getURL(); - - $url = "getURL()}\">{$performed_by->name}"; - $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") . " getURL() . "\">" . $object->title . " ". friendly_time($object->time_created) ." Comment"; - $string .= elgg_view('likes/forms/link', array('entity' => $object)); - $string .= "
"; - $string .= elgg_make_excerpt($contents, 200); - $string .= "
"; - echo $string; +$url = "getURL()}\">{$performed_by->name}"; +$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") . " getURL() . "\">" . $object->title . " ". friendly_time($object->time_created) ." Comment"; +$string .= elgg_view('likes/forms/link', array('entity' => $object)); +$string .= "
"; +$string .= elgg_make_excerpt($contents, 200); +$string .= "
"; + +echo $string; diff --git a/mod/pages/views/default/river/object/page/update.php b/mod/pages/views/default/river/object/page/update.php index 2b20a9ed8..82b38f315 100644 --- a/mod/pages/views/default/river/object/page/update.php +++ b/mod/pages/views/default/river/object/page/update.php @@ -1,14 +1,16 @@ subject_guid); // $statement->getSubject(); - $object = get_entity($vars['item']->object_guid); - $url = $object->getURL(); +$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); +$object = get_entity($vars['item']->object_guid); +$url = $object->getURL(); - - $url = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("pages:river:updated"),$url) . " "; - $string .= elgg_echo("pages:river:update") . " getURL() . "\">" . $object->title . ""; - -?> +$url = "getURL()}\">{$performed_by->name}"; +$string = sprintf(elgg_echo("pages:river:updated"),$url) . " "; +$string .= elgg_echo("pages:river:update") . " getURL() . "\">" . $object->title . ""; - +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 index f3a47e5d9..43270f736 100644 --- a/mod/pages/views/default/river/object/page_top/annotate.php +++ b/mod/pages/views/default/river/object/page_top/annotate.php @@ -1,14 +1,16 @@ getSubject(); - $object = $statement->getObject(); - - $url = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("pages:river:posted"),$url) . " "; - $string .= elgg_echo("pages:river:annotate:create") . " getURL() . "\">" . $object->title . ""; - //$string .= "
" . $object->title . "
"; +$statement = $vars['statement']; +$performed_by = $statement->getSubject(); +$object = $statement->getObject(); -?> +$url = "getURL()}\">{$performed_by->name}"; +$string = sprintf(elgg_echo("pages:river:posted"),$url) . " "; +$string .= elgg_echo("pages:river:annotate:create") . " getURL() . "\">" . $object->title . ""; - +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..d49f3d5c4 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,15 @@ getSubject(); - $object = $statement->getObject(); - - $url = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("pages:river:created"),$url) . " "; - $string .= elgg_echo("pages:river:create") . "getURL() . "\">" . $object->title . ""; - //$string .= "
Page title: " . $object->title . "
"; +$statement = $vars['statement']; +$performed_by = $statement->getSubject(); +$object = $statement->getObject(); -?> - - +$url = "getURL()}\">{$performed_by->name}"; +$string = sprintf(elgg_echo("pages:river:created"),$url) . " "; +$string .= elgg_echo("pages:river:create") . "getURL() . "\">" . $object->title . ""; +echo $string; \ 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 index febe2965d..6187f54bc 100644 --- a/mod/pages/views/default/river/object/page_top/update.php +++ b/mod/pages/views/default/river/object/page_top/update.php @@ -1,14 +1,16 @@ getSubject(); - $object = $statement->getObject(); - - $url = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("pages:river:updated"),$url) . " "; - $string .= elgg_echo("pages:river:update") . " getURL() . "\">" . $object->title . ""; - //$string .= "
Title: " . $object->title . "
"; - -?> +$statement = $vars['statement']; +$performed_by = $statement->getSubject(); +$object = $statement->getObject(); - +$url = "getURL()}\">{$performed_by->name}"; +$string = sprintf(elgg_echo("pages:river:updated"),$url) . " "; +$string .= elgg_echo("pages:river:update") . " getURL() . "\">" . $object->title . ""; + +echo $string; \ No newline at end of file diff --git a/mod/pages/views/default/widgets/pages/edit.php b/mod/pages/views/default/widgets/pages/edit.php index 6459a0373..4ddfec428 100644 --- a/mod/pages/views/default/widgets/pages/edit.php +++ b/mod/pages/views/default/widgets/pages/edit.php @@ -1,14 +1,9 @@ - * @copyright Curverider Ltd 2008-2010 - * @link http://elgg.com/ - */ +/** + * Elgg pages widget edit + * + * @package ElggPages + */ if (!isset($vars['entity']->pages_num)) { $vars['entity']->pages_num = 4; @@ -16,10 +11,10 @@ if (!isset($vars['entity']->pages_num)) { ?>

- : - +pages_num == $i) { @@ -29,5 +24,5 @@ for ($i=1; $i<=10; $i++) { echo " \n"; } ?> - +

diff --git a/mod/pages/views/default/widgets/pages/view.php b/mod/pages/views/default/widgets/pages/view.php index d975dcdc0..5428b89a1 100644 --- a/mod/pages/views/default/widgets/pages/view.php +++ b/mod/pages/views/default/widgets/pages/view.php @@ -1,32 +1,28 @@ - * @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 .= "
" . elgg_echo('pages:more') . "
"; - } +/** + * Elgg pages widget edit + * + * @package ElggPages + * @link http://elgg.com/ + */ - echo "
" . $pages . "
"; - -?> +$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 .= "
" . elgg_echo('pages:more') . "
"; +} + +echo "
" . $pages . "
"; \ No newline at end of file -- cgit v1.2.3