Commit ae96f8cf authored by patrick-proulx's avatar patrick-proulx

[ENH] Made some enhancements to the unified user details page. Renamed the...

[ENH] Made some enhancements to the unified user details page. Renamed the pref and the page to make it more explicit. Fixed a small issue with language. Still a work in progress
parent 9ddf8792
......@@ -6087,11 +6087,11 @@ templates/tiki-user_information.tpl -text
templates/tiki-user_mailin.tpl -text
templates/tiki-user_menu.tpl -text
templates/tiki-user_preferences.tpl -text
templates/tiki-user_profile.tpl -text
templates/tiki-user_tasks.tpl -text
templates/tiki-user_tasks_edit.tpl -text
templates/tiki-user_tasks_list.tpl -text
templates/tiki-user_tasks_view.tpl -text
templates/tiki-user_unified_details.tpl -text
templates/tiki-user_watches.tpl -text
templates/tiki-userfiles.tpl -text
templates/tiki-usermenu.tpl -text
......@@ -7751,10 +7751,10 @@ themes/yeti/templates/index.php -text
/tiki-user_mailin.php -text
/tiki-user_notifications.php -text
/tiki-user_preferences.php -text
/tiki-user_profile.php -text
/tiki-user_reports.php -text
/tiki-user_reports_send.php -text
/tiki-user_tasks.php -text
/tiki-user_unified_details.php -text
/tiki-user_watches.php -text
/tiki-userfiles.php -text
/tiki-usermenu.php -text
......
......@@ -254,9 +254,9 @@ function prefs_feature_list($partial = false)
'textFilter' => 'categ', // intentional use of categ so it catches category and categories
),
),
'feature_new_profiles' => array(
'name' => tra('Use new profiles'),
'description' => tra('Use new profiles build with elasticsearch'),
'feature_unified_user_details' => array(
'name' => tra('Use Unified User Details '),
'description' => tra('Use User Details Page using the Unified Index.'),
'help' => 'User+Preferences',
'type' => 'flag',
'default' => 'n',
......
......@@ -22,7 +22,7 @@
<h2>{tr}User features{/tr}</h2>
<div class="admin featurelist">
{preference name=feature_new_profiles}
{preference name=feature_unified_user_details}
{preference name=feature_score}
{preference name=feature_mytiki}
{preference name=feature_minical}
......@@ -32,7 +32,6 @@
{preference name=feature_contacts}
{preference name=monitor_enabled}
<div class="adminoptionboxchild" id="monitor_enabled_childcontainer">
{preference name=monitor_individual_clear}
{preference name=monitor_count_refresh_interval}
{preference name=monitor_reply_email_pattern}
......
......@@ -60,7 +60,9 @@
<td class="profile-info-value">{$userwatch|escape}</td>
</tr>
{/if}
{if !empty($userinfo['user_country']) and $userinfo['user_country'] != 'Other'}
{$userinfo['user_country']|var_dump}
{if not empty($userinfo['user_country']) and $userinfo['user_country'] != 'Other'}
<tr class="profile-info">
<td class="profile-info-label">{tr}Country:{/tr}</td>
<td class="profile-info-value">{$userwatch|countryflag} {tr}{$userinfo['user_country']|stringfix}{/tr}</td>
......@@ -92,7 +94,8 @@
{if $prefs.change_language eq 'y'}
<tr class="profile-info">
<td class="profile-info-label">{tr}Language:{/tr}</td>
<td class="profile-info-value">{$userinfo['user_language']}</td>
<td class="profile-info-value">{', '|implode:$userinfo['user_language']}</td>
</tr>
{/if}
{if $userinfo['user_homepage']}
......
......@@ -12,8 +12,8 @@ require_once ('tiki-setup.php');
include_once ('lib/messu/messulib.php');
include_once ('lib/userprefs/scrambleEmail.php');
if ($prefs['feature_new_profiles'] == 'y'){
include "tiki-user_profile.php";
if ($prefs['feature_unified_user_details'] == 'y'){
include "tiki-user_unified_details.php";
die;
}
......
......@@ -80,5 +80,5 @@ if ($user_picture_id = $userprefslib->get_user_picture_id($userwatch)) {
}
// disallow robots to index page:
$smarty->assign('metatag_robots', 'NOINDEX, NOFOLLOW');
$smarty->assign('mid', 'tiki-user_profile.tpl');
$smarty->assign('mid', 'tiki-user_unified_details.tpl');
$smarty->display("tiki.tpl");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment