aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mod/blog/views/default/blog/css.php6
-rw-r--r--mod/blog/views/default/blog/forms/edit.php4
-rw-r--r--mod/blog/views/default/blog/sidebar_revisions.php4
-rw-r--r--mod/blog/views/default/object/blog.php24
-rw-r--r--mod/blog/views/default/river/object/blog/create.php2
-rw-r--r--mod/bookmarks/views/default/bookmarks/bookmarklet.php2
-rw-r--r--mod/bookmarks/views/default/bookmarks/form.php2
-rwxr-xr-xmod/bookmarks/views/default/bookmarks/group_bookmarks.php10
-rw-r--r--mod/bookmarks/views/default/object/bookmarks.php10
-rw-r--r--mod/bookmarks/views/default/river/object/bookmarks/create.php2
-rw-r--r--mod/bookmarks/views/default/widgets/bookmarks/view.php2
-rw-r--r--mod/defaultwidgets/views/default/defaultwidgets/editor.php8
-rw-r--r--mod/ecml/views/default/embed/web_services/content.php2
-rw-r--r--mod/ecml/views/default/settings/ecml/edit.php2
-rw-r--r--mod/embed/views/default/embed/css.php48
-rw-r--r--mod/embed/views/default/embed/embed.php6
-rw-r--r--mod/embed/views/default/embed/item/list.php4
-rw-r--r--mod/embed/views/default/embed/js.php2
-rw-r--r--mod/embed/views/default/object/file/embedlist.php10
-rw-r--r--mod/file/friends.php2
-rw-r--r--mod/file/index.php2
-rw-r--r--mod/file/views/default/file/css.php4
-rw-r--r--mod/file/views/default/file/groupprofile_files.php12
-rw-r--r--mod/file/views/default/file/upload.php2
-rw-r--r--mod/file/views/default/object/file.php4
-rw-r--r--mod/file/views/default/widgets/filerepo/content.php4
-rw-r--r--mod/groups/groupprofile.php2
-rw-r--r--mod/groups/views/default/forms/forums/addtopic.php2
-rw-r--r--mod/groups/views/default/forms/groups/edit.php2
-rw-r--r--mod/groups/views/default/forms/groups/invite.php2
-rw-r--r--mod/groups/views/default/forum/maintopic.php22
-rw-r--r--mod/groups/views/default/forum/topics.php6
-rw-r--r--mod/groups/views/default/groups/closedmembership.php2
-rw-r--r--mod/groups/views/default/groups/css.php20
-rw-r--r--mod/groups/views/default/groups/featured.php4
-rw-r--r--mod/groups/views/default/groups/find.php2
-rw-r--r--mod/groups/views/default/groups/forum_latest.php12
-rw-r--r--mod/groups/views/default/groups/group_sort_menu.php2
-rw-r--r--mod/groups/views/default/groups/grouplisting.php6
-rw-r--r--mod/groups/views/default/groups/groupprofile.php4
-rw-r--r--mod/groups/views/default/groups/invitationrequests.php12
-rw-r--r--mod/groups/views/default/groups/membershiprequests.php10
-rw-r--r--mod/groups/views/default/object/groupforumtopic.php20
-rw-r--r--mod/groups/views/default/river/forum/create.php2
-rw-r--r--mod/groups/views/default/river/forum/topic/create.php2
-rw-r--r--mod/groups/views/default/river/group/create.php2
-rw-r--r--mod/groups/views/default/river/relationship/member/create.php2
-rw-r--r--mod/invitefriends/views/default/invitefriends/formitems.php2
-rw-r--r--mod/members/index.php2
-rw-r--r--mod/members/views/default/members/css.php2
-rw-r--r--mod/members/views/default/members/members_navigation.php2
-rw-r--r--mod/members/views/default/members/search.php4
-rw-r--r--mod/messageboard/views/default/widgets/messageboard/content.php2
-rw-r--r--mod/messages/index.php4
-rw-r--r--mod/messages/sent.php4
-rw-r--r--mod/messages/views/default/messages/css.php6
-rw-r--r--mod/messages/views/default/messages/forms/reply.php2
-rw-r--r--mod/messages/views/default/messages/forms/send.php8
-rw-r--r--mod/messages/views/default/messages/messages.php20
-rw-r--r--mod/messages/views/default/messages/view.php16
-rw-r--r--mod/notifications/start.php6
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/collections.php2
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/form.php2
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/forminternals.php14
-rw-r--r--mod/notifications/views/default/notifications/subscriptions/groupsform.php2
-rw-r--r--mod/pages/views/default/river/object/page/create.php2
-rw-r--r--mod/profile/views/default/profile/commentwall/commentwall.php2
-rw-r--r--mod/profile/views/default/profile/commentwall/commentwall_content.php10
-rw-r--r--mod/profile/views/default/profile/css.php18
-rw-r--r--mod/profile/views/default/profile/edit.php2
-rw-r--r--mod/profile/views/default/profile/editdefaultprofile.php2
-rw-r--r--mod/profile/views/default/profile/editdefaultprofileitems.php2
-rw-r--r--mod/profile/views/default/profile/editicon.php2
-rw-r--r--mod/profile/views/default/profile/listing.php6
-rwxr-xr-xmod/profile/views/default/profile/profile_navigation.php2
-rw-r--r--mod/profile/views/default/river/user/default/profileiconupdate.php2
-rw-r--r--mod/profile/views/default/river/user/default/profileupdate.php2
-rw-r--r--mod/reportedcontent/views/default/admin/overview/reportedcontent.php2
-rw-r--r--mod/reportedcontent/views/default/reportedcontent/form.php2
-rw-r--r--mod/riverdashboard/endpoint/get_comments.php8
-rw-r--r--mod/riverdashboard/endpoint/ping.php6
-rw-r--r--mod/riverdashboard/index.php2
-rw-r--r--mod/riverdashboard/start.php2
-rw-r--r--mod/riverdashboard/views/default/river/item/list.php6
-rw-r--r--mod/riverdashboard/views/default/river/item/wrapper.php42
-rw-r--r--mod/riverdashboard/views/default/river/item/wrapper_classic.php6
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/container.php2
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/css.php72
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/ecml/activity.php2
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/js.php32
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/nav.php4
-rw-r--r--mod/riverdashboard/views/default/riverdashboard/rivercomment.php2
-rw-r--r--mod/search/views/default/search/comments/entity.php4
-rw-r--r--mod/search/views/default/search/entity.php6
-rw-r--r--mod/search/views/default/search/search_box.php6
-rw-r--r--mod/sitepages/views/default/canvas/layouts/frontpage.php6
-rw-r--r--mod/sitepages/views/default/sitepages/css.php10
-rw-r--r--mod/sitepages/views/default/sitepages/members.php2
-rw-r--r--mod/sitepages/views/default/sitepages/menu.php2
-rw-r--r--mod/thewire/views/default/object/thewire.php2
-rw-r--r--mod/thewire/views/default/river/object/thewire/create.php2
-rw-r--r--mod/thewire/views/default/thewire/css.php2
-rw-r--r--mod/thewire/views/default/thewire/profile_status.php2
-rw-r--r--mod/tinymce/views/default/tinymce/css.php26
-rw-r--r--views/default/account/forms/forgotten_password.php2
-rw-r--r--views/default/account/forms/login.php4
-rw-r--r--views/default/account/forms/register.php2
-rw-r--r--views/default/account/forms/useradd.php2
-rw-r--r--views/default/account/login_dropdown.php18
-rw-r--r--views/default/account/login_walled_garden.php8
-rw-r--r--views/default/admin/appearance/menu_items.php2
-rw-r--r--views/default/admin/overview.php6
-rw-r--r--views/default/admin/overview/online.php2
-rw-r--r--views/default/admin/plugins/advanced.php4
-rw-r--r--views/default/admin/plugins/simple.php4
-rw-r--r--views/default/admin/site/advanced.php2
-rw-r--r--views/default/admin/site/basic.php2
-rw-r--r--views/default/admin/users/newest.php2
-rw-r--r--views/default/admin/users/online.php2
-rw-r--r--views/default/ajax/loader.php2
-rw-r--r--views/default/annotation/annotate.php2
-rw-r--r--views/default/annotation/annotatelike.php2
-rw-r--r--views/default/annotation/generic_comment.php10
-rw-r--r--views/default/annotation/latest_comments.php4
-rw-r--r--views/default/annotation/likes.php12
-rw-r--r--views/default/comments/forms/edit.php2
-rw-r--r--views/default/css/admin.php54
-rw-r--r--views/default/css/ie.php38
-rw-r--r--views/default/css/ie6.php4
-rw-r--r--views/default/css/screen.php398
-rw-r--r--views/default/dashboard/blurb.php2
-rw-r--r--views/default/entities/entity_listing.php2
-rw-r--r--views/default/export/entity.php14
-rw-r--r--views/default/export/metadata.php2
-rw-r--r--views/default/export/relationship.php2
-rw-r--r--views/default/friends/collection.php4
-rw-r--r--views/default/friends/collections.php2
-rw-r--r--views/default/friends/collectiontabs.php6
-rw-r--r--views/default/friends/picker.php16
-rw-r--r--views/default/input/userpicker.php34
-rw-r--r--views/default/js/friendsPickerv1.php36
-rw-r--r--views/default/js/initialise_elgg.php42
-rw-r--r--views/default/layouts/administration.php8
-rw-r--r--views/default/layouts/one_column.php4
-rw-r--r--views/default/layouts/one_column_with_sidebar.php6
-rw-r--r--views/default/layouts/widgets.php2
-rw-r--r--views/default/likes/forms/edit.php10
-rw-r--r--views/default/likes/forms/link.php2
-rw-r--r--views/default/messages/errors/list.php2
-rw-r--r--views/default/messages/list.php2
-rw-r--r--views/default/messages/messages/list.php2
-rw-r--r--views/default/navigation/listtype.php2
-rw-r--r--views/default/navigation/pagination.php10
-rw-r--r--views/default/navigation/site_nav.php4
-rw-r--r--views/default/navigation/tabs.php2
-rw-r--r--views/default/notifications/settings/usersettings.php2
-rw-r--r--views/default/output/rss_view.php2
-rw-r--r--views/default/page_elements/content_header.php4
-rw-r--r--views/default/page_elements/content_header_member.php2
-rw-r--r--views/default/page_elements/footer.php8
-rw-r--r--views/default/page_elements/header.php6
-rw-r--r--views/default/page_elements/header_logo.php4
-rw-r--r--views/default/page_elements/owner_block.php2
-rw-r--r--views/default/page_elements/topbar.php8
-rw-r--r--views/default/page_elements/topbar_logout.php2
-rw-r--r--views/default/page_shells/walled_garden.php4
-rw-r--r--views/default/river/item/wrapper.php4
-rw-r--r--views/default/settings/system.php2
-rw-r--r--views/default/settings/upgrading.php2
-rw-r--r--views/default/user/settings/default_access.php2
-rw-r--r--views/default/user/settings/email.php2
-rw-r--r--views/default/user/settings/language.php2
-rw-r--r--views/default/user/settings/password.php2
-rw-r--r--views/default/usersettings/plugins.php2
-rw-r--r--views/default/usersettings/plugins_opt/plugin.php2
-rw-r--r--views/default/usersettings/statistics_opt/numentities.php4
-rw-r--r--views/default/usersettings/statistics_opt/online.php10
-rw-r--r--views/default/widgets/add_button.php2
-rw-r--r--views/default/widgets/add_panel.php6
-rw-r--r--views/default/widgets/controls.php14
-rw-r--r--views/default/widgets/settings.php2
-rw-r--r--views/default/widgets/wrapper.php6
-rw-r--r--views/installation/page_shells/default.php8
183 files changed, 827 insertions, 827 deletions
diff --git a/mod/blog/views/default/blog/css.php b/mod/blog/views/default/blog/css.php
index d9e565ee6..0cd539ca4 100644
--- a/mod/blog/views/default/blog/css.php
+++ b/mod/blog/views/default/blog/css.php
@@ -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;
}
diff --git a/mod/blog/views/default/blog/forms/edit.php b/mod/blog/views/default/blog/forms/edit.php
index 5da9c3cd1..e9fb7d37f 100644
--- a/mod/blog/views/default/blog/forms/edit.php
+++ b/mod/blog/views/default/blog/forms/edit.php
@@ -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>
diff --git a/mod/blog/views/default/blog/sidebar_revisions.php b/mod/blog/views/default/blog/sidebar_revisions.php
index e53ba9e52..ecc479812 100644
--- a/mod/blog/views/default/blog/sidebar_revisions.php
+++ b/mod/blog/views/default/blog/sidebar_revisions.php
@@ -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 {
diff --git a/mod/blog/views/default/object/blog.php b/mod/blog/views/default/object/blog.php
index 91fc7f594..733d42fa4 100644
--- a/mod/blog/views/default/object/blog.php
+++ b/mod/blog/views/default/object/blog.php
@@ -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
diff --git a/mod/blog/views/default/river/object/blog/create.php b/mod/blog/views/default/river/object/blog/create.php
index d311c5883..2b52429a6 100644
--- a/mod/blog/views/default/river/object/blog/create.php
+++ b/mod/blog/views/default/river/object/blog/create.php
@@ -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>';
diff --git a/mod/bookmarks/views/default/bookmarks/bookmarklet.php b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
index 17a304d78..b1929486d 100644
--- a/mod/bookmarks/views/default/bookmarks/bookmarklet.php
+++ b/mod/bookmarks/views/default/bookmarks/bookmarklet.php
@@ -23,7 +23,7 @@ if (!$name && ($user = get_loggedin_user())) {
<h3><?php echo elgg_echo('bookmarks:browser_bookmarklet')?></h3>
<a href="javascript:location.href='<?php echo elgg_get_site_url(); ?>pg/bookmarks/<?php echo $name; ?>/add?address='+encodeURIComponent(location.href)+'&title='+encodeURIComponent(document.title)"> <img src="<?php echo elgg_get_site_url(); ?>_graphics/elgg_bookmarklet.gif" border="0" title="<?php echo elgg_echo('bookmarks:this');?>" /> </a>
<br />
-<a class="link" onclick="elgg_slide_toggle(this,'#elgg_sidebar','.bookmarklet');">Instructions</a>
+<a class="link" onclick="elgg_slide_toggle(this,'#elgg-sidebar','.bookmarklet');">Instructions</a>
<div class="bookmarklet hidden">
<p><?php echo elgg_echo("bookmarks:bookmarklet:description"); ?></p>
diff --git a/mod/bookmarks/views/default/bookmarks/form.php b/mod/bookmarks/views/default/bookmarks/form.php
index 927ed445d..7273836e2 100644
--- a/mod/bookmarks/views/default/bookmarks/form.php
+++ b/mod/bookmarks/views/default/bookmarks/form.php
@@ -35,7 +35,7 @@ if(isset($vars['entity'])){
$url = "action/bookmarks/add";
}
?>
-<form id="bookmark_edit_form" class="margin_top" action="<?php echo elgg_get_site_url() . $url; ?>" method="post">
+<form id="bookmark_edit_form" class="margin-top" action="<?php echo elgg_get_site_url() . $url; ?>" method="post">
<?php echo elgg_view('input/securitytoken'); ?>
<p>
<label>
diff --git a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
index 83d6c97ea..50d4dbdb2 100755
--- a/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
+++ b/mod/bookmarks/views/default/bookmarks/group_bookmarks.php
@@ -17,19 +17,19 @@ if($bookmarks){
//get the time
$friendlytime = elgg_view_friendly_time($b->time_created);
- $info = "<div class='entity_listing_icon'>" . elgg_view('profile/icon',array('entity' => $b->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
+ $info = "<div class='entity-listing-icon'>" . elgg_view('profile/icon',array('entity' => $b->getOwnerEntity(), 'size' => 'tiny')) . "</div>";
//get the bookmark entries body
- $info .= "<div class='entity_listing_info'><p class='entity_title'><a href=\"{$b->address}\">{$b->title}</a></p>";
+ $info .= "<div class='entity-listing-info'><p class='entity-title'><a href=\"{$b->address}\">{$b->title}</a></p>";
//get the user details
- $info .= "<p class='entity_subtext'>{$friendlytime}</p>";
+ $info .= "<p class='entity-subtext'>{$friendlytime}</p>";
$info .= "</div>";
//display
- echo "<div class='entity_listing clearfix'>" . $info . "</div>";
+ echo "<div class='entity-listing clearfix'>" . $info . "</div>";
}
} else {
$create_bookmark = elgg_get_site_url() . "pg/bookmarks/" . elgg_get_page_owner()->username . "/add";
- echo "<p class='margin_top'><a href=\"{$create_bookmark}\">" . elgg_echo("bookmarks:new") . "</a></p>";
+ echo "<p class='margin-top'><a href=\"{$create_bookmark}\">" . elgg_echo("bookmarks:new") . "</a></p>";
}
echo "</div>"; \ No newline at end of file
diff --git a/mod/bookmarks/views/default/object/bookmarks.php b/mod/bookmarks/views/default/object/bookmarks.php
index 7438f1570..f90a2f355 100644
--- a/mod/bookmarks/views/default/object/bookmarks.php
+++ b/mod/bookmarks/views/default/object/bookmarks.php
@@ -47,7 +47,7 @@ if($is_group instanceof ElggGroup){
}
if($vars['entity']->description != '')
- $view_notes = "<a class='link' onclick=\"elgg_slide_toggle(this,'.entity_listing','.note');\">note</a>";
+ $view_notes = "<a class='link' onclick=\"elgg_slide_toggle(this,'.entity-listing','.note');\">note</a>";
else
$view_notes = '';
if (@file_exists($faviconurl)) {
@@ -66,7 +66,7 @@ if($vars['entity']->canEdit()){
)) . "</span>";
}
-$info = "<div class='entity_metadata'><span {$access_level}>{$object_acl}</span>";
+$info = "<div class='entity-metadata'><span {$access_level}>{$object_acl}</span>";
// include a view for plugins to extend
$info .= elgg_view("bookmarks/options",array('entity' => $vars['entity']));
@@ -74,14 +74,14 @@ $info .= elgg_view_likes($vars['entity']); // include likes
//include edit and delete options
if($vars['entity']->canEdit()){
- $info .= "<span class='entity_edit'><a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>";
+ $info .= "<span class='entity-edit'><a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}/edit/{$vars['entity']->getGUID()}\">" . elgg_echo('edit') . "</a></span>";
$info .= $delete;
}
$info .= "</div>";
-$info .= "<p class='entity_title'>$a_tag_title</p>";
-$info .= "<p class='entity_subtext'>Bookmarked by <a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}\">{$owner->name}</a> {$friendlytime} {$view_notes}</p>";
+$info .= "<p class='entity-title'>$a_tag_title</p>";
+$info .= "<p class='entity-subtext'>Bookmarked by <a href=\"".elgg_get_site_url()."pg/bookmarks/{$owner->username}\">{$owner->name}</a> {$friendlytime} {$view_notes}</p>";
$tags = elgg_view('output/tags', array('tags' => $vars['entity']->tags));
if (!empty($tags)) {
diff --git a/mod/bookmarks/views/default/river/object/bookmarks/create.php b/mod/bookmarks/views/default/river/object/bookmarks/create.php
index 32434471b..956e84b1c 100644
--- a/mod/bookmarks/views/default/river/object/bookmarks/create.php
+++ b/mod/bookmarks/views/default/river/object/bookmarks/create.php
@@ -13,7 +13,7 @@ $string .= "<a href=\"" . $object->address . "\">" . $object->title . "</a>";
if (($is_group instanceof ElggGroup) && (elgg_get_context() != 'groups')){
$string .= " " . elgg_echo('bookmarks:ingroup') . " <a href=\"{$is_group->getURL()}\">" . $is_group->name . "</a>";
}
-$string .= " <span class='entity_subtext'>" . elgg_view_friendly_time($object->time_created);
+$string .= " <span class='entity-subtext'>" . elgg_view_friendly_time($object->time_created);
if (isloggedin()){
$string .= "<a class='river_comment_form_button link'>Comment</a>";
$string .= elgg_view('likes/forms/link', array('entity' => $object));
diff --git a/mod/bookmarks/views/default/widgets/bookmarks/view.php b/mod/bookmarks/views/default/widgets/bookmarks/view.php
index cbd0012bb..34b9ff834 100644
--- a/mod/bookmarks/views/default/widgets/bookmarks/view.php
+++ b/mod/bookmarks/views/default/widgets/bookmarks/view.php
@@ -45,7 +45,7 @@ if ($bookmarks) {
//display
echo "<div class='ContentWrapper bookmarks'>";
- echo "<div class='shares_widget_content'>" . $info . "</div></div>";
+ echo "<div class='shares_widget-content'>" . $info . "</div></div>";
}
if ($num_bookmarks > $num) {
diff --git a/mod/defaultwidgets/views/default/defaultwidgets/editor.php b/mod/defaultwidgets/views/default/defaultwidgets/editor.php
index 0e2519690..54090b8fa 100644
--- a/mod/defaultwidgets/views/default/defaultwidgets/editor.php
+++ b/mod/defaultwidgets/views/default/defaultwidgets/editor.php
@@ -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
diff --git a/mod/ecml/views/default/embed/web_services/content.php b/mod/ecml/views/default/embed/web_services/content.php
index 4697eedab..cc44d582f 100644
--- a/mod/ecml/views/default/embed/web_services/content.php
+++ b/mod/ecml/views/default/embed/web_services/content.php
@@ -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;
?>
diff --git a/mod/ecml/views/default/settings/ecml/edit.php b/mod/ecml/views/default/settings/ecml/edit.php
index 1a918fa99..8c1a3b4a1 100644
--- a/mod/ecml/views/default/settings/ecml/edit.php
+++ b/mod/ecml/views/default/settings/ecml/edit.php
@@ -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
diff --git a/mod/embed/views/default/embed/css.php b/mod/embed/views/default/embed/css.php
index 559cd456d..e87584205 100644
--- a/mod/embed/views/default/embed/css.php
+++ b/mod/embed/views/default/embed/css.php
@@ -79,37 +79,37 @@
}
/* 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;
}
@@ -139,10 +139,10 @@
#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 {
@@ -153,19 +153,19 @@
/* ***************************************
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;
@@ -176,7 +176,7 @@
-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;
@@ -184,15 +184,15 @@
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;
@@ -204,25 +204,25 @@
#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;
diff --git a/mod/embed/views/default/embed/embed.php b/mod/embed/views/default/embed/embed.php
index 2855a5576..21b296db4 100644
--- a/mod/embed/views/default/embed/embed.php
+++ b/mod/embed/views/default/embed/embed.php
@@ -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>
diff --git a/mod/embed/views/default/embed/item/list.php b/mod/embed/views/default/embed/item/list.php
index 8cc60753c..fc5545df0 100644
--- a/mod/embed/views/default/embed/item/list.php
+++ b/mod/embed/views/default/embed/item/list.php
@@ -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>';
diff --git a/mod/embed/views/default/embed/js.php b/mod/embed/views/default/embed/js.php
index fbc6a0340..4f4663f40 100644
--- a/mod/embed/views/default/embed/js.php
+++ b/mod/embed/views/default/embed/js.php
@@ -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 : '\
diff --git a/mod/embed/views/default/object/file/embedlist.php b/mod/embed/views/default/object/file/embedlist.php
index bf306b4e7..c6595ab36 100644
--- a/mod/embed/views/default/object/file/embedlist.php
+++ b/mod/embed/views/default/object/file/embedlist.php
@@ -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>
diff --git a/mod/file/friends.php b/mod/file/friends.php
index 32eeeffd8..e7a17adab 100644
--- a/mod/file/friends.php
+++ b/mod/file/friends.php
@@ -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;
}
diff --git a/mod/file/index.php b/mod/file/index.php
index 5f1bc3400..06a5979d1 100644
--- a/mod/file/index.php
+++ b/mod/file/index.php
@@ -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
diff --git a/mod/file/views/default/file/css.php b/mod/file/views/default/file/css.php
index 46913dea7..7fff98c97 100644
--- a/mod/file/views/default/file/css.php
+++ b/mod/file/views/default/file/css.php
@@ -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;
}
diff --git a/mod/file/views/default/file/groupprofile_files.php b/mod/file/views/default/file/groupprofile_files.php
index 745c5f053..4c7321e48 100644
--- a/mod/file/views/default/file/groupprofile_files.php
+++ b/mod/file/views/default/file/groupprofile_files.php
@@ -30,11 +30,11 @@
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>";
}
diff --git a/mod/file/views/default/file/upload.php b/mod/file/views/default/file/upload.php
index b7b99e3b3..0ef99348c 100644
--- a/mod/file/views/default/file/upload.php
+++ b/mod/file/views/default/file/upload.php
@@ -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
diff --git a/mod/file/views/default/object/file.php b/mod/file/views/default/object/file.php
index 3b9731ed6..37019c1aa 100644
--- a/mod/file/views/default/object/file.php
+++ b/mod/file/views/default/object/file.php
@@ -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>";
diff --git a/mod/file/views/default/widgets/filerepo/content.php b/mod/file/views/default/widgets/filerepo/content.php
index 41a968dce..ee7bbe3cc 100644
--- a/mod/file/views/default/widgets/filerepo/content.php
+++ b/mod/file/views/default/widgets/filerepo/content.php
@@ -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
diff --git a/mod/groups/groupprofile.php b/mod/groups/groupprofile.php
index e7daddb43..43473e261 100644
--- a/mod/groups/groupprofile.php
+++ b/mod/groups/groupprofile.php
@@ -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));
}
diff --git a/mod/groups/views/default/forms/forums/addtopic.php b/mod/groups/views/default/forms/forums/addtopic.php
index af8c0a447..7d61e2514 100644
--- a/mod/groups/views/default/forms/forums/addtopic.php
+++ b/mod/groups/views/default/forms/forums/addtopic.php
@@ -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>
diff --git a/mod/groups/views/default/forms/groups/edit.php b/mod/groups/views/default/forms/groups/edit.php
index 32e9f6ff3..d3eb7ac68 100644
--- a/mod/groups/views/default/forms/groups/edit.php
+++ b/mod/groups/views/default/forms/groups/edit.php
@@ -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'); ?>
diff --git a/mod/groups/views/default/forms/groups/invite.php b/mod/groups/views/default/forms/groups/invite.php
index 3298a7450..279e11a20 100644
--- a/mod/groups/views/default/forms/groups/invite.php
+++ b/mod/groups/views/default/forms/groups/invite.php
@@ -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');
diff --git a/mod/groups/views/default/forum/maintopic.php b/mod/groups/views/default/forum/maintopic.php
index 8cf2e4a76..2c75c0a77 100644
--- a/mod/groups/views/default/forum/maintopic.php
+++ b/mod/groups/views/default/forum/maintopic.php
@@ -13,38 +13,38 @@
?>
-<div class="entity_listing topic clearfix">
+<div class="entity-listing topic clearfix">
<a class="anchor_link" name="<?php echo $vars['entity']->id; ?>"></a>
<?php
// get infomation about the owner of the comment
if ($post_owner = get_user($vars['entity']->owner_guid)) {
// display the user icon
- echo "<div class='entity_listing_icon'>" . elgg_view("profile/icon",array('entity' => $post_owner, 'size' => 'tiny')) . "</div>";
+ echo "<div class='entity-listing-icon'>" . elgg_view("profile/icon",array('entity' => $post_owner, 'size' => 'tiny')) . "</div>";
// display the user name
- echo "<div class='entity_listing_info'>";
+ echo "<div class='entity-listing-info'>";
// if comment owner, group owner, or site admin - display edit and delete options
if (groups_can_edit_discussion($vars['entity'], elgg_get_page_owner()->owner_guid)) {
- echo "<div class='entity_metadata'>";
+ echo "<div class='entity-metadata'>";
echo "<span class='delete-button'>".elgg_view("output/confirmlink",array(
'href' => "action/groups/deletepost?post=" . $vars['entity']->id . "&topic=" . get_input('topic') . "&group=" . get_input('group_guid'),
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm')
))."</span>";
- echo "<span class='entity_edit'><a class='link' href=\"".elgg_get_site_url()."pg/groups/edittopic/{$group_guid}/{$topic}/\">".elgg_echo('edit')."</a></span>";
+ echo "<span class='entity-edit'><a class='link' href=\"".elgg_get_site_url()."pg/groups/edittopic/{$group_guid}/{$topic}/\">".elgg_echo('edit')."</a></span>";
echo "</div>";
}
- echo "<p class='entity_title'><a href='".$post_owner->getURL()."'>" . $post_owner->name . "</a></p>";
+ echo "<p class='entity-title'><a href='".$post_owner->getURL()."'>" . $post_owner->name . "</a></p>";
} else {
- echo "<div class='entity_listing_icon'><img src=\"" . elgg_view('icon/user/default/tiny') . "\" /></div>";
- echo "<div class='entity_listing_info'><p class='entity_title'>" . elgg_echo('profile:deleteduser') . "</p>";
+ echo "<div class='entity-listing-icon'><img src=\"" . elgg_view('icon/user/default/tiny') . "\" /></div>";
+ echo "<div class='entity-listing-info'><p class='entity-title'>" . elgg_echo('profile:deleteduser') . "</p>";
}
//display the date of the comment
- echo "<p class='entity_subtext'>" . elgg_view_friendly_time($vars['entity']->time_created) . "</p>";
- echo "</div>"; // close entity_listing_info
- echo "</div>"; // close entity_listing.topic
+ echo "<p class='entity-subtext'>" . elgg_view_friendly_time($vars['entity']->time_created) . "</p>";
+ echo "</div>"; // close entity-listing-info
+ echo "</div>"; // close entity-listing.topic
//display the actual message posted
echo "<div class='topic_post maintopic'>";
diff --git a/mod/groups/views/default/forum/topics.php b/mod/groups/views/default/forum/topics.php
index 1426ba274..fbe168588 100644
--- a/mod/groups/views/default/forum/topics.php
+++ b/mod/groups/views/default/forum/topics.php
@@ -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
diff --git a/mod/groups/views/default/groups/closedmembership.php b/mod/groups/views/default/groups/closedmembership.php
index bf0db7e22..d5abe1e09 100644
--- a/mod/groups/views/default/groups/closedmembership.php
+++ b/mod/groups/views/default/groups/closedmembership.php
@@ -6,7 +6,7 @@
*/
?>
-<p class="margin_top">
+<p class="margin-top">
<?php
echo elgg_echo('groups:closedgroup');
if (isloggedin()) {
diff --git a/mod/groups/views/default/groups/css.php b/mod/groups/views/default/groups/css.php
index eb93c4bd9..dcda51fd8 100644
--- a/mod/groups/views/default/groups/css.php
+++ b/mod/groups/views/default/groups/css.php
@@ -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;
@@ -25,10 +25,10 @@
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 {
@@ -130,17 +130,17 @@
.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 {
diff --git a/mod/groups/views/default/groups/featured.php b/mod/groups/views/default/groups/featured.php
index 580f1ca0f..0f9a3bedf 100644
--- a/mod/groups/views/default/groups/featured.php
+++ b/mod/groups/views/default/groups/featured.php
@@ -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>";
}
}
?>
diff --git a/mod/groups/views/default/groups/find.php b/mod/groups/views/default/groups/find.php
index 70d03e458..0ad9f2018 100644
--- a/mod/groups/views/default/groups/find.php
+++ b/mod/groups/views/default/groups/find.php
@@ -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>
diff --git a/mod/groups/views/default/groups/forum_latest.php b/mod/groups/views/default/groups/forum_latest.php
index d78a47456..9b6f292e0 100644
--- a/mod/groups/views/default/groups/forum_latest.php
+++ b/mod/groups/views/default/groups/forum_latest.php
@@ -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>";
}
}
diff --git a/mod/groups/views/default/groups/group_sort_menu.php b/mod/groups/views/default/groups/group_sort_menu.php
index aedb3f8e5..58ecf920f 100644
--- a/mod/groups/views/default/groups/group_sort_menu.php
+++ b/mod/groups/views/default/groups/group_sort_menu.php
@@ -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>
diff --git a/mod/groups/views/default/groups/grouplisting.php b/mod/groups/views/default/groups/grouplisting.php
index 1466234ab..dc6bdb4a4 100644
--- a/mod/groups/views/default/groups/grouplisting.php
+++ b/mod/groups/views/default/groups/grouplisting.php
@@ -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);
diff --git a/mod/groups/views/default/groups/groupprofile.php b/mod/groups/views/default/groups/groupprofile.php
index 436901368..42928a12f 100644
--- a/mod/groups/views/default/groups/groupprofile.php
+++ b/mod/groups/views/default/groups/groupprofile.php
@@ -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
diff --git a/mod/groups/views/default/groups/invitationrequests.php b/mod/groups/views/default/groups/invitationrequests.php
index 4674a3c23..a1cca6489 100644
--- a/mod/groups/views/default/groups/invitationrequests.php
+++ b/mod/groups/views/default/groups/invitationrequests.php
@@ -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
diff --git a/mod/groups/views/default/groups/membershiprequests.php b/mod/groups/views/default/groups/membershiprequests.php
index 6cb5f75f6..714b8e8f9 100644
--- a/mod/groups/views/default/groups/membershiprequests.php
+++ b/mod/groups/views/default/groups/membershiprequests.php
@@ -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>
diff --git a/mod/groups/views/default/object/groupforumtopic.php b/mod/groups/views/default/object/groupforumtopic.php
index efa4dee79..551e256db 100644
--- a/mod/groups/views/default/object/groupforumtopic.php
+++ b/mod/groups/views/default/object/groupforumtopic.php
@@ -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'));
diff --git a/mod/groups/views/default/river/forum/create.php b/mod/groups/views/default/river/forum/create.php
index 69481e97e..2e8365ec2 100644
--- a/mod/groups/views/default/river/forum/create.php
+++ b/mod/groups/views/default/river/forum/create.php
@@ -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) {
diff --git a/mod/groups/views/default/river/forum/topic/create.php b/mod/groups/views/default/river/forum/topic/create.php
index e595b1fdc..e73064e00 100644
--- a/mod/groups/views/default/river/forum/topic/create.php
+++ b/mod/groups/views/default/river/forum/topic/create.php
@@ -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));
diff --git a/mod/groups/views/default/river/group/create.php b/mod/groups/views/default/river/group/create.php
index ef0aaab1b..4774e7a85 100644
--- a/mod/groups/views/default/river/group/create.php
+++ b/mod/groups/views/default/river/group/create.php
@@ -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));
}
diff --git a/mod/groups/views/default/river/relationship/member/create.php b/mod/groups/views/default/river/relationship/member/create.php
index 3ba191676..430e95839 100644
--- a/mod/groups/views/default/river/relationship/member/create.php
+++ b/mod/groups/views/default/river/relationship/member/create.php
@@ -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>";
?>
diff --git a/mod/invitefriends/views/default/invitefriends/formitems.php b/mod/invitefriends/views/default/invitefriends/formitems.php
index f189d4525..dceac6bbc 100644
--- a/mod/invitefriends/views/default/invitefriends/formitems.php
+++ b/mod/invitefriends/views/default/invitefriends/formitems.php
@@ -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>
diff --git a/mod/members/index.php b/mod/members/index.php
index a4f21da13..5a62e9d46 100644
--- a/mod/members/index.php
+++ b/mod/members/index.php
@@ -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(
diff --git a/mod/members/views/default/members/css.php b/mod/members/views/default/members/css.php
index 9c92398fc..6695537a2 100644
--- a/mod/members/views/default/members/css.php
+++ b/mod/members/views/default/members/css.php
@@ -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
diff --git a/mod/members/views/default/members/members_navigation.php b/mod/members/views/default/members/members_navigation.php
index f3d53a954..c866e194d 100644
--- a/mod/members/views/default/members/members_navigation.php
+++ b/mod/members/views/default/members/members_navigation.php
@@ -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>
diff --git a/mod/members/views/default/members/search.php b/mod/members/views/default/members/search.php
index 746db67a0..98ec20549 100644
--- a/mod/members/views/default/members/search.php
+++ b/mod/members/views/default/members/search.php
@@ -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" />
diff --git a/mod/messageboard/views/default/widgets/messageboard/content.php b/mod/messageboard/views/default/widgets/messageboard/content.php
index 2f85a16ac..305a6980f 100644
--- a/mod/messageboard/views/default/widgets/messageboard/content.php
+++ b/mod/messageboard/views/default/widgets/messageboard/content.php
@@ -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
diff --git a/mod/messages/index.php b/mod/messages/index.php
index 496a8ee9d..53aeef2aa 100644
--- a/mod/messages/index.php
+++ b/mod/messages/index.php
@@ -30,9 +30,9 @@ $messages = elgg_get_entities_from_metadata(array(
));
// Set the page title
-$area2 = "<div id='content_header'><div class='content_header_title'>";
+$area2 = "<div id='content_header'><div class='content-header-title'>";
$area2 .= elgg_view_title(elgg_echo("messages:inbox"))."</div>";
-$area2 .= "<div class='content_header_options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
+$area2 .= "<div class='content-header-options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
// Display them. The last variable 'page_view' is to allow the view page to know where this data is coming from,
// in this case it is the inbox, this is necessary to ensure the correct display
diff --git a/mod/messages/sent.php b/mod/messages/sent.php
index 7331a8d52..34dc11692 100644
--- a/mod/messages/sent.php
+++ b/mod/messages/sent.php
@@ -26,9 +26,9 @@ $messages = elgg_get_entities_from_metadata(array('metadata_name' => 'fromId', '
// Set the page title
-$area2 = "<div id='content_header'><div class='content_header_title'>";
+$area2 = "<div id='content_header'><div class='content-header-title'>";
$area2 .= elgg_view_title(elgg_echo("messages:sentmessages"))."</div>";
-$area2 .= "<div class='content_header_options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
+$area2 .= "<div class='content-header-options'><a class='action-button' href='".elgg_get_site_url()."mod/messages/send.php'>" . elgg_echo('messages:compose') . "</a></div></div>";
// Set content
$area2 .= elgg_view("messages/forms/view",array('entity' => $messages, 'page_view' => "sent", 'limit' => $limit, 'offset' => $offset));
diff --git a/mod/messages/views/default/messages/css.php b/mod/messages/views/default/messages/css.php
index b186400f8..3e58c2607 100644
--- a/mod/messages/views/default/messages/css.php
+++ b/mod/messages/views/default/messages/css.php
@@ -6,7 +6,7 @@
*/
?>
-/* messages/new messages icon & counter in elgg_topbar */
+/* messages/new messages icon & counter in elgg-topbar */
a.privatemessages {
background:transparent url(<?php echo elgg_get_site_url(); ?>mod/messages/graphics/toolbar_messages_icon.gif) no-repeat left 2px;
padding-left:16px;
@@ -52,7 +52,7 @@ a.privatemessages.new span {
border-bottom:1px dotted #cccccc;
padding:5px 0 7px 0;
}
-.message.notread .entity_listing_info p.entity_title a {
+.message.notread .entity-listing-info p.entity-title a {
color:#d40005;
}
.message_sender {
@@ -77,7 +77,7 @@ a.privatemessages.new span {
.message .delete-button {
margin-top:3px;
}
-.entity_listing.messages:hover {
+.entity-listing.messages:hover {
background-color:white;
}
.messages_buttonbank {
diff --git a/mod/messages/views/default/messages/forms/reply.php b/mod/messages/views/default/messages/forms/reply.php
index 15eb3ebd0..0b78f4db3 100644
--- a/mod/messages/views/default/messages/forms/reply.php
+++ b/mod/messages/views/default/messages/forms/reply.php
@@ -12,7 +12,7 @@
}
?>
-<form class="margin_top" id="messages_reply_form" action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm">
+<form class="margin-top" id="messages_reply_form" action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm">
<?php echo elgg_view('action/securitytoken'); ?>
<!-- populate the title space with the orginal message title, inserting re: before it -->
diff --git a/mod/messages/views/default/messages/forms/send.php b/mod/messages/views/default/messages/forms/send.php
index 43ece8d89..9a83ce103 100644
--- a/mod/messages/views/default/messages/forms/send.php
+++ b/mod/messages/views/default/messages/forms/send.php
@@ -31,10 +31,10 @@ unset($_SESSION['msg_contents']);
//get the user object
$user = get_user($send_to);
- echo "<div class='entity_listing messages clearfix'><div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>";
+ echo "<div class='entity-listing messages clearfix'><div class='entity-listing-icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>";
//draw it
- echo "<div class='entity_listing_info'>".elgg_echo("messages:to").": <a href='".elgg_get_site_url()."pg/profile/".$user->username."'>".$user->name."</a>";
+ echo "<div class='entity-listing-info'>".elgg_echo("messages:to").": <a href='".elgg_get_site_url()."pg/profile/".$user->username."'>".$user->name."</a>";
//set the hidden input field to the recipients guid
echo "<input type='hidden' name='send_to' value=\"{$send_to}\" />";
echo "</div></div>";
@@ -42,7 +42,7 @@ unset($_SESSION['msg_contents']);
} else {
?>
- <p class="margin_top"><label><?php echo elgg_echo("messages:to"); ?>: </label>
+ <p class="margin-top"><label><?php echo elgg_echo("messages:to"); ?>: </label>
<select name='send_to'>
<?php
// make the first option blank
@@ -57,7 +57,7 @@ unset($_SESSION['msg_contents']);
}
?>
- <p class="margin_top"><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' value='<?php echo $msg_title; ?>' class="input-text" /></label></p>
+ <p class="margin-top"><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' value='<?php echo $msg_title; ?>' class="input-text" /></label></p>
<p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label>
<?php
echo elgg_view("input/longtext", array(
diff --git a/mod/messages/views/default/messages/messages.php b/mod/messages/views/default/messages/messages.php
index 6fc87ac0e..b489cbacd 100644
--- a/mod/messages/views/default/messages/messages.php
+++ b/mod/messages/views/default/messages/messages.php
@@ -42,9 +42,9 @@ if (isloggedin())
?>
<!-- display the content header block -->
<div id="content_header" class="clearfix">
- <div class="content_header_title"><h2><?php echo $vars['entity']->title; ?></h2></div>
- <div class="content_header_options">
- <a class="action-button message_reply" onclick="elgg_slide_toggle(this,'#elgg_page_contents','#message_reply_form');"><?php echo elgg_echo('messages:answer'); ?></a>
+ <div class="content-header-title"><h2><?php echo $vars['entity']->title; ?></h2></div>
+ <div class="content-header-options">
+ <a class="action-button message_reply" onclick="elgg_slide_toggle(this,'#elgg-page-contents','#message_reply_form');"><?php echo elgg_echo('messages:answer'); ?></a>
<?php echo elgg_view("output/confirmlink", array(
'href' => "action/messages/delete?message_id=" . $vars['entity']->getGUID() . "&type={$type}&submit=" . elgg_echo('delete'),
'text' => elgg_echo('delete'),
@@ -55,7 +55,7 @@ if (isloggedin())
</div>
</div>
- <div class="entity_listing messages clearfix">
+ <div class="entity-listing messages clearfix">
<?php
// we need a different user icon and name depending on whether the user is reading the message
// from their inbox or sentbox. If it is the inbox, then the icon and name will be the person who sent
@@ -71,13 +71,13 @@ if (isloggedin())
$message_owner = elgg_echo('messages:from').": <a href='".elgg_get_site_url()."pg/profile/".$user_object->username."'>".get_entity($vars['entity']->fromId)->name."</a>";
}
?>
- <div class="entity_listing_icon"><?php echo $message_icon ?></div>
- <div class="entity_listing_info"><p><?php echo $message_owner ?></p>
- <p class="entity_subtext"><?php echo elgg_view_friendly_time($vars['entity']->time_created); ?></p>
+ <div class="entity-listing-icon"><?php echo $message_icon ?></div>
+ <div class="entity-listing-info"><p><?php echo $message_owner ?></p>
+ <p class="entity-subtext"><?php echo elgg_view_friendly_time($vars['entity']->time_created); ?></p>
</div>
</div>
- <div class="messagebody margin_top clearfix">
+ <div class="messagebody margin-top clearfix">
<?php
// if the message is a reply, display the message the reply was for
// @todo I need to figure out how to get the description out using -> (anyone?)
@@ -90,9 +90,9 @@ if (isloggedin())
</div>
<!-- reply form -->
- <div id="message_reply_form" class="hidden margin_top">
+ <div id="message_reply_form" class="hidden margin-top">
<h2><?php echo elgg_echo('messages:answer'); ?></h2>
- <form action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm" class="margin_top" id="messages_send_form">
+ <form action="<?php echo elgg_get_site_url(); ?>action/messages/send" method="post" name="messageForm" class="margin-top" id="messages_send_form">
<?php echo elgg_view('input/securitytoken'); ?>
<p><label><?php echo elgg_echo("messages:title"); ?>: <br /><input type='text' name='title' class="input-text" value='<?php echo $reply_title; ?>' /></label></p>
<p class="longtext_inputarea"><label><?php echo elgg_echo("messages:message"); ?>:</label>
diff --git a/mod/messages/views/default/messages/view.php b/mod/messages/views/default/messages/view.php
index 76fa4a00c..cc0b5ec3a 100644
--- a/mod/messages/views/default/messages/view.php
+++ b/mod/messages/views/default/messages/view.php
@@ -34,9 +34,9 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
}
// get the icon of the user who owns the message
$from = get_entity($message->fromId);
- echo "<div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $from, 'size' => 'tiny'))."</div>";
+ echo "<div class='entity-listing-icon'>".elgg_view("profile/icon",array('entity' => $from, 'size' => 'tiny'))."</div>";
// message block (message sender, message subject, delete checkbox)
- echo "<div class='entity_listing_info'><div class='message_sender'>".$from->name."<p class='entity_subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
+ echo "<div class='entity-listing-info'><div class='message_sender'>".$from->name."<p class='entity-subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
// display message subject
echo "<div class='message_subject'>";
// display delete button
@@ -45,7 +45,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
)) . "</span>";
- echo "<p class='entity_title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" />";
+ echo "<p class='entity-title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" />";
echo "<a href=\"{$message->getURL()}\">" . $message->title . "</a></p>";
echo "</div></div></div>"; // close the message container
}//end of hiddenFrom if statement
@@ -70,8 +70,8 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
$user = get_entity($message->toId);
echo "<div class='message sent clearfix'>";
//get the icon for the user the message was sent to
- echo "<div class='entity_listing_icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>";
- echo "<div class='entity_listing_info'><div class='message_sender'>".get_loggedin_user()->name."<p class='entity_subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
+ echo "<div class='entity-listing-icon'>".elgg_view("profile/icon",array('entity' => $user, 'size' => 'tiny'))."</div>";
+ echo "<div class='entity-listing-info'><div class='message_sender'>".get_loggedin_user()->name."<p class='entity-subtext'>".elgg_view_friendly_time($message->time_created)."</p></div>";
// display message subject
echo "<div class='message_subject'>";
//display the link to 'delete'
@@ -80,7 +80,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
)) . "</div>";
- echo "<p class='entity_title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" /> ";
+ echo "<p class='entity-title'><input type='checkbox' name=\"message_id[]\" value=\"{$message->guid}\" /> ";
echo "<a href=\"{$message->getURL()}?type=sent\">" . $message->title . "</a></p>";
echo "</div></div></div>"; // close the message container
}//close hiddeTo if statement
@@ -99,7 +99,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
$newoffset = $offset + $limit;
$nexturl = elgg_http_add_url_query_elements($baseurl, array('offset' => $newoffset));
- $nav .= '<a class="pagination_previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
+ $nav .= '<a class="pagination-previous" href="'.$nexturl.'">&laquo; ' . elgg_echo('previous') . '</a> ';
}
if ($offset > 0) {
@@ -108,7 +108,7 @@ if (is_array($vars['entity']) && sizeof($vars['entity']) > 0) {
$prevurl = elgg_http_add_url_query_elements($baseurl, array('offset' => $newoffset));
- $nav .= '<a class="pagination_next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
+ $nav .= '<a class="pagination-next" href="'.$prevurl.'">' . elgg_echo('next') . ' &raquo;</a> ';
}
diff --git a/mod/notifications/start.php b/mod/notifications/start.php
index cea806f2f..eb9e4778e 100644
--- a/mod/notifications/start.php
+++ b/mod/notifications/start.php
@@ -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
diff --git a/mod/notifications/views/default/notifications/subscriptions/collections.php b/mod/notifications/views/default/notifications/subscriptions/collections.php
index 713dff765..8cca13689 100644
--- a/mod/notifications/views/default/notifications/subscriptions/collections.php
+++ b/mod/notifications/views/default/notifications/subscriptions/collections.php
@@ -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%">
diff --git a/mod/notifications/views/default/notifications/subscriptions/form.php b/mod/notifications/views/default/notifications/subscriptions/form.php
index 6c18f6fca..449f908a7 100644
--- a/mod/notifications/views/default/notifications/subscriptions/form.php
+++ b/mod/notifications/views/default/notifications/subscriptions/form.php
@@ -14,7 +14,7 @@
// Display a description
?>
-<div class="user_settings notifications">
+<div class="user-settings notifications">
<?php
diff --git a/mod/notifications/views/default/notifications/subscriptions/forminternals.php b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
index 7cc393442..0576bc7b9 100644
--- a/mod/notifications/views/default/notifications/subscriptions/forminternals.php
+++ b/mod/notifications/views/default/notifications/subscriptions/forminternals.php
@@ -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
}
}
diff --git a/mod/notifications/views/default/notifications/subscriptions/groupsform.php b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
index b89350acb..bf75f5931 100644
--- a/mod/notifications/views/default/notifications/subscriptions/groupsform.php
+++ b/mod/notifications/views/default/notifications/subscriptions/groupsform.php
@@ -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);
diff --git a/mod/pages/views/default/river/object/page/create.php b/mod/pages/views/default/river/object/page/create.php
index f85e4d42e..221ca0e21 100644
--- a/mod/pages/views/default/river/object/page/create.php
+++ b/mod/pages/views/default/river/object/page/create.php
@@ -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);
diff --git a/mod/profile/views/default/profile/commentwall/commentwall.php b/mod/profile/views/default/profile/commentwall/commentwall.php
index a45c3adde..56670dcf0 100644
--- a/mod/profile/views/default/profile/commentwall/commentwall.php
+++ b/mod/profile/views/default/profile/commentwall/commentwall.php
@@ -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
diff --git a/mod/profile/views/default/profile/commentwall/commentwall_content.php b/mod/profile/views/default/profile/commentwall/commentwall_content.php
index a7a7ca14d..a0785b565 100644
--- a/mod/profile/views/default/profile/commentwall/commentwall_content.php
+++ b/mod/profile/views/default/profile/commentwall/commentwall_content.php
@@ -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 -->
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index d1941bbc8..537d9261e 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -17,22 +17,22 @@
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;
}
diff --git a/mod/profile/views/default/profile/edit.php b/mod/profile/views/default/profile/edit.php
index 4ca723385..2e3ec24a4 100644
--- a/mod/profile/views/default/profile/edit.php
+++ b/mod/profile/views/default/profile/edit.php
@@ -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>
diff --git a/mod/profile/views/default/profile/editdefaultprofile.php b/mod/profile/views/default/profile/editdefaultprofile.php
index 4993e1c7f..7d701af11 100644
--- a/mod/profile/views/default/profile/editdefaultprofile.php
+++ b/mod/profile/views/default/profile/editdefaultprofile.php
@@ -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'));
diff --git a/mod/profile/views/default/profile/editdefaultprofileitems.php b/mod/profile/views/default/profile/editdefaultprofileitems.php
index 4c093cb22..29ce7f138 100644
--- a/mod/profile/views/default/profile/editdefaultprofileitems.php
+++ b/mod/profile/views/default/profile/editdefaultprofileitems.php
@@ -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>";
diff --git a/mod/profile/views/default/profile/editicon.php b/mod/profile/views/default/profile/editicon.php
index 9e1987d55..9eeaecb4a 100644
--- a/mod/profile/views/default/profile/editicon.php
+++ b/mod/profile/views/default/profile/editicon.php
@@ -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">
diff --git a/mod/profile/views/default/profile/listing.php b/mod/profile/views/default/profile/listing.php
index 96b3d24d5..0622264b8 100644
--- a/mod/profile/views/default/profile/listing.php
+++ b/mod/profile/views/default/profile/listing.php
@@ -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;
diff --git a/mod/profile/views/default/profile/profile_navigation.php b/mod/profile/views/default/profile/profile_navigation.php
index a27cf789d..ca0873ebd 100755
--- a/mod/profile/views/default/profile/profile_navigation.php
+++ b/mod/profile/views/default/profile/profile_navigation.php
@@ -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>
diff --git a/mod/profile/views/default/river/user/default/profileiconupdate.php b/mod/profile/views/default/river/user/default/profileiconupdate.php
index 9e617573b..d7b15dab5 100644
--- a/mod/profile/views/default/river/user/default/profileiconupdate.php
+++ b/mod/profile/views/default/river/user/default/profileiconupdate.php
@@ -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
diff --git a/mod/profile/views/default/river/user/default/profileupdate.php b/mod/profile/views/default/river/user/default/profileupdate.php
index 156aa8b1b..155b25fa9 100644
--- a/mod/profile/views/default/river/user/default/profileupdate.php
+++ b/mod/profile/views/default/river/user/default/profileupdate.php
@@ -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>";
?>
diff --git a/mod/reportedcontent/views/default/admin/overview/reportedcontent.php b/mod/reportedcontent/views/default/admin/overview/reportedcontent.php
index 0cf8643a3..3f79d500a 100644
--- a/mod/reportedcontent/views/default/admin/overview/reportedcontent.php
+++ b/mod/reportedcontent/views/default/admin/overview/reportedcontent.php
@@ -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
diff --git a/mod/reportedcontent/views/default/reportedcontent/form.php b/mod/reportedcontent/views/default/reportedcontent/form.php
index b22bc05f6..e70afacf8 100644
--- a/mod/reportedcontent/views/default/reportedcontent/form.php
+++ b/mod/reportedcontent/views/default/reportedcontent/form.php
@@ -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>
diff --git a/mod/riverdashboard/endpoint/get_comments.php b/mod/riverdashboard/endpoint/get_comments.php
index 22d89bcfd..f130cfd3c 100644
--- a/mod/riverdashboard/endpoint/get_comments.php
+++ b/mod/riverdashboard/endpoint/get_comments.php
@@ -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
diff --git a/mod/riverdashboard/endpoint/ping.php b/mod/riverdashboard/endpoint/ping.php
index 5dd3bff5e..239582bf2 100644
--- a/mod/riverdashboard/endpoint/ping.php
+++ b/mod/riverdashboard/endpoint/ping.php
@@ -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(){
diff --git a/mod/riverdashboard/index.php b/mod/riverdashboard/index.php
index 8d650e1f5..8d0d1d657 100644
--- a/mod/riverdashboard/index.php
+++ b/mod/riverdashboard/index.php
@@ -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);
diff --git a/mod/riverdashboard/start.php b/mod/riverdashboard/start.php
index 8469448a0..ae193ce4c 100644
--- a/mod/riverdashboard/start.php
+++ b/mod/riverdashboard/start.php
@@ -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 {
diff --git a/mod/riverdashboard/views/default/river/item/list.php b/mod/riverdashboard/views/default/river/item/list.php
index a0f547e45..fdd5b24df 100644
--- a/mod/riverdashboard/views/default/river/item/list.php
+++ b/mod/riverdashboard/views/default/river/item/list.php
@@ -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)) {
diff --git a/mod/riverdashboard/views/default/river/item/wrapper.php b/mod/riverdashboard/views/default/river/item/wrapper.php
index 0413775d6..8e93b25b5 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper.php
@@ -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>";
diff --git a/mod/riverdashboard/views/default/river/item/wrapper_classic.php b/mod/riverdashboard/views/default/river/item/wrapper_classic.php
index 60568642a..58fe938f4 100644
--- a/mod/riverdashboard/views/default/river/item/wrapper_classic.php
+++ b/mod/riverdashboard/views/default/river/item/wrapper_classic.php
@@ -6,13 +6,13 @@
* @package Elgg
*/
?>
-<div class="river_item riverdashboard">
- <span class="river_item_useravatar">
+<div class="river-item riverdashboard">
+ <span class="river-item-useravatar">
<?php
echo elgg_view("profile/icon",array('entity' => get_entity($vars['item']->subject_guid), 'size' => 'small'));
?>
</span>
- <div class="river_item_contents clearfix">
+ <div class="river-item-contents clearfix">
<?php
echo $vars['body'];
?>
diff --git a/mod/riverdashboard/views/default/riverdashboard/container.php b/mod/riverdashboard/views/default/riverdashboard/container.php
index 9f0164b43..09a593622 100644
--- a/mod/riverdashboard/views/default/riverdashboard/container.php
+++ b/mod/riverdashboard/views/default/riverdashboard/container.php
@@ -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.
diff --git a/mod/riverdashboard/views/default/riverdashboard/css.php b/mod/riverdashboard/views/default/riverdashboard/css.php
index a09a32712..18ba7c0dc 100644
--- a/mod/riverdashboard/views/default/riverdashboard/css.php
+++ b/mod/riverdashboard/views/default/riverdashboard/css.php
@@ -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;
@@ -18,47 +18,47 @@
-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;
@@ -66,11 +66,11 @@
}
/* 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;
@@ -81,65 +81,65 @@
-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;
@@ -154,17 +154,17 @@
-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;
diff --git a/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php b/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
index d24a8ffc2..2a76f0c68 100644
--- a/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
+++ b/mod/riverdashboard/views/default/riverdashboard/ecml/activity.php
@@ -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);
diff --git a/mod/riverdashboard/views/default/riverdashboard/js.php b/mod/riverdashboard/views/default/riverdashboard/js.php
index 4eec41149..09b1113d8 100644
--- a/mod/riverdashboard/views/default/riverdashboard/js.php
+++ b/mod/riverdashboard/views/default/riverdashboard/js.php
@@ -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 = {
@@ -24,33 +24,33 @@
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,
@@ -67,12 +67,12 @@
});
// 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>
diff --git a/mod/riverdashboard/views/default/riverdashboard/nav.php b/mod/riverdashboard/views/default/riverdashboard/nav.php
index 820ebb5ae..cae3d7bcd 100644
--- a/mod/riverdashboard/views/default/riverdashboard/nav.php
+++ b/mod/riverdashboard/views/default/riverdashboard/nav.php
@@ -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>
diff --git a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php b/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
index 03bd91d10..d6037557d 100644
--- a/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
+++ b/mod/riverdashboard/views/default/riverdashboard/rivercomment.php
@@ -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...',
diff --git a/mod/search/views/default/search/comments/entity.php b/mod/search/views/default/search/comments/entity.php
index 0cd760664..6e267fe7a 100644
--- a/mod/search/views/default/search/comments/entity.php
+++ b/mod/search/views/default/search/comments/entity.php
@@ -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;
diff --git a/mod/search/views/default/search/entity.php b/mod/search/views/default/search/entity.php
index e008da10d..d93a603eb 100644
--- a/mod/search/views/default/search/entity.php
+++ b/mod/search/views/default/search/entity.php
@@ -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>
diff --git a/mod/search/views/default/search/search_box.php b/mod/search/views/default/search/search_box.php
index df66d11f5..b42319520 100644
--- a/mod/search/views/default/search/search_box.php
+++ b/mod/search/views/default/search/search_box.php
@@ -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
diff --git a/mod/sitepages/views/default/canvas/layouts/frontpage.php b/mod/sitepages/views/default/canvas/layouts/frontpage.php
index 00e978492..bef8b8396 100644
--- a/mod/sitepages/views/default/canvas/layouts/frontpage.php
+++ b/mod/sitepages/views/default/canvas/layouts/frontpage.php
@@ -1,15 +1,15 @@
<?php
?>
-<div id="elgg_content" class="clearfix">
- <div id="elgg_sidebar" class="frontpage">
+<div id="elgg-content" class="clearfix">
+ <div id="elgg-sidebar" class="frontpage">
<?php
if (isset($vars['area2'])) echo $vars['area2'];
if (isset($vars['area3'])) echo $vars['area3'];
?>
</div>
- <div id="elgg_page_contents" class="frontpage clearfix">
+ <div id="elgg-page-contents" class="frontpage clearfix">
<?php
if (isset($vars['area1'])) echo $vars['area1'];
?>
diff --git a/mod/sitepages/views/default/sitepages/css.php b/mod/sitepages/views/default/sitepages/css.php
index 91fe9d9e3..3e54172f2 100644
--- a/mod/sitepages/views/default/sitepages/css.php
+++ b/mod/sitepages/views/default/sitepages/css.php
@@ -3,18 +3,18 @@
* Sitepages CSS
*/
?>
-#elgg_sidebar.frontpage {
+#elgg-sidebar.frontpage {
margin-top:0;
}
-#elgg_sidebar.frontpage .sitepages_sidebar_object {
+#elgg-sidebar.frontpage .sitepages_sidebar_object {
margin-bottom: 30px;
}
-#elgg_sidebar.frontpage .sitepages_sidebar_object h3 {
+#elgg-sidebar.frontpage .sitepages_sidebar_object h3 {
margin-top:12px;
}
-#elgg_page_contents.frontpage .sitepages_welcome {
+#elgg-page-contents.frontpage .sitepages_welcome {
margin-bottom: 20px;
}
-#elgg_page_contents.frontpage .sitepages_message {
+#elgg-page-contents.frontpage .sitepages_message {
margin-top: 10px;
} \ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/members.php b/mod/sitepages/views/default/sitepages/members.php
index 73a010332..9ca33064e 100644
--- a/mod/sitepages/views/default/sitepages/members.php
+++ b/mod/sitepages/views/default/sitepages/members.php
@@ -5,7 +5,7 @@
<h3><?php echo elgg_echo('riverdashboard:recentmembers') ?></h3>
<?php
foreach($newest_members as $mem){
- echo "<div class='entity_listing_icon'>" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'small')) . "</div>";
+ echo "<div class='entity-listing-icon'>" . elgg_view("profile/icon",array('entity' => $mem, 'size' => 'small')) . "</div>";
}
?>
</div> \ No newline at end of file
diff --git a/mod/sitepages/views/default/sitepages/menu.php b/mod/sitepages/views/default/sitepages/menu.php
index ec145cc67..6759e3570 100644
--- a/mod/sitepages/views/default/sitepages/menu.php
+++ b/mod/sitepages/views/default/sitepages/menu.php
@@ -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.
diff --git a/mod/thewire/views/default/object/thewire.php b/mod/thewire/views/default/object/thewire.php
index 66debd5e2..4ccd5d7f4 100644
--- a/mod/thewire/views/default/object/thewire.php
+++ b/mod/thewire/views/default/object/thewire.php
@@ -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))
diff --git a/mod/thewire/views/default/river/object/thewire/create.php b/mod/thewire/views/default/river/object/thewire/create.php
index 0e0674a7e..b654ccb51 100644
--- a/mod/thewire/views/default/river/object/thewire/create.php
+++ b/mod/thewire/views/default/river/object/thewire/create.php
@@ -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));
diff --git a/mod/thewire/views/default/thewire/css.php b/mod/thewire/views/default/thewire/css.php
index 230711c49..a00acaec5 100644
--- a/mod/thewire/views/default/thewire/css.php
+++ b/mod/thewire/views/default/thewire/css.php
@@ -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 {
diff --git a/mod/thewire/views/default/thewire/profile_status.php b/mod/thewire/views/default/thewire/profile_status.php
index 9a9c95ec0..09d878c81 100644
--- a/mod/thewire/views/default/thewire/profile_status.php
+++ b/mod/thewire/views/default/thewire/profile_status.php
@@ -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'>";
diff --git a/mod/tinymce/views/default/tinymce/css.php b/mod/tinymce/views/default/tinymce/css.php
index f7eee7fe9..e8d768b91 100644
--- a/mod/tinymce/views/default/tinymce/css.php
+++ b/mod/tinymce/views/default/tinymce/css.php
@@ -3,7 +3,7 @@
* TinyMCE CSS
*/
?>
-#elgg_page_contents .mceButton {
+#elgg-page-contents .mceButton {
background-color: #e9e8e8;
border-color: #B2B2B2;
margin:4px;
@@ -11,13 +11,13 @@
-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;
@@ -35,18 +35,18 @@
-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;
}
diff --git a/views/default/account/forms/forgotten_password.php b/views/default/account/forms/forgotten_password.php
index 2fe2bc9d9..48fafe4d8 100644
--- a/views/default/account/forms/forgotten_password.php
+++ b/views/default/account/forms/forgotten_password.php
@@ -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"
));
?>
diff --git a/views/default/account/forms/login.php b/views/default/account/forms/login.php
index 8b4d88583..87dd6d5ad 100644
--- a/views/default/account/forms/login.php
+++ b/views/default/account/forms/login.php
@@ -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'))); ?>
diff --git a/views/default/account/forms/register.php b/views/default/account/forms/register.php
index b0a48cf35..bf629b589 100644
--- a/views/default/account/forms/register.php
+++ b/views/default/account/forms/register.php
@@ -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"
));
?>
diff --git a/views/default/account/forms/useradd.php b/views/default/account/forms/useradd.php
index 4729048e6..7c1969f1b 100644
--- a/views/default/account/forms/useradd.php
+++ b/views/default/account/forms/useradd.php
@@ -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
diff --git a/views/default/account/login_dropdown.php b/views/default/account/login_dropdown.php
index 29eca2347..dc124f4e8 100644
--- a/views/default/account/login_dropdown.php
+++ b/views/default/account/login_dropdown.php
@@ -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();
}
});
diff --git a/views/default/account/login_walled_garden.php b/views/default/account/login_walled_garden.php
index e24c80f78..9f407bdff 100644
--- a/views/default/account/login_walled_garden.php
+++ b/views/default/account/login_walled_garden.php
@@ -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>";
diff --git a/views/default/admin/appearance/menu_items.php b/views/default/admin/appearance/menu_items.php
index c2335db7b..9bed69a06 100644
--- a/views/default/admin/appearance/menu_items.php
+++ b/views/default/admin/appearance/menu_items.php
@@ -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
diff --git a/views/default/admin/overview.php b/views/default/admin/overview.php
index 804f4cc5e..1785864e7 100644
--- a/views/default/admin/overview.php
+++ b/views/default/admin/overview.php
@@ -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;
diff --git a/views/default/admin/overview/online.php b/views/default/admin/overview/online.php
index 00e5c863a..f8b890c91 100644
--- a/views/default/admin/overview/online.php
+++ b/views/default/admin/overview/online.php
@@ -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>
diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index ee4366679..195df5169 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -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
diff --git a/views/default/admin/plugins/simple.php b/views/default/admin/plugins/simple.php
index 8a269c43b..89373fc7d 100644
--- a/views/default/admin/plugins/simple.php
+++ b/views/default/admin/plugins/simple.php
@@ -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) {
diff --git a/views/default/admin/site/advanced.php b/views/default/admin/site/advanced.php
index 00e63e95d..048ffa883 100644
--- a/views/default/admin/site/advanced.php
+++ b/views/default/admin/site/advanced.php
@@ -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));
diff --git a/views/default/admin/site/basic.php b/views/default/admin/site/basic.php
index f6b2d03e0..9b8f4652d 100644
--- a/views/default/admin/site/basic.php
+++ b/views/default/admin/site/basic.php
@@ -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));
diff --git a/views/default/admin/users/newest.php b/views/default/admin/users/newest.php
index 79de121e5..4d5b85836 100644
--- a/views/default/admin/users/newest.php
+++ b/views/default/admin/users/newest.php
@@ -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>
diff --git a/views/default/admin/users/online.php b/views/default/admin/users/online.php
index 4acaa3f6e..9c0f52c7f 100644
--- a/views/default/admin/users/online.php
+++ b/views/default/admin/users/online.php
@@ -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>
diff --git a/views/default/ajax/loader.php b/views/default/ajax/loader.php
index 430ba2ea3..b1f35971a 100644
--- a/views/default/ajax/loader.php
+++ b/views/default/ajax/loader.php
@@ -8,7 +8,7 @@
$loader = <<< END
-<div align="center" class="ajax_loader hidden"></div>
+<div align="center" class="ajax-loader hidden"></div>
END;
diff --git a/views/default/annotation/annotate.php b/views/default/annotation/annotate.php
index 6e83e8afb..de2513587 100644
--- a/views/default/annotation/annotate.php
+++ b/views/default/annotation/annotate.php
@@ -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') {
diff --git a/views/default/annotation/annotatelike.php b/views/default/annotation/annotatelike.php
index 43655ba6e..7b0d5c2e2 100644
--- a/views/default/annotation/annotatelike.php
+++ b/views/default/annotation/annotatelike.php
@@ -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
diff --git a/views/default/annotation/generic_comment.php b/views/default/annotation/generic_comment.php
index f016609e2..5f23b6300 100644
--- a/views/default/annotation/generic_comment.php
+++ b/views/default/annotation/generic_comment.php
@@ -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>
diff --git a/views/default/annotation/latest_comments.php b/views/default/annotation/latest_comments.php
index 8e1f3e81b..4de93cf90 100644
--- a/views/default/annotation/latest_comments.php
+++ b/views/default/annotation/latest_comments.php
@@ -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>";
}
diff --git a/views/default/annotation/likes.php b/views/default/annotation/likes.php
index 6538e65dc..3fdf2349b 100644
--- a/views/default/annotation/likes.php
+++ b/views/default/annotation/likes.php
@@ -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
diff --git a/views/default/comments/forms/edit.php b/views/default/comments/forms/edit.php
index dd0b374e0..3c26bf7cc 100644
--- a/views/default/comments/forms/edit.php
+++ b/views/default/comments/forms/edit.php
@@ -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>";
diff --git a/views/default/css/admin.php b/views/default/css/admin.php
index af2a16f55..155907acb 100644
--- a/views/default/css/admin.php
+++ b/views/default/css/admin.php
@@ -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;
diff --git a/views/default/css/ie.php b/views/default/css/ie.php
index 95f2d34a9..94407fdc8 100644
--- a/views/default/css/ie.php
+++ b/views/default/css/ie.php
@@ -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;}
@@ -67,12 +67,12 @@
.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
diff --git a/views/default/css/ie6.php b/views/default/css/ie6.php
index 943b94e32..d1fdb750c 100644
--- a/views/default/css/ie6.php
+++ b/views/default/css/ie6.php
@@ -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; }
diff --git a/views/default/css/screen.php b/views/default/css/screen.php
index 59016b777..492e600ff 100644
--- a/views/default/css/screen.php
+++ b/views/default/css/screen.php
@@ -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;
diff --git a/views/default/dashboard/blurb.php b/views/default/dashboard/blurb.php
index 9450d2676..821c617f5 100644
--- a/views/default/dashboard/blurb.php
+++ b/views/default/dashboard/blurb.php
@@ -5,7 +5,7 @@
*/
?>
-<div id="dashboard_info">
+<div id="dashboard-info">
<p>
<?php echo elgg_echo("dashboard:nowidgets"); ?>
</p>
diff --git a/views/default/entities/entity_listing.php b/views/default/entities/entity_listing.php
index 11d1edcda..4b6636db7 100644
--- a/views/default/entities/entity_listing.php
+++ b/views/default/entities/entity_listing.php
@@ -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>
diff --git a/views/default/export/entity.php b/views/default/export/entity.php
index c2fd7f8b8..333179fbb 100644
--- a/views/default/export/entity.php
+++ b/views/default/export/entity.php
@@ -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
}
diff --git a/views/default/export/metadata.php b/views/default/export/metadata.php
index 477cde3c3..1dd7f2054 100644
--- a/views/default/export/metadata.php
+++ b/views/default/export/metadata.php
@@ -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
diff --git a/views/default/export/relationship.php b/views/default/export/relationship.php
index e7c8ac121..d8cb3e4f4 100644
--- a/views/default/export/relationship.php
+++ b/views/default/export/relationship.php
@@ -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>
diff --git a/views/default/friends/collection.php b/views/default/friends/collection.php
index 9981dd291..665e6d34d 100644
--- a/views/default/friends/collection.php
+++ b/views/default/friends/collection.php
@@ -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>";
diff --git a/views/default/friends/collections.php b/views/default/friends/collections.php
index f1e27f9b7..d0669bb46 100644
--- a/views/default/friends/collections.php
+++ b/views/default/friends/collections.php
@@ -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;
});
});
diff --git a/views/default/friends/collectiontabs.php b/views/default/friends/collectiontabs.php
index f191f2c58..6aef4bf1e 100644
--- a/views/default/friends/collectiontabs.php
+++ b/views/default/friends/collectiontabs.php
@@ -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");
diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php
index f348b754d..3bbe4ffe2 100644
--- a/views/default/friends/picker.php
+++ b/views/default/friends/picker.php
@@ -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
}
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index 74ec10818..8f32aa4c5 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -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">
diff --git a/views/default/js/friendsPickerv1.php b/views/default/js/friendsPickerv1.php
index 2fa4e373f..e9a387844 100644
--- a/views/default/js/friendsPickerv1.php
+++ b/views/default/js/friendsPickerv1.php
@@ -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 />");
});
};
diff --git a/views/default/js/initialise_elgg.php b/views/default/js/initialise_elgg.php
index 49c12e30c..5157bb8bc 100644
--- a/views/default/js/initialise_elgg.php
+++ b/views/default/js/initialise_elgg.php
@@ -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;
});
}
diff --git a/views/default/layouts/administration.php b/views/default/layouts/administration.php
index cfc831a33..f7ed84935 100644
--- a/views/default/layouts/administration.php
+++ b/views/default/layouts/administration.php
@@ -11,23 +11,23 @@
?>
<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);
?>
diff --git a/views/default/layouts/one_column.php b/views/default/layouts/one_column.php
index e4a7845f5..9555707ce 100644
--- a/views/default/layouts/one_column.php
+++ b/views/default/layouts/one_column.php
@@ -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>
diff --git a/views/default/layouts/one_column_with_sidebar.php b/views/default/layouts/one_column_with_sidebar.php
index 046c49997..f3ca08f06 100644
--- a/views/default/layouts/one_column_with_sidebar.php
+++ b/views/default/layouts/one_column_with_sidebar.php
@@ -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'])) {
diff --git a/views/default/layouts/widgets.php b/views/default/layouts/widgets.php
index afb44f551..c5607314a 100644
--- a/views/default/layouts/widgets.php
+++ b/views/default/layouts/widgets.php
@@ -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);
diff --git a/views/default/likes/forms/edit.php b/views/default/likes/forms/edit.php
index 96092d118..b4ced1453 100644
--- a/views/default/likes/forms/edit.php
+++ b/views/default/likes/forms/edit.php
@@ -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>";
}
diff --git a/views/default/likes/forms/link.php b/views/default/likes/forms/link.php
index 4e52224e2..decb4aa7f 100644
--- a/views/default/likes/forms/link.php
+++ b/views/default/likes/forms/link.php
@@ -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
diff --git a/views/default/messages/errors/list.php b/views/default/messages/errors/list.php
index 5f675715d..6e1c5a888 100644
--- a/views/default/messages/errors/list.php
+++ b/views/default/messages/errors/list.php
@@ -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>
diff --git a/views/default/messages/list.php b/views/default/messages/list.php
index dc50ef071..84cec1b34 100644
--- a/views/default/messages/list.php
+++ b/views/default/messages/list.php
@@ -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 ) {
diff --git a/views/default/messages/messages/list.php b/views/default/messages/messages/list.php
index 1d69c0289..6af17b929 100644
--- a/views/default/messages/messages/list.php
+++ b/views/default/messages/messages/list.php
@@ -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>
diff --git a/views/default/navigation/listtype.php b/views/default/navigation/listtype.php
index c4693313b..9b86df40c 100644
--- a/views/default/navigation/listtype.php
+++ b/views/default/navigation/listtype.php
@@ -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
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index de401eae4..fc15470bc 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -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>";
}
diff --git a/views/default/navigation/site_nav.php b/views/default/navigation/site_nav.php
index 325f5a18b..84ac75569 100644
--- a/views/default/navigation/site_nav.php
+++ b/views/default/navigation/site_nav.php
@@ -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>
diff --git a/views/default/navigation/tabs.php b/views/default/navigation/tabs.php
index fd6d8b8fe..582b56bbe 100644
--- a/views/default/navigation/tabs.php
+++ b/views/default/navigation/tabs.php
@@ -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";
}
diff --git a/views/default/notifications/settings/usersettings.php b/views/default/notifications/settings/usersettings.php
index c7a27a16f..afb142ebe 100644
--- a/views/default/notifications/settings/usersettings.php
+++ b/views/default/notifications/settings/usersettings.php
@@ -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'); ?>
diff --git a/views/default/output/rss_view.php b/views/default/output/rss_view.php
index 0e45ce1df..530bb9684 100644
--- a/views/default/output/rss_view.php
+++ b/views/default/output/rss_view.php
@@ -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
diff --git a/views/default/page_elements/content_header.php b/views/default/page_elements/content_header.php
index f10d8b7ad..64d122877 100644
--- a/views/default/page_elements/content_header.php
+++ b/views/default/page_elements/content_header.php
@@ -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
diff --git a/views/default/page_elements/content_header_member.php b/views/default/page_elements/content_header_member.php
index 3d4a0f853..91a4b4976 100644
--- a/views/default/page_elements/content_header_member.php
+++ b/views/default/page_elements/content_header_member.php
@@ -19,6 +19,6 @@ $title = $name . "'s " . $type;
?>
<div id="content_header" class="clearfix">
- <?php echo '<div class="content_header_title">' . elgg_view_title($title) . '</div>'; ?>
+ <?php echo '<div class="content-header-title">' . elgg_view_title($title) . '</div>'; ?>
</div>
diff --git a/views/default/page_elements/footer.php b/views/default/page_elements/footer.php
index 93aac4d96..2f976c8ab 100644
--- a/views/default/page_elements/footer.php
+++ b/views/default/page_elements/footer.php
@@ -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>
diff --git a/views/default/page_elements/header.php b/views/default/page_elements/header.php
index f747b67a2..54a166b2d 100644
--- a/views/default/page_elements/header.php
+++ b/views/default/page_elements/header.php
@@ -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');
diff --git a/views/default/page_elements/header_logo.php b/views/default/page_elements/header_logo.php
index 1e5e5269d..c782310f0 100644
--- a/views/default/page_elements/header_logo.php
+++ b/views/default/page_elements/header_logo.php
@@ -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>
diff --git a/views/default/page_elements/owner_block.php b/views/default/page_elements/owner_block.php
index 9962e2962..66fc180dd 100644
--- a/views/default/page_elements/owner_block.php
+++ b/views/default/page_elements/owner_block.php
@@ -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;
}
diff --git a/views/default/page_elements/topbar.php b/views/default/page_elements/topbar.php
index 5f980603e..8c19c6409 100644
--- a/views/default/page_elements/topbar.php
+++ b/views/default/page_elements/topbar.php
@@ -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);
diff --git a/views/default/page_elements/topbar_logout.php b/views/default/page_elements/topbar_logout.php
index 38a37bc22..2d2ecf67c 100644
--- a/views/default/page_elements/topbar_logout.php
+++ b/views/default/page_elements/topbar_logout.php
@@ -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'),
diff --git a/views/default/page_shells/walled_garden.php b/views/default/page_shells/walled_garden.php
index 7d96c80d8..5c4e54b75 100644
--- a/views/default/page_shells/walled_garden.php
+++ b/views/default/page_shells/walled_garden.php
@@ -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;
diff --git a/views/default/river/item/wrapper.php b/views/default/river/item/wrapper.php
index cad70f92b..0bdf2f4aa 100644
--- a/views/default/river/item/wrapper.php
+++ b/views/default/river/item/wrapper.php
@@ -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);
?>)
diff --git a/views/default/settings/system.php b/views/default/settings/system.php
index 7371ac71f..362f504cc 100644
--- a/views/default/settings/system.php
+++ b/views/default/settings/system.php
@@ -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));
diff --git a/views/default/settings/upgrading.php b/views/default/settings/upgrading.php
index 19bc13879..4d39f29d9 100644
--- a/views/default/settings/upgrading.php
+++ b/views/default/settings/upgrading.php
@@ -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>
diff --git a/views/default/user/settings/default_access.php b/views/default/user/settings/default_access.php
index c557fd09d..e7c280198 100644
--- a/views/default/user/settings/default_access.php
+++ b/views/default/user/settings/default_access.php
@@ -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'); ?>:
diff --git a/views/default/user/settings/email.php b/views/default/user/settings/email.php
index 0a08b1faf..396f8e79b 100644
--- a/views/default/user/settings/email.php
+++ b/views/default/user/settings/email.php
@@ -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'); ?>:
diff --git a/views/default/user/settings/language.php b/views/default/user/settings/language.php
index 06486ae3e..ada133791 100644
--- a/views/default/user/settings/language.php
+++ b/views/default/user/settings/language.php
@@ -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>
diff --git a/views/default/user/settings/password.php b/views/default/user/settings/password.php
index 416e4dcef..0bd7f38f8 100644
--- a/views/default/user/settings/password.php
+++ b/views/default/user/settings/password.php
@@ -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
diff --git a/views/default/usersettings/plugins.php b/views/default/usersettings/plugins.php
index 71be11d9f..c4df9e26b 100644
--- a/views/default/usersettings/plugins.php
+++ b/views/default/usersettings/plugins.php
@@ -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);
diff --git a/views/default/usersettings/plugins_opt/plugin.php b/views/default/usersettings/plugins_opt/plugin.php
index 9638e00af..981d8d937 100644
--- a/views/default/usersettings/plugins_opt/plugin.php
+++ b/views/default/usersettings/plugins_opt/plugin.php
@@ -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">
diff --git a/views/default/usersettings/statistics_opt/numentities.php b/views/default/usersettings/statistics_opt/numentities.php
index c80347b34..10d2b7c68 100644
--- a/views/default/usersettings/statistics_opt/numentities.php
+++ b/views/default/usersettings/statistics_opt/numentities.php
@@ -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;
diff --git a/views/default/usersettings/statistics_opt/online.php b/views/default/usersettings/statistics_opt/online.php
index bbe6203ce..dc24130cd 100644
--- a/views/default/usersettings/statistics_opt/online.php
+++ b/views/default/usersettings/statistics_opt/online.php
@@ -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
diff --git a/views/default/widgets/add_button.php b/views/default/widgets/add_button.php
index dc84528f2..92de8a99f 100644
--- a/views/default/widgets/add_button.php
+++ b/views/default/widgets/add_button.php
@@ -1,7 +1,7 @@
<?php
?>
-<div id="widget_add_button">
+<div id="widget-add-button">
<?php
$options = array(
'href' => '#',
diff --git a/views/default/widgets/add_panel.php b/views/default/widgets/add_panel.php
index a010d1e9e..9dbc8f78f 100644
--- a/views/default/widgets/add_panel.php
+++ b/views/default/widgets/add_panel.php
@@ -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;
}
diff --git a/views/default/widgets/controls.php b/views/default/widgets/controls.php
index bd4af97a6..5e6aaf193 100644
--- a/views/default/widgets/controls.php
+++ b/views/default/widgets/controls.php
@@ -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
diff --git a/views/default/widgets/settings.php b/views/default/widgets/settings.php
index e2db3b5db..5814e5821 100644
--- a/views/default/widgets/settings.php
+++ b/views/default/widgets/settings.php
@@ -33,7 +33,7 @@ $body = <<<___END
___END;
?>
-<div class="widget_edit">
+<div class="widget-edit">
<?php
$params = array(
'body' => $body,
diff --git a/views/default/widgets/wrapper.php b/views/default/widgets/wrapper.php
index 9c941a7c9..4483be887 100644
--- a/views/default/widgets/wrapper.php
+++ b/views/default/widgets/wrapper.php
@@ -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);
diff --git a/views/installation/page_shells/default.php b/views/installation/page_shells/default.php
index 62bb0a5b3..27a7c2fe2 100644
--- a/views/installation/page_shells/default.php
+++ b/views/installation/page_shells/default.php
@@ -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>