Updated Bookmarks interface (old sidebar nav removed, breadcrumbs fixed, bookmarklet fixed & updated)

git-svn-id: http://code.elgg.org/elgg/trunk@5283 36083f99-b078-4883-b0ff-0f9b5a30f544

4 files changed, 11 insertions, 37 deletions

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)) {