]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Refs #2700 replaced most underscores with hyphens - there may be broken display code...
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Thu, 2 Dec 2010 03:10:57 +0000 (03:10 +0000)
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Thu, 2 Dec 2010 03:10:57 +0000 (03:10 +0000)
git-svn-id: http://code.elgg.org/elgg/trunk@7493 36083f99-b078-4883-b0ff-0f9b5a30f544

183 files changed:
mod/blog/views/default/blog/css.php
mod/blog/views/default/blog/forms/edit.php
mod/blog/views/default/blog/sidebar_revisions.php
mod/blog/views/default/object/blog.php
mod/blog/views/default/river/object/blog/create.php
mod/bookmarks/views/default/bookmarks/bookmarklet.php
mod/bookmarks/views/default/bookmarks/form.php
mod/bookmarks/views/default/bookmarks/group_bookmarks.php
mod/bookmarks/views/default/object/bookmarks.php
mod/bookmarks/views/default/river/object/bookmarks/create.php
mod/bookmarks/views/default/widgets/bookmarks/view.php
mod/defaultwidgets/views/default/defaultwidgets/editor.php
mod/ecml/views/default/embed/web_services/content.php
mod/ecml/views/default/settings/ecml/edit.php
mod/embed/views/default/embed/css.php
mod/embed/views/default/embed/embed.php
mod/embed/views/default/embed/item/list.php
mod/embed/views/default/embed/js.php
mod/embed/views/default/object/file/embedlist.php
mod/file/friends.php
mod/file/index.php
mod/file/views/default/file/css.php
mod/file/views/default/file/groupprofile_files.php
mod/file/views/default/file/upload.php
mod/file/views/default/object/file.php
mod/file/views/default/widgets/filerepo/content.php
mod/groups/groupprofile.php
mod/groups/views/default/forms/forums/addtopic.php
mod/groups/views/default/forms/groups/edit.php
mod/groups/views/default/forms/groups/invite.php
mod/groups/views/default/forum/maintopic.php
mod/groups/views/default/forum/topics.php
mod/groups/views/default/groups/closedmembership.php
mod/groups/views/default/groups/css.php
mod/groups/views/default/groups/featured.php
mod/groups/views/default/groups/find.php
mod/groups/views/default/groups/forum_latest.php
mod/groups/views/default/groups/group_sort_menu.php
mod/groups/views/default/groups/grouplisting.php
mod/groups/views/default/groups/groupprofile.php
mod/groups/views/default/groups/invitationrequests.php
mod/groups/views/default/groups/membershiprequests.php
mod/groups/views/default/object/groupforumtopic.php
mod/groups/views/default/river/forum/create.php
mod/groups/views/default/river/forum/topic/create.php
mod/groups/views/default/river/group/create.php
mod/groups/views/default/river/relationship/member/create.php
mod/invitefriends/views/default/invitefriends/formitems.php
mod/members/index.php
mod/members/views/default/members/css.php
mod/members/views/default/members/members_navigation.php
mod/members/views/default/members/search.php
mod/messageboard/views/default/widgets/messageboard/content.php
mod/messages/index.php
mod/messages/sent.php
mod/messages/views/default/messages/css.php
mod/messages/views/default/messages/forms/reply.php
mod/messages/views/default/messages/forms/send.php
mod/messages/views/default/messages/messages.php
mod/messages/views/default/messages/view.php
mod/notifications/start.php
mod/notifications/views/default/notifications/subscriptions/collections.php
mod/notifications/views/default/notifications/subscriptions/form.php
mod/notifications/views/default/notifications/subscriptions/forminternals.php
mod/notifications/views/default/notifications/subscriptions/groupsform.php
mod/pages/views/default/river/object/page/create.php
mod/profile/views/default/profile/commentwall/commentwall.php
mod/profile/views/default/profile/commentwall/commentwall_content.php
mod/profile/views/default/profile/css.php
mod/profile/views/default/profile/edit.php
mod/profile/views/default/profile/editdefaultprofile.php
mod/profile/views/default/profile/editdefaultprofileitems.php
mod/profile/views/default/profile/editicon.php
mod/profile/views/default/profile/listing.php
mod/profile/views/default/profile/profile_navigation.php
mod/profile/views/default/river/user/default/profileiconupdate.php
mod/profile/views/default/river/user/default/profileupdate.php
mod/reportedcontent/views/default/admin/overview/reportedcontent.php
mod/reportedcontent/views/default/reportedcontent/form.php
mod/riverdashboard/endpoint/get_comments.php
mod/riverdashboard/endpoint/ping.php
mod/riverdashboard/index.php
mod/riverdashboard/start.php
mod/riverdashboard/views/default/river/item/list.php
mod/riverdashboard/views/default/river/item/wrapper.php
mod/riverdashboard/views/default/river/item/wrapper_classic.php
mod/riverdashboard/views/default/riverdashboard/container.php
mod/riverdashboard/views/default/riverdashboard/css.php
mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
mod/riverdashboard/views/default/riverdashboard/js.php
mod/riverdashboard/views/default/riverdashboard/nav.php
mod/riverdashboard/views/default/riverdashboard/rivercomment.php
mod/search/views/default/search/comments/entity.php
mod/search/views/default/search/entity.php
mod/search/views/default/search/search_box.php
mod/sitepages/views/default/canvas/layouts/frontpage.php
mod/sitepages/views/default/sitepages/css.php
mod/sitepages/views/default/sitepages/members.php
mod/sitepages/views/default/sitepages/menu.php
mod/thewire/views/default/object/thewire.php
mod/thewire/views/default/river/object/thewire/create.php
mod/thewire/views/default/thewire/css.php
mod/thewire/views/default/thewire/profile_status.php
mod/tinymce/views/default/tinymce/css.php
views/default/account/forms/forgotten_password.php
views/default/account/forms/login.php
views/default/account/forms/register.php
views/default/account/forms/useradd.php
views/default/account/login_dropdown.php
views/default/account/login_walled_garden.php
views/default/admin/appearance/menu_items.php
views/default/admin/overview.php
views/default/admin/overview/online.php
views/default/admin/plugins/advanced.php
views/default/admin/plugins/simple.php
views/default/admin/site/advanced.php
views/default/admin/site/basic.php
views/default/admin/users/newest.php
views/default/admin/users/online.php
views/default/ajax/loader.php
views/default/annotation/annotate.php
views/default/annotation/annotatelike.php
views/default/annotation/generic_comment.php
views/default/annotation/latest_comments.php
views/default/annotation/likes.php
views/default/comments/forms/edit.php
views/default/css/admin.php
views/default/css/ie.php
views/default/css/ie6.php
views/default/css/screen.php
views/default/dashboard/blurb.php
views/default/entities/entity_listing.php
views/default/export/entity.php
views/default/export/metadata.php
views/default/export/relationship.php
views/default/friends/collection.php
views/default/friends/collections.php
views/default/friends/collectiontabs.php
views/default/friends/picker.php
views/default/input/userpicker.php
views/default/js/friendsPickerv1.php
views/default/js/initialise_elgg.php
views/default/layouts/administration.php
views/default/layouts/one_column.php
views/default/layouts/one_column_with_sidebar.php
views/default/layouts/widgets.php
views/default/likes/forms/edit.php
views/default/likes/forms/link.php
views/default/messages/errors/list.php
views/default/messages/list.php
views/default/messages/messages/list.php
views/default/navigation/listtype.php
views/default/navigation/pagination.php
views/default/navigation/site_nav.php
views/default/navigation/tabs.php
views/default/notifications/settings/usersettings.php
views/default/output/rss_view.php
views/default/page_elements/content_header.php
views/default/page_elements/content_header_member.php
views/default/page_elements/footer.php
views/default/page_elements/header.php
views/default/page_elements/header_logo.php
views/default/page_elements/owner_block.php
views/default/page_elements/topbar.php
views/default/page_elements/topbar_logout.php
views/default/page_shells/walled_garden.php
views/default/river/item/wrapper.php
views/default/settings/system.php
views/default/settings/upgrading.php
views/default/user/settings/default_access.php
views/default/user/settings/email.php
views/default/user/settings/language.php
views/default/user/settings/password.php
views/default/usersettings/plugins.php
views/default/usersettings/plugins_opt/plugin.php
views/default/usersettings/statistics_opt/numentities.php
views/default/usersettings/statistics_opt/online.php
views/default/widgets/add_button.php
views/default/widgets/add_panel.php
views/default/widgets/controls.php
views/default/widgets/settings.php
views/default/widgets/wrapper.php
views/installation/page_shells/default.php

index d9e565ee6b55edc7193545cef951369afa79af03..0cd539ca46502c5a9b72214ecb1e719fa5eccbd9 100644 (file)
@@ -8,10 +8,10 @@
 .blogpost {
        border-bottom:1px dotted #CCCCCC;
 }
-.blogpost .entity_listing_icon {
+.blogpost .entity-listing-icon {
        margin-top:6px;
 }
-.blogpost .entity_listing_info {
+.blogpost .entity-listing-info {
        margin-top:4px;
 }
 .blog_post {
@@ -31,7 +31,7 @@
 }
 
 /* blogs list view */
-.entity_listing.blog .entity_metadata {
+.entity-listing.blog .entity-metadata {
        min-width:400px;
        text-align: right;
 }
index 5da9c3cd15998f95975ebb2af64f4646dc8f3809..e9fb7d37fd4dc10d8b1921d2701dfff1bf6c7bd6 100644 (file)
@@ -167,7 +167,7 @@ $form_body = <<<___END
 
 $draft_warning
 
-<p class="margin_top">
+<p class="margin-top">
        <label for="blog_title">$title_label</label>
        $title_input
 </p>
@@ -204,7 +204,7 @@ $body_input
 $categories_input
 
 <div class="divider"></div>
-<p class="margin_none margin_top entity_subtext">
+<p class="margin-none margin-top entity-subtext">
        $save_status <span class="blog_save_status_time">$saved</span>
 </p>
 
index e53ba9e529bc25fbdf9a55907ffbe840e0702dfd..ecc479812a41b65d3ed2a157f66eb26fa89f1165 100644 (file)
@@ -40,7 +40,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
                                'text' => elgg_echo('blog:status:published')
                        ));
 
-                       $time = "<span class='entity_subtext'>".elgg_view_friendly_time($blog->publish_date)."</span>";
+                       $time = "<span class='entity-subtext'>".elgg_view_friendly_time($blog->publish_date)."</span>";
 
                        echo '<li>
                        ' . $load . ": $time
@@ -48,7 +48,7 @@ if (elgg_instanceof($blog, 'object', 'blog') && $blog->canEdit()) {
                }
 
                foreach ($revisions as $revision) {
-                       $time = "<span class='entity_subtext'>".elgg_view_friendly_time($revision->time_created)."</span>";
+                       $time = "<span class='entity-subtext'>".elgg_view_friendly_time($revision->time_created)."</span>";
                        if ($revision->name == 'blog_auto_save') {
                                $revision_lang = elgg_echo('blog:auto_saved_revision');
                        } else {
index 91fc7f594b0593297bb5add3cd4f2ac5b1edee96..733d42fa41cacf12257fff9c80d5dd551fe61738 100644 (file)
@@ -49,7 +49,7 @@ $edit = elgg_view('output/access', array('entity' => $vars['entity']));
 
 if ($blog->canEdit()) {
        $edit_url = elgg_get_site_url()."pg/blog/{$owner->username}/edit/{$blog->getGUID()}/";
-       $edit_link = "<span class='entity_edit'><a href=\"$edit_url\">" . elgg_echo('edit') . '</a></span>';
+       $edit_link = "<span class='entity-edit'><a href=\"$edit_url\">" . elgg_echo('edit') . '</a></span>';
 
        $delete_url = "action/blog/delete?guid={$blog->getGUID()}";
        $delete_link = "<span class='delete-button'>" . elgg_view('output/confirmlink', array(
@@ -77,15 +77,15 @@ if ($full) {
 echo <<<___END
 <div class="blogpost clearfix">
        <div id="content_header" class="clearfix">
-               <div class="content_header_title"><h2>{$blog->title}</h2></div>
+               <div class="content-header-title"><h2>{$blog->title}</h2></div>
        </div>
        <div class="clearfix">
-       <div class="entity_listing_icon">
+       <div class="entity-listing-icon">
                $owner_icon
        </div>
-       <div class="entity_listing_info">
-               <div class="entity_metadata">$edit</div>
-               <p class="entity_subtext">
+       <div class="entity-listing-info">
+               <div class="entity-metadata">$edit</div>
+               <p class="entity-subtext">
                        $author_text
                        $date
                        $categories
@@ -101,14 +101,14 @@ ___END;
 
 } else {
        echo <<<___END
-<div class="blog $status_class entity_listing clearfix">
-       <div class="entity_listing_icon">
+<div class="blog $status_class entity-listing clearfix">
+       <div class="entity-listing-icon">
                $owner_icon
        </div>
-       <div class="entity_listing_info">
-               <div class="entity_metadata">$edit</div>
-               <p class="entity_title">$linked_title</p>
-               <p class="entity_subtext">
+       <div class="entity-listing-info">
+               <div class="entity-metadata">$edit</div>
+               <p class="entity-title">$linked_title</p>
+               <p class="entity-subtext">
                        $author_text
                        $date
                        $categories
index d311c588387d10ef4224db51fe0b2491b49831b4..2b52429a6545a38eac5fd12d1ac22f298b738e3a 100644 (file)
@@ -10,7 +10,7 @@ $contents = strip_tags($object->excerpt);
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 $title = elgg_echo('blog:river:create', array($url));
-$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created);
+$string .= $title . " <a href=\"{$object->getURL()}\">{$object->title}</a> <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created);
 
 if (isloggedin()) {
        $string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';
index 17a304d78e1e8d184c16f5266103b4b6786aa269..b1929486d2e181378e6a6a787d10bcaf4f9bd6dd 100644 (file)
@@ -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>
index 927ed445d5678ca78766e2e877ee7873e6fc4bca..7273836e26214dd4b5a6ce7db4aa91a0c50afc02 100644 (file)
@@ -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>
index 83d6c97ea9cb31d79bd6b8cfa41770bce5bf1878..50d4dbdb255c81bbbad751f78708355f8462a433 100755 (executable)
@@ -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
index 7438f1570b43154d730eff9065dd9bd146fa0b6e..f90a2f355668e9dbad91aed5791b695583db0e6e 100644 (file)
@@ -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)) {
index 32434471bf4773c597f96e9dc41d9232fbf28017..956e84b1ce23193d591cd77d8ee3829cc5100637 100644 (file)
@@ -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));
index cbd0012bb3f43ae6f5634c5073cef8bc86b768a2..34b9ff834af5a9b94c1efbd9767e23936c21cd86 100644 (file)
@@ -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) {
index 0e251969075ba6b60965f051c7442114ff28047b..54090b8fad255d85cc0a04a93e9371c704f8533b 100644 (file)
@@ -77,7 +77,7 @@ $(document).ready(function () {
 </td>
 <td width="17px" align="right"></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag-handle" /></a></td>
 </tr></table>
 
 <?php
@@ -144,7 +144,7 @@ $(document).ready(function () {
                </td>
                <td width="17px" align="right"></td>
                <td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
-               <td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
+               <td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag-handle" /></a></td>
                </tr></table>
                
                <?php
@@ -189,7 +189,7 @@ $(document).ready(function () {
 </td>
 <td width="17px" align="right"></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag-handle" /></a></td>
 </tr></table>
 
 <?php
@@ -230,7 +230,7 @@ $(document).ready(function () {
 </td>
 <td width="17px" align="right"></td>
 <td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="14" height="14" class="more_info" /></a></td>
-<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag_handle" /></a></td>
+<td width="17px" align="right"><a href="#"><img src="<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif" width="15" height="15" class="drag-handle" /></a></td>
 </tr></table>
 
 <?php
index 4697eedab91218743a395d5af95652f8bcb97b1e..cc44d582f5c42a59f98cb3df4288e6b89cf9e640 100644 (file)
@@ -62,7 +62,7 @@ echo "<div class='ecml_generated_code hidden'>ECML: <span id='ecml_code'></span>
 echo "<div class='embed_content_section preview hidden'><a class='ecml_embed_preview link'>Preview</a>";
 echo "<div id='ecml_preview' class='hidden'></div></div>";
 
-echo "<div class='divider margin_top'></div>";
+echo "<div class='divider margin-top'></div>";
 echo $embed;
 
 ?>
index 1a918fa999a1948bdca9d4251a85850548630ea6..8c1a3b4a1316923e99ae7b95e6cd137e01a3813b 100644 (file)
@@ -12,7 +12,7 @@ $perms = $vars['config']->ecml_permissions;
 ksort($views);
 ksort($keywords);
 
-echo '<p class="margin_top">' . elgg_echo('ecml:admin:instruction') . '</p>';
+echo '<p class="margin-top">' . elgg_echo('ecml:admin:instruction') . '</p>';
 
 // yes I'm using a table because this is table.
 $form_body = <<<___END
index 559cd456d93c142c40e41ae06b0901bceb304903..e8758420550c8d0803ac31bf5b6b7e0480b7d266 100644 (file)
 }
 
 /* entity listings */
-.embed_data .entity_listing_icon img {
+.embed_data .entity-listing-icon img {
        cursor: pointer;
 }
-.embed_data .entity_listing  {
+.embed_data .entity-listing  {
        border-bottom:none;
 }
 .embed_data:last-child {
        border-bottom:1px dotted #CCCCCC;
 }
-.embed_modal_videolist .entity_listing_icon img {
+.embed_modal_videolist .entity-listing-icon img {
        width:75px;
        height:auto;
 }
-.embed_modal_document .embed_data .entity_listing_info {
+.embed_modal_document .embed_data .entity-listing-info {
        margin-top:0;
        margin-left:7px;
 }
-.embed_modal_tidypics .embed_data .entity_listing_info {
+.embed_modal_tidypics .embed_data .entity-listing-info {
        margin-top:11px;
 }
-.embed_modal_file .embed_data .entity_listing_info {
+.embed_modal_file .embed_data .entity-listing-info {
        margin-top:0px;
        margin-left:9px;
 }
-.embed_data .entity_listing_info {
+.embed_data .entity-listing-info {
        width:auto;
        margin-top:15px;
        margin-left:15px;
        float:left;
 }
-.embed_data .entity_listing {
+.embed_data .entity-listing {
        cursor:pointer;
 }
 
 #facebox .content p {
        color:#333333;
 }
-#facebox .content p.entity_title {
+#facebox .content p.entity-title {
        color:#666666;
 }
-#facebox .content .entity_listing:hover {
+#facebox .content .entity-listing:hover {
        background-color: #eeeeee;
 }
 #facebox .content label {
 /* ***************************************
        ELGG TABBED PAGE NAVIGATION
 *************************************** */
-#facebox .body .elgg_horizontal_tabbed_nav {
+#facebox .body .elgg-horizontal-tabbed-nav {
        margin-bottom:5px;
        padding: 0;
        border-bottom: 2px solid #cccccc;
        display:table;
        width:100%;
 }
-#facebox .body .elgg_horizontal_tabbed_nav ul {
+#facebox .body .elgg-horizontal-tabbed-nav ul {
        list-style: none;
        padding: 0;
        margin: 0;
 }
-#facebox .body .elgg_horizontal_tabbed_nav li {
+#facebox .body .elgg-horizontal-tabbed-nav li {
        float: left;
        border: 2px solid #cccccc;
        border-bottom-width: 0;
        -webkit-border-top-left-radius:5px;
        -webkit-border-top-right-radius:5px;
 }
-#facebox .body .elgg_horizontal_tabbed_nav a {
+#facebox .body .elgg-horizontal-tabbed-nav a {
        text-decoration: none;
        display: block;
        padding:3px 10px 0 10px;
        height:21px;
        color:#999999;
 }
-#facebox .body .elgg_horizontal_tabbed_nav a:hover {
+#facebox .body .elgg-horizontal-tabbed-nav a:hover {
        background: #dedede;
        color:#666666;
 }
-#facebox .body .elgg_horizontal_tabbed_nav .selected {
+#facebox .body .elgg-horizontal-tabbed-nav .selected {
        border-color: #cccccc;
        background: white;
 }
-#facebox .body .elgg_horizontal_tabbed_nav .selected a {
+#facebox .body .elgg-horizontal-tabbed-nav .selected a {
        position: relative;
        top: 2px;
        background: white;
 #facebox .body .pagination {
        float:right;    
 }
-#facebox .body .pagination .pagination_number {
+#facebox .body .pagination .pagination-number {
        border:1px solid #999999; 
        color:#666666;
 }
-#facebox .body .pagination .pagination_number:hover {
+#facebox .body .pagination .pagination-number:hover {
        background-color:#aaaaaa; 
        color:black;
 }
-#facebox .body .pagination .pagination_previous,
-#facebox .body .pagination .pagination_next {
+#facebox .body .pagination .pagination-previous,
+#facebox .body .pagination .pagination-next {
        border:1px solid #999999; 
        color:#666666;
 }
-#facebox .body .pagination .pagination_previous:hover,
-#facebox .body .pagination .pagination_next:hover {
+#facebox .body .pagination .pagination-previous:hover,
+#facebox .body .pagination .pagination-next:hover {
        background-color:#aaaaaa; 
        color:black;
 }
-#facebox .body .pagination .pagination_currentpage {
+#facebox .body .pagination .pagination-currentpage {
        background-color:#666666; 
        border:1px solid #666666; 
        color:white;
index 2855a55769f8e616d0b992d8e89c5bff6c3eca96..21b296db4e5c15b22fd373cc29683d2c78c59821 100644 (file)
@@ -149,9 +149,9 @@ $(document).ready(function() {
                return false;
        }
 
-       $('.pagination_number').click(elggPaginationClick);
-       $('.pagination_next').click(elggPaginationClick);
-       $('.pagination_previous').click(elggPaginationClick);
+       $('.pagination-number').click(elggPaginationClick);
+       $('.pagination-next').click(elggPaginationClick);
+       $('.pagination-previous').click(elggPaginationClick);
 });
 
 </script>
index 8cc60753cf0e065b9f0ce028d04274cd0481b2fa..fc5545df0bf17612d62566e9aaf93eb4ee71cec3 100644 (file)
@@ -41,8 +41,8 @@ if ($ecml_keyword) {
 }
 
 $icon = "<img src=\"{$item->getIcon($icon_size)}\" />";
-$info = "<p class='entity_title'>" . htmlentities($title, ENT_QUOTES, 'UTF-8') . "</p>";
-$info .= "<p class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->time_created) . "</p>";
+$info = "<p class='entity-title'>" . htmlentities($title, ENT_QUOTES, 'UTF-8') . "</p>";
+$info .= "<p class='entity-subtext'>" . elgg_view_friendly_time($vars['item']->time_created) . "</p>";
 
 // @todo is this approach better than inline js?
 echo "<div class=\"embed_data\" id=\"embed_{$item->getGUID()}\">" . elgg_view_listing($icon, $info) . '</div>';
index fbc6a0340307c50b2cdb198893298f03b4ce842e..4f4663f4028b4e2919a0a0c082527dd2096fc089 100644 (file)
@@ -112,7 +112,7 @@ $.extend($.facebox, {
        settings: {
        opacity      : 0.7,
        overlay      : true,
-       loadingImage : '<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif',
+       loadingImage : '<?php echo elgg_get_site_url(); ?>_graphics/ajax-loader_bw.gif',
        closeImage   : '<?php echo elgg_get_site_url(); ?>_graphics/spacer.gif',
        imageTypes   : [ 'png', 'jpg', 'jpeg', 'gif' ],
        faceboxHtml  : '\
index bf306b4e7d587d0b5d4457c9e15d5a0270b49743..c6595ab36721078cc4fa6f51bab5f4150baa6398 100644 (file)
@@ -2,16 +2,16 @@
        $file = $vars['entity'];
        $friendlytime = elgg_view_friendly_time($vars['entity']->time_created);
        
-       $info = "<p class='entity_title'> <a href=\"{$file->getURL()}\">{$file->title}</a></p>";
-       $info .= "<p class='entity_subtext'>{$friendlytime}";   
+       $info = "<p class='entity-title'> <a href=\"{$file->getURL()}\">{$file->title}</a></p>";
+       $info .= "<p class='entity-subtext'>{$friendlytime}";   
        $icon = "<a href=\"{$file->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $file->mimetype, 'thumbnail' => $file->thumbnail, 'file_guid' => $file->guid, 'size' => 'small')) . "</a>";
 ?>
 <div id="embed_entity_<?php echo $file->guid; ?>">
-       <div class="entity_listing clearfix">
-               <div class="entity_listing_icon">
+       <div class="entity-listing clearfix">
+               <div class="entity-listing-icon">
                        <?php echo $icon; ?>
                </div>
-               <div class="entity_listing_info">
+               <div class="entity-listing-info">
                        <?php echo $info; ?>
                </div>
        </div>
index 32eeeffd806ed1006336aa5a369426b9f8ee8959..e7a17adab18137a85d71510a20ad8773d2d22185 100644 (file)
@@ -24,7 +24,7 @@
 
        // handle case where friends don't have any files
        if (empty($content)) {
-               $area2 .= "<p class='margin_top'>".elgg_echo("file:none")."</p>";
+               $area2 .= "<p class='margin-top'>".elgg_echo("file:none")."</p>";
        } else {
                $area2 .= $content;
        }
index 5f1bc3400180cc384f0fd1d1f135650c11613906..06a5979d1e12fb658fdf562ad29f30802e58f37e 100644 (file)
@@ -32,7 +32,7 @@
        if ($get_filter) {
                $area1 .= $get_filter;
        } else {
-               $area2 .= "<p class='margin_top'>".elgg_echo("file:none")."</p>";
+               $area2 .= "<p class='margin-top'>".elgg_echo("file:none")."</p>";
        }
 
        //get the latest comments on the current users files
index 46913dea70594a015169c55ef77655807b6d2aef..7fff98c97c12c0cbbeec6f2799b93a98f6b1c0b1 100644 (file)
@@ -5,10 +5,10 @@
         * @package Elgg File Repository
         */
 ?>
-.files .entity_listing .entity_listing_info {
+.files .entity-listing .entity-listing-info {
        width:453px;
 }
-.files .entity_listing:hover {
+.files .entity-listing:hover {
        background-color: white;
 }
 
index 745c5f0535b2c585cc2fad7b325cb13e45dab48e..4c7321e4852596e853566a3f86d148d51f58d2eb 100644 (file)
             foreach($files as $f){
 
                 $mime = $f->mimetype;
-                echo "<div class='entity_listing clearfix'>";
-               echo "<div class='entity_listing_icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
-               echo "<div class='entity_listing_info'>";
-               echo "<p class='entity_title'>" . $f->title . "</p>";
-               echo "<p class='entity_subtext'>" . elgg_view_friendly_time($f->time_created) . "</p>";
+                echo "<div class='entity-listing clearfix'>";
+               echo "<div class='entity-listing-icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
+               echo "<div class='entity-listing-info'>";
+               echo "<p class='entity-title'>" . $f->title . "</p>";
+               echo "<p class='entity-subtext'>" . elgg_view_friendly_time($f->time_created) . "</p>";
                        echo "</div></div>";
 
                }
@@ -47,7 +47,7 @@
 
        } else {
 
-               echo "<p class='margin_top'>" . elgg_echo("file:none") . "</p>";
+               echo "<p class='margin-top'>" . elgg_echo("file:none") . "</p>";
 
        }
 
index b7b99e3b37b8466520fd25377015881c8901bc6f..0ef99348cb3911d2a430c87e902d4aa11d1b600d 100644 (file)
@@ -38,7 +38,7 @@
        
        
 ?>
-<form action="<?php echo elgg_get_site_url(); ?>action/<?php echo $action; ?>" enctype="multipart/form-data" method="post" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/<?php echo $action; ?>" enctype="multipart/form-data" method="post" class="margin-top">
 <p>
        <label>
 <?php
index 3b9731ed66b3d7c7af1e8216b23def525edb7374..37019c1aacb750aca69c5d7e68066dc56dc8d955 100644 (file)
@@ -67,8 +67,8 @@
 
                } else {
 
-                       $info = "<p class='entity_title'> <a href=\"{$file->getURL()}\">{$title}</a></p>";
-                       $info .= "<p class='entity_subtext'><a href=\"".elgg_get_site_url()."pg/file/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
+                       $info = "<p class='entity-title'> <a href=\"{$file->getURL()}\">{$title}</a></p>";
+                       $info .= "<p class='entity-subtext'><a href=\"".elgg_get_site_url()."pg/file/{$owner->username}\">{$owner->name}</a> {$friendlytime}";
                        $numcomments = elgg_count_comments($file);
                        if ($numcomments)
                                $info .= ", <a href=\"{$file->getURL()}\">" . elgg_echo("comments") . " (" . $numcomments . ")</a>";
index 41a968dcebd18f1390942a9942a7ed47f18b7e29..ee7bbe3cca8932817447cde2924410970781a735 100644 (file)
@@ -51,7 +51,7 @@ if ($files) {
                        $mime = $f->mimetype;
                        echo "<div class='filerepo_widget_singleitem clearfix'>";
                        echo "<div class='filerepo_listview_icon'><a href=\"{$f->getURL()}\">" . elgg_view("file/icon", array("mimetype" => $mime, 'thumbnail' => $f->thumbnail, 'file_guid' => $f->guid)) . "</a></div>";
-                       echo "<div class='filerepo_widget_content'>";
+                       echo "<div class='filerepo_widget-content'>";
                        echo "<div class='filerepo_listview_title'><p class='filerepo_title'>" . $f->title . "</p></div>";
                        echo "<div class='filerepo_listview_date'><p class='filerepo_timestamp'><small>" . elgg_view_friendly_time($f->time_created) . "</small></p></div>";
                        echo "</div></div>";
@@ -66,6 +66,6 @@ if ($files) {
        echo "</div>";
 } else {
 
-       echo "<p class='margin_top'>" . elgg_echo("file:none") . "</p>";
+       echo "<p class='margin-top'>" . elgg_echo("file:none") . "</p>";
 }
 ?>
\ No newline at end of file
index e7daddb43ed220566f0ff3562dcfe24eda347c53..43473e26122a168a81f6d23180f0924661b50e8a 100644 (file)
@@ -46,7 +46,7 @@
                $title = elgg_echo('groups:notfound');
                
                $area2 = elgg_view_title($title);
-               $area2 .= "<p class='margin_top'>".elgg_echo('groups:notfound:details')."</p>";
+               $area2 .= "<p class='margin-top'>".elgg_echo('groups:notfound:details')."</p>";
                
                $body = elgg_view_layout('one_column_with_sidebar', array('content' => $area2));
        }
index af8c0a447849549c2bf24c19a39c47211b77440b..7d61e2514e8caf341ae6a77d9a6790ddd85ff2ee 100644 (file)
@@ -35,7 +35,7 @@
 
 ?>
 <!-- display the input form -->
-<form id="group_addtopic" action="<?php echo elgg_get_site_url(); ?>action/<?php echo $action; ?>" method="post" class="margin_top">
+<form id="group_addtopic" action="<?php echo elgg_get_site_url(); ?>action/<?php echo $action; ?>" method="post" class="margin-top">
 <?php echo elgg_view('input/securitytoken'); ?>
 
        <p>
index 32e9f6ff36c62431fe8e9ba1379f7f348316574f..d3eb7ac688b4767184569bf0a2e24ea2314abda4 100644 (file)
@@ -13,7 +13,7 @@
        }
        
 ?>
-<form action="<?php echo elgg_get_site_url(); ?>action/groups/edit" id="edit_group" enctype="multipart/form-data" method="post" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/groups/edit" id="edit_group" enctype="multipart/form-data" method="post" class="margin-top">
 
        <?php echo elgg_view('input/securitytoken'); ?>
 
index 3298a745034d90d6d16d4b7a6520dc6cba217338..279e11a201e8ed39801b26d242c1e6eafd1afe0e 100644 (file)
@@ -12,7 +12,7 @@
 
 if ($friends) {
 ?>
-<form action="<?php echo elgg_get_site_url(); ?>action/groups/invite" method="post" id="invite_to_group" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/groups/invite" method="post" id="invite_to_group" class="margin-top">
 
 <?php
        echo elgg_view('input/securitytoken');
index 8cf2e4a7615dcd83c32643ce09f4c573bebe38b9..2c75c0a77574be70ec63df0b5ef36da2ef699bfd 100644 (file)
        \r
 ?>\r
 \r
-<div class="entity_listing topic clearfix">\r
+<div class="entity-listing topic clearfix">\r
 <a class="anchor_link" name="<?php echo $vars['entity']->id; ?>"></a>\r
        <?php\r
        // get infomation about the owner of the comment\r
        if ($post_owner = get_user($vars['entity']->owner_guid)) {\r
            // display the user icon\r
-           echo "<div class='entity_listing_icon'>" . elgg_view("profile/icon",array('entity' => $post_owner, 'size' => 'tiny')) . "</div>";\r
+           echo "<div class='entity-listing-icon'>" . elgg_view("profile/icon",array('entity' => $post_owner, 'size' => 'tiny')) . "</div>";\r
            // display the user name\r
-           echo "<div class='entity_listing_info'>";\r
+           echo "<div class='entity-listing-info'>";\r
            // if comment owner, group owner, or site admin - display edit and delete options\r
            if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {\r
-                       echo "<div class='entity_metadata'>";\r
+                       echo "<div class='entity-metadata'>";\r
                echo "<span class='delete-button'>".elgg_view("output/confirmlink",array(\r
                                'href' => "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'),\r
                                'text' => elgg_echo('delete'),\r
                                'confirm' => elgg_echo('deleteconfirm')\r
                                ))."</span>";\r
-                       echo "<span class='entity_edit'><a class='link' href=\"".elgg_get_site_url()."pg/groups/edittopic/{$group_guid}/{$topic}/\">".elgg_echo('edit')."</a></span>";\r
+                       echo "<span class='entity-edit'><a class='link' href=\"".elgg_get_site_url()."pg/groups/edittopic/{$group_guid}/{$topic}/\">".elgg_echo('edit')."</a></span>";\r
                        echo "</div>";\r
 \r
                }           \r
            \r
-           echo "<p class='entity_title'><a href='".$post_owner->getURL()."'>" . $post_owner->name . "</a></p>";\r
+           echo "<p class='entity-title'><a href='".$post_owner->getURL()."'>" . $post_owner->name . "</a></p>";\r
        } else {\r
-               echo "<div class='entity_listing_icon'><img src=\"" . elgg_view('icon/user/default/tiny') . "\" /></div>";\r
-               echo "<div class='entity_listing_info'><p class='entity_title'>" . elgg_echo('profile:deleteduser') . "</p>";\r
+               echo "<div class='entity-listing-icon'><img src=\"" . elgg_view('icon/user/default/tiny') . "\" /></div>";\r
+               echo "<div class='entity-listing-info'><p class='entity-title'>" . elgg_echo('profile:deleteduser') . "</p>";\r
        }\r
        \r
        //display the date of the comment\r
-       echo "<p class='entity_subtext'>" . elgg_view_friendly_time($vars['entity']->time_created) . "</p>";\r
-       echo "</div>"; // close entity_listing_info\r
-       echo "</div>"; // close entity_listing.topic\r
+       echo "<p class='entity-subtext'>" . elgg_view_friendly_time($vars['entity']->time_created) . "</p>";\r
+       echo "</div>"; // close entity-listing-info\r
+       echo "</div>"; // close entity-listing.topic\r
 \r
        //display the actual message posted\r
        echo "<div class='topic_post maintopic'>";\r
index 1426ba27419e6d3485ef21447b97e8f690af588e..fbe16858818ee90ac4070731606d1f6484e4a47c 100644 (file)
@@ -5,13 +5,13 @@
 ?>
 
 <div id="content_header" class="clearfix">
-       <div class="content_header_title">
+       <div class="content-header-title">
                <h2><?php echo elgg_echo("groups:forum"); ?></h2>
        </div>
        <?php // only show the add topic button if the user is a member
                if(elgg_get_page_owner()->isMember(get_loggedin_user())) {
        ?>
-               <div class="content_header_options">
+               <div class="content-header-options">
                        <a class="action-button" href="<?php echo elgg_get_site_url(); ?>mod/groups/addtopic.php?group_guid=<?php echo $vars['group_guid']; ?>"><?php echo elgg_echo("groups:addtopic"); ?></a>
                </div>
        <?php
@@ -22,4 +22,4 @@
 if($vars['topics'])
        echo $vars['topics'];
 else
-       echo "<p class='margin_top'>". elgg_echo("grouptopic:notcreated") . "</p>";
\ No newline at end of file
+       echo "<p class='margin-top'>". elgg_echo("grouptopic:notcreated") . "</p>";
\ No newline at end of file
index bf0db7e22281daf59ae2febbab0d9e738c735f3e..d5abe1e09240f1cef5d3c07ee0def7073388a77b 100644 (file)
@@ -6,7 +6,7 @@
         */
 
 ?>
-<p class="margin_top">
+<p class="margin-top">
 <?php 
 echo elgg_echo('groups:closedgroup');
 if (isloggedin()) {
index eb93c4bd9abfdd5a3294716c4f372f27dced669b..dcda51fd86e1d5971a62231848eec3297f354f5d 100644 (file)
@@ -14,7 +14,7 @@
        /* wraps group lists on 
        latest discussion, newest, popular */
 }
-.entity_subtext.groups {
+.entity-subtext.groups {
        float:right;
        width:300px;
        text-align: right;
        padding-bottom:40px;
        border-bottom:1px solid #CCCCCC;
 }
-.entity_listing.topic .topic_post p {
+.entity-listing.topic .topic_post p {
        margin:10px 0 5px 0;
 }
-.entity_listing.topic:hover {
+.entity-listing.topic:hover {
        background-color: white;
 }
 
@@ -42,7 +42,7 @@
 
 
 /* GROUPS SIDEBAR ELEMENTS */
-#groupsearchform .search_input {
+#groupsearchform .search-input {
        width:196px;
 }
 .featured_group {
@@ -52,7 +52,7 @@
        float:left;
        margin-right:10px;
 }
-.featured_group p.entity_title {
+.featured_group p.entity-title {
        margin-bottom:0;
 }
 .member_icon {
 .group_tool_widget.activity a.river_comment_form_button,
 .group_tool_widget.activity .river_comments_tabs,
 .group_tool_widget.activity .river_content_display,
-.group_tool_widget.activity .river_comments,
+.group_tool_widget.activity .river-comments,
 .group_tool_widget.activity .river_link_divider,
-.group_tool_widget.activity .river_user_like_button {
+.group_tool_widget.activity .river_user-like_button {
        display:none;
 }
-.group_tool_widget.activity .river_item .entity_subtext {
+.group_tool_widget.activity .river_item .entity-subtext {
        padding:0;
 }
 
-/* override default entity_listing_info width */
-.group_tool_widget .entity_listing_info {
+/* override default entity-listing-info width */
+.group_tool_widget .entity-listing-info {
        width:315px;
 }
 .group_widget_link {
index 580f1ca0fe3fc981ef6dc88eff1a06e729c4932b..0f9a3bedf4a1779358fbb1f439f4b5a5868e1888 100644 (file)
@@ -18,8 +18,8 @@
                                'size' => 'tiny',
                        ));
                                
-                       echo "<div class='featured_group'>".$icon."<p class='entity_title clearfix'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
-                       echo "<p class='entity_subtext'>" . $group->briefdescription . "</p></div>";
+                       echo "<div class='featured_group'>".$icon."<p class='entity-title clearfix'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
+                       echo "<p class='entity-subtext'>" . $group->briefdescription . "</p></div>";
                }
        }
 ?>
index 70d03e458908cecd9591e2fa895209bfc6a3dac4..0ad9f20188a2c9904f828985116d54f29ed69d16 100644 (file)
@@ -9,6 +9,6 @@ $tag_string = elgg_echo('groups:search:tags');
 ?>
 <h3><?php echo elgg_echo('groups:searchtag'); ?></h3>
 <form id="groupsearchform" action="<?php echo elgg_get_site_url(); ?>pg/groups/world/" method="get">
-       <input type="text" name="tag" value="<?php echo $tag_string; ?>" onclick="if (this.value=='<?php echo $tag_string; ?>') { this.value='' }" class="search_input" />
+       <input type="text" name="tag" value="<?php echo $tag_string; ?>" onclick="if (this.value=='<?php echo $tag_string; ?>') { this.value='' }" class="search-input" />
        <input type="submit" value="<?php echo elgg_echo('search:go'); ?>" />
 </form>
index d78a47456b9bf97aacbf39e1cab33e0afd3a2ee0..9b6f292e0645bd64a2353f22e469d33ef70bb858 100644 (file)
@@ -16,18 +16,18 @@ if($vars['entity']->forum_enable != 'no'){
                    
                 $count_annotations = $f->countAnnotations("generic_comment");
                  
-                   echo "<div class='entity_listing clearfix'>";
-                   echo "<div class='entity_listing_icon'>" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
-               echo "<div class='entity_listing_info'><p class='entity_title'><a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$f->guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "</a></p>";
-               echo "<p class='entity_subtext'>".elgg_echo('comments').": " . $count_annotations . "</p></div>";
+                   echo "<div class='entity-listing clearfix'>";
+                   echo "<div class='entity-listing-icon'>" . elgg_view('profile/icon',array('entity' => $f->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
+               echo "<div class='entity-listing-info'><p class='entity-title'><a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$f->guid}&group_guid={$vars['entity']->guid}\">" . $f->title . "</a></p>";
+               echo "<p class='entity-subtext'>".elgg_echo('comments').": " . $count_annotations . "</p></div>";
                echo "</div>";
         }
     } else {
            if(elgg_get_page_owner()->isMember(get_loggedin_user())){
                        $create_discussion = elgg_get_site_url() . "mod/groups/addtopic.php?group_guid=" . elgg_get_page_owner_guid();
-                       echo "<p class='margin_top'><a href=\"{$create_discussion}\">".elgg_echo("groups:addtopic")."</a></p>";
+                       echo "<p class='margin-top'><a href=\"{$create_discussion}\">".elgg_echo("groups:addtopic")."</a></p>";
                }else{
-                       echo "<p class='margin_top'>". elgg_echo("grouptopic:notcreated") . "</p>";
+                       echo "<p class='margin-top'>". elgg_echo("grouptopic:notcreated") . "</p>";
                }
     }
 
index aedb3f8e5989185e17d4f4182696579a1f267503..58ecf920f4565739b0a1b75a6a22488228b29424 100644 (file)
@@ -14,7 +14,7 @@
         $url = elgg_get_site_url() . "pg/groups/world/";
 
 ?>
-<div class="elgg_horizontal_tabbed_nav margin_top">
+<div class="elgg-horizontal-tabbed-nav margin-top">
 <div class="group_count"><?php echo $num_groups . " " . elgg_echo("groups:count"); ?></div>
 <ul>
        <li <?php if($filter == "newest") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=newest"><?php echo elgg_echo('groups:newest'); ?></a></li>
index 1466234abc8b5e5e89fe348023cfb92b24d0a638..dc6bdb4a4f5729fbb3cd105954595c93444e1a48 100644 (file)
@@ -21,7 +21,7 @@ if($membership == ACCESS_PUBLIC) {
        $mem = elgg_echo("groups:closed");
 }
 
-$info .= "<p class='entity_subtext groups'>" . $mem . " / <b>" . get_group_members($vars['entity']->guid, 10, 0, 0, true) ."</b> " . elgg_echo("groups:member");
+$info .= "<p class='entity-subtext groups'>" . $mem . " / <b>" . get_group_members($vars['entity']->guid, 10, 0, 0, true) ."</b> " . elgg_echo("groups:member");
 
 //for admins only - display the feature or unfeature option
 if(isadminloggedin()) {
@@ -37,8 +37,8 @@ if(isadminloggedin()) {
 }
 
 $info .= "</p>";
-$info .= "<p class='entity_title'><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></p>";
-$info .= "<p class='entity_subtext'>" . $vars['entity']->briefdescription . "</p>";
+$info .= "<p class='entity-title'><a href=\"" . $vars['entity']->getUrl() . "\">" . $vars['entity']->name . "</a></p>";
+$info .= "<p class='entity-subtext'>" . $vars['entity']->briefdescription . "</p>";
 
 echo elgg_view_listing($icon, $info);
 
index 4369013684050a827c886baa2699dc19057bd06d..42928a12fbb1ebfd658d243ec7ce0abe8c3b2686 100644 (file)
@@ -50,7 +50,7 @@ if ($vars['entity']->isMember($user)) {
 // build action buttons
 $action_buttons = '';
 if (!empty($actions)) {
-       $action_buttons = '<div class="content_header_options">';
+       $action_buttons = '<div class="content-header-options">';
        foreach ($actions as $url => $action) {
                $action_buttons .= "<a class=\"action-button\" href=\"$url\">$action</a>";
        }
@@ -64,7 +64,7 @@ echo elgg_view('navigation/breadcrumbs');
 // build and display header
 echo <<<__HTML
 <div id="content_header" class="clearfix">
-       <div class="content_header_title">
+       <div class="content-header-title">
                <h2>{$vars['entity']->name}</h2>
        </div>
        $action_buttons
index 4674a3c2390542c64179d48340f962e260c63284..a1cca6489e11ec8a7563a064cf854d798a47f71b 100644 (file)
@@ -6,9 +6,9 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
                if ($group instanceof ElggGroup) {
                
                ?>
-               <div class="entity_listing group_invitations clearfix">
+               <div class="entity-listing group_invitations clearfix">
                        <?php
-                               echo "<div class='entity_listing_icon'>";
+                               echo "<div class='entity-listing-icon'>";
                                echo elgg_view("profile/icon", array(
                                        'entity' => $group,
                                        'size' => 'tiny',
@@ -17,7 +17,7 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
 
                        $url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/join?user_guid={$user->guid}&group_guid={$group->guid}");
                        ?>
-                       <div class="entity_listing_info">
+                       <div class="entity-listing-info">
                        <a href="<?php echo $url; ?>" class="submit-button"><?php echo elgg_echo('accept'); ?></a>
                        <?php           
                                echo str_replace('<a', '<a class="action-button disabled" ', elgg_view('output/confirmlink',array(
@@ -26,8 +26,8 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
                                        'text' => elgg_echo('delete'),
                                )));
                        
-                       echo "<p class='entity_title'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
-                       echo "<p class='entity_subtext'>" . $group->briefdescription . "</p>";
+                       echo "<p class='entity-title'><a href=\"" . $group->getUrl() . "\">" . $group->name . "</a></p>";
+                       echo "<p class='entity-subtext'>" . $group->briefdescription . "</p>";
 
                        ?>
                </div></div>
@@ -35,6 +35,6 @@ if (!empty($vars['invitations']) && is_array($vars['invitations'])) {
                }
 
        } else {
-               echo "<p class='default_string margin_top'>" . elgg_echo('groups:invitations:none') . "</p>";
+               echo "<p class='default_string margin-top'>" . elgg_echo('groups:invitations:none') . "</p>";
 }
 ?>
\ No newline at end of file
index 6cb5f75f6336b93adf71d79e9527af438c0de542..714b8e8f97003c333f8c277498e8dc73a5faa272 100644 (file)
@@ -6,9 +6,9 @@
                                if ($request instanceof ElggUser) {
        
        ?>
-               <div class="entity_listing group_invitations clearfix">
+               <div class="entity-listing group_invitations clearfix">
                                <?php
-                                       echo "<div class='entity_listing_icon'>";
+                                       echo "<div class='entity-listing-icon'>";
                                        echo elgg_view("profile/icon", array(
                                                'entity' => $request,
                                                'size' => 'small',
@@ -18,7 +18,7 @@
                                        
                                        $url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/groups/addtogroup?user_guid={$request->guid}&group_guid={$vars['entity']->guid}");
                                        ?>
-                                       <div class="entity_listing_info">
+                                       <div class="entity-listing-info">
                                        <a href="<?php echo $url; ?>" class="submit-button"><?php echo elgg_echo('accept'); ?></a>
                                        <?php   
                                        echo str_replace('<a', '<a class="action-button disabled" ', elgg_view('output/confirmlink',array(
@@ -26,8 +26,8 @@
                                                'confirm' => elgg_echo('groups:joinrequest:remove:check'),
                                                'text' => elgg_echo('delete'),
                                        )));
-                               echo "<p class='entity_title'><a href=\"" . $request->getUrl() . "\">" . $request->name . "</a></p>";
-                               echo "<p class='entity_subtext'>" . $request->briefdescription . "</p>";
+                               echo "<p class='entity-title'><a href=\"" . $request->getUrl() . "\">" . $request->name . "</a></p>";
+                               echo "<p class='entity-subtext'>" . $request->briefdescription . "</p>";
                                ?>
                        </div>
                </div>
index efa4dee792892f98b3ff39d2429e8a6d5afbb7e3..551e256db91618c360002f880b1e937748fcadb3 100644 (file)
@@ -27,32 +27,32 @@ $u = get_user($last_user);
 if (elgg_get_context() == "search") {
        var_export($counter);
        if($counter == 1){
-               $info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) .  "<br />";
+               $info = "<p class='entity-subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) .  "<br />";
        }else{
-               $info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) .  "<br />";
+               $info = "<p class='entity-subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) .  "<br />";
        }
        if (($last_time) && ($u)) $info.= elgg_echo('groups:lastupdated', array(elgg_view_friendly_time($last_time), " <a href=\"" . $u->getURL() . "\">" . $u->name . "</a>"));
        $info .= '</p>';
        //get the group avatar
        $icon = elgg_view("profile/icon",array('entity' => $u, 'size' => 'tiny'));
        //get the group and topic title
-       $info .= "<p class='entity_subtext'><b>" . elgg_echo('groups:topic') . ":</b> <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
+       $info .= "<p class='entity-subtext'><b>" . elgg_echo('groups:topic') . ":</b> <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
        if ($group instanceof ElggGroup) {
-               $info .= "<p class='entity_title'><b>" . elgg_echo('group') . ":</b> <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>";
+               $info .= "<p class='entity-title'><b>" . elgg_echo('group') . ":</b> <a href=\"{$group->getURL()}\">".htmlentities($group->name, ENT_QUOTES, 'UTF-8') ."</a></p>";
        }
 
 } else {
        if($counter == 1){
-               $info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) . "</p>";
+               $info = "<p class='entity-subtext groups'>" . elgg_echo('groups:forum:created:single', array($forum_created, $counter)) . "</p>";
        }else{
-               $info = "<p class='entity_subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) . "</p>";
+               $info = "<p class='entity-subtext groups'>" . elgg_echo('groups:forum:created', array($forum_created, $counter)) . "</p>";
        }
-       $info .= "<p class='entity_title'>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
+       $info .= "<p class='entity-title'>" . elgg_echo('groups:started') . " " . $topic_owner->name . ": <a href=\"".elgg_get_site_url()."mod/groups/topicposts.php?topic={$vars['entity']->guid}&group_guid={$group->guid}\">{$title}</a></p>";
 
        if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {
                        // display the delete link to those allowed to delete
-                       $info .= "<div class='entity_metadata'>";
-                       $info .= '<span class="entity_edit">' . elgg_view("output/url", array(
+                       $info .= "<div class='entity-metadata'>";
+                       $info .= '<span class="entity-edit">' . elgg_view("output/url", array(
                                                                                                                                                        'href' => "mod/groups/edittopic.php?group={$vars['entity']->container_guid}&topic={$vars['entity']->guid}",
                                                                                                                                                        'text' => elgg_echo('edit'),
                                                                                                                                                ));
@@ -71,7 +71,7 @@ if (elgg_get_context() == "search") {
        if (($last_time) && ($u)) {
                $commenter_link = "<a href\"{$u->getURL()}\">$u->name</a>";
                $text = elgg_echo('groups:lastcomment', array(elgg_view_friendly_time($last_time), $commenter_link));
-               $info .= "<p class='entity_subtext'>$text</p>";
+               $info .= "<p class='entity-subtext'>$text</p>";
        }
        //get the user avatar
        $icon = elgg_view("profile/icon",array('entity' => $topic_owner, 'size' => 'tiny'));
index 69481e97e26bbd175d4b5fa9164af1f49da986b1..2e8365ec28a9a8689996615c019418cb61a09c30 100644 (file)
@@ -17,7 +17,7 @@
        $url = elgg_get_site_url() . "mod/groups/topicposts.php?topic=" . $forumtopic . "&group_guid=" . $group_guid;
        $url_user = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
        $string = elgg_echo("groupforum:river:posted", array($url_user)) . " ";
-       $string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
+       $string .= elgg_echo("groupforum:river:annotate:create") . " | <a href=\"" . $url . "\">" . $object->title . "</a> <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created) ."<a class='river_comment_form_button link' href=\"{$object_url}\">Visit discussion</a>";
        $string .= elgg_view('likes/forms/link', array('entity' => $object));
        $string .= "</span>";
        if ($comment) {
index e595b1fdc09b61b85ae28f4d5eee3a552f54cd04..e73064e007447532de009f44fe7b43fd7f7f1bed 100644 (file)
@@ -16,7 +16,7 @@
        $string = elgg_echo("groupforum:river:postedtopic", array($url_user)) . ": ";
        $string .= "<a href=\"" . $url . "\">" . $object->title . "</a>";
        $string .= " " . elgg_echo('groups:ingroup') . " <a href=\"{$group->getURL()}\">" . $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() && $object->status != "closed") {
                $string .= '<a class="river_comment_form_button link">' . elgg_echo('generic_comments:text') . '</a>';
                $string .= elgg_view('likes/forms/link', array('entity' => $object));
index ef0aaab1b4e7d98df1d8a0850442e4e7ad0cda79..4774e7a85488def2c80ed7baf6008dadb0522317 100644 (file)
@@ -7,7 +7,7 @@
        $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
        $string = elgg_echo("groups:river:create", array($url)) . " ";
        $string .= " <a href=\"" . $object->getURL() . "\">" . $object->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 .= elgg_view('likes/forms/link', array('entity' => $object));
        }
index 3ba191676f261534b7272b3d6283c4dd328e52a0..430e958391b930c8eac0ee982d880fcddf891165 100644 (file)
@@ -7,7 +7,7 @@
        $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
        $string = elgg_echo("groups:river:member", array($url)) . " ";
        $string .= " <a href=\"" . $object->getURL() . "\">" . $object->name . "</a>";
-       $string .= " <span class='entity_subtext'>". elgg_view_friendly_time($vars['item']->posted);
+       $string .= " <span class='entity-subtext'>". elgg_view_friendly_time($vars['item']->posted);
        $string .= "</span>";
 ?>
 
index f189d4525e8f9d33763f5b928ec0ecdd4f9ae3f1..dceac6bbc76f6aefda41bdf42a8076736ed4d635 100644 (file)
@@ -14,7 +14,7 @@ if ($CONFIG->allow_registration) {
 
        echo <<< HTML
 <h2>$invite</h2>
-<p class="margin_top">
+<p class="margin-top">
        <label>
                $introduction
                <textarea class="input-textarea" name="emails" ></textarea>
index a4f21da1352a0e91cee9b7dcd5681235e7249713..5a62e9d46d8439c4581c01f16fa2cf1baba10836 100644 (file)
@@ -71,7 +71,7 @@ switch($filter){
                break;
 }
 
-$area2 .= elgg_view('page_elements/content', array('body' => elgg_view("members/members_navigation", array("count" => $members, "filter" => $filter)) . "<div class='members_list'>".$filter_content."</div>", 'subclass' => 'members'));
+$area2 .= elgg_view('page_elements/content', array('body' => elgg_view("members/members_navigation", array("count" => $members, "filter" => $filter)) . "<div class='members-list'>".$filter_content."</div>", 'subclass' => 'members'));
 
 //select the correct canvas area
 $params = array(
index 9c92398fcc37f335b9954177ca6fa8daae547950..6695537a2f29d46386a817e34bc6290f301cc5fa 100644 (file)
@@ -19,6 +19,6 @@
        height:auto;
        margin:4px 0 5px 0;
 }
-#memberssearchform .search_input {
+#memberssearchform .search-input {
        width:196px;
 }
\ No newline at end of file
index f3d53a95443d509b237499d683e5c470ef31668c..c866e194d5c44e15b2a5de63ff8b870480d1f5f9 100644 (file)
@@ -14,7 +14,7 @@
         $url = elgg_get_site_url() . "mod/members/index.php";
 
 ?>
-<div class="elgg_horizontal_tabbed_nav margin_top">
+<div class="elgg-horizontal-tabbed-nav margin-top">
 <ul>
        <li <?php if($filter == "newest") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=newest"><?php echo elgg_echo('members:label:newest'); ?></a></li>
        <li <?php if($filter == "pop") echo "class='selected'"; ?>><a href="<?php echo $url; ?>?filter=pop"><?php echo elgg_echo('members:label:popular'); ?></a></li>
index 746db67a0d5ad63f6b63b19a79eba075a9a6028a..98ec20549779e4c75b13df56e2ce8e85453d0af9 100644 (file)
@@ -9,14 +9,14 @@
 
 <h3><?php echo elgg_echo('members:searchtag'); ?></h3>
 <form id="memberssearchform" class="member_tags" action="<?php echo elgg_get_site_url(); ?>mod/members/index.php?" method="get">
-       <input type="text" name="tag" value="Member tags" onclick="if (this.value=='Member tags') { this.value='' }" class="search_input" />
+       <input type="text" name="tag" value="Member tags" onclick="if (this.value=='Member tags') { this.value='' }" class="search-input" />
        <input type="hidden" name="filter" value="search_tags" />       
        <input type="submit" value="<?php echo elgg_echo('search:go'); ?>" />
 </form>
 
 <h3><?php echo elgg_echo('members:searchname'); ?></h3>
 <form id="memberssearchform" class="member_name" action="<?php echo elgg_get_site_url(); ?>mod/members/index.php?" method="get">
-       <input type="text" name="tag" value="Members name" onclick="if (this.value=='Members name') { this.value='' }" class="search_input" />
+       <input type="text" name="tag" value="Members name" onclick="if (this.value=='Members name') { this.value='' }" class="search-input" />
        <input type="hidden" name="subtype" value="" />
        <input type="hidden" name="object" value="user" />
        <input type="hidden" name="filter" value="search" />    
index 2f85a16ac18d639f6b697800760d55c44962baf8..305a6980f90a4e6e1a773b1d7299a4535d58fd39 100644 (file)
@@ -25,7 +25,7 @@ if (isloggedin()) {
                $("#postit").click(function(){
 
                        //display the ajax loading gif at the start of the function call
-                       //$('#loader').html('<img src="<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader.gif" />');
+                       //$('#loader').html('<img src="<?php echo elgg_get_site_url(); ?>_graphics/ajax-loader.gif" />');
                        $('#loader').html('<?php echo elgg_view('ajax/loader',array('slashes' => TRUE)); ?>');
 
                        //load the results back into the message board contents and remove the loading gif
index 496a8ee9d0f02078d1071204808781a8478e6789..53aeef2aa7b3c76ffae4b0cd282a50ccca0a72c6 100644 (file)
@@ -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
index 7331a8d5252102febc7b63e6dc82132734941621..34dc116920139447009ac51924cbae0d6f6ce34b 100644 (file)
@@ -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));
index b186400f88291ca678789ca1d9bac6a9446861f5..3e58c2607b6f9f508b2f86dea5cf36a1aa6eb51c 100644 (file)
@@ -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 {
index 15eb3ebd07296b0a2413e74d5a71c3903bcc4646..0b78f4db3f7cc4adcb8cceccdcbc32193b27adaa 100644 (file)
@@ -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 -->                                                  
index 43ece8d898e14da19e0db19b7a46a152dde765bf..9a83ce103f9c1851259b295e9f9da7db9261b958 100644 (file)
@@ -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(
index 6fc87ac0e83373ce9d6d9ddb9cacb9065380e7be..b489cbacd6b676b1515e0baea8822120028f664b 100644 (file)
@@ -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>
index 76fa4a00c7239a3ca40707030e936f65e8ba11c9..cc0b5ec3afb0af69fa96a04a3e3183d88e1af663 100644 (file)
@@ -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> ';
                }
 
 
index cea806f2f74ef664a5d6dfd62509cc1085ba468d..eb9e4778e5edde0ae98b142bf5f319ce8324b235 100644 (file)
@@ -17,7 +17,7 @@ function notifications_plugin_init() {
        elgg_register_event_handler('pagesetup', 'system', 'notifications_plugin_pagesetup');
 
        // Unset the default notification settings
-       elgg_unregister_plugin_hook_handler('usersettings:save', 'user', 'notification_user_settings_save');
+       elgg_unregister_plugin_hook_handler('usersettings:save', 'user', 'notification_user-settings_save');
        elgg_unextend_view('usersettings/user', 'notifications/settings/usersettings');
 
        // update notifications based on relationships changing
@@ -26,7 +26,7 @@ function notifications_plugin_init() {
 
        // update notifications when new friend or access collection membership
        elgg_register_event_handler('create', 'friend', 'notifications_update_friend_notify');
-       elgg_register_plugin_hook_handler('access:collections:add_user', 'collection', 'notifications_update_collection_notify');
+       elgg_register_plugin_hook_handler('access:collections:add-user', 'collection', 'notifications_update_collection_notify');
 }
 
 /**
@@ -161,7 +161,7 @@ function notifications_update_collection_notify($event, $object_type, $returnval
                }
                if (in_array($collection_id, $collections_preferences)) {
                        // notifications are on for this collection so we add/remove
-                       if ($event == 'access:collections:add_user') {
+                       if ($event == 'access:collections:add-user') {
                                add_entity_relationship($user->guid, "notify$method", $member_guid);
                        } elseif ($event == 'access:collections:remove_user') {
                                // removing someone from an access collection is not a guarantee
index 713dff7652cbb53feb6006ebc79b839f05b82963..8cca1368974976ebc1eb6dc32fd5d3916f4961ca 100644 (file)
@@ -17,7 +17,7 @@
 <h3>
        <?php echo elgg_echo('notifications:subscriptions:friends:title'); ?>
 </h3>
-<p class="margin_none">
+<p class="margin-none">
        <?php echo elgg_echo('notifications:subscriptions:friends:description'); ?>
 </p>
 <table id="notificationstable" cellspacing="0" cellpadding="4" border="0" width="100%">
index 6c18f6fcade510e856308bdc8efc6a1b0f79db2e..449f908a705e69e80e452ce4d807f7bd41260188 100644 (file)
@@ -14,7 +14,7 @@
        
 // Display a description
 ?>
-<div class="user_settings notifications">
+<div class="user-settings notifications">
 <?php
 
 
index 7cc393442cad15af45de0cf5dccf83820ab4b457..0576bc7b99aa700bef505c1446e536c3fc607172 100644 (file)
@@ -96,7 +96,7 @@ if (!$callback) {
                        
 ?>
 
-<div class="friends_picker">
+<div class="friends-picker">
 
 <?php
 
@@ -106,7 +106,7 @@ if (!$callback) {
        
 ?>
 
-       <div id="friends_picker_placeholder<?php echo $friendspicker; ?>">
+       <div id="friends-picker_placeholder<?php echo $friendspicker; ?>">
 
 <?php
        
@@ -149,9 +149,9 @@ if (!isset($vars['replacement'])) {
                
 ?>
 
-       <div class="friends_picker_wrapper">
-       <div id="friends_picker<?php echo $friendspicker; ?>">
-               <div class="friends_picker_container">
+       <div class="friends-picker-wrapper">
+       <div id="friends-picker<?php echo $friendspicker; ?>">
+               <div class="friends-picker-container">
 <?php
 
        // Initialise letters
@@ -289,7 +289,7 @@ if (!isset($vars['replacement'])) {
 
 <script type="text/javascript">
                // initialise picker
-               $("div#friends_picker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
+               $("div#friends-picker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
 </script>
 <script type="text/javascript">
        $(document).ready(function () {
@@ -300,7 +300,7 @@ if (!isset($vars['replacement'])) {
                foreach($activeletters as $letter) {
                        $tab = elgg_strpos($chararray, $letter) + 1;
 ?>
-       $("div#friends_picker_navigation<?php echo $friendspicker; ?> li.tab<?php echo $tab; ?> a").addClass("tabHasContent");
+       $("div#friends-picker-navigation<?php echo $friendspicker; ?> li.tab<?php echo $tab; ?> a").addClass("tabHasContent");
 <?php
                }
        }
index b89350acbabfd25b330812fb122f2eedd9ee64bc..bf75f59319d0f235306d6c3b8c89668db158bbc3 100644 (file)
@@ -20,7 +20,7 @@ foreach($NOTIFICATION_HANDLERS as $method => $foo) {
 echo elgg_view_title(elgg_echo('notifications:subscriptions:changesettings:groups'));
 ?>
 
-<div class="user_settings margin_top">
+<div class="user-settings margin-top">
 
        <?php
                echo elgg_view('notifications/subscriptions/jsfuncs',$vars);
index f85e4d42e219fa4009991e29468b0509ccd9eae9..221ca0e21311cba641514f10ab31ceba3e43ecf7 100644 (file)
@@ -13,7 +13,7 @@ $url = $object->getURL();
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 $contents = strip_tags($object->description); //strip tags from the contents to stop large images etc blowing out the river view
 $string = elgg_echo("pages:river:created", array($url)) . " ";
-$string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a> <span class='entity_subtext'>". elgg_view_friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>";
+$string .= elgg_echo("pages:river:create") . " <a href=\"" . $object->getURL() . "\">" . $object->title . "</a> <span class='entity-subtext'>". elgg_view_friendly_time($object->time_created) ."</span> <a class='river_comment_form_button link'>Comment</a>";
 $string .= elgg_view('likes/forms/link', array('entity' => $object));
 $string .= "<div class=\"river_content_display\">";
 $string .= elgg_get_excerpt($contents, 200);
index a45c3adde33562f21ad6a30584267da12462d5b7..56670dcf0c3c13897e0379de8d70de8ba96e412f 100644 (file)
@@ -12,7 +12,7 @@ if (is_array($vars['annotation']) && sizeof($vars['annotation']) > 0) {
                echo elgg_view("profile/commentwall/commentwall_content", array('annotation' => $content));
        }                       
 } else {
-       echo "<p class='margin_top'>" . elgg_echo("profile:commentwall:none") . "</p>";
+       echo "<p class='margin-top'>" . elgg_echo("profile:commentwall:none") . "</p>";
 }
 //close the wrapper div
 echo "</div>";
\ No newline at end of file
index a7a7ca14d420be93d6ec12a403bfa59f91c7c9c9..a0785b5658e185e57239fa58835cab3f5f57051c 100644 (file)
@@ -3,19 +3,19 @@
 * Elgg Message board individual item display page
  */
 ?>
-<div class="entity_listing clearfix">
+<div class="entity-listing clearfix">
     <!-- display the user icon of the user that posted the message -->
-    <div class="entity_listing_icon">          
+    <div class="entity-listing-icon">          
         <?php
             echo elgg_view("profile/icon",array('entity' => get_entity($vars['annotation']->owner_guid), 'size' => 'tiny'));
         ?>
     </div>
     
-    <div class="entity_listing_info">
+    <div class="entity-listing-info">
        <?php
         // if the user looking at the comment can edit, show the delete link
            if ($vars['annotation']->canEdit()) {
-                              echo "<div class='entity_metadata'><span class='delete-button'>" . elgg_view("output/confirmlink",array(
+                              echo "<div class='entity-metadata'><span class='delete-button'>" . elgg_view("output/confirmlink",array(
                                                        'href' => "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id,
                                                                'text' => elgg_echo('delete'),
                                                                'confirm' => elgg_echo('deleteconfirm'),
@@ -23,7 +23,7 @@
            } //end of can edit if statement
        ?>
            <!-- display the user's name who posted and the date/time -->
-           <p class="entity_subtext">
+           <p class="entity-subtext">
                <?php echo get_entity($vars['annotation']->owner_guid)->name . " " . elgg_view_friendly_time($vars['annotation']->time_created); ?>
            </p>        
                <!-- output the actual comment -->
index d1941bbc81cf8ae1eb7c83b9c2835dfa8e0ce664..537d9261eb3937e854c6a10f8b16e6cb2d0527b2 100644 (file)
        width:230px;
        float:left;
 }
-.elgg_horizontal_tabbed_nav.profile {
+.elgg-horizontal-tabbed-nav.profile {
        margin-top:0px;
        margin-bottom:25px;
        position:relative;
 }
-.elgg_horizontal_tabbed_nav.profile .profile_name {
+.elgg-horizontal-tabbed-nav.profile .profile_name {
        display:block;
        width:265px;
        position:absolute;
 }
-.elgg_horizontal_tabbed_nav.profile .profile_name h2 {
+.elgg-horizontal-tabbed-nav.profile .profile_name h2 {
        margin:0;
        padding:0;
        border:none;
 }
-.elgg_horizontal_tabbed_nav.profile ul {
+.elgg-horizontal-tabbed-nav.profile ul {
        margin-left:260px;
 }
 
@@ -89,7 +89,7 @@ img.medium {
        padding:15px;
        min-height:270px;
 }
-#elgg_sidebar #owner_block {
+#elgg-sidebar #owner_block {
        background-color: white;
        -webkit-border-radius: 8px; 
        -moz-border-radius: 8px;
@@ -110,7 +110,7 @@ img.medium {
 #owner_block .owner_block_contents {
        margin-left: 50px;
 }
-#elgg_sidebar #owner_block .owner_block_contents {
+#elgg-sidebar #owner_block .owner_block_contents {
        margin-left: 34px;
 }
 #owner_block .owner_block_contents h3 {
@@ -249,7 +249,7 @@ img.medium {
 /* ***************************************
        friends panel within profile
 *************************************** */
-#profile_content .entity_listing .entity_listing_info {
+#profile_content .entity-listing .entity-listing-info {
        width:664px;
 }
 
@@ -351,10 +351,10 @@ p.visit_twitter a {
        -moz-border-radius: 6px;
 }
 /* banned user in friends lists */
-.entity_listing_info p.entity_title.user.banned {
+.entity-listing-info p.entity-title.user.banned {
        text-decoration: line-through;
 }
-.entity_listing_info p.entity_title.user.banned a {
+.entity-listing-info p.entity-title.user.banned a {
        color:red;
 }
 
index 4ca72338538cb40b3fdc52b651b15f17b3d5b000..2e3ec24a4cc3d3d635baf2d1a41d634ed63314c8 100644 (file)
@@ -8,7 +8,7 @@
  * @uses $vars['profile'] Profile items from $CONFIG->profile, defined in profile/start.php for now 
  */
 ?>
-<form action="<?php echo elgg_get_site_url(); ?>action/profile/edit" method="post" id="edit_profile" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/profile/edit" method="post" id="edit_profile" class="margin-top">
 <?php echo elgg_view('input/securitytoken') ?>
 
        <p><label>
index 4993e1c7fdfb8db4a95707c3adf4bdef31a8637b..7d701af117fa6486938d5c171a46476bd9f69b4c 100644 (file)
@@ -25,5 +25,5 @@ $formbody = <<< END
                $submit_control</p>
 END;
 
-echo "<p class='margin_top'>" . elgg_echo('profile:explainchangefields') . "</p>";
+echo "<p class='margin-top'>" . elgg_echo('profile:explainchangefields') . "</p>";
 echo elgg_view('input/form', array('body' => $formbody, 'action' => 'action/profile/editdefault'));
index 4c093cb2211b7ece851657ecdc3e29e79de1e522..29ce7f138a4733084c9156bafe523e0f5b386cb1 100644 (file)
@@ -51,7 +51,7 @@ END;
                //$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
                $url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/profile/editdefault/delete?id={$item->shortname}");
                echo "<li id=\"{$item->shortname}\"><div class='delete-button'><a href=\"$url\">" . elgg_echo('delete') . "</a></div>";
-               echo "<img width='16' height='16' class='handle' alt='move' title='Drag here to reorder this item' src='".elgg_get_site_url()."mod/profile/graphics/drag_handle.png'/>";
+               echo "<img width='16' height='16' class='handle' alt='move' title='Drag here to reorder this item' src='".elgg_get_site_url()."mod/profile/graphics/drag-handle.png'/>";
                echo "<b class=\"profile_field_editable\"><span class=\"{$item->shortname}_editable\">$item->translation</span></b>:  [".elgg_echo($item->type)."]";
                echo "</li>";
 
index 9e1987d55b8acb3629041ea60a12e86af84ce252..9eeaecb4ae7991799e7f08668e5b1389723328c7 100644 (file)
@@ -15,7 +15,7 @@ $currentuser = get_loggedin_user();
 <!-- grab the required js for icon cropping -->
 <script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>mod/profile/views/default/js/jquery.imgareaselect-0.8.min.js"></script>
 
-<p class="margin_top"><?php echo elgg_echo('profile:profilepictureinstructions'); ?></p>
+<p class="margin-top"><?php echo elgg_echo('profile:profilepictureinstructions'); ?></p>
 
 <div id="current_user_avatar">
 
index 96b3d24d58fa7f24cbf095d7a45e1683eed46b3f..0622264b8c19c270c9fdaaadff4a4bc24393083b 100644 (file)
@@ -29,15 +29,15 @@ if ($rel_type) {
 }
 
 if (!$banned) {
-       $info .= "<p class='entity_title user'><a href=\"" . $vars['entity']->getUrl() . "\" $rel>" . $vars['entity']->name . "</a></p>";
+       $info .= "<p class='entity-title user'><a href=\"" . $vars['entity']->getUrl() . "\" $rel>" . $vars['entity']->name . "</a></p>";
        $location = $vars['entity']->location;
        if (!empty($location)) {
-               $info .= "<p class='entity_subtext user'>" . elgg_echo("profile:location") . ": " . elgg_view("output/tags",array('value' => $vars['entity']->location)) . "</p>";
+               $info .= "<p class='entity-subtext user'>" . elgg_echo("profile:location") . ": " . elgg_view("output/tags",array('value' => $vars['entity']->location)) . "</p>";
        }
        //create a view that a status plugin could extend - in the default case, this is the wire
        $info .= elgg_view("profile/status", array("entity" => $vars['entity']));
 }else{
-       $info .= "<p class='entity_title user banned'>";
+       $info .= "<p class='entity-title user banned'>";
        if (isadminloggedin())
                $info .= "<a href=\"" . $vars['entity']->getUrl() . "\">";
        $info .= $vars['entity']->name;
index a27cf789d6036146070838a33eb79225ada1191c..ca0873ebd7f6f4d5e224c3b099f6a9d338a47ee6 100755 (executable)
@@ -45,7 +45,7 @@ switch($section){
                break;
 }
 ?>
-<div class="elgg_horizontal_tabbed_nav profile">
+<div class="elgg-horizontal-tabbed-nav profile">
 <div class="profile_name"><h2><?php echo $user->name; ?></h2></div>
 <ul>
        <li <?php echo $activity; ?>><a href="<?php echo $url; ?>"><?php echo elgg_echo('activity'); ?></a></li>
index 9e617573b8701e138f748f8fd18f6737c6414f1d..d7b15dab51eecb4d0dd6c9766658f04bb546ef38 100644 (file)
@@ -3,6 +3,6 @@
        $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
 
        $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-       $string = elgg_echo("profile:river:update", array($url)) ." <span class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
+       $string = elgg_echo("profile:river:update", array($url)) ." <span class='entity-subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
 
        echo $string;
\ No newline at end of file
index 156aa8b1b2fc24b3ddb88da672048f4a19857ebe..155b25fa9ff36d0deeb59e0a8f0a80c25e3c3bfd 100644 (file)
@@ -3,7 +3,7 @@
        $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
 
        $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
-       $string = elgg_echo("profile:river:update", array($url)) ." <span class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
+       $string = elgg_echo("profile:river:update", array($url)) ." <span class='entity-subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
 
 ?>
 
index 0cf8643a32cbc6731498dbd1982d1ae767d551ff..3f79d500abf1f06c823fbd22d0746ca0deb9e064 100644 (file)
@@ -9,7 +9,7 @@ $title = elgg_view_title(elgg_echo('reportedcontent'));
 
 $list = elgg_list_entities(array('types' => 'object', 'subtypes' => 'reported_content'));
 if (!$list) {
-       $list = '<p class="margin_top">' . elgg_echo('reportedcontent:none') . '</p>';
+       $list = '<p class="margin-top">' . elgg_echo('reportedcontent:none') . '</p>';
 }
 
 $body = <<<__HTML
index b22bc05f6f3d3ff3e93ce3db058b63f3bd1433a4..e70afacf8cc80b6f7b138fe738cf2e4332ea1af7 100644 (file)
@@ -18,7 +18,7 @@ $shares = array();
 $owner = get_loggedin_user();
 
 ?>
-<form action="<?php echo elgg_get_site_url(); ?>action/reportedcontent/add" method="post" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/reportedcontent/add" method="post" class="margin-top">
 <?php echo elgg_view('input/securitytoken'); ?>
 
        <p>
index 22d89bcfd940c5f7b3d6ecc8bc90f71772970639..f130cfd3cdc28258a9441b00941150d7de65d821 100644 (file)
@@ -25,16 +25,16 @@ foreach ($comments as $comment) {
        $comment_owner_url = $comment_owner->getURL();
 
        //display comment
-       echo "<div class='river_comment clearfix'>";
-       echo "<span class='river_comment_owner_icon'>";
+       echo "<div class='river-comment clearfix'>";
+       echo "<span class='river-comment-owner-icon'>";
        echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny'));
        echo "</span>";
 
        //truncate comment to 150 characters and strip tags
        $contents = elgg_get_excerpt($comment->value, 150);
 
-       echo "<div class='river_comment_contents'>";
+       echo "<div class='river-comment-contents'>";
        echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . '</a>&nbsp;<span class="twitter_anywhere">' . parse_urls($contents) . '</span>';
-       echo "<span class='entity_subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
+       echo "<span class='entity-subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
        echo "</div></div>";
 }
\ No newline at end of file
index 5dd3bff5e63f2a0a7585dacc592043d16d5e80d7..239582bf25fd4ff80aad469bf140358bf6258e62 100644 (file)
@@ -17,8 +17,8 @@ $last_reload = time() - $seconds_passed;
 
 // This entire system is driven by the river table.
 // There is no core interface to simply grab the number of entries in the table.
-// In order for something to count as an update, you must put a call to add_river_item().
-// @todo Remove this when elgg_get_river_items() supports 1.7-style API and count => TRUE and not group by object_guid
+// In order for something to count as an update, you must put a call to add_river-item().
+// @todo Remove this when elgg_get_river-items() supports 1.7-style API and count => TRUE and not group by object_guid
 
 // river table does not have columns expected by get_access_sql_suffix so we modify its output
 $access = str_replace("and enabled='yes'", '', str_replace('owner_guid', 'subject_guid', get_access_sql_suffix_new('r', 'e')));
@@ -34,7 +34,7 @@ if ($d = get_data($q)) {
 
 if ($all_activity > 0) {
        $s = ($all_activity == 1) ? '' : 's';
-       echo "<a href='' onClick=\"window.location.reload();\" class='update_link'>$all_activity update$s!</a>";
+       echo "<a href='' onClick=\"window.location.reload();\" class='update-link'>$all_activity update$s!</a>";
 ?>
        <script type="text/javascript">
                $(document).ready(function(){
index 8d650e1f5b770768f6d10cf3148fb19bf57c7dc3..8d0d1d657e0999ff12dfdd3bec33a9ff5a1f0b42 100644 (file)
@@ -41,7 +41,7 @@ switch($orient) {
 
 $title .= elgg_view_title($title_wording);
 $extend = elgg_view("activity/extend");
-$river = elgg_view_river_items($subject_guid, 0, $relationship_type, $type, $subtype, '', 20, 0, 0, TRUE, FALSE);
+$river = elgg_view_river-items($subject_guid, 0, $relationship_type, $type, $subtype, '', 20, 0, 0, TRUE, FALSE);
 
 // Replacing callback calls in the nav with something meaningless
 $river = str_replace('callback=true', 'replaced=88,334', $river);
index 8469448a0b5f01ccbc29a983c064d68efd673c78..ae193ce4cb58075776b72e8ffa4f6b2f95323849 100644 (file)
@@ -38,7 +38,7 @@ function riverdashboard_page_handler($page){
  * @param ElggEntity $entity The entity to comment on
  * @return string|false The HTML (etc) for the comment form, or false on failure
  */
-function elgg_make_river_comment($entity){
+function elgg_make_river-comment($entity){
        if (!($entity instanceof ElggEntity)) {
                return FALSE;
        } else {
index a0f547e452e1bc3ef77331df6fa044d2c8b4bbb4..fdd5b24df1941fad83cf2238cd869b263f35eb77 100644 (file)
@@ -5,7 +5,7 @@ if (isset($vars['items']) && is_array($vars['items'])) {
        $i = 0;
        if (!empty($vars['items'])) {
                foreach($vars['items'] as $item) {
-                       echo elgg_view_river_item($item);
+                       echo elgg_view_river-item($item);
                        $i++;
                        if ($i >= $vars['limit']) {
                                break;
@@ -29,7 +29,7 @@ if ($vars['pagination'] !== false) {
                        $nexturl=$baseurl . '?' . $urladdition;
                }
 
-               $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 ($vars['offset'] > 0) {
@@ -44,7 +44,7 @@ if ($vars['pagination'] !== false) {
                        $prevurl=$baseurl . '?' . $urladdition;
                }
 
-               $nav .= '<a class="pagination_next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
+               $nav .= '<a class="pagination-next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
        }
 
        if (!empty($nav)) {
index 0413775d616c5e95f72923c8f1817b319d9bc2f2..8e93b25b5399992fe938fb4af33f964c71a69bc5 100644 (file)
@@ -41,12 +41,12 @@ if ($comment_count < 3) {
 }
 
 ?>
-<div class="river_item riverdashboard" id="river_entity_<?php echo $object->guid; ?>">
-       <span class="river_item_useravatar">
+<div class="river-item riverdashboard" id="river_entity_<?php echo $object->guid; ?>">
+       <span class="river-item-useravatar">
                <?php echo elgg_view("profile/icon",array('entity' => $user, 'size' => 'small')); ?>
        </span>
 
-       <div class="river_item_contents clearfix">
+       <div class="river-item-contents clearfix">
 <?php
 
 // body contents, generated by the river view in each plugin
@@ -56,30 +56,30 @@ echo $vars['body'];
 if ($comments){
        $counter = 0;
 
-       echo "<div class='river_comments_tabs clearfix'>";
-       echo "<a class='river_more_comments show_comments_button link'>" . elgg_echo('comments') . '</a>';
+       echo "<div class='river-comments-tabs clearfix'>";
+       echo "<a class='river-more-comments show_comments_button link'>" . elgg_echo('comments') . '</a>';
 
        if ($likes_count != 0) {
                echo elgg_view('likes/forms/display', array('entity' => $object));
        }
 
-       echo "</div>"; // close river_comments_tabs
+       echo "</div>"; // close river-comments-tabs
 
-       echo "<div class='river_comments'>";
+       echo "<div class='river-comments'>";
 
        if ($likes_count != 0) {
                //show the users who liked the object
                // this is loaded via ajax to avoid pounding the server with avatar requests.
-               echo "<div class='likes_list hidden'></div>";
+               echo "<div class='likes-list hidden'></div>";
        }
 
        echo "<div class=\"comments_container\">";
        // display appropriate comment link
        if ($more_comments_count > 0) {
-               echo "<a class=\"river_more_comments show_more_button link\">" .
+               echo "<a class=\"river-more-comments show_more_button link\">" .
                elgg_echo('riverdashboard:n_more_comments', array($more_comments_count)) . '</a>';
 
-               echo "<a style=\"display: none\" class=\"river_more_comments show_less_button link\">" . elgg_echo('riverdashboard:show_less') . '</a>';
+               echo "<a style=\"display: none\" class=\"river-more-comments show_less_button link\">" . elgg_echo('riverdashboard:show_less') . '</a>';
        }
        echo "<div class=\"comments_list\">";
        foreach ($comments as $comment) {
@@ -95,27 +95,27 @@ if ($comments){
                        $alt = 'penultimate';
                }
                //display comment
-               echo "<div class='river_comment $alt clearfix'>";
-               echo "<span class='river_comment_owner_icon'>";
+               echo "<div class='river-comment $alt clearfix'>";
+               echo "<span class='river-comment-owner-icon'>";
                echo elgg_view("profile/icon", array('entity' => $comment_owner, 'size' => 'tiny'));
                echo "</span>";
 
                //truncate comment to 150 characters and strip tags
                $contents = elgg_get_excerpt($comment->value, 150);
 
-               echo "<div class='river_comment_contents'>";
+               echo "<div class='river-comment-contents'>";
                echo "<a href=\"{$comment_owner_url}\">" . $comment_owner->name . '</a>&nbsp;<span class="elgg_excerpt">' . parse_urls($contents) . '</span>';
-               echo "<span class='entity_subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
+               echo "<span class='entity-subtext'>" . elgg_view_friendly_time($comment->time_created) . "</span>";
                echo "</div></div>";
                $counter++;
        }
 
-       // close comments_list, comments_container and river_comments
-       echo '</div></div>' . elgg_make_river_comment($object) . '</div>';
+       // close comments_list, comments_container and river-comments
+       echo '</div></div>' . elgg_make_river-comment($object) . '</div>';
 } else {
        // tab bar nav - for users that liked object
        if ($vars['item']->type != 'user' && $likes_count != 0) {
-               echo "<div class='river_comments_tabs clearfix'>";
+               echo "<div class='river-comments-tabs clearfix'>";
        }
 
        if ($likes_count != 0) {
@@ -123,15 +123,15 @@ if ($comments){
        }
 
        if ($vars['item']->type != 'user' && $likes_count != 0) {
-               echo "</div>"; // close river_comments_tabs
+               echo "</div>"; // close river-comments-tabs
        }
 
        if ($vars['item']->type != 'user') {
-               echo "<div class='river_comments'>";
+               echo "<div class='river-comments'>";
        }
        if ($likes_count != 0) {
                //show the users who liked the object
-               echo "<div class='likes_list hidden'>";
+               echo "<div class='likes-list hidden'>";
                echo list_annotations($object->getGUID(), 'likes', 99);
                echo "</div>";
        }
@@ -139,7 +139,7 @@ if ($comments){
        // if there are no comments to display
        // and this is not a user - include the inline comment form
        if ($vars['item']->type != 'user') {
-               echo elgg_make_river_comment($object);
+               echo elgg_make_river-comment($object);
        }
        if ($vars['item']->type != 'user') {
                echo "</div>";
index 60568642aa30d1b985b7e4aac85ace4c97f751b0..58fe938f497586ca905451ab1109970fa46bb43c 100644 (file)
@@ -6,13 +6,13 @@
  * @package Elgg\r
  */\r
 ?>\r
-<div class="river_item riverdashboard">\r
-       <span class="river_item_useravatar">\r
+<div class="river-item riverdashboard">\r
+       <span class="river-item-useravatar">\r
 <?php\r
 echo elgg_view("profile/icon",array('entity' => get_entity($vars['item']->subject_guid), 'size' => 'small'));\r
 ?>\r
        </span>\r
-       <div class="river_item_contents clearfix">\r
+       <div class="river-item-contents clearfix">\r
 <?php\r
 echo $vars['body'];\r
 ?>\r
index 9f0164b43287a40b637557a18d9e97d047eb56a2..09a593622d7fa14e1c64d7d9682cb0a4738184f7 100644 (file)
@@ -30,7 +30,7 @@ function activityUpdateChecker(interval) {
                        'data': {'seconds_passed': this.seconds_passed},
                        'success': function(data) {
                                if (data) {
-                                       $('#riverdashboard_updates').html(data).slideDown();
+                                       $('#riverdashboard-updates').html(data).slideDown();
                                        // could crank down the interval here.
                                        // if we change the message to simply "New Posts!"
                                        // we could stop the polling altogether.
index a09a32712f490f67d072caadf9fc328d15d1205b..18ba7c0dc464b3af67e0eb32c3d0c3980c7a10e2 100644 (file)
@@ -4,10 +4,10 @@
  *
  */
 ?>
-#riverdashboard_updates {
+#riverdashboard-updates {
        border-bottom:1px solid #cccccc;
 }
-#riverdashboard_updates a.update_link {
+#riverdashboard-updates a.update-link {
        display: inline-table;
        color:white;
        font-weight: bold;
        -webkit-border-radius: 10px;
        -moz-border-radius: 10px;
 }
-#riverdashboard_updates a.update_link:hover {
+#riverdashboard-updates a.update-link:hover {
        background: #4690D6 url("<?php echo elgg_get_site_url(); ?>mod/riverdashboard/graphics/refresh.png") no-repeat 5px -22px;
        color:white;
        text-decoration: none;
 }
-.riverdashboard_filtermenu {
+.riverdashboard-filtermenu {
        margin:10px 0 10px 0;
        float:right;
 }
 
 /* RIVER ENTRY */
-.river_item {
+.river-item {
        border-bottom:1px solid #cccccc;
        padding:7px 0 7px 0;
 }
-.river_item p {
+.river-item p {
        margin:0;
 }
-.river_item .entity_subtext {
+.river-item .entity-subtext {
        display: block;
        line-height: 1.4em;
 }
-.river_item_useravatar {
+.river-item-useravatar {
        float:left;
        margin-top:3px;
        margin-left:1px;
 }
-.river_item_contents {
+.river-item-contents {
        margin-left:55px;
 }
-.river_item_contents a {
+.river-item-contents a {
        font-weight: bold;
 }
-.river_content_display {
+.river-content-display {
        border-left:1px solid #DDDDDD;
        font-size:85%;
        line-height:1.5em;
        margin:8px 0 5px 0;
        padding-left:5px;
 }
-.following_icon {
+.following-icon {
        width:20px;
        height:25px;
        margin:0 2px 0 2px;
 }
 
 /* LATEST COMMENTS IN RIVER */
-.river_comments_tabs {
+.river-comments-tabs {
        max-height: 19px;
        overflow:hidden;
 }
-.river_comments {
+.river-comments {
        -moz-border-radius-bottomleft:5px;
        -moz-border-radius-bottomright:5px;
        -moz-border-radius-topleft:5px;
        -webkit-border-bottom-left-radius:5px;
        background-color: #eeeeee;
 }
-.river_comment {
+.river-comment {
        padding:3px;
        border-bottom:1px solid white;
 }
-.river_comment.penultimate {
+.river-comment.penultimate {
 
 }
-.river_comment.latest {
+.river-comment.latest {
 
 }
 /* hidden inline comment form */
-.river_comment_form.hidden {
+.river-comment_form.hidden {
        padding:5px;
        height:26px;
 }
-.river_comment_form.hidden .input-text {
+.river-comment_form.hidden .input-text {
        width:560px;
        padding:3px;
 }
-#profile_content .river_comment_form.hidden .input-text { /* when activity is displayed on profile page */
+#profile-content .river-comment_form.hidden .input-text { /* when activity is displayed on profile page */
        width:535px;
 }
-.river_comment_form.hidden .submit-button {
+.river-comment_form.hidden .submit-button {
        margin:0 0 0 10px;
        float:right;
 }
-.river_link_divider {
+.river-link-divider {
        color:#999999;
        font-style: normal;
 }
-.river_item_contents .river_comment_form_button,
-.river_item_contents .river_user_like_button {
+.river-item-contents .river-comment-form-button,
+.river-item-contents .river_user-like-button {
        font-weight:normal;
        font-style: normal;
 }
-.river_item_contents .river_comment_form_button {
+.river-item-contents .river-comment-form-button {
        margin-left: 7px;
 }
 /* hidden list of users that liked item */
-.river_item .elgg_likes_user {
+.river-item .elgg-likes-user {
        border-bottom:1px solid white;
        padding:3px;
 }
-.river_item .elgg_likes_user .entity_listing_icon {
+.river-item .elgg-likes-user .entity-listing-icon {
        margin:3px 0 4px 2px;
 }
-.river_item .elgg_likes_user .entity_listing_info {
+.river-item .elgg-likes-user .entity-listing-info {
        width:635px;
 }
-#profile_content .river_item .elgg_likes_user .entity_listing_info { /* when likes is displayed on profile page activity stream */
+#profile-content .river-item .elgg-likes-user .entity-listing-info { /* when likes is displayed on profile page activity stream */
        width:600px;
 }
-.river_item .elgg_likes_user .entity_metadata {
+.river-item .elgg-likes-user .entity-metadata {
        margin-top:3px;
 }
-.river_item p.elgg_likes_owner {
+.river-item p.elgg-likes-owner {
        padding-top:0;
 }
-.river_item a.river_more_comments {
+.river-item a.river-more-comments {
        display:block;
        float:right;
        padding:1px 7px 1px 7px;
        -webkit-border-top-left-radius:4px;
        -webkit-border-top-right-radius:4px;
 }
-.river_item a.river_more_comments.off {
+.river-item a.river-more-comments.off {
        background-color: white;
 }
-.river_item .river_comment_owner_icon {
+.river-item .river-comment-owner-icon {
        float:left;
        margin:3px 8px 4px 2px;
 }
-.river_item .river_comment_contents {
+.river-item .river-comment-contents {
        margin-left:34px;
 }
-a.river_more_comments {
+a.river-more-comments {
        float:right;
        font-size:85%;
        padding-right:7px;
index d24a8ffc280537ec785ff413c25d0ecbaf397425..2a76f0c68d38cde6a60d50613c2bab200e2aceb7 100644 (file)
@@ -18,7 +18,7 @@ if ($owner && !is_numeric($owner)) {
        }
 }
 
-$river = elgg_view_river_items($owner, NULL, NULL, $type, $subtype, '', $limit, 0, 0, true, false)  . "</div>";
+$river = elgg_view_river-items($owner, NULL, NULL, $type, $subtype, '', $limit, 0, 0, true, false)  . "</div>";
 
 // Replacing callback calls in the nav with something meaningless
 $river = str_replace('callback=true','replaced=88,334', $river);
index 4eec41149c5a4d64d4ed43b5df7d323172bb6eec..09b1113d84949a6a30ad6a3f7568b5aa86b25b3d 100644 (file)
@@ -1,16 +1,16 @@
 <script type="text/javascript">
        $(document).ready(function() {
-               $('.river_comment_form_button').click(function() {
-                       elgg_slide_toggle(this, '.river_item', '.river_comment_form');
+               $('.river-comment-form-button').click(function() {
+                       elgg_slide_toggle(this, '.river-item', '.river-comment_form');
                });
 
                $('.likes_user_list_button').click(function() {
-                       var myParent = $(this).closest('.river_item');
-                       var likesList = myParent.find('.likes_list');
+                       var myParent = $(this).closest('.river-item');
+                       var likesList = myParent.find('.likes-list');
 
                        if (likesList.css('display') == 'none') {
                                // pull in likes via ajax to save on loading many avatars
-                               var riverItem = $(this).closest('.river_item');
+                               var riverItem = $(this).closest('.river-item');
                                var guid = riverItem.attr('id').replace('river_entity_', '');
 
                                var params = {
                                        myParent.find('.show_comments_button').addClass('off');
                                        myParent.find('.likes_user_list_button').removeClass('off');
                                        // show users that liked object
-                                       elgg_slide_toggle(this, '.river_item', '.likes_list');
+                                       elgg_slide_toggle(this, '.river-item', '.likes-list');
                                });
                        }
                });
 
                $('.show_comments_button').click(function() {
-                       var myParent = $(this).closest('.river_item');
+                       var myParent = $(this).closest('.river-item');
                        if (myParent.find('.comments_container').css('display') == 'none') {
                                // hide likes
-                               myParent.find('.likes_list').animate({"height": "toggle", "opacity": "toggle"}, { duration: 400 });
+                               myParent.find('.likes-list').animate({"height": "toggle", "opacity": "toggle"}, { duration: 400 });
                                // change selected tab
                                myParent.find('.show_comments_button').removeClass('off');
                                myParent.find('.likes_user_list_button').addClass('off');
                                // show users that liked object
-                               elgg_slide_toggle(this, '.river_item', '.comments_container');
+                               elgg_slide_toggle(this, '.river-item', '.comments_container');
                        }
                });
 
                // grab more comments
-               $('.river_more_comments.show_more_button').click(function() {
+               $('.river-more-comments.show_more_button').click(function() {
                        var showLess = $(this).next('.show_less_button');
                        var showMore = $(this);
-                       var riverItem = $(this).closest('.river_item');
+                       var riverItem = $(this).closest('.river-item');
 
                        var guid = riverItem.attr('id').replace('river_entity_', '');
                        var commentsList = riverItem.find('.comments_list');
-                       var numComments = riverItem.find('.river_comment').length;
+                       var numComments = riverItem.find('.river-comment').length;
 
                        var params = {
                                'entity_guid': guid,
                });
 
                // hide more comments
-               $('.river_more_comments.show_less_button').click(function() {
+               $('.river-more-comments.show_less_button').click(function() {
                        var showLess = $(this);
                        var showMore = $(this).prev('.show_more_button');
-                       var riverItem = $(this).closest('.river_item');
+                       var riverItem = $(this).closest('.river-item');
                        // want to keep the latest 3 comments
-                       var comments = riverItem.find('.river_comment')
+                       var comments = riverItem.find('.river-comment')
                        comments = $.makeArray(comments).reverse();
                        //reverse().splice(0, 3);
 
@@ -92,5 +92,5 @@
        });
 
        // re-add avatar menus for new avatars
-       //setup_avatar_menu($('.river_item_list'));
+       //setup_avatar_menu($('.river-item_list'));
 </script>
index 820ebb5ae37398d141a7eacdbee94301f99206ab..cae3d7bcdc56b1ab25436499de00f3d0f8cd7dda 100644 (file)
@@ -32,7 +32,7 @@ switch($vars['orient']) {
                break;
 }
 ?>
-<div class="riverdashboard_filtermenu"> 
+<div class="riverdashboard-filtermenu"> 
        <?php
                $location_filter = "<select onchange=\"window.open(this.options[this.selectedIndex].value,'_top')\" name=\"file_filter\" class='Notstyled' >";
                $current = get_input('subtype');
@@ -54,4 +54,4 @@ switch($vars['orient']) {
        ?>
        <input type="hidden" name="display" id="display" value="<?php echo htmlentities($vars['orient']); ?>" />
 </div>
-<div id="riverdashboard_updates" class="clearfix"></div>
+<div id="riverdashboard-updates" class="clearfix"></div>
index 03bd91d10749044ae1bb6465986b6d957687bf5a..d6037557d2db12c9be2e45d3fec5f8f18f3e0660 100644 (file)
@@ -5,7 +5,7 @@
  */
 
 if (isset($vars['entity']) && isloggedin()) {
-       $form_body = "<div class='river_comment_form hidden'>";
+       $form_body = "<div class='river-comment_form hidden'>";
        $form_body .= elgg_view('input/text',array(
                                                        'internalname' => 'generic_comment',
                                                        'value' => 'Add a comment...',
index 0cd760664778a97afb752e6117c8d6a6736012a8..6e267fe7ab62a9932fb2d2225ce801b7c5534dad 100644 (file)
@@ -48,8 +48,8 @@ echo <<<___END
        <div class="search_listing clearfix">
                <div class="search_listing_icon">$icon</div>
                <div class="search_listing_info">
-                       <p class="entity_title">$title</p>$description
-                       <p class="entity_subtext">$time</p>
+                       <p class="entity-title">$title</p>$description
+                       <p class="entity-subtext">$time</p>
                </div>
        </div>
 ___END;
index e008da10d33e646b699d1638316288bbb58f6078..d93a603eb4c3f0402a1b77538fde976c6f36586f 100644 (file)
@@ -56,15 +56,15 @@ if (!$time) {
        <div class="search_listing clearfix">
        <div class="search_listing_icon"><?php echo $icon; ?></div>
                <div class="search_listing_info">
-                       <p class="entity_title"><?php echo $title; ?></p>
+                       <p class="entity-title"><?php echo $title; ?></p>
                        <?php echo $description; ?>
 <?php 
 if ($extra_info) {
 ?>
-                       <p class="entity_subtext"><?php echo $extra_info; ?></p>
+                       <p class="entity-subtext"><?php echo $extra_info; ?></p>
 <?php
 }
 ?>
-                       <p class="entity_subtext"><?php echo $time; ?></p>
+                       <p class="entity-subtext"><?php echo $time; ?></p>
                </div>
        </div>
index df66d11f5db8405d4923d59cb41e3d451cd63e0d..b42319520aeee41a897f0664d484b676185d4400 100644 (file)
@@ -12,11 +12,11 @@ $value = stripslashes($value);
 
 ?>
 
-<div id="elgg_search">
+<div id="elgg-search">
        <form id="searchform" action="<?php echo elgg_get_site_url(); ?>pg/search/" method="get">
                <fieldset>
-               <input type="text" size="21" name="q" value="<?php echo elgg_echo('search'); ?>" onblur="if (this.value=='') { this.value='<?php echo elgg_echo('search'); ?>' }" onfocus="if (this.value=='<?php echo elgg_echo('search'); ?>') { this.value='' };" class="search_input" />
-               <input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search_submit_button" />
+               <input type="text" size="21" name="q" value="<?php echo elgg_echo('search'); ?>" onblur="if (this.value=='') { this.value='<?php echo elgg_echo('search'); ?>' }" onfocus="if (this.value=='<?php echo elgg_echo('search'); ?>') { this.value='' };" class="search-input" />
+               <input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search-submit-button" />
                </fieldset>
        </form>
 </div>
\ No newline at end of file
index 00e978492bf4dd6290ee19b04c4ffeb3dd4cf6ee..bef8b839678d2e58cfcfe640ec524fb054080538 100644 (file)
@@ -1,15 +1,15 @@
 <?php\r
 \r
 ?>\r
-<div id="elgg_content" class="clearfix">\r
-       <div id="elgg_sidebar" class="frontpage">\r
+<div id="elgg-content" class="clearfix">\r
+       <div id="elgg-sidebar" class="frontpage">\r
                <?php \r
                        if (isset($vars['area2'])) echo $vars['area2']; \r
                        if (isset($vars['area3'])) echo $vars['area3']; \r
                ?>\r
        </div>\r
        \r
-       <div id="elgg_page_contents" class="frontpage clearfix">\r
+       <div id="elgg-page-contents" class="frontpage clearfix">\r
                <?php \r
                        if (isset($vars['area1'])) echo $vars['area1'];\r
                ?>\r
index 91fe9d9e3dc094aa270bb67e98b7f4da162483db..3e54172f270afa46d5c902dea2f09171d89b5ab5 100644 (file)
@@ -3,18 +3,18 @@
 * Sitepages CSS\r
 */\r
 ?>\r
-#elgg_sidebar.frontpage {\r
+#elgg-sidebar.frontpage {\r
        margin-top:0;\r
 }\r
-#elgg_sidebar.frontpage .sitepages_sidebar_object {\r
+#elgg-sidebar.frontpage .sitepages_sidebar_object {\r
        margin-bottom: 30px;\r
 }\r
-#elgg_sidebar.frontpage .sitepages_sidebar_object h3 {\r
+#elgg-sidebar.frontpage .sitepages_sidebar_object h3 {\r
        margin-top:12px;\r
 }\r
-#elgg_page_contents.frontpage .sitepages_welcome {\r
+#elgg-page-contents.frontpage .sitepages_welcome {\r
        margin-bottom: 20px;\r
 }\r
-#elgg_page_contents.frontpage .sitepages_message {\r
+#elgg-page-contents.frontpage .sitepages_message {\r
        margin-top: 10px;\r
 }
\ No newline at end of file
index 73a01033245a8fc06e8314c4bc7bbe779e348868..9ca33064ee227f7e53fbb184c9ec38ba1a7fdf5e 100644 (file)
@@ -5,7 +5,7 @@
 <h3><?php echo elgg_echo('riverdashboard:recentmembers') ?></h3>\r
 <?php \r
        foreach($newest_members as $mem){\r
-               echo "<div class='entity_listing_icon'>" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'small')) . "</div>";\r
+               echo "<div class='entity-listing-icon'>" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'small')) . "</div>";\r
        }\r
 ?>\r
 </div>
\ No newline at end of file
index ec145cc67a4a1c440ecf48943d395736838aab72..6759e3570cd7ca02c6b83ef5b954d8964beeb672 100644 (file)
@@ -9,7 +9,7 @@ $page_type = $vars['page_type'];
 $url = elgg_get_site_url()."pg/admin/plugin_settings/sitepages/";
 ?>
 
-<div class="elgg_horizontal_tabbed_nav margin_top">
+<div class="elgg-horizontal-tabbed-nav margin-top">
 <ul>
 <?php
        // @todo let users be able to add static content pages.
index 66debd5e21ffdc2ed2a20001251718c0114cebf7..4ccd5d7f4bc892db2ac991148e14c83144816f30 100644 (file)
@@ -51,7 +51,7 @@ if (isset($vars['entity'])) {
                                //$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . elgg_get_site_url() . 'pg/thewire/$1">$1</a>',$desc);
                                echo parse_urls($desc);
                        ?>
-                       <p class="entity_subtext">
+                       <p class="entity-subtext">
                        <?php
                                echo elgg_echo("thewire:wired") . " " . elgg_echo("thewire:strapline",
                                                                array(elgg_view_friendly_time($vars['entity']->time_created))
index 0e0674a7e67e092727bb987716589542e6647c74..b654ccb515329141c916d961be5495d9e92bafbd 100644 (file)
@@ -8,7 +8,7 @@ $string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}:</a> ";
 $desc = $object->description;
 //$desc = preg_replace('/\@([A-Za-z0-9\_\.\-]*)/i','@<a href="' . elgg_get_site_url() . 'pg/thewire/$1">$1</a>',$desc);
 $string .= parse_urls($desc);
-$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));
index 230711c49744090302ca1e592a9fb5bd529420b8..a00acaec5eb83afd5874c242a6bd1ee35ae7bbb7 100644 (file)
@@ -52,7 +52,7 @@
        background-repeat: no-repeat;
        background-position: right bottom; 
 }
-.members_list .wire_post { /* when displayed in lists of friends */
+.members-list .wire_post { /* when displayed in lists of friends */
        margin-top:4px;
 }
 .wire_post_contents {
index 9a9c95ec09a7eb1f26f8ee7cbc46b08d0eef8c2f..09d878c81f25173c662d7a9ad1e835f71e072fe9 100644 (file)
@@ -19,7 +19,7 @@ $latest_wire = elgg_get_entities($params);
 if ($latest_wire) {
        foreach ($latest_wire as $lw) {
                $content = $lw->description;
-               $time = "<p class='entity_subtext'> (" . elgg_view_friendly_time($lw->time_created) . ")</p>";
+               $time = "<p class='entity-subtext'> (" . elgg_view_friendly_time($lw->time_created) . ")</p>";
        }
 
        echo "<div class='wire_post'><div class='wire_post_contents clearfix radius8'>";
index f7eee7fe90bc15b45835527a12d8db6202f51183..e8d768b91796136a4ab81039e091af68f7219505 100644 (file)
@@ -3,7 +3,7 @@
 * TinyMCE CSS
 */
 ?>
-#elgg_page_contents .mceButton {
+#elgg-page-contents .mceButton {
        background-color: #e9e8e8;
        border-color: #B2B2B2;
        margin:4px;
        -webkit-border-radius: 4px; 
        -moz-border-radius: 4px;
 }
-#elgg_page_contents a.mceButtonEnabled:hover,
-#elgg_page_contents a.mceButtonActive,
-#elgg_page_contents a.mceButtonSelected {
+#elgg-page-contents a.mceButtonEnabled:hover,
+#elgg-page-contents a.mceButtonActive,
+#elgg-page-contents a.mceButtonSelected {
        background-color: #d5d5d5;
        border-color: #777 !important;
 }
-#elgg_page_contents .mceFocus .mceTop .mceLeft {
+#elgg-page-contents .mceFocus .mceTop .mceLeft {
        background: #444444;
        border-left: 1px solid #999;
        border-top: 1px solid #999;
@@ -26,7 +26,7 @@
        -khtml-border-top-left-radius: 4px;
        border-top-left-radius: 4px;
 }
-#elgg_page_contents .mceFocus .mceTop .mceRight {
+#elgg-page-contents .mceFocus .mceTop .mceRight {
        background: #444444;
        border-right: 1px solid #999;
        border-top: 1px solid #999;
        -webkit-border-top-right-radius: 4px;
        -moz-border-radius: 0 4px 0 0;
 }
-#elgg_page_contents .mceLayout{
+#elgg-page-contents .mceLayout{
        border: 1px solid #CCC;
        -webkit-border-radius: 5px; 
        -moz-border-radius: 5px;
 }
-#elgg_page_contents table.mceLayout tr.mceFirst td {border-top:0px solid #CCC}
-#elgg_page_contents table.mceLayout tr.mceLast td {border-bottom:0px solid #CCC}
-#elgg_page_contents #blogbody_toolbar1{}
-#elgg_page_contents .mceToolbar{}
-#elgg_page_contents #blogbody_ifr{height:400px !important;} /* blogs */
+#elgg-page-contents table.mceLayout tr.mceFirst td {border-top:0px solid #CCC}
+#elgg-page-contents table.mceLayout tr.mceLast td {border-bottom:0px solid #CCC}
+#elgg-page-contents #blogbody_toolbar1{}
+#elgg-page-contents .mceToolbar{}
+#elgg-page-contents #blogbody_ifr{height:400px !important;} /* blogs */
 #pagesForm #description_ifr {height:400px !important;} /* pages */
-#elgg_page_contents .mceIframeContainer{}
+#elgg-page-contents .mceIframeContainer{}
 .wp_themeSkin .mceButtonDisabled {
        border-color: #ccc !important;
 }
index 2fe2bc9d9f1530777998b825cb1ea05cb8fe7252..48fafe4d83704d23d263d5595cf5151991724ca5 100644 (file)
@@ -15,7 +15,7 @@ $form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('requ
 echo elgg_view('input/form', array(
        'action' => "action/user/requestnewpassword",
        'body' => $form_body,
-       'class' => "margin_top"
+       'class' => "margin-top"
 ));
 ?>
 
index 8b4d885831bac2c838beced4338f3fd78c91be66..87dd6d5ad28f16f0756b14a723fe6c2a28442c9c 100644 (file)
@@ -9,9 +9,9 @@
 
 <p class='loginbox'>
        <label><?php echo elgg_echo('loginusername'); ?></label>
-       <?php echo elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea')); ?>
+       <?php echo elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea')); ?>
        <label><?php echo elgg_echo('password'); ?></label>
-       <?php echo elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')); ?>
+       <?php echo elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')); ?>
 
        <?php echo elgg_view('input/submit', array('value' => elgg_echo('login'))); ?>
 
index b0a48cf351bf297b16c729f3674dbfafa36c0b47..bf629b589de4e12d6ee4fc330d339246c25b132d 100644 (file)
@@ -46,7 +46,7 @@ $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value
 echo elgg_view('input/form', array(
        'action' => "{$login_url}action/register",
        'body' => $form_body,
-       'class' => "margin_top"
+       'class' => "margin-top"
 ));
 ?>
 
index 4729048e6cd8657a3e74563396477e2eeb4b7531..7c1969f1b44178dabdb0aa5985ae0e7bee3a6019 100644 (file)
@@ -25,7 +25,7 @@ if ($admin_option) {
 $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('register'))) . "</p>";
 ?>
 
-<div class="admin_settings add_user">
+<div class="admin_settings add-user">
        <h3><?php echo elgg_echo('adduser'); ?></h3>
        <?php echo elgg_view('input/form', array('action' => "action/useradd", 'body' => $form_body)) ?>
 </div>
\ No newline at end of file
index 29eca2347ffb4f48e5afaa34240434fe9fbc23ae..dc124f4e8fcacf9175b0d2593c7fcee674f1ef0b 100644 (file)
@@ -18,11 +18,11 @@ if ((isset($CONFIG->https_login)) && ($CONFIG->https_login)) {
 
 ?>
 
-<div id="login_dropdown">
-       <div id="signin_button" class="signin_button">
+<div id="login-dropdown">
+       <div id="signin-button" class="signin-button">
                <a href="<?php echo $CONFIG->url; ?>pg/login" class="signin"><span><?php echo elgg_echo('login') ?></span></a>
        </div>
-       <fieldset id="signin_menu">
+       <fieldset id="signin-menu">
                <?php echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$login_url}action/login")); ?>
        </fieldset>
 </div>
@@ -32,19 +32,19 @@ $(document).ready(function() {
 
        $(".signin").click(function(e) {
                e.preventDefault();
-               $("fieldset#signin_menu").toggle();
-               $(".signin").toggleClass("menu_open");
-               $('.login_textarea.name').focus();
+               $("fieldset#signin-menu").toggle();
+               $(".signin").toggleClass("menu-open");
+               $('.login-textarea.name').focus();
        });
 
-       $("fieldset#signin_menu").mouseup(function() {
+       $("fieldset#signin-menu").mouseup(function() {
                return false
        });
 
        $(document).mouseup(function(e) {
                if($(e.target).parent("a.signin").length==0) {
-                       $(".signin").removeClass("menu_open");
-                       $("fieldset#signin_menu").hide();
+                       $(".signin").removeClass("menu-open");
+                       $("fieldset#signin-menu").hide();
                }
        });
 
index e24c80f78e784b83e085a71d4de86f7b2429af51..9f407bdff381c4c1c1c88d6cbc762d8d8f49d3d4 100644 (file)
@@ -6,9 +6,9 @@
 global $CONFIG;
 
 /*
-$form_body = "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea username')) . "</label>";
+$form_body = "<label>" . elgg_echo('username') . "<br />" . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea username')) . "</label>";
 $form_body .= "<br />";
-$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login_textarea')) . "</label><br />";
+$form_body .= "<label>" . elgg_echo('password') . "<br />" . elgg_view('input/password', array('internalname' => 'password', 'class' => 'login-textarea')) . "</label><br />";
 
 $form_body .= elgg_view('input/submit', array('value' => elgg_echo('login')));
 $form_body .= "<div class='remember_me'><label><input type='checkbox' name='persistent' checked value='true' />".elgg_echo('user:persistent')."</label></div>";
@@ -54,8 +54,8 @@ __HTML;
 ?>
        <?php
        $lostpassword_form_body = "<p>" . elgg_echo('user:password:text') . "</p>";
-       $lostpassword_form_body .= "<p class='margin_none'><label>". elgg_echo('username') . " "
-               . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login_textarea lostusername')) . "</label></p>";
+       $lostpassword_form_body .= "<p class='margin-none'><label>". elgg_echo('username') . " "
+               . elgg_view('input/text', array('internalname' => 'username', 'class' => 'login-textarea lostusername')) . "</label></p>";
        $lostpassword_form_body .= elgg_view('input/captcha');
        $lostpassword_form_body .= "<p>" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "<input class='action-button disabled cancel_request' type='reset' value='Cancel'></p>";
        
index c2335db7b785658560ecc9f07f9a313582f6718c..9bed69a06bd4e5523e63314be032c36125f5b4e6 100644 (file)
@@ -21,7 +21,7 @@ $pulldown_values[''] = elgg_echo('none');
 
 echo elgg_view_title(elgg_echo('admin:menu_items'));
 echo "<div class='admin_settings menuitems'><h3>".elgg_echo('admin:menu_items:configure')."</h3>";
-echo "<p class='margin_top'>".strip_tags(elgg_view('output/longtext', array('value' => elgg_echo("admin:menu_items:description"))))."</p>";
+echo "<p class='margin-top'>".strip_tags(elgg_view('output/longtext', array('value' => elgg_echo("admin:menu_items:description"))))."</p>";
 $form_body = '';
 
 // @todo Could probably make this number configurable
index 804f4cc5e5395773e1b5c23d35e2e8506127e7d8..1785864e78e796a5293b6b338a229840a4ca223b 100644 (file)
@@ -23,11 +23,11 @@ echo elgg_view_title(elgg_echo('admin:overview'));
        <h3><?php echo elgg_echo('admin:statistics:label:basic'); ?></h3>
        <table class="styled">
                <tr class="odd">
-                       <td class="column_one"><b><?php echo elgg_echo('admin:statistics:label:version'); ?> :</b></td>
+                       <td class="column-one"><b><?php echo elgg_echo('admin:statistics:label:version'); ?> :</b></td>
                        <td><?php echo elgg_echo('admin:statistics:label:version:release'); ?> - <?php echo $release; ?>, <?php echo elgg_echo('admin:statistics:label:version:version'); ?> - <?php echo $version; ?></td>
                </tr>
                <tr class="even">
-                       <td class="column_one"><b><?php echo elgg_echo('admin:statistics:label:numusers'); ?> :</b></td>
+                       <td class="column-one"><b><?php echo elgg_echo('admin:statistics:label:numusers'); ?> :</b></td>
                        <td><?php echo $users_stats; ?> <?php echo elgg_echo('active'); ?> / <?php echo $total_users; ?> <?php echo elgg_echo('total') ?></td>
                </tr>
 
@@ -69,7 +69,7 @@ $even_odd = "";
                                                }
                                        echo <<< END
                                                <tr class="{$even_odd}">
-                                                       <td class="column_one">{$a}:</td>
+                                                       <td class="column-one">{$a}:</td>
                                                        <td>{$b}</td>
                                                </tr>
 END;
index 00e5c863a0431f349edba667118a489fd66b3b42..f8b890c91c1fd9a973ff9f39a6924c21da51c372 100644 (file)
@@ -13,7 +13,7 @@ if( (is_plugin_enabled('search')) && (is_plugin_enabled('profile')) ) {
        elgg_pop_context();
        ?>
 
-       <div class="admin_settings members_list users_online">
+       <div class="admin_settings members-list users_online">
                <h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
                <?php echo $users_online; ?>
        </div>
index ee43666798c9a81d1a05a44764bdbc0515c6824a..195df5169aa3da763541d1c9ef7541e189933cf4 100644 (file)
@@ -68,8 +68,8 @@ $buttons .= $category_form;
 // construct page header
 ?>
 <div id="content_header" class="clearfix">
-       <div class="content_header_title"><?php echo $title ?></div>
-       <div class="content_header_options"><?php echo $buttons ?></div>
+       <div class="content-header-title"><?php echo $title ?></div>
+       <div class="content-header-options"><?php echo $buttons ?></div>
 </div>
 <br />
 <?php
index 8a269c43b8ced735a2a42b5c36aa179de7f9b821..89373fc7d623a6490fdc5488190a5619e9665e02 100644 (file)
@@ -26,9 +26,9 @@ foreach ($installed_plugins as $installed_name => $plugin) {
 ksort($plugin_list);
 $form_body  .= <<<___END
        <div id="content_header" class="clearfix">
-               <div class="content_header_title">$title</div>
+               <div class="content-header-title">$title</div>
        </div>
-       <ul class="admin_plugins margin_top">
+       <ul class="admin_plugins margin-top">
 ___END;
 
 foreach ($plugin_list as $name => $info) {
index 00e63e95d8b6b7967b6a515747db0b6177d76551..048ffa883dee0180afbf531b551f712c553b469c 100644 (file)
@@ -62,6 +62,6 @@ $form_body .= "</p>";
 $form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
 
 $form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo("save")));
-$form_body = "<div class='admin_settings site_admin margin_top'>".$form_body."</div>";
+$form_body = "<div class='admin_settings site_admin margin-top'>".$form_body."</div>";
 echo elgg_view_title(elgg_echo('admin:site:advanced') . " " . elgg_echo('admin:site'));
 echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
index f6b2d03e01ce45e53f55a9928ab2d66db439f145..9b8f4652d4138566cb8ebf9ea8a1a535143f0005 100644 (file)
@@ -24,6 +24,6 @@ $languages = get_installed_translations();
 $form_body .= "<p>" . elgg_echo('installation:language') . elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $vars['config']->language, 'options_values' => $languages)) . "</p>";
 
 $form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo("save")));
-$form_body = "<div class='admin_settings site_admin margin_top'>".$form_body."</div>";
+$form_body = "<div class='admin_settings site_admin margin-top'>".$form_body."</div>";
 echo elgg_view_title(elgg_echo('admin:site'));
 echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
index 79de121e50d9f851fc5a7650d3b666373fc9a9b0..4d5b8583647ca3b9cdd24d52134cfd4daa3645f4 100644 (file)
@@ -9,7 +9,7 @@ if (is_plugin_enabled('profile')) {
        echo elgg_view_title(elgg_echo('admin:users'));
        ?>
 
-       <div class="admin_settings members_list users_online">
+       <div class="admin_settings members-list users_online">
                <h3><?php echo elgg_echo('admin:users:newest'); ?></h3>
                <?php echo $users; ?>
        </div>
index 4acaa3f6e741cab04a049202cde71ebb6943b640..9c0f52c7f440389fd3488a0d9d58ee6e532704eb 100644 (file)
@@ -8,7 +8,7 @@ if ((is_plugin_enabled('search')) && (is_plugin_enabled('profile'))) {
        echo elgg_view_title(elgg_echo('admin:users'));
        ?>
 
-       <div class="admin_settings members_list users_online">
+       <div class="admin_settings members-list users_online">
                <h3><?php echo elgg_echo('admin:statistics:label:onlineusers'); ?></h3>
                <?php echo $users_online; ?>
        </div>
index 430ba2ea300b245e09cad8b4c10ac4544112e130..b1f35971a390435cdf509ee4973bd09975c187c7 100644 (file)
@@ -8,7 +8,7 @@
 
 $loader = <<< END
 
-<div align="center" class="ajax_loader hidden"></div>
+<div align="center" class="ajax-loader hidden"></div>
 
 END;
 
index 6e83e8afb836fd6ac3fba5d64161818678f9562a..de25135877d5ffdc7d2999f5b1997e5f9f5bda27 100644 (file)
@@ -17,7 +17,7 @@ if ($vars['item']->annotation_id != 0) {
 
 $url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
 $string = elgg_echo("river:posted:generic", array($url)) . " ";
-$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created) . "<a class='river_comment_form_button link'>Comment</a>";
+$string .= elgg_echo("{$subtype}:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created) . "<a class='river_comment_form_button link'>Comment</a>";
 $string .= elgg_view('likes/forms/link', array('entity' => $object));
 $string .= "</span>";
 if (elgg_get_context() != 'riverdashboard') {
index 43655ba6e1fa230993565a8e9a52374a6490bf1b..7b0d5c2e2e3149e8fdd175639409aaa8fdb819b2 100644 (file)
@@ -6,6 +6,6 @@ $url = $object->getURL();
 $title = $object->title;
  
 $string = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a> ";
-$string .= elgg_echo("likes:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created)."</span>";
+$string .= elgg_echo("likes:river:annotate") . "  <a href=\"{$object->getURL()}\">" . $title . "</a> <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created)."</span>";
        
 echo $string;
\ No newline at end of file
index f016609e2196fcb360069145143580f13b16142d..5f23b6300165bccced23a8b708f451b8e23f5be2 100644 (file)
@@ -8,7 +8,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_icon">
+       <div class="generic-comment-icon">
                <?php
                        echo elgg_view("profile/icon", array(
                                        'entity' => $owner,
@@ -17,7 +17,7 @@ $owner = get_user($vars['annotation']->owner_guid);
                ?>
        </div>
 
-       <div class="generic_comment_details">
+       <div class="generic-comment-details">
                <?php
                // if the user looking at the comment can edit, show the delete link
                if ($vars['annotation']->canEdit()) {
@@ -33,14 +33,14 @@ $owner = get_user($vars['annotation']->owner_guid);
                <?php
                        } //end of can edit if statement
                ?>
-               <p class="generic_comment_owner">
+               <p class="generic-comment-owner">
                        <a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a>
-                       <span class="entity_subtext">
+                       <span class="entity-subtext">
                                <?php echo elgg_view_friendly_time($vars['annotation']->time_created); ?>
                        </span>
                </p>
                <!-- output the actual comment -->
-               <div class="generic_comment_body">
+               <div class="generic-comment-body">
                        <?php echo elgg_view("output/longtext",array("value" => $vars['annotation']->value)); ?>
                </div>
        </div>
index 8e1f3e81b226fb74f95ed8d33f1b28661ee3ff46..4de93cf90da80809d2bee387cede19138a25c8fc 100644 (file)
@@ -28,8 +28,8 @@ 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_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 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>";
        
        }
index 6538e65dc28308ac9e8e741eda58c84738f282a5..3fdf2349bd3de4f11cdf1acb086bf5f5a5a0b34d 100644 (file)
@@ -6,8 +6,8 @@
 $owner = get_user($vars['annotation']->owner_guid);
 
 ?>
-<div class="elgg_likes_user clearfix">
-       <div class="entity_listing_icon">
+<div class="elgg-likes-user clearfix">
+       <div class="entity-listing-icon">
                <?php
                        echo elgg_view("profile/icon", array(
                                        'entity' => $owner,
@@ -16,12 +16,12 @@ $owner = get_user($vars['annotation']->owner_guid);
                ?>
        </div>
        
-       <div class="entity_listing_info">
+       <div class="entity-listing-info">
                <?php
                // if the user looking at the like listing can edit, show the delete link
                if ($vars['annotation']->canEdit()) {
                ?>
-                       <div class="entity_metadata"><span class="delete-button">
+                       <div class="entity-metadata"><span class="delete-button">
                                <?php echo elgg_view("output/confirmlink",array(
                                                'href' => "action/likes/delete?annotation_id=" . $vars['annotation']->id,
                                                'text' => elgg_echo('remove'),
@@ -32,9 +32,9 @@ $owner = get_user($vars['annotation']->owner_guid);
                <?php
                        } //end of can edit if statement
                ?>
-               <p class="elgg_likes_owner">
+               <p class="elgg-likes-owner">
                        <a href="<?php echo $owner->getURL(); ?>"><?php echo $owner->name; ?></a> <?php echo elgg_echo('likes:this') . 
-                       " <span class=\"entity_subtext\">" . elgg_view_friendly_time($vars['annotation']->time_created) . "</span>"; ?>
+                       " <span class=\"entity-subtext\">" . elgg_view_friendly_time($vars['annotation']->time_created) . "</span>"; ?>
                </p>
        </div>
 </div>
\ No newline at end of file
index dd0b374e0e261258982c5533c1c754cc822ddf4c..3c26bf7cc98d37f587004cd2628da626a3230746 100644 (file)
@@ -9,7 +9,7 @@
         
         if (isset($vars['entity']) && isloggedin()) {
         
-                $form_body = "<div class='comment margin_top'><p class='longtext_inputarea'><label>".elgg_echo("generic_comments:text")."</label>" . elgg_view('input/longtext',array('internalname' => 'generic_comment')) . "</p>";
+                $form_body = "<div class='comment margin-top'><p class='longtext_inputarea'><label>".elgg_echo("generic_comments:text")."</label>" . elgg_view('input/longtext',array('internalname' => 'generic_comment')) . "</p>";
                 $form_body .= elgg_view('input/hidden', array('internalname' => 'entity_guid', 'value' => $vars['entity']->getGUID()));
                 $form_body .= elgg_view('input/submit', array('value' => elgg_echo("generic_comments:post"))) . "</div>";
                 
index af2a16f5527850cba8f318539edb8d86ccd6796a..155907acbf16c0f807a448cd6e5d46996391a08b 100644 (file)
@@ -184,14 +184,14 @@ h2 {
        -webkit-border-radius: 8px;
        -moz-border-radius: 8px;
 }
-.margin_none {
+.margin-none {
        margin:0;
 }
-.margin_top {
+.margin-top {
        margin-top:10px;
 }
-.entity_title a { color:#0054A7; }
-.elgg_horizontal_tabbed_nav a:hover { color:#0054A7; }
+.entity-title a { color:#0054A7; }
+.elgg-horizontal-tabbed-nav a:hover { color:#0054A7; }
 table.mceLayout {
        width:100% !important;
 }
@@ -213,28 +213,28 @@ table.mceLayout {
        height:30px;
        width:100%;
 }
-#admin_header .network_title h2 {
+#admin_header .network-title h2 {
        height:45px;
        line-height:45px;
        margin:0;
        padding:0 0 0 20px;
        border:0;
 }
-#admin_header .network_title h2 a {
+#admin_header .network-title h2 a {
        color:white;
 }
-#admin_header .network_title h2 a:hover {
+#admin_header .network-title h2 a:hover {
        color:white;
        text-decoration: underline;
 }
-#admin_header .network_title h2 a.return_to_network {
+#admin_header .network-title h2 a.return_to_network {
        font-size:12px;
        font-weight: normal;
        color:#666666;
        float:right;
        margin-right:40px;
 }
-#elgg_content.admin_area {
+#elgg-content.admin_area {
        margin:20px;
        min-height:400px;
        position:relative;
@@ -244,7 +244,7 @@ table.mceLayout {
        -webkit-box-shadow: none;
        -moz-box-shadow: none;
 }
-#elgg_content.admin_area #elgg_page_contents  {
+#elgg-content.admin_area #elgg-page-contents  {
        float:left;
        margin:0;
        padding:14px;
@@ -253,7 +253,7 @@ table.mceLayout {
        -webkit-border-radius: 6px;
        -moz-border-radius: 6px;
 }
-#elgg_content.admin_area #elgg_sidebar  {
+#elgg-content.admin_area #elgg-sidebar  {
        float:left;
        margin:0;
        min-height:400px;
@@ -270,7 +270,7 @@ table.mceLayout {
 .admin_area h6 {
        color:#666666;
 }
-.admin_area #elgg_sidebar .submenu {
+.admin_area #elgg-sidebar .submenu {
        margin:0;
        padding:0;
        list-style: none;
@@ -301,7 +301,7 @@ table.mceLayout {
        color:white;
        text-decoration:none;
 }
-.admin_area #elgg_sidebar .submenu ul.child {
+.admin_area #elgg-sidebar .submenu ul.child {
        margin-bottom:10px;
 }
 .admin_area .submenu .child li a {
@@ -488,7 +488,7 @@ table.mceLayout {
        text-decoration:none;
        color:white;
 }
-.admin_area .content_header_options .action-button {
+.admin_area .content-header-options .action-button {
        margin-top:0;
        margin-left:10px;
 }
@@ -581,22 +581,22 @@ table.mceLayout {
        clear: both;
        visibility: hidden;
 }
-.content_header_title {
+.content-header-title {
        float:left;
 }
-.content_header_title {
+.content-header-title {
        margin-right:10px;
        max-width: 530px;
 }
-.content_header_title h2 {
+.content-header-title h2 {
        border:none;
        margin-bottom:0;
        padding-bottom:5px;
 }
-.content_header_options {
+.content-header-options {
        float:right;
 }
-.content_header_options .action-button {
+.content-header-options .action-button {
        float:right;
        margin:0 0 5px 10px;
 }
@@ -643,7 +643,7 @@ table.mceLayout {
        padding:2px 4px 2px 4px;
        border-bottom:1px solid #cccccc;
 }
-.admin_settings table.styled td.column_one {
+.admin_settings table.styled td.column-one {
        width:200px;
 }
 .admin_settings table.styled tr:hover {
@@ -788,19 +788,19 @@ ul.admin_plugins {
 /* ***************************************
        ELGG TABBED PAGE NAVIGATION
 *************************************** */
-.elgg_horizontal_tabbed_nav {
+.elgg-horizontal-tabbed-nav {
        margin-bottom:5px;
        padding: 0;
        border-bottom: 2px solid #cccccc;
        display:table;
        width:100%;
 }
-.elgg_horizontal_tabbed_nav ul {
+.elgg-horizontal-tabbed-nav ul {
        list-style: none;
        padding: 0;
        margin: 0;
 }
-.elgg_horizontal_tabbed_nav li {
+.elgg-horizontal-tabbed-nav li {
        float: left;
        border: 2px solid #cccccc;
        border-bottom-width: 0;
@@ -811,7 +811,7 @@ ul.admin_plugins {
        -webkit-border-top-left-radius:5px;
        -webkit-border-top-right-radius:5px;
 }
-.elgg_horizontal_tabbed_nav a {
+.elgg-horizontal-tabbed-nav a {
        text-decoration: none;
        display: block;
        padding:3px 10px 0 10px;
@@ -819,15 +819,15 @@ ul.admin_plugins {
        height:21px;
        color:#999999;
 }
-.elgg_horizontal_tabbed_nav a:hover {
+.elgg-horizontal-tabbed-nav a:hover {
        background: #dedede;
        color:#4690D6;
 }
-.elgg_horizontal_tabbed_nav .selected {
+.elgg-horizontal-tabbed-nav .selected {
        border-color: #cccccc;
        background: white;
 }
-.elgg_horizontal_tabbed_nav .selected a {
+.elgg-horizontal-tabbed-nav .selected a {
        position: relative;
        top: 2px;
        background: white;
index 95f2d34a9198d395dd71b907b38ce6892d7b8322..94407fdc8a88ebb4d6811f9871e387caad224735 100644 (file)
@@ -5,39 +5,39 @@
 * {zoom: 1;} /* trigger hasLayout in IE */
 
 /* tools drop-down menu */
-#elgg_header {z-index:1;}
+#elgg-header {z-index:1;}
 .navigation li a:hover ul {display:block; position:absolute; top:21px; left:0;}
 .navigation li a:hover ul li a {display:block;}
-.navigation li.navigation_more ul li a {width:150px;background-color: #dedede;}
+.navigation li.navigation-more ul li a {width:150px;background-color: #dedede;}
 
 .clearfix { display: block; }
 .hidden.clearfix { display: none; }
-#elgg_page_contents {overflow: hidden;} /* remove horizontal scroll on riverdash */
+#elgg-page-contents {overflow: hidden;} /* remove horizontal scroll on riverdash */
 #breadcrumbs {top:-2px; margin-bottom: 5px;}
 
 /* entity list views */
-.entity_metadata {max-width: 300px;}
-.entity_edit {float:right;}
+.entity-metadata {max-width: 300px;}
+.entity-edit {float:right;}
 .access_level {float:left;}
-.entity_listing .entity_metadata {
+.entity-listing .entity-metadata {
        min-width:400px;
        text-align: right;
 }
 
-.likes_list {display:none;}
-.likes_list_holder .likes_list {top:20px !important;} /* position likes list below link in IE to prevent clipping */
-.elgg_likes_user .entity_metadata .delete-button {float:none;}
+.likes-list {display:none;}
+.likes-list-holder .likes-list {top:20px !important;} /* position likes list below link in IE to prevent clipping */
+.elgg-likes-user .entity-metadata .delete-button {float:none;}
 
 /* profile */
-.elgg_horizontal_tabbed_nav.profile .profile_name {margin-left: -260px;}
+.elgg-horizontal-tabbed-nav.profile .profile_name {margin-left: -260px;}
 #profile_content .river_comment_form.hidden .input-text { width:510px; }
 
 /* notifications */
-.friends_picker_navigation {margin:0;padding:0;}
-.friends_picker_container h3 {margin:0;padding:0;line-height: 1em;}
+.friends-picker-navigation {margin:0;padding:0;}
+.friends-picker-container h3 {margin:0;padding:0;line-height: 1em;}
 
 /* private messages */
-#elgg_topbar_contents a.privatemessages.new span { 
+#elgg-topbar-contents a.privatemessages.new span { 
        display:block;
        padding:1px;
        position:relative;
@@ -46,9 +46,9 @@
        top:-1px;
        right:auto;
 }
-#elgg_topbar_contents a.privatemessages.new  {padding:0 0 0 20px;}
-#elgg_topbar_contents a.privatemessages:hover {background-position:left 2px;}
-#elgg_topbar_contents a.privatemessages.new:hover {background-position: left 2px;}
+#elgg-topbar-contents a.privatemessages.new  {padding:0 0 0 20px;}
+#elgg-topbar-contents a.privatemessages:hover {background-position:left 2px;}
+#elgg-topbar-contents a.privatemessages.new:hover {background-position: left 2px;}
 
 /* riverdashboard mod rules */
 #riverdashboard_updates {clear:both;}
 .shared_access_collection h2.shared_access_name {margin-top:-15px;}
 
 /* dropdown login */
-*:first-child+html #login_dropdown #signin_button {
+*:first-child+html #login-dropdown #signin-button {
        line-height:10px;
 }
-*:first-child+html #login_dropdown #signin_button a.signin span {
+*:first-child+html #login-dropdown #signin-button a.signin span {
        background-position:-150px -54px;
 }
-*:first-child+html #login_dropdown #signin_button a.signin.menu_open span {
+*:first-child+html #login-dropdown #signin-button a.signin.menu-open span {
        background-position:-150px -74px;
 }
\ No newline at end of file
index 943b94e325b8f3e0ea0566b6e1b51ea58c77b211..d1fdb750c61938da6709a4bcabec9ee90cfd53ad 100644 (file)
@@ -6,10 +6,10 @@
 * {zoom: 1;} /* trigger hasLayout in IE */
 
 /* main nav drop-down */
-#elgg_header {z-index:1;}
+#elgg-header {z-index:1;}
 .navigation li a:hover ul {display:block; position:absolute; top:21px; left:0;}
 .navigation li a:hover ul li a {display:block;}
-.navigation li.navigation_more ul li a {width:150px;background-color: #dedede;}
+.navigation li.navigation-more ul li a {width:150px;background-color: #dedede;}
 
 /* @todo check this one */
 .delete-button a { background-position-y: 2px; }
index 59016b777f72bbd6a274e655b1bbd5884f8ea6c5..492e600ffd0a9330bf85059d74fa9e4b7eb45282 100644 (file)
@@ -187,17 +187,17 @@ h2 {
        -webkit-border-radius: 8px;
        -moz-border-radius: 8px;
 }
-.margin_none {
+.margin-none {
        margin:0;
 }
-.margin_top {
+.margin-top {
        margin-top:10px;
 }
-.rss_link {
+.rss-link {
        margin-top:-10px;
        margin-bottom:10px;
 }
-.rss_link a {
+.rss-link a {
        display:block;
        width:14px;
        height:14px;
@@ -217,7 +217,7 @@ h2 {
 .tagcloud {
        text-align:justify;
 }
-.ajax_loader {
+.ajax-loader {
        background-color: white;
        background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif);
        background-repeat: no-repeat;
@@ -225,10 +225,10 @@ h2 {
        min-height:33px;
        min-width:33px;
 }
-.ajax_loader.left {
+.ajax-loader.left {
        background-position: left center;
 }
-#elgg_sidebar h3 {
+#elgg-sidebar h3 {
        border-bottom:1px solid #CCCCCC;
        margin-bottom:5px;
        margin-top:20px;
@@ -238,7 +238,7 @@ h2 {
 /* ***************************************
        PAGE LAYOUT - MAIN BLOCKS POSITIONING
 *************************************** */
-#elgg_topbar {
+#elgg-topbar {
        background:#333333 url(<?php echo elgg_get_site_url(); ?>_graphics/toptoolbar_background.gif) repeat-x top left;
        color:#eeeeee;
        border-bottom:1px solid #000000;
@@ -248,7 +248,7 @@ h2 {
        height:24px;
        z-index: 9000;
 }
-#elgg_header {
+#elgg-header {
        x-overflow: hidden;
        position: relative;
        width: 100%;
@@ -258,19 +258,19 @@ h2 {
        background-repeat: repeat-x;
        background-position: bottom left;
 }
-#elgg_header_contents {
+#elgg-header-contents {
        width:990px;
        position: relative;
        margin:0 auto;
        height:90px;
 }
-#elgg_search {
+#elgg-search {
        bottom:5px;
        height:23px;
        position:absolute;
        right:0;
 }
-#elgg_main_nav {
+#elgg-main-nav {
        z-index: 7000;
        position: absolute;
        height:23px;
@@ -278,7 +278,7 @@ h2 {
        left:0;
        width:auto;
 }
-#elgg_content { /* wraps sidebar and page contents */
+#elgg-content { /* wraps sidebar and page contents */
        width:990px;
        position: relative;
        overflow:hidden;
@@ -286,34 +286,34 @@ h2 {
        margin:0 auto;
        min-height:400px;
 }
-#elgg_content.sidebar { /* class on #elgg_content div to give a full-height sidebar background */
+#elgg-content.sidebar { /* class on #elgg-content div to give a full-height sidebar background */
        background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/sidebar_background.gif);
        background-repeat:repeat-y;
        background-position: right top;
 }
-#elgg_page_contents { /* main page contents */
+#elgg-page-contents { /* main page contents */
        float:left;
        width:730px;
        position: relative;
        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;
 }
-#elgg_sidebar { /* elgg sidebar */
+#elgg-sidebar { /* elgg sidebar */
        float:right;
        width:210px;
        margin:20px 10px;
        position: relative;
        min-height:360px;
 }
-#elgg_footer {
+#elgg-footer {
        position: relative;
        z-index: 999;
 }
-#elgg_footer_contents {
+#elgg-footer-contents {
        border-top:1px solid #DEDEDE;
        margin:0 auto;
        width:990px;
@@ -325,7 +325,7 @@ h2 {
 /* ***************************************
        ELGG TOPBAR
 *************************************** */
-#elgg_topbar_contents {
+#elgg-topbar-contents {
        float:left;
        height:24px;
        left:0px;
@@ -334,7 +334,7 @@ h2 {
        text-align:left;
        width:100%;
 }
-#elgg_topbar_contents a {
+#elgg-topbar-contents a {
        margin-right:30px;
        padding-top:2px;
        display:inline;
@@ -342,54 +342,54 @@ h2 {
        text-align: left;
        color:#eeeeee;
 }
-#elgg_topbar_contents a:hover {
+#elgg-topbar-contents a:hover {
        color:#71cbff;
        text-decoration: none;
 }
-#elgg_topbar_contents a img.user_mini_avatar {
+#elgg-topbar-contents a img.user-mini-avatar {
        border:1px solid #eeeeee;
        margin:1px 0 0 10px;
        display: block;
 }
-#elgg_topbar_contents a img.site_logo {
+#elgg-topbar-contents a img.site-logo {
        display: block;
        margin-left:5px;
        margin-top: -1px;
 }
-#elgg_topbar_contents .log_out {
+#elgg-topbar-contents .log-out {
        float:right;
 }
-#elgg_topbar_contents .log_out a {
+#elgg-topbar-contents .log-out a {
        display: inline;
        text-align: right;
        margin-right:10px;
        color:#999999;
 }
-#elgg_topbar_contents .log_out a:hover {
+#elgg-topbar-contents .log-out a:hover {
        color:#71cbff;
 }
-#elgg_topbar_contents a.myfriends {
+#elgg-topbar-contents a.myfriends {
        background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left -297px;
        margin-right:30px;
        text-indent: -900em;
        width:36px;
 }
-#elgg_topbar_contents a.myfriends:hover {
+#elgg-topbar-contents a.myfriends:hover {
        background-position: left -337px;
 }
-#elgg_topbar_contents a.settings {
+#elgg-topbar-contents a.settings {
        background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -41px;
        padding-left:20px !important;
        float:right;
        margin-right:30px;
 }
-#elgg_topbar_contents a.admin {
+#elgg-topbar-contents a.admin {
        background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -41px;
        padding-left:20px !important;
        float:right;
        margin-right:30px;
 }
-#elgg_topbar_contents a.help {
+#elgg-topbar-contents a.help {
        background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -133px;
        padding-left:18px !important;
        float:right;
@@ -400,7 +400,7 @@ h2 {
 /* ***************************************
        HEADER CONTENTS
 *************************************** */
-#elgg_header_contents h1 a span.network_title {
+#elgg-header-contents h1 a span.network-title {
        font-size: 2em;
        line-height:1.4em;
        color: white;
@@ -410,7 +410,7 @@ h2 {
        text-decoration: none;
        text-shadow:1px 2px 4px #333333;
 }
-#elgg_header_contents #elgg_search input.search_input {
+#elgg-header-contents #elgg-search input.search-input {
        -webkit-border-radius: 10px;
        -moz-border-radius: 10px;
        background-color:transparent;
@@ -425,19 +425,19 @@ h2 {
        background-position: 2px -220px;
        background-repeat: no-repeat;
 }
-#elgg_header_contents #elgg_search input.search_input:focus {
+#elgg-header-contents #elgg-search input.search-input:focus {
        background-color:white;
        color:#0054A7;
        border:1px solid white;
        background-position: 2px -257px;
 }
-#elgg_header_contents #elgg_search input.search_input:active {
+#elgg-header-contents #elgg-search input.search-input:active {
        background-color:white;
        color:#0054A7;
        border:1px solid white;
        background-position: 2px -257px;
 }
-#elgg_header_contents #elgg_search input.search_submit_button {
+#elgg-header-contents #elgg-search input.search-submit-button {
        display:none;
 }
 
@@ -497,13 +497,13 @@ h2 {
        -webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
        -moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
 }
-li.navigation_more {
+li.navigation-more {
        overflow:hidden;
 }
-li.navigation_more:hover {
+li.navigation-more:hover {
        overflow:visible;
 }
-li.navigation_more:hover a {
+li.navigation-more:hover a {
        background:white;
        color:#555555;
        -moz-border-radius-topleft:4px;
@@ -513,17 +513,17 @@ li.navigation_more:hover a {
        -webkit-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
        -moz-box-shadow: 2px -1px 1px rgba(0, 0, 0, 0.25);
 }
-li.navigation_more a.subnav span {
+li.navigation-more a.subnav span {
        background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
        background-repeat: no-repeat;
        background-position: -150px -56px;
        padding-left: 12px;
 }
-li.navigation_more:hover a.subnav span,
-li.navigation_more a.subnav:hover span {
+li.navigation-more:hover a.subnav span,
+li.navigation-more a.subnav:hover span {
        background-position: -150px -76px;
 }
-li.navigation_more ul {
+li.navigation-more ul {
        z-index: 7000;
        min-width: 150px;
        margin-left:-1px;
@@ -538,10 +538,10 @@ li.navigation_more ul {
        -webkit-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
        -moz-box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.25);
 }
-li.navigation_more ul li {
+li.navigation-more ul li {
        float:none;
 }
-.navigation li.navigation_more ul li a {
+.navigation li.navigation-more ul li a {
        background:white;
        color:#555555;
        margin:0;
@@ -550,14 +550,14 @@ li.navigation_more ul li {
        -webkit-box-shadow: none;
        -moz-box-shadow: none;
 }
-.navigation li.navigation_more ul li:last-child a,
-.navigation li.navigation_more ul li:last-child a:hover {
+.navigation li.navigation-more ul li:last-child a,
+.navigation li.navigation-more ul li:last-child a:hover {
        -moz-border-radius-bottomleft:4px;
        -moz-border-radius-bottomright:4px;
        -webkit-border-bottom-left-radius:4px;
        -webkit-border-bottom-right-radius:4px;
 }
-.navigation li.navigation_more ul li a:hover {
+.navigation li.navigation-more ul li a:hover {
        background:#4690D6;
        color:white;
        margin:0;
@@ -566,7 +566,7 @@ li.navigation_more ul li {
        -webkit-box-shadow: none;
        -moz-box-shadow: none;
 }
-.navigation li.navigation_more ul li.selected a {
+.navigation li.navigation-more ul li.selected a {
        background:#4690D6;
        color:white;
 }
@@ -574,18 +574,18 @@ li.navigation_more ul li {
 /* ***************************************
        FOOTER CONTENTS
 *************************************** */
-#elgg_footer_contents,
-#elgg_footer_contents a,
-#elgg_footer_contents p {
+#elgg-footer-contents,
+#elgg-footer-contents a,
+#elgg-footer-contents p {
        color:#999999;
 }
-#elgg_footer_contents a:hover {
+#elgg-footer-contents a:hover {
        color:#666666;
 }
-.#elgg_footer_contents p {
+.#elgg-footer-contents p {
        margin:0;
 }
-.powered_by_elgg_badge {
+.powered-by-elgg-badge {
        float:right;
 }
 
@@ -593,14 +593,14 @@ li.navigation_more ul li {
 /* ***************************************
        SYSTEM MESSAGES
 *************************************** */
-#elgg_system_messages {
+#elgg-system-messages {
        position:fixed;
        right:20px;
        max-width: 500px;
        z-index: 9600;
 }
 
-.elgg_system_message {
+.elgg-system-message {
        background-color:black;
        color:white;
        font-weight: bold;
@@ -613,10 +613,10 @@ li.navigation_more ul li {
        -moz-box-shadow: 0 2px 5px rgba(0, 0, 0, 0.45);
        z-index: 9600;
 }
-.elgg_system_message.error {
+.elgg-system-message.error {
        background-color:red;
 }
-.elgg_system_message p {
+.elgg-system-message p {
        margin:0;
 }
 
@@ -695,7 +695,7 @@ li.navigation_more ul li {
        margin:5px 0 5px 0;
        padding:5px 0;
 }
-.pagination .pagination_number {
+.pagination .pagination-number {
        display:block;
        float:left;
        background:#ffffff;
@@ -710,12 +710,12 @@ li.navigation_more ul li {
        -webkit-border-radius: 4px;
        -moz-border-radius: 4px;
 }
-.pagination .pagination_number:hover {
+.pagination .pagination-number:hover {
        background:#4690d6;
        color:white;
        text-decoration: none;
 }
-.pagination .pagination_more {
+.pagination .pagination-more {
        display:block;
        float:left;
        background:#ffffff;
@@ -729,8 +729,8 @@ li.navigation_more ul li {
        -webkit-border-radius: 4px;
        -moz-border-radius: 4px;
 }
-.pagination .pagination_previous,
-.pagination .pagination_next {
+.pagination .pagination-previous,
+.pagination .pagination-next {
        display:block;
        float:left;
        border:1px solid #cccccc;
@@ -744,14 +744,14 @@ li.navigation_more ul li {
        -webkit-border-radius: 4px;
        -moz-border-radius: 4px;
 }
-.pagination .pagination_previous:hover,
-.pagination .pagination_next:hover {
+.pagination .pagination-previous:hover,
+.pagination .pagination-next:hover {
        background:#4690d6;
        border:1px solid #4690d6;
        color:white;
        text-decoration: none;
 }
-.pagination .pagination_currentpage {
+.pagination .pagination-currentpage {
        display:block;
        float:left;
        background:#4690d6;
@@ -771,19 +771,19 @@ li.navigation_more ul li {
 /* ***************************************
        ELGG TABBED PAGE NAVIGATION
 *************************************** */
-.elgg_horizontal_tabbed_nav {
+.elgg-horizontal-tabbed-nav {
        margin-bottom:5px;
        padding: 0;
        border-bottom: 2px solid #cccccc;
        display:table;
        width:100%;
 }
-.elgg_horizontal_tabbed_nav ul {
+.elgg-horizontal-tabbed-nav ul {
        list-style: none;
        padding: 0;
        margin: 0;
 }
-.elgg_horizontal_tabbed_nav li {
+.elgg-horizontal-tabbed-nav li {
        float: left;
        border: 2px solid #cccccc;
        border-bottom-width: 0;
@@ -794,7 +794,7 @@ li.navigation_more ul li {
        -webkit-border-top-left-radius:5px;
        -webkit-border-top-right-radius:5px;
 }
-.elgg_horizontal_tabbed_nav a {
+.elgg-horizontal-tabbed-nav a {
        text-decoration: none;
        display: block;
        padding:3px 10px 0 10px;
@@ -802,15 +802,15 @@ li.navigation_more ul li {
        height:21px;
        color:#999999;
 }
-.elgg_horizontal_tabbed_nav a:hover {
+.elgg-horizontal-tabbed-nav a:hover {
        background: #dedede;
        color:#4690D6;
 }
-.elgg_horizontal_tabbed_nav .selected {
+.elgg-horizontal-tabbed-nav .selected {
        border-color: #cccccc;
        background: white;
 }
-.elgg_horizontal_tabbed_nav .selected a {
+.elgg-horizontal-tabbed-nav .selected a {
        position: relative;
        top: 2px;
        background: white;
@@ -819,38 +819,38 @@ li.navigation_more ul li {
 /* ***************************************
        WIDGETS
 *************************************** */
-.widget_column {
+.widget-column {
        float: right;
        min-height: 30px;
 }
-.widget_1_columns {
+.widget-1-columns {
        width: 100%;
 }
-.widget_2_columns {
+.widget-2-columns {
        width: 50%;
 }
-.widget_3_columns {
+.widget-3-columns {
        width: 33%;
 }
-.widget_4_columns {
+.widget-4-columns {
        width: 25%;
 }
-#widget_add_button {
+#widget-add-button {
        padding: 0px;
        text-align: right;
        margin-bottom: 15px;
        margin-right: 5px;
 }
-.widgets_add_panel {
+.widgets-add-panel {
        padding: 10px;
        margin: 0 5px 15px;
        background: #dedede;
 }
-.widgets_add_panel ul {
+.widgets-add-panel ul {
        padding: 0;
        margin: 0;
 }
-.widgets_add_panel li {
+.widgets-add-panel li {
        float: left;
        margin: 2px 10px;
        list-style: none;
@@ -858,13 +858,13 @@ li.navigation_more ul li {
        padding: 4px;
        background-color: #cccccc;
 }
-.widgets_add_panel li a {
+.widgets-add-panel li a {
        display: block;
 }
-.widget_available {
+.widget-available {
        cursor: pointer;
 }
-.widget_unavailable {
+.widget-unavailable {
        color: #888888;
 }
 .widget {
@@ -876,18 +876,18 @@ li.navigation_more ul li {
 .widget:hover {
        background-color: #cccccc;
 }
-.widget_title {
+.widget-title {
        background-color: #dedede;
        height: 30px;
        line-height: 30px;
        overflow: hidden;
 }
-.widget_title h3 {
+.widget-title h3 {
        float: left;
        padding: 0 45px 0 20px;
        color: #333333;
 }
-.widget_controls a {
+.widget-controls a {
        position: absolute;
        top: 5px;
        display: block;
@@ -895,42 +895,42 @@ li.navigation_more ul li {
        height: 18px;
        border: 1px solid transparent;
 }
-a.widget_collapse_button {
+a.widget-collapse-button {
        left: 5px;
        background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat 0px -385px;
 }
-.widget_controls a.widget_collapsed {
+.widget-controls a.widget-collapsed {
        background-position: 0px -365px;
 }
-a.widget_delete_button {
+a.widget-delete-button {
        right: 5px;
        background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -198px 3px;
 }
-a.widget_edit_button {
+a.widget-edit-button {
        right: 25px;
        background:transparent url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat -300px -1px;
 }
-a.widget_edit_button:hover, a.widget_delete_button:hover {
+a.widget-edit-button:hover, a.widget-delete-button:hover {
        border: 1px solid #cccccc;
 }
-.widget_container {
+.widget-container {
        background-color: white;
        width: 100%;
        overflow: hidden;
 }
-.widget_edit {
+.widget-edit {
        display: none;
        width: 96%;
        padding: 2%;
        border-bottom: 2px solid #dedede;
 }
-.widget_content {
+.widget-content {
        padding: 10px;
 }
-.drag_handle {
+.drag-handle {
        cursor: move;
 }
-.widget_placeholder {
+.widget-placeholder {
        border: 2px dashed #dedede;
        margin-bottom: 15px;
 }
@@ -939,13 +939,13 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
        LOGIN / REGISTER
 *************************************** */
 /* login in sidebar */
-#elgg_sidebar #login {
+#elgg-sidebar #login {
        width:auto;
 }
-#elgg_sidebar #login form {
+#elgg-sidebar #login form {
        width:auto;
 }
-#elgg_sidebar #login .login_textarea {
+#elgg-sidebar #login .login-textarea {
        width:196px;
 }
 /* default login and register forms */
@@ -966,30 +966,30 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
 .loginbox .submit-button {
        margin-right: 15px;
 }
-#login .persistent_login {
+#login .persistent-login {
        float:right;
        display:block;
        margin-top:-34px;
        margin-left:80px;
 }
-#login .persistent_login label {
+#login .persistent-login label {
        font-size:1.0em;
        font-weight: normal;
        cursor: pointer;
 }
-#login_dropdown {
+#login-dropdown {
        float:right;
        position: absolute;
        top:10px;
        right:0;
        z-index: 9599;
 }
-#login_dropdown #signin_button {
+#login-dropdown #signin-button {
        padding:10px 0px 12px;
        line-height:23px;
        text-align:right;
 }
-#login_dropdown #signin_button a.signin {
+#login-dropdown #signin-button a.signin {
        padding:2px 6px 3px 6px;
        text-decoration:none;
        font-weight:bold;
@@ -1001,30 +1001,30 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
        -moz-border-radius:4px;
        border-radius:4px;
 }
-#login_dropdown #signin_button a.signin span {
+#login-dropdown #signin-button a.signin span {
        padding:4px 0 6px 12px;
        background-image:url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png);
        background-position:-150px -51px;
        background-repeat:no-repeat;
 }
-#login_dropdown #signin_button a.signin:hover {
+#login-dropdown #signin-button a.signin:hover {
        background-color:#71B9F7;
        /* color:black; */
 }
-#login_dropdown #signin_button a.signin:hover span {
+#login-dropdown #signin-button a.signin:hover span {
        /* background-position:-150px -71px; */
 }
-#login_dropdown #signin_button a.signin.menu_open {
+#login-dropdown #signin-button a.signin.menu-open {
        background:#cccccc !important;
        color:#666666 !important;
        border:1px solid #cccccc;
        outline:none;
 }
-#login_dropdown #signin_button a.signin.menu_open span {
+#login-dropdown #signin-button a.signin.menu-open span {
        background-position:-150px -71px;
        color:#333333;
 }
-#login_dropdown #signin_menu {
+#login-dropdown #signin-menu {
        -moz-border-radius-topleft:5px;
        -moz-border-radius-bottomleft:5px;
        -moz-border-radius-bottomright:5px;
@@ -1047,19 +1047,19 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
        -webkit-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
        -moz-box-shadow: 0 3px 3px rgba(0, 0, 0, 0.45);
 }
-#login_dropdown #signin_menu input[type=text],
-#login_dropdown #signin_menu input[type=password] {
+#login-dropdown #signin-menu input[type=text],
+#login-dropdown #signin-menu input[type=password] {
        width:203px;
        margin:0 0 5px;
 }
-#login_dropdown #signin_menu p {
+#login-dropdown #signin-menu p {
        margin:0;
 }
-#login_dropdown #signin_menu label {
+#login-dropdown #signin-menu label {
        font-weight:normal;
        font-size: 100%;
 }
-#login_dropdown #signin_menu .submit-button {
+#login-dropdown #signin-menu .submit-button {
        margin-right:15px;
 }
 
@@ -1076,22 +1076,22 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
        clear: both;
        visibility: hidden;
 }
-.content_header_title {
+.content-header-title {
        float:left;
 }
-.content_header_title {
+.content-header-title {
        margin-right:10px;
        max-width: 530px;
 }
-.content_header_title h2 {
+.content-header-title h2 {
        border:none;
        margin-bottom:0;
        padding-bottom:5px;
 }
-.content_header_options {
+.content-header-options {
        float:right;
 }
-.content_header_options .action-button {
+.content-header-options .action-button {
        float:right;
        margin:0 0 5px 10px;
 }
@@ -1111,49 +1111,49 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
 .generic_comment:first-child {
        border-top:1px dotted #cccccc;
 }
-.generic_comment_icon {
+.generic-comment-icon {
        float:left;
        margin-left:3px;
        margin-top:3px;
 }
-.generic_comment_icon img {
+.generic-comment-icon img {
        width: auto;
 }
-.generic_comment_details {
+.generic-comment-details {
        float:left;
        margin-left:7px;
        min-height:28px;
        width:693px;
 }
-.generic_comment_details p {
+.generic-comment-details p {
        margin:0;
 }
-.generic_comment_owner {
+.generic-comment-owner {
        line-height:1.2em;
 }
-.generic_comment_owner a {
+.generic-comment-owner a {
        color:#0054A7;
 }
-.generic_comment_body {
+.generic-comment-body {
        margin:3px 0 5px 0;
 }
-.generic_comment_body p {
+.generic-comment-body p {
        margin-bottom: 10px;
 }
 /* latest comments in sidebar */
-#elgg_sidebar .generic_comment.latest {
+#elgg-sidebar .generic_comment.latest {
        padding:2px 0;
 }
-#elgg_sidebar .generic_comment.latest .generic_comment_icon  {
+#elgg-sidebar .generic_comment.latest .generic-comment-icon  {
        margin-left:1px;
        margin-top:5px;
 }
-#elgg_sidebar .generic_comment.latest .generic_comment_details {
+#elgg-sidebar .generic_comment.latest .generic-comment-details {
        width:177px;
        line-height:1.1em;
        overflow:hidden;
 }
-#elgg_sidebar .generic_comment.latest .entity_title {
+#elgg-sidebar .generic_comment.latest .entity-title {
        font-size: inherit;
        line-height: inherit;
 }
@@ -1162,67 +1162,67 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
 /* ***************************************
        DEFAULT ENTITY LISTINGS
 **************************************** */
-.entity_listing {
+.entity-listing {
        border-bottom:1px dotted #cccccc;
        padding:4px 0;
        position:relative;
 }
-.entity_listing:first-child {
+.entity-listing:first-child {
        border-top:1px dotted #cccccc;
 }
-.entity_listing:hover {
+.entity-listing:hover {
        background-color: #eeeeee;
 }
-.entity_listing .icon {
+.entity-listing .icon {
        margin-left:3px;
        margin-top:3px;
 }
-.entity_listing .info {
+.entity-listing .info {
        min-height:28px;
        width:693px;
 }
-.entity_listing_info p {
+.entity-listing-info p {
        margin:0;
        /* line-height:1.2em; */
 }
-.entity_title {
+.entity-title {
        font-weight: bold;
        font-size: 1.1em;
        line-height:1.2em;
        color:#666666;
        padding-bottom:4px;
 }
-.entity_title a {
+.entity-title a {
        color:#0054A7;
 }
-.entity_subtext {
+.entity-subtext {
        color:#666666;
        font-size: 85%;
        font-style: italic;
        line-height:1.2em;
 }
 /* entity metadata block */
-.entity_metadata {
+.entity-metadata {
        float:right;
        margin:0 3px 0 15px;
        color:#aaaaaa;
        font-size: 90%;
 }
-.entity_metadata span {
+.entity-metadata span {
        margin-left:14px;
        text-align:right;
 }
-.entity_metadata .entity_edit a {
+.entity-metadata .entity-edit a {
        color:#aaaaaa;
 }
-.entity_metadata .entity_edit a:hover {
+.entity-metadata .entity-edit a:hover {
        color:#555555;
 }
-.entity_metadata .delete-button {
+.entity-metadata .delete-button {
        margin-top:3px;
 }
 /* override hover for lists of site users/members */
-.members_list .entity_listing:hover {
+.members-list .entity-listing:hover {
        background-color:white;
 }
 
@@ -1230,10 +1230,10 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
 /* ***************************************
        USER SETTINGS
 *************************************** */
-.user_settings {
+.user-settings {
        margin-bottom:20px;
 }
-.user_settings h3 {
+.user-settings h3 {
        background:#e4e4e4;
        color:#333333;
        padding:5px;
@@ -1242,35 +1242,35 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
        -webkit-border-radius: 3px;
        -moz-border-radius: 3px;
 }
-.user_settings label {
+.user-settings label {
        color:#333333;
        font-size:100%;
        font-weight:normal;
 }
-.user_settings table.styled {
+.user-settings table.styled {
        width:100%;
 }
-.user_settings table.styled {
+.user-settings table.styled {
        border-top:1px solid #cccccc;
 }
-.user_settings table.styled td {
+.user-settings table.styled td {
        padding:2px 4px 2px 4px;
        border-bottom:1px solid #cccccc;
 }
-.user_settings table.styled td.column_one {
+.user-settings table.styled td.column-one {
        width:200px;
 }
-.user_settings table.styled tr:hover {
+.user-settings table.styled tr:hover {
        background: #E4E4E4;
 }
-.add_user form {
+.add-user form {
        width:300px;
 }
 
 /* ***************************************
        FRIENDS PICKER
 *************************************** */
-.friends_picker_container h3 {
+.friends-picker-container h3 {
        font-size:4em !important;
        text-align: left;
        margin:10px 0 20px 0 !important;
@@ -1278,18 +1278,18 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
        background: none !important;
        padding:0 !important;
 }
-.friends_picker .friends_picker_container .panel ul {
+.friends-picker .friends-picker-container .panel ul {
        text-align: left;
        margin: 0;
        padding:0;
 }
-.friends_picker_wrapper {
+.friends-picker-wrapper {
        margin: 0;
        padding:0;
        position: relative;
        width: 100%;
 }
-.friends_picker {
+.friends-picker {
        position: relative;
        overflow: hidden;
        margin: 0;
@@ -1297,20 +1297,20 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
        width: 730px;
        height: auto;
 }
-.friendspicker_savebuttons {
+.friendspicker-savebuttons {
        background: white;
        -webkit-border-radius: 8px;
        -moz-border-radius: 8px;
        margin:0 10px 10px 10px;
 }
-.friends_picker .friends_picker_container { /* long container used to house end-to-end panels. Width is calculated in JS  */
+.friends-picker .friends-picker-container { /* long container used to house end-to-end panels. Width is calculated in JS  */
        position: relative;
        left: 0;
        top: 0;
        width: 100%;
        list-style-type: none;
 }
-.friends_picker .friends_picker_container .panel {
+.friends-picker .friends-picker-container .panel {
        float:left;
        height: 100%;
        position: relative;
@@ -1318,26 +1318,26 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
        margin: 0;
        padding:0;
 }
-.friends_picker .friends_picker_container .panel .wrapper {
+.friends-picker .friends-picker-container .panel .wrapper {
        margin: 0;
        padding:4px 10px 10px 10px;
        min-height: 230px;
 }
-.friends_picker_navigation {
+.friends-picker-navigation {
        margin: 0 0 10px 0;
        padding:0 0 10px 0;
        border-bottom:1px solid #cccccc;
 }
-.friends_picker_navigation ul {
+.friends-picker-navigation ul {
        list-style: none;
        padding-left: 0;
 }
-.friends_picker_navigation ul li {
+.friends-picker-navigation ul li {
        float: left;
        margin:0;
        background:white;
 }
-.friends_picker_navigation a {
+.friends-picker-navigation a {
        font-weight: bold;
        text-align: center;
        background: white;
@@ -1353,46 +1353,46 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
        background: white;
        color:#333333 !important;
 }
-.friends_picker_navigation li a:hover {
+.friends-picker-navigation li a:hover {
        background: #333333;
        color:white !important;
 }
-.friends_picker_navigation li a.current {
+.friends-picker-navigation li a.current {
        background: #4690D6;
        color:white !important;
 }
-.friends_picker_navigation_l, .friends_picker_navigation_r {
+.friends-picker-navigation-l, .friends-picker-navigation-r {
        position: absolute;
        top: 46px;
        text-indent: -9000em;
 }
-.friends_picker_navigation_l a, .friends_picker_navigation_r a {
+.friends-picker-navigation-l a, .friends-picker-navigation-r a {
        display: block;
        height: 43px;
        width: 43px;
 }
-.friends_picker_navigation_l {
+.friends-picker-navigation-l {
        right: 48px;
        z-index:1;
 }
-.friends_picker_navigation_r {
+.friends-picker-navigation-r {
        right: 0;
        z-index:1;
 }
-.friends_picker_navigation_l {
+.friends-picker-navigation-l {
        background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat left top;
 }
-.friends_picker_navigation_r {
+.friends-picker-navigation-r {
        background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -60px top;
 }
-.friends_picker_navigation_l:hover {
+.friends-picker-navigation-l:hover {
        background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat left -44px;
 }
-.friends_picker_navigation_r:hover {
+.friends-picker-navigation-r:hover {
        background: url("<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png") no-repeat -60px -44px;
 }
-.friendspicker_savebuttons .submit-button,
-.friendspicker_savebuttons .cancel-button {
+.friendspicker-savebuttons .submit-button,
+.friendspicker-savebuttons .cancel-button {
        margin:5px 20px 5px 5px;
 }
 #collectionMembersTable {
@@ -1407,11 +1407,11 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
 /* ***************************************
        LIKES
 *************************************** */
-.likes_list_holder {
+.likes-list-holder {
        position: relative;
        float:right;
 }
-.likes_list_holder a.user_like {
+.likes-list-holder a.user-like {
        cursor:pointer;
        background: url(<?php echo elgg_get_site_url(); ?>_graphics/elgg_sprites.png) no-repeat left -101px;
        text-indent: -9000em;
@@ -1422,21 +1422,21 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
        margin:0;
        float:left;
 }
-.likes_list_holder a.user_like: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;
 }
-.likes_list_holder .likes_list {
+.likes-list-holder .likes-list {
        background-color: white;
        border:1px solid #cccccc;
        width: 345px;
@@ -1449,41 +1449,41 @@ a.widget_edit_button:hover, a.widget_delete_button:hover {
        -webkit-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
        -moz-box-shadow: 4px 4px 4px rgba(0, 0, 0, 0.5);
 }
-.likes_list_holder .elgg_likes_user {
+.likes-list-holder .elgg-likes-user {
        border-bottom:1px solid #cccccc;
        padding:3px;
 }
-.likes_list_holder .elgg_likes_user .entity_listing_info {
+.likes-list-holder .elgg-likes-user .entity-listing-info {
        width:305px;
 }
-.entity_listing .elgg_likes_user .entity_metadata {
+.entity-listing .elgg-likes-user .entity-metadata {
        min-width:20px !important;
 }
-.elgg_likes_user .entity_listing_icon {
+.elgg-likes-user .entity-listing-icon {
        margin:3px 0 4px 2px;
 }
-.elgg_likes_user .entity_metadata {
+.elgg-likes-user .entity-metadata {
        margin-top:3px;
 }
-p.elgg_likes_owner {
+p.elgg-likes-owner {
        padding-top:4px;
 }
 
-.user_picker .user_picker_entry {
+.user-picker .user-picker-entry {
        clear:both;
        height:25px;
        padding:5px;
        margin-top:5px;
        border-bottom:1px solid #cccccc;
 }
-.user_picker_entry .delete-button {
+.user-picker-entry .delete-button {
        margin-right:10px;
 }
 
 /* ***************************************
        MISC
 *************************************** */
-#dashboard_info {
+#dashboard-info {
        float: left;
        width: 625px;
        margin: 0 5px 15px;
index 9450d2676f699bf859ff7a2b0686db03d9f0daec..821c617f55ddc10d2798288826e33e417698321f 100644 (file)
@@ -5,7 +5,7 @@
  */
 ?>
 
-<div id="dashboard_info">
+<div id="dashboard-info">
        <p>
                <?php echo elgg_echo("dashboard:nowidgets"); ?>
        </p>
index 11d1edcda5f909e0187c2507141fb6d42d106f9e..4b6636db787ffe51b189117bff94f39cdb3bce8f 100644 (file)
@@ -9,7 +9,7 @@
  * @uses string $vars['info'] Info about the entity.
  */
 ?>
-<div class="listing entity_listing">
+<div class="listing entity-listing">
        <div class="icon">
                <?php echo $vars['icon']; ?>
        </div>
index c2fd7f8b8070333336a57767d61783fe7408c175..333179fbb600ca42d981e5a1a8d5bfde57c9b474 100644 (file)
@@ -24,7 +24,7 @@ $exportable_values = $entity->getExportableValues();
                foreach ($entity as $k => $v) {
                        if ((in_array($k, $exportable_values)) || (isadminloggedin())) {
 ?>
-                       <p class="margin_none"><b><?php echo $k; ?>: </b><?php echo strip_tags($v); ?></p>
+                       <p class="margin-none"><b><?php echo $k; ?>: </b><?php echo strip_tags($v); ?></p>
 <?php
                        }
                }
@@ -32,12 +32,12 @@ $exportable_values = $entity->getExportableValues();
 </div>
 
 <?php if ($metadata) { ?>
-<div id="metadata" class="margin_top">
+<div id="metadata" class="margin-top">
 <h2><?php echo elgg_echo('metadata'); ?></h2>
        <?php
                foreach ($metadata as $m) {
 ?>
-               <p class="margin_none"><b><?php echo $m->name; ?>: </b><?php echo $m->value; ?></p>
+               <p class="margin-none"><b><?php echo $m->name; ?>: </b><?php echo $m->value; ?></p>
 <?php
                }
        ?>
@@ -46,13 +46,13 @@ $exportable_values = $entity->getExportableValues();
 <?php } ?>
 
 <?php if ($annotations) { ?>
-<div id="annotations" class="margin_top">
+<div id="annotations" class="margin-top">
 <h2><?php echo elgg_echo('annotations'); ?></h2>
        <?php
                foreach ($annotations as $a) {
 ?>
                <table>
-                       <p class="margin_none"><b><?php echo $a->name; ?>: </b><?php echo $a->value; ?></p>
+                       <p class="margin-none"><b><?php echo $a->name; ?>: </b><?php echo $a->value; ?></p>
                </table>
 <?php
                }
@@ -61,13 +61,13 @@ $exportable_values = $entity->getExportableValues();
 <?php } ?>
 
 <?php if ($relationships) { ?>
-<div id="relationship" class="margin_top">
+<div id="relationship" class="margin-top">
 <h2><?php echo elgg_echo('relationships'); ?></h2>
        <?php
                foreach ($relationships as $r) {
 ?>
                <table>
-                       <p class="margin_none"><b><?php echo $r->relationship; ?>: </b><?php echo $r->guid_two; ?></p>
+                       <p class="margin-none"><b><?php echo $r->relationship; ?>: </b><?php echo $r->guid_two; ?></p>
                </table>
 <?php
                }
index 477cde3c3322f1ea383daa1cb596619497c79a7a..1dd7f2054cbced70e8c1f224436f91c7f3867c30 100644 (file)
@@ -10,5 +10,5 @@
 $m = $vars['metadata'];
 $e = get_entity($m->entity_guid);
 ?>
-<p class="margin_none"><?php if ($e) echo "<a href=\"" . $e->getURL() . "\">GUID:{$m->entity_guid}</a>"; else echo "GUID:".$m->entity_guid;
+<p class="margin-none"><?php if ($e) echo "<a href=\"" . $e->getURL() . "\">GUID:{$m->entity_guid}</a>"; else echo "GUID:".$m->entity_guid;
 ?>: <b><?php echo $m->name; ?></b> <?php echo $m->value; ?></p>
\ No newline at end of file
index e7c8ac1215e8039f7279c87ad4d099878d136296..d8cb3e4f445cdfd0590bf00958dd6eb9ef9f1d29 100644 (file)
@@ -12,7 +12,7 @@ $r = $vars['relationship'];
 $e1 = get_entity($r->guid_one);
 $e2 = get_entity($r->guid_two);
 ?>
-<p class="margin_none"><?php
+<p class="margin-none"><?php
        if ($e1) echo "<a href=\"" . $e1->getURL() . "\">GUID:" . $r->guid_one . "</a>"; else echo "GUID:".$r->guid_one;
 ?>
 <b><?php echo $r->relationship; ?></b>
index 9981dd291b8952a9c6ba5cb8d2262255f9dc3962..665e6d34dbea71b49f3a9ac026d39897e6dab0cd 100644 (file)
@@ -43,12 +43,12 @@ if ($friends = $vars['collection']->entities) {
        <script type="text/javascript">
        $(document).ready(function () {
 
-                       $('#friends_picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
+                       $('#friends-picker_placeholder<?php echo $vars['friendspicker']; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $vars['collection']->id; ?>');
 
        });
        </script>
        <?php
 }
 
-// close friends_picker div and the accordian list item
+// close friends-picker div and the accordian list item
 echo "</li>";
index f1e27f9b77ab1a0f713d00470a825ef0bca898f7..d0669bb46aa16d00eab8c5eb8c4ab28d2e0312cc 100644 (file)
@@ -33,7 +33,7 @@ if (is_array($vars['collections']) && sizeof($vars['collections'])) {
 <script>
 $(document).ready(function(){
        $('#friends_collections_accordian h2').click(function () {
-               $(this.parentNode).children("[class=friends_picker]").slideToggle("fast");
+               $(this.parentNode).children("[class=friends-picker]").slideToggle("fast");
                //return false;
        });
 });
index f191f2c589a6f17f2b78fdf5e13137ed587dbb4c..6aef4bf1ecad0846b90d8b9c1a884a25d7e53adf 100644 (file)
@@ -16,7 +16,7 @@ $ownerid = $vars['owner']->getGUID();
 
 ?>
 
-<div id="elgg_horizontal_tabbed_nav">
+<div id="elgg-horizontal-tabbed-nav">
 <ul>
 <li class="selected"><a href="#" class="collectionmembers<?php echo $friendspicker; ?>"><?php echo elgg_echo('friends:collections:members'); ?></a></li>
 
@@ -30,7 +30,7 @@ $(document).ready(function () {
 
        $('a.collectionmembers<?php echo $friendspicker; ?>').click(function () {
                // load collection members pane
-               $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
+               $('#friends-picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=list&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
 
                // remove selected state from previous tab
                $(this).parent().parent().find("li.selected").removeClass("selected");
@@ -42,7 +42,7 @@ $(document).ready(function () {
 
        $('a.editmembers<?php echo $friendspicker; ?>').click(function () {
                // load friends picker pane
-               $('#friends_picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
+               $('#friends-picker_placeholder<?php echo $friendspicker; ?>').load('<?php echo elgg_get_site_url(); ?>pages/friends/pickercallback.php?username=<?php echo get_loggedin_user()->username; ?>&type=picker&collection=<?php echo $collectionid; ?>&friendspicker=<?php echo $friendspicker; ?>');
 
                // remove selected state from previous tab
                $(this).parent().parent().find("li.selected").removeClass("selected");
index f348b754df3ad744ca891bce8835b411ded742c4..3bbe4ffe2becb4285498e25b32c59313c61c7f20 100644 (file)
@@ -101,7 +101,7 @@ foreach ($users as $letter => $letter_users) {
 if (!$callback) {
        ?>
 
-       <div class="friends_picker">
+       <div class="friends-picker">
 
        <?php
 
@@ -110,7 +110,7 @@ if (!$callback) {
        }
        ?>
 
-       <div id="friends_picker_placeholder<?php echo $friendspicker; ?>">
+       <div id="friends-picker_placeholder<?php echo $friendspicker; ?>">
 
        <?php
 }
@@ -150,9 +150,9 @@ if (!isset($vars['replacement'])) {
        }
 ?>
 
-<div class="friends_picker_wrapper">
-<div id="friends_picker<?php echo $friendspicker; ?>">
-       <div class="friends_picker_container">
+<div class="friends-picker-wrapper">
+<div id="friends-picker<?php echo $friendspicker; ?>">
+       <div class="friends-picker-container">
 <?php
 
 // Initialise letters
@@ -269,7 +269,7 @@ if ($formtarget) {
 
 ?>
        <div class="clearfix"></div>
-       <div class="friendspicker_savebuttons">
+       <div class="friendspicker-savebuttons">
                <input type="submit" class="submit-button" value="<?php echo elgg_echo('save'); ?>" />
                <input type="button" class="cancel-button" value="<?php echo elgg_echo('cancel'); ?>" onclick="$('a.collectionmembers<?php echo $friendspicker; ?>').click();" />
        <br /></div>
@@ -305,7 +305,7 @@ if (!isset($vars['replacement'])) {
 
 <script type="text/javascript">
        // initialise picker
-       $("div#friends_picker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
+       $("div#friends-picker<?php echo $friendspicker; ?>").friendsPicker(<?php echo $friendspicker; ?>);
 </script>
 <script>
 $(document).ready(function () {
@@ -316,7 +316,7 @@ if (sizeof($activeletters) > 0)
        foreach($activeletters as $letter) {
                $tab = strpos($chararray, $letter) + 1;
 ?>
-$("div#friends_picker_navigation<?php echo $friendspicker; ?> li.tab<?php echo $tab; ?> a").addClass("tabHasContent");
+$("div#friends-picker-navigation<?php echo $friendspicker; ?> li.tab<?php echo $tab; ?> a").addClass("tabHasContent");
 <?php
        }
 
index 74ec10818b185beee05f294eb99abde106af778e..8f32aa4c57a8a7aea6d4994b7ba6f0f793028bee 100644 (file)
@@ -18,9 +18,9 @@
  *
  */
 
-global $user_picker_js_sent;
+global $user-picker_js_sent;
 
-function user_picker_add_user($user_id) {
+function user-picker_add-user($user_id) {
        $user = get_entity($user_id);
        if (!$user || !($user instanceof ElggUser)) {
                return FALSE;
@@ -28,7 +28,7 @@ function user_picker_add_user($user_id) {
        
        $icon = $user->getIcon('tiny');
        
-       $code = '<li class="user_picker_entry">';
+       $code = '<li class="user-picker-entry">';
        $code .= "<img class=\"livesearch_icon\" src=\"$icon\" />";
        $code .= "$user->name - $user->username";
        $code .= '<div class="delete-button">';
@@ -56,7 +56,7 @@ foreach ($vars['value'] as $value) {
 // convert the values to a json-encoded list
 $json_values = json_encode($values);
 
-if (!$user_picker_js_sent) {
+if (!$user-picker_js_sent) {
 ?>
 <!-- User picker JS -->
 <script language="javascript" type="text/javascript" src="<?php echo elgg_get_site_url(); ?>vendors/jquery/jquery.autocomplete.min.js"></script>
@@ -68,21 +68,21 @@ userList = <?php echo $json_values ?>;
 function userPickerBindEvents() {
        // binding autocomplete.
        // doing this as an each so we can past this to functions.
-       $('.user_picker .search').each(function (i, e) {
+       $('.user-picker .search').each(function (i, e) {
                userPickerBindAutocomplete(e);
        });
 
        // changing friends vs all users.
-       $('.user_picker .all_users').click(function() {
+       $('.user-picker .all_users').click(function() {
                // update the extra params for the autocomplete.
-               var e = $(this).parents('.user_picker').find('.search');
+               var e = $(this).parents('.user-picker').find('.search');
                var params = userPickerGetSearchParams(e);
                e.setOptions({extraParams: params});
                e.flushCache();
        });
 
        // hitting enter on the text field
-//     $('.user_picker .search').bind($.browser.opera ? "keypress" : "keydown", function(event) {
+//     $('.user-picker .search').bind($.browser.opera ? "keypress" : "keydown", function(event) {
 //             if(event.keyCode == 13) {
 ////                   console.log($(this).val());
 //                     userPickerAddUser(this);
@@ -114,8 +114,8 @@ function userPickerBindAutocomplete(e) {
 function userPickerFormatItem(row, i, max, term) {
        eval("var info = " + row + ";");
        var r = '';
-       var name = info.name.replace(new RegExp("(" + term + ")", "gi"), "<span class=\"user_picker_highlight\">$1</b>");
-       var desc = info.desc.replace(new RegExp("(" + term + ")", "gi"), "<span class=\"user_picker_highlight\">$1</b>");
+       var name = info.name.replace(new RegExp("(" + term + ")", "gi"), "<span class=\"user-picker_highlight\">$1</b>");
+       var desc = info.desc.replace(new RegExp("(" + term + ")", "gi"), "<span class=\"user-picker_highlight\">$1</b>");
 
        switch (info.type) {
                case 'user':
@@ -128,7 +128,7 @@ function userPickerFormatItem(row, i, max, term) {
                        break;
        }
        return r;
-       //return r.replace(new RegExp("(" + term + ")", "gi"), "<span class=\"user_picker_highlight\">$1</b>");
+       //return r.replace(new RegExp("(" + term + ")", "gi"), "<span class=\"user-picker_highlight\">$1</b>");
 }
 
 function userPickerAddUser(event, data, formatted) {
@@ -138,7 +138,7 @@ function userPickerAddUser(event, data, formatted) {
        if (!(info.guid in userList)) {
                userList[info.guid] = true;
        
-               var picker = $(this).parent('.user_picker');
+               var picker = $(this).parent('.user-picker');
                var users = picker.find('.users');
                var internalName = picker.find('input.internalname').val();
                // not sure why formatted isn't.
@@ -147,14 +147,14 @@ function userPickerAddUser(event, data, formatted) {
                // add guid as hidden input and to list.
                var li = formatted + ' <div class="delete-button"><a onclick="userPickerRemoveUser(this, ' + info.guid + ')"><strong>X</strong></a></div>'
                + '<input type="hidden" name="' + internalName + '[]" value="' + info.guid + '" />';
-               $('<li class="user_picker_entry">').html(li).appendTo(users);
+               $('<li class="user-picker-entry">').html(li).appendTo(users);
 
                $(this).val('');
        }
 }
 
 function userPickerRemoveUser(link, guid) {
-       $(link).parents('.user_picker_entry').remove();
+       $(link).parents('.user-picker-entry').remove();
 }
 
 function userPickerGetSearchParams(e) {
@@ -170,17 +170,17 @@ $(document).ready(function() {
 });
 </script>
 <?php
-       $user_picker_js_sent = true;
+       $user-picker_js_sent = true;
 }
 
 // create an HTML list of users
 $user_list = '';
 foreach ($vars['value'] as $user_id) {
-       $user_list .= user_picker_add_user($user_id);
+       $user_list .= user-picker_add-user($user_id);
 }
 
 ?>
-<div class="user_picker">
+<div class="user-picker">
        <input class="internalname" type="hidden" name="internalname" value="<?php echo $vars['internalname']; ?>" />
        <input class="search" type="text" name="user_search" size="30"/>
        <span class="controls">
index 2fa4e373ff158189673a3242639bfae59032de48..e9a3878442c7b3700ffa2ab09e89661e6742a879 100644 (file)
@@ -12,7 +12,7 @@ jQuery.fn.friendsPicker = function(iterator) {
        return this.each(function() {
        
                var container = $(this);
-               container.addClass("friends_picker");
+               container.addClass("friends-picker");
                // set panelwidth manually as it's hidden initially - adjust this value for different themes/pagewidths 
                var panelWidth = 730;
 
@@ -21,7 +21,7 @@ jQuery.fn.friendsPicker = function(iterator) {
                // calculate the width of all the panels lined up end-to-end
                var friendsPicker_containerWidth = panelWidth*panelCount;
                // specify width for the friendsPicker_container
-               container.find("div.friends_picker_container").css("width" , friendsPicker_containerWidth);
+               container.find("div.friends-picker-container").css("width" , friendsPicker_containerWidth);
                
                // global variables for container.each function below
                var friendsPickerNavigationWidth = 0;
@@ -30,17 +30,17 @@ jQuery.fn.friendsPicker = function(iterator) {
                // generate appropriate nav for each container
                container.each(function(i) {
                        // generate Left and Right arrows
-                       $(this).before("<div class='friends_picker_navigation_l' id='friends_picker_navigation_l" + iterator + "'><a href='#'>Left</a><\/div>");
-                       $(this).after("<div class='friends_picker_navigation_r' id='friends_picker_navigation_r" + iterator + "'><a href='#'>Right</a><\/div>");
+                       $(this).before("<div class='friends-picker-navigation-l' id='friends-picker-navigation-l" + iterator + "'><a href='#'>Left</a><\/div>");
+                       $(this).after("<div class='friends-picker-navigation-r' id='friends-picker-navigation-r" + iterator + "'><a href='#'>Right</a><\/div>");
                        
                        // generate a-z tabs
-                       $(this).before("<div class='friends_picker_navigation' id='friends_picker_navigation" + iterator + "'><ul><\/ul><\/div>");
+                       $(this).before("<div class='friends-picker-navigation' id='friends-picker-navigation" + iterator + "'><ul><\/ul><\/div>");
                        $(this).find("div.panel").each(function(individualTabItemNumber) {
-                               $("div#friends_picker_navigation" + iterator + " ul").append("<li class='tab" + (individualTabItemNumber+1) + "'><a href='#" + (individualTabItemNumber+1) + "'>" + $(this).attr("title") + "<\/a><\/li>");             
+                               $("div#friends-picker-navigation" + iterator + " ul").append("<li class='tab" + (individualTabItemNumber+1) + "'><a href='#" + (individualTabItemNumber+1) + "'>" + $(this).attr("title") + "<\/a><\/li>");             
                        });
                        
                        // tabs navigation
-                       $("div#friends_picker_navigation" + iterator + " a").each(function(individualTabItemNumber) {
+                       $("div#friends-picker-navigation" + iterator + " a").each(function(individualTabItemNumber) {
                                // calc friendsPickerNavigationWidth by summing width of each li
                                friendsPickerNavigationWidth += $(this).parent().width();
                                // set-up individual tab clicks
@@ -48,45 +48,45 @@ jQuery.fn.friendsPicker = function(iterator) {
                                        $(this).addClass("current").parent().parent().find("a").not($(this)).removeClass("current"); 
                                        var distanceToMoveFriendsPicker_container = - (panelWidth*individualTabItemNumber);
                                        currentPanel = individualTabItemNumber + 1;
-                                       $(this).parent().parent().parent().next().find("div.friends_picker_container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
+                                       $(this).parent().parent().parent().next().find("div.friends-picker-container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
                                });
                        });
                        
                        // Right arow click function
-                       $("div#friends_picker_navigation_r" + iterator + " a").click(function() {
+                       $("div#friends-picker-navigation-r" + iterator + " a").click(function() {
                                if (currentPanel == panelCount) {
                                        var distanceToMoveFriendsPicker_container = 0;
                                        currentPanel = 1; 
-                                       $(this).parent().parent().find("div.friends_picker_navigation a.current").removeClass("current").parent().parent().find("a:eq(0)").addClass("current");
+                                       $(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().parent().find("a:eq(0)").addClass("current");
                                } else {
                                        var distanceToMoveFriendsPicker_container = - (panelWidth*currentPanel);
                                        currentPanel += 1;
-                                       $(this).parent().parent().find("div.friends_picker_navigation a.current").removeClass("current").parent().next().find("a").addClass("current");
+                                       $(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().next().find("a").addClass("current");
                                };
-                               $(this).parent().parent().find("div.friends_picker_container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
+                               $(this).parent().parent().find("div.friends-picker-container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
                                return false;
                        });
                        
                        // Left arrow click function
-                       $("div#friends_picker_navigation_l" + iterator + " a").click(function() {
+                       $("div#friends-picker-navigation-l" + iterator + " a").click(function() {
                                if (currentPanel == 1) {
                                        var distanceToMoveFriendsPicker_container = - (panelWidth*(panelCount - 1));
                                        currentPanel = panelCount;
-                                       $(this).parent().parent().find("div.friends_picker_navigation a.current").removeClass("current").parent().parent().find("li:last a").addClass("current");
+                                       $(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().parent().find("li:last a").addClass("current");
                                } else {
                                        currentPanel -= 1;
                                        var distanceToMoveFriendsPicker_container = - (panelWidth*(currentPanel - 1));
-                                       $(this).parent().parent().find("div.friends_picker_navigation a.current").removeClass("current").parent().prev().find("a").addClass("current");
+                                       $(this).parent().parent().find("div.friends-picker-navigation a.current").removeClass("current").parent().prev().find("a").addClass("current");
                                };
-                               $(this).parent().parent().find("div.friends_picker_container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
+                               $(this).parent().parent().find("div.friends-picker-container").animate({ left: distanceToMoveFriendsPicker_container}, settings.easeTime, settings.easeFunc);
                                return false;
                        });
                                                
                                // apply 'current' class to currently selected tab link
-                               $("div#friends_picker_navigation" + iterator + " a:eq(0)").addClass("current");
+                               $("div#friends-picker-navigation" + iterator + " a:eq(0)").addClass("current");
                });
 
-               $("div#friends_picker_navigation" + iterator).append("<br />");         
+               $("div#friends-picker-navigation" + iterator).append("<br />");         
   });
 };
 
index 49c12e30c57f934d52133dbb123015cf808c2333..5157bb8bc8203b7ec24d5e0c4175def8cbb6dafc 100644 (file)
@@ -76,7 +76,7 @@ $(document).ready(function () {
 
        $els.sortable({
                items: '.draggable_widget',
-               handle: '.drag_handle',
+               handle: '.drag-handle',
                forcePlaceholderSize: true,
                placeholder: 'ui-state-highlight',
                cursor: 'move',
@@ -119,47 +119,47 @@ $(document).ready(function () {
        });
 
        // user likes
-       $(".likes_list_button").click(function(event) {
-               if ($(this).next(".likes_list").css('display') == 'none') {     // show list
+       $(".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();
+                       $('.likes-list').fadeOut();
 
-                       var topPosition = - $(this).next(".likes_list").height();
+                       var topPosition = - $(this).next(".likes-list").height();
                        topPosition10 = topPosition + 10 + "px";
                        topPosition = topPosition - 5 + "px";
-                       $('.likes_list').css('top',topPosition10);
-                       $('.likes_list').css('left', -$('.likes_list').width()+110);
-                       $(this).next(".likes_list").animate({opacity: "toggle", top: topPosition}, 500);
+                       $('.likes-list').css('top',topPosition10);
+                       $('.likes-list').css('left', -$('.likes-list').width()+110);
+                       $(this).next(".likes-list").animate({opacity: "toggle", top: topPosition}, 500);
 
                        // set up cancel for a click outside the likes list
                        $(document).click(function(event) {
                                        var target = $(event.target);
-                                       if (target.parents(".likes_list_holder").length == 0) {
-                                               $(".likes_list").fadeOut();
+                                       if (target.parents(".likes-list-holder").length == 0) {
+                                               $(".likes-list").fadeOut();
                                        }
                        });
 
                } else { // hide list
-                       var topPosition = - $(this).next(".likes_list").height() + 5;
-                       $(this).next(".likes_list").animate({opacity: "toggle", top: topPosition}, 500);
+                       var topPosition = - $(this).next(".likes-list").height() + 5;
+                       $(this).next(".likes-list").animate({opacity: "toggle", top: topPosition}, 500);
                }
        });
 
-       elgg_system_message();
+       elgg-system-message();
 
 }); /* end document ready function */
 
 
 
 // display & hide elgg system messages
-function elgg_system_message() {
-       $("#elgg_system_message").animate({opacity: 0.9}, 1000);
-       $("#elgg_system_message").animate({opacity: 0.9}, 5000);
-       $("#elgg_system_message").fadeOut('slow');
-
-       $("#elgg_system_message").click(function () {
-               $("#elgg_system_message").stop();
-               $("#elgg_system_message").fadeOut('slow');
+function elgg-system-message() {
+       $("#elgg-system-message").animate({opacity: 0.9}, 1000);
+       $("#elgg-system-message").animate({opacity: 0.9}, 5000);
+       $("#elgg-system-message").fadeOut('slow');
+
+       $("#elgg-system-message").click(function () {
+               $("#elgg-system-message").stop();
+               $("#elgg-system-message").fadeOut('slow');
        return false;
        });
 }
index cfc831a3314de255bd0131e54611255601877e21..f7ed849355d8a760ac03626bf5141cff0fac488e 100644 (file)
 ?>
 
 <div id="admin_header">
-       <span class="network_title"><h2>
+       <span class="network-title"><h2>
        <a href="<?php echo elgg_get_site_url(); ?>">
        <?php echo $vars['config']->sitename; echo " ".elgg_echo('admin'); ?></a>
        <a class="return_to_network" href="<?php echo elgg_get_site_url(); ?>">&lt;&lt; Return to network</a>
        </h2></span>
 </div>
 
-<div id="elgg_content" class="clearfix admin_area">
+<div id="elgg-content" class="clearfix admin_area">
        
-       <div id="elgg_page_contents" class="clearfix">
+       <div id="elgg-page-contents" class="clearfix">
                <?php
                        if (isset($vars['content'])) {
                                echo $vars['content'];
                        }
                ?>
        </div>
-       <div id="elgg_sidebar" class="clearfix">
+       <div id="elgg-sidebar" class="clearfix">
                <?php
                        echo elgg_view('page_elements/sidebar', $vars);
                ?>
index e4a7845f5fd2bb98e23b4ee5340cac6b72d49f1a..9555707ce2b6ba3428f3efe0bc4bf93c4cacaeb7 100644 (file)
@@ -8,8 +8,8 @@
  * @uses $vars['content'] Content string
  */
 ?>
-<div id="elgg_content" class="clearfix">
-       <div id="elgg_page_contents" class="clearfix one_column">
+<div id="elgg-content" class="clearfix">
+       <div id="elgg-page-contents" class="clearfix one_column">
                <?php echo $vars['content']; ?>
                <?php echo $vars['area1']; ?>
        </div>
index 046c49997126c637c714dbc1436d568cf5f6765d..f3ca08f06dbb8b4a701bf17e057fb1140436ff97 100644 (file)
@@ -9,14 +9,14 @@
  * @uses $vars['sidebar'] Optional content that is displayed in the sidebar
  */
 ?>
-<div id="elgg_content" class="clearfix sidebar">
-       <div id="elgg_sidebar">
+<div id="elgg-content" class="clearfix sidebar">
+       <div id="elgg-sidebar">
                <?php
                        echo elgg_view('page_elements/sidebar', $vars);
                ?>
        </div>
        
-       <div id="elgg_page_contents" class="clearfix">
+       <div id="elgg-page-contents" class="clearfix">
                <?php
                        // @todo deprecated so remove in Elgg 2.0
                        if (isset($vars['area1'])) {
index afb44f551c2025ac56a84b7322db9259fba437d6..c5607314aec9f5d3bf95d9e76c46a79cf3a46892 100644 (file)
@@ -34,7 +34,7 @@ $widget_class = "widget_{$num_columns}_columns";
 for ($column_index = 1; $column_index <= $num_columns; $column_index++) {
        $column_widgets = $widgets[$column_index];
 
-       echo "<div class=\"widget_column $widget_class\" id=\"widget_col_$column_index\">";
+       echo "<div class=\"widget-column $widget_class\" id=\"widget_col_$column_index\">";
        if (is_array($column_widgets) && sizeof($column_widgets) > 0) {
                foreach ($column_widgets as $widget) {
                        echo elgg_view_entity($widget);
index 96092d118a5783e0e9703df5536c503a4c220454..b4ced14537d1e19e4284ea6b82be3bb89e14935e 100644 (file)
@@ -11,11 +11,11 @@ if (isset($vars['entity']) && isloggedin()) {
        $guid = $vars['entity']->getGuid();
        $url = elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/likes/add?guid={$guid}");
        
-       echo "<span class='likes_list_holder'>";
+       echo "<span class='likes-list-holder'>";
        //check to see if the user has already liked
        if (!elgg_annotation_exists($guid, 'likes') ) {
-               echo "<a class='user_like link' title='".elgg_echo('likes:likethis')."' href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a>";
-               $likes_classname = "not_liked";
+               echo "<a class='user-like link' title='".elgg_echo('likes:likethis')."' href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a>";
+               $likes_classname = "not-liked";
                $likes_titletag = "";
        } else {
                $likes_titletag = "title='".elgg_echo('likes:remove')."'";
@@ -29,10 +29,10 @@ 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'>";
+               echo "<div class='likes-list hidden clearfix'>";
                echo list_annotations($vars['entity']->getGUID(), 'likes', 99);
                echo "</div>";  
        }
index 4e52224e2a55ae12bd5f8154d6287d7470d5498b..decb4aa7f73a8ed1ba9efa79c7c879e99a88d06c 100644 (file)
@@ -12,6 +12,6 @@ if (isset($vars['entity']) && isloggedin()) {
        $url = elgg_add_action_tokens_to_url(elgg_get_site_url() . "action/likes/add?guid={$guid}");
        //check to see if the user has already liked
        if (!elgg_annotation_exists($guid, 'likes') ) {
-               echo "<span class='river_link_divider'> | </span><a class='river_user_like_button link' href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a>";
+               echo "<span class='river_link_divider'> | </span><a class='river_user-like_button link' href=\"{$url}\">" . elgg_echo('likes:likethis') . "</a>";
        }
 }
\ No newline at end of file
index 5f675715dffa12fff37bea35415c87d448458ef1..6e1c5a888b9f78ad1bacc37928abe202df89a823 100644 (file)
@@ -13,7 +13,7 @@ if (!empty($vars['object']) && is_array($vars['object'])) {
        foreach($vars['object'] as $error) {
 ?>
 
-       <div class="elgg_system_message hidden radius8 error">
+       <div class="elgg-system-message hidden radius8 error">
                <?php echo elgg_view('messages/errors/error',array('object' => $error)); ?>
        </div>
        
index dc50ef071e329ab9fa1bee7ad673921bb0c48642..84cec1b34ec076631be317de3092cebaaf9ea53f 100644 (file)
@@ -10,7 +10,7 @@
  */
 ?>
 
-<div id="elgg_system_messages">
+<div id="elgg-system-messages">
 <?php 
        if (!empty($vars['object']) && is_array($vars['object']) && sizeof($vars['object']) > 0) {
                foreach($vars['object'] as $register => $list ) {
index 1d69c028935c6dfd60e520bb9814f83c390ac6b6..6af17b9298b820fae773c0b92e77dc528beaa00a 100644 (file)
@@ -13,7 +13,7 @@ if (!empty($vars['object']) && is_array($vars['object'])) {
        foreach($vars['object'] as $message) {
 ?>
 
-       <div class="elgg_system_message hidden radius8">
+       <div class="elgg-system-message hidden radius8">
                <?php echo elgg_view('messages/messages/message',array('object' => $message)); ?>
        </div>
 
index c4693313b54653f3f1fbb8644f6e429a977fd226..9b86df40c5ac04962acc1d252280bb300cae7a2c 100644 (file)
@@ -22,7 +22,7 @@ if (substr_count($baseurl,'?')) {
 
 ?>
 
-<p class="margin_top">
+<p class="margin-top">
        <?php echo elgg_echo("listtype:change") ?>:
        <a href="<?php echo $baseurl; ?>"><?php echo elgg_echo("listtype:{$listtype}"); ?></a>
 </p>
\ No newline at end of file
index de401eae4645fd0b733024bc983b8863bb4f4211..fc15470bce465f2bc53c4e7ea0f9f30b51ed88ad 100644 (file)
@@ -41,7 +41,7 @@ if (($count > $limit || $offset > 0) && elgg_get_context() != 'widget') {
 
                $prevurl = elgg_http_add_url_query_elements($baseurl, array($word => $prevoffset));
 
-               echo "<a href=\"{$prevurl}\" class='pagination_previous'>&laquo; ". elgg_echo("previous") ."</a> ";
+               echo "<a href=\"{$prevurl}\" class='pagination-previous'>&laquo; ". elgg_echo("previous") ."</a> ";
        }
 
        if ($offset > 0 || $offset < ($count - $limit)) {
@@ -75,16 +75,16 @@ if (($count > $limit || $offset > 0) && elgg_get_context() != 'widget') {
                $prev = 0;
                foreach($pagesarray as $i) {
                        if (($i - $prev) > 1) {
-                               echo "<span class='pagination_more'>...</span>";
+                               echo "<span class='pagination-more'>...</span>";
                        }
 
                        $curoffset = (($i - 1) * $limit);
                        $counturl = elgg_http_add_url_query_elements($baseurl, array($word => $curoffset));
 
                        if ($curoffset != $offset) {
-                               echo " <a href=\"{$counturl}\" class='pagination_number'>{$i}</a> ";
+                               echo " <a href=\"{$counturl}\" class='pagination-number'>{$i}</a> ";
                        } else {
-                               echo "<span class='pagination_currentpage'>{$i}</span>";
+                               echo "<span class='pagination-currentpage'>{$i}</span>";
                        }
                        $prev = $i;
 
@@ -100,7 +100,7 @@ if (($count > $limit || $offset > 0) && elgg_get_context() != 'widget') {
 
                $nexturl = elgg_http_add_url_query_elements($baseurl, array($word => $nextoffset));
 
-               echo " <a href=\"{$nexturl}\" class='pagination_next'>" . elgg_echo("next") . " &raquo;</a>";
+               echo " <a href=\"{$nexturl}\" class='pagination-next'>" . elgg_echo("next") . " &raquo;</a>";
 
        }
 
index 325f5a18b51a11f8acfc67c128c766eb4c425be8..84ac7556954fa1e3ab44f4f4db91bc3658754c3f 100644 (file)
@@ -65,7 +65,7 @@ foreach ($more as $info) {
 
 if ($more_nav_html) {
        $more = elgg_echo('more');
-       $nav_html .= "<li class='navigation_more'><a class='subnav' title=\"$more\"><span>$more</span></a>
+       $nav_html .= "<li class='navigation-more'><a class='subnav' title=\"$more\"><span>$more</span></a>
                <ul>
                        $more_nav_html
                </ul>
@@ -75,7 +75,7 @@ if ($more_nav_html) {
 // only display, if there are nav items to display
 if ($nav_html) {
        echo <<<___END
-       <div id="elgg_main_nav" class="clearfix">
+       <div id="elgg-main-nav" class="clearfix">
                <ul class="navigation">
                        $nav_html
                </ul>
index fd6d8b8fe97968ef7afb4ccd7bda8da3c1f2ed83..582b56bbe98655ff044a31f8218083052c873566 100644 (file)
@@ -15,7 +15,7 @@
 
 $type = (isset($vars['type'])) ? $vars['type'] : 'horizontal';
 if ($type == 'horizontal') {
-       $type_class = "elgg_horizontal_tabbed_nav margin_top";
+       $type_class = "elgg-horizontal-tabbed-nav margin-top";
 } else {
        $type_class = "elgg_vertical_tabbed_nav";
 }
index c7a27a16f4a89354c8aa4bdd6ed5daaa636e7cdd..afb142ebe697f9ed74a08fa51bd7202978779d65 100644 (file)
@@ -10,7 +10,7 @@ global $NOTIFICATION_HANDLERS;
 $notification_settings = get_user_notification_settings(elgg_get_page_owner_guid());
 
 ?>
-<div class="user_settings notifications">
+<div class="user-settings notifications">
 <h3><?php echo elgg_echo('notifications:usersettings'); ?></h3>
 
 <p><?php echo elgg_echo('notifications:methods'); ?>
index 0e45ce1dfa383c427540eee97ed0d828addd2aaf..530bb96841962b9b2df5b8ed058b70c6e42dbd00 100644 (file)
@@ -4,4 +4,4 @@
         * @todo check this - it doesn't appear this view is ever called
         **/
 ?>
-<div class="rss_link clearfix"><a href="" title="RSS feed for the wire">RSS feed for the wire</a></div>
\ No newline at end of file
+<div class="rss-link clearfix"><a href="" title="RSS feed for the wire">RSS feed for the wire</a></div>
\ No newline at end of file
index f10d8b7adbbfcd4ed9cbb15f8ba462665fa3e4a7..64d12287761dca32c36e8583537c366d83a4c83a 100644 (file)
@@ -58,7 +58,7 @@ $tabs = (isset($vars['tabs'])) ? $vars['tabs'] : $default_tabs;
 $tab_list = elgg_view('navigation/tabs', array('tabs' => $tabs));
 
 $title = elgg_echo($type);
-$title = '<div class="content_header_title">' . elgg_view_title($title) . '</div>';
+$title = '<div class="content-header-title">' . elgg_view_title($title) . '</div>';
 
 // must be logged in to see any action buttons
 if (isloggedin()) {
@@ -75,7 +75,7 @@ if (isloggedin()) {
                        $new_link = elgg_normalize_url((isset($vars['new_link'])) ? $vars['new_link'] : "pg/$type/$username/new");
                        $new_button = "<a href=\"{$new_link}\" class='action-button'>" . elgg_echo($type . ':new') . '</a>';
                }
-               $new_button = "<div class='content_header_options'>$new_button</div>";
+               $new_button = "<div class='content-header-options'>$new_button</div>";
        }
 
        // also hide the tabs if in a group context (ie, listing groups) or
index 3d4a0f853a873a02d65eeeedf91c03d92ad6cd50..91a4b497670861199ad6cf4a3c9b3ddae7ba3cc9 100644 (file)
@@ -19,6 +19,6 @@ $title = $name . "'s " . $type;
 ?>\r
 \r
 <div id="content_header" class="clearfix">\r
-       <?php echo '<div class="content_header_title">' . elgg_view_title($title) . '</div>'; ?>\r
+       <?php echo '<div class="content-header-title">' . elgg_view_title($title) . '</div>'; ?>\r
 </div>\r
 \r
index 93aac4d9694f2bf009f2e8221e91e0e35c745c2e..2f976c8abb569b0d836a403015e2abb4e356ebfc 100644 (file)
@@ -9,11 +9,11 @@
  */
 
 ?>
-<div id="elgg_footer">
-       <div id="elgg_footer_contents" class="clearfix">
+<div id="elgg-footer">
+       <div id="elgg-footer-contents" class="clearfix">
                <?php echo elgg_view('footer/links'); ?>
-               <a href="http://www.elgg.org" class="powered_by_elgg_badge">
-                       <img src="<?php echo elgg_get_site_url(); ?>_graphics/powered_by_elgg_badge_drk_bckgnd.gif" alt="Powered by Elgg" />
+               <a href="http://www.elgg.org" class="powered-by-elgg-badge">
+                       <img src="<?php echo elgg_get_site_url(); ?>_graphics/powered-by-elgg-badge_drk_bckgnd.gif" alt="Powered by Elgg" />
                </a>
        </div>
 </div>
index f747b67a2e32ca106f3619c1561b72337032342a..54a166b2d0cc13f30dd953f395f77f630ed875e9 100644 (file)
@@ -5,14 +5,14 @@
  **/
 
 ?>
-<div id="elgg_header">
-       <div id="elgg_header_contents">
+<div id="elgg-header">
+       <div id="elgg-header-contents">
                <?php
                        // link back to main site.
                        echo elgg_view('page_elements/header_logo', $vars);
                        
                        // drop-down login
-                       echo elgg_view('account/login_dropdown');
+                       echo elgg_view('account/login-dropdown');
                
                        // insert site-wide navigation
                        echo elgg_view('navigation/site_nav');
index 1e5e5269d3be567cc93809c3870adf840c514be3..c782310f0931f2277494f7e132d4e3b87107948d 100644 (file)
@@ -1,10 +1,10 @@
 <?php
 /**
  * Elgg header logo
- * The logo to display in elgg_header.
+ * The logo to display in elgg-header.
  **/
 ?>
 
 <h1><a href="<?php echo elgg_get_site_url(); ?>">
-<span class='network_title'><?php echo $vars['config']->sitename; ?></span>
+<span class='network-title'><?php echo $vars['config']->sitename; ?></span>
 </a></h1>
index 9962e2962b3c55579a6f2a5072f95c6a08eded97..66fc180dda403baaafc97370d6a3703e02a7be6a 100644 (file)
@@ -22,7 +22,7 @@ if (isset($autofeed) && $autofeed == true) {
        $url = elgg_format_url($url);
        $label = elgg_echo('feed:rss');
        $contents .= <<<END
-       <div class="rss_link clearfix"><a href="{$url}" rel="nofollow" title="{$label}">{$label}</a></div>
+       <div class="rss-link clearfix"><a href="{$url}" rel="nofollow" title="{$label}">{$label}</a></div>
 END;
 }
 
index 5f980603e40b5d3ee20cf157078137be50e05bd5..8c19c6409bf9b1941bafabec7a088b712522ebbc 100644 (file)
@@ -6,18 +6,18 @@
 
 $user = get_loggedin_user();
 if (($user instanceof ElggUser) && ($user->guid > 0)) {
-       echo '<div id="elgg_topbar" class="clearfix">';
-       echo '<div id="elgg_topbar_contents">';
+       echo '<div id="elgg-topbar" class="clearfix">';
+       echo '<div id="elgg-topbar-contents">';
        
        // Elgg logo
        echo '<a href="http://www.elgg.org">';
-       echo "<img class=\"site_logo\" src=\"".elgg_get_site_url()."_graphics/elgg_toolbar_logo.gif\" alt=\"Elgg logo\" />";
+       echo "<img class=\"site-logo\" src=\"".elgg_get_site_url()."_graphics/elgg_toolbar_logo.gif\" alt=\"Elgg logo\" />";
        echo '</a>';
        
        // avatar
        $user_link = $user->getURL();
        $user_image = $user->getIcon('topbar');
-       echo "<a href=\"$user_link\"><img class=\"user_mini_avatar\" src=\"$user_image\" alt=\"User avatar\" /></a>";
+       echo "<a href=\"$user_link\"><img class=\"user-mini-avatar\" src=\"$user_image\" alt=\"User avatar\" /></a>";
 
        // logout link
        echo elgg_view('page_elements/topbar_logout', $vars);
index 38a37bc2298161c018499392c43a6a586c6132b2..2d2ecf67c1ec61e526f17872cf1f96e78388d044 100644 (file)
@@ -5,7 +5,7 @@
  * Called within the Elgg topbar view.
  */
 
-echo '<div class="log_out">';
+echo '<div class="log-out">';
 echo elgg_view('output/url', array(
        'href' => "action/logout",
        'text' => elgg_echo('logout'),
index 7d96c80d8ad16143ebe400b638166d1774ddbbba..5c4e54b755ee7b456347717355f0400600f9776e 100644 (file)
@@ -73,7 +73,7 @@ body {background: white;}
        margin-bottom:5px;
        padding-bottom:5px;
 }
-.walledgardenlogin form input.login_textarea {
+.walledgardenlogin form input.login-textarea {
        margin:0 0 10px 0;
        width:210px;
 }
@@ -218,7 +218,7 @@ body {background: white;}
        top:0;
        z-index:9600;
 }
-#walledgarden_sysmessages #elgg_system_message {
+#walledgarden_sysmessages #elgg-system-message {
        width: 515px;
        max-width: 515px;
        right:auto;
index cad70f92b32c12d19896bd11f3ad66b763a6b976..0bdf2f4aa4771d6959472891420c7cdd48d8d884 100644 (file)
@@ -24,7 +24,7 @@ if($avatar_icon == "icon"){
                                                <?php
                                                                echo $vars['body'];
                                                ?>
-                                               <span class="entity_subtext">
+                                               <span class="entity-subtext">
                                                        (<?php
                                                                echo elgg_view_friendly_time($vars['item']->posted);
                                                        ?>)
@@ -49,7 +49,7 @@ if($avatar_icon == "icon"){
                        <?php
                                echo $vars['body'];
                        ?>
-                       <span class="entity_subtext">
+                       <span class="entity-subtext">
                                (<?php
                                        echo elgg_view_friendly_time($vars['item']->posted);
                                ?>)
index 7371ac71f20cb677c92d17cb8a4fd4f71fc9aec2..362f504cc1c0d510c5d1c24156ab34406cda6a21 100644 (file)
@@ -54,5 +54,5 @@ $form_body .= "</p>";
 $form_body .= elgg_view('input/hidden', array('internalname' => 'settings', 'value' => 'go'));
 
 $form_body .= "<div class='divider'></div>".elgg_view('input/submit', array('value' => elgg_echo("save")));
-$form_body = "<div class='admin_settings site_admin margin_top'>".$form_body."</div>";
+$form_body = "<div class='admin_settings site_admin margin-top'>".$form_body."</div>";
 echo elgg_view('input/form', array('action' => $action, 'body' => $form_body));
index 19bc13879201b937fd339c27d6b56ff230c56cbb..4d39f29d94219f602a5023f4d2ff680b6ff70ad9 100644 (file)
@@ -14,7 +14,7 @@
                <table width="100%" height="100%" border="0" style="margin: 0px; padding: 0px">
                        <tr>
                                <td width="100%" height="100%" valign="middle" align="center">
-                                       <img src="<?php echo elgg_get_site_url(); ?>_graphics/ajax_loader_bw.gif" />
+                                       <img src="<?php echo elgg_get_site_url(); ?>_graphics/ajax-loader_bw.gif" />
                                </td>
                        </tr>
                </table>
index c557fd09da0380c2b2521ed45576d79755f7cccb..e7c2801989acfabccf10e6fad451c5431129a2ea 100644 (file)
@@ -13,7 +13,7 @@ if ($vars['config']->allow_user_default_access) {
                        $default_access = $vars['config']->default_access;
                }
 ?>
-<div class="user_settings access">
+<div class="user-settings access">
        <h3><?php echo elgg_echo('default_access:settings'); ?></h3>
        <p>
                <?php echo elgg_echo('default_access:label'); ?>:
index 0a08b1faf58473400862b9da9b0d537816565ab6..396f8e79b196ff32affa24e6ea7dfd1472020a2d 100644 (file)
@@ -10,7 +10,7 @@ $user = elgg_get_page_owner();
 
 if ($user) {
 ?>
-<div class="user_settings email">
+<div class="user-settings email">
 <h3><?php echo elgg_echo('email:settings'); ?></h3>
 <p>
        <?php echo elgg_echo('email:address:label'); ?>:
index 06486ae3e82fe1f1d810340d3176785018eea59d..ada13379192da8c1274dc840c371bf2a09625243 100644 (file)
@@ -11,7 +11,7 @@ $user = elgg_get_page_owner();
 
 if ($user) {
 ?>
-<div class="user_settings language">
+<div class="user-settings language">
 <h3><?php echo elgg_echo('user:set:language'); ?></h3>
 <p>
 
index 416e4dcef2aba83b3896ff369b3a079d2b210704..0bd7f38f80baab1484a714a882f5e5ec6f30b3a4 100644 (file)
@@ -10,7 +10,7 @@ $user = elgg_get_page_owner();
 
 if ($user) {
 ?>
-<div class="user_settings password">
+<div class="user-settings password">
 <h3><?php echo elgg_echo('user:set:password'); ?></h3>
 
        <?php
index 71be11d9f0348c6695045ac833a474cee1c7c36f..c4df9e26b4922fe3f426f3cfc6b1bce1a652e575 100644 (file)
@@ -7,7 +7,7 @@
  */
 
 // Description of what's going on
-echo "<div class='user_settings margin_top'>".elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description")))."</div>";
+echo "<div class='user-settings margin-top'>".elgg_view('output/longtext', array('value' => elgg_echo("usersettings:plugins:description")))."</div>";
 
 $limit = get_input('limit', 10);
 $offset = get_input('offset', 0);
index 9638e00afff20198954411fc5d476617659316a5..981d8d93711b9e5e146a54959c760d78198b15f1 100644 (file)
@@ -23,7 +23,7 @@ if ($user_guid) {
 
 if (elgg_view("usersettings/{$plugin}/edit")) {
 ?>
-<div class="user_settings">
+<div class="user-settings">
        <h3><?php echo elgg_echo($plugin); ?></h3>
        
        <div id="<?php echo $plugin; ?>_settings">
index c80347b34ce46d894cd62ba4e26d028de7c5a6da..10d2b7c68cff0d6b2d94d59f739637bdedcad4cc 100644 (file)
@@ -11,7 +11,7 @@ $entity_stats = get_entity_statistics(get_loggedin_userid());
 
 if ($entity_stats) {
 ?>
-<div class="user_settings statistics">
+<div class="user-settings statistics">
        <h3><?php echo elgg_echo('usersettings:statistics:label:numentities'); ?></h3>
        <table class="styled">
                <?php
@@ -34,7 +34,7 @@ if ($entity_stats) {
                                        }
                                        echo <<< END
                                                <tr class="{$even_odd}">
-                                                       <td class="column_one"><b>{$a}:</b></td>
+                                                       <td class="column-one"><b>{$a}:</b></td>
                                                        <td>{$b}</td>
                                                </tr>
 END;
index bbe6203ce39b21a6fe51a366c09f79bcd4d58b99..dc24130cd23d717489c6cfdfb642b3e17739521f 100644 (file)
@@ -16,13 +16,13 @@ if ($log) {
 }
 
 ?>
-<div class="user_settings details">
+<div class="user-settings details">
        <h3><?php echo elgg_echo('usersettings:statistics:yourdetails'); ?></h3>
 
        <table class="styled">
-               <tr class="odd"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:name'); ?></td><td><?php echo $user->name; ?></td></tr>
-               <tr class="even"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:email'); ?></td><td><?php echo $user->email; ?></td></tr>
-               <tr class="odd"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:membersince'); ?></td><td><?php echo date("r",$user->time_created); ?></td></tr>
-               <tr class="even"><td class="column_one"><?php echo elgg_echo('usersettings:statistics:label:lastlogin'); ?></td><td><?php echo date("r",$logged_in); ?></td></tr>
+               <tr class="odd"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:name'); ?></td><td><?php echo $user->name; ?></td></tr>
+               <tr class="even"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:email'); ?></td><td><?php echo $user->email; ?></td></tr>
+               <tr class="odd"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:membersince'); ?></td><td><?php echo date("r",$user->time_created); ?></td></tr>
+               <tr class="even"><td class="column-one"><?php echo elgg_echo('usersettings:statistics:label:lastlogin'); ?></td><td><?php echo date("r",$logged_in); ?></td></tr>
        </table>
 </div>
\ No newline at end of file
index dc84528f298da78689464bef6107d5c32b2397c9..92de8a99f2ff7899c29223e5f31692743d5456f8 100644 (file)
@@ -1,7 +1,7 @@
 <?php
 
 ?>
-<div id="widget_add_button">
+<div id="widget-add-button">
 <?php
 $options = array(
        'href' => '#',
index a010d1e9e510ff12ca5b157ddc8756dc05e6baeb..9dbc8f78f2f53d8f30b401f42d0491e76e0ef67a 100644 (file)
@@ -13,7 +13,7 @@ foreach ($widgets as $column_widgets) {
 }
 
 ?>
-<div class="widgets_add_panel hidden">
+<div class="widgets-add-panel hidden">
        <p>
                <?php echo elgg_echo('widgets:add:description'); ?>
        </p>
@@ -23,10 +23,10 @@ foreach ($widgets as $column_widgets) {
                        $id = "widget_type_$handler";
                        // check if widget added and only one instance allowed
                        if ($widget_type->multiple == false && in_array($handler, $current_handlers)) {
-                               $class = 'widget_unavailable';
+                               $class = 'widget-unavailable';
                                $tooltip = elgg_echo('widget:unavailable');
                        } else {
-                               $class = 'widget_available';
+                               $class = 'widget-available';
                                $tooltip = $widget_type->description;
                        }
 
index bd4af97a64bfa48d3bc6d2f6a42091cb94bb905d..5e6aaf193c7856e201fb0a573c89080c95d6562d 100644 (file)
@@ -11,8 +11,8 @@ $widget = $vars['widget'];
 $params = array(
        'text' => ' ',
        'href' => "#",
-       'class' => 'widget_collapse_button',
-       'internalid' => "widget_collapse_button_$widget->guid"
+       'class' => 'widget-collapse-button',
+       'internalid' => "widget-collapse-button_$widget->guid"
 );
 $collapse_link = elgg_view('output/url', $params);
 
@@ -21,8 +21,8 @@ $params = array(
        'title' => elgg_echo('widget:delete', array($widget->getTitle())),
        'href' => elgg_get_site_url() . "action/widgets/delete?guid=$widget->guid",
        'is_action' => true,
-       'class' => 'widget_delete_button',
-       'internalid' => "widget_delete_button_$widget->guid"
+       'class' => 'widget-delete-button',
+       'internalid' => "widget-delete-button_$widget->guid"
 );
 $delete_link = elgg_view('output/url', $params);
 
@@ -30,13 +30,13 @@ $params = array(
        'text' => ' ',
        'title' => elgg_echo('widget:edit'),
        'href' => "#",
-       'class' => 'widget_edit_button',
-       'internalid' => "widget_edit_button_$widget->guid"
+       'class' => 'widget-edit-button',
+       'internalid' => "widget-edit-button_$widget->guid"
 );
 $edit_link = elgg_view('output/url', $params);
 
 echo <<<___END
-<div class="widget_controls">
+<div class="widget-controls">
        $collapse_link
        $delete_link
        $edit_link
index e2db3b5db69d2e9d9e563c8b8e2c6321add33f18..5814e5821facdb731149cc03bae84a85ebd22607 100644 (file)
@@ -33,7 +33,7 @@ $body = <<<___END
 ___END;
 
 ?>
-<div class="widget_edit">
+<div class="widget-edit">
 <?php
 $params = array(
        'body' => $body,
index 9c941a7c9cc33ed173e2d5df8b59236ac12fc65d..4483be8870913bad43586dde723fdd3cee7f322a 100644 (file)
@@ -25,7 +25,7 @@ $widget_instance = "widget_instance_$handler";
 
 ?>
 <div class="widget draggable <?php echo $widget_instance?>" id="<?php echo $widget_id; ?>">
-       <div class="widget_title drag_handle">
+       <div class="widget-title drag-handle">
                <h3><?php echo $title; ?></h3>
        </div>
        <?php
@@ -33,13 +33,13 @@ $widget_instance = "widget_instance_$handler";
                echo elgg_view('widgets/controls', array('widget' => $widget));
        }
        ?>
-       <div class="widget_container">
+       <div class="widget-container">
                <?php
                if ($can_edit) {
                        echo elgg_view('widgets/settings', array('widget' => $widget));
                }
                ?>
-               <div class="widget_content">
+               <div class="widget-content">
                        <?php
                        if (elgg_view_exists("widgets/$handler/content")) {
                                echo elgg_view("widgets/$handler/content", $vars);
index 62bb0a5b3b62911a70e67ca15bb7de59c5c3e9ae..27a7c2fe2ccdb69d7df03e397563e57cd4eda799 100644 (file)
@@ -32,20 +32,20 @@ header('Expires: Fri, 05 Feb 1982 00:00:00 -0500', TRUE);
        </head>
        <body>
        <div id="elgg_wrapper">
-               <div id="elgg_header">
+               <div id="elgg-header">
                        <?php echo elgg_view('install/header', $vars); ?>
                </div>
-               <div id="elgg_sidebar">
+               <div id="elgg-sidebar">
                        <?php echo elgg_view('install/sidebar', $vars); ?>
                </div>
-               <div id="elgg_content">
+               <div id="elgg-content">
                        <h2><?php echo $vars['title']; ?></h2>
                        <?php echo elgg_view('messages/list', array('object' => $vars['sysmessages'])); ?>
                        <?php echo $vars['body']; ?>
                </div>
                <div class="clearfloat"></div>
        </div>
-       <div id="elgg_footer">
+       <div id="elgg-footer">
                <?php echo elgg_view('install/footer'); ?>
        </div>
        </body>