diff options
author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-02 03:10:57 +0000 |
---|---|---|
committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-12-02 03:10:57 +0000 |
commit | 4d80bc33b8924038bd1ca57d548828afe661bb42 (patch) | |
tree | 600b8a2d46ea899d35582667ed00049a0a4367cc /views/default/friends | |
parent | 89ded32abebd0f2100e0014249df54bde7a44258 (diff) | |
download | elgg-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 'views/default/friends')
-rw-r--r-- | views/default/friends/collection.php | 4 | ||||
-rw-r--r-- | views/default/friends/collections.php | 2 | ||||
-rw-r--r-- | views/default/friends/collectiontabs.php | 6 | ||||
-rw-r--r-- | views/default/friends/picker.php | 16 |
4 files changed, 14 insertions, 14 deletions
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 } |