diff options
author | Simon Rettberg | 2016-04-28 21:31:15 +0200 |
---|---|---|
committer | Simon Rettberg | 2016-04-28 21:31:15 +0200 |
commit | 95db8e184b378534db0ac08d14ae8500ee5090c3 (patch) | |
tree | f39cee8160ef4266e49dbe04d3e8fe6400ce2133 /modules | |
parent | Merge branch 'master' into modularization (diff) | |
download | slx-admin-95db8e184b378534db0ac08d14ae8500ee5090c3.tar.gz slx-admin-95db8e184b378534db0ac08d14ae8500ee5090c3.tar.xz slx-admin-95db8e184b378534db0ac08d14ae8500ee5090c3.zip |
Implemented new menu, added logic for defining dependencies, move translation files around
Diffstat (limited to 'modules')
59 files changed, 141 insertions, 149 deletions
diff --git a/modules/adduser/config.json b/modules/adduser/config.json index d5da4cc8..4da67ef8 100644 --- a/modules/adduser/config.json +++ b/modules/adduser/config.json @@ -1,4 +1,3 @@ { - "category":"hidden", "enabled":"true" } diff --git a/modules/adduser/module.inc.php b/modules/adduser/page.inc.php index c236cb6f..c236cb6f 100644 --- a/modules/adduser/module.inc.php +++ b/modules/adduser/page.inc.php diff --git a/modules/backup/config.json b/modules/backup/config.json index 4e7fa5fb..6c189b63 100644 --- a/modules/backup/config.json +++ b/modules/backup/config.json @@ -1,4 +1,4 @@ { - "category":"content", + "category":"main.content", "enabled":"true" } diff --git a/modules/backup/module.inc.php b/modules/backup/page.inc.php index 4095f875..4095f875 100644 --- a/modules/backup/module.inc.php +++ b/modules/backup/page.inc.php diff --git a/modules/baseconfig/config.json b/modules/baseconfig/config.json index 93209f62..b72e9c23 100644 --- a/modules/baseconfig/config.json +++ b/modules/baseconfig/config.json @@ -1,4 +1,4 @@ { - "category":"settings", - "enabled":"true" + "category": "main.settings", + "enabled": true } diff --git a/modules/baseconfig/lang/en/module.json b/modules/baseconfig/lang/en/module.json new file mode 100644 index 00000000..7b1bb316 --- /dev/null +++ b/modules/baseconfig/lang/en/module.json @@ -0,0 +1,3 @@ +{ + "module_name": "Config Variables" +} diff --git a/modules/baseconfig/module.inc.php b/modules/baseconfig/page.inc.php index 3d187d30..3d187d30 100644 --- a/modules/baseconfig/module.inc.php +++ b/modules/baseconfig/page.inc.php diff --git a/modules/baseconfig/templates/_page.html b/modules/baseconfig/templates/_page.html index c72f0a5e..273ee50c 100644 --- a/modules/baseconfig/templates/_page.html +++ b/modules/baseconfig/templates/_page.html @@ -163,16 +163,6 @@ <input type="hidden" name="token" value="{{token}}"> </form> <script type="text/javascript"> -document.getElementById("cat-extra-6").innerHTML = "<div class='list-group'> <div class='list-group-item' style='background-color:#f5f5f5;color:#428bca;'> " + -"{{lang_catPartition}} <span style='display:inline-block; float: right; margin-top: -7px;'> <a class='btn btn-default ' data-toggle='modal' " + -"data-target='#add-partition'> <span class='glyphicon glyphicon-plus'></span> </a> </span> </div> {{#partitions}} <div class='list-group-item'> " + -"<div class='row'> <div class='col-md-1'> <input name='partition-{{id}}-partition_id' type='text' class='form-control' size='30' value='{{partition_id}}'" + -" placeholder='{{lang_partitionId}}' /> </div> <div class='col-md-1'> <input name='partition-{{id}}-size' type='text' class='form-control' size='30' " + -"value='{{size}}' placeholder='{{lang_partitionSize}}'/> </div> <div class='col-md-4'> <input name='partition-{{id}}-mount_point' type='text' " + -"class='form-control' size='30' value='{{mount_point}}' placeholder='{{lang_partitionMountPoint}}'/> </div> <div class='col-md-4'> <input " + -"name='partition-{{id}}-options' type='text' class='form-control' size='30' value='{{options}}' placeholder='{{lang_partitionOptions}}'/> </div> " + -"<div class='col-md-2'> <a class='btn btn-danger' href='?do=BaseConfig&deletePartition={{id}}&token={{token}}' ><span class='glyphicon glyphicon-trash'>" + -"</span> {{lang_delete}}</a> </div> </div> </div> {{/partitions}} </div> </div>"; function saveConfig(){ if(confirm('{{lang_confirm}}')) @@ -181,6 +171,18 @@ function saveConfig(){ window.location = 'api.php?do=getconfig&user={{user}}'; } -$("[name^='switch']").bootstrapSwitch(); +document.addEventListener("DOMContentLoaded", function() { + document.getElementById("cat-extra-6").innerHTML = "<div class='list-group'> <div class='list-group-item' style='background-color:#f5f5f5;color:#428bca;'> " + + "{{lang_catPartition}} <span style='display:inline-block; float: right; margin-top: -7px;'> <a class='btn btn-default ' data-toggle='modal' " + + "data-target='#add-partition'> <span class='glyphicon glyphicon-plus'></span> </a> </span> </div> {{#partitions}} <div class='list-group-item'> " + + "<div class='row'> <div class='col-md-1'> <input name='partition-{{id}}-partition_id' type='text' class='form-control' size='30' value='{{partition_id}}'" + + " placeholder='{{lang_partitionId}}' /> </div> <div class='col-md-1'> <input name='partition-{{id}}-size' type='text' class='form-control' size='30' " + + "value='{{size}}' placeholder='{{lang_partitionSize}}'/> </div> <div class='col-md-4'> <input name='partition-{{id}}-mount_point' type='text' " + + "class='form-control' size='30' value='{{mount_point}}' placeholder='{{lang_partitionMountPoint}}'/> </div> <div class='col-md-4'> <input " + + "name='partition-{{id}}-options' type='text' class='form-control' size='30' value='{{options}}' placeholder='{{lang_partitionOptions}}'/> </div> " + + "<div class='col-md-2'> <a class='btn btn-danger' href='?do=BaseConfig&deletePartition={{id}}&token={{token}}' ><span class='glyphicon glyphicon-trash'>" + + "</span> {{lang_delete}}</a> </div> </div> </div> {{/partitions}} </div> </div>"; + $("[name^='switch']").bootstrapSwitch(); +} </script> diff --git a/modules/citymanagement/config.json b/modules/citymanagement/config.json index 3cd4afd3..aff54b3a 100644 --- a/modules/citymanagement/config.json +++ b/modules/citymanagement/config.json @@ -1,5 +1,4 @@ { - "category":"hidden", "enabled":"false", "permission":"0" } diff --git a/modules/citymanagement/module.inc.php b/modules/citymanagement/page.inc.php index acc30bf9..acc30bf9 100644 --- a/modules/citymanagement/module.inc.php +++ b/modules/citymanagement/page.inc.php diff --git a/modules/dozmod/config.json b/modules/dozmod/config.json index 4e7fa5fb..6c189b63 100644 --- a/modules/dozmod/config.json +++ b/modules/dozmod/config.json @@ -1,4 +1,4 @@ { - "category":"content", + "category":"main.content", "enabled":"true" } diff --git a/modules/dozmod/module.inc.php b/modules/dozmod/page.inc.php index f98d8952..f98d8952 100644 --- a/modules/dozmod/module.inc.php +++ b/modules/dozmod/page.inc.php diff --git a/modules/eventlog/config.json b/modules/eventlog/config.json index d42dc3e3..650ab2fe 100644 --- a/modules/eventlog/config.json +++ b/modules/eventlog/config.json @@ -1,4 +1,4 @@ { - "category":"status", + "category":"main.status", "enabled":"true" } diff --git a/modules/eventlog/module.inc.php b/modules/eventlog/page.inc.php index 7cfc8a55..7cfc8a55 100644 --- a/modules/eventlog/module.inc.php +++ b/modules/eventlog/page.inc.php diff --git a/modules/imgmanagement/config.json b/modules/imgmanagement/config.json index 49daa91a..5c5c05ca 100644 --- a/modules/imgmanagement/config.json +++ b/modules/imgmanagement/config.json @@ -1,5 +1,4 @@ { - "category":"hidden", "enabled":"false", "permission":"1" } diff --git a/modules/imgmanagement/module.inc.php b/modules/imgmanagement/page.inc.php index 27844e23..27844e23 100644 --- a/modules/imgmanagement/module.inc.php +++ b/modules/imgmanagement/page.inc.php diff --git a/modules/internetaccess/config.json b/modules/internetaccess/config.json index 4e7fa5fb..6c189b63 100644 --- a/modules/internetaccess/config.json +++ b/modules/internetaccess/config.json @@ -1,4 +1,4 @@ { - "category":"content", + "category":"main.content", "enabled":"true" } diff --git a/modules/internetaccess/module.inc.php b/modules/internetaccess/page.inc.php index b949be26..b949be26 100644 --- a/modules/internetaccess/module.inc.php +++ b/modules/internetaccess/page.inc.php diff --git a/modules/locations/config.json b/modules/locations/config.json index 4e7fa5fb..6c189b63 100644 --- a/modules/locations/config.json +++ b/modules/locations/config.json @@ -1,4 +1,4 @@ { - "category":"content", + "category":"main.content", "enabled":"true" } diff --git a/modules/locations/module.inc.php b/modules/locations/page.inc.php index 60af719b..60af719b 100644 --- a/modules/locations/module.inc.php +++ b/modules/locations/page.inc.php diff --git a/modules/main/category-icons.json b/modules/main/category-icons.json new file mode 100644 index 00000000..97b76eac --- /dev/null +++ b/modules/main/category-icons.json @@ -0,0 +1,7 @@ +{ + "cities":"tower", + "content":"th", + "settings":"cog", + "status":"tasks", + "users":"user" +}
\ No newline at end of file diff --git a/modules/main/config.json b/modules/main/config.json index d5da4cc8..4da67ef8 100644 --- a/modules/main/config.json +++ b/modules/main/config.json @@ -1,4 +1,3 @@ { - "category":"hidden", "enabled":"true" } diff --git a/modules/main/lang/en/categories.json b/modules/main/lang/en/categories.json new file mode 100644 index 00000000..3d67bcfd --- /dev/null +++ b/modules/main/lang/en/categories.json @@ -0,0 +1,6 @@ +{ + "settings": "Settings", + "status": "Status", + "content": "Content", + "users": "Users" +} diff --git a/modules/main/lang/en/templates/dialog-generic.json b/modules/main/lang/en/templates/dialog-generic.json new file mode 100644 index 00000000..c7551ed3 --- /dev/null +++ b/modules/main/lang/en/templates/dialog-generic.json @@ -0,0 +1,3 @@ +{ + "lang_next": "Next" +}
\ No newline at end of file diff --git a/modules/main/lang/en/templates/main-menu.json b/modules/main/lang/en/templates/main-menu.json new file mode 100644 index 00000000..635c7aa8 --- /dev/null +++ b/modules/main/lang/en/templates/main-menu.json @@ -0,0 +1,28 @@ +{ + "lang_backup": "Backup\/Restore", + "lang_client": "Client", + "lang_clientLog": "Client Log", + "lang_clientStats": "Client statistics", + "lang_configurationBasic": "PXE\/Boot", + "lang_configurationVariables": "Configuration Variables", + "lang_dozmod": "Tutor module", + "lang_eventLog": "Server Log", + "lang_internetAccess": "Internet access", + "lang_language": "Language", + "lang_localization": "Localization", + "lang_locations": "Rooms\/Locations", + "lang_login": "Login", + "lang_logout": "Logout", + "lang_needsSetup": "Setup incomplete", + "lang_news": "vmChooser news", + "lang_server": "Server", + "lang_serverStatus": "Server status", + "lang_settings": "Settings", + "lang_status": "Status", + "lang_translations": "Translations", + "lang_vmLocation": "VM Location", + "lang_warning": "Warning", + "lang_webInterface": "Web interface", + "lang_loggedInPrefix": "Logged in as", + "lang_loggedInSuffix": " " +} diff --git a/modules/main/lang/en/templates/messagebox-warning.json b/modules/main/lang/en/templates/messagebox-warning.json new file mode 100644 index 00000000..2c63c085 --- /dev/null +++ b/modules/main/lang/en/templates/messagebox-warning.json @@ -0,0 +1,2 @@ +{ +} diff --git a/modules/main/lang/en/templates/page-main-guest.json b/modules/main/lang/en/templates/page-main-guest.json new file mode 100644 index 00000000..6526f5bd --- /dev/null +++ b/modules/main/lang/en/templates/page-main-guest.json @@ -0,0 +1,7 @@ +{ + "lang_introGuest": "This is the administration interface of the local bwLehrpool intallation. Please authenticate yourself to adjust settings.", + "lang_login": "Login", + "lang_noExistingAccount": "No account has been created yet. Sign up to become the administrator.", + "lang_register": "Register", + "lang_welcome": "Welcome" +}
\ No newline at end of file diff --git a/modules/main/lang/en/templates/page-main.json b/modules/main/lang/en/templates/page-main.json new file mode 100644 index 00000000..8031ac1c --- /dev/null +++ b/modules/main/lang/en/templates/page-main.json @@ -0,0 +1,11 @@ +{ + "lang_bootMenuWarning": "The boot menu is outdated or has not been generated.", + "lang_configure": "Configure", + "lang_intro": "This is the bwLehrpool configuration interface.", + "lang_minilinuxMissing": "Important files from the mini Linux installation are missing.", + "lang_numerOfImagesMarkedForDeletion": "Images marked for deletion", + "lang_systemConfiguration": "System Configuration", + "lang_systemConfigurationNotChosen": "A system configuration has not been chosen yet.", + "lang_vmLocationNotSet": "A location for the virtual machine is not set yet.", + "lang_welcome": "Welcome" +}
\ No newline at end of file diff --git a/modules/main/module.inc.php b/modules/main/page.inc.php index 369d4b54..369d4b54 100644 --- a/modules/main/module.inc.php +++ b/modules/main/page.inc.php diff --git a/modules/main/templates/main-menu.html b/modules/main/templates/main-menu.html index c4534c2f..556548e9 100644 --- a/modules/main/templates/main-menu.html +++ b/modules/main/templates/main-menu.html @@ -1,42 +1,64 @@ -<!-- Fixed navbar --> -<div class="navbar navbar-inverse navbar-fixed-top"> - <div class="container-fluid"> +<div class="slx-topbar"> + <div> + {{#dbupdate}} + <a href="api.php?do=update"><span class="slx-warning-badge badge"><span class="glyphicon glyphicon-exclamation-sign"></span> DB-Update</span></a> + {{/dbupdate}} + {{#warning}} + <a href="?do=EventLog"><span class="slx-warning-badge badge"><span class="glyphicon glyphicon-exclamation-sign"></span> {{lang_warning}}</span></a> + {{/warning}} + {{#needsSetup}} + <a href="?do=Main"><span class="slx-warning-badge badge"><span class="glyphicon glyphicon-exclamation-sign"></span> {{lang_needsSetup}}</span></a> + {{/needsSetup}} + </div> +</div> +<div class="sidebar-bg"></div> +<nav class="navbar navbar-inverse sidebar" role="navigation"> + <div class="container-fluid"> + <!-- Brand and toggle get grouped for better mobile display --> <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> + <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#bs-sidebar-navbar-collapse-1"> + <span class="sr-only">{{lang_toggleNavigation}}</span> <span class="icon-bar"></span> <span class="icon-bar"></span> <span class="icon-bar"></span> </button> - <a class="navbar-brand" href="?do=Main">OpenSLX Admin</a> + <a class="navbar-brand" href="#">OpenSLX</a> </div> - <div class="navbar-collapse collapse"> + <!-- Collect the nav links, forms, and other content for toggling --> + <div class="collapse navbar-collapse" id="bs-sidebar-navbar-collapse-1"> <ul class="nav navbar-nav"> - {{#dbupdate}} - <li><a href="api.php?do=update"><span class="slx-warning-badge badge"><span class="glyphicon glyphicon-exclamation-sign"></span> DB-Update</span></a></li> - {{/dbupdate}} - {{#warning}} - <li><a href="?do=EventLog"><span class="slx-warning-badge badge"><span class="glyphicon glyphicon-exclamation-sign"></span> {{lang_warning}}</span></a></li> - {{/warning}} - {{#needsSetup}} - <li><a href="?do=Main"><span class="slx-warning-badge badge"><span class="glyphicon glyphicon-exclamation-sign"></span> {{lang_needsSetup}}</span></a></li> - {{/needsSetup}} - </ul> - <ul class="nav navbar-nav navbar-right"> + {{#categories}} + <li class="dropdown"> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="sidebar-visible-inline {{icon}}"></span> {{displayName}}<b class="caret sidebar-hide"></b></a> + <ul class="dropdown-menu sidebar-visible-block" role="menu"> + {{#modules}} + <li class="{{className}}"><a href="?do={{identifier}}">{{displayName}}</a></li> + {{/modules}} + </ul> + </li> + {{/categories}} <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="lang/{{current_lang}}/flag.png"><b class="caret"></b></a> + <a href="#" class="dropdown-toggle" data-toggle="dropdown"> + <img src="lang/{{current_lang}}/flag.png" alt="{{current_lang}}"> + <span class="sidebar-visible-inline">{{lang_language}}</span> + <b class="caret"></b> + </a> <ul class="dropdown-menu"> + <li><a href="?do=Translation">{{lang_translations}}</a></li> <li class="dropdown-header">{{lang_language}}</li> {{#langs}} <li><a href="?lang={{cc}}&url={{url}}"><img src="lang/{{cc}}/flag.png" alt="{{name}}"> {{name}}</a></li> {{/langs}} </ul> </li> + </ul> + <ul class="nav navbar-nav navbar-right"> {{#user}} + <li><span>{{lang_loggedInPrefix}} {{user}} {{lang_loggedInSuffix}}</span></li> <li> <form method="post" action="?do=Session"> <input type="hidden" name="token" value="{{token}}"> <input type="hidden" name="action" value="logout"> - <b>{{user}}</b> <button class="btn btn-default btn-xs" type="submit">{{lang_logout}}</button> </form> </li> @@ -47,5 +69,4 @@ </ul> </div> </div> -</div> - +</nav> diff --git a/modules/main/templates/main-menu.html.topnavbar b/modules/main/templates/main-menu.html.topnavbar deleted file mode 100644 index 8da8edd0..00000000 --- a/modules/main/templates/main-menu.html.topnavbar +++ /dev/null @@ -1,92 +0,0 @@ -<!-- Fixed navbar --> -<div class="navbar navbar-default navbar-fixed-top"> - <div class="container"> - <div class="navbar-header"> - <button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse"> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="?do=Main">OpenSLX Admin</a> - </div> - <div class="navbar-collapse collapse"> - <ul class="nav navbar-nav"> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{lang_settings}}<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li class="dropdown-header">{{lang_client}}</li> - <li><a href="?do=News">{{lang_news}}</a></li> - <li><a href="?do=SysConfig">{{lang_localization}}</a></li> - <li><a href="?do=MiniLinux">bwLehrpool Mini-Linux</a></li> - <li><a href="?do=BaseConfig">{{lang_configurationVariables}}</a></li> - <li><a href="?do=Locations">{{lang_locations}}</a></li> - <li class="divider"></li> - <li class="dropdown-header">{{lang_server}}</li> - <li><a href="?do=ServerSetup">{{lang_configurationBasic}}</a></li> - <li><a href="?do=InternetAccess">{{lang_internetAccess}}</a></li> - <li><a href="?do=VmStore">{{lang_vmLocation}}</a></li> - <li><a href="?do=WebInterface">{{lang_webInterface}}</a></li> - <li><a href="?do=Backup">{{lang_backup}}</a></li> - </ul> - </li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">{{lang_status}}<b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="?do=SystemStatus">{{lang_serverStatus}}</a></li> - <li><a href="?do=EventLog">{{lang_eventLog}}</a></li> - <li class="divider"></li> - <li><a href="?do=SysLog">{{lang_clientLog}}</a></li> - <li><a href="?do=Statistics">{{lang_clientStats}}</a></li> - </ul> - </li> - <li> - <a href="?do=DozMod">{{lang_dozmod}}</a> - </li> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="lang/{{current_lang}}/flag.png" alt="{{current_lang}}"><b class="caret"></b></a> - <ul class="dropdown-menu"> - <li><a href="?do=Translation">{{lang_translations}}</a></li> - <li class="dropdown-header">{{lang_language}}</li> - {{#langs}} - <li><a href="?lang={{cc}}&url={{url}}"><img src="lang/{{cc}}/flag.png" alt="{{name}}"> {{name}}</a></li> - {{/langs}} - </ul> - </li> - {{#dbupdate}} - <li><a href="api.php?do=update"><span class="slx-warning-badge badge"><span class="glyphicon glyphicon-exclamation-sign"></span> DB-Update</span></a></li> - {{/dbupdate}} - {{#warning}} - <li><a href="?do=EventLog"><span class="slx-warning-badge badge"><span class="glyphicon glyphicon-exclamation-sign"></span> {{lang_warning}}</span></a></li> - {{/warning}} - {{#needsSetup}} - <li><a href="?do=Main"><span class="slx-warning-badge badge"><span class="glyphicon glyphicon-exclamation-sign"></span> {{lang_needsSetup}}</span></a></li> - {{/needsSetup}} - </ul> - <ul class="nav navbar-nav navbar-right"> - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown"><img src="lang/{{current_lang}}/flag.png"><b class="caret"></b></a> - <ul class="dropdown-menu"> - <li class="dropdown-header">{{lang_language}}</li> - {{#langs}} - <li><a href="?lang={{cc}}&url={{url}}"><img src="lang/{{cc}}/flag.png" alt="{{name}}"> {{name}}</a></li> - {{/langs}} - </ul> - </li> - {{#user}} - <li> - <form method="post" action="?do=Session"> - <input type="hidden" name="token" value="{{token}}"> - <input type="hidden" name="action" value="logout"> - <b>{{user}}</b> - <button class="btn btn-default btn-xs" type="submit">{{lang_logout}}</button> - </form> - </li> - {{/user}} - {{^user}} - <li><a href="?do=Session&action=login">{{lang_login}}</a></li> - {{/user}} - </ul> - </div> - </div> -</div> - diff --git a/modules/minilinux/config.json b/modules/minilinux/config.json index 93209f62..f2abe27c 100644 --- a/modules/minilinux/config.json +++ b/modules/minilinux/config.json @@ -1,4 +1,4 @@ { - "category":"settings", + "category":"main.settings", "enabled":"true" } diff --git a/modules/minilinux/module.inc.php b/modules/minilinux/page.inc.php index 91be456e..91be456e 100644 --- a/modules/minilinux/module.inc.php +++ b/modules/minilinux/page.inc.php diff --git a/modules/news/config.json b/modules/news/config.json index 4e7fa5fb..6c189b63 100644 --- a/modules/news/config.json +++ b/modules/news/config.json @@ -1,4 +1,4 @@ { - "category":"content", + "category":"main.content", "enabled":"true" } diff --git a/modules/news/module.inc.php b/modules/news/page.inc.php index 9bbadc4f..9bbadc4f 100644 --- a/modules/news/module.inc.php +++ b/modules/news/page.inc.php diff --git a/modules/serversetup/config.json b/modules/serversetup/config.json index 93209f62..f2abe27c 100644 --- a/modules/serversetup/config.json +++ b/modules/serversetup/config.json @@ -1,4 +1,4 @@ { - "category":"settings", + "category":"main.settings", "enabled":"true" } diff --git a/modules/serversetup/module.inc.php b/modules/serversetup/page.inc.php index e37d7d40..e37d7d40 100644 --- a/modules/serversetup/module.inc.php +++ b/modules/serversetup/page.inc.php diff --git a/modules/session/config.json b/modules/session/config.json index d5da4cc8..4da67ef8 100644 --- a/modules/session/config.json +++ b/modules/session/config.json @@ -1,4 +1,3 @@ { - "category":"hidden", "enabled":"true" } diff --git a/modules/session/module.inc.php b/modules/session/page.inc.php index ef135f9d..ef135f9d 100644 --- a/modules/session/module.inc.php +++ b/modules/session/page.inc.php diff --git a/modules/statistics/config.json b/modules/statistics/config.json index 17acab76..b0123727 100644 --- a/modules/statistics/config.json +++ b/modules/statistics/config.json @@ -1,5 +1,5 @@ { - "category":"status", + "category":"main.status", "enabled":"true", "permission":"0" } diff --git a/modules/statistics/module.inc.php b/modules/statistics/page.inc.php index faf88521..faf88521 100644 --- a/modules/statistics/module.inc.php +++ b/modules/statistics/page.inc.php diff --git a/modules/support/config.json b/modules/support/config.json index 4e7fa5fb..6c189b63 100644 --- a/modules/support/config.json +++ b/modules/support/config.json @@ -1,4 +1,4 @@ { - "category":"content", + "category":"main.content", "enabled":"true" } diff --git a/modules/support/module.inc.php b/modules/support/page.inc.php index d4012c1a..d4012c1a 100644 --- a/modules/support/module.inc.php +++ b/modules/support/page.inc.php diff --git a/modules/sysconfig/config.json b/modules/sysconfig/config.json index 93209f62..f2abe27c 100644 --- a/modules/sysconfig/config.json +++ b/modules/sysconfig/config.json @@ -1,4 +1,4 @@ { - "category":"settings", + "category":"main.settings", "enabled":"true" } diff --git a/modules/sysconfig/module.inc.php b/modules/sysconfig/page.inc.php index 0c06e125..0c06e125 100644 --- a/modules/sysconfig/module.inc.php +++ b/modules/sysconfig/page.inc.php diff --git a/modules/sysconfignew/config.json b/modules/sysconfignew/config.json index d5da4cc8..4da67ef8 100644 --- a/modules/sysconfignew/config.json +++ b/modules/sysconfignew/config.json @@ -1,4 +1,3 @@ { - "category":"hidden", "enabled":"true" } diff --git a/modules/sysconfignew/module.inc.php b/modules/sysconfignew/page.inc.php index 105ad6c7..105ad6c7 100644 --- a/modules/sysconfignew/module.inc.php +++ b/modules/sysconfignew/page.inc.php diff --git a/modules/syslog/config.json b/modules/syslog/config.json index d42dc3e3..650ab2fe 100644 --- a/modules/syslog/config.json +++ b/modules/syslog/config.json @@ -1,4 +1,4 @@ { - "category":"status", + "category":"main.status", "enabled":"true" } diff --git a/modules/syslog/module.inc.php b/modules/syslog/page.inc.php index 43a9bd28..43a9bd28 100644 --- a/modules/syslog/module.inc.php +++ b/modules/syslog/page.inc.php diff --git a/modules/systemstatus/config.json b/modules/systemstatus/config.json index d42dc3e3..650ab2fe 100644 --- a/modules/systemstatus/config.json +++ b/modules/systemstatus/config.json @@ -1,4 +1,4 @@ { - "category":"status", + "category":"main.status", "enabled":"true" } diff --git a/modules/systemstatus/module.inc.php b/modules/systemstatus/page.inc.php index 2a5382e1..2a5382e1 100644 --- a/modules/systemstatus/module.inc.php +++ b/modules/systemstatus/page.inc.php diff --git a/modules/translation/config.json b/modules/translation/config.json index 4e7fa5fb..6c189b63 100644 --- a/modules/translation/config.json +++ b/modules/translation/config.json @@ -1,4 +1,4 @@ { - "category":"content", + "category":"main.content", "enabled":"true" } diff --git a/modules/translation/module.inc.php b/modules/translation/page.inc.php index 3548f727..3548f727 100644 --- a/modules/translation/module.inc.php +++ b/modules/translation/page.inc.php diff --git a/modules/usermanagement/config.json b/modules/usermanagement/config.json index 90787d94..b9fc3ad3 100644 --- a/modules/usermanagement/config.json +++ b/modules/usermanagement/config.json @@ -1,5 +1,5 @@ { - "category":"users", + "category":"main.users", "enabled":"true", "permission":"0" } diff --git a/modules/usermanagement/module.inc.php b/modules/usermanagement/page.inc.php index 01b5f755..01b5f755 100644 --- a/modules/usermanagement/module.inc.php +++ b/modules/usermanagement/page.inc.php diff --git a/modules/vmstore/config.json b/modules/vmstore/config.json index 93209f62..f2abe27c 100644 --- a/modules/vmstore/config.json +++ b/modules/vmstore/config.json @@ -1,4 +1,4 @@ { - "category":"settings", + "category":"main.settings", "enabled":"true" } diff --git a/modules/vmstore/module.inc.php b/modules/vmstore/page.inc.php index 81f92ee3..81f92ee3 100644 --- a/modules/vmstore/module.inc.php +++ b/modules/vmstore/page.inc.php diff --git a/modules/webinterface/config.json b/modules/webinterface/config.json index 4e7fa5fb..6c189b63 100644 --- a/modules/webinterface/config.json +++ b/modules/webinterface/config.json @@ -1,4 +1,4 @@ { - "category":"content", + "category":"main.content", "enabled":"true" } diff --git a/modules/webinterface/module.inc.php b/modules/webinterface/page.inc.php index c301dec9..c301dec9 100644 --- a/modules/webinterface/module.inc.php +++ b/modules/webinterface/page.inc.php |