From: <dj...@us...> - 2012-01-16 14:29:29
|
Revision: 8743 http://xoops.svn.sourceforge.net/xoops/?rev=8743&view=rev Author: djculex Date: 2012-01-16 14:29:22 +0000 (Mon, 16 Jan 2012) Log Message: ----------- Admin descide fields to use assigned on edit_profile Modified Paths: -------------- XoopsModules/smallworld/trunk/editprofile.php XoopsModules/smallworld/trunk/include/functions.php XoopsModules/smallworld/trunk/index.php XoopsModules/smallworld/trunk/language/english/modinfo.php XoopsModules/smallworld/trunk/preloads/core.php XoopsModules/smallworld/trunk/register.php XoopsModules/smallworld/trunk/templates/smallworld_userprofile_edittemplate.html XoopsModules/smallworld/trunk/xoops_version.php Modified: XoopsModules/smallworld/trunk/editprofile.php =================================================================== --- XoopsModules/smallworld/trunk/editprofile.php 2012-01-16 13:36:04 UTC (rev 8742) +++ XoopsModules/smallworld/trunk/editprofile.php 2012-01-16 14:29:22 UTC (rev 8743) @@ -50,156 +50,253 @@ // ------------ PERSONAL INFO ------------ // // Real name - $realname = $item->input('realname', 'realname', 'realname',$size=30, $preset=$r['realname']); + if (smallworldGetValfromArray ('realname', 'smallworldusethesefields') != 0) { + $realname = $item->input('realname', 'realname', 'realname',$size=30, $preset=$r['realname']); $xoopsTpl->append('realname',$realname); + } else { + $xoopsTpl->assign('show_realname','no'); + } // Dropdown for gender - $gender = $item->dropdown('gender',$arr0,$r['gender']); + if (smallworldGetValfromArray ('gender', 'smallworldusethesefields') != 0) { + $gender = $item->dropdown('gender',$arr0,$r['gender']); $xoopsTpl->append('gender', $gender); + } else { + $xoopsTpl->assign('show_gender','no'); + } // Selectbox for "interested in gender(s)" - $nr = unserialize($r['intingender']); - $intInGender = $item->RetrieveRadio('intingender',$arr01,$nr, $selected=null); - $xoopsTpl->append('intingender',$intInGender); + if (smallworldGetValfromArray ('interestedin', 'smallworldusethesefields') != 0) { + $nr = unserialize($r['intingender']); + $intInGender = $item->RetrieveRadio('intingender',$arr01,$nr, $selected=null); + $xoopsTpl->append('intingender',$intInGender); + } else { + $xoopsTpl->assign('show_interestedin','no'); + } // Dropdown for marital status - $relationshipstatus = $item->dropdown('relationship',$arr02,0); - $xoopsTpl->append('relationshipstatus',$relationshipstatus); + if (smallworldGetValfromArray ('relationshipstatus', 'smallworldusethesefields') != 0) { + $relationshipstatus = $item->dropdown('relationship',$arr02,0); + $xoopsTpl->append('relationshipstatus',$relationshipstatus); + // Partner. Only shown if marital status is married, it's complicated, engaged) $partner = $item->input('partner', 'partner', 'partner',$size='30', stripslashes($r['partner'])); $xoopsTpl->append('partner',$partner); - + } else { + $xoopsTpl->assign('show_relationshipstatus','no'); + } + + if (smallworldGetValfromArray ('lookingfor', 'smallworldusethesefields') != 0) { $nr1 = unserialize($r['searchrelat']); $searchrelat = $item->RetrieveRadio('searchrelat',$arr03,$nr1, $selected=null); $xoopsTpl->append('searchrelat',$searchrelat); + } else { + $xoopsTpl->assign('show_lookingfor','no'); + } + if (smallworldGetValfromArray ('birthday', 'smallworldusethesefields') != 0) { // Select Birthday dd-mm-Y $birthday = $item->input('birthday', 'birthday', 'birthday',$size='12', $preset=stripslashes(UsToEuroDate($r['birthday']))); $xoopsTpl->append('birthdaydate',$birthday); + } else { + $xoopsTpl->assign('show_birthday','no'); + } // Select Hometown or Enter new + if (smallworldGetValfromArray ('birthplace', 'smallworldusethesefields') != 0) { $birthplace = $item->input('birthplace', 'birthplace', 'birthplace',$size='50', $preset=stripslashes($r['birthplace'])); $xoopsTpl->append('birthplace',$birthplace); + } else { + $xoopsTpl->assign('show_birthplace','no'); + } // Dropdown politics + if (smallworldGetValfromArray ('politicalview', 'smallworldusethesefields') != 0) { $politic = $item->dropdown('politic',$arr04,0); $xoopsTpl->append('politic',$politic); + } else { + $xoopsTpl->assign('show_political','no'); + } // Dropdown Religion + if (smallworldGetValfromArray ('religiousview', 'smallworldusethesefields') != 0) { $religion = $item->dropdown('religion',$arr05,0); $xoopsTpl->append('religion',$religion); + } else { + $xoopsTpl->assign('show_religion','no'); + } - // ------------ CONTACT INFO ------------ // - + // ------------ CONTACT INFO ------------ // // Add email test - $nr2 = unserialize($r['emailtype']); - $emailtext = ''; - foreach ($nr2 as $k => $v) { - $nr2id = "email-".$k; - $emailtext .= $item->input_add('smallworld_add2','email','emailtype','.smallworld_clone2',20,$addmore=null,$preset=stripslashes($v),$nr2id); - // $emailtext .= $item->input_add('smallworld_add2','email','emailtype','.smallworld_clone2',20,$addmore=null,$preset=stripslashes($v)); - $emailtext .= "<span class='smallworld_remove' id='emailremove'><a href='javascript:removelnk (\"#emailremovelnk\",\"input#email\",\"email\");' id='emailremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>"; + if (smallworldGetValfromArray ('emails', 'smallworldusethesefields') != 0) { + $nr2 = unserialize($r['emailtype']); + $emailtext = ''; + foreach ($nr2 as $k => $v) { + $nr2id = "email-".$k; + $emailtext .= $item->input_add('smallworld_add2','email','emailtype','.smallworld_clone2',20,$addmore=null,$preset=stripslashes($v),$nr2id); + // $emailtext .= $item->input_add('smallworld_add2','email','emailtype','.smallworld_clone2',20,$addmore=null,$preset=stripslashes($v)); + $emailtext .= "<span class='smallworld_remove' id='emailremove'><a href='javascript:removelnk (\"#emailremovelnk\",\"input#email\",\"email\");' id='emailremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>"; + } + $emailtext .= "<a class='smallworld_addemail' href='javascript:void();' id='emailAdd'>"._SMALLWORLD_ADDMORE."</a><br><br>"; + $xoopsTpl->append('emailtext',$emailtext); + } else { + $xoopsTpl->assign('show_emails','no'); } - $emailtext .= "<a class='smallworld_addemail' href='javascript:void();' id='emailAdd'>"._SMALLWORLD_ADDMORE."</a><br><br>"; - $xoopsTpl->append('emailtext',$emailtext); - + + //Add screen names (usernames for facebook etc etc) - $nr3 = unserialize($r['screenname_type']); - $nr4 = unserialize($r['screenname']); - $count1 = count($nr3); - $cnt1 = 0; - - // Drop down for screen names - $screenname =""; - foreach ($nr3 as $k => $v) { - if ($cnt1 < $count1-1) {$addmore1 ="";} else {$addmore1 = _SMALLWORLD_ADDMORE;} - $screenname .= $item->dropdown_add('smallworld_add','screenname', 'screenname_type', '.smallworld_clone',$arr06,$addmore1,$selected=stripslashes($nr4[$k]),$preset=stripslashes($v)); - $screenname .= "<span class='smallworld_remove' id='screennameremove'>"; - $screenname .= "<a href='javascript:removelnk (\"#screennameremovelnk\",\"span#screenname\",\"screenname\");' id='screennameremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>"; - $cnt1++; + if (smallworldGetValfromArray ('screennames', 'smallworldusethesefields') != 0) { + $nr3 = unserialize($r['screenname_type']); + $nr4 = unserialize($r['screenname']); + $count1 = count($nr3); + $cnt1 = 0; + + // Drop down for screen names + $screenname =""; + foreach ($nr3 as $k => $v) { + if ($cnt1 < $count1-1) {$addmore1 ="";} else {$addmore1 = _SMALLWORLD_ADDMORE;} + $screenname .= $item->dropdown_add('smallworld_add','screenname', 'screenname_type', '.smallworld_clone',$arr06,$addmore1,$selected=stripslashes($nr4[$k]),$preset=stripslashes($v)); + $screenname .= "<span class='smallworld_remove' id='screennameremove'>"; + $screenname .= "<a href='javascript:removelnk (\"#screennameremovelnk\",\"span#screenname\",\"screenname\");' id='screennameremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>"; + $cnt1++; + } + $screenname .= "<a class='smallworld_addscreenname' href='javascript:void(0);' id='screennameAdd'>"._SMALLWORLD_ADDMORE."</a><br><br>"; + $xoopsTpl->append('screenname',$screenname); + } else { + $xoopsTpl->assign('show_screennames','no'); } - $screenname .= "<a class='smallworld_addscreenname' href='javascript:void(0);' id='screennameAdd'>"._SMALLWORLD_ADDMORE."</a><br><br>"; - $xoopsTpl->append('screenname',$screenname); // Mobilephone + if (smallworldGetValfromArray ('mobile', 'smallworldusethesefields') != 0) { $mobile = $item->input('mobile','mobile','mobile',12,$preset=stripslashes($r['mobile'])); $xoopsTpl->append('mobile',$mobile); + } else { + $xoopsTpl->assign('show_mobile','no'); + } // Landphone + if (smallworldGetValfromArray ('landphone', 'smallworldusethesefields') != 0) { $phone = $item->input('phone','phone','phone',12,$preset=stripslashes($r['phone'])); $xoopsTpl->append('phone',$phone); + } else { + $xoopsTpl->assign('show_landphone','no'); + } // Adress - $adress = $item->input('adress','adress','adress',$size='50',$preset=stripslashes($r['adress'])); + if (smallworldGetValfromArray ('streetadress', 'smallworldusethesefields') != 0) { + $adress = $item->input('adress','adress','adress',$size='50',$preset=stripslashes($r['adress'])); $xoopsTpl->append('adress',$adress); - - $present_city = $item->input('present_city', 'present_city', 'present_city',50, $preset=stripslashes($r['present_city'])); + } else { + $xoopsTpl->assign('show_adress','no'); + } + + if (smallworldGetValfromArray ('presentcity', 'smallworldusethesefields') != 0) { + $present_city = $item->input('present_city', 'present_city', 'present_city',50, $preset=stripslashes($r['present_city'])); $xoopsTpl->append('present_city',$present_city); - $present_country = $item->input('present_country', 'present_country', 'present_country',$size='50', $preset=stripslashes($r['present_country'])); + $present_country = $item->input('present_country', 'present_country', 'present_country',$size='50', $preset=stripslashes($r['present_country'])); $xoopsTpl->append('present_country',$present_country); + } else { + $xoopsTpl->assign('show_city','no'); + } + if (smallworldGetValfromArray ('presentcity', 'smallworldusethesefields') == 0) { + $xoopsTpl->assign('show_website','no'); + } + // ------------ INTERESTS ------------ // // Textarea for interests //textarea($name, $id, $title, $rows, $cols, $class) - $interests = $item->textarea('interests','interests',_SMALLWORLD_INTERESTS,1,20,'favourites',$preset=stripslashes($r['interests'])); + if (smallworldGetValfromArray ('interests', 'smallworldusethesefields') != 0) { + $interests = $item->textarea('interests','interests',_SMALLWORLD_INTERESTS,1,20,'favourites',$preset=stripslashes($r['interests'])); $xoopsTpl->append('interests',$interests); + } else { + $xoopsTpl->assign('show_interests','no'); + } // Textarea for Music - $music = $item->textarea('music','music',_SMALLWORLD_MUSIC,1,20,'favourites',$preset=stripslashes($r['music'])); + if (smallworldGetValfromArray ('favouritemusic', 'smallworldusethesefields') != 0) { + $music = $item->textarea('music','music',_SMALLWORLD_MUSIC,1,20,'favourites',$preset=stripslashes($r['music'])); $xoopsTpl->append('music',$music); + } else { + $xoopsTpl->assign('show_music','no'); + } // Textarea for Tvshow - $tvshow = $item->textarea('tvshow','tvshow',_SMALLWORLD_TVSHOW,1,20,'favourites',$preset=stripslashes($r['tvshow'])); - $xoopsTpl->append('tvshow',$tvshow); + if (smallworldGetValfromArray ('favouritetvshows', 'smallworldusethesefields') != 0) { + $tvshow = $item->textarea('tvshow','tvshow',_SMALLWORLD_TVSHOW,1,20,'favourites',$preset=stripslashes($r['tvshow'])); + $xoopsTpl->append('tvshow',$tvshow); + } else { + $xoopsTpl->assign('show_tv','no'); + } // Textarea for Movie - $movie = $item->textarea('movie','movie',_SMALLWORLD_MOVIE,1,20,'favourites',$preset=stripslashes($r['movie'])); - $xoopsTpl->append('movie',$movie); + if (smallworldGetValfromArray ('favouritemovies', 'smallworldusethesefields') != 0) { + $movie = $item->textarea('movie','movie',_SMALLWORLD_MOVIE,1,20,'favourites',$preset=stripslashes($r['movie'])); + $xoopsTpl->append('movie',$movie); + } else { + $xoopsTpl->assign('show_movies','no'); + } // Textarea for Books - $books = $item->textarea('books','books',_SMALLWORLD_BOOKS,1,20,'favourites',$preset=stripslashes($r['books'])); - $xoopsTpl->append('books',$books); + if (smallworldGetValfromArray ('favouritebooks', 'smallworldusethesefields') != 0) { + $books = $item->textarea('books','books',_SMALLWORLD_BOOKS,1,20,'favourites',$preset=stripslashes($r['books'])); + $xoopsTpl->append('books',$books); + } else { + $xoopsTpl->assign('show_books','no'); + } // Textarea for About me - $aboutme = $item->textarea('aboutme','aboutme',_SMALLWORLD_ABOUTME,2,20,'favourites',$preset=stripslashes($r['aboutme'])); - $xoopsTpl->append('aboutme',$aboutme); + if (smallworldGetValfromArray ('aboutme', 'smallworldusethesefields') != 0) { + $aboutme = $item->textarea('aboutme','aboutme',_SMALLWORLD_ABOUTME,2,20,'favourites',$preset=stripslashes($r['aboutme'])); + $xoopsTpl->append('aboutme',$aboutme); + } else { + $xoopsTpl->assign('show_aboutme','no'); + } // ------------ SCHOOL ------------ // //School name - $nr5 = unserialize($r['school_type']); - $nr6 = unserialize($r['school']); - $nr7 = unserialize($r['schoolstart']); - $nr8 = unserialize($r['schoolstop']); - $school = ""; - foreach ($nr5 as $k => $v) { - $school .= $item->school_add ('smallworld_add3', 'school', 'school_type', - '.smallworld_clone3', $arr7, _SMALLWORLD_ADDMORE, $selected=stripslashes($nr6[$k]),$preset=$v, $selectedstart=date("Y",$nr7[$k]),$selectedstop=date("Y",$nr8[$k])); - $school .= "<span class='smallworld_remove2' id='schoolremove'>"; - $school .= "<a href='javascript:removelnk (\"#schoolremovelnk\",\"div#school\",\"school\");' id='schoolremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>"; - } - $school .= "<a class='smallworld_addschool' href='javascript:void(0);' id='schoolAdd'>"._SMALLWORLD_ADDMORE."</a><br><br>"; - $xoopsTpl->append('school',$school); + if (smallworldGetValfromArray ('education', 'smallworldusethesefields') != 0) { + $nr5 = unserialize($r['school_type']); + $nr6 = unserialize($r['school']); + $nr7 = unserialize($r['schoolstart']); + $nr8 = unserialize($r['schoolstop']); + $school = ""; + foreach ($nr5 as $k => $v) { + $school .= $item->school_add ('smallworld_add3', 'school', 'school_type', + '.smallworld_clone3', $arr7, _SMALLWORLD_ADDMORE, $selected=stripslashes($nr6[$k]),$preset=$v, $selectedstart=date("Y",$nr7[$k]),$selectedstop=date("Y",$nr8[$k])); + $school .= "<span class='smallworld_remove2' id='schoolremove'>"; + $school .= "<a href='javascript:removelnk (\"#schoolremovelnk\",\"div#school\",\"school\");' id='schoolremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>"; + } + $school .= "<a class='smallworld_addschool' href='javascript:void(0);' id='schoolAdd'>"._SMALLWORLD_ADDMORE."</a><br><br>"; + $xoopsTpl->append('school',$school); + } else { + $xoopsTpl->assign('show_school','no'); + } //Jobs - $nr9 = unserialize($r['employer']); - $nr10 = unserialize($r['position']); - $nr11 = unserialize($r['jobstart']); - $nr12 = unserialize($r['jobstop']); - $nr13 = unserialize(stripslashes($r['description'])); - $job=""; - foreach ($nr9 as $k=>$v) { - $job .= $item->job('smallworld_add4', 'job', 'job_type', '.smallworld_clone4', _SMALLWORLD_ADDMORE, $employer=stripslashes($v), $position=stripslashes($nr10[$k]), - $selectedstart=date("Y",$nr11[$k]), $selectedstop=date("Y",$nr12[$k]),$description=$nr13[$k]); - $job .= "<span class='smallworld_remove3' id='jobremove'>"; - $job .= "<a href='javascript:removelnk (\"#jobremovelnk\",\"div#job\",\"job\");' id='jobremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>"; - } - $job .= "<a class='smallworld_addjob' href='javascript:void(0);' id='jobAdd'>"._SMALLWORLD_ADDMORE."</a><br><br>"; - $xoopsTpl->append('job',$job); + if (smallworldGetValfromArray ('employment', 'smallworldusethesefields') != 0) { + $nr9 = unserialize($r['employer']); + $nr10 = unserialize($r['position']); + $nr11 = unserialize($r['jobstart']); + $nr12 = unserialize($r['jobstop']); + $nr13 = unserialize(stripslashes($r['description'])); + $job=""; + foreach ($nr9 as $k=>$v) { + $job .= $item->job('smallworld_add4', 'job', 'job_type', '.smallworld_clone4', _SMALLWORLD_ADDMORE, $employer=stripslashes($v), $position=stripslashes($nr10[$k]), + $selectedstart=date("Y",$nr11[$k]), $selectedstop=date("Y",$nr12[$k]),$description=$nr13[$k]); + $job .= "<span class='smallworld_remove3' id='jobremove'>"; + $job .= "<a href='javascript:removelnk (\"#jobremovelnk\",\"div#job\",\"job\");' id='jobremovelnk'>"._SMALLWORLD_REMOVE."</a><br></span>"; + } + $job .= "<a class='smallworld_addjob' href='javascript:void(0);' id='jobAdd'>"._SMALLWORLD_ADDMORE."</a><br><br>"; + $xoopsTpl->append('job',$job); + } else { + $xoopsTpl->assign('show_jobs','no'); + } // Create hidden forms for birthcity $birthplace_lat = $item->hidden('birthplace_lat','birthplace_lat',$preset=stripslashes($r['birthplace_lat'])); Modified: XoopsModules/smallworld/trunk/include/functions.php =================================================================== --- XoopsModules/smallworld/trunk/include/functions.php 2012-01-16 13:36:04 UTC (rev 8742) +++ XoopsModules/smallworld/trunk/include/functions.php 2012-01-16 14:29:22 UTC (rev 8743) @@ -634,4 +634,17 @@ return 0; } } + +//Function to get value from xoopsConfig array +function smallworldGetValfromArray ($key, $array) { + $ar = smallworld_GetModuleOption($array, $repmodule='smallworld'); + $ret = 0; + if (in_array($key, $ar,true)) { + $ret = 1; + return $ret; + } else { + return 0; + } + +} ?> Modified: XoopsModules/smallworld/trunk/index.php =================================================================== --- XoopsModules/smallworld/trunk/index.php 2012-01-16 13:36:04 UTC (rev 8742) +++ XoopsModules/smallworld/trunk/index.php 2012-01-16 14:29:22 UTC (rev 8743) @@ -26,7 +26,6 @@ include_once(XOOPS_ROOT_PATH."/modules/smallworld/class/class_collector.php"); global $xoopsUser, $xoTheme,$xoopsConfig; - if ($xoopsUser) { $id = $xoopsUser->getVar('uid'); $user = new XoopsUser($id); @@ -54,6 +53,7 @@ $menu_gallery = "<a href='".XOOPS_URL."/modules/smallworld/galleryshow.php?username=".$username."'><img id='menuimg' src='".XOOPS_URL."/modules/smallworld/images/picture.png'>"._SMALLWORLD_GALLERY."</a>"; $menu_friends = "<a href='".XOOPS_URL."/modules/smallworld/friends.php?username=".$username."'><img id='menuimg' src='".XOOPS_URL."/modules/smallworld/images/group.png'>"._SMALLWORLD_FRIENDSPAGE."</a>"; + // Things to do with wall $Wall = new Wall_Updates(); $myavatar = $Wall->Gravatar($id); Modified: XoopsModules/smallworld/trunk/language/english/modinfo.php =================================================================== --- XoopsModules/smallworld/trunk/language/english/modinfo.php 2012-01-16 13:36:04 UTC (rev 8742) +++ XoopsModules/smallworld/trunk/language/english/modinfo.php 2012-01-16 14:29:22 UTC (rev 8743) @@ -60,6 +60,7 @@ define ('_MI_SMALLWORLD_REALNAME','Real name'); define ('_MI_SMALLWORLD_INTERESTEDIN','Interested in'); +define ('_MI_SMALLWORLD_RELATIONSHIPSTATUS','relationship status'); define ('_MI_SMALLWORLD_PARTNER','Partner'); define ('_MI_SMALLWORLD_LOOKINGFOR','Looking for'); define ('_MI_SMALLWORLD_BIRTHDAY','Birthday'); Modified: XoopsModules/smallworld/trunk/preloads/core.php =================================================================== --- XoopsModules/smallworld/trunk/preloads/core.php 2012-01-16 13:36:04 UTC (rev 8742) +++ XoopsModules/smallworld/trunk/preloads/core.php 2012-01-16 14:29:22 UTC (rev 8743) @@ -67,7 +67,7 @@ $fieldstoshow = array_flip(smallworld_GetModuleOption('smallworldusethesefields', $repmodule='smallworld')); $useverification = array_flip(smallworld_GetModuleOption('smallworldmandatoryfields', $repmodule='smallworld')); $smallworldUV = implode(',', $useverification); - + // Get users messages count based on users followerArray $getUserMsgNum = smallworld_getCountFriendMessagesEtc (); Modified: XoopsModules/smallworld/trunk/register.php =================================================================== --- XoopsModules/smallworld/trunk/register.php 2012-01-16 13:36:04 UTC (rev 8742) +++ XoopsModules/smallworld/trunk/register.php 2012-01-16 14:29:22 UTC (rev 8743) @@ -50,12 +50,16 @@ // ------------ PERSONAL INFO ------------ // // Real name + if (smallworldGetValfromArray ('realname', 'smallworldusethesefields') != 0) { $realname = $item->input('realname', 'realname', 'realname',$size=30, $preset=$xoopsUser->getVar('name')); $xoopsTpl->append('realname',$realname); - + } + + if (smallworldGetValfromArray ('gender', 'smallworldusethesefields') != 0) { // Dropdown for gender $gender = $item->dropdown('gender',$arr0,0); $xoopsTpl->append('gender', $gender); + } // Selectbox for "interested in gender(s)" $intInGender = $item->radio('intingender',$arr01,0); Modified: XoopsModules/smallworld/trunk/templates/smallworld_userprofile_edittemplate.html =================================================================== --- XoopsModules/smallworld/trunk/templates/smallworld_userprofile_edittemplate.html 2012-01-16 13:36:04 UTC (rev 8742) +++ XoopsModules/smallworld/trunk/templates/smallworld_userprofile_edittemplate.html 2012-01-16 14:29:22 UTC (rev 8743) @@ -8,6 +8,7 @@ <label for="smallworld_realname"></label> <table class="smallworld_table" border="0" cellspacing="0" cellpadding="0"> + <{if $show_realname != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_REALNAME}></p></td> <td><label for="Realname"></label> @@ -16,7 +17,9 @@ <{/section}> </td> </tr> - + <{/if}> + + <{if $show_gender != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_GENDER}></p></td> <td><label for="select"></label> @@ -25,7 +28,9 @@ <{/section}> </td> </tr> + <{/if}> + <{if $show_interestedin != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_INTERESTEDIN}></p></td> <td><label for="select"></label> @@ -36,7 +41,9 @@ </span> </td> </tr> + <{/if}> + <{if $show_relationshipstatus != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_RELATIONSHIPSTATUS}></p></td> <td><label for="select"></label> @@ -45,6 +52,7 @@ <{/section}> </td> </tr> + <div class="partner"> <tr> <td><p class="partner"><{$smarty.const._SMALLWORLD_PARTNER}></p></td> @@ -55,7 +63,9 @@ </td> </tr> </div> + <{/if}> + <{if $show_lookingfor != 'no'}> <tr> <td valign="top"><p><{$smarty.const._SMALLWORLD_LOOKINGFOR}></p></td> <td><label for="select"></label> @@ -67,7 +77,9 @@ <br/> </td> </tr> - + <{/if}> + + <{if $show_birthday != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_BIRTHDAY}></p></td> <td> @@ -76,7 +88,9 @@ <{/section}> </td> </tr> + <{/if}> + <{if $show_birthplace != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_BIRTHPLACE}></p></td> <div class="ui-widget"> @@ -97,11 +111,11 @@ <{$birthplace_country_img[i]}> <{/section}> </td> - </div> - + </div> </tr> + <{/if}> - + <{if $show_political != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_POLITICALVIEW}></p></td> <td><label for="select"></label> @@ -110,7 +124,9 @@ <{/section}> </td> </tr> + <{/if}> + <{if $show_religion != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_RELIGIOUSVIEW}></p></td> <td><lable for="select"></lable> @@ -119,12 +135,14 @@ <{/section}> </td> </tr> + <{/if}> </table> </fieldset> <fieldset> <legend><{$smarty.const._SMALLWORLD_STEP2}></legend> <table border="0" class="smallworld_table" cellspacing="0" cellpadding="0"> + <{if $show_emails != 'no'}> <tr> <p class="emails"> <td valign="top"><p><{$smarty.const._SMALLWORLD_EMAILS}></p></td> @@ -135,6 +153,9 @@ </td> </p> </tr> + <{/if}> + + <{if $show_screennames != 'no'}> <tr> <td valign="top"><p><{$smarty.const._SMALLWORLD_SCREENNAMES}></p></td> <td><label for="Screenname"></label> @@ -144,6 +165,9 @@ </td> </tr> + <{/if}> + + <{if $show_mobile != 'no'}> <tr> <td valign="top"><p><{$smarty.const._SMALLWORLD_MOBILEPHONE}></p></td> <td> @@ -152,8 +176,9 @@ <{/section}> </td> </tr> + <{/if}> - + <{if $show_landphone != 'no'}> <tr> <td valign="top"><p><{$smarty.const._SMALLWORLD_LANDPHONE}></p></td> <td> @@ -162,7 +187,9 @@ <{/section}> </td> </tr> + <{/if}> + <{if $show_adress != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_ADRESS}></p></td> <td> @@ -171,6 +198,9 @@ <{/section}> </td> </tr> + <{/if}> + + <{if $show_city != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_CITY}></p></td> <div class="ui-widget"> @@ -190,7 +220,6 @@ </td><td style="right:2px" id="cityflag"></td> </div> </tr> - <tr> <td><p><{$smarty.const._SMALLWORLD_COUNTRY}></p></td> <td> @@ -199,17 +228,22 @@ <{/section}> </td> </tr> + <{/if}> + + <{if $show_website != 'no'}> <tr> <td valign="top"><p><{$smarty.const._SMALLWORLD_WEBSITE}></p></td> <td><textarea name="website" id="website">http://</textarea> </td> </tr> + <{/if}> </table><br/> </fieldset> <fieldset> <legend><{$smarty.const._SMALLWORLD_STEP3}></legend> <table border="0" class="smallworld_table" cellspacing="0" cellpadding="0"> + <{if $show_interests != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_INTERESTS}></p></td> <td> @@ -217,9 +251,11 @@ <{$interests[i]}> <{/section}> </td> - </tr> + </tr> + <{/if}> + + <{if $show_music != 'no'}> <tr> - <td><p><{$smarty.const._SMALLWORLD_FAVOURITEMUSIC}></p></td> <td> <{section name=i loop=$music}> @@ -227,7 +263,9 @@ <{/section}> </td> </tr> + <{/if}> + <{if $show_tv != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_FAVOURITETVSHOW}></p></td> <td> @@ -236,7 +274,9 @@ <{/section}> </textarea></td> </tr> + <{/if}> + <{if $show_movies != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_FAVOURITEMOVIES}></p></td> <td> @@ -244,8 +284,10 @@ <{$movie[i]}> <{/section}> </td> - </tr> + </tr> + <{/if}> + <{if $show_books != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_FAVOURITEBOOKS}></p></td> <td> @@ -254,7 +296,9 @@ <{/section}> </td> </tr> - + <{/if}> + + <{if $show_aboutme != 'no'}> <tr> <td><p><{$smarty.const._SMALLWORLD_ABOUTME}></p></td> <td> @@ -263,6 +307,7 @@ <{/section}> </td> </tr> + <{/if}> <tr> <td ></td> </tr><br/> @@ -273,20 +318,23 @@ <fieldset> <legend><{$smarty.const._SMALLWORLD_STEP4}></legend> <table border="0" class="smallworld_table" cellspacing="0" cellpadding="0"> + <{if $show_school != 'no'}> <tr> - <label for="School"></label> - <td> - <{section name=i loop=$school}> - <{$school[i]}> - <{/section}> - </td> - </tr> + <label for="School"></label> + <td> + <{section name=i loop=$school}> + <{$school[i]}> + <{/section}> + </td> + </tr> + <{/if}> </table> </fieldset> <fieldset> <legend><{$smarty.const._SMALLWORLD_STEP5}></legend> <table border="0" class="smallworld_table" cellspacing="0" cellpadding="0"> + <{if $show_jobs != 'no'}> <tr> <label for="Job"></label> <td> @@ -295,6 +343,7 @@ <{/section}> </td> </tr> + <{/if}> </table> </fieldset> Modified: XoopsModules/smallworld/trunk/xoops_version.php =================================================================== --- XoopsModules/smallworld/trunk/xoops_version.php 2012-01-16 13:36:04 UTC (rev 8742) +++ XoopsModules/smallworld/trunk/xoops_version.php 2012-01-16 14:29:22 UTC (rev 8743) @@ -171,6 +171,7 @@ $modversion['config'][$i]['valuetype'] = 'array'; $modversion['config'][$i]['options'] = array( '_MI_SMALLWORLD_REALNAME' => 'realname', '_MI_SMALLWORLD_INTERESTEDIN' => 'interestedin', + '_MI_SMALLWORLD_RELATIONSHIPSTATUS' => 'relationshipstatus', '_MI_SMALLWORLD_PARTNER' => 'partner', '_MI_SMALLWORLD_LOOKINGFOR' => 'lookingfor', '_MI_SMALLWORLD_BIRTHDAY' => 'birthday', @@ -195,6 +196,7 @@ '_MI_SMALLWORLD_EMPLOYMENT' => 'employment',); $modversion['config'][$i]['default'] = array( 'realname', 'interestedin', + 'relationshipstatus', 'partner', 'lookingfor', 'birthday', @@ -227,6 +229,7 @@ $modversion['config'][$i]['valuetype'] = 'array'; $modversion['config'][$i]['options'] = array( '_MI_SMALLWORLD_REALNAME' => 'realname', '_MI_SMALLWORLD_INTERESTEDIN' => 'interestedin', + '_MI_SMALLWORLD_RELATIONSHIPSTATUS' => 'relationshipstatus', '_MI_SMALLWORLD_PARTNER' => 'partner', '_MI_SMALLWORLD_LOOKINGFOR' => 'lookingfor', '_MI_SMALLWORLD_BIRTHDAY' => 'birthday', @@ -251,6 +254,7 @@ '_MI_SMALLWORLD_EMPLOYMENT' => 'employment',); $modversion['config'][$i]['default'] = array( 'realname', 'interestedin', + 'relationshipstatus', 'partner', 'lookingfor', 'birthday', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |