From 78e61c892c61278f97ce5f5ca50242c8fc8d54e3 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Thu, 2 Dec 2010 03:10:57 +0000 Subject: [PATCH] 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/mod/profile@7493 36083f99-b078-4883-b0ff-0f9b5a30f544 --- .../profile/commentwall/commentwall.php | 2 +- .../commentwall/commentwall_content.php | 10 +++++----- views/default/profile/css.php | 18 +++++++++--------- views/default/profile/edit.php | 2 +- views/default/profile/editdefaultprofile.php | 2 +- .../profile/editdefaultprofileitems.php | 2 +- views/default/profile/editicon.php | 2 +- views/default/profile/listing.php | 6 +++--- views/default/profile/profile_navigation.php | 2 +- .../river/user/default/profileiconupdate.php | 2 +- .../river/user/default/profileupdate.php | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/views/default/profile/commentwall/commentwall.php b/views/default/profile/commentwall/commentwall.php index a45c3ad..56670dc 100644 --- a/views/default/profile/commentwall/commentwall.php +++ b/views/default/profile/commentwall/commentwall.php @@ -12,7 +12,7 @@ echo elgg_view("profile/commentwall/commentwall_content", array('annotation' => $content)); } } else { - echo "

" . elgg_echo("profile:commentwall:none") . "

"; + echo "

" . elgg_echo("profile:commentwall:none") . "

"; } //close the wrapper div echo ""; \ No newline at end of file diff --git a/views/default/profile/commentwall/commentwall_content.php b/views/default/profile/commentwall/commentwall_content.php index a7a7ca1..a0785b5 100644 --- a/views/default/profile/commentwall/commentwall_content.php +++ b/views/default/profile/commentwall/commentwall_content.php @@ -3,19 +3,19 @@ * Elgg Message board individual item display page */ ?> -
+
-
+
get_entity($vars['annotation']->owner_guid), 'size' => 'tiny')); ?>
-
+
canEdit()) { - echo "
" . elgg_view("output/confirmlink",array( + echo "
" . 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 ?> -

+

owner_guid)->name . " " . elgg_view_friendly_time($vars['annotation']->time_created); ?>

diff --git a/views/default/profile/css.php b/views/default/profile/css.php index d1941bb..537d926 100644 --- a/views/default/profile/css.php +++ b/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 @@ 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 @@ #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 @@ /* *************************************** friends panel within profile *************************************** */ -#profile_content .entity_listing .entity_listing_info { +#profile_content .entity-listing .entity-listing-info { width:664px; } @@ -351,10 +351,10 @@ -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/views/default/profile/edit.php b/views/default/profile/edit.php index 4ca7233..2e3ec24 100644 --- a/views/default/profile/edit.php +++ b/views/default/profile/edit.php @@ -8,7 +8,7 @@ * @uses $vars['profile'] Profile items from $CONFIG->profile, defined in profile/start.php for now */ ?> -
+

END; -echo "

" . elgg_echo('profile:explainchangefields') . "

"; +echo "

" . elgg_echo('profile:explainchangefields') . "

"; echo elgg_view('input/form', array('body' => $formbody, 'action' => 'action/profile/editdefault')); diff --git a/views/default/profile/editdefaultprofileitems.php b/views/default/profile/editdefaultprofileitems.php index 4c093cb..29ce7f1 100644 --- a/views/default/profile/editdefaultprofileitems.php +++ b/views/default/profile/editdefaultprofileitems.php @@ -51,7 +51,7 @@ function sortCallback(event, ui) { //$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 "
  • shortname}\">
    " . elgg_echo('delete') . "
    "; - echo "move"; + echo "move"; echo "shortname}_editable\">$item->translation: [".elgg_echo($item->type)."]"; echo "
    • "; diff --git a/views/default/profile/editicon.php b/views/default/profile/editicon.php index 9e1987d..9eeaecb 100644 --- a/views/default/profile/editicon.php +++ b/views/default/profile/editicon.php @@ -15,7 +15,7 @@ -

    +

    diff --git a/views/default/profile/listing.php b/views/default/profile/listing.php index 96b3d24..0622264 100644 --- a/views/default/profile/listing.php +++ b/views/default/profile/listing.php @@ -29,15 +29,15 @@ } if (!$banned) { - $info .= "

    getUrl() . "\" $rel>" . $vars['entity']->name . "

    "; + $info .= "

    getUrl() . "\" $rel>" . $vars['entity']->name . "

    "; $location = $vars['entity']->location; if (!empty($location)) { - $info .= "

    " . elgg_echo("profile:location") . ": " . elgg_view("output/tags",array('value' => $vars['entity']->location)) . "

    "; + $info .= "

    " . elgg_echo("profile:location") . ": " . elgg_view("output/tags",array('value' => $vars['entity']->location)) . "

    "; } //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 .= "

    "; + $info .= "

    "; if (isadminloggedin()) $info .= "getUrl() . "\">"; $info .= $vars['entity']->name; diff --git a/views/default/profile/profile_navigation.php b/views/default/profile/profile_navigation.php index a27cf78..ca0873e 100755 --- a/views/default/profile/profile_navigation.php +++ b/views/default/profile/profile_navigation.php @@ -45,7 +45,7 @@ break; } ?> -

    +

    name; ?>

    • >
      • diff --git a/views/default/river/user/default/profileiconupdate.php b/views/default/river/user/default/profileiconupdate.php index 9e61757..d7b15da 100644 --- a/views/default/river/user/default/profileiconupdate.php +++ b/views/default/river/user/default/profileiconupdate.php @@ -3,6 +3,6 @@ $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); $url = "getURL()}\">{$performed_by->name}"; - $string = elgg_echo("profile:river:update", array($url)) ." " . elgg_view_friendly_time($vars['item']->posted) . ""; + $string = elgg_echo("profile:river:update", array($url)) ." " . elgg_view_friendly_time($vars['item']->posted) . ""; echo $string; \ No newline at end of file diff --git a/views/default/river/user/default/profileupdate.php b/views/default/river/user/default/profileupdate.php index 156aa8b..155b25f 100644 --- a/views/default/river/user/default/profileupdate.php +++ b/views/default/river/user/default/profileupdate.php @@ -3,7 +3,7 @@ $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); $url = "getURL()}\">{$performed_by->name}"; - $string = elgg_echo("profile:river:update", array($url)) ." " . elgg_view_friendly_time($vars['item']->posted) . ""; + $string = elgg_echo("profile:river:update", array($url)) ." " . elgg_view_friendly_time($vars['item']->posted) . ""; ?>