Skip to content
This repository has been archived by the owner on Jun 2, 2023. It is now read-only.

Commit

Permalink
Refs #2700 replaced most underscores with hyphens - there may be brok…
Browse files Browse the repository at this point in the history
…en display code due to extent of this change

git-svn-id: http://code.elgg.org/elgg/trunk/mod/profile@7493 36083f99-b078-4883-b0ff-0f9b5a30f544
  • Loading branch information
cash committed Dec 2, 2010
1 parent 1eb8f7d commit 78e61c8
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion views/default/profile/commentwall/commentwall.php
Expand Up @@ -12,7 +12,7 @@
echo elgg_view("profile/commentwall/commentwall_content", array('annotation' => $content)); echo elgg_view("profile/commentwall/commentwall_content", array('annotation' => $content));
} }
} else { } 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 //close the wrapper div
echo "</div>"; echo "</div>";
10 changes: 5 additions & 5 deletions views/default/profile/commentwall/commentwall_content.php
Expand Up @@ -3,27 +3,27 @@
* Elgg Message board individual item display page * 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 --> <!-- display the user icon of the user that posted the message -->
<div class="entity_listing_icon"> <div class="entity-listing-icon">
<?php <?php
echo elgg_view("profile/icon",array('entity' => get_entity($vars['annotation']->owner_guid), 'size' => 'tiny')); echo elgg_view("profile/icon",array('entity' => get_entity($vars['annotation']->owner_guid), 'size' => 'tiny'));
?> ?>
</div> </div>


<div class="entity_listing_info"> <div class="entity-listing-info">
<?php <?php
// if the user looking at the comment can edit, show the delete link // if the user looking at the comment can edit, show the delete link
if ($vars['annotation']->canEdit()) { 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, 'href' => "action/profile/deletecomment?annotation_id=" . $vars['annotation']->id,
'text' => elgg_echo('delete'), 'text' => elgg_echo('delete'),
'confirm' => elgg_echo('deleteconfirm'), 'confirm' => elgg_echo('deleteconfirm'),
)) . "</span></div>"; )) . "</span></div>";
} //end of can edit if statement } //end of can edit if statement
?> ?>
<!-- display the user's name who posted and the date/time --> <!-- 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); ?> <?php echo get_entity($vars['annotation']->owner_guid)->name . " " . elgg_view_friendly_time($vars['annotation']->time_created); ?>
</p> </p>
<!-- output the actual comment --> <!-- output the actual comment -->
Expand Down
18 changes: 9 additions & 9 deletions views/default/profile/css.php
Expand Up @@ -17,22 +17,22 @@
width:230px; width:230px;
float:left; float:left;
} }
.elgg_horizontal_tabbed_nav.profile { .elgg-horizontal-tabbed-nav.profile {
margin-top:0px; margin-top:0px;
margin-bottom:25px; margin-bottom:25px;
position:relative; position:relative;
} }
.elgg_horizontal_tabbed_nav.profile .profile_name { .elgg-horizontal-tabbed-nav.profile .profile_name {
display:block; display:block;
width:265px; width:265px;
position:absolute; position:absolute;
} }
.elgg_horizontal_tabbed_nav.profile .profile_name h2 { .elgg-horizontal-tabbed-nav.profile .profile_name h2 {
margin:0; margin:0;
padding:0; padding:0;
border:none; border:none;
} }
.elgg_horizontal_tabbed_nav.profile ul { .elgg-horizontal-tabbed-nav.profile ul {
margin-left:260px; margin-left:260px;
} }


Expand Down Expand Up @@ -89,7 +89,7 @@
padding:15px; padding:15px;
min-height:270px; min-height:270px;
} }
#elgg_sidebar #owner_block { #elgg-sidebar #owner_block {
background-color: white; background-color: white;
-webkit-border-radius: 8px; -webkit-border-radius: 8px;
-moz-border-radius: 8px; -moz-border-radius: 8px;
Expand All @@ -110,7 +110,7 @@
#owner_block .owner_block_contents { #owner_block .owner_block_contents {
margin-left: 50px; margin-left: 50px;
} }
#elgg_sidebar #owner_block .owner_block_contents { #elgg-sidebar #owner_block .owner_block_contents {
margin-left: 34px; margin-left: 34px;
} }
#owner_block .owner_block_contents h3 { #owner_block .owner_block_contents h3 {
Expand Down Expand Up @@ -249,7 +249,7 @@
/* *************************************** /* ***************************************
friends panel within profile friends panel within profile
*************************************** */ *************************************** */
#profile_content .entity_listing .entity_listing_info { #profile_content .entity-listing .entity-listing-info {
width:664px; width:664px;
} }


Expand Down Expand Up @@ -351,10 +351,10 @@
-moz-border-radius: 6px; -moz-border-radius: 6px;
} }
/* banned user in friends lists */ /* 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; text-decoration: line-through;
} }
.entity_listing_info p.entity_title.user.banned a { .entity-listing-info p.entity-title.user.banned a {
color:red; color:red;
} }


Expand Down
2 changes: 1 addition & 1 deletion views/default/profile/edit.php
Expand Up @@ -8,7 +8,7 @@
* @uses $vars['profile'] Profile items from $CONFIG->profile, defined in profile/start.php for now * @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') ?> <?php echo elgg_view('input/securitytoken') ?>


<p><label> <p><label>
Expand Down
2 changes: 1 addition & 1 deletion views/default/profile/editdefaultprofile.php
Expand Up @@ -25,5 +25,5 @@
$submit_control</p> $submit_control</p>
END; 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')); echo elgg_view('input/form', array('body' => $formbody, 'action' => 'action/profile/editdefault'));
2 changes: 1 addition & 1 deletion views/default/profile/editdefaultprofileitems.php
Expand Up @@ -51,7 +51,7 @@ function sortCallback(event, ui) {
//$even_odd = ( 'odd' != $even_odd ) ? 'odd' : 'even'; //$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}"); $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 "<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 "<b class=\"profile_field_editable\"><span class=\"{$item->shortname}_editable\">$item->translation</span></b>: [".elgg_echo($item->type)."]";
echo "</li>"; echo "</li>";


Expand Down
2 changes: 1 addition & 1 deletion views/default/profile/editicon.php
Expand Up @@ -15,7 +15,7 @@
<!-- grab the required js for icon cropping --> <!-- 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> <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"> <div id="current_user_avatar">


Expand Down
6 changes: 3 additions & 3 deletions views/default/profile/listing.php
Expand Up @@ -29,15 +29,15 @@
} }


if (!$banned) { 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; $location = $vars['entity']->location;
if (!empty($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 //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'])); $info .= elgg_view("profile/status", array("entity" => $vars['entity']));
}else{ }else{
$info .= "<p class='entity_title user banned'>"; $info .= "<p class='entity-title user banned'>";
if (isadminloggedin()) if (isadminloggedin())
$info .= "<a href=\"" . $vars['entity']->getUrl() . "\">"; $info .= "<a href=\"" . $vars['entity']->getUrl() . "\">";
$info .= $vars['entity']->name; $info .= $vars['entity']->name;
Expand Down
2 changes: 1 addition & 1 deletion views/default/profile/profile_navigation.php
Expand Up @@ -45,7 +45,7 @@
break; 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> <div class="profile_name"><h2><?php echo $user->name; ?></h2></div>
<ul> <ul>
<li <?php echo $activity; ?>><a href="<?php echo $url; ?>"><?php echo elgg_echo('activity'); ?></a></li> <li <?php echo $activity; ?>><a href="<?php echo $url; ?>"><?php echo elgg_echo('activity'); ?></a></li>
Expand Down
2 changes: 1 addition & 1 deletion views/default/river/user/default/profileiconupdate.php
Expand Up @@ -3,6 +3,6 @@
$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();


$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; $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; echo $string;
2 changes: 1 addition & 1 deletion views/default/river/user/default/profileupdate.php
Expand Up @@ -3,7 +3,7 @@
$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject();


$url = "<a href=\"{$performed_by->getURL()}\">{$performed_by->name}</a>"; $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>";


?> ?>


Expand Down

0 comments on commit 78e61c8

Please sign in to comment.