xoops-cvs2 Mailing List for XOOPS Web Application System (Page 3)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 8816
          http://xoops.svn.sourceforge.net/xoops/?rev=8816&view=rev
Author:   djculex
Date:     2012-01-26 17:03:42 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
- show only "show more in profile" if any fields to show
- Show fields allowed by admin in profile
- Added language define if all fields are disabled

Modified Paths:
--------------
    XoopsModules/smallworld/trunk/smallworld/language/english/main.php
    XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html
    XoopsModules/smallworld/trunk/smallworld/userprofile.php

Modified: XoopsModules/smallworld/trunk/smallworld/language/english/main.php
===================================================================

--- XoopsModules/smallworld/trunk/smallworld/language/english/main.php	2012-01-26 15:33:48 UTC (rev 8815)
+++ XoopsModules/smallworld/trunk/smallworld/language/english/main.php	2012-01-26 17:03:42 UTC (rev 8816)
@@ -24,6 +24,7 @@
 /*------------ General items -------- */
 define("_SMALLWORLD_SYSERROR","System Error!");
 define("_SMALLWORLD_SYSNAME","Smallworld");
+define("_SMALLWORLD_ALL_FIELDS_DISABLED","No personal info available");
 
 /*----------- Personal info ------------------*/
 define("_SMALLWORLD_AVATAR","Current Image");

Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html	2012-01-26 15:33:48 UTC (rev 8815)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_userprofile_template.html	2012-01-26 17:03:42 UTC (rev 8816)
@@ -140,11 +140,13 @@
 							<{$heorshe}> <{$smarty.const._SMALLWORLD_ISEMPLOYEDBY}> <{$work}> <{$smarty.const._SMALLWORLD_AND}> <{$smarty.const._SMALLWORLD_ATTENDED}> <{$education}>.
 							<br/><br/>
 							
+							<{if $flds[0] != ''}>
 							<fieldset>
 							<label><{$smarty.const._SMALLWORLD_ADDITIONALINFO}> <{$username}></label>
 							 <{$aboutme}>
 							 <br><br><a href='javascript:void(0)' class="smallworld_moreinfo" id='_SMALLWORLD_MOREINFO'><{$smarty.const._SMALLWORLD_MOREINFO}></a><br><br>
 							</fieldset>	
+							<{/if}>
 							</div>
 							<{/if}>
 							<{if $isuserafriend == 'no'}>
@@ -368,6 +370,28 @@
 	</div>
 	
 	<div id="interestsandmore" title="<{$smarty.const._SMALLWORLD_INTERESTS_TITLE}>" >
+					<{if 
+					!in_array('religiousview',$flds) && 
+					!in_array('politicalview',$flds) &&
+					!in_array('favouritebooks',$flds) && 
+					!in_array('favouritemusic',$flds) && 
+					!in_array('favouritemovies',$flds) && 
+					!in_array('favouritetvshows',$flds) && 
+					!in_array('interests',$flds) &&
+					!in_array('emails',$flds) && !in_array('screennames',$flds) && 
+					!in_array('mobile',$flds) && !in_array('landphone',$flds) &&
+					!in_array('streetadress',$flds) && 
+					!in_array('country',$flds) && 
+					!in_array('website',$flds)
+					}>
+						<fieldset>
+						<table border="0" class="smallworld_table" cellspacing="0" cellpadding="0">
+							<tr>
+							 <td><label><{$smarty.const._SMALLWORLD_ALL_FIELDS_DISABLED}></label></td>
+							</tr>
+						</table>
+						</fieldset>	
+					<{else}>
 					<fieldset>
 					<table border="0" class="smallworld_table" cellspacing="0" cellpadding="0">
 						<tr>
@@ -375,64 +399,98 @@
 						</tr>
 					</table>
 					</fieldset>					
+					<{/if}>
 					
+					<{if !in_array('religiousview',$flds) && !in_array('politicalview',$flds)}>
+					 <{else}>
 					<fieldset>
 					<table border="0" class="smallworld_table" cellspacing="0" cellpadding="0">
 					 <tr>
 					  <h3><label><{$smarty.const._SMALLWORLD_BELIEFS}></label></h3>
 					 </tr>
-						
+					
+					<{if !in_array('politicalview',$flds)}>
+					<{else}>
 						<tr>
 						 <td><{$smarty.const._SMALLWORLD_POLITICWORD}>:</td>
 						 <td><{$politic}></td>
 						</tr>
-						
+					<{/if}>
+						<{if !in_array('religiousview',$flds)}>
+						<{else}>
 						<tr>
 						 <td><{$smarty.const._SMALLWORLD_RELIGIONWORD}>:</td>
 						 <td><{$religion}></td>
 						</tr>
+						<{/if}>
 					</table>
 					</fieldset>
+					<{/if}>	
 
+					<{if 
+					!in_array('favouritebooks',$flds) && !in_array('favouritemusic',$flds) && 
+					!in_array('favouritemovies',$flds) && !in_array('favouritetvshows',$flds) && 
+					!in_array('interests',$flds)
+					}>
+					<{else}>
 					<fieldset>
 					<table border="0" class="smallworld_table" cellspacing="0" cellpadding="0">
 					 <tr>
 					  <h3><label><{$smarty.const._SMALLWORLD_FAVOURITETHINGS}></label></h3>
 					 </tr>
-							
+							<{if !in_array('favouritebooks',$flds)}>
+							<{else}>
 							<tr>
 							 <td><{$smarty.const._SMALLWORLD_FAVOURITEBOOKS}>:</td>
 							 <td><{$favbook}></td>
 							</tr>
+							<{/if}>	
 							
+							<{if !in_array('favouritemusic',$flds)}>
+							<{else}>
 							<tr>
 							 <td><{$smarty.const._SMALLWORLD_FAVOURITEMUSIC}>:</td>
 							 <td><{$favmusic}></td>
 							</tr>
+							<{/if}>
 							
+							<{if !in_array('favouritemovies',$flds)}>
+							<{else}>
 							<tr>
 							 <td><{$smarty.const._SMALLWORLD_FAVOURITEMOVIE}>:</td>
 							 <td><{$favmovie}></td>
 							</tr>
-							
+							<{/if}>
+							<{if !in_array('favouritetvshows',$flds)}>
+							<{else}>
 							<tr>
 							 <td><{$smarty.const._SMALLWORLD_FAVOURITETVSHOW}>:</td>
 							 <td><{$favtvshow}></td>
 							</tr>
-							
+							<{/if}>
+							<{if !in_array('interests',$flds)}>
+							<{else}>
 							<tr>
 							 <td><{$smarty.const._SMALLWORLD_FAVOURITEINTERESTS}>:</td>
 							 <td><{$favinterests}></td>
 							</tr>
+							<{/if}>
 					</table>
 					</fieldset>
+					<{/if}>
 					
+					<{if 
+					!in_array('emails',$flds) && !in_array('screennames',$flds) && 
+					!in_array('mobile',$flds) && !in_array('landphone',$flds)
+					}>
+					<{else}>
 					<fieldset>
 					<table border="0" class="smallworld_table" cellspacing="0" cellpadding="0">
 					 <tr>
 					  <h3><label><{$smarty.const._SMALLWORLD_CONTACTS}></label></h3>
 					 </tr>
-					 
+						<{if !in_array('emails',$flds)}>
+						<{else}>
 						<tr>
 						 <td><{$smarty.const._SMALLWORLD_EMAIL}>:</td>
 						 <td>
@@ -442,7 +500,9 @@
 							<br><br>
 						 </td>
 						</tr>
-						
+						<{/if}>
+						<{if !in_array('screennames',$flds)}>
+						<{else}>
 						<tr>
 							<td><{$smarty.const._SMALLWORLD_SCREENNAMES}>:</td>					
 							<td>
@@ -452,38 +512,63 @@
 								 <br><br>
 							</td>
 						</tr>				
-
+						<{/if}>
+						
+						<{if !in_array('landphone',$flds)}>
+						<{else}>
 						<tr>
 						 <td><{$smarty.const._SMALLWORLD_PHONE}>:</td>
 						 <td><{$phone}></td>
 						</tr>
+						<{/if}>
 						
+						<{if !in_array('mobile',$flds)}>
+						<{else}>
 						<tr>
 						 <td><{$smarty.const._SMALLWORLD_GSM}>:</td>
 						 <td><{$mobile}></td>
 						</tr>
+						<{/if}>
 					</table>	
 					</fieldset>
+					<{/if}>
 					
+					
+					<{if 
+					!in_array('streetadress',$flds) && 
+					!in_array('country',$flds) && 
+					!in_array('website',$flds)
+					}>
+					<{else}>
 					<fieldset>
 					<table border="0" class="smallworld_table" cellspacing="0" cellpadding="0">
 					 <tr><h3><label><{$smarty.const._SMALLWORLD_ADRESS}></label></h3></tr>
+							<{if !in_array('streetadress',$flds)}>
+							<{else}>
 							<tr>
 							 <td><{$smarty.const._SMALLWORLD_ADRESS}>:</td>
 							 <td><{$realname}><br><{$adress}></td>
 							</tr>
+							<{/if}>
 							
+							<{if !in_array('country',$flds)}>
+							<{else}>
 							<tr>
 							 <td><{$smarty.const._SMALLWORLD_COUNTRY}>:</td>
 							 <td><{$country}></td>
 							</tr>
+							<{/if}>
 							
+							<{if !in_array('website',$flds)}>
+							<{else}>
 							<tr>
 							 <td><br><br><{$smarty.const._SMALLWORLD_WEBSITE}>:</td>
 							 <td><br><br><span class="smallworld_website"><a href="<{$website}>" target="_BLANK"><{$website}></a></span></td>
 							</tr>
+							<{/if}>
 					</table>
 					</fieldset>
+					<{/if}>
 	</div>	
 	
 	<div id="_smallworld_birthplace_map" title="<{$birthcity}>/<{$country}>">

Modified: XoopsModules/smallworld/trunk/smallworld/userprofile.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/userprofile.php	2012-01-26 15:33:48 UTC (rev 8815)
+++ XoopsModules/smallworld/trunk/smallworld/userprofile.php	2012-01-26 17:03:42 UTC (rev 8816)
@@ -194,6 +194,7 @@
 			$xoopsTpl->assign('username',$Xusername);
 			$xoopsTpl->assign('bdaynow',$birthday_today_text);
 			$xoopsTpl->assign('isfollowing',$fl[0]);	
+			$xoopsTpl->assign('flds',smallworld_GetModuleOption('smallworldusethesefields', $repmodule='smallworld'));
 		}	else {
 				$check->chkUser ();
 			}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (361)	Oct (65)	Nov	Dec
2003	Jan (798)	Feb (694)	Mar (586)	Apr (145)	May (24)	Jun (24)	Jul (56)	Aug (11)	Sep (138)	Oct (107)	Nov (58)	Dec (39)
2004	Jan (157)	Feb (24)	Mar (13)	Apr (14)	May (73)	Jun (106)	Jul (217)	Aug (91)	Sep (116)	Oct (357)	Nov (27)	Dec (272)
2005	Jan (97)	Feb (40)	Mar (167)	Apr (365)	May (344)	Jun (357)	Jul (407)	Aug (529)	Sep (204)	Oct (52)	Nov (80)	Dec (1)
2006	Jan (2)	Feb (1)	Mar (11)	Apr (112)	May (121)	Jun (86)	Jul (51)	Aug (48)	Sep (107)	Oct (20)	Nov (50)	Dec (11)
2007	Jan (7)	Feb (11)	Mar (8)	Apr (11)	May (2)	Jun (25)	Jul (67)	Aug (134)	Sep (54)	Oct (69)	Nov (10)	Dec (74)
2008	Jan (73)	Feb (81)	Mar (64)	Apr (98)	May (157)	Jun (68)	Jul (80)	Aug (108)	Sep (176)	Oct (107)	Nov (265)	Dec (60)
2009	Jan (149)	Feb (140)	Mar (195)	Apr (141)	May (53)	Jun (45)	Jul (98)	Aug (153)	Sep (160)	Oct (138)	Nov (139)	Dec (104)
2010	Jan (188)	Feb (259)	Mar (133)	Apr (104)	May (42)	Jun (121)	Jul (38)	Aug (223)	Sep (259)	Oct (255)	Nov (106)	Dec (157)
2011	Jan (202)	Feb (110)	Mar (261)	Apr (272)	May (218)	Jun (108)	Jul (141)	Aug (205)	Sep (326)	Oct (279)	Nov (368)	Dec (238)
2012	Jan (239)	Feb (3)	Mar	Apr (1)	May (2)	Jun	Jul (3)	Aug (6)	Sep (5)	Oct	Nov	Dec
2013	Jan (1)	Feb (3)	Mar (9)	Apr (10)	May	Jun (1)	Jul (3)	Aug (1)	Sep (2)	Oct (1)	Nov	Dec
2014	Jan	Feb	Mar	Apr	May	Jun (1)	Jul	Aug	Sep (1)	Oct	Nov	Dec
2015	Jan (1)	Feb	Mar	Apr (2)	May	Jun	Jul	Aug (1)	Sep (1)	Oct (1)	Nov (1)	Dec (1)
2016	Jan	Feb (1)	Mar	Apr (2)	May	Jun	Jul (1)	Aug	Sep	Oct	Nov (1)	Dec
2017	Jan	Feb	Mar	Apr	May	Jun (1)	Jul (1)	Aug	Sep	Oct	Nov	Dec

xoops-cvs2 Mailing List for XOOPS Web Application System (Page 3)

The world's leading content management systems (CMS) written in PHP

xoops-cvs2 — All SVN commits will be posted to this ML