Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[11712] XoopsModules/smallworld/trunk/smallworld
|
From: <dj...@us...> - 2013-06-17 17:20:46
|
Revision: 11712
http://sourceforge.net/p/xoops/svn/11712
Author: djculex
Date: 2013-06-17 17:20:44 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
Bugfix: Missing settings and colorbox in a few places
Bugfix: html tags breaks up changelog.txt (mamba)
Modified Paths:
--------------
XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
XoopsModules/smallworld/trunk/smallworld/include/functions.php
XoopsModules/smallworld/trunk/smallworld/publicindex.php
XoopsModules/smallworld/trunk/smallworld/templates/smallworld_publicindex.html
Modified: XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2013-06-17 17:16:51 UTC (rev 11711)
+++ XoopsModules/smallworld/trunk/smallworld/docs/changelog.txt 2013-06-17 17:20:44 UTC (rev 11712)
@@ -32,7 +32,7 @@
Bugfix : Parsing links double
Bugfix : Removing nl2br (module.sanitizer already does this)
bugfix : Min xoops is 2.5.5 not 2.55
-Bugfix : Aparently function smallworld_xv_getGroupd (); needs to be defined. Solution include function file
+Bugfix : Aparently function smallworld_xv_getGroupd () needs to be defined. Solution include function file
@@ -210,7 +210,7 @@
- Bugfix: Merging a few css files into smallworld.css
- Bugfix: Correction language/danish/js/bookmark.js
- Bugfix: Calculating age in profile was (-1 year) when month == this month. Now only if day < this day
-- Bugfix: added some return false; or e.preventDefault; to js functions
+- Bugfix: added some return false or e.preventDefault to js functions
- Bugfix: After pressing 'more' - avatar size in comment is wrong
- Change: Preparing test for adding js / css to templates via function based on request page
@@ -263,9 +263,9 @@
- Bugfix: Added check for preloads javascript vars to see if vars is already defined (djculex)
- Bugfix: html_entity_decode is not set in returning image link or post from image uploads (djculex)
- Bugfix: Spelling error in english/main.php (tanks -> thanks) (djculex)
-- Bugfix: on close upload new images do (location.href = 'editimages.php';) instead of index.php
+- Bugfix: on close upload new images do (location.href = 'editimages.php') instead of index.php
- Bugfix: css url() pointing to wrong folder (djculex)
-- Bugfix: Removed empty <td></td>
+- Bugfix: Removed empty
- Bugfix: moved ui-anim_basic_16x16.gif to ..images/
- Change: Changed update text when upload new images to use image and default uploaded new text (djculex)
@@ -274,7 +274,7 @@
- Bugfix: Discovered jquery was 1.5.1 -> Updated to 1.7.1
- Bugfix: Jquery 1.7.1 revealed bugs in show more/less on updates (djculex)
- Bugfix: changed selector name .finish to .smallworld_finish
-- Bugfix: Changed multible return false; to e.preventDefault();
+- Bugfix: Changed multible return false to e.preventDefault()
- Changed: css, jquery for new addions
- Changed: claning up code etc
@@ -314,7 +314,7 @@
- change $modversion name due to name too long for mysql thus being cut short (djculex)
25. januar 2012
-- Implimenting colorbox instead of jquery dialog(); (djculex)
+- Implimenting colorbox instead of jquery dialog() (djculex)
- Correction in stats() function to show correct user avatar (djculex)
- Css adjustments (djculex)
- Re-attach validate to colorbox forms (djculex)
Modified: XoopsModules/smallworld/trunk/smallworld/include/functions.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/include/functions.php 2013-06-17 17:16:51 UTC (rev 11711)
+++ XoopsModules/smallworld/trunk/smallworld/include/functions.php 2013-06-17 17:20:44 UTC (rev 11712)
@@ -1127,7 +1127,8 @@
$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/smallworld.css');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.innerfade.js');
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.elastic.source.js');
- $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.bookmark.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.bookmark.js');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.colorbox.js');
break;
case 'index':
@@ -1201,6 +1202,7 @@
$xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.bookmark.js');
$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/oembed.css');
$xoTheme->addStylesheet(XOOPS_URL.'/modules/smallworld/css/smallworld.css');
+ $xoTheme->addScript(XOOPS_URL.'/modules/smallworld/js/jquery.colorbox.js');
break;
case 'userprofile':
Modified: XoopsModules/smallworld/trunk/smallworld/publicindex.php
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/publicindex.php 2013-06-17 17:16:51 UTC (rev 11711)
+++ XoopsModules/smallworld/trunk/smallworld/publicindex.php 2013-06-17 17:20:44 UTC (rev 11712)
@@ -67,6 +67,11 @@
} else {
$xoopsTpl->assign('isadminuser', 'NO');
}
+
+ // Create form for private settings
+ $form = new SmallWorldForm;
+ $usersettings = $form->usersettings ($id, $selected=null);
+ $xoopsTpl->assign('usersetting', $usersettings);
/* if (!$xoopsUser && $set['access']==1) {
*/
Modified: XoopsModules/smallworld/trunk/smallworld/templates/smallworld_publicindex.html
===================================================================
--- XoopsModules/smallworld/trunk/smallworld/templates/smallworld_publicindex.html 2013-06-17 17:16:51 UTC (rev 11711)
+++ XoopsModules/smallworld/trunk/smallworld/templates/smallworld_publicindex.html 2013-06-17 17:20:44 UTC (rev 11712)
@@ -248,6 +248,7 @@
<{/foreach}>
</table>
</div>
+ <{$usersetting}>
<div id="smallworldStatsDiv" title="<{$smarty.const._SMALLWORLD_STATS}>" style="display:none;"></div>
<{else}>
<div id="smallworld_notyetregistered" title="<{$smarty.const._SMALLWORLD_NOTYETREGISTERED_TITLE}>">
|
