Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion manager/actions/mutate_module.dynamic.php
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ function SetUrl(url, width, height, alt) {
<input type="hidden" name="mode" value="<?= $modx->manager->action ?>">

<h1>
<i class="fa fa-cubes"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>
<i class="<?= ($content['icon'] != '' ? $content['icon'] : $_style['icons_module']) ?>"></i><?= ($content['name'] ? $content['name'] . '<small>(' . $content['id'] . ')</small>' : $_lang['new_module']) ?><i class="fa fa-question-circle help"></i>
</h1>

<?= $_style['actionbuttons']['dynamic']['element'] ?>
Expand Down
8 changes: 4 additions & 4 deletions manager/frames/mainmenu.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
$sitemenu['modules'] = array(
'modules',
'main',
'<i class="fa fa-cubes"></i>' . $_lang['modules'],
'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['modules'],
'javascript:;',
$_lang['modules'],
' return false;',
Expand Down Expand Up @@ -210,7 +210,7 @@
$sitemenu['new_module'] = array(
'new_module',
'modules',
'<i class="fa fa-cubes"></i>' . $_lang['module_management'],
'<i class="'.$_style['icons_modules'] .'"></i>' . $_lang['module_management'],
'index.php?a=106',
$_lang['module_management'],
'',
Expand All @@ -224,7 +224,7 @@

if($modx->hasPermission('exec_module')) {
if($_SESSION['mgrRole'] != 1 && !empty($modx->config['use_udperms'])) {
$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, mg.member
$rs = $modx->db->query('SELECT DISTINCT sm.id, sm.name, sm,icon, mg.member
FROM ' . $modx->getFullTableName('site_modules') . ' AS sm
LEFT JOIN ' . $modx->getFullTableName('site_module_access') . ' AS sma ON sma.module = sm.id
LEFT JOIN ' . $modx->getFullTableName('member_groups') . ' AS mg ON sma.usergroup = mg.user_group
Expand All @@ -238,7 +238,7 @@
$sitemenu['module' . $row['id']] = array(
'module' . $row['id'],
'modules',
($row['name'] == 'Extras' ? '<i class="fa fa-archive"></i>' : '<i class="fa fa-cube"></i>') . $row['name'],
($row['icon'] != '' ? '<i class="'.$row['icon'].'"></i>' : '<i class="'.$_style['icons_module'].'"></i>') . $row['name'],
'index.php?a=112&id=' . $row['id'],
$row['name'],
'',
Expand Down