aboutsummaryrefslogtreecommitdiff
path: root/views/default/user
diff options
context:
space:
mode:
Diffstat (limited to 'views/default/user')
-rw-r--r--views/default/user/default.php37
-rw-r--r--views/default/user/search/finishblurb.php18
-rw-r--r--views/default/user/search/startblurb.php17
-rw-r--r--views/default/user/settings/default_access.php52
-rw-r--r--views/default/user/settings/email.php41
-rw-r--r--views/default/user/settings/language.php60
-rw-r--r--views/default/user/settings/name.php11
-rw-r--r--views/default/user/settings/password.php45
8 files changed, 143 insertions, 138 deletions
diff --git a/views/default/user/default.php b/views/default/user/default.php
index 0e83b5fb0..8e48b13f6 100644
--- a/views/default/user/default.php
+++ b/views/default/user/default.php
@@ -1,23 +1,18 @@
<?php
+/**
+ * Elgg user display
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @link http://elgg.org/
+ */
- /**
- * Elgg user display
- *
- * @package Elgg
- * @subpackage Core
-
-
- * @link http://elgg.org/
- */
-
- if ($vars['full']) {
- echo elgg_view("profile/userdetails",$vars);
- } else {
- if (get_input('search_viewtype') == "gallery") {
- echo elgg_view('profile/gallery',$vars);
- } else {
- echo elgg_view("profile/listing",$vars);
- }
- }
-
-?> \ No newline at end of file
+if ($vars['full']) {
+ echo elgg_view("profile/userdetails",$vars);
+} else {
+ if (get_input('search_viewtype') == "gallery") {
+ echo elgg_view('profile/gallery',$vars);
+ } else {
+ echo elgg_view("profile/listing",$vars);
+ }
+}
diff --git a/views/default/user/search/finishblurb.php b/views/default/user/search/finishblurb.php
index 2b44c3dfc..58c8655e8 100644
--- a/views/default/user/search/finishblurb.php
+++ b/views/default/user/search/finishblurb.php
@@ -1,15 +1,17 @@
<?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
- if ($vars['count'] > $vars['threshold']) {
+if ($vars['count'] > $vars['threshold']) {
?>
-<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php
-
- echo elgg_echo("user:search:finishblurb");
-
+<div class="contentWrapper"><a href="<?php echo $vars['url']; ?>pg/search/users/?tag=<?php echo urlencode($vars['tag']); ?>"><?php
+ echo elgg_echo("user:search:finishblurb");
?></a></div>
<?php
- }
-
-?> \ No newline at end of file
+} \ No newline at end of file
diff --git a/views/default/user/search/startblurb.php b/views/default/user/search/startblurb.php
index fa855aa13..37c2ff818 100644
--- a/views/default/user/search/startblurb.php
+++ b/views/default/user/search/startblurb.php
@@ -1,8 +1,15 @@
-
+<?php
+/**
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+?>
<div class="contentWrapper">
- <?php
-
- echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']);
-
+ <?php
+
+ echo sprintf(elgg_echo("user:search:startblurb"),$vars['tag']);
+
?>
</div> \ No newline at end of file
diff --git a/views/default/user/settings/default_access.php b/views/default/user/settings/default_access.php
index d5df5e426..3a6e6842c 100644
--- a/views/default/user/settings/default_access.php
+++ b/views/default/user/settings/default_access.php
@@ -1,30 +1,30 @@
<?php
- /**
- * Provide a way of setting your default access
- *
- * @package Elgg
- * @subpackage Core
+/**
+ * Provide a way of setting your default access
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+if ($vars['config']->allow_user_default_access) {
+ $user = page_owner_entity();
- * @author Curverider Ltd
+ if ($user) {
+ if (false === ($default_access = $user->getPrivateSetting('elgg_default_access'))) {
+ $default_access = $vars['config']->default_access;
+ }
+?>
+ <h3><?php echo elgg_echo('default_access:settings'); ?></h3>
+ <p>
+ <?php echo elgg_echo('default_access:label'); ?>:
+ <?php
- * @link http://elgg.org/
- */
- if ($vars['config']->allow_user_default_access) {
- $user = page_owner_entity();
-
- if ($user) {
- if (false === ($default_access = $user->getPrivateSetting('elgg_default_access'))) {
- $default_access = $vars['config']->default_access;
- }
- ?>
- <h3><?php echo elgg_echo('default_access:settings'); ?></h3>
- <p>
- <?php echo elgg_echo('default_access:label'); ?>:
- <?php
-
- echo elgg_view('input/access',array('internalname' => 'default_access', 'value' => $default_access));
-
- ?>
- </p>
+ echo elgg_view('input/access',array('internalname' => 'default_access', 'value' => $default_access));
-<?php }} ?> \ No newline at end of file
+ ?>
+ </p>
+
+<?php
+ }
+} \ No newline at end of file
diff --git a/views/default/user/settings/email.php b/views/default/user/settings/email.php
index 60f2f7acd..699f72583 100644
--- a/views/default/user/settings/email.php
+++ b/views/default/user/settings/email.php
@@ -1,27 +1,26 @@
<?php
- /**
- * Provide a way of setting your email
- *
- * @package Elgg
- * @subpackage Core
+/**
+ * Provide a way of setting your email
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
- * @author Curverider Ltd
+$user = page_owner_entity();
- * @link http://elgg.org/
- */
-
- $user = page_owner_entity();
-
- if ($user) {
+if ($user) {
?>
- <h3><?php echo elgg_echo('email:settings'); ?></h3>
- <p>
- <?php echo elgg_echo('email:address:label'); ?>:
- <?php
+<h3><?php echo elgg_echo('email:settings'); ?></h3>
+<p>
+ <?php echo elgg_echo('email:address:label'); ?>:
+ <?php
+
+ echo elgg_view('input/email',array('internalname' => 'email', 'value' => $user->email));
- echo elgg_view('input/email',array('internalname' => 'email', 'value' => $user->email));
-
- ?>
- </p>
+ ?>
+</p>
-<?php } ?> \ No newline at end of file
+<?php
+} \ No newline at end of file
diff --git a/views/default/user/settings/language.php b/views/default/user/settings/language.php
index fa5dec0fa..a7a66e5c2 100644
--- a/views/default/user/settings/language.php
+++ b/views/default/user/settings/language.php
@@ -1,31 +1,33 @@
<?php
- /**
- * Provide a way of setting your language prefs
- *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
- */
-
- global $CONFIG;
- $user = page_owner_entity();
-
- if ($user) {
+/**
+ * Provide a way of setting your language prefs
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
+
+global $CONFIG;
+$user = page_owner_entity();
+
+if ($user) {
?>
- <h3><?php echo elgg_echo('user:set:language'); ?></h3>
- <p>
-
- <?php echo elgg_echo('user:language:label'); ?>: <?php
-
- $value = $CONFIG->language;
- if ($user->language)
- $value = $user->language;
-
- echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $value, 'options_values' => get_installed_translations()));
-
- ?>
-
- </p>
-
-<?php } ?> \ No newline at end of file
+<h3><?php echo elgg_echo('user:set:language'); ?></h3>
+<p>
+
+ <?php echo elgg_echo('user:language:label'); ?>: <?php
+
+ $value = $CONFIG->language;
+ if ($user->language) {
+ $value = $user->language;
+ }
+
+ echo elgg_view("input/pulldown", array('internalname' => 'language', 'value' => $value, 'options_values' => get_installed_translations()));
+
+ ?>
+
+</p>
+
+<?php
+} \ No newline at end of file
diff --git a/views/default/user/settings/name.php b/views/default/user/settings/name.php
index 56f6139e7..072c7cb03 100644
--- a/views/default/user/settings/name.php
+++ b/views/default/user/settings/name.php
@@ -1,7 +1,7 @@
<?php
/**
* Provide a way of setting your full name.
- *
+ *
* @package Elgg
* @subpackage Core
@@ -11,8 +11,8 @@
*/
$user = page_owner_entity();
-
- if ($user) {
+
+if ($user) {
?>
<h3><?php echo elgg_echo('user:set:name'); ?></h3>
<p>
@@ -21,7 +21,8 @@
echo elgg_view('input/text',array('internalname' => 'name', 'value' => $user->name));
echo elgg_view('input/hidden',array('internalname' => 'guid', 'value' => $user->guid));
- ?>
+ ?>
</p>
-<?php } ?> \ No newline at end of file
+<?php
+} \ No newline at end of file
diff --git a/views/default/user/settings/password.php b/views/default/user/settings/password.php
index d2b794808..5cefe3821 100644
--- a/views/default/user/settings/password.php
+++ b/views/default/user/settings/password.php
@@ -1,28 +1,27 @@
<?php
- /**
- * Provide a way of setting your password
- *
- * @package Elgg
- * @subpackage Core
+/**
+ * Provide a way of setting your password
+ *
+ * @package Elgg
+ * @subpackage Core
+ * @author Curverider Ltd
+ * @link http://elgg.org/
+ */
- * @author Curverider Ltd
+$user = page_owner_entity();
- * @link http://elgg.org/
- */
-
- $user = page_owner_entity();
-
- if ($user) {
+if ($user) {
?>
- <h3><?php echo elgg_echo('user:set:password'); ?></h3>
- <p>
- <?php echo elgg_echo('user:password:label'); ?>:
- <?php
- echo elgg_view('input/password',array('internalname' => 'password'));
- ?></p><p>
- <?php echo elgg_echo('user:password2:label'); ?>: <?php
- echo elgg_view('input/password',array('internalname' => 'password2'));
- ?>
- </p>
+<h3><?php echo elgg_echo('user:set:password'); ?></h3>
+<p>
+ <?php echo elgg_echo('user:password:label'); ?>:
+ <?php
+ echo elgg_view('input/password',array('internalname' => 'password'));
+ ?></p><p>
+ <?php echo elgg_echo('user:password2:label'); ?>: <?php
+ echo elgg_view('input/password',array('internalname' => 'password2'));
+ ?>
+</p>
-<?php } ?> \ No newline at end of file
+<?php
+} \ No newline at end of file