aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mod/bookmarks/add.php4
-rw-r--r--mod/bookmarks/all.php2
-rw-r--r--mod/bookmarks/bookmarklet.php2
-rw-r--r--mod/bookmarks/friends.php2
-rw-r--r--mod/bookmarks/index.php2
-rw-r--r--mod/bookmarks/start.php7
-rw-r--r--mod/bookmarks/views/default/bookmarks/bookmarklet.php22
-rwxr-xr-xmod/bookmarks/views/default/bookmarks/bookmarklet_menu_option.php23
-rw-r--r--mod/bookmarks/views/default/bookmarks/css.php1
-rw-r--r--mod/bookmarks/views/default/object/bookmarks.php2
-rw-r--r--views/default/css.php3
11 files changed, 26 insertions, 44 deletions
diff --git a/mod/bookmarks/add.php b/mod/bookmarks/add.php
index 4839c04f5..baf059e75 100644
--- a/mod/bookmarks/add.php
+++ b/mod/bookmarks/add.php
@@ -9,6 +9,8 @@
* @link http://elgg.org/
*/
+global $CONFIG;
+
// Start engine
require_once(dirname(dirname(dirname(__FILE__))) . "/engine/start.php");
@@ -46,7 +48,7 @@ if ($this_guid = get_input('bookmark',0)) {
$area3 = elgg_view('bookmarks/ownerblock');
// if logged in, get the bookmarklet
-$area3 .= elgg_view("bookmarks/bookmarklet_menu_option");
+$area3 .= elgg_view("bookmarks/bookmarklet");
//include a view for plugins to extend
$area3 .= elgg_view("bookmarks/sidebar_options", array("object_type" => 'bookmarks'));
diff --git a/mod/bookmarks/all.php b/mod/bookmarks/all.php
index 02efa69cb..6f9a898b5 100644
--- a/mod/bookmarks/all.php
+++ b/mod/bookmarks/all.php
@@ -29,7 +29,7 @@ set_context('bookmarks');
// if logged in, get the bookmarklet
if(isloggedin()){
- $area3 = elgg_view("bookmarks/bookmarklet_menu_option");
+ $area3 = elgg_view("bookmarks/bookmarklet");
}
//include a view for plugins to extend
$area3 .= elgg_view("bookmarks/sidebar_options", array("object_type" => 'bookmarks'));
diff --git a/mod/bookmarks/bookmarklet.php b/mod/bookmarks/bookmarklet.php
index c8a488f13..2262cadff 100644
--- a/mod/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/bookmarklet.php
@@ -30,7 +30,7 @@ $area2 = elgg_view_title(elgg_echo('bookmarks:bookmarklet'));
$area2 .= elgg_view('bookmarks/bookmarklet', array('pg_owner' => $page_owner));
// if logged in, get the bookmarklet
-$area3 = elgg_view("bookmarks/bookmarklet_menu_option");
+$area3 = elgg_view("bookmarks/bookmarklet");
// Format page
$body = elgg_view_layout('one_column_with_sidebar', $area3, $area1.$area2);
diff --git a/mod/bookmarks/friends.php b/mod/bookmarks/friends.php
index a327043d6..3fc4a0d2d 100644
--- a/mod/bookmarks/friends.php
+++ b/mod/bookmarks/friends.php
@@ -24,7 +24,7 @@ set_context('bookmarks');
$area3 = elgg_view("bookmarks/sidebar_options", array("object_type" => 'bookmarks'));
// if logged in, get the bookmarklet
-$area3 .= elgg_view("bookmarks/bookmarklet_menu_option");
+$area3 .= elgg_view("bookmarks/bookmarklet");
// Format page
$body = elgg_view_layout('one_column_with_sidebar', $area3, $area1.$area2);
diff --git a/mod/bookmarks/index.php b/mod/bookmarks/index.php
index 1fbb03186..042ac7346 100644
--- a/mod/bookmarks/index.php
+++ b/mod/bookmarks/index.php
@@ -47,7 +47,7 @@ if(page_owner() != get_loggedin_user()->guid){
}else{
if(isloggedin()){
// if logged in, get the bookmarklet
- $area3 .= elgg_view("bookmarks/bookmarklet_menu_option");
+ $area3 .= elgg_view("bookmarks/bookmarklet");
}
}
//include a view for plugins to extend
diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index b775bf9b1..128838f0d 100644
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -55,8 +55,9 @@ function bookmarks_pagesetup() {
global $CONFIG;
// Set up menu for logged in users
- //add submenu options
+ // add submenu options - @todo partially removed - now provided by drop-down menu filter in content area
if (get_context() == "bookmarks") {
+/*
if (isloggedin()) {
if (page_owner()) {
$page_owner = page_owner_entity();
@@ -65,8 +66,10 @@ function bookmarks_pagesetup() {
if(!$page_owner instanceof ElggGroup)
add_submenu_item(elgg_echo('bookmarks:friends'),$CONFIG->wwwroot."pg/bookmarks/" . $_SESSION['user']->username . "/friends");
}
+
if(!$page_owner instanceof ElggGroup)
add_submenu_item(elgg_echo('bookmarks:everyone'),$CONFIG->wwwroot."mod/bookmarks/everyone.php");
+*/
// Bookmarklet
if ((isloggedin()) && (page_owner()) && (can_write_to_container(0, page_owner()))) {
@@ -74,7 +77,7 @@ function bookmarks_pagesetup() {
$bmtext = elgg_echo('bookmarks:bookmarklet');
if ($page_owner instanceof ElggGroup)
$bmtext = elgg_echo('bookmarks:bookmarklet:group');
- add_submenu_item($bmtext, $CONFIG->wwwroot . "pg/bookmarks/{$page_owner->username}/bookmarklet");
+ // add_submenu_item($bmtext, $CONFIG->wwwroot . "pg/bookmarks/{$page_owner->username}/bookmarklet");
}
}
diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
index 14dedb9d4..4ff05c68a 100644
--- a/mod/bookmarks/views/default/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
@@ -15,15 +15,13 @@ $bookmarktext = elgg_echo("bookmarks:this");
if ($page_owner instanceof ElggGroup)
$bookmarktext = sprintf(elgg_echo("bookmarks:this:group"), $page_owner->name)
?>
-<p>
- <?php echo elgg_echo("bookmarks:bookmarklet:description"); ?>
-</p>
-<p class="sharing_bookmarklet">
- <a href="javascript:location.href='<?php echo $vars['url']; ?>pg/bookmarks/<?php echo $page_owner->username; ?>/add?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)"> <img src="<?php echo $vars['url']; ?>_graphics/elgg_bookmarklet.gif" border="0" title="<?php echo $bookmarktext ?>" /> </a>
-</p>
-<p>
- <?php echo elgg_echo("bookmarks:bookmarklet:descriptionie"); ?>
-</p>
-<p>
- <?php echo elgg_echo("bookmarks:bookmarklet:description:conclusion"); ?>
-</p> \ No newline at end of file
+<h3>Browser Bookmarklet</h3>
+<a href="javascript:location.href='<?php echo $vars['url']; ?>pg/bookmarks/<?php echo page_owner_entity()->username; ?>/add?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)"> <img src="<?php echo $vars['url']; ?>_graphics/elgg_bookmarklet.gif" border="0" title="<?php echo elgg_echo('bookmarks:this');?>" /> </a>
+<br />
+<a class="link" onclick="elgg_slide_toggle(this,'#elgg_sidebar','.bookmarklet');">Instructions</a>
+
+<div class="bookmarklet hidden">
+ <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> \ No newline at end of file
diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet_menu_option.php b/mod/bookmarks/views/default/bookmarks/bookmarklet_menu_option.php
deleted file mode 100755
index 4e71760e7..000000000
--- a/mod/bookmarks/views/default/bookmarks/bookmarklet_menu_option.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * bookmarklet tool
- **/
-$page_owner = page_owner_entity();
-?>
-<h3>Browser Bookmarklet</h3>
-<a href="javascript:location.href='<?php echo $vars['url']; ?>pg/bookmarks/<?php echo $page_owner->username; ?>/add?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)"> <img src="<?php echo $vars['url']; ?>_graphics/elgg_bookmarklet.gif" border="0" title="<?php echo elgg_echo('bookmarks:this');?>" /> </a>
-<br />
-<a onclick="elgg_slide_toggle(this,'#elgg_sidebar','.bookmarklet');">Instructions</a>
-
-<div class="bookmarklet hidden">
- <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> \ No newline at end of file
diff --git a/mod/bookmarks/views/default/bookmarks/css.php b/mod/bookmarks/views/default/bookmarks/css.php
index 94ba3768f..1e8f8c145 100644
--- a/mod/bookmarks/views/default/bookmarks/css.php
+++ b/mod/bookmarks/views/default/bookmarks/css.php
@@ -12,7 +12,6 @@
.bookmark_note {
margin:0 0 0 5px;
- cursor: pointer;
}
.note {
margin-top:5px;
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index 95baf5f54..4c647dd6f 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -39,7 +39,7 @@ if($is_group instanceof ElggGroup){
}
if($vars['entity']->description != '')
- $view_notes = "<a class='bookmark_note' onclick=\"elgg_slide_toggle(this,'.entity_listing','.note');\">note</a>";
+ $view_notes = "<a class='link' onclick=\"elgg_slide_toggle(this,'.entity_listing','.note');\">note</a>";
else
$view_notes = '';
if (@file_exists($faviconurl)) {
diff --git a/views/default/css.php b/views/default/css.php
index ed6f526c6..2cf91fe2f 100644
--- a/views/default/css.php
+++ b/views/default/css.php
@@ -191,6 +191,9 @@ h2 {
clear: both;
visibility: hidden;
}
+.link {
+ cursor:pointer;
+}
.divider {
border-top:1px solid #cccccc;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 01:49:12 +0000