aboutsummaryrefslogtreecommitdiff
path: root/mod/profile
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-02 03:10:57 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-12-02 03:10:57 +0000
commit4d80bc33b8924038bd1ca57d548828afe661bb42 (patch)
tree600b8a2d46ea899d35582667ed00049a0a4367cc /mod/profile
parent89ded32abebd0f2100e0014249df54bde7a44258 (diff)
downloadelgg-4d80bc33b8924038bd1ca57d548828afe661bb42.tar.gz
elgg-4d80bc33b8924038bd1ca57d548828afe661bb42.tar.bz2
Refs #2700 replaced most underscores with hyphens - there may be broken display code due to extent of this change
git-svn-id: http://code.elgg.org/elgg/trunk@7493 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'mod/profile')
-rw-r--r--mod/profile/views/default/profile/commentwall/commentwall.php2
-rw-r--r--mod/profile/views/default/profile/commentwall/commentwall_content.php10
-rw-r--r--mod/profile/views/default/profile/css.php18
-rw-r--r--mod/profile/views/default/profile/edit.php2
-rw-r--r--mod/profile/views/default/profile/editdefaultprofile.php2
-rw-r--r--mod/profile/views/default/profile/editdefaultprofileitems.php2
-rw-r--r--mod/profile/views/default/profile/editicon.php2
-rw-r--r--mod/profile/views/default/profile/listing.php6
-rwxr-xr-xmod/profile/views/default/profile/profile_navigation.php2
-rw-r--r--mod/profile/views/default/river/user/default/profileiconupdate.php2
-rw-r--r--mod/profile/views/default/river/user/default/profileupdate.php2
11 files changed, 25 insertions, 25 deletions
diff --git a/mod/profile/views/default/profile/commentwall/commentwall.php b/mod/profile/views/default/profile/commentwall/commentwall.php
index a45c3adde..56670dcf0 100644
--- a/mod/profile/views/default/profile/commentwall/commentwall.php
+++ b/mod/profile/views/default/profile/commentwall/commentwall.php
@@ -12,7 +12,7 @@ if (is_array($vars['annotation']) && sizeof($vars['annotation']) > 0) {
echo elgg_view("profile/commentwall/commentwall_content", array('annotation' => $content));
}
} else {
- echo "<p class='margin_top'>" . elgg_echo("profile:commentwall:none") . "</p>";
+ echo "<p class='margin-top'>" . elgg_echo("profile:commentwall:none") . "</p>";
}
//close the wrapper div
echo "</div>"; \ No newline at end of file
diff --git a/mod/profile/views/default/profile/commentwall/commentwall_content.php b/mod/profile/views/default/profile/commentwall/commentwall_content.php
index a7a7ca14d..a0785b565 100644
--- a/mod/profile/views/default/profile/commentwall/commentwall_content.php
+++ b/mod/profile/views/default/profile/commentwall/commentwall_content.php
@@ -3,19 +3,19 @@
* Elgg Message board individual item display page
*/
?>
-<div class="entity_listing clearfix">
+<div class="entity-listing clearfix">
<!-- display the user icon of the user that posted the message -->
- <div class="entity_listing_icon">
+ <div class="entity-listing-icon">
<?php
echo elgg_view("profile/icon",array('entity' => get_entity($vars['annotation']->owner_guid), 'size' => 'tiny'));
?>
</div>
- <div class="entity_listing_info">
+ <div class="entity-listing-info">
<?php
// if the user looking at the comment can edit, show the delete link
if ($vars['annotation']->canEdit()) {
- echo "<div class='entity_metadata'><span class='delete-button'>" . elgg_view("output/confirmlink",array(
+ echo "<div class='entity-metadata'><span class='delete-button'>" . elgg_view("output/confirmlink",array(
'href' => "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id,
'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'),
@@ -23,7 +23,7 @@
} //end of can edit if statement
?>
<!-- display the user's name who posted and the date/time -->
- <p class="entity_subtext">
+ <p class="entity-subtext">
<?php echo get_entity($vars['annotation']->owner_guid)->name . " " . elgg_view_friendly_time($vars['annotation']->time_created); ?>
</p>
<!-- output the actual comment -->
diff --git a/mod/profile/views/default/profile/css.php b/mod/profile/views/default/profile/css.php
index d1941bbc8..537d9261e 100644
--- a/mod/profile/views/default/profile/css.php
+++ b/mod/profile/views/default/profile/css.php
@@ -17,22 +17,22 @@
width:230px;
float:left;
}
-.elgg_horizontal_tabbed_nav.profile {
+.elgg-horizontal-tabbed-nav.profile {
margin-top:0px;
margin-bottom:25px;
position:relative;
}
-.elgg_horizontal_tabbed_nav.profile .profile_name {
+.elgg-horizontal-tabbed-nav.profile .profile_name {
display:block;
width:265px;
position:absolute;
}
-.elgg_horizontal_tabbed_nav.profile .profile_name h2 {
+.elgg-horizontal-tabbed-nav.profile .profile_name h2 {
margin:0;
padding:0;
border:none;
}
-.elgg_horizontal_tabbed_nav.profile ul {
+.elgg-horizontal-tabbed-nav.profile ul {
margin-left:260px;
}
@@ -89,7 +89,7 @@ img.medium {
padding:15px;
min-height:270px;
}
-#elgg_sidebar #owner_block {
+#elgg-sidebar #owner_block {
background-color: white;
-webkit-border-radius: 8px;
-moz-border-radius: 8px;
@@ -110,7 +110,7 @@ img.medium {
#owner_block .owner_block_contents {
margin-left: 50px;
}
-#elgg_sidebar #owner_block .owner_block_contents {
+#elgg-sidebar #owner_block .owner_block_contents {
margin-left: 34px;
}
#owner_block .owner_block_contents h3 {
@@ -249,7 +249,7 @@ img.medium {
/* ***************************************
friends panel within profile
*************************************** */
-#profile_content .entity_listing .entity_listing_info {
+#profile_content .entity-listing .entity-listing-info {
width:664px;
}
@@ -351,10 +351,10 @@ p.visit_twitter a {
-moz-border-radius: 6px;
}
/* banned user in friends lists */
-.entity_listing_info p.entity_title.user.banned {
+.entity-listing-info p.entity-title.user.banned {
text-decoration: line-through;
}
-.entity_listing_info p.entity_title.user.banned a {
+.entity-listing-info p.entity-title.user.banned a {
color:red;
}
diff --git a/mod/profile/views/default/profile/edit.php b/mod/profile/views/default/profile/edit.php
index 4ca723385..2e3ec24a4 100644
--- a/mod/profile/views/default/profile/edit.php
+++ b/mod/profile/views/default/profile/edit.php
@@ -8,7 +8,7 @@
* @uses $vars['profile'] Profile items from $CONFIG->profile, defined in profile/start.php for now
*/
?>
-<form action="<?php echo elgg_get_site_url(); ?>action/profile/edit" method="post" id="edit_profile" class="margin_top">
+<form action="<?php echo elgg_get_site_url(); ?>action/profile/edit" method="post" id="edit_profile" class="margin-top">
<?php echo elgg_view('input/securitytoken') ?>
<p><label>
diff --git a/mod/profile/views/default/profile/editdefaultprofile.php b/mod/profile/views/default/profile/editdefaultprofile.php
index 4993e1c7f..7d701af11 100644
--- a/mod/profile/views/default/profile/editdefaultprofile.php
+++ b/mod/profile/views/default/profile/editdefaultprofile.php
@@ -25,5 +25,5 @@ $formbody = <<< END
$submit_control</p>
END;
-echo "<p class='margin_top'>" . elgg_echo('profile:explainchangefields') . "</p>";
+echo "<p class='margin-top'>" . elgg_echo('profile:explainchangefields') . "</p>";
echo elgg_view('input/form', array('body' => $formbody, 'action' => 'action/profile/editdefault'));
diff --git a/mod/profile/views/default/profile/editdefaultprofileitems.php b/mod/profile/views/default/profile/editdefaultprofileitems.php
index 4c093cb22..29ce7f138 100644
--- a/mod/profile/views/default/profile/editdefaultprofileitems.php
+++ b/mod/profile/views/default/profile/editdefaultprofileitems.php
@@ -51,7 +51,7 @@ END;
//$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even';
$url = elgg_add_action_tokens_to_url(elgg_get_site_url()."action/profile/editdefault/delete?id={$item->shortname}");
echo "<li id=\"{$item->shortname}\"><div class='delete-button'><a href=\"$url\">" . elgg_echo('delete') . "</a></div>";
- echo "<img width='16' height='16' class='handle' alt='move' title='Drag here to reorder this item' src='".elgg_get_site_url()."mod/profile/graphics/drag_handle.png'/>";
+ echo "<img width='16' height='16' class='handle' alt='move' title='Drag here to reorder this item' src='".elgg_get_site_url()."mod/profile/graphics/drag-handle.png'/>";
echo "<b class=\"profile_field_editable\"><span class=\"{$item->shortname}_editable\">$item->translation</span></b>: [".elgg_echo($item->type)."]";
echo "</li>";
diff --git a/mod/profile/views/default/profile/editicon.php b/mod/profile/views/default/profile/editicon.php
index 9e1987d55..9eeaecb4a 100644
--- a/mod/profile/views/default/profile/editicon.php
+++ b/mod/profile/views/default/profile/editicon.php
@@ -15,7 +15,7 @@ $currentuser = get_loggedin_user();
<!-- grab the required js for icon cropping -->
<script type="text/javascript" src="<?php echo elgg_get_site_url(); ?>mod/profile/views/default/js/jquery.imgareaselect-0.8.min.js"></script>
-<p class="margin_top"><?php echo elgg_echo('profile:profilepictureinstructions'); ?></p>
+<p class="margin-top"><?php echo elgg_echo('profile:profilepictureinstructions'); ?></p>
<div id="current_user_avatar">
diff --git a/mod/profile/views/default/profile/listing.php b/mod/profile/views/default/profile/listing.php
index 96b3d24d5..0622264b8 100644
--- a/mod/profile/views/default/profile/listing.php
+++ b/mod/profile/views/default/profile/listing.php
@@ -29,15 +29,15 @@ if ($rel_type) {
}
if (!$banned) {
- $info .= "<p class='entity_title user'><a href=\"" . $vars['entity']->getUrl() . "\" $rel>" . $vars['entity']->name . "</a></p>";
+ $info .= "<p class='entity-title user'><a href=\"" . $vars['entity']->getUrl() . "\" $rel>" . $vars['entity']->name . "</a></p>";
$location = $vars['entity']->location;
if (!empty($location)) {
- $info .= "<p class='entity_subtext user'>" . elgg_echo("profile:location") . ": " . elgg_view("output/tags",array('value' => $vars['entity']->location)) . "</p>";
+ $info .= "<p class='entity-subtext user'>" . elgg_echo("profile:location") . ": " . elgg_view("output/tags",array('value' => $vars['entity']->location)) . "</p>";
}
//create a view that a status plugin could extend - in the default case, this is the wire
$info .= elgg_view("profile/status", array("entity" => $vars['entity']));
}else{
- $info .= "<p class='entity_title user banned'>";
+ $info .= "<p class='entity-title user banned'>";
if (isadminloggedin())
$info .= "<a href=\"" . $vars['entity']->getUrl() . "\">";
$info .= $vars['entity']->name;
diff --git a/mod/profile/views/default/profile/profile_navigation.php b/mod/profile/views/default/profile/profile_navigation.php
index a27cf789d..ca0873ebd 100755
--- a/mod/profile/views/default/profile/profile_navigation.php
+++ b/mod/profile/views/default/profile/profile_navigation.php
@@ -45,7 +45,7 @@ switch($section){
break;
}
?>
-<div class="elgg_horizontal_tabbed_nav profile">
+<div class="elgg-horizontal-tabbed-nav profile">
<div class="profile_name"><h2><?php echo $user->name; ?></h2></div>
<ul>
<li <?php echo $activity; ?>><a href="<?php echo $url; ?>"><?php echo elgg_echo('activity'); ?></a></li>
diff --git a/mod/profile/views/default/river/user/default/profileiconupdate.php b/mod/profile/views/default/river/user/default/profileiconupdate.php
index 9e617573b..d7b15dab5 100644
--- a/mod/profile/views/default/river/user/default/profileiconupdate.php
+++ b/mod/profile/views/default/river/user/default/profileiconupdate.php
@@ -3,6 +3,6 @@
$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = elgg_echo("profile:river:update", array($url)) ." <span class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
+ $string = elgg_echo("profile:river:update", array($url)) ." <span class='entity-subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
echo $string; \ No newline at end of file
diff --git a/mod/profile/views/default/river/user/default/profileupdate.php b/mod/profile/views/default/river/user/default/profileupdate.php
index 156aa8b1b..155b25fa9 100644
--- a/mod/profile/views/default/river/user/default/profileupdate.php
+++ b/mod/profile/views/default/river/user/default/profileupdate.php
@@ -3,7 +3,7 @@
$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();
$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>";
- $string = elgg_echo("profile:river:update", array($url)) ." <span class='entity_subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
+ $string = elgg_echo("profile:river:update", array($url)) ." <span class='entity-subtext'>" . elgg_view_friendly_time($vars['item']->posted) . "</span>";
?>