diff options
| author | Christian Klinger | 2016-06-15 16:43:17 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-06-15 16:43:17 +0200 |
| commit | 2b18d0d0c49c3a75bd221ab86b7315f7bae98008 (patch) | |
| tree | 7d44e103224c1a79e8ccdd5d0313f76180847303 /modules-available/main | |
| parent | small style changes (diff) | |
| parent | [sysconfignew] Move css from global file to module specific one (diff) | |
| download | slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.tar.gz slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.tar.xz slx-admin-2b18d0d0c49c3a75bd221ab86b7315f7bae98008.zip | |
Merge branch 'modularization' of git.openslx.org:openslx-ng/slx-admin into modularization
Conflicts:
install/content.sql
install/schema.sql
Diffstat (limited to 'modules-available/main')
| -rw-r--r-- | modules-available/main/hooks/translation.inc.php | 17 | ||||
| -rw-r--r-- | modules-available/main/templates/main-menu.html | 3 |
2 files changed, 4 insertions, 16 deletions
diff --git a/modules-available/main/hooks/translation.inc.php b/modules-available/main/hooks/translation.inc.php index c831cbfd..03fa5f79 100644 --- a/modules-available/main/hooks/translation.inc.php +++ b/modules-available/main/hooks/translation.inc.php @@ -6,7 +6,7 @@ $HANDLER = array(); * List of valid subsections */ $HANDLER['subsections'] = array( - 'categories', 'global-tags' + 'global-tags' ); /* @@ -15,21 +15,6 @@ $HANDLER['subsections'] = array( */ /** - * Configuration categories - */ -$HANDLER['grep_categories'] = function($module) { - $skip = strlen($module->getIdentifier()) + 1; - $want = array(); - foreach (Module::getAll() as $module) { - $cat = $module->getCategory(); - if (is_string($cat)) { - $want[substr($cat, $skip)] = true; - } - } - return $want; -}; - -/** * Global tags. * This just returns the union of global tags of all languages, as there is no * way to define a definite set of required global tags. diff --git a/modules-available/main/templates/main-menu.html b/modules-available/main/templates/main-menu.html index b14d1ace..7c104e92 100644 --- a/modules-available/main/templates/main-menu.html +++ b/modules-available/main/templates/main-menu.html @@ -33,6 +33,9 @@ <ul class="dropdown-menu sidebar-visible-block" role="menu"> {{#modules}} <li class="{{className}}"><a href="?do={{identifier}}">{{displayName}}</a></li> + {{#subMenu}} + <li class="slx-submenu"><a href="{{url}}">{{name}}</a></li> + {{/subMenu}} {{/modules}} </ul> </li> |