Refs #2700 completed the _ to - conversion for screen.css (leaves admin.css and plugi...

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

diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 733d42fa41cacf12257fff9c80d5dd551fe61738..b4ce9423634b1b0b2739dcbbd37c8a7c18d5a8cc 100644 (file)
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -76,7 +76,7 @@ if ($full) {
 
 echo <<<___END
 <div class="blogpost clearfix">
-       <div id="content_header" class="clearfix">
+       <div id="content-header" class="clearfix">
                <div class="content-header-title"><h2>{$blog->title}</h2></div>
        </div>
        <div class="clearfix">

diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php
index fbe16858818ee90ac4070731606d1f6484e4a47c..799e252d8d1acd772ffe7c083fe5bdef87ecadba 100644 (file)
--- a/mod/groups/views/default/forum/topics.php
+++ b/mod/groups/views/default/forum/topics.php
@@ -4,7 +4,7 @@
  */
 ?>
 
-<div id="content_header" class="clearfix">
+<div id="content-header" class="clearfix">
        <div class="content-header-title">
                <h2><?php echo elgg_echo("groups:forum"); ?></h2>
        </div>

diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php
index 42928a12fbb1ebfd658d243ec7ce0abe8c3b2686..02b1205fe31577f0af4edab1cf4698d680195ea4 100644 (file)
--- a/mod/groups/views/default/groups/groupprofile.php
+++ b/mod/groups/views/default/groups/groupprofile.php
@@ -63,7 +63,7 @@ echo elgg_view('navigation/breadcrumbs');
 
 // build and display header
 echo <<<__HTML
-<div id="content_header" class="clearfix">
+<div id="content-header" class="clearfix">
        <div class="content-header-title">
                <h2>{$vars['entity']->name}</h2>
        </div>

diff --git a/mod/messages/index.php b/mod/messages/index.php
index 53aeef2aa7b3c76ffae4b0cd282a50ccca0a72c6..3fe1b0f844ea62a46ec29be4967fa97443e9947b 100644 (file)
--- a/mod/messages/index.php
+++ b/mod/messages/index.php
@@ -30,7 +30,7 @@ $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>";
 

diff --git a/mod/messages/sent.php b/mod/messages/sent.php
index 34dc116920139447009ac51924cbae0d6f6ce34b..989337f55bb0c9c617112db12932406179dbd4dd 100644 (file)
--- a/mod/messages/sent.php
+++ b/mod/messages/sent.php
@@ -26,7 +26,7 @@ $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>";
 

diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php
index b489cbacd6b676b1515e0baea8822120028f664b..5ac749135b932b2dc1154083d01a3eec6f549ba8 100644 (file)
--- a/mod/messages/views/default/messages/messages.php
+++ b/mod/messages/views/default/messages/messages.php
@@ -41,7 +41,7 @@ if (isloggedin())
                        echo elgg_view('navigation/breadcrumbs');
 ?>
 <!-- display the content header block -->
-                       <div id="content_header" class="clearfix">
+                       <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>

diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index 5f23b6300165bccced23a8b708f451b8e23f5be2..26fd468b755c1b51f0d595b9de009c498c4b3022 100644 (file)
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -7,7 +7,7 @@ $owner = get_user($vars['annotation']->owner_guid);
 
 ?>
 <a class="anchor_link" name="comment_<?php echo $vars['annotation']->id; ?>"></a>
-<div class="generic_comment clearfix">
+<div class="generic-comment clearfix">
        <div class="generic-comment-icon">
                <?php
                        echo elgg_view("profile/icon", array(

diff --git a/views/default/annotation/latest_comments.php b/views/default/annotation/latest_comments.php
index 4de93cf90da80809d2bee387cede19138a25c8fc..a43ec4feec863e452f6fb1fc43a02cd8a2d1be93 100644 (file)
--- a/views/default/annotation/latest_comments.php
+++ b/views/default/annotation/latest_comments.php
@@ -28,7 +28,7 @@ if($vars['comments']){
                        $url_display = $objecttitle;
                }
        
-               echo "<div class='generic_comment latest clearfix'><span class='generic-comment-icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
+               echo "<div class='generic-comment latest clearfix'><span class='generic-comment-icon'>" . elgg_view("profile/icon",array('entity' => $comment_owner, 'size' => 'tiny')) . "</span>";
                echo "<div class='generic-comment-details'><span class='entity-subtext'><a href=\"".elgg_get_site_url()."pg/profile/{$comment_owner->username}\">{$comment_owner->name}</a> " . elgg_echo('on') . " <span class='entity-title'>{$url_display}</span> ({$friendlytime})</span></div>";
                echo "</div>";
        

diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 6fc967bb50df94a3e3f5787f5f95b16520ca8ffc..2e6c9c1a7ba0bfdd5f4d6eb55d281be10a761c5d 100644 (file)
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -327,7 +327,7 @@ h2 {
        min-height: 360px;
        margin:10px 20px 20px 10px;
 }
-#elgg-page-contents.one_column { /* class on #elgg-page-contents when no sidebar */
+#elgg-page-contents.one-column { /* class on #elgg-page-contents when no sidebar */
        width:970px;
        margin-right:10px;
 }
@@ -1102,10 +1102,10 @@ a.widget-edit-button:hover, a.widget-delete-button:hover {
 /* ***************************************
        CONTENT HEADER
 **************************************** */
-#content_header {
+#content-header {
        border-bottom:1px solid #CCCCCC;
 }
-#content_header:after {
+#content-header:after {
        content: ".";
        display: block;
        height: 0;
@@ -1136,7 +1136,7 @@ a.widget-edit-button:hover, a.widget-delete-button:hover {
 /* ***************************************
        DEFAULT COMMENTS
 **************************************** */
-.generic_comment {
+.generic-comment {
        border-bottom:1px dotted #cccccc;
        clear:both;
        display:block;
@@ -1144,7 +1144,7 @@ a.widget-edit-button:hover, a.widget-delete-button:hover {
        padding:5px 0 7px;
        position:relative;
 }
-.generic_comment:first-child {
+.generic-comment:first-child {
        border-top:1px dotted #cccccc;
 }
 .generic-comment-icon {
@@ -1177,19 +1177,19 @@ a.widget-edit-button:hover, a.widget-delete-button:hover {
        margin-bottom: 10px;
 }
 /* latest comments in sidebar */
-.elgg-aside .generic_comment.latest {
+.elgg-aside .generic-comment.latest {
        padding:2px 0;
 }
-.elgg-aside .generic_comment.latest .generic-comment-icon  {
+.elgg-aside .generic-comment.latest .generic-comment-icon  {
        margin-left:1px;
        margin-top:5px;
 }
-.elgg-aside .generic_comment.latest .generic-comment-details {
+.elgg-aside .generic-comment.latest .generic-comment-details {
        width:177px;
        line-height:1.1em;
        overflow:hidden;
 }
-.elgg-aside .generic_comment.latest .entity-title {
+.elgg-aside .generic-comment.latest .entity-title {
        font-size: inherit;
        line-height: inherit;
 }
@@ -1461,14 +1461,14 @@ a.widget-edit-button:hover, a.widget-delete-button:hover {
 .likes-list-holder a.user-like:hover {
        background-position: left -131px;
 }
-.likes-list-holder .likes-list_button.link {
+.likes-list-holder .likes-list-button.link {
        float:left;
        text-align: left;
        background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left -131px;
        padding-left:21px;
        height:20px;
 }
-.likes-list-holder .likes-list_button.link.not-liked {
+.likes-list-holder .likes-list-button.link.not-liked {
        background:none;
        padding-left:0;
 }

diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index 0db4b88bba551164ec6478837db26b6607b21405..2db51d9916bcfb3f3ce045fdb0e5770c3ba46cda 100644 (file)
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -119,7 +119,7 @@ $(document).ready(function () {
        });
 
        // user likes
-       $(".likes-list_button").click(function(event) {
+       $(".likes-list-button").click(function(event) {
                if ($(this).next(".likes-list").css('display') == 'none') {     // show list
                        // hide any other currently viewable likes lists
                        $('.likes-list').fadeOut();

diff --git a/views/default/likes/forms/edit.php b/views/default/likes/forms/edit.php
index b4ced14537d1e19e4284ea6b82be3bb89e14935e..33527b53a0f49cf1a18552a6afe0a7c66f2d9c98 100644 (file)
--- a/views/default/likes/forms/edit.php
+++ b/views/default/likes/forms/edit.php
@@ -29,7 +29,7 @@ if (isset($vars['entity']) && isloggedin()) {
                        $user_string = elgg_echo('likes:userslikedthis');
                }
 
-               echo "<a class='likes-list_button link {$likes_classname}' {$likes_titletag}>" . elgg_count_likes($vars['entity']) . " " . $user_string . "</a>";
+               echo "<a class='likes-list-button link {$likes_classname}' {$likes_titletag}>" . elgg_count_likes($vars['entity']) . " " . $user_string . "</a>";
 
                //show the users who liked the object
                echo "<div class='likes-list hidden clearfix'>";

diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
index 64d12287761dca32c36e8583537c366d83a4c83a..8809ad8b7e5e2ef4a428b0b8ba2c7100f91b47ec 100644 (file)
--- a/views/default/page_elements/content_header.php
+++ b/views/default/page_elements/content_header.php
@@ -86,7 +86,7 @@ if (isloggedin()) {
 }
 
 echo <<<HTML
-<div id="content_header" class="clearfix">
+<div id="content-header" class="clearfix">
        $title $new_button
 </div>
 HTML;

diff --git a/views/default/page_elements/content_header_member.php b/views/default/page_elements/content_header_member.php
index 91a4b497670861199ad6cf4a3c9b3ddae7ba3cc9..4cfee92588dcbf575e444d3c15d235703672e238 100644 (file)
--- a/views/default/page_elements/content_header_member.php
+++ b/views/default/page_elements/content_header_member.php
@@ -18,7 +18,7 @@ $title = elgg_echo($type);
 $title = $name . "'s " . $type;\r
 ?>\r
 \r
-<div id="content_header" class="clearfix">\r
+<div id="content-header" class="clearfix">\r
        <?php echo '<div class="content-header-title">' . elgg_view_title($title) . '</div>'; ?>\r
 </div>\r
 \r