Menu
▾
▴
[xoops-svn] SF.net SVN: xoops:[8630] XoopsCore/branches/2.6.x/2.6.0/htdocs
|
From: <be...@us...> - 2012-01-03 22:47:21
|
Revision: 8630
http://xoops.svn.sourceforge.net/xoops/?rev=8630&view=rev
Author: beckmi
Date: 2012-01-03 22:47:14 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
- adjusting message icons links
- fixing Smarty Plugins with links to Icon folders
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/pmsg.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/viewpmsg.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoModuleIcons16.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoModuleIcons32.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoModuleIconsBookmarks.php
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/pmsg.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/pmsg.php 2012-01-02 23:04:32 UTC (rev 8629)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/language/english/pmsg.php 2012-01-03 22:47:14 UTC (rev 8630)
@@ -42,5 +42,5 @@
define('_PM_ONLINE', 'Online');
//XOOPS 2.5.2
define('_PM_SURE_TO_DELETE',"Are you sure you want to delete these message(s)?");
-
-?>
\ No newline at end of file
+//XOOPS 2.5.5
+define('_PM_READ', 'Already Read');
\ No newline at end of file
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/viewpmsg.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/viewpmsg.php 2012-01-02 23:04:32 UTC (rev 8629)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/viewpmsg.php 2012-01-03 22:47:14 UTC (rev 8630)
@@ -71,13 +71,14 @@
} else {
$display = 1;
}
+
for ($i = 0; $i < $total_messages; $i++) {
$class = ($i % 2 == 0) ? 'even' : 'odd';
echo "<tr class='$class txtleft'><td class='aligntop width2 txtcenter'><input type='checkbox' id='msg_id[]' name='msg_id[]' value='" . $pm_arr[$i]->getVar("msg_id") . "' /></td>\n";
if ($pm_arr[$i]->getVar('read_msg') == 1) {
- echo "<td class='aligntop width5 txtcenter'><img src='images/email_read.png' alt='" . _PM_READ . "' title='" . _PM_READ . "' /></td>\n";
+ echo "<td class='aligntop width5 txtcenter'><img src= media/xoops/images/icons/16/mail_read.png alt='" . _PM_READ . "' title='" . _PM_READ . "' /></td>\n";
} else {
- echo "<td class='aligntop width5 txtcenter'><img src='images/email_notread.png' alt='" . _PM_NOTREAD . "' title='" . _PM_NOTREAD . "' /></td>\n";
+ echo "<td class='aligntop width5 txtcenter'><img src= media/xoops/images/icons/16/mail_notread.png alt='" . _PM_NOTREAD . "' title='" . _PM_NOTREAD . "' /></td>\n";
}
$iconName = $pm_arr[$i]->getVar("msg_image", "E");
if ($iconName != '') {
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoModuleIcons16.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoModuleIcons16.php 2012-01-02 23:04:32 UTC (rev 8629)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoModuleIcons16.php 2012-01-03 22:47:14 UTC (rev 8630)
@@ -23,13 +23,13 @@
$xoops = Xoops::getInstance();
- if (file_exists($xoops->path('Frameworks/moduleclasses/icons/16/index.html'))) {
- $url = $xoops->url('Frameworks/moduleclasses/icons/16/' . $argStr);
+ if (file_exists($xoops->path('media/xoops/images/icons/16/index.html'))) {
+ $url = $xoops->url('media/xoops/images/icons/16/' . $argStr);
} else {
if (file_exists($xoops->path('modules/system/images/icons/default/' . $argStr))) {
$url = $xoops->url('modules/system/images/icons/default/' . $argStr);
} else {
- $url = $xoops->url('modules/system/images/icons/default/xoops/xoops.png');
+ $url = $xoops->url('modules/system/images/icons/default/xoops/xoops2.png');
}
}
return "\necho '" . addslashes($url) . "';";
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoModuleIcons32.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoModuleIcons32.php 2012-01-02 23:04:32 UTC (rev 8629)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoModuleIcons32.php 2012-01-03 22:47:14 UTC (rev 8630)
@@ -24,8 +24,8 @@
$icons = $xoops->getModuleConfig('typeicons', 'system');
if ( $icons == '' ) $icons = 'default';
- if ( file_exists( $xoops->path('Frameworks/moduleclasses/icons/32/' . $icons . '/index.html'))) {
- $url = $xoops->url( 'Frameworks/moduleclasses/icons/32/' . $icons . '/' . $argStr );
+ if ( file_exists( $xoops->path('media/xoops/images/icons/32/' . $icons . '/index.html'))) {
+ $url = $xoops->url( 'media/xoops/images/icons/32/' . $icons . '/' . $argStr );
} else {
if ( file_exists( $xoops->path('modules/system/images/icons/default/' . $argStr ))) {
$url = $xoops->url( 'modules/system/images/icons/default/' . $argStr );
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoModuleIconsBookmarks.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoModuleIconsBookmarks.php 2012-01-02 23:04:32 UTC (rev 8629)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/xoops_lib/smarty/xoops_plugins/compiler.xoModuleIconsBookmarks.php 2012-01-03 22:47:14 UTC (rev 8630)
@@ -22,8 +22,8 @@
{
$xoops = Xoops::getInstance();
- if (file_exists($xoops->path('Frameworks/moduleclasses/icons/bookmarks/index.html'))) {
- $url = $xoops->url('Frameworks/moduleclasses/icons/bookmarks/' . $argStr);
+ if (file_exists($xoops->path('media/xoops/images/icons/bookmarks/index.html'))) {
+ $url = $xoops->url('media/xoops/images/icons/bookmarks/' . $argStr);
} else {
if (file_exists($xoops->path('modules/system/images/icons/default/' . $argStr))) {
$url = $xoops->url('modules/system/images/icons/default/' . $argStr);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
