From 8048313e87b9fd5ab6734e29a0e951524fa33e45 Mon Sep 17 00:00:00 2001 From: brettp Date: Fri, 16 Oct 2009 19:26:37 +0000 Subject: Standardized more files. git-svn-id: http://code.elgg.org/elgg/trunk@3554 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/friends/collection.php | 110 +++--- views/default/friends/collections.php | 84 ++--- views/default/friends/collectiontabs.php | 31 +- views/default/friends/forms/collectionfields.php | 30 +- views/default/friends/forms/edit.php | 110 +++--- views/default/friends/list.php | 41 +- views/default/friends/picker.php | 459 +++++++++++------------ views/default/friends/river/create.php | 36 +- 8 files changed, 436 insertions(+), 465 deletions(-) (limited to 'views/default/friends') diff --git a/views/default/friends/collection.php b/views/default/friends/collection.php index 812623cb1..deadb2f6a 100644 --- a/views/default/friends/collection.php +++ b/views/default/friends/collection.php @@ -1,60 +1,56 @@ members)) { + $count = sizeof($vars['collection']->members); +} else { + $count = 0; +} + +echo "

  • "; + +//as collections are private, check that the logged in user is the owner +if($coll->owner_guid == $_SESSION['user']->getGUID()) { + echo "
    "; + echo elgg_view('output/confirmlink', array( + 'href' => $vars['url'] . 'action/friends/deletecollection?collection=' . $coll->id, + 'class' => 'delete_collection' + )); + echo "
    "; +} +echo $coll->name; +echo " ({$count})

    "; + +// individual collection panels +if($friends = $vars['collection']->entities) { + $content = elgg_view('friends/collectiontabs', array('owner' => $_SESSION['user'], 'collection' => $vars['collection'], 'friendspicker' => $vars['friendspicker'])); + + echo elgg_view('friends/picker',array('entities' => $friends, 'value' => $members, 'content' => $content, 'replacement' => '', 'friendspicker' => $vars['friendspicker'])); + ?> + + - "; - -?> \ No newline at end of file + + "; diff --git a/views/default/friends/collections.php b/views/default/friends/collections.php index c785cd68e..a013dc1da 100644 --- a/views/default/friends/collections.php +++ b/views/default/friends/collections.php @@ -1,53 +1,45 @@ "; + +if (is_array($vars['collections']) && sizeof($vars['collections'])) { + echo ""; + +} else { + echo elgg_echo("friends:nocollections"); +} + +echo ""; - /** - * Elgg friends collections - * Lists a user's friends collections - * - * @package Elgg - * @subpackage Core - - * @author Curverider Ltd - - * @link http://elgg.org/ - * - * @uses $vars['collections'] The array of friends collections - */ - - if (!isset($friendspicker)) $friendspicker = 0; - - echo "
    "; - - if (is_array($vars['collections']) && sizeof($vars['collections'])) { - - echo "
      "; - - foreach($vars['collections'] as $collection) { - - $friendspicker++; - echo elgg_view('friends/collection',array('collection' => $collection, 'friendspicker' => $friendspicker)); - - } - - echo "
    "; - - } else { - - echo elgg_echo("friends:nocollections"); - - } - - echo "
    "; - ?> \ No newline at end of file + diff --git a/views/default/friends/collectiontabs.php b/views/default/friends/collectiontabs.php index a4ad59866..8f3c684a8 100644 --- a/views/default/friends/collectiontabs.php +++ b/views/default/friends/collectiontabs.php @@ -1,10 +1,21 @@ id; +$ownerid = $vars['owner']->getGUID(); - $friendspicker = $vars['friendspicker']; - - $collectionid = $vars['collection']->id; - $ownerid = $vars['owner']->getGUID(); - ?>
    @@ -22,14 +33,14 @@ $(document).ready(function () { $('a.collectionmembers').click(function () { // load collection members pane $('#friends_picker_placeholder').load('friends/pickercallback.php?username=username; ?>&type=list&collection=&friendspicker='); - + // remove selected state from previous tab $(this).parent().parent().find("li.selected").removeClass("selected"); // add selected class to current tab $(this).parent().addClass("selected"); - + return false; - }); + }); $('a.editmembers').click(function () { // load friends picker pane @@ -39,9 +50,9 @@ $(document).ready(function () { $(this).parent().parent().find("li.selected").removeClass("selected"); // add selected class to current tab $(this).parent().addClass("selected"); - + return false; - }); + }); }); diff --git a/views/default/friends/forms/collectionfields.php b/views/default/friends/forms/collectionfields.php index bec7212ee..f9d8ac5ff 100644 --- a/views/default/friends/forms/collectionfields.php +++ b/views/default/friends/forms/collectionfields.php @@ -1,23 +1,17 @@ - + \ No newline at end of file +} \ No newline at end of file diff --git a/views/default/friends/forms/edit.php b/views/default/friends/forms/edit.php index c35bcaba3..5751950d8 100644 --- a/views/default/friends/forms/edit.php +++ b/views/default/friends/forms/edit.php @@ -1,59 +1,55 @@ id); - - // Set title, form destination - if (isset($vars['collection'])) { - $action = "friends/editcollection"; - $title = $vars['collection'][0]->name; - $highlight = 'default'; - } else { - $action = "friends/addcollection"; - $title = ""; - $highlight = 'all'; - } - - - $form_body = "

    "; - - $form_body .= "

    "; - - if($vars['collection_members']){ - $form_body .= elgg_echo("friends:collectionfriends") . "
    "; - foreach($vars['collection_members'] as $mem){ - - $form_body .= elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny')); - $form_body .= $mem->name; - - } - } - - $form_body .= "

    "; - - $form_body .= "

    ". - elgg_view('friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "

    "; - - $form_body .= "

    "; - if (isset($vars['collection'])) { - $form_body .= elgg_view('input/hidden', array('internalname' => 'collection_id', 'value' => "{$vars['collection'][0]->id}")); - } - $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save'))); - $form_body .= "

    "; - - echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/$action")); -?> \ No newline at end of file +// var_export($vars['collection'][0]->id); + +// Set title, form destination +if (isset($vars['collection'])) { + $action = "friends/editcollection"; + $title = $vars['collection'][0]->name; + $highlight = 'default'; +} else { + $action = "friends/addcollection"; + $title = ""; + $highlight = 'all'; +} + + +$form_body = "

    "; + +$form_body .= "

    "; + +if($vars['collection_members']){ + $form_body .= elgg_echo("friends:collectionfriends") . "
    "; + foreach($vars['collection_members'] as $mem){ + $form_body .= elgg_view("profile/icon",array('entity' => $mem, 'size' => 'tiny')); + $form_body .= $mem->name; + } +} + +$form_body .= "

    "; + +$form_body .= "

    ". + elgg_view('friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection', 'highlight' => $highlight)) . "

    "; + +$form_body .= "

    "; +if (isset($vars['collection'])) { + $form_body .= elgg_view('input/hidden', array('internalname' => 'collection_id', 'value' => "{$vars['collection'][0]->id}")); +} +$form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save'))); +$form_body .= "

    "; + +echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/$action")); \ No newline at end of file diff --git a/views/default/friends/list.php b/views/default/friends/list.php index 3907479bd..7bc42a015 100644 --- a/views/default/friends/list.php +++ b/views/default/friends/list.php @@ -1,27 +1,18 @@ 0) { - - foreach($vars['friends'] as $friend) { - - echo elgg_view_entity($friend); - - } - - } - -?> \ No newline at end of file +if (is_array($vars['friends']) && sizeof($vars['friends']) > 0) { + foreach($vars['friends'] as $friend) { + echo elgg_view_entity($friend); + } +} \ No newline at end of file diff --git a/views/default/friends/picker.php b/views/default/friends/picker.php index 319088601..1ac8b23af 100644 --- a/views/default/friends/picker.php +++ b/views/default/friends/picker.php @@ -1,115 +1,110 @@ name,0,1)); } else { - $internalname = $vars['internalname']; - } - - // Are we highlighting default or all? - if (empty($vars['highlight'])) $vars['highlight'] = 'default'; - if ($vars['highlight'] != 'all') $vars['highlight'] = 'default'; - - // Initialise values - if (!isset($vars['value'])) { - $vars['value'] = array(); - } else { - if (!is_array($vars['value'])) { - $vars['value'] = (int) $vars['value']; - $vars['value'] = array($vars['value']); - } + $letter = strtoupper(substr($user->name,0,1)); } - // Initialise whether we're calling back or not - if (isset($vars['callback'])) { - $callback = $vars['callback']; - } else { - $callback = false; + if (!substr_count($chararray,$letter)) { + $letter = "*"; } - - // We need to count the number of friends pickers on the page. - if (!isset($vars['friendspicker'])) { - global $friendspicker; - if (!isset($friendspicker)) $friendspicker = 0; - $friendspicker++; - } else { - $friendspicker = $vars['friendspicker']; + if (!isset($users[$letter])) { + $users[$letter] = array(); } + $users[$letter][$user->name] = $user; + } +} - $users = array(); - $activeletters = array(); - - // Are we displaying form tags and submit buttons? - // (If we've been given a target, then yes! Otherwise, no.) - if (isset($vars['formtarget'])) { - $formtarget = $vars['formtarget']; - } else { - $formtarget = false; - } - - // Sort users by letter - if (is_array($vars['entities']) && sizeof($vars['entities'])) - foreach($vars['entities'] as $user) { - - if (is_callable('mb_substr')) - $letter = strtoupper(mb_substr($user->name,0,1)); - else - $letter = strtoupper(substr($user->name,0,1)); - if (!substr_count($chararray,$letter)) { - $letter = "*"; - } - if (!isset($users[$letter])) { - $users[$letter] = array(); - } - $users[$letter][$user->name] = $user; - - } - - if (!$callback) { - -?> - -
    +if (!$callback) { + ?> - - if (isset($vars['content'])) echo $vars['content']; + + if (isset($vars['content'])) { + echo $vars['content']; + } + ?>
    - - - -
    + + -
    -
    -
    +
    +
    +
    -
    -
    -

    - -"; - $col = 0; - - foreach($users[$letter] as $friend) { - if ($col == 0) echo ""; - - //echo "

    " . $user->name . "

    "; - $label = elgg_view("profile/icon",array('entity' => $friend, 'size' => 'tiny', 'override' => true)); - $options[$label] = $friend->getGUID(); - - if ($vars['highlight'] == 'all' - && !in_array($letter,$activeletters)) { - $activeletters[] = $letter; - } - - - if (in_array($friend->getGUID(),$vars['value'])) { - $checked = "checked = \"checked\""; - if ( - !in_array($letter,$activeletters) - && $vars['highlight'] == 'default' - ) - $activeletters[] = $letter; - } else { - $checked = ""; - } +// Initialise letters + $chararray .= "*"; + if (is_callable('mb_substr')) { + $letter = mb_substr($chararray,0,1); + } else { + $letter = substr($chararray,0,1); + } + $letpos = 0; + while (1 == 1) { + ?> +
    +
    +

    + "; + $col = 0; + + foreach($users[$letter] as $friend) { + if ($col == 0) { + echo ""; + } -?> + //echo "

    " . $user->name . "

    "; + $label = elgg_view("profile/icon",array('entity' => $friend, 'size' => 'tiny', 'override' => true)); + $options[$label] = $friend->getGUID(); - - - name="[]" value="" /> - - + if ($vars['highlight'] == 'all' + && !in_array($letter,$activeletters)) { - - -
    - -
    - - -name; - -?> - -"; - $col = 0; + if (in_array($friend->getGUID(),$vars['value'])) { + $checked = "checked = \"checked\""; + if (!in_array($letter,$activeletters) && $vars['highlight'] == 'default') { + $activeletters[] = $letter; } + } else { + $checked = ""; } - if ($col < 3) echo ""; - - echo ""; - + ?> + + + + name="[]" value="" /> + + + + + +
    + +
    + + + name; ?> + + "; + $col = 0; + } + } + if ($col < 3) { + echo ""; } + echo ""; + } + ?> - -
    +
    - + -
    - +
    + -
    -
    - - -
    - - +
    +
    + + +
    + + - -
    -
    - + +
    +
    + - -
    + +
    \ No newline at end of file +} \ No newline at end of file diff --git a/views/default/friends/river/create.php b/views/default/friends/river/create.php index 04947568b..e577ba721 100644 --- a/views/default/friends/river/create.php +++ b/views/default/friends/river/create.php @@ -1,19 +1,23 @@ + * @link http://elgg.com/ + * + * @uses $vars['entity'] + */ +$performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); +$performed_on = get_entity($vars['item']->object_guid); +$url = $performed_on->getURL(); - $performed_by = get_entity($vars['item']->subject_guid); // $statement->getSubject(); - $performed_on = get_entity($vars['item']->object_guid); - $url = $performed_on->getURL(); +$url = "getURL()}\">{$performed_by->name}"; +$string = sprintf(elgg_echo("friends:river:add"),$url) . " "; +$string .= "getURL()}\">{$performed_on->name}"; +$string .= "
    "; +$string .= ""; +$string .= "
    " . elgg_view("profile/icon",array('entity' => $performed_by, 'size' => 'small')) . "
    		" . elgg_view("profile/icon",array('entity' => $performed_on, 'size' => 'small')) . "
    "; +$string .= "
    "; - $url = "getURL()}\">{$performed_by->name}"; - $string = sprintf(elgg_echo("friends:river:add"),$url) . " "; - $string .= "getURL()}\">{$performed_on->name}"; - $string .= "
    "; - $string .= ""; - $string .= "
    " . elgg_view("profile/icon",array('entity' => $performed_by, 'size' => 'small')) . "
    		" . elgg_view("profile/icon",array('entity' => $performed_on, 'size' => 'small')) . "
    "; - $string .= "
    "; - -?> - - \ No newline at end of file +echo $string; \ No newline at end of file -- cgit v1.2.3