Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[10664] XoopsCore/branches/2.6.x/2.6.0/htdocs/modules /system
|
From: <du...@us...> - 2013-01-04 20:53:50
|
Revision: 10664
http://sourceforge.net/p/xoops/svn/10664
Author: dugris
Date: 2013-01-04 20:53:47 +0000 (Fri, 04 Jan 2013)
Log Message:
-----------
Add icon modules to user and main menu
Modified Paths:
--------------
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html
XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php 2013-01-04 20:16:17 UTC (rev 10663)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/main.php 2013-01-04 20:53:47 UTC (rev 10664)
@@ -36,7 +36,10 @@
foreach (array_keys($modules) as $i) {
if (in_array($i, $read_allowed)) {
$block['modules'][$i]['name'] = $modules[$i]->getVar('name');
- $block['modules'][$i]['directory'] = $modules[$i]->getVar('dirname');
+ $block['modules'][$i]['dirname'] = $modules[$i]->getVar('dirname');
+ if (file_exists($xoops->path('modules/' . $modules[$i]->getVar('dirname') . '/icons/logo_small.png'))) {
+ $block['modules'][$i]['image'] = $xoops->url('modules/' . $modules[$i]->getVar('dirname') . '/icons/logo_small.png');
+ }
if ($xoops->isModule() && ($i == $xoops->module->getVar('mid'))) {
$block['modules'][$i]['highlight'] = true;
$block['nothome'] = true;
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php 2013-01-04 20:16:17 UTC (rev 10663)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/blocks/user.php 2013-01-04 20:53:47 UTC (rev 10664)
@@ -38,6 +38,7 @@
if ($plugin = Xoops_Module_Plugin::getPlugin($extension->getVar('dirname'), 'system')) {
if (method_exists($plugin, 'userMenus') && $plugin->userMenus()) {
$block['modules'][$i]['name'] = $extension->getVar('name');
+ $block['modules'][$i]['dirname'] = $extension->getVar('dirname');
$block['modules'][$i]['link'] = $xoops->url('modules/' . $extension->getVar('dirname') . '/');
if (file_exists($xoops->path('modules/' . $extension->getVar('dirname') . '/icons/logo_small.png'))) {
$block['modules'][$i]['image'] = $xoops->url('modules/' . $extension->getVar('dirname') . '/icons/logo_small.png');
@@ -95,7 +96,7 @@
array_push($block['modules'], array('name' => $name,
'link' => $xoops->url('viewpmsg.php'),
- 'icon' => 'icon-wrench',
+ 'icon' => 'icon-envelope',
'class' => $class,
));
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html 2013-01-04 20:16:17 UTC (rev 10663)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_mainmenu.html 2013-01-04 20:53:47 UTC (rev 10664)
@@ -1,3 +1,18 @@
+<style type="text/css">
+ <{foreachq from=$block.modules item=module}>
+ <{if $module.image}>
+ .<{$module.dirname}>-icon {
+ background-image: url('<{$module.image}>');
+ background-size: 16px 16px;
+ background-position: 0 0;
+ width: 14px;
+ height: 14px;
+ line-height: 14px;
+ vertical-align: text-top;
+ }
+ <{/if}>
+ <{/foreach}>
+</style>
<ul class="nav nav-list">
<li class="<{if !$block.nothome}>active<{/if}>">
<a href="<{xoAppUrl }>" title="<{$block.lang_home}>">
@@ -8,8 +23,8 @@
<!-- start module menu loop -->
<{foreach item=module from=$block.modules}>
<li class="<{if $module.highlight}>active<{/if}>">
- <a class="" href="<{$xoops_url}>/modules/<{$module.directory}>/" title="<{$module.name}>">
- <i class="icon-tags <{if $module.highlight}>icon-white<{/if}>"></i>
+ <a class="" href="<{$xoops_url}>/modules/<{$module.dirname}>/" title="<{$module.name}>">
+ <i class="icon-tags <{$module.dirname}>-icon<{if $module.highlight}> icon-white<{/if}>"></i>
<{$module.name}>
</a>
<{if $module.sublinks}>
Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html 2013-01-04 20:16:17 UTC (rev 10663)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/blocks/system_block_user.html 2013-01-04 20:53:47 UTC (rev 10664)
@@ -1,3 +1,18 @@
+<style type="text/css">
+ <{foreachq from=$block.modules item=module}>
+ <{if $module.image}>
+ .<{$module.dirname}>-icon {
+ background-image: url('<{$module.image}>');
+ background-size: 16px 16px;
+ background-position: 0 0;
+ width: 14px;
+ height: 14px;
+ line-height: 14px;
+ vertical-align: text-top;
+ }
+ <{/if}>
+ <{/foreach}>
+</style>
<ul class="nav nav-list">
<{foreachq from=$block.modules item=module}>
<li<{if $module.link == $block.active_url}> class="active"<{/if}>>
@@ -2,3 +17,3 @@
<a <{if $module.class}>class="<{$module.class}>"<{/if}> href="<{$module.link}>" title="<{$module.name}>" <{if $module.rel}>rel="<{$module.rel}>"<{/if}>>
- <i class="<{$module.icon}>"></i>
+ <i class="<{$module.icon}> <{$module.dirname}>-icon"></i>
<{$module.name}>
|
