aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-12 20:08:44 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-12 20:08:44 +0000
commitd4cab20408bcfa394ca978a16e09e6fd84539350 (patch)
tree1742a815ff4d19adc652f2a00e121e6c27a3472c /views
parent78f023b3b149e1f1c8c9428162e3b6551145b9e1 (diff)
downloadelgg-d4cab20408bcfa394ca978a16e09e6fd84539350.tar.gz
elgg-d4cab20408bcfa394ca978a16e09e6fd84539350.tar.bz2
Refs #3091 rewrote the js and css register functions to require a name
git-svn-id: http://code.elgg.org/elgg/trunk@8668 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/admin/plugins/advanced.php5
-rw-r--r--views/default/input/autocomplete.php2
-rw-r--r--views/default/input/friendspicker.php4
-rw-r--r--views/default/input/userpicker.php2
-rw-r--r--views/default/page/components/list.php5
5 files changed, 13 insertions, 5 deletions
diff --git a/views/default/admin/plugins/advanced.php b/views/default/admin/plugins/advanced.php
index 49e31d9c1..e78dbe2f1 100644
--- a/views/default/admin/plugins/advanced.php
+++ b/views/default/admin/plugins/advanced.php
@@ -85,7 +85,10 @@ $buttons .= $category_form;
<div id="elgg-plugin-list">
<?php
- echo elgg_view_entity_list($installed_plugins, 0, 0, 0, true, false, false);
+$options = array(
+
+);
+echo elgg_view_entity_list($installed_plugins, 0, 0, 0, true, false, false);
?>
</div> \ No newline at end of file
diff --git a/views/default/input/autocomplete.php b/views/default/input/autocomplete.php
index 61f338611..212333141 100644
--- a/views/default/input/autocomplete.php
+++ b/views/default/input/autocomplete.php
@@ -29,7 +29,7 @@ $ac_url_params = http_build_query(array(
unset($vars['match_on']);
unset($vars['match_owner']);
-elgg_register_js('js/lib/autocomplete.js', 'autocomplete', 'head');
+elgg_register_js('elgg.autocomplete', 'js/lib/autocomplete.js');
?>
diff --git a/views/default/input/friendspicker.php b/views/default/input/friendspicker.php
index 82ef3e3d7..b5f347e0c 100644
--- a/views/default/input/friendspicker.php
+++ b/views/default/input/friendspicker.php
@@ -11,8 +11,8 @@
* @uses $vars['entities'] The array of ElggUser objects
*/
-elgg_register_js('js/lib/friends_picker.js', 'friendspicker', 'head');
-elgg_register_js('vendors/jquery/jquery.easing.1.3.packed.js', 'jquery.easing');
+elgg_register_js('elgg.friendspicker', 'js/lib/friends_picker.js');
+elgg_register_js('jquery.easing', 'vendors/jquery/jquery.easing.1.3.packed.js');
$chararray = elgg_echo('friendspicker:chararray');
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index 77a51f37c..8280305b0 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -18,7 +18,7 @@
*
*/
-elgg_register_js('js/lib/userpicker.js', 'userpicker', 'head');
+elgg_register_js('elgg.userpicker', 'js/lib/userpicker.js');
function user_picker_add_user($user_id) {
$user = get_entity($user_id);
diff --git a/views/default/page/components/list.php b/views/default/page/components/list.php
index ae951c89f..5e8c8432d 100644
--- a/views/default/page/components/list.php
+++ b/views/default/page/components/list.php
@@ -25,6 +25,11 @@ $pagination = elgg_extract('pagination', $vars, true);
$offset_key = elgg_extract('offset_key', $vars, 'offset');
$position = elgg_extract('position', $vars, 'after');
+// @todo standardize on full - will require backward compatible code
+if (isset($vars['full_view'])) {
+ $vars['full'] = $vars['full_view'];
+}
+
$list_class = 'elgg-list';
if (isset($vars['list_class'])) {
$list_class = "{$vars['list_class']} $list_class";