Refs #2700 replaced most underscores with hyphens - there may be broken display code due to extent of this change

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

6 files changed, 14 insertions, 14 deletions

diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
index 17a304d78..b1929486d 100644
--- a/mod/bookmarks/views/default/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
@@ -23,7 +23,7 @@ if (!$name && ($user = get_loggedin_user())) {
 <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 />
-<a class="link" onclick="elgg_slide_toggle(this,'#elgg_sidebar','.bookmarklet');">Instructions</a>
+<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>
diff --git a/mod/bookmarks/views/default/bookmarks/form.php b/mod/bookmarks/views/default/bookmarks/form.php
index 927ed445d..7273836e2 100644
--- a/mod/bookmarks/views/default/bookmarks/form.php
+++ b/mod/bookmarks/views/default/bookmarks/form.php
@@ -35,7 +35,7 @@ if(isset($vars['entity'])){
 	$url = "action/bookmarks/add";
 }
 ?>
-<form id="bookmark_edit_form" class="margin_top" action="<?php echo elgg_get_site_url() . $url; ?>" method="post">
+<form id="bookmark_edit_form" class="margin-top" action="<?php echo elgg_get_site_url() . $url; ?>" method="post">
 	<?php echo elgg_view('input/securitytoken'); ?>
 	<p>
 		<label>
diff --git a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
index 83d6c97ea..50d4dbdb2 100755
--- a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
+++ b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
@@ -17,19 +17,19 @@ if($bookmarks){
 		//get the time
 		$friendlytime = elgg_view_friendly_time($b->time_created);
 		
-	    $info = "<div class='entity_listing_icon'>" . elgg_view('profile/icon',array('entity' => $b->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
+	    $info = "<div class='entity-listing-icon'>" . elgg_view('profile/icon',array('entity' => $b->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
 
 		//get the bookmark entries body
-		$info .= "<div class='entity_listing_info'><p class='entity_title'><a href=\"{$b->address}\">{$b->title}</a></p>";
+		$info .= "<div class='entity-listing-info'><p class='entity-title'><a href=\"{$b->address}\">{$b->title}</a></p>";
 				
 		//get the user details
-		$info .= "<p class='entity_subtext'>{$friendlytime}</p>";
+		$info .= "<p class='entity-subtext'>{$friendlytime}</p>";
 		$info .= "</div>";
 		//display 
-		echo "<div class='entity_listing clearfix'>" . $info . "</div>";
+		echo "<div class='entity-listing clearfix'>" . $info . "</div>";
 	} 
 } else {
 	$create_bookmark = elgg_get_site_url() . "pg/bookmarks/" . elgg_get_page_owner()->username . "/add";
-	echo "<p class='margin_top'><a href=\"{$create_bookmark}\">" . elgg_echo("bookmarks:new") . "</a></p>";
+	echo "<p class='margin-top'><a href=\"{$create_bookmark}\">" . elgg_echo("bookmarks:new") . "</a></p>";
 }
 echo "</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 7438f1570..f90a2f355 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -47,7 +47,7 @@ if($is_group instanceof ElggGroup){
 }
 
 if($vars['entity']->description != '')
-	$view_notes = "<a class='link' 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)) {
@@ -66,7 +66,7 @@ if($vars['entity']->canEdit()){
 				)) . "</span>";
 }
 
-$info = "<div class='entity_metadata'><span {$access_level}>{$object_acl}</span>";
+$info = "<div class='entity-metadata'><span {$access_level}>{$object_acl}</span>";
 
 // include a view for plugins to extend
 $info .= elgg_view("bookmarks/options",array('entity' => $vars['entity']));
@@ -74,14 +74,14 @@ $info .= elgg_view_likes($vars['entity']); // include likes
 
 //include edit and delete options
 if($vars['entity']->canEdit()){
-	$info .= "<span class='entity_edit'><a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>";
+	$info .= "<span class='entity-edit'><a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>";
 	$info .= $delete;
 }
 
 	$info .= "</div>";
 
-$info .= "<p class='entity_title'>$a_tag_title</p>";
-$info .= "<p class='entity_subtext'>Bookmarked by <a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}\">{$owner->name}</a> {$friendlytime} {$view_notes}</p>";
+$info .= "<p class='entity-title'>$a_tag_title</p>";
+$info .= "<p class='entity-subtext'>Bookmarked by <a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}\">{$owner->name}</a> {$friendlytime} {$view_notes}</p>";
 
 $tags = elgg_view('output/tags', array('tags' => $vars['entity']->tags));
 if (!empty($tags)) {
diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
index 32434471b..956e84b1c 100644
--- a/mod/bookmarks/views/default/river/object/bookmarks/create.php
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -13,7 +13,7 @@ $string .= "<a href=\"" . $object->address . "\">" . $object->title . "</a>";
 if (($is_group instanceof ElggGroup) && (elgg_get_context() != 'groups')){
 	$string .= " " . elgg_echo('bookmarks:ingroup') . " <a href=\"{$is_group->getURL()}\">" . $is_group->name . "</a>";
 }
-$string .= " <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created);
+$string .= " <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created);
 if (isloggedin()){
 	$string .= "<a class='river_comment_form_button link'>Comment</a>";
 	$string .= elgg_view('likes/forms/link', array('entity' => $object));
diff --git a/mod/bookmarks/views/default/widgets/bookmarks/view.php b/mod/bookmarks/views/default/widgets/bookmarks/view.php
index cbd0012bb..34b9ff834 100644
--- a/mod/bookmarks/views/default/widgets/bookmarks/view.php
+++ b/mod/bookmarks/views/default/widgets/bookmarks/view.php
@@ -45,7 +45,7 @@ if ($bookmarks) {
 
 		//display
 		echo "<div class='ContentWrapper bookmarks'>";
-		echo "<div class='shares_widget_content'>" . $info . "</div></div>";
+		echo "<div class='shares_widget-content'>" . $info . "</div></div>";
 	}
 
 	if ($num_bookmarks > $num) {