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

7 files changed, 30 insertions, 30 deletions

diff --git a/mod/messages/index.php b/mod/messages/index.php
index 496a8ee9d..53aeef2aa 100644
--- a/mod/messages/index.php
+++ b/mod/messages/index.php
@@ -30,9 +30,9 @@ $messages = elgg_get_entities_from_metadata(array(
 ));
 
 // Set the page title
-$area2 = "<div id='content_header'><div class='content_header_title'>";
+$area2 = "<div id='content_header'><div class='content-header-title'>";
 $area2 .= elgg_view_title(elgg_echo("messages:inbox"))."</div>";
-$area2 .= "<div class='content_header_options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
+$area2 .= "<div class='content-header-options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
 
 // Display them. The last variable 'page_view' is to allow the view page to know where this data is coming from,
 // in this case it is the inbox, this is necessary to ensure the correct display
diff --git a/mod/messages/sent.php b/mod/messages/sent.php
index 7331a8d52..34dc11692 100644
--- a/mod/messages/sent.php
+++ b/mod/messages/sent.php
@@ -26,9 +26,9 @@ $messages = elgg_get_entities_from_metadata(array('metadata_name' => 'fromId', '
 
 
 // Set the page title
-$area2 = "<div id='content_header'><div class='content_header_title'>";
+$area2 = "<div id='content_header'><div class='content-header-title'>";
 $area2 .= elgg_view_title(elgg_echo("messages:sentmessages"))."</div>";
-$area2 .= "<div class='content_header_options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
+$area2 .= "<div class='content-header-options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
 
 // Set content
 $area2 .= elgg_view("messages/forms/view",array('entity' => $messages, 'page_view' => "sent", 'limit' => $limit, 'offset' => $offset));
diff --git a/mod/messages/views/default/messages/css.php b/mod/messages/views/default/messages/css.php
index b186400f8..3e58c2607 100644
--- a/mod/messages/views/default/messages/css.php
+++ b/mod/messages/views/default/messages/css.php
@@ -6,7 +6,7 @@
  */
 ?>
 
-/* messages/new messages icon & counter in elgg_topbar */
+/* messages/new messages icon & counter in elgg-topbar */
 a.privatemessages {
 	background:transparent url(<?php echo elgg_get_site_url(); ?>mod/messages/graphics/toolbar_messages_icon.gif) no-repeat left 2px;
 	padding-left:16px;
@@ -52,7 +52,7 @@ a.privatemessages.new span {
 	border-bottom:1px dotted #cccccc;
 	padding:5px 0 7px 0;
 }
-.message.notread .entity_listing_info p.entity_title a {
+.message.notread .entity-listing-info p.entity-title a {
 	color:#d40005;
 }
 .message_sender {
@@ -77,7 +77,7 @@ a.privatemessages.new span {
 .message .delete-button {
 	margin-top:3px;
 }
-.entity_listing.messages:hover {
+.entity-listing.messages:hover {
 	background-color:white;
 }
 .messages_buttonbank {
diff --git a/mod/messages/views/default/messages/forms/reply.php b/mod/messages/views/default/messages/forms/reply.php
index 15eb3ebd0..0b78f4db3 100644
--- a/mod/messages/views/default/messages/forms/reply.php
+++ b/mod/messages/views/default/messages/forms/reply.php
@@ -12,7 +12,7 @@
 	}
 ?>
 
-<form class="margin_top" id="messages_reply_form" action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm">
+<form class="margin-top" id="messages_reply_form" action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm">
 	<?php echo elgg_view('action/securitytoken'); ?>
 
     <!-- populate the title space with the orginal message title, inserting re: before it -->						        
diff --git a/mod/messages/views/default/messages/forms/send.php b/mod/messages/views/default/messages/forms/send.php
index 43ece8d89..9a83ce103 100644
--- a/mod/messages/views/default/messages/forms/send.php
+++ b/mod/messages/views/default/messages/forms/send.php
@@ -31,10 +31,10 @@ unset($_SESSION['msg_contents']);
 			//get the user object  
 	        $user = get_user($send_to);
 	        
-	        echo "<div class='entity_listing messages clearfix'><div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>";
+	        echo "<div class='entity-listing messages clearfix'><div class='entity-listing-icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>";
 	        
 	        //draw it
-			echo "<div class='entity_listing_info'>".elgg_echo("messages:to").": <a href='".elgg_get_site_url()."pg/profile/".$user->username."'>".$user->name."</a>";
+			echo "<div class='entity-listing-info'>".elgg_echo("messages:to").": <a href='".elgg_get_site_url()."pg/profile/".$user->username."'>".$user->name."</a>";
 			//set the hidden input field to the recipients guid
 	        echo "<input type='hidden' name='send_to' value=\"{$send_to}\" />";	
 			echo "</div></div>";
@@ -42,7 +42,7 @@ unset($_SESSION['msg_contents']);
         } else {
     ?>
         
-        <p class="margin_top"><label><?php echo elgg_echo("messages:to"); ?>: </label>
+        <p class="margin-top"><label><?php echo elgg_echo("messages:to"); ?>: </label>
 	    <select name='send_to'>
 	    <?php 
 			// make the first option blank
@@ -57,7 +57,7 @@ unset($_SESSION['msg_contents']);
         }
     ?>
     
-	<p class="margin_top"><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' value='<?php echo $msg_title; ?>' class="input-text" /></label></p>
+	<p class="margin-top"><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' value='<?php echo $msg_title; ?>' class="input-text" /></label></p>
 	<p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label>
 	<?php
 		echo elgg_view("input/longtext", array(
diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php
index 6fc87ac0e..b489cbacd 100644
--- a/mod/messages/views/default/messages/messages.php
+++ b/mod/messages/views/default/messages/messages.php
@@ -42,9 +42,9 @@ if (isloggedin())
 ?>
 <!-- display the content header block -->
 			<div id="content_header" class="clearfix">
-				<div class="content_header_title"><h2><?php echo $vars['entity']->title; ?></h2></div>
-				<div class="content_header_options">
-					<a class="action-button message_reply" onclick="elgg_slide_toggle(this,'#elgg_page_contents','#message_reply_form');"><?php echo elgg_echo('messages:answer'); ?></a>
+				<div class="content-header-title"><h2><?php echo $vars['entity']->title; ?></h2></div>
+				<div class="content-header-options">
+					<a class="action-button message_reply" onclick="elgg_slide_toggle(this,'#elgg-page-contents','#message_reply_form');"><?php echo elgg_echo('messages:answer'); ?></a>
 					<?php echo elgg_view("output/confirmlink", array(
 						'href' => "action/messages/delete?message_id=" . $vars['entity']->getGUID() . "&type={$type}&submit=" . elgg_echo('delete'),
 						'text' => elgg_echo('delete'),
@@ -55,7 +55,7 @@ if (isloggedin())
 				</div>
 			</div>
 
-				<div class="entity_listing messages clearfix">
+				<div class="entity-listing messages clearfix">
 					<?php
 						// we need a different user icon and name depending on whether the user is reading the message
 						// from their inbox or sentbox. If it is the inbox, then the icon and name will be the person who sent
@@ -71,13 +71,13 @@ if (isloggedin())
 							$message_owner = elgg_echo('messages:from').": <a href='".elgg_get_site_url()."pg/profile/".$user_object->username."'>".get_entity($vars['entity']->fromId)->name."</a>";
 						}
 					?>
-					<div class="entity_listing_icon"><?php echo $message_icon ?></div>
-					<div class="entity_listing_info"><p><?php echo $message_owner ?></p>
-						<p class="entity_subtext"><?php echo elgg_view_friendly_time($vars['entity']->time_created); ?></p>
+					<div class="entity-listing-icon"><?php echo $message_icon ?></div>
+					<div class="entity-listing-info"><p><?php echo $message_owner ?></p>
+						<p class="entity-subtext"><?php echo elgg_view_friendly_time($vars['entity']->time_created); ?></p>
 					</div>
 				</div>
 
-				<div class="messagebody margin_top clearfix">
+				<div class="messagebody margin-top clearfix">
 					<?php
 						// if the message is a reply, display the message the reply was for
 						// @todo I need to figure out how to get the description out using -> (anyone?)
@@ -90,9 +90,9 @@ if (isloggedin())
 				</div>
 
 				<!-- reply form -->
-				<div id="message_reply_form" class="hidden margin_top">
+				<div id="message_reply_form" class="hidden margin-top">
 					<h2><?php echo elgg_echo('messages:answer'); ?></h2>
-					<form action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm" class="margin_top" id="messages_send_form">
+					<form action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm" class="margin-top" id="messages_send_form">
 						<?php echo elgg_view('input/securitytoken'); ?>
 						<p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input-text" value='<?php echo $reply_title; ?>' /></label></p>
 						<p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label>
diff --git a/mod/messages/views/default/messages/view.php b/mod/messages/views/default/messages/view.php
index 76fa4a00c..cc0b5ec3a 100644
--- a/mod/messages/views/default/messages/view.php
+++ b/mod/messages/views/default/messages/view.php
@@ -34,9 +34,9 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
 		            }
 				    // get the icon of the user who owns the message
 				    $from = get_entity($message->fromId);
-					echo "<div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $from, 'size' => 'tiny'))."</div>";
+					echo "<div class='entity-listing-icon'>".elgg_view("profile/icon",array('entity' => $from, 'size' => 'tiny'))."</div>";
 					// message block (message sender, message subject, delete checkbox)
-					echo "<div class='entity_listing_info'><div class='message_sender'>".$from->name."<p class='entity_subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
+					echo "<div class='entity-listing-info'><div class='message_sender'>".$from->name."<p class='entity-subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
 					// display message subject
 					echo "<div class='message_subject'>";
 					// display delete button
@@ -45,7 +45,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
 						'text' => elgg_echo('delete'),
 						'confirm' => elgg_echo('deleteconfirm'),
 					)) . "</span>";
-					echo "<p class='entity_title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" />";
+					echo "<p class='entity-title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" />";
 					echo "<a href=\"{$message->getURL()}\">" . $message->title . "</a></p>";
 				    echo "</div></div></div>"; // close the message container
 				}//end of hiddenFrom if statement
@@ -70,8 +70,8 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
 					$user = get_entity($message->toId);
 					echo "<div class='message sent clearfix'>";
 					//get the icon for the user the message was sent to
-					echo "<div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>";
-					echo "<div class='entity_listing_info'><div class='message_sender'>".get_loggedin_user()->name."<p class='entity_subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
+					echo "<div class='entity-listing-icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>";
+					echo "<div class='entity-listing-info'><div class='message_sender'>".get_loggedin_user()->name."<p class='entity-subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
 					// display message subject
 					echo "<div class='message_subject'>";
 					//display the link to 'delete'
@@ -80,7 +80,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
 						'text' => elgg_echo('delete'),
 						'confirm' => elgg_echo('deleteconfirm'),
 					)) . "</div>";
-					echo "<p class='entity_title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" /> ";
+					echo "<p class='entity-title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" /> ";
 					echo "<a href=\"{$message->getURL()}?type=sent\">" . $message->title . "</a></p>";
 					echo "</div></div></div>"; // close the message container
 				}//close hiddeTo if statement
@@ -99,7 +99,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
 			$newoffset = $offset + $limit;
 			$nexturl = elgg_http_add_url_query_elements($baseurl, array('offset' => $newoffset));
 
-			$nav .= '<a class="pagination_previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
+			$nav .= '<a class="pagination-previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
 		}
 
 		if ($offset > 0) {
@@ -108,7 +108,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
 
 			$prevurl = elgg_http_add_url_query_elements($baseurl, array('offset' => $newoffset));
 
-			$nav .= '<a class="pagination_next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
+			$nav .= '<a class="pagination-next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
 		}