From c434485c763f06ab6eeb7e217cb719fdadabbc1b Mon Sep 17 00:00:00 2001 From: dougk_ff7 Date: Fri, 7 Sep 2001 22:07:14 +0000 Subject: [PATCH] Oops, a little CVS conflict. git-svn-id: file:///svn/phpbb/trunk@1003 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/templates/PSO/admin/user_edit_body.tpl | 140 +------------------ 1 file changed, 6 insertions(+), 134 deletions(-) diff --git a/phpBB/templates/PSO/admin/user_edit_body.tpl b/phpBB/templates/PSO/admin/user_edit_body.tpl index a35787a4c1..a19069e61e 100644 --- a/phpBB/templates/PSO/admin/user_edit_body.tpl +++ b/phpBB/templates/PSO/admin/user_edit_body.tpl @@ -1,16 +1,12 @@ -
- -

{L_USER_TITLE}

- -

{L_USER_EXPLAIN}

- -
+
- + +
{L_REGISTRATION_INFO}
{L_ITEMS_REQUIRED}		{SITENAME} {L_INDEX}
+ + -<<<<<<< user_edit_body.tpl
@@ -144,133 +140,9 @@ -======= - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{L_REGISTRATION_INFO}
{L_ITEMS_REQUIRED}		{L_DELETE_USER}? {L_DELETE_USER_EXPLAIN}
{L_USERNAME}: *
{L_EMAIL_ADDRESS}: *
{L_PASSWORD}: *
{L_PASSWORD_IF_CHANGED}
{L_CONFIRM} {L_PASSWORD}: *
{L_PASSWORD_CONFIRM_IF_CHANGED}
{L_PROFILE_INFO}
{L_PROFILE_INFO_NOTICE}
{L_ICQ_NUMBER}:
{L_AIM}:
{L_MESSENGER}:
{L_YAHOO}:
{L_WEBSITE}:
{L_LOCATION}:
{L_OCCUPATION}:
{L_INTERESTS}:
{L_SIGNATURE}:
{L_SIGNATURE_EXPLAIN}

{L_HTML_IS} {HTML_STATUS}
{L_BBCODE_IS} {BBCODE_STATUS}
{L_SMILIES_ARE} {SMILIES_STATUS}
{L_PREFERENCES}
{L_PUBLIC_VIEW_EMAIL}: {L_YES}   {L_NO}
{L_HIDE_USER}: {L_YES}   {L_NO}
{L_NOTIFY_ON_PRIVMSG}: {L_YES}   {L_NO}
{L_ALWAYS_ADD_SIGNATURE}: {L_YES}   {L_NO}
{L_ALWAYS_ALLOW_BBCODE}: {L_YES}   {L_NO}
{L_ALWAYS_ALLOW_HTML}: {L_YES}   {L_NO}
{L_ALWAYS_ALLOW_SMILIES}: {L_YES}   {L_NO}
{L_TIMEZONE}:{TIMEZONE_SELECT}
{L_DATE_FORMAT}:
{L_DATE_FORMAT_EXPLAIN}
{L_AVATAR_PANEL}
->>>>>>> 1.4 - - +
{L_AVATAR_EXPLAIN}{L_CURRENT_IMAGE}
{AVATAR}
 {L_DELETE_AVATAR}		{S_HIDDEN_FIELDS}  
{L_SPECIAL}
{L_SPECIAL_EXPLAIN}
{L_STATUS}: {L_YES}   {L_NO}
{L_ALLOWPM}: {L_YES}   {L_NO}
{L_ALLOWAVATAR}: {L_YES}   {L_NO}
{L_DELETE_USER}?{L_DELETE_USER_EXPLAIN}
{S_HIDDEN_FIELDS}  
-