diff options
76 files changed, 210 insertions, 159 deletions
diff --git a/config.php.example b/config.php.example index cd05e115..6674ef61 100644 --- a/config.php.example +++ b/config.php.example @@ -27,7 +27,7 @@ define('CONFIG_VMSTORE_DIR', '/srv/openslx/nfs'); define('CONFIG_PROXY_CONF', '/opt/openslx/proxy/config'); // Sort order for menu - optional, if missing, order will be alphabetically -$MENU_CAT_SORT_ORDER = array('main.content' => 0, 'main.settings' => 1, 'main.status' => 2, 'main.users' => 3); +$MENU_CAT_SORT_ORDER = array('main.content' => 0, 'main.settings-client' => 1, 'main.settings-server' => 2, 'main.status' => 3, 'main.users' => 4); $MENU_SETTING_SORT_ORDER = array( 'news' => 0, 'sysconfig' => 1, 'baseconfig' => 2, 'locations' => 3, // main.content 'serversetup' => 0, 'internetaccess' => 1, 'vmstore' => 2, 'webinterface' => 3, 'backup' => 4, // main.settings diff --git a/inc/dashboard.inc.php b/inc/dashboard.inc.php index 13d713bb..e8c20dee 100644 --- a/inc/dashboard.inc.php +++ b/inc/dashboard.inc.php @@ -63,7 +63,7 @@ class Dashboard if ($category === false) { return ''; } - if (!preg_match('/^(\w+)\.(\w+)$/', $category, $out)) { + if (!preg_match('/^(\w+)\.(.*)$/', $category, $out)) { error_log('Requested category icon for invalid category "' . $category . '"'); return ''; } diff --git a/inc/dictionary.inc.php b/inc/dictionary.inc.php index 5679c52d..f5886bda 100644 --- a/inc/dictionary.inc.php +++ b/inc/dictionary.inc.php @@ -104,7 +104,7 @@ class Dictionary if ($category === false) { return 'No Category'; } - if (!preg_match('/^(\w+)\.(\w+)$/', $category, $out)) { + if (!preg_match('/^(\w+)\.(.*)$/', $category, $out)) { return 'Invalid Category ID format: ' . $category; } $string = self::translateFileModule($out[1], 'categories', $out[2]); diff --git a/modules-available/adduser/config.json b/modules-available/adduser/config.json index 4da67ef8..2c63c085 100644 --- a/modules-available/adduser/config.json +++ b/modules-available/adduser/config.json @@ -1,3 +1,2 @@ { - "enabled":"true" } diff --git a/modules-available/backup/config.json b/modules-available/backup/config.json index 6c189b63..706412d0 100644 --- a/modules-available/backup/config.json +++ b/modules-available/backup/config.json @@ -1,4 +1,3 @@ { - "category":"main.content", - "enabled":"true" + "category":"main.content" } diff --git a/modules-available/backup/lang/pt/template-tags.json b/modules-available/backup/lang/pt/template-tags.json index 79f455a5..4ec1abd1 100644 --- a/modules-available/backup/lang/pt/template-tags.json +++ b/modules-available/backup/lang/pt/template-tags.json @@ -3,7 +3,6 @@ "lang_backupDescription": "Aqui voc\u00ea pode fazer um backup completo da configura\u00e7\u00e3o deste server.", "lang_backupRestore": "Backup e Recupera\u00e7\u00e3o", "lang_download": "Baixar", - "lang_file": "Arquivo", "lang_reboot": "Reinicializar Sistema", "lang_restore": "Carregar", "lang_restoreConfig": "Recuperar Configura\u00e7\u00e3o", diff --git a/modules-available/baseconfig/api.inc.php b/modules-available/baseconfig/api.inc.php index c692a0b2..db890299 100644 --- a/modules-available/baseconfig/api.inc.php +++ b/modules-available/baseconfig/api.inc.php @@ -59,9 +59,33 @@ foreach ($defaults as $setting => $value) { $configVars[$setting] = $value; } -// Finally, output what we gathered -foreach ($configVars as $setting => $value) { - echo $setting, "='", escape($value), "'\n"; +// All done, now output + +if (Request::any('save') === 'true') { + // output AND save to disk: Generate contents + $lines = ''; + foreach ($configVars as $setting => $value) { + $lines .= $setting . "='" . escape($value) . "'\n"; + } + // Save to all the locations + $data = Property::getVersionCheckInformation(); + if (is_array($data) && isset($data['systems'])) { + foreach ($data['systems'] as $system) { + $path = CONFIG_HTTP_DIR . '/' . $system['id'] . '/config'; + if (file_put_contents($path, $lines) > 0) { + echo "# Saved config to $path\n"; + } else { + echo "# Error saving config to $path\n"; + } + } + } + // Output to browser + echo $lines; +} else { + // Only output to client + foreach ($configVars as $setting => $value) { + echo $setting, "='", escape($value), "'\n"; + } } // For quick testing or custom extensions: Include external file that should do nothing diff --git a/modules-available/baseconfig/config.json b/modules-available/baseconfig/config.json index 9ce17b0d..dd2122be 100644 --- a/modules-available/baseconfig/config.json +++ b/modules-available/baseconfig/config.json @@ -1,3 +1,3 @@ { - "category": "main.settings" + "category": "main.settings-client" } diff --git a/modules-available/baseconfig/lang/de/template-tags.json b/modules-available/baseconfig/lang/de/template-tags.json index 1c71e174..34163ca9 100644 --- a/modules-available/baseconfig/lang/de/template-tags.json +++ b/modules-available/baseconfig/lang/de/template-tags.json @@ -1,6 +1,5 @@ { "lang_basicConfiguration": "Basiskonfiguration", "lang_clientRelatedConfig": "Die Optionen auf dieser Seite beziehen sich auf das Verhalten der bwLehrpool-Clients.", - "lang_enableOverride": "\u00dcberschreiben", - "lang_reset": "Zur\u00fccksetzen" + "lang_enableOverride": "\u00dcberschreiben" }
\ No newline at end of file diff --git a/modules-available/baseconfig/lang/en/template-tags.json b/modules-available/baseconfig/lang/en/template-tags.json index 84eb01d7..6adfd682 100644 --- a/modules-available/baseconfig/lang/en/template-tags.json +++ b/modules-available/baseconfig/lang/en/template-tags.json @@ -15,7 +15,6 @@ "lang_partitionMountPoint": "Mount Point", "lang_partitionOptions": "Options", "lang_partitionSize": "Size", - "lang_reset": "Reset", "lang_resetConfirm": "Do you really wish to reset the variable to their default values?", "lang_resetDefault": "Reset Default", "lang_userName": "Username", diff --git a/modules-available/baseconfig/lang/pt/template-tags.json b/modules-available/baseconfig/lang/pt/template-tags.json index 79e3e911..28b9cb76 100644 --- a/modules-available/baseconfig/lang/pt/template-tags.json +++ b/modules-available/baseconfig/lang/pt/template-tags.json @@ -4,7 +4,6 @@ "lang_catUser": "Gerenciamente de Usu\u00e1rios", "lang_confirm": "Voc\u00ea deseja salvar configura\u00e7\u00f5es em [ \/srv\/openslx\/www\/boot\/default\/config ] ?", "lang_create": "Criar", - "lang_delete": "Deletar", "lang_helpId": "Id da parti\u00e7\u00e3o", "lang_helpMountPoint": "Precisa ser um diret\u00f3rio: \/exemplo\/diret\u00f3rio\/", "lang_helpOptions": "Atualmente, apenas a op\u00e7\u00e3o 'bootable' est\u00e1 dispon\u00edvel", @@ -15,7 +14,6 @@ "lang_partitionMountPoint": "Mount Point", "lang_partitionOptions": "Op\u00e7\u00f5es", "lang_partitionSize": "Tamanho", - "lang_reset": "Limpar", "lang_resetConfirm": "Voc\u00ea realmente deseja restaurar as vari\u00e1veis para seus valores padr\u00f5es?", "lang_resetDefault": "Restaurar Padr\u00e3o", "lang_userName": "Nome", diff --git a/modules-available/baseconfig/page.inc.php b/modules-available/baseconfig/page.inc.php index 21b5459b..d14c64ac 100644 --- a/modules-available/baseconfig/page.inc.php +++ b/modules-available/baseconfig/page.inc.php @@ -157,6 +157,7 @@ class Page_BaseConfig extends Page unset($setting); array_multisort($sortvals, SORT_ASC, SORT_NUMERIC, $settings); Render::addTemplate('_page', array( + 'userid' => User::getId(), 'override' => $this->targetModule !== false, 'categories' => array_values($settings), 'target_module' => $this->targetModule, diff --git a/modules-available/baseconfig/templates/_page.html b/modules-available/baseconfig/templates/_page.html index 093cb10f..305b3cd9 100644 --- a/modules-available/baseconfig/templates/_page.html +++ b/modules-available/baseconfig/templates/_page.html @@ -63,5 +63,5 @@ </div> <button class="btn btn-primary" type="submit">{{lang_save}}</button> <button class="btn btn-default" type="reset">{{lang_reset}}</button> - <a class="btn btn-default" href="api.php?do=baseconfig">Download</a> + <a class="btn btn-default" href="api.php?do=baseconfig&user={{userid}}">Download</a> </form> diff --git a/modules-available/baseconfig_partitions_cdn/baseconfig/getconfig.inc.php b/modules-available/baseconfig_partitions_cdn/baseconfig/getconfig.inc.php new file mode 100644 index 00000000..6348fe71 --- /dev/null +++ b/modules-available/baseconfig_partitions_cdn/baseconfig/getconfig.inc.php @@ -0,0 +1,17 @@ +<?php + +$config = ''; +$res = Database::simpleQuery('SELECT partition_id, size, mount_point, options FROM setting_partition WHERE user = :user', + array('user'=>$_GET['user'])); +while ($row = $res->fetch(PDO::FETCH_ASSOC)) { + $config .= "\n" . $row['partition_id'] . "," . $row['size']; + if(strlen($row['mount_point']) > 0) + $config .= "," . $row['mount_point']; + if(strlen($row['options']) > 0) + $config .= "," . $row['options']; +} +$config .= "\n"; + +// vm list url. doesn't really fit anywhere, seems to be a tie between here and dozmod +$configVars["SLX_PARTITION_TABLE"] = $config; +unset($config);
\ No newline at end of file diff --git a/modules-available/baseconfig_partitions_cdn/config.json b/modules-available/baseconfig_partitions_cdn/config.json index a3036a56..a355eef3 100644 --- a/modules-available/baseconfig_partitions_cdn/config.json +++ b/modules-available/baseconfig_partitions_cdn/config.json @@ -1,4 +1,4 @@ { - "category": "main.settings", + "category": "main.settings-client", "dependencies": [ "baseconfig" ] -}
\ No newline at end of file +} diff --git a/modules-available/baseconfig_partitions_cdn/lang/de/messages.json b/modules-available/baseconfig_partitions_cdn/lang/de/messages.json new file mode 100644 index 00000000..085214a3 --- /dev/null +++ b/modules-available/baseconfig_partitions_cdn/lang/de/messages.json @@ -0,0 +1,3 @@ +{ + "partitions-updated": "Partitionskonfiguration wurde aktualisiert" +}
\ No newline at end of file diff --git a/modules-available/baseconfig_partitions_cdn/lang/de/module.json b/modules-available/baseconfig_partitions_cdn/lang/de/module.json new file mode 100644 index 00000000..7a50f349 --- /dev/null +++ b/modules-available/baseconfig_partitions_cdn/lang/de/module.json @@ -0,0 +1,4 @@ +{ + "module_name": "Partitionierung", + "page_title": "Partitionierung" +}
\ No newline at end of file diff --git a/modules-available/baseconfig_partitions_cdn/lang/de/template-tags.json b/modules-available/baseconfig_partitions_cdn/lang/de/template-tags.json new file mode 100644 index 00000000..91cca0db --- /dev/null +++ b/modules-available/baseconfig_partitions_cdn/lang/de/template-tags.json @@ -0,0 +1,18 @@ +{ + "lang_addPartition": "Partition anlegen", + "lang_confirm": "Wollen Sie die Einstellungen unter \/srv\/openslx\/www\/boot\/config speichern?", + "lang_create": "Anlegen", + "lang_explanationText": "Hier k\u00f6nnen Sie bestimmen, welche Partitionen auf dem Client angelegt werden.", + "lang_helpId": "Partitions-ID", + "lang_helpMountPoint": "Muss ein Absolutes Verzeichnis im Zieldateisystem sein, z.B. \/mnt\/shares\/data", + "lang_helpOptions": "Zur Zeit ist hier nur 'bootable' erlaubt.", + "lang_helpSize": "Angabe im Format 10G um eine 10GiB-Partition zu erstellen.", + "lang_newPartition": "Neue Partition", + "lang_partitionId": "ID", + "lang_partitionManagement": "Partitionsverwaltung", + "lang_partitionMountPoint": "Mount point", + "lang_partitionOptions": "Optionen", + "lang_partitionSize": "Gr\u00f6\u00dfe", + "lang_resetConfirm": "Wollen Sie die Einstellungen wirklich auf die Standardwerte zur\u00fccksetzen?", + "lang_resetDefault": "Standardwerte laden" +}
\ No newline at end of file diff --git a/modules-available/baseconfig_partitions_cdn/lang/en/messages.json b/modules-available/baseconfig_partitions_cdn/lang/en/messages.json new file mode 100644 index 00000000..55289288 --- /dev/null +++ b/modules-available/baseconfig_partitions_cdn/lang/en/messages.json @@ -0,0 +1,3 @@ +{ + "partitions-updated": "Partition configuration has been updated" +}
\ No newline at end of file diff --git a/modules-available/baseconfig_partitions_cdn/lang/en/module.json b/modules-available/baseconfig_partitions_cdn/lang/en/module.json new file mode 100644 index 00000000..e3ed7ffa --- /dev/null +++ b/modules-available/baseconfig_partitions_cdn/lang/en/module.json @@ -0,0 +1,4 @@ +{ + "module_name": "Partitioning", + "page_title": "Partitioning" +}
\ No newline at end of file diff --git a/modules-available/baseconfig_partitions_cdn/lang/en/template-tags.json b/modules-available/baseconfig_partitions_cdn/lang/en/template-tags.json new file mode 100644 index 00000000..819d2273 --- /dev/null +++ b/modules-available/baseconfig_partitions_cdn/lang/en/template-tags.json @@ -0,0 +1,17 @@ +{ + "lang_confirm": "Would you like to save the settings on [ \/srv\/openslx\/www\/boot\/config ] ?", + "lang_create": "Create", + "lang_explanationText": "Here you can configure what kind of partitions will be created on the client computers, and where they will be mounted", + "lang_helpId": "Partition Id", + "lang_helpMountPoint": "Must be a directory: \/example\/directory\/", + "lang_helpOptions": "Currently, only option 'bootable' is available", + "lang_helpSize": "Must be in Gigabytes e.g. 15G", + "lang_newPartition": "New Partition", + "lang_partitionId": "Id", + "lang_partitionManagement": "Partition Managment", + "lang_partitionMountPoint": "Mount Point", + "lang_partitionOptions": "Options", + "lang_partitionSize": "Size", + "lang_resetConfirm": "Do you really wish to reset the variable to their default values?", + "lang_resetDefault": "Reset Default" +}
\ No newline at end of file diff --git a/modules-available/baseconfig_partitions_cdn/lang/pt/template-tags.json b/modules-available/baseconfig_partitions_cdn/lang/pt/template-tags.json new file mode 100644 index 00000000..a010e18c --- /dev/null +++ b/modules-available/baseconfig_partitions_cdn/lang/pt/template-tags.json @@ -0,0 +1,16 @@ +{ + "lang_confirm": "Voc\u00ea deseja salvar configura\u00e7\u00f5es em [ \/srv\/openslx\/www\/boot\/default\/config ] ?", + "lang_create": "Criar", + "lang_helpId": "Id da parti\u00e7\u00e3o", + "lang_helpMountPoint": "Precisa ser um diret\u00f3rio: \/exemplo\/diret\u00f3rio\/", + "lang_helpOptions": "Atualmente, apenas a op\u00e7\u00e3o 'bootable' est\u00e1 dispon\u00edvel", + "lang_helpSize": "Precisa estar em Gigabytes, por exemplo 15G", + "lang_newPartition": "Nova Parti\u00e7\u00e3o", + "lang_partitionId": "Id", + "lang_partitionManagement": "Gerenciamento de Parti\u00e7\u00f5es", + "lang_partitionMountPoint": "Mount Point", + "lang_partitionOptions": "Op\u00e7\u00f5es", + "lang_partitionSize": "Tamanho", + "lang_resetConfirm": "Voc\u00ea realmente deseja restaurar as vari\u00e1veis para seus valores padr\u00f5es?", + "lang_resetDefault": "Restaurar Padr\u00e3o" +}
\ No newline at end of file diff --git a/modules-available/baseconfig_partitions_cdn/page.inc.php b/modules-available/baseconfig_partitions_cdn/page.inc.php index b6ea869a..a1d1445f 100644 --- a/modules-available/baseconfig_partitions_cdn/page.inc.php +++ b/modules-available/baseconfig_partitions_cdn/page.inc.php @@ -73,7 +73,7 @@ class Page_BaseConfig_Partitions_CDN extends Page Util::traceError('Could not create new partition in DB'); } } - Util::redirect('?do=BaseConfig'); + Util::redirect('?do=BaseConfig_Partitions_CDN'); } private function deletePartition($id){ @@ -86,7 +86,7 @@ class Page_BaseConfig_Partitions_CDN extends Page Util::traceError('Could not delete partition in DB'); } } - Util::redirect('?do=BaseConfig'); + Util::redirect('?do=BaseConfig_Partitions_CDN'); } private function updatePartitions(){ @@ -113,7 +113,7 @@ class Page_BaseConfig_Partitions_CDN extends Page } if (!empty($partitions)) { Message::addSuccess('partitions-updated'); - Util::redirect('?do=BaseConfig'); + Util::redirect('?do=BaseConfig_Partitions_CDN'); } } diff --git a/modules-available/baseconfig_partitions_cdn/templates/_page.html b/modules-available/baseconfig_partitions_cdn/templates/_page.html index ee764e37..f7331186 100644 --- a/modules-available/baseconfig_partitions_cdn/templates/_page.html +++ b/modules-available/baseconfig_partitions_cdn/templates/_page.html @@ -1,17 +1,53 @@ -<h1>{{lang_partitioningManagement}}</h1> +<h1>{{lang_partitionManagement}}</h1> + +<p>{{lang_explanationText}}</p> <form action="?do=BaseConfig_Partitions_CDN" method="post"> <input type="hidden" name="token" value="{{token}}"> + <div class='list-group'> + {{#partitions}} + <div class='list-group-item'> + <div class='row'> + <div class='col-sm-2'> + <input name='partition-{{id}}-partition_id' type='text' class='form-control' value='{{partition_id}}' placeholder='{{lang_partitionId}}'> + </div> + <div class='col-sm-2'> + <input name='partition-{{id}}-size' type='text' class='form-control' value='{{size}}' placeholder='{{lang_partitionSize}}'> + </div> + <div class='col-sm-4 col-md-3'> + <input name='partition-{{id}}-mount_point' type='text' class='form-control' value='{{mount_point}}' placeholder='{{lang_partitionMountPoint}}'/> + </div> + <div class='col-sm-3'> + <input name='partition-{{id}}-options' type='text' class='form-control' size='30' value='{{options}}' placeholder='{{lang_partitionOptions}}'/> + </div> + <div class='col-sm-1 col-md-2'> + <a class='btn btn-danger' href='?do=BaseConfig_Partitions_CDN&deletePartition={{id}}&token={{token}}'> + <span class='glyphicon glyphicon-trash'></span> + <span class="hidden-sm">{{lang_delete}}</span> + </a> + </div> + </div> + </div> + {{/partitions}} + <div class='list-group-item clearfix'> + <div class="pull-right"> + <a class='btn btn-default ' data-toggle='modal' data-target='#add-partition'> + <span class='glyphicon glyphicon-plus'></span> {{lang_newPartition}} + </a> + </div> + </div> + </div> <button class="btn btn-lg btn-primary" type="submit">{{lang_save}}</button> <button class="btn btn-lg btn-primary" type="reset">{{lang_reset}}</button> <a class="btn btn-lg btn-primary" href="#" onclick="saveConfig()">Download</a> </form> + <div> -<form method="post" action="?do=BaseConfig_Partitions_CDN"> - <input type="hidden" name="token" value="{{token}}"> - <input type="hidden" name="action" value="reset"> - <button class="btn btn-default" type="submit" onclick="return confirm('{{lang_resetConfirm}}');">{{lang_resetDefault}}</button> -</form> + <form method="post" action="?do=BaseConfig_Partitions_CDN"> + <input type="hidden" name="token" value="{{token}}"> + <input type="hidden" name="action" value="reset"> + <button class="btn btn-default" type="submit" onclick="return confirm('{{lang_resetConfirm}}');">{{lang_resetDefault}}</button> + </form> </div> <!-- Create Partition Window --> @@ -53,17 +89,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}}')) window.location = 'api.php?do=baseconfig&user={{user}}&save=true'; diff --git a/modules-available/citymanagement/config.json b/modules-available/citymanagement/config.json index aff54b3a..2eb2d680 100644 --- a/modules-available/citymanagement/config.json +++ b/modules-available/citymanagement/config.json @@ -1,4 +1,4 @@ { - "enabled":"false", + "category":"main.settings-server", "permission":"0" } diff --git a/modules-available/citymanagement/lang/pt/template-tags.json b/modules-available/citymanagement/lang/pt/template-tags.json index acfe4e2e..b8c35000 100644 --- a/modules-available/citymanagement/lang/pt/template-tags.json +++ b/modules-available/citymanagement/lang/pt/template-tags.json @@ -3,11 +3,9 @@ "lang_cityInfo": "Nesta se\u00e7\u00e3o voc\u00ea poder\u00e1 criar cidades para o site, al\u00e9m de editar ou remover cidades existentes", "lang_cityPage": "Gerenciar cidades", "lang_cityname": "Nome da cidade", - "lang_close": "Fechar", "lang_create": "Criar", "lang_edit": "Editar", "lang_editcity": "Editar Cidade", "lang_operations": "Opera\u00e7\u00f5es", - "lang_remove": "Remover", - "lang_save": "Salvar" + "lang_remove": "Remover" }
\ No newline at end of file diff --git a/modules-available/dozmod/config.json b/modules-available/dozmod/config.json index 6c189b63..706412d0 100644 --- a/modules-available/dozmod/config.json +++ b/modules-available/dozmod/config.json @@ -1,4 +1,3 @@ { - "category":"main.content", - "enabled":"true" + "category":"main.content" } diff --git a/modules-available/dozmod/lang/de/template-tags.json b/modules-available/dozmod/lang/de/template-tags.json index 7f4fad6f..b70d6784 100644 --- a/modules-available/dozmod/lang/de/template-tags.json +++ b/modules-available/dozmod/lang/de/template-tags.json @@ -2,7 +2,6 @@ "lang_asteriskRequired": "Felder mit (*) sind erforderlich", "lang_canLogin": "Nutzer dieser Einrichtung k\u00f6nnen sich am Satelliten anmelden", "lang_delButton": "Gew\u00e4hlte Images endg\u00fcltig l\u00f6schen", - "lang_delete": "L\u00f6schen", "lang_description": "Diese Liste zeigt Images, die entweder abgelaufen sind, oder deren Datei besch\u00e4digt, verschoben oder gel\u00f6scht wurde. Diese Images sind zur Zeit im Lehrpool nicht verf\u00fcgbar, ihre endg\u00fcltige L\u00f6schung muss aber manuell best\u00e4tigt werden, um gr\u00f6\u00dfere Katastrophen durch Softwarefehler, verstellte Systemuhren etc. zu vermeiden.", "lang_email": "EMail", "lang_emailNotifications": "EMail-Benachrichtigungen aktiviert", @@ -21,7 +20,6 @@ "lang_password": "Passwort", "lang_port": "Port", "lang_replyTo": "Reply-To Adresse (z.B. Helpdesk)", - "lang_save": "Konfiguration speichern", "lang_senderAddress": "Absenderadresse", "lang_senderName": "Absender Anzeigename", "lang_size": "Gr\u00f6\u00dfe", diff --git a/modules-available/dozmod/lang/en/template-tags.json b/modules-available/dozmod/lang/en/template-tags.json index 7bb65540..2ed11a2a 100644 --- a/modules-available/dozmod/lang/en/template-tags.json +++ b/modules-available/dozmod/lang/en/template-tags.json @@ -2,7 +2,6 @@ "lang_asteriskRequired": "Fields marked with (*) are required", "lang_canLogin": "Members of this organization can login", "lang_delButton": "Permanently delete selected images", - "lang_delete": "Delete", "lang_description": "This list shows images that reached their expire date, or where the image file in the file system is damaged or missing. You need to manually confirm the deletion of these files for safety reasons (software bugs, wrong system time, etc.).", "lang_email": "E-Mail", "lang_emailNotifications": "E-Mail notifications enabled", @@ -21,7 +20,6 @@ "lang_password": "Password", "lang_port": "Port", "lang_replyTo": "Reply-To address", - "lang_save": "Save configuration", "lang_senderAddress": "Sender address", "lang_senderName": "Sender's display name", "lang_size": "Size", diff --git a/modules-available/eventlog/config.json b/modules-available/eventlog/config.json index 650ab2fe..6778348d 100644 --- a/modules-available/eventlog/config.json +++ b/modules-available/eventlog/config.json @@ -1,4 +1,3 @@ { - "category":"main.status", - "enabled":"true" + "category":"main.status" } diff --git a/modules-available/imgmanagement/config.json b/modules-available/imgmanagement/config.json index 5c5c05ca..6454d96f 100644 --- a/modules-available/imgmanagement/config.json +++ b/modules-available/imgmanagement/config.json @@ -1,4 +1,4 @@ { - "enabled":"false", + "category":"main.content", "permission":"1" } diff --git a/modules-available/internetaccess/config.json b/modules-available/internetaccess/config.json index 6c189b63..706412d0 100644 --- a/modules-available/internetaccess/config.json +++ b/modules-available/internetaccess/config.json @@ -1,4 +1,3 @@ { - "category":"main.content", - "enabled":"true" + "category":"main.content" } diff --git a/modules-available/locations/config.json b/modules-available/locations/config.json index 6c189b63..706412d0 100644 --- a/modules-available/locations/config.json +++ b/modules-available/locations/config.json @@ -1,4 +1,3 @@ { - "category":"main.content", - "enabled":"true" + "category":"main.content" } diff --git a/modules-available/locations/lang/de/template-tags.json b/modules-available/locations/lang/de/template-tags.json index 839536f1..13e21217 100644 --- a/modules-available/locations/lang/de/template-tags.json +++ b/modules-available/locations/lang/de/template-tags.json @@ -6,7 +6,6 @@ "lang_deleteChildLocations": "Untergeordnete Orte ebenfalls l\u00f6schen", "lang_deleteLocation": "Ort l\u00f6schen", "lang_deleteSubnet": "Bereich l\u00f6schen", - "lang_edit": "Bearbeiten", "lang_endAddress": "Endadresse", "lang_listOfSubnets": "Liste der Subnetze", "lang_location": "Ort", @@ -19,7 +18,6 @@ "lang_noParent": "Kein \u00fcbergeordneter Ort", "lang_parentLocation": "\u00dcbergeordneter Ort", "lang_referencingLectures": "Veranstaltungen", - "lang_save": "Speichern", "lang_startAddress": "Startadresse", "lang_subnet": "IP-Bereich", "lang_thisListByLocation": "Zur Ortsansicht", diff --git a/modules-available/locations/lang/en/template-tags.json b/modules-available/locations/lang/en/template-tags.json index 7c217732..1ea0f56e 100644 --- a/modules-available/locations/lang/en/template-tags.json +++ b/modules-available/locations/lang/en/template-tags.json @@ -6,7 +6,6 @@ "lang_deleteChildLocations": "Delete child locations aswell", "lang_deleteLocation": "Delete location", "lang_deleteSubnet": "Delete range", - "lang_edit": "Edit", "lang_endAddress": "End address", "lang_listOfSubnets": "List of subnets", "lang_location": "Ort", @@ -19,7 +18,6 @@ "lang_noParent": "No parent", "lang_parentLocation": "Parent location", "lang_referencingLectures": "Assigned Lectures", - "lang_save": "Save", "lang_startAddress": "Start address", "lang_subnet": "IP range", "lang_thisListByLocation": "List by location", diff --git a/modules-available/main/category-icons.json b/modules-available/main/category-icons.json index 97b76eac..08cb2a64 100644 --- a/modules-available/main/category-icons.json +++ b/modules-available/main/category-icons.json @@ -1,7 +1,8 @@ { "cities":"tower", "content":"th", - "settings":"cog", + "settings-client":"cog", + "settings-server":"cog", "status":"tasks", "users":"user" -}
\ No newline at end of file +} diff --git a/modules-available/main/config.json b/modules-available/main/config.json index 4da67ef8..2c63c085 100644 --- a/modules-available/main/config.json +++ b/modules-available/main/config.json @@ -1,3 +1,2 @@ { - "enabled":"true" } diff --git a/modules-available/main/lang/de/categories.json b/modules-available/main/lang/de/categories.json index 3d9b50a3..8fd292ec 100644 --- a/modules-available/main/lang/de/categories.json +++ b/modules-available/main/lang/de/categories.json @@ -1,6 +1,7 @@ { "content": "Inhalt", - "settings": "Einstellungen", + "settings-client": "Einstellungen (Client)", + "settings-server": "Einstellungen (Server)", "status": "Status", "users": "Benutzer" }
\ No newline at end of file diff --git a/modules-available/main/lang/de/global-tags.json b/modules-available/main/lang/de/global-tags.json index a8fa0034..6664caac 100644 --- a/modules-available/main/lang/de/global-tags.json +++ b/modules-available/main/lang/de/global-tags.json @@ -4,9 +4,11 @@ "lang_close": "Schlie\u00dfen", "lang_days": "Tag(e)", "lang_delete": "L\u00f6schen", + "lang_edit": "Bearbeiten", "lang_hint": "Hinweis", "lang_hours": "Stunde(n)", "lang_next": "Weiter", + "lang_reset": "Zur\u00fccksetzen", "lang_save": "Speichern", "lang_today": "Heute", "lang_yesterday": "Gestern" diff --git a/modules-available/main/lang/en/categories.json b/modules-available/main/lang/en/categories.json index 3d67bcfd..defbd652 100644 --- a/modules-available/main/lang/en/categories.json +++ b/modules-available/main/lang/en/categories.json @@ -1,6 +1,7 @@ { - "settings": "Settings", - "status": "Status", - "content": "Content", - "users": "Users" -} + "content": "Content", + "settings-client": "Settings (Client)", + "settings-server": "Settings (Server)", + "status": "Status", + "users": "Users" +}
\ No newline at end of file diff --git a/modules-available/main/lang/en/global-tags.json b/modules-available/main/lang/en/global-tags.json index 181f600a..26cbdfde 100644 --- a/modules-available/main/lang/en/global-tags.json +++ b/modules-available/main/lang/en/global-tags.json @@ -4,9 +4,11 @@ "lang_close": "Close", "lang_days": "day(s)", "lang_delete": "Delete", + "lang_edit": "Edit", "lang_hint": "Hint", "lang_hours": "hour(s)", "lang_next": "Next", + "lang_reset": "Reset", "lang_save": "Save", "lang_today": "Today", "lang_yesterday": "Yesterday" diff --git a/modules-available/main/lang/pt/categories.json b/modules-available/main/lang/pt/categories.json index 4b6ed82f..b7c8382e 100644 --- a/modules-available/main/lang/pt/categories.json +++ b/modules-available/main/lang/pt/categories.json @@ -1,6 +1,7 @@ { "content": "Conte\u00fado", - "settings": "Configura\u00e7\u00f5es", + "settings-client": "Configura\u00e7\u00f5es (Client)", + "settings-server": "Configura\u00e7\u00f5es (Server)", "status": "Status", "users": "Usu\u00e1rios" -} +}
\ No newline at end of file diff --git a/modules-available/main/lang/pt/global-tags.json b/modules-available/main/lang/pt/global-tags.json index a462651b..11e032e2 100644 --- a/modules-available/main/lang/pt/global-tags.json +++ b/modules-available/main/lang/pt/global-tags.json @@ -1,5 +1,14 @@ { + "lang_back": "Voltar", + "lang_cancel": "Cancelar", "lang_close": "Fechar", + "lang_days": "Dia(s)", + "lang_delete": "Excluir", + "lang_edit": "Editar", + "lang_hours": "Hora(s)", "lang_next": "Pr\u00f3ximo", - "lang_save": "Salvar" + "lang_reset": "Limpar", + "lang_save": "Salvar", + "lang_today": "Hoje", + "lang_yesterday": "Ontem" }
\ No newline at end of file diff --git a/modules-available/minilinux/config.json b/modules-available/minilinux/config.json index f2abe27c..28d71577 100644 --- a/modules-available/minilinux/config.json +++ b/modules-available/minilinux/config.json @@ -1,4 +1,3 @@ { - "category":"main.settings", - "enabled":"true" + "category":"main.settings-client" } diff --git a/modules-available/news/config.json b/modules-available/news/config.json index 6c189b63..706412d0 100644 --- a/modules-available/news/config.json +++ b/modules-available/news/config.json @@ -1,4 +1,3 @@ { - "category":"main.content", - "enabled":"true" + "category":"main.content" } diff --git a/modules-available/news/lang/de/template-tags.json b/modules-available/news/lang/de/template-tags.json index 7801584d..94aee385 100644 --- a/modules-available/news/lang/de/template-tags.json +++ b/modules-available/news/lang/de/template-tags.json @@ -2,12 +2,10 @@ "lang_activeNews": "Aktive News", "lang_content": "Inhalt", "lang_date": "Datum", - "lang_delete": "L\u00f6schen", "lang_editNews": "News bearbeiten", "lang_latestUpdate": "Letzte Aktualisierung", "lang_newsIntro": "Hier haben Sie die M\u00f6glichkeit, die von bwLehrpool-Clients angezeigten News zu editieren.", "lang_newsOld": "Alte News", - "lang_save": "Speichern", "lang_show": "Ansehen", "lang_title": "Titel" }
\ No newline at end of file diff --git a/modules-available/news/lang/en/template-tags.json b/modules-available/news/lang/en/template-tags.json index a2c08d50..8630e8e8 100644 --- a/modules-available/news/lang/en/template-tags.json +++ b/modules-available/news/lang/en/template-tags.json @@ -2,12 +2,10 @@ "lang_activeNews": "News", "lang_content": "Content", "lang_date": "Date", - "lang_delete": "Delete", "lang_editNews": "Edit news", "lang_latestUpdate": "Latest update", "lang_newsIntro": "Here you have the possibility to edit the news displayed to the bwLehrpool clients.", "lang_newsOld": "Old News", - "lang_save": "Save", "lang_show": "Show", "lang_title": "Title" }
\ No newline at end of file diff --git a/modules-available/news/lang/pt/template-tags.json b/modules-available/news/lang/pt/template-tags.json index 3c03cb34..127aeec9 100644 --- a/modules-available/news/lang/pt/template-tags.json +++ b/modules-available/news/lang/pt/template-tags.json @@ -2,7 +2,6 @@ "lang_activeNews": "Novidades", "lang_content": "Conte\u00fado", "lang_date": "Data", - "lang_delete": "Excluir", "lang_latestUpdate": "\u00daltima Atualiza\u00e7\u00e3o", "lang_newsIntro": "Aqui voc\u00ea tem a possibilidade de editar as novidades que s\u00e3o mostradas para os clientes do bwLehrpool.", "lang_newsOld": "Antigas", diff --git a/modules-available/serversetup-bwlp/config.json b/modules-available/serversetup-bwlp/config.json index f2abe27c..7205d70a 100644 --- a/modules-available/serversetup-bwlp/config.json +++ b/modules-available/serversetup-bwlp/config.json @@ -1,4 +1,3 @@ { - "category":"main.settings", - "enabled":"true" + "category":"main.settings-server" } diff --git a/modules-available/serversetup-bwlp/lang/de/template-tags.json b/modules-available/serversetup-bwlp/lang/de/template-tags.json index bdbcb1ec..700d3ef1 100644 --- a/modules-available/serversetup-bwlp/lang/de/template-tags.json +++ b/modules-available/serversetup-bwlp/lang/de/template-tags.json @@ -7,7 +7,6 @@ "lang_bootMenu": "Bootmen\u00fc", "lang_bootMenuCreate": "Bootmen\u00fc erzeugen", "lang_chooseIP": "Bitte w\u00e4hlen Sie die IP-Adresse, \u00fcber die der Server von den Clients zum Booten angesprochen werden soll.", - "lang_close": "Schlie\u00dfen", "lang_compile": "Kompilieren", "lang_customEntry": "Eigener Eintrag", "lang_example": "Beispiel", diff --git a/modules-available/serversetup-bwlp/lang/en/template-tags.json b/modules-available/serversetup-bwlp/lang/en/template-tags.json index af22081a..bb44247c 100644 --- a/modules-available/serversetup-bwlp/lang/en/template-tags.json +++ b/modules-available/serversetup-bwlp/lang/en/template-tags.json @@ -6,9 +6,7 @@ "lang_bootInfo": "Here adjustments can be made to the appearance of the boot menu.", "lang_bootMenu": "Boot Menu", "lang_bootMenuCreate": "Create Boot Menu", - "lang_cancel": "Cancel", "lang_chooseIP": "Please select the IP address that the client server will use to boot.", - "lang_close": "Close", "lang_compile": "Compile", "lang_compilingIpxe": "Compiling iPXE", "lang_customEntry": "Custom entry", diff --git a/modules-available/serversetup-bwlp/lang/pt/template-tags.json b/modules-available/serversetup-bwlp/lang/pt/template-tags.json index 3120c58c..14788767 100644 --- a/modules-available/serversetup-bwlp/lang/pt/template-tags.json +++ b/modules-available/serversetup-bwlp/lang/pt/template-tags.json @@ -6,7 +6,6 @@ "lang_bootInfo": "Aqui ajustes podem ser feitos na apar\u00eancia do menu de boot.", "lang_bootMenu": "Menu de Boot", "lang_bootMenuCreate": "Criar Menu de Boot", - "lang_cancel": "Cancelar", "lang_chooseIP": "Por favor, selecione o endere\u00e7o IP que o servidor do cliente utilizar\u00e1 realizar o boot.", "lang_close": "Fechar", "lang_compile": "Compilar", diff --git a/modules-available/session/config.json b/modules-available/session/config.json index 4da67ef8..2c63c085 100644 --- a/modules-available/session/config.json +++ b/modules-available/session/config.json @@ -1,3 +1,2 @@ { - "enabled":"true" } diff --git a/modules-available/statistics/lang/de/template-tags.json b/modules-available/statistics/lang/de/template-tags.json index 138ee4a4..bd4785c0 100644 --- a/modules-available/statistics/lang/de/template-tags.json +++ b/modules-available/statistics/lang/de/template-tags.json @@ -12,7 +12,6 @@ "lang_hardwareSummary": "Hardware", "lang_hdds": "Festplatten", "lang_hostname": "Hostname", - "lang_hours": "Stunden", "lang_inUseMachines": "In Verwendung", "lang_ip": "IP-Adresse", "lang_knownMachines": "Bekannte Clients", @@ -52,7 +51,6 @@ "lang_ramSlots": "Speicher-Slots", "lang_realCores": "Kerne", "lang_reallocatedSectors": "Defekte Sektoren", - "lang_save": "Speichern", "lang_serialNo": "Serien-Nr", "lang_sockets": "Sockel", "lang_tempPart": "Temp. Partition", diff --git a/modules-available/statistics/lang/en/template-tags.json b/modules-available/statistics/lang/en/template-tags.json index 5782cb88..aae26ae6 100644 --- a/modules-available/statistics/lang/en/template-tags.json +++ b/modules-available/statistics/lang/en/template-tags.json @@ -12,7 +12,6 @@ "lang_hardwareSummary": "Hardware", "lang_hdds": "Hard disk drives", "lang_hostname": "Hostname", - "lang_hours": "hours", "lang_inUseMachines": "In use", "lang_ip": "IP address", "lang_knownMachines": "Known clients", @@ -52,7 +51,6 @@ "lang_ramSlots": "Memory slots", "lang_realCores": "Cores", "lang_reallocatedSectors": "Bad sectors", - "lang_save": "Save", "lang_serialNo": "Serial no", "lang_sockets": "Sockets", "lang_tempPart": "Temp. partition", diff --git a/modules-available/support/config.json b/modules-available/support/config.json index 6c189b63..706412d0 100644 --- a/modules-available/support/config.json +++ b/modules-available/support/config.json @@ -1,4 +1,3 @@ { - "category":"main.content", - "enabled":"true" + "category":"main.content" } diff --git a/modules-available/sysconfig/config.json b/modules-available/sysconfig/config.json index ee5c83c8..28d71577 100644 --- a/modules-available/sysconfig/config.json +++ b/modules-available/sysconfig/config.json @@ -1,5 +1,3 @@ { - "category":"main.settings", - "enabled":"true", - "dependencies": [ "minilinux" ] + "category":"main.settings-client" } diff --git a/modules-available/sysconfig/lang/de/template-tags.json b/modules-available/sysconfig/lang/de/template-tags.json index a0d88a92..c1cf8be8 100644 --- a/modules-available/sysconfig/lang/de/template-tags.json +++ b/modules-available/sysconfig/lang/de/template-tags.json @@ -12,13 +12,11 @@ "lang_asteriskMandatory": "Mit (*) gekennzeichnete Felder sind Pflichtfelder", "lang_availableModules": "Verf\u00fcgbare Konfigurationsmodule", "lang_availableSystem": "Verf\u00fcgbare Systemkonfigurationen", - "lang_back": "Zur\u00fcck", "lang_bindDN": "Bind DN", "lang_branding": "Hier k\u00f6nnen Sie ihr Einrichtungslogo im SVG-Format hochladen. Das SVG-Format ist ein Vektorgrafikformat, was zum Skalieren vorteilhaft ist. Eine gute Quelle f\u00fcr SVG-Logos von Unis und Hochschulen ist ihr jeweiliger Wikipedia-Artikel.", "lang_brandingInfo": "Unten sehen Sie zur Kontrolle noch einmal das ausgew\u00e4hlte Logo. Sollten Sie das Logo nicht sehen k\u00f6nnen, pr\u00fcfen Sie bitte, ob Sie ein valides SVG-Bild verwendet haben. Alternativ ist es m\u00f6glich, dass beim Verarbeiten des Bildes ein Fehler auftrat. Sie k\u00f6nnen daher das Modul trotzdem speichern und testen, ob das Logo im bwLehrpool-System angezeigt wird.", "lang_browseForFile": "Durchsuchen", "lang_checkFileContent": "Hier haben Sie die M\u00f6glichkeit, den Inhalt des Archivs noch einmal zu \u00fcberpr\u00fcfen.", - "lang_close": "Schlie\u00dfen", "lang_computerLoad": "Bild von lokalem Rechner hochladen", "lang_configuration": "Konfiguration", "lang_configurationActive": "Konfiguration aktivieren", @@ -30,12 +28,10 @@ "lang_customCertificate": "Zur Validierung zus\u00e4tzlich erforderliche (Intermediate-)Zertifikate", "lang_customModuleInfo1": "\u00dcber ein benutzerdefiniertes Modul ist es m\u00f6glich, beliebige Dateien zum Linux-Grundsystem, das auf den Clients gebootet wird, hinzuzuf\u00fcgen. Dazu kann ein Archiv mit einer Dateisystemstruktur hochgeladen werden, die in dieser Form 1:1 in das gebootete Linux extrahiert wird.", "lang_customModuleInfo2": "Beispiel: Enth\u00e4lt das hochgeladene Archiv eine Datei etc\/beispiel.conf, so wird auf einem gebooteten Client diese Datei als \/etc\/beispiel.conf zu finden sein.", - "lang_delete": "L\u00f6schen", "lang_deleteLong": "Modul oder Konfiguration l\u00f6schen.", "lang_dnLookup": "Ermitteln der Bind-DN", "lang_download": "Herunterladen", "lang_downloadLong": "Dieses Modul \"so wie es ist\" herunterladen.", - "lang_edit": "Bearbeiten", "lang_editLong": "Modul oder Konfiguration bearbeiten.", "lang_generateModule": "Modul erzeugen", "lang_helpHomeAttrHead": "Name des Home-Verzeichnis-Attributs", @@ -57,7 +53,6 @@ "lang_name": "Name", "lang_newConfiguration": "Neue Konfiguration", "lang_newModule": "Neues Modul", - "lang_next": "Weiter", "lang_noContent": "Kein Inhalt!", "lang_noModuleOfType": "Kein Modul dieser Art vorhanden.", "lang_noOpenPort": "Auf dem angegebenen Server wurde kein offener Port gefunden.", @@ -71,7 +66,6 @@ "lang_restartWizard": "Wizard neu starten", "lang_rootKey": "root pubkey (\u00f6ffentlicher Schl\u00fcssel)", "lang_rootKeyInfo": "Tragen Sie hier den \u00f6ffentlichen Schl\u00fcssel eines Schl\u00fcsselpaars ein, mit dem Sie sich als root-Benutzer an den Clients anmelden wollen. Lassen Sie das Feld leer, um diese Funktion nicht zu verwenden.", - "lang_save": "Speichern", "lang_searchBase": "Suchbasis", "lang_selectFile": "Bitte w\u00e4hlen Sie ein Archiv", "lang_selectHomeAttribute": "Home-Attribut", diff --git a/modules-available/sysconfig/lang/en/template-tags.json b/modules-available/sysconfig/lang/en/template-tags.json index f4ce7c4d..2e42d1f5 100644 --- a/modules-available/sysconfig/lang/en/template-tags.json +++ b/modules-available/sysconfig/lang/en/template-tags.json @@ -12,13 +12,11 @@ "lang_asteriskMandatory": "Fields marked with (*) are mandatory", "lang_availableModules": "Available Configuration Modules", "lang_availableSystem": "Available System Configuration", - "lang_back": "Back", "lang_bindDN": "Bind DN", "lang_branding": "For best results, you should upload the logo in SVG format. SVG is a vector graphics format, which is advantageous for scaling. A good source for SVG logos of universities and colleges is their respective Wikipedia article.", "lang_brandingInfo": "Below you can check the selected logo. If you can not see the logo, please check whether you have used a valid SVG image. Alternatively, it is possible that during processing of the image, an error occurred. Therefore, you can save the module anyway and test whether the logo is displayed in the bwLehrpool system.", "lang_browseForFile": "Browse", "lang_checkFileContent": "Here you have the possibility to check the contents of the archive again.", - "lang_close": "Close", "lang_computerLoad": "Load image from local computer", "lang_configuration": "Configuration", "lang_configurationActive": "Enable configuration", @@ -30,12 +28,10 @@ "lang_customCertificate": "Additional (intermediate) certificates required for certificate validation", "lang_customModuleInfo1": "About a custom module, it is possible to add arbitrary files to a Linux system that is booted clients. For this purpose, an archive can be uploaded using a file system structure that is extracted in this form 1:1 in the booted Linux.", "lang_customModuleInfo2": "Example: If the uploaded archive is the file etc\/example.conf, this file will be located as \/etc\/example.conf to a booted client.", - "lang_delete": "Delete", "lang_deleteLong": "Delete module or configuration.", "lang_dnLookup": "Looking up bind dn", "lang_download": "Download", "lang_downloadLong": "Download module \"as is\".", - "lang_edit": "Edit", "lang_editLong": "Edit module or configuration.", "lang_folderRedirection": "Folder Redirection", "lang_generateModule": "Generating module", @@ -64,7 +60,6 @@ "lang_name": "Name", "lang_newConfiguration": "New Configuration", "lang_newModule": "New Module", - "lang_next": "Next", "lang_noContent": "No content!", "lang_noModuleOfType": "No module of this type found.", "lang_noOpenPort": "There is no open LDAP port on this server.", @@ -79,7 +74,6 @@ "lang_restartWizard": "Restart wizard", "lang_rootKey": "root pubkey", "lang_rootKeyInfo": "Here you can add the public key of a keypair that you want to use for authentication as root-user. Leave this field blank to disable the feature.", - "lang_save": "Save", "lang_searchBase": "Search Base", "lang_selectFile": "Please select an archive", "lang_selectHomeAttribute": "Home attribute", diff --git a/modules-available/sysconfig/lang/pt/template-tags.json b/modules-available/sysconfig/lang/pt/template-tags.json index ff8c37fa..d136c801 100644 --- a/modules-available/sysconfig/lang/pt/template-tags.json +++ b/modules-available/sysconfig/lang/pt/template-tags.json @@ -7,11 +7,8 @@ "lang_adText4": "Depois de inserir todos os dados necess\u00e1rios na pr\u00f3xima etapa, ela verifica se a comunica\u00e7\u00e3o \u00e9 poss\u00edvel com o AD.", "lang_availableModules": "M\u00f3dulos de Configura\u00e7\u00e3o Dispon\u00edveis", "lang_availableSystem": "Configura\u00e7\u00f5es de Sistema Dispon\u00edveis", - "lang_back": "Voltar", "lang_bindDN": "Vincular DN", - "lang_close": "Fechar", "lang_configurationModuleNotFound": "M\u00f3dulo de configura\u00e7\u00e3o n\u00e3o encontrado!", - "lang_delete": "Excluir", "lang_file": "Arquivo", "lang_helpModuleConfiguration": "M\u00f3dulos de configura\u00e7\u00e3o s\u00e3o as pe\u00e7as fundamentais para a cria\u00e7\u00e3o de uma configura\u00e7\u00e3o de sistema. Aqui voc\u00ea pode criar tanto m\u00f3dulos gen\u00e9ricos atrav\u00e9s de nossa interface, tanto quanto criar m\u00f3dulos completamente customizados (\u00e9 necess\u00e1rio conhecimento de Linux avan\u00e7ado).", "lang_helpSystemConfiguration": "A localiza\u00e7\u00e3o fundamental do sistema bwLehrpool \u00e9 feita atrav\u00e9s de uma configura\u00e7\u00e3o de sistema. Isso inclui aspectos como o m\u00e9todo de autentica\u00e7\u00e3o de usu\u00e1rios (por exemplo, Diret\u00f3rio Ativo, LDAP), configura\u00e7\u00e3o de impressora, diret\u00f3rios home, etc. Uma configura\u00e7\u00e3o de sistema \u00e9 composta por um ou mais m\u00f3dulo de configura\u00e7\u00e3o, que podem ser gerenciados na parte inferior da p\u00e1gina.", @@ -21,10 +18,8 @@ "lang_new": "Novo", "lang_newConfiguration": "Nova Configura\u00e7\u00e3o", "lang_newModule": "Novo M\u00f3dulo", - "lang_next": "Pr\u00f3ximo", "lang_noContent": "Sem conte\u00fado!", "lang_password": "Senha", - "lang_save": "Salvar", "lang_searchBase": "Base de Pesquisa", "lang_show": "Mostrar", "lang_systemConfiguration": "Confgura\u00e7\u00e3o do Sistema", diff --git a/modules-available/sysconfignew/config.json b/modules-available/sysconfignew/config.json index 4da67ef8..28d71577 100644 --- a/modules-available/sysconfignew/config.json +++ b/modules-available/sysconfignew/config.json @@ -1,3 +1,3 @@ { - "enabled":"true" + "category":"main.settings-client" } diff --git a/modules-available/syslog/config.json b/modules-available/syslog/config.json index 650ab2fe..6778348d 100644 --- a/modules-available/syslog/config.json +++ b/modules-available/syslog/config.json @@ -1,4 +1,3 @@ { - "category":"main.status", - "enabled":"true" + "category":"main.status" } diff --git a/modules-available/systemstatus/config.json b/modules-available/systemstatus/config.json index e78484d8..3c2efce7 100644 --- a/modules-available/systemstatus/config.json +++ b/modules-available/systemstatus/config.json @@ -1,5 +1,4 @@ { "category":"main.status", - "enabled":"true", "dependencies": [ "js_circles" ] } diff --git a/modules-available/translation/config.json b/modules-available/translation/config.json index 6c189b63..706412d0 100644 --- a/modules-available/translation/config.json +++ b/modules-available/translation/config.json @@ -1,4 +1,3 @@ { - "category":"main.content", - "enabled":"true" + "category":"main.content" } diff --git a/modules-available/translation/lang/de/template-tags.json b/modules-available/translation/lang/de/template-tags.json index 83871e46..3f381751 100644 --- a/modules-available/translation/lang/de/template-tags.json +++ b/modules-available/translation/lang/de/template-tags.json @@ -1,16 +1,7 @@ { - "lang_adminInfo": "Dies ist eine Liste aller Templates. Die \"Status\"-Spalte zeigt an, wenn f\u00fcr ein Template \u00fcbersetzungen fehlen, oder veraltete Tags definiert sind.", "lang_createTag": "Tag erstellen", - "lang_editConfigModule": "Konfigurationsmodulbezeichnungsphrasen editieren", - "lang_editHardcoded": "Hardcoded-Texte bearbeiten", - "lang_editMessages": "Nachrichten bearbeiten", - "lang_editModules": "Modul bearbeiten", - "lang_editSettings": "Einstellungstexte bearbeiten", - "lang_editTemplates": "Template-Texte bearbeiten", "lang_global": "Global", "lang_globalTooltip": "Dieser Tag ist global verf\u00fcgbar und braucht normalerweise nicht explizit f\u00fcr dieses Modul \u00fcbersetzt zu werden", - "lang_langAdministration": "Templates", - "lang_mainHeading": "\u00dcbersetzungen verwalten", "lang_messages": "Benachrichtigungen", "lang_missing": "Fehlend", "lang_module": "Modul", diff --git a/modules-available/translation/lang/en/template-tags.json b/modules-available/translation/lang/en/template-tags.json index 75564bc3..5aee54c3 100644 --- a/modules-available/translation/lang/en/template-tags.json +++ b/modules-available/translation/lang/en/template-tags.json @@ -1,16 +1,7 @@ { - "lang_adminInfo": "This is a list of all templates. The \"status\"-column tells if there are translations missing, or unused tags are defined.", - "lang_createTag": "Create TAG", - "lang_editConfigModule": "Edit config module strings", - "lang_editHardcoded": "Edit hardcoded strings", - "lang_editMessages": "Edit Messages", - "lang_editModules": "Edit Module Translations", - "lang_editSettings": "Edit configuration variables related strings", - "lang_editTemplates": "Edit template strings", + "lang_createTag": "Create Tag", "lang_global": "Global", "lang_globalTooltip": "This tag is global; usually there is no need to translate it explicitly for this module", - "lang_langAdministration": "Templates", - "lang_mainHeading": "Translation management", "lang_messages": "Messages", "lang_missing": "Missing", "lang_module": "Module", diff --git a/modules-available/usermanagement/config.json b/modules-available/usermanagement/config.json index b9fc3ad3..9c66d6bf 100644 --- a/modules-available/usermanagement/config.json +++ b/modules-available/usermanagement/config.json @@ -1,5 +1,4 @@ { "category":"main.users", - "enabled":"true", "permission":"0" } diff --git a/modules-available/usermanagement/lang/en/template-tags.json b/modules-available/usermanagement/lang/en/template-tags.json index 61225f55..66b30c6a 100644 --- a/modules-available/usermanagement/lang/en/template-tags.json +++ b/modules-available/usermanagement/lang/en/template-tags.json @@ -1,15 +1,12 @@ { "lang_cancelConfirm": "Do you really want to delete this users?", - "lang_close": "Close", "lang_create": "Create", - "lang_edit": "Edit", "lang_editUser": "Edit User", "lang_email": "Email", "lang_login": "Login", "lang_operations": "Operation", "lang_password": "Password", "lang_remove": "Remove", - "lang_save": "Save", "lang_telephone": "Telephone", "lang_userAdmin": "Administrator", "lang_userInfo": "On this section, you will be able to create website users, besides editing or removing existing users.", diff --git a/modules-available/usermanagement/lang/pt/template-tags.json b/modules-available/usermanagement/lang/pt/template-tags.json index 3ce0d812..ad84126a 100644 --- a/modules-available/usermanagement/lang/pt/template-tags.json +++ b/modules-available/usermanagement/lang/pt/template-tags.json @@ -1,15 +1,12 @@ { "lang_cancelConfirm": "Deseja realmente remover o usu\u00e1rio?", - "lang_close": "Fechar", "lang_create": "Criar", - "lang_edit": "Editar", "lang_editUser": "Editar Usu\u00e1rio", "lang_email": "Email", "lang_login": "Login", "lang_operations": "Opera\u00e7\u00f5es", "lang_password": "Senha", "lang_remove": "Remover", - "lang_save": "Salvar", "lang_telephone": "Telefone", "lang_userAdmin": "Administrador", "lang_userInfo": "Nesta se\u00e7\u00e3o voc\u00ea poder\u00e1 criar usu\u00e1rios para o site, al\u00e9m de editar as informa\u00e7\u00f5es ou remover usu\u00e1rios existentes.", diff --git a/modules-available/vmstore/config.json b/modules-available/vmstore/config.json index f2abe27c..7205d70a 100644 --- a/modules-available/vmstore/config.json +++ b/modules-available/vmstore/config.json @@ -1,4 +1,3 @@ { - "category":"main.settings", - "enabled":"true" + "category":"main.settings-server" } diff --git a/modules-available/vmstore/lang/de/template-tags.json b/modules-available/vmstore/lang/de/template-tags.json index e47c451d..a7840aa7 100644 --- a/modules-available/vmstore/lang/de/template-tags.json +++ b/modules-available/vmstore/lang/de/template-tags.json @@ -1,6 +1,4 @@ { - "lang_back": "Zur\u00fcck", - "lang_close": "Schlie\u00dfen", "lang_configure": "Konfigurieren", "lang_intern": "Intern", "lang_nfsHelp1": "Ben\u00f6tigt wird ein NFSv4\/3-Share, der f\u00fcr den Satelliten-Server schreibbar, und f\u00fcr die Arbeitsstationen lesbar ist. Beispielkonfiguration auf dem NFS-Server, wenn der Satelliten-Server die Adresse 1.2.3.4 hat:", @@ -9,7 +7,6 @@ "lang_password": "Passwort", "lang_readOnly": "Nur-Lese-Zugangsdaten", "lang_readWrite": "Lese\/Schreib-Zugangsdaten", - "lang_save": "Speichern", "lang_username": "Benutzerkennung", "lang_vmLocation": "VM Speicherort", "lang_vmLocationChoose": "Bitte w\u00e4hlen Sie, wo die Images der Virtuellen Maschinen gespeichert werden sollen.", diff --git a/modules-available/vmstore/lang/en/template-tags.json b/modules-available/vmstore/lang/en/template-tags.json index bd1e043a..38047e09 100644 --- a/modules-available/vmstore/lang/en/template-tags.json +++ b/modules-available/vmstore/lang/en/template-tags.json @@ -1,6 +1,4 @@ { - "lang_back": "Back", - "lang_close": "Close", "lang_configure": "Configure", "lang_intern": "Intern", "lang_nfsHelp1": "An NFSv4\/3-Share is required. It should be readable by all the workstations, and writable for the satellite server. An example, assuming the satellite server has IP address 1.2.3.4:", @@ -9,7 +7,6 @@ "lang_password": "Password", "lang_readOnly": "Read-only Access", "lang_readWrite": "Read\/Write Access", - "lang_save": "Save", "lang_username": "Username", "lang_vmLocation": "VM Location", "lang_vmLocationChoose": "Please choose where the images of virtual machines will be stored.", diff --git a/modules-available/webinterface/config.json b/modules-available/webinterface/config.json index 6c189b63..7205d70a 100644 --- a/modules-available/webinterface/config.json +++ b/modules-available/webinterface/config.json @@ -1,4 +1,3 @@ { - "category":"main.content", - "enabled":"true" + "category":"main.settings-server" } diff --git a/modules-available/webinterface/lang/de/template-tags.json b/modules-available/webinterface/lang/de/template-tags.json index 631d139f..e204adec 100644 --- a/modules-available/webinterface/lang/de/template-tags.json +++ b/modules-available/webinterface/lang/de/template-tags.json @@ -12,6 +12,5 @@ "lang_passwordFields": "Passwortfelder", "lang_privateKey": "Bitte f\u00fcgen Sie hier den privaten Schl\u00fcssel ein, der zum obigen Zertifikat geh\u00f6rt. Er muss ebenfalls im \"pem\"-Format vorliegen, und sieht wie folgt aus:", "lang_randomCert": "Neues selbstsigniertes Zertifikat generieren", - "lang_save": "Speichern", "lang_showPasswords": "Passw\u00f6rter anzeigen" }
\ No newline at end of file diff --git a/modules-available/webinterface/lang/en/template-tags.json b/modules-available/webinterface/lang/en/template-tags.json index 0c58fba7..4a43bdc1 100644 --- a/modules-available/webinterface/lang/en/template-tags.json +++ b/modules-available/webinterface/lang/en/template-tags.json @@ -12,6 +12,5 @@ "lang_passwordFields": "Password fields", "lang_privateKey": "Please paste the private key belonging to the certificate here. It has to be in \"pem\" format too, which should look like this:", "lang_randomCert": "Genenrate new self-signed certificate", - "lang_save": "Save", "lang_showPasswords": "Show passwords" }
\ No newline at end of file diff --git a/modules-available/webinterface/page.inc.php b/modules-available/webinterface/page.inc.php index b6502e35..3c4304cd 100644 --- a/modules-available/webinterface/page.inc.php +++ b/modules-available/webinterface/page.inc.php @@ -48,7 +48,6 @@ class Page_WebInterface extends Page protected function doRender() { - Render::setTitle(Dictionary::translate('lang_titleWebinterface')); if (Request::get('show') === 'httpsupdate') { Render::addTemplate('httpd-restart', array('taskid' => Session::get('https-id'))); } |