diff options
Diffstat (limited to 'views')
79 files changed, 462 insertions, 462 deletions
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(); ?>"><< 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'>« ". elgg_echo("previous") ."</a> "; + echo "<a href=\"{$prevurl}\" class='pagination-previous'>« ". 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") . " »</a>"; + echo " <a href=\"{$nexturl}\" class='pagination-next'>" . elgg_echo("next") . " »</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> |