diff options
Diffstat (limited to 'mod/bookmarks/views')
17 files changed, 282 insertions, 415 deletions
diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php index bb2cf885e..b3e9737fe 100644 --- a/mod/bookmarks/views/default/bookmarks/bookmarklet.php +++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php @@ -1,33 +1,35 @@ <?php /** - * Elgg get bookmarks bookmarklet view - * - * @package ElggBookmarks + * Bookmarklet + * + * @package Bookmarks */ $page_owner = elgg_get_page_owner_entity(); -$bookmarktext = elgg_echo("bookmarks:this"); if ($page_owner instanceof ElggGroup) { - $bookmarktext = elgg_echo("bookmarks:this:group", array($page_owner->name)); - $name = "group:$page_owner->guid"; + $title = elgg_echo("bookmarks:this:group", array($page_owner->name)); } else { - $name = $page_owner->username; + $title = elgg_echo("bookmarks:this"); } -if (!$name && ($user = get_loggedin_user())) { +$guid = $page_owner->getGUID(); + +if (!$name && ($user = elgg_get_logged_in_user_entity())) { $name = $user->username; } +$url = elgg_get_site_url(); +$img = elgg_view('output/img', array( + 'src' => 'mod/bookmarks/graphics/bookmarklet.gif', + 'alt' => $title, +)); +$bookmarklet = "<a href=\"javascript:location.href='{$url}bookmarks/add/$guid?address='" + . "+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)\">" + . $img . "</a>"; + ?> -<h3><?php echo elgg_echo('bookmarks:browser_bookmarklet')?></h3> -<a href="javascript:location.href='<?php echo elgg_get_site_url(); ?>pg/bookmarks/<?php echo $name; ?>/add?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)"> <img src="<?php echo elgg_get_site_url(); ?>_graphics/elgg_bookmarklet.gif" border="0" title="<?php echo elgg_echo('bookmarks:this');?>" /> </a> -<br /> -<div class="elgg-discover"> - <a class="link">Instructions</a> - <div class="elgg-discoverable"> - <p><?php echo elgg_echo("bookmarks:bookmarklet:description"); ?></p> - <p><?php echo elgg_echo("bookmarks:bookmarklet:descriptionie"); ?></p> - <p><?php echo elgg_echo("bookmarks:bookmarklet:description:conclusion"); ?></p> - </div> -</div>
\ No newline at end of file +<p><?php echo elgg_echo("bookmarks:bookmarklet:description"); ?></p> +<p><?php echo $bookmarklet; ?></p> +<p><?php echo elgg_echo("bookmarks:bookmarklet:descriptionie"); ?></p> +<p><?php echo elgg_echo("bookmarks:bookmarklet:description:conclusion"); ?></p> diff --git a/mod/bookmarks/views/default/bookmarks/css.php b/mod/bookmarks/views/default/bookmarks/css.php new file mode 100644 index 000000000..0d734c847 --- /dev/null +++ b/mod/bookmarks/views/default/bookmarks/css.php @@ -0,0 +1,3 @@ +.elgg-icon-bookmark { + background: transparent url(<?php echo elgg_get_site_url();?>mod/bookmarks/graphics/bookmark.gif); +}
\ No newline at end of file diff --git a/mod/bookmarks/views/default/bookmarks/form.php b/mod/bookmarks/views/default/bookmarks/form.php deleted file mode 100644 index 2131f7cd8..000000000 --- a/mod/bookmarks/views/default/bookmarks/form.php +++ /dev/null @@ -1,133 +0,0 @@ -<?php - -/** -* Elgg bookmarks plugin form -* -* @package ElggBookmarks -*/ - -if(isset($vars['entity'])){ - $guid = $vars['entity']->guid; - $title = $vars['entity']->title; - $description = $vars['entity']->description; - $address = $vars['entity']->address; - $tags = $vars['entity']->tags; - $access_id = $vars['entity']->access_id; - $shares = $vars['entity']->shares; - $owner = $vars['entity']->getOwnerEntity(); - $highlight = 'default'; - -} else { - $guid = 0; - $title = get_input('title',""); - $title = stripslashes($title); // strip slashes from URL encoded apostrophes - $description = ""; - $address = get_input('address',""); - $highlight = 'all'; - - if ($address == "previous") - $address = $_SERVER['HTTP_REFERER']; - $tags = array(); - - if (defined('ACCESS_DEFAULT')) { - $access_id = ACCESS_DEFAULT; - } else { - $access_id = 0; - } - $shares = array(); - $owner = page_owner_entity(); -} - -?> -<div class="contentWrapper"> -<form action="<?php echo $vars['url']; ?>action/bookmarks/add" method="post"> -<?php echo elgg_view('input/securitytoken'); ?> -<p> - <label> - <?php echo elgg_echo('title'); ?> - <?php - - echo elgg_view('input/text',array( - 'internalname' => 'title', - 'value' => $title, - )); - - ?> - </label> -</p> -<p> - <label> - <?php echo elgg_echo('bookmarks:address'); ?> - <?php - - echo elgg_view('input/url',array( - 'internalname' => 'address', - 'value' => $address, - )); - - ?> - </label> -</p> -<p class="longtext_editarea"> - <label> - <?php echo elgg_echo('description'); ?> - <br /> - <?php - - echo elgg_view('input/longtext',array( - 'internalname' => 'description', - 'value' => $description, - )); - - ?> - </label> -</p> -<p> - <label> - <?php echo elgg_echo('tags'); ?> - <?php - - echo elgg_view('input/tags',array( - 'internalname' => 'tags', - 'value' => $tags, - )); - - ?> - </label> -</p> - <?php - - //echo elgg_view('bookmarks/sharing',array('shares' => $shares, 'owner' => $owner)); - if ($friends = elgg_get_entities_from_relationship(array('relationship' => 'friend', 'relationship_guid' => $owner->getGUID(), 'inverse_relationship' => FALSE, 'type' => 'user', 'limit' => 9999))) { -?> -<p> - <label><?php echo elgg_echo("bookmarks:with"); ?></label><br /> -<?php - echo elgg_view('friends/picker',array('entities' => $friends, 'internalname' => 'shares', 'highlight' => $highlight)); -?> -</p> -<?php - } - - ?> -<p> - <label> - <?php echo elgg_echo('access'); ?> - <?php - - echo elgg_view('input/access',array( - 'internalname' => 'access', - 'value' => $access_id, - )); - - ?> - </label> -</p> -<p> - <?php echo $vars['container_guid'] ? elgg_view('input/hidden', array('internalname' => 'container_guid', 'value' => $vars['container_guid'])) : ""; ?> - <input type="hidden" name="bookmark_guid" value="<?php echo $guid; ?>" /> - <input type="submit" value="<?php echo elgg_echo('save'); ?>" /> -</p> - -</form> -</div>
\ No newline at end of file diff --git a/mod/bookmarks/views/default/bookmarks/group_module.php b/mod/bookmarks/views/default/bookmarks/group_module.php new file mode 100644 index 000000000..60a727819 --- /dev/null +++ b/mod/bookmarks/views/default/bookmarks/group_module.php @@ -0,0 +1,47 @@ +<?php +/** + * List most recent bookmarks on group profile page + * + * @package Bookmarks + */ + +$group = elgg_get_page_owner_entity(); + +if ($group->bookmarks_enable == "no") { + return true; +} + +$all_link = elgg_view('output/url', array( + 'href' => "bookmarks/group/$group->guid/all", + 'text' => elgg_echo('link:view:all'), + 'is_trusted' => true, +)); + +elgg_push_context('widgets'); +$options = array( + 'type' => 'object', + 'subtype' => 'bookmarks', + '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('bookmarks:none') . '</p>'; +} + +$new_link = elgg_view('output/url', array( + 'href' => "bookmarks/add/$group->guid", + 'text' => elgg_echo('bookmarks:add'), + 'is_trusted' => true, +)); + +echo elgg_view('groups/profile/module', array( + 'title' => elgg_echo('bookmarks:group'), + 'content' => $content, + 'all_link' => $all_link, + 'add_link' => $new_link, +)); diff --git a/mod/bookmarks/views/default/bookmarks/groupprofile_bookmarks.php b/mod/bookmarks/views/default/bookmarks/groupprofile_bookmarks.php deleted file mode 100644 index ad8095d11..000000000 --- a/mod/bookmarks/views/default/bookmarks/groupprofile_bookmarks.php +++ /dev/null @@ -1,34 +0,0 @@ -<?php - -/** - * List most recent bookmarks on group profile page - */ - -if ($vars['entity']->bookmarks_enable != 'no') { -?> - -<div class="group_widget"> -<h2><?php echo elgg_echo('bookmarks:group'); ?></h2> -<?php - $context = get_context(); - set_context('search'); - $content = elgg_list_entities(array('types' => 'object', - 'subtypes' => 'bookmarks', - 'container_guid' => $vars['entity']->guid, - 'limit' => 5, - 'full_view' => FALSE, - 'pagination' => FALSE)); - set_context($context); - - if ($content) { - echo $content; - - $more_url = "{$vars['url']}pg/bookmarks/owner/group:{$vars['entity']->guid}/"; - echo "<div class=\"forum_latest\"><a href=\"$more_url\">" . elgg_echo('bookmarks:more') . "</a></div>"; - } else { - echo "<div class=\"forum_latest\">" . elgg_echo("bookmarks:nogroup") . "</div>"; - } -?> -</div> -<?php -}
\ No newline at end of file diff --git a/mod/bookmarks/views/default/bookmarks/js.php b/mod/bookmarks/views/default/bookmarks/js.php new file mode 100644 index 000000000..c36823c09 --- /dev/null +++ b/mod/bookmarks/views/default/bookmarks/js.php @@ -0,0 +1,12 @@ + +elgg.provide('elgg.bookmarks'); + +elgg.bookmarks.init = function() { + // append the title to the url + var title = document.title; + var e = $('a.elgg-bookmark-page'); + var link = e.attr('href') + '&title=' + encodeURIComponent(title); + e.attr('href', link); +}; + +elgg.register_hook_handler('init', 'system', elgg.bookmarks.init); diff --git a/mod/bookmarks/views/default/bookmarks/owner_block.php b/mod/bookmarks/views/default/bookmarks/owner_block.php deleted file mode 100644 index 654ff9152..000000000 --- a/mod/bookmarks/views/default/bookmarks/owner_block.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php - -$label = elgg_echo('bookmarks:this'); -$user = get_loggedin_user(); -$url = "'" . $vars['url'] . "pg/bookmarks/add/{$user->username}?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)"; - -?> -<div id="owner_block_bookmark_this"> -<a href="javascript:location.href=<?php echo $url; ?>"><?php echo $label ?></a> -</div> diff --git a/mod/bookmarks/views/default/bookmarks/sharing.php b/mod/bookmarks/views/default/bookmarks/sharing.php deleted file mode 100644 index 63738d94d..000000000 --- a/mod/bookmarks/views/default/bookmarks/sharing.php +++ /dev/null @@ -1,80 +0,0 @@ -<?php - - $owner = $vars['owner']; - if ($friends = elgg_get_entities_from_relationship(array('relationship' => 'friend', 'relationship_guid' => $owner->getGUID(), 'inverse_relationship' => FALSE, 'type' => 'user', 'limit' => 9999))) { - -?> - -<table border="0" cellspacing="0" cellpadding="0"> - -<?php - - $col = 0; - foreach($friends as $friend) { - - if ($col == 0) echo "<tr>"; - - $label = elgg_view("profile/icon",array('entity' => $friend, 'size' => 'tiny')); - $options[$label] = $friend->getGUID(); - -?> - - <td> - - <input type="checkbox" name="shares[]" value="<?php echo $options[$label]; ?>" /> - - </td> - - <td > - - <div style="width: 25px; margin-bottom: 15px;"> - <?php - - echo $label; - - ?> - </div> - </td> - <td style="width: 300px; padding: 5px;"> - <?php - - echo $friend->name; - - ?> - </td> -<?php - - - $col++; - - if ($col == 3) { - - $col = 0; - echo "</tr>"; - - } - - - } - if ($col != 3) { - echo "</tr>"; - } - - -?> - -</table> - -<?php - - /*echo elgg_view('input/checkboxes',array( - - 'internalname' => 'shares', - 'options' => $options, - 'value' => $vars['shares'], - - )); */ - - } - -?>
\ No newline at end of file diff --git a/mod/bookmarks/views/default/bookmarks/sidebar.php b/mod/bookmarks/views/default/bookmarks/sidebar.php new file mode 100644 index 000000000..811284ef3 --- /dev/null +++ b/mod/bookmarks/views/default/bookmarks/sidebar.php @@ -0,0 +1,14 @@ +<?php +/** + * Bookmarks sidebar + */ + +echo elgg_view('page/elements/comments_block', array( + 'subtypes' => 'bookmarks', + 'owner_guid' => elgg_get_page_owner_guid(), +)); + +echo elgg_view('page/elements/tagcloud_block', array( + 'subtypes' => 'bookmarks', + 'owner_guid' => elgg_get_page_owner_guid(), +)); diff --git a/mod/bookmarks/views/default/forms/bookmarks/save.php b/mod/bookmarks/views/default/forms/bookmarks/save.php new file mode 100644 index 000000000..7d064a55b --- /dev/null +++ b/mod/bookmarks/views/default/forms/bookmarks/save.php @@ -0,0 +1,59 @@ +<?php +/** + * Edit / add a bookmark + * + * @package Bookmarks + */ + +// once elgg_view stops throwing all sorts of junk into $vars, we can use extract() +$title = elgg_extract('title', $vars, ''); +$desc = elgg_extract('description', $vars, ''); +$address = elgg_extract('address', $vars, ''); +$tags = elgg_extract('tags', $vars, ''); +$access_id = elgg_extract('access_id', $vars, ACCESS_DEFAULT); +$container_guid = elgg_extract('container_guid', $vars); +$guid = elgg_extract('guid', $vars, null); +$shares = elgg_extract('shares', $vars, array()); + +?> +<div> + <label><?php echo elgg_echo('title'); ?></label><br /> + <?php echo elgg_view('input/text', array('name' => 'title', 'value' => $title)); ?> +</div> +<div> + <label><?php echo elgg_echo('bookmarks:address'); ?></label><br /> + <?php echo elgg_view('input/text', array('name' => 'address', 'value' => $address)); ?> +</div> +<div> + <label><?php echo elgg_echo('description'); ?></label> + <?php echo elgg_view('input/longtext', array('name' => 'description', 'value' => $desc)); ?> +</div> +<div> + <label><?php echo elgg_echo('tags'); ?></label> + <?php echo elgg_view('input/tags', array('name' => 'tags', 'value' => $tags)); ?> +</div> +<?php + +$categories = elgg_view('input/categories', $vars); +if ($categories) { + echo $categories; +} + +?> +<div> + <label><?php echo elgg_echo('access'); ?></label><br /> + <?php echo elgg_view('input/access', array('name' => 'access_id', 'value' => $access_id)); ?> +</div> +<div class="elgg-foot"> +<?php + +echo elgg_view('input/hidden', array('name' => 'container_guid', 'value' => $container_guid)); + +if ($guid) { + echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $guid)); +} + +echo elgg_view('input/submit', array('value' => elgg_echo("save"))); + +?> +</div>
\ No newline at end of file diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php index 7d2370c19..83bae2b13 100644 --- a/mod/bookmarks/views/default/object/bookmarks.php +++ b/mod/bookmarks/views/default/object/bookmarks.php @@ -5,27 +5,28 @@ * @package ElggBookmarks */ -$full = elgg_get_array_value('full', $vars, FALSE); -$bookmark = elgg_get_array_value('entity', $vars, FALSE); +$full = elgg_extract('full_view', $vars, FALSE); +$bookmark = elgg_extract('entity', $vars, FALSE); if (!$bookmark) { return; } $owner = $bookmark->getOwnerEntity(); +$owner_icon = elgg_view_entity_icon($owner, 'tiny'); $container = $bookmark->getContainerEntity(); -$categories = elgg_view('categories/view', $vars); +$categories = elgg_view('output/categories', $vars); -$link = filter_tags(elgg_view('output/url', array('href' => $bookmark->address))); +$link = elgg_view('output/url', array('href' => $bookmark->address)); $description = elgg_view('output/longtext', array('value' => $bookmark->description, 'class' => 'pbl')); $owner_link = elgg_view('output/url', array( - 'href' => "pg/file/owner/$owner->username", + 'href' => "bookmarks/owner/$owner->username", 'text' => $owner->name, + 'is_trusted' => true, )); -$author_text = elgg_echo('blog:author_by_line', array($owner_link)); +$author_text = elgg_echo('byline', array($owner_link)); -$tags = elgg_view('output/tags', array('tags' => $bookmark->tags)); $date = elgg_view_friendly_time($bookmark->time_created); $comments_count = $bookmark->countComments(); @@ -35,17 +36,20 @@ if ($comments_count != 0) { $comments_link = elgg_view('output/url', array( 'href' => $bookmark->getURL() . '#comments', 'text' => $text, + 'is_trusted' => true, )); } else { $comments_link = ''; } -$metadata = elgg_view('layout/objects/list/metadata', array( - 'entity' => $bookmark, +$metadata = elgg_view_menu('entity', array( + 'entity' => $vars['entity'], 'handler' => 'bookmarks', + 'sort_by' => 'priority', + 'class' => 'elgg-menu-hz', )); -$subtitle = "$author_text $date $categories $comments_link"; +$subtitle = "$author_text $date $comments_link $categories"; // do not show the metadata and controls in widget view if (elgg_in_context('widgets')) { @@ -53,36 +57,46 @@ if (elgg_in_context('widgets')) { } if ($full && !elgg_in_context('gallery')) { - $header = elgg_view_title($bookmark->title); $params = array( 'entity' => $bookmark, 'title' => false, 'metadata' => $metadata, 'subtitle' => $subtitle, - 'tags' => $tags, ); - $bookmark_info = elgg_view('layout/objects/list/body', $params); + $params = $params + $vars; + $summary = elgg_view('object/elements/summary', $params); - echo <<<HTML -$header -$bookmark_info -<div class="bookmark elgg-content"> - <span class="elgg-icon elgg-icon-following"></span><h3 class="pbl">$link</h3> + $bookmark_icon = elgg_view_icon('push-pin-alt'); + $body = <<<HTML +<div class="bookmark elgg-content mts"> + $bookmark_icon<span class="elgg-heading-basic mbs">$link</span> $description </div> HTML; + echo elgg_view('object/elements/full', array( + 'entity' => $bookmark, + 'icon' => $owner_icon, + 'summary' => $summary, + 'body' => $body, + )); + } elseif (elgg_in_context('gallery')) { - echo '<div class="bookmarks-gallery-item">'; - echo "<h3>" . $bookmark->title . "</h3>"; - echo "<p class='subtitle'>$owner_link $date</p>"; - echo '</div>'; + echo <<<HTML +<div class="bookmarks-gallery-item"> + <h3>$bookmark->title</h3> + <p class='subtitle'>$owner_link $date</p> +</div> +HTML; } else { // brief view $url = $bookmark->address; $display_text = $url; $excerpt = elgg_get_excerpt($bookmark->description); + if ($excerpt) { + $excerpt = " - $excerpt"; + } if (strlen($url) > 25) { $bits = parse_url($url); @@ -93,20 +107,21 @@ HTML; } } - $link = filter_tags(elgg_view('output/url', array( + $link = elgg_view('output/url', array( 'href' => $bookmark->address, - 'text' => $display_text - ))); + 'text' => $display_text, + )); - $content = "<span class=\"elgg-icon elgg-icon-following\"></span>$link - $excerpt"; + $content = elgg_view_icon('push-pin-alt') . "$link{$excerpt}"; $params = array( 'entity' => $bookmark, 'metadata' => $metadata, 'subtitle' => $subtitle, - 'tags' => $tags, 'content' => $content, ); - - echo elgg_view('layout/objects/list/body', $params); -}
\ No newline at end of file + $params = $params + $vars; + $body = elgg_view('object/elements/summary', $params); + + echo elgg_view_image_block($owner_icon, $body); +} diff --git a/mod/bookmarks/views/default/river/object/bookmarks/annotate.php b/mod/bookmarks/views/default/river/object/bookmarks/annotate.php deleted file mode 100644 index 8db8a6581..000000000 --- a/mod/bookmarks/views/default/river/object/bookmarks/annotate.php +++ /dev/null @@ -1,10 +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("bookmarks:river:annotate"),$url) . " "; -$string .= "<a href=\"" . $object->getURL() . "\">" . elgg_echo("bookmarks:river:item") . "</a>"; - -echo $string;
\ No newline at end of file diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php index 82ea75af7..388f54ac9 100644 --- a/mod/bookmarks/views/default/river/object/bookmarks/create.php +++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php @@ -1,10 +1,15 @@ <?php -$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); -$object = get_entity($vars['item']->object_guid); -$url = $object->getURL(); +/** + * New bookmarks river entry + * + * @package Bookmarks + */ -$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; -$string = sprintf(elgg_echo("bookmarks:river:created"),$url) . " "; -$string .= "<a href=\"" . $object->getURL() . "\">" . $object->title . "</a>"; //elgg_echo("bookmarks:river:item") . "</a>"; +$object = $vars['item']->getObjectEntity(); +$excerpt = elgg_get_excerpt($object->description); -echo $string; +echo elgg_view('river/elements/layout', array( + 'item' => $vars['item'], + 'message' => $excerpt, + 'attachments' => elgg_view('output/url', array('href' => $object->address)), +)); diff --git a/mod/bookmarks/views/default/widgets/bookmarks/content.php b/mod/bookmarks/views/default/widgets/bookmarks/content.php new file mode 100644 index 000000000..0b85017fc --- /dev/null +++ b/mod/bookmarks/views/default/widgets/bookmarks/content.php @@ -0,0 +1,32 @@ +<?php +/** + * Elgg bookmarks widget + * + * @package Bookmarks + */ + +$max = (int) $vars['entity']->num_display; + +$options = array( + 'type' => 'object', + 'subtype' => 'bookmarks', + 'container_guid' => $vars['entity']->owner_guid, + 'limit' => $max, + 'full_view' => FALSE, + 'pagination' => FALSE, +); +$content = elgg_list_entities($options); + +echo $content; + +if ($content) { + $url = "bookmarks/owner/" . elgg_get_page_owner_entity()->username; + $more_link = elgg_view('output/url', array( + 'href' => $url, + 'text' => elgg_echo('bookmarks:more'), + 'is_trusted' => true, + )); + echo "<span class=\"elgg-widget-more\">$more_link</span>"; +} else { + echo elgg_echo('bookmarks:none'); +} diff --git a/mod/bookmarks/views/default/widgets/bookmarks/edit.php b/mod/bookmarks/views/default/widgets/bookmarks/edit.php index edb6afdf2..ed9c7fd88 100644 --- a/mod/bookmarks/views/default/widgets/bookmarks/edit.php +++ b/mod/bookmarks/views/default/widgets/bookmarks/edit.php @@ -1,28 +1,24 @@ <?php /** * Elgg bookmark widget edit view - * - * @package ElggBookmarks + * + * @package Bookmarks */ // set default value if (!isset($vars['entity']->num_display)) { $vars['entity']->num_display = 4; } -?> -<p> - <?php echo elgg_echo('bookmarks:numbertodisplay'); ?>: - <select name="params[num_display]"> -<?php -for ($i=1; $i<=10; $i++) { - $selected = ''; - if ($vars['entity']->num_display == $i) { - $selected = "selected='selected'"; - } +$params = array( + 'name' => 'params[num_display]', + 'value' => $vars['entity']->num_display, + 'options' => array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10), +); +$dropdown = elgg_view('input/dropdown', $params); - echo " <option value='{$i}' $selected >{$i}</option>\n"; -} ?> - </select> -</p>
\ No newline at end of file +<div> + <?php echo elgg_echo('bookmarks:numbertodisplay'); ?>: + <?php echo $dropdown; ?> +</div> diff --git a/mod/bookmarks/views/default/widgets/bookmarks/view.php b/mod/bookmarks/views/default/widgets/bookmarks/view.php deleted file mode 100644 index f9bbf5488..000000000 --- a/mod/bookmarks/views/default/widgets/bookmarks/view.php +++ /dev/null @@ -1,65 +0,0 @@ - -<script type="text/javascript"> -$(document).ready(function () { - $('a.share_more_info').click(function () { - $(this.parentNode).children("[class=share_desc]").slideToggle("fast"); - return false; - }); -}); /* end document ready function */ -</script> - -<?php - -//get the num of shares the user want to display -$num = $vars['entity']->num_display; - -//if no number has been set, default to 4 -if(!$num) - $num = 4; - -//grab the users bookmarked items -$shares = elgg_get_entities(array('types' => 'object', 'subtypes' => 'bookmarks', 'container_guid' => $vars['entity']->owner_guid, 'limit' => $num, 'offset' => 0)); - -if($shares){ - - foreach($shares as $s){ - - //get the owner - $owner = $s->getOwnerEntity(); - - //get the time - $friendlytime = elgg_view_friendly_time($s->time_created); - - //get the user icon - $icon = elgg_view( - "profile/icon", array( - 'entity' => $owner, - 'size' => 'tiny', - ) - ); - - //get the bookmark title - $info = "<p class=\"shares_title\"><a href=\"{$s->getURL()}\">{$s->title}</a></p>"; - - //get the user details - $info .= "<p class=\"shares_timestamp\"><small><a href=\"{$owner->getURL()}\">{$owner->name}</a> {$friendlytime}</small></p>"; - - //get the bookmark description - if($s->description) - $info .= "<a href=\"javascript:void(0);\" class=\"share_more_info\">".elgg_echo('bookmarks:more')."</a><br /><div class=\"share_desc\"><p>{$s->description}</p></div>"; - - //display - echo "<div class=\"shares_widget_wrapper\">"; - echo "<div class=\"shares_widget_icon\">" . $icon . "</div>"; - echo "<div class=\"shares_widget_content\">" . $info . "</div>"; - echo "</div>"; - - } - - $user_inbox = $vars['url'] . "pg/bookmarks/owner/" . page_owner_entity()->username; - echo "<div class=\"widget_more_wrapper\"><a href=\"{$user_inbox}\">".elgg_echo('bookmarks:morebookmarks')."</a></div>"; - -} - - -?>
\ No newline at end of file diff --git a/mod/bookmarks/views/rss/object/bookmarks.php b/mod/bookmarks/views/rss/object/bookmarks.php index 8e88485f1..1abda4710 100644 --- a/mod/bookmarks/views/rss/object/bookmarks.php +++ b/mod/bookmarks/views/rss/object/bookmarks.php @@ -1,23 +1,37 @@ <?php /** - * Elgg bookmark rss view - * + * Bookmark RSS object view + * * @package ElggBookmarks */ $title = $vars['entity']->title; if (empty($title)) { - $title = substr($vars['entity']->description,0,32); - if (strlen($vars['entity']->description) > 32) - $title .= " ..."; + $title = strip_tags($vars['entity']->description); + $title = elgg_get_excerpt($title, 32); } -?> +$permalink = htmlspecialchars($vars['entity']->getURL(), ENT_NOQUOTES, 'UTF-8'); +$pubdate = date('r', $vars['entity']->getTimeCreated()); +$url_text = elgg_echo('bookmarks:address'); +$link = elgg_view('output/url', array('href' => $vars['entity']->address)); +$description = $vars['entity']->description . "<p>$url_text: $link</p>"; + +$creator = elgg_view('page/components/creator', $vars); +$georss = elgg_view('page/components/georss', $vars); +$extension = elgg_view('extensions/item'); + +$item = <<<__HTML <item> - <guid isPermaLink='true'><?php echo $vars['entity']->getURL(); ?></guid> - <pubDate><?php echo date("r",$vars['entity']->time_created) ?></pubDate> - <link><?php echo $vars['entity']->address; ?></link> - <title><![CDATA[<?php echo $title; ?>]]></title> - <description><![CDATA[<?php echo (autop($vars['entity']->description)); ?>]]></description> + <guid isPermaLink="true">$permalink</guid> + <pubDate>$pubdate</pubDate> + <link>$permalink</link> + <title><![CDATA[$title]]></title> + <description><![CDATA[$description]]></description> + $creator$georss$extension </item> + +__HTML; + +echo $item; |