From af2f3805095f8a91d85847e11faeb280fddf58c0 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Tue, 15 Feb 2011 01:27:40 +0000 Subject: Fixes #2921: converted internalname => name and internalid => id git-svn-id: http://code.elgg.org/elgg/trunk@8249 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/core/account/login_walled_garden.php | 4 ++-- views/default/core/friends/picker.php | 10 +++++----- views/default/core/river/controls.php | 2 +- views/default/core/river/filter.php | 2 +- views/default/core/river/footer.php | 2 +- views/default/core/settings/account/default_access.php | 2 +- views/default/core/settings/account/email.php | 2 +- views/default/core/settings/account/language.php | 2 +- views/default/core/settings/account/name.php | 4 ++-- views/default/core/settings/account/notifications.php | 2 +- views/default/core/settings/account/password.php | 6 +++--- 11 files changed, 19 insertions(+), 19 deletions(-) (limited to 'views/default/core') diff --git a/views/default/core/account/login_walled_garden.php b/views/default/core/account/login_walled_garden.php index 6bd028da6..93aa87782 100644 --- a/views/default/core/account/login_walled_garden.php +++ b/views/default/core/account/login_walled_garden.php @@ -4,7 +4,7 @@ */ $form_body = elgg_view('forms/login'); -$form_body .= elgg_view('input/hidden', array('internalname' => 'returntoreferer', 'value' => 'true')); +$form_body .= elgg_view('input/hidden', array('name' => 'returntoreferer', 'value' => 'true')); $login_url = elgg_get_site_url(); if (elgg_get_config('https_login')) { @@ -38,7 +38,7 @@ __HTML; " . elgg_echo('user:password:text') . ""; $lostpassword_form_body .= "
"; + . elgg_view('input/text', array('name' => 'username', 'class' => 'login-textarea lostusername')) . ""; $lostpassword_form_body .= elgg_view('input/captcha'); $lostpassword_form_body .= "
" . elgg_view('input/submit', array('value' => elgg_echo('request'))) . "
"; diff --git a/views/default/core/friends/picker.php b/views/default/core/friends/picker.php index 2d5976540..04a40d0d7 100644 --- a/views/default/core/friends/picker.php +++ b/views/default/core/friends/picker.php @@ -17,11 +17,11 @@ elgg_register_js($url, 'friendsPicker'); $chararray = elgg_echo('friendspicker:chararray'); -// Initialise internalname -if (!isset($vars['internalname'])) { - $internalname = "friend"; +// Initialise name +if (!isset($vars['name'])) { + $name = "friend"; } else { - $internalname = $vars['internalname']; + $name = $vars['name']; } // Are we highlighting default or all? @@ -204,7 +204,7 @@ if (!isset($vars['replacement'])) { - name="[]" value="" /> + name="[]" value="" /> diff --git a/views/default/core/river/controls.php b/views/default/core/river/controls.php index 37bfba91b..6f2be623c 100644 --- a/views/default/core/river/controls.php +++ b/views/default/core/river/controls.php @@ -15,7 +15,7 @@ if (elgg_is_logged_in()) { 'href' => '#', 'text' => elgg_echo('generic_comments:text'), 'class' => 'elgg-toggle', - 'internalid' => "elgg-toggler-{$object->getGUID()}", + 'id' => "elgg-toggler-{$object->getGUID()}", ); echo elgg_view('output/url', $params); diff --git a/views/default/core/river/filter.php b/views/default/core/river/filter.php index 74af9969b..aaa4beb89 100644 --- a/views/default/core/river/filter.php +++ b/views/default/core/river/filter.php @@ -24,7 +24,7 @@ if (!empty($registered_entities)) { } $params = array( - 'internalid' => 'elgg-river-selector', + 'id' => 'elgg-river-selector', 'options_values' => $options, ); $selector = $vars['selector']; diff --git a/views/default/core/river/footer.php b/views/default/core/river/footer.php index ee9d5dc58..ff960cebe 100644 --- a/views/default/core/river/footer.php +++ b/views/default/core/river/footer.php @@ -49,5 +49,5 @@ if ($comments) { // inline comment form echo elgg_view_form('comments/inline', array( 'action' => 'action/comments/add', - 'internalid' => "elgg-togglee-{$object->getGUID()}", + 'id' => "elgg-togglee-{$object->getGUID()}", ), array('entity' => $object)); diff --git a/views/default/core/settings/account/default_access.php b/views/default/core/settings/account/default_access.php index 67a0a4137..e33211460 100644 --- a/views/default/core/settings/account/default_access.php +++ b/views/default/core/settings/account/default_access.php @@ -22,7 +22,7 @@ if (elgg_get_config('allow_user_default_access')) { : 'default_access', 'value' => $default_access)); + echo elgg_view('input/access', array('name' => 'default_access', 'value' => $default_access)); ?>

diff --git a/views/default/core/settings/account/email.php b/views/default/core/settings/account/email.php index 3782d39a8..fda83e795 100644 --- a/views/default/core/settings/account/email.php +++ b/views/default/core/settings/account/email.php @@ -18,7 +18,7 @@ if ($user) {

: 'email', 'value' => $user->email)); + echo elgg_view('input/email',array('name' => 'email', 'value' => $user->email)); ?>

diff --git a/views/default/core/settings/account/language.php b/views/default/core/settings/account/language.php index a1e8d9886..3a992966f 100644 --- a/views/default/core/settings/account/language.php +++ b/views/default/core/settings/account/language.php @@ -19,7 +19,7 @@ if ($user) { : 'language', + 'name' => 'language', 'value' => $user->language, 'options_values' => get_installed_translations() )); diff --git a/views/default/core/settings/account/name.php b/views/default/core/settings/account/name.php index 22f950925..69ffcecaf 100644 --- a/views/default/core/settings/account/name.php +++ b/views/default/core/settings/account/name.php @@ -11,5 +11,5 @@ $user = elgg_get_page_owner_entity(); // all hidden, but necessary for properly updating user details -echo elgg_view('input/hidden', array('internalname' => 'name', 'value' => $user->name)); -echo elgg_view('input/hidden', array('internalname' => 'guid', 'value' => $user->guid)); +echo elgg_view('input/hidden', array('name' => 'name', 'value' => $user->name)); +echo elgg_view('input/hidden', array('name' => 'guid', 'value' => $user->guid)); diff --git a/views/default/core/settings/account/notifications.php b/views/default/core/settings/account/notifications.php index decf000ea..ae5fe40bb 100644 --- a/views/default/core/settings/account/notifications.php +++ b/views/default/core/settings/account/notifications.php @@ -36,7 +36,7 @@ $notification_settings = get_user_notification_settings(elgg_get_page_owner_guid } echo elgg_view('input/radio', array( - 'internalname' => "method[$k]", + 'name' => "method[$k]", 'value' => $val, 'options' => array( elgg_echo('option:yes') => 'yes', diff --git a/views/default/core/settings/account/password.php b/views/default/core/settings/account/password.php index 06e59dfbb..a80f3df6b 100644 --- a/views/default/core/settings/account/password.php +++ b/views/default/core/settings/account/password.php @@ -22,7 +22,7 @@ if ($user) {

: 'current_password')); + echo elgg_view('input/password', array('name' => 'current_password')); ?>

@@ -30,13 +30,13 @@ if ($user) {

: 'password')); + echo elgg_view('input/password', array('name' => 'password')); ?>

: 'password2')); + echo elgg_view('input/password', array('name' => 'password2')); ?>

-- cgit v1.2.3