CVS update: xoops2jp/html/modules/user/templates (xoops-cvslog 3618) - XOOPS

Index: xoops2jp/html/modules/user/templates/user_userinfo.html
diff -u xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.11 xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.12

--- xoops2jp/html/modules/user/templates/user_userinfo.html:1.1.2.11	Fri Jun 30 17:04:39 2006
+++ xoops2jp/html/modules/user/templates/user_userinfo.html	Wed Jul 19 19:21:40 2006
@@ -4,8 +4,8 @@
   </div>
 <{elseif $xoops_isadmin == true}>
   <div style="text-align:right;">
-    <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserEdit&amp;uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_EDITPROFILE}></a> - 
-    <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserDelete&amp;uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_DELACCOUNT}></a>
+    <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserEdit&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._US_EDITPROFILE}></a> - 
+    <a href="<{$smarty.const.XOOPS_URL}>/modules/user/admin/index.php?action=UserDelete&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._US_DELACCOUNT}></a>
   </div>
 <{/if}>
 
@@ -16,84 +16,84 @@
     <table class="outer" cellpadding="4" cellspacing="1" width="100%">
       <tr>
         <th colspan="2" style="text-align:center;">
-          <{$smarty.const._US_ALLABOUT|replace:"%s":$thisUser->getVar('uname')}>
+          <{$smarty.const._US_ALLABOUT|replace:"%s":$thisUser->getShow('uname')}>
         </th>
       </tr>
       <{if $user_ownpage == true}>
       <tr>
         <td class="head" colspan="2" style="text-align:center;">
-          <a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=EditUser&amp;uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_EDITPROFILE}></a>
+          <a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=EditUser&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._US_EDITPROFILE}></a>
         </td>
       </tr>
       <{/if}>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_AVATAR}></td>
         <td class="even" style="text-align:center;">
-          <{if $thisUser->getVar('user_avatar') != "blank.gif" }>
-            <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$thisUser->getVar('user_avatar')}>" alt="Avatar" title="Avatar" />
+          <{if $thisUser->get('user_avatar') != "blank.gif" }>
+            <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$thisUser->getShow('user_avatar')}>" alt="Avatar" title="Avatar" />
           <{else}>
             <img src="<{$smarty.const.XOOPS_URL}>/modules/user/images/no_avatar.gif" alt="No Avatar" title="No Avatar" />
           <{/if}>
           <{if $user_ownpage == true}>
-            <br /><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=AvatarEdit&amp;uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._MD_USER_LANG_AVATAR_EDIT}></a>
+            <br /><a href="<{$smarty.const.XOOPS_URL}>/modules/user/index.php?action=AvatarEdit&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._MD_USER_LANG_AVATAR_EDIT}></a>
           <{/if}>
         </td>
       </tr>
       <tr>
         <td class="head"><{$smarty.const._US_REALNAME}></td>
-        <td class="odd" style="text-align:center;"><{$thisUser->getVar('name')}></td>
+        <td class="odd" style="text-align:center;"><{$thisUser->getShow('name')}></td>
       </tr>
       <tr>
         <td class="head"><{$smarty.const._US_WEBSITE}></td>
-        <td class="even"><a href="<{$thisUser->getVar('url', 'E')}>" target="_blank"><{$thisUser->getVar('url')}></a></td>
+        <td class="even"><a href="<{$thisUser->getShow('url')}>" target="_blank"><{$thisUser->getShow('url')}></a></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_EMAIL}></td>
         <td class="odd">
-          <{if $thisUser->getVar('user_viewemail') == 1 || $user_ownpage == true || $xoops_isadmin == true }>
-            <{mailto address=$thisUser->getVar('email') encode="javascript"}>
+          <{if $thisUser->get('user_viewemail') == 1 || $user_ownpage == true || $xoops_isadmin == true }>
+            <{mailto address=$thisUser->get('email') encode="javascript"}>
           <{/if}>
         </td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_PM}></td>
         <td class="even">
-          <a href="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send2=1&amp;to_userid=<{$thisUser->getVar('uid')}>', 'pmlite', 450, 380);">
-          <img src="<{$smarty.const.XOOPS_URL}>/images/icons/pm.gif" alt="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getVar('uname')}>" title="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getVar('uname')}>" /></a>
+          <a href="javascript:openWithSelfMain('<{$smarty.const.XOOPS_URL}>/pmlite.php?send2=1&amp;to_userid=<{$thisUser->getShow('uid')}>', 'pmlite', 450, 380);">
+          <img src="<{$smarty.const.XOOPS_URL}>/images/icons/pm.gif" alt="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getShow('uname')}>" title="<{$smarty.const._SENDPMTO|replace:"%s":$thisUser->getShow('uname')}>" /></a>
           <{$user_pmlink}>
         </td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_ICQ}></td>
-        <td class="odd"><{$thisUser->getVar('user_icq')}></td>
+        <td class="odd"><{$thisUser->getShow('user_icq')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_AIM}></td>
-        <td class="even"><{$thisUser->getVar('user_aim')}></td>
+        <td class="even"><{$thisUser->getShow('user_aim')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_YIM}></td>
-        <td class="odd"><{$thisUser->getVar('user_yim')}></td>
+        <td class="odd"><{$thisUser->getShow('user_yim')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_MSNM}></td>
-        <td class="even"><{$thisUser->getVar('user_msnm')}></td>
+        <td class="even"><{$thisUser->getShow('user_msnm')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_LOCATION}></td>
-        <td class="odd"><{$thisUser->getVar('user_from')}></td>
+        <td class="odd"><{$thisUser->getShow('user_from')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_OCCUPATION}></td>
-        <td class="even"><{$thisUser->getVar('user_occ')}></td>
+        <td class="even"><{$thisUser->getShow('user_occ')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_INTEREST}></td>
-        <td class="odd"><{$thisUser->getVar('user_intrest')}></td>
+        <td class="odd"><{$thisUser->getShow('user_intrest')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_EXTRAINFO}></td>
-        <td class="even"><{$thisUser->getVar('bio')}></td>
+        <td class="even"><{$thisUser->getShow('bio')}></td>
       </tr>
     </table>
     </td>
@@ -104,24 +104,24 @@
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_MEMBERSINCE}></td>
-        <td class="even" style="text-align:center;"><{$thisUser->getVar('user_regdate')|xoops_formattimestamp:l}></td>
+        <td class="even" style="text-align:center;"><{$thisUser->get('user_regdate')|xoops_formattimestamp:l}></td>
       </tr>
       <{if $rank != null}>
         <tr valign="top">
           <td class="head"><{$smarty.const._US_RANK}></td>
           <td class="odd" style="text-align:center;">
-            <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$rank->getVar('rank_image')}>" alt="<{$rank->getVar('rank_title')}>" title="<{$rank->getVar('rank_title')}>" /><br />
-            <{$rank->getVar('rank_title')}>
+            <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$rank->getShow('rank_image')}>" alt="<{$rank->getShow('rank_title')}>" title="<{$rank->getShow('rank_title')}>" /><br />
+            <{$rank->getShow('rank_title')}>
           </td>
         </tr>
       <{/if}>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_POSTS}></td>
-        <td class="even" style="text-align:center;"><{$thisUser->getVar('posts')}></td>
+        <td class="even" style="text-align:center;"><{$thisUser->getShow('posts')}></td>
       </tr>
       <tr valign="top">
         <td class="head"><{$smarty.const._US_LASTLOGIN}></td>
-        <td class="odd" style="text-align:center;"><{$thisUser->getVar('last_login')|xoops_formattimestamp:l}></td>
+        <td class="odd" style="text-align:center;"><{$thisUser->get('last_login')|xoops_formattimestamp:l}></td>
       </tr>
     </table>
     <br />
@@ -149,7 +149,7 @@
   <!-- end results item loop -->
 
   <{if $module.has_more}>
-    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showallbyuser&amp;mid=<{$module.mid|escape}>&amp;uid=<{$thisUser->getVar('uid')}>"><{$smarty.const._US_SHOWALL}></a>
+    <a href="<{$smarty.const.XOOPS_URL}>/search.php?action=showallbyuser&amp;mid=<{$module.mid|escape}>&amp;uid=<{$thisUser->getShow('uid')}>"><{$smarty.const._US_SHOWALL}></a>
   <{/if}>
   </p>
 <{/foreach}>
Index: xoops2jp/html/modules/user/templates/user_register_confirm.html
diff -u xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.4 xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.5
--- xoops2jp/html/modules/user/templates/user_register_confirm.html:1.1.2.4	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/templates/user_register_confirm.html	Wed Jul 19 19:21:40 2006
@@ -3,13 +3,13 @@
   <tr>
     <td class="head"><{$smarty.const._US_NICKNAME}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{$registForm->getVar('uname')|escape}>
+      <{$registForm->get('uname')|escape}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_EMAIL}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{$registForm->getVar('email')|escape}>
+      <{$registForm->get('email')|escape}>
     </td>
   </tr>
   <tr>
Index: xoops2jp/html/modules/user/templates/user_avatar_edit.html
diff -u xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.7 xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.8
--- xoops2jp/html/modules/user/templates/user_avatar_edit.html:1.1.2.7	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/templates/user_avatar_edit.html	Wed Jul 19 19:21:40 2006
@@ -1,5 +1,5 @@
 <div>
-<a href="./index.php?action=UserInfo&amp;uid=<{$actionForm->get('uid')}>"><{$smarty.const._US_PROFILE}></a>
+<a href="./index.php?action=UserInfo&amp;uid=<{$actionForm->getShow('uid')}>"><{$smarty.const._US_PROFILE}></a>
 &nbsp;<span style="font-weight:bold;">&raquo;&raquo;</span>&nbsp;<{$smarty.const._MD_USER_LANG_AVATAR_EDIT}>
 </div>
 
@@ -58,9 +58,9 @@
     <tr>
       <{foreach item=obj from=$systemAvatars}>
         <td class="<{cycle values="odd,even" name="class"}>" style="text-align:center;">
-          <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getVar('avatar_file')}>" alt="<{$obj->getVar('avatar_name')}>" title="<{$obj->getVar('avatar_name')}>"/><br />
-          <{$obj->getVar('avatar_name')}><br />
-          <input name="avatar_id[<{$obj->getVar('avatar_id')}>]" type="submit" value="<{$smarty.const._MD_USER_LANG_SELECT}>" />
+          <img src="<{$smarty.const.XOOPS_UPLOAD_URL}>/<{$obj->getShow('avatar_file')}>" alt="<{$obj->getShow('avatar_name')}>" title="<{$obj->getShow('avatar_name')}>"/><br />
+          <{$obj->getShow('avatar_name')}><br />
+          <input name="avatar_id[<{$obj->getShow('avatar_id')}>]" type="submit" value="<{$smarty.const._MD_USER_LANG_SELECT}>" />
         <{cycle name="table" values="</td>,</td>,</td>,</td>,</td></tr><tr>"}>
       <{/foreach}>
     </tr>
Index: xoops2jp/html/modules/user/templates/user_edituser.html
diff -u xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.8 xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.9
--- xoops2jp/html/modules/user/templates/user_edituser.html:1.1.2.8	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/templates/user_edituser.html	Wed Jul 19 19:21:40 2006
@@ -22,7 +22,7 @@
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_NICKNAME}></td>
-    <td class="<{cycle values="odd,even"}>"><{$thisUser->getVar('uname')}></td>
+    <td class="<{cycle values="odd,even"}>"><{$thisUser->getShow('uname')}></td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_REALNAME}></td>
@@ -30,20 +30,29 @@
       <{xoops_input name=name size=30 maxlength=60 value=$actionForm->get('name')}>
     </td>
   </tr>
+  <{if $allow_chgmail}>
+    <tr>
+      <td class="head"><{$smarty.const._US_EMAIL}></td>
+      <td class="<{cycle values="odd,even"}>">
+        <{xoops_input name=email size=30 maxlength=60 value=$actionForm->get('email')}><br />
+        <{xoops_input type=checkbox name=user_viewemail value=1 default=$actionForm->get('user_viewemail')}><{$smarty.const._US_ALLOWVIEWEMAIL}>
+      </td>
+    </tr>
+  <{/if}>
   <tr>
-    <td class="head"><{$smarty.const._US_EMAIL}></td>
+    <td class="head"><{$smarty.const._US_WEBSITE}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=email size=30 maxlength=60 value=$actionForm->get('email')}><br />
-      <input type="checkbox" name="user_viewemail" value="1"<{if $actionForm->get('user_viewemail')}>checked<{/if}> /><{$smarty.const._US_ALLOWVIEWEMAIL}>
+      <{xoops_input name=url size=30 maxlength=100 value=$actionForm->get('url')}>
     </td>
   </tr>
   <tr>
-    <td class="head"><{$smarty.const._US_WEBSITE}></td>
+    <td class="head"><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_input name=url size=30 maxlength=100 value=$actionForm->get('url')}>
+      <select name="timezone_offset">
+        <{xoops_optionsArray label=zone_name value=offset from=$timezones default=$actionForm->get('timezone_offset')}>
+      </select>
     </td>
   </tr>
-  <!--- // TODO TIMEZONE --->
   <tr>
     <td class="head"><{$smarty.const._US_ICQ}></td>
     <td class="<{cycle values="odd,even"}>">
@@ -90,13 +99,37 @@
     <td class="head"><{$smarty.const._US_SIGNATURE}></td>
     <td class="<{cycle values="odd,even"}>">
       <{xoops_dhtmltarea name=user_sig value=$actionForm->get('user_sig')}><br />
-      <input type="checkbox" name="attachsig" value="1"<{if $actionForm->get('attachsig')}>checked<{/if}> /><{$smarty.const._US_SHOWSIG}>
+      <{xoops_input type=checkbox name=attachsig value=1 default=$actionForm->get('attachsig')}><{$smarty.const._US_SHOWSIG}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_CDISPLAYMODE}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{html_options name=umode options=$umodeOptions selected=$actionForm->get('umode')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._US_CSORTORDER}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{html_options name=uorder options=$uorderOptions selected=$actionForm->get('uorder')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._MD_USER_LANG_NOTIFY_METHOD}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{html_options name=notify_method options=$notify_methodOptions selected=$actionForm->get('notify_method')}>
+    </td>
+  </tr>
+  <tr>
+    <td class="head"><{$smarty.const._MD_USER_LANG_NOTIFY_MODE}></td>
+    <td class="<{cycle values="odd,even"}>">
+      <{html_options name=notify_mode options=$notify_modeOptions selected=$actionForm->get('notify_mode')}>
     </td>
   </tr>
   <tr>
     <td class="head"><{$smarty.const._US_EXTRAINFO}></td>
     <td class="<{cycle values="odd,even"}>">
-      <{xoops_textarea name=bio value=$actionForm->get('bio') rows=5 cols=50 id=bio}>
+      <{xoops_textarea name=bio value=$actionForm->get('bio') rows=5 cols=50}>
     </td>
   </tr>
   <tr>
@@ -110,8 +143,8 @@
   <tr>
     <td class="head"><{$smarty.const._US_MAILOK}></td>
     <td class="<{cycle values="odd,even"}>">
-      <input type="radio" name="user_mailok" value="1"<{if $actionForm->get('user_mailok')==1}>checked<{/if}> /><{$smarty.const._YES}>
-      <input type="radio" name="user_mailok" value="0"<{if $actionForm->get('user_mailok')==0}>checked<{/if}> /><{$smarty.const._NO}>
+      <{xoops_input type=radio name=user_mailok value=1 default=$actionForm->get('user_mailok')}><{$smarty.const._YES}>
+      <{xoops_input type=radio name=user_mailok value=0 default=$actionForm->get('user_mailok')}><{$smarty.const._NO}>
     </td>
   </tr>
   <tr>
Index: xoops2jp/html/modules/user/templates/user_register_form.html
diff -u xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.8 xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.9
--- xoops2jp/html/modules/user/templates/user_register_form.html:1.1.2.8	Wed Jun 14 01:12:53 2006
+++ xoops2jp/html/modules/user/templates/user_register_form.html	Wed Jul 19 19:21:40 2006
@@ -34,9 +34,7 @@
     <td class="head"><{$smarty.const._MD_USER_LANG_TIMEZONE_OFFSET}></td>
     <td class="<{cycle values="odd,even"}>">
       <select name="timezone_offset">
-        <{foreach item=timezone from=$timezones}>
-          <option value="<{$timezone->getVar('offset')}>" <{if $actionForm->get('timezone_offset')==$timezone->getVar('offset')}>selected<{/if}>><{$timezone->getVar('zone_name')}></option>
-        <{/foreach}>
+        <{xoops_optionsArray label=zone_name value=offset from=$timezones default=$actionForm->get('timezone_offset')}>
       </select>
     </td>
   </tr>
Index: xoops2jp/html/modules/user/templates/user_register_finish.html
diff -u xoops2jp/html/modules/user/templates/user_register_finish.html:1.1.2.1 xoops2jp/html/modules/user/templates/user_register_finish.html:1.1.2.2
--- xoops2jp/html/modules/user/templates/user_register_finish.html:1.1.2.1	Sat Feb  4 22:35:32 2006
+++ xoops2jp/html/modules/user/templates/user_register_finish.html	Wed Jul 19 19:21:40 2006
@@ -1 +1 @@
-<div><{$complete_message}></div>
\ No newline at end of file
+<div><{$complete_message|escape}></div>
\ No newline at end of file


XOOPS

[xoops-cvslog 3618] CVS update: xoops2jp/html/modules/user/templates