From d7efef285bfef24739cc56cf7fad2bedf5fcd9dd Mon Sep 17 00:00:00 2001 From: Christian Hofmaier Date: Thu, 14 Sep 2017 15:57:36 +0200 Subject: [dozmod] fixed inconsistencies + some issues in [internetaccess] and [news] --- .../dozmod/lang/de/template-tags.json | 7 +- .../dozmod/lang/en/template-tags.json | 17 ++- modules-available/dozmod/page.inc.php | 1 + modules-available/dozmod/style.css | 12 ++ .../dozmod/templates/actionlog-log.html | 84 ++++++------ .../dozmod/templates/images-delete.html | 34 +++-- modules-available/dozmod/templates/mailconfig.html | 41 +++--- modules-available/dozmod/templates/orglist.html | 14 +- .../dozmod/templates/runtimeconfig.html | 6 +- modules-available/dozmod/templates/templates.html | 151 +++++++++++---------- modules-available/dozmod/templates/userlist.html | 34 +++-- .../internetaccess/templates/_page.html | 4 +- modules-available/news/templates/page-news.html | 22 ++- 13 files changed, 249 insertions(+), 178 deletions(-) diff --git a/modules-available/dozmod/lang/de/template-tags.json b/modules-available/dozmod/lang/de/template-tags.json index 97ab0a21..0c7d8348 100644 --- a/modules-available/dozmod/lang/de/template-tags.json +++ b/modules-available/dozmod/lang/de/template-tags.json @@ -4,6 +4,7 @@ "lang_allowLoginDescription": "Wenn diese Option aktiviert ist, k\u00f6nnen sich alle Mitarbeiter der Einrichtung \u00fcber die bwLehrpool-Suite anmelden und VMs\/Veranstaltungen verwalten. Wenn Sie diese Option deaktivieren, m\u00fcssen Sie in der Untersektion \"Benutzer und Berechtigungen\" jeden Benutzer nach dem ersten Loginversuch manuell freischalten.", "lang_asteriskRequired": "Felder mit (*) sind erforderlich", "lang_blockCount": "Anzahl Bl\u00f6cke", + "lang_bwlehrpoolsuite": "bwLehrpool-Suite", "lang_canLoginOrganization": "Nutzer dieser Einrichtung k\u00f6nnen sich am Satelliten anmelden", "lang_canLoginUser": "Nutzer kann sich am Satelliten anmelden", "lang_createTime": "Erstellt", @@ -53,11 +54,12 @@ "lang_os": "Betriebssystem", "lang_owner": "Besitzer", "lang_password": "Passwort", + "lang_passwordplaceholder": "SMTP Passwort", "lang_placeholders": "Platzhalter", "lang_port": "Port", "lang_reallyResetTemplates": "Sind Sie sicher, dass Sie alle Texte l\u00f6schen und auf die Standardwerte zur\u00fccksetzen wollen?", "lang_replaceWithOriginal": "Originaltext in Textbox laden", - "lang_replyTo": "Reply-To Adresse (z.B. Helpdesk)", + "lang_replyTo": "Reply-To Adresse", "lang_runtimeConfig": "Laufzeit-Konfiguration", "lang_runtimeConfigHeadline": "Laufzeit-Konfiguration", "lang_runtimeConfigLimits": "Beschr\u00e4nkungen", @@ -84,7 +86,8 @@ "lang_userList": "Benutzerliste", "lang_userListDescription": "Hier k\u00f6nnen Sie individuelle Nutzer zu \"Super-Usern\" machen. Diese haben in der bwLehrpool-Suite auf alle Veranstaltungen und VMs Vollzugriff, unabh\u00e4ngig von den gesetzten Berechtigungen. Au\u00dferdem k\u00f6nnen Sie hier Benutzer vom Zugriff mittels der bwLehrpool-Suite ausschlie\u00dfen.", "lang_userListHeader": "Dem Satelliten bekannte Benutzer", - "lang_username": "Benutzername (SMTP-Auth)", + "lang_username": "Benutzername", + "lang_usernameplaceholder": "SMTP Benutzername", "lang_version": "Version vom", "lang_when": "Wann" } \ No newline at end of file diff --git a/modules-available/dozmod/lang/en/template-tags.json b/modules-available/dozmod/lang/en/template-tags.json index e2e085b4..95edfe49 100644 --- a/modules-available/dozmod/lang/en/template-tags.json +++ b/modules-available/dozmod/lang/en/template-tags.json @@ -4,6 +4,7 @@ "lang_allowLoginDescription": "If this option is enabled, all members of the organization marked as staff or employee are allowed to login to this server and manage VMs\/courses. Otherwise, new users need to be individually allowed access after their first login attempt by visiting the sub page \"users and permissions\" in this web interface.", "lang_asteriskRequired": "Fields marked with (*) are required", "lang_blockCount": "Block count", + "lang_bwlehrpoolsuite": "bwLehrpool-Suite", "lang_canLoginOrganization": "Users from this organization can login", "lang_canLoginUser": "This user can login", "lang_createTime": "Created", @@ -28,7 +29,7 @@ "lang_followingPlaceholdersUnused": "The following placeholders are not being used", "lang_hasNewer": "Newer version exists", "lang_hash": "Hash", - "lang_heading": "Images marked for deletion", + "lang_heading": "Images Marked for Deletion", "lang_host": "Host", "lang_image": "VM", "lang_lastEditor": "Edited by", @@ -39,27 +40,28 @@ "lang_lecturePermissionEdit": "Edit", "lang_loadDefaults": "Reset all templates to their defaults", "lang_mailConfig": "SMTP configuration for sending mails", - "lang_mailConfigHeadline": "email configuration", + "lang_mailConfigHeadline": "Email Configuration", "lang_mailDescription": "Fill in the following fields if you want to notify tutors\/professors\/lecturers about expiring VMs and lectures. If you leave one of the required fields blank, the feature will be disabled.", - "lang_mailTemplates": "E-Mail templates", + "lang_mailTemplates": "E-Mail Templates", "lang_maxImageValidity": "New VM validity (days)", "lang_maxLectureVisibility": "Max time lecture end date may lie in the future (days)", "lang_maxTransfers": "Max concurrent transfers per user", "lang_miscOptions": "Misc options", "lang_modified": "modified", "lang_organization": "Organization", - "lang_organizationList": "List of organizations", + "lang_organizationList": "List of Organizations", "lang_organizationListHeader": "Set access permissions for organizations", "lang_os": "Operating System", "lang_owner": "Owner", "lang_password": "Password", + "lang_passwordplaceholder": "SMTP Password", "lang_placeholders": "Placeholders", "lang_port": "Port", "lang_reallyResetTemplates": "Are you sure you want to reset all texts to their default values?", "lang_replaceWithOriginal": "load original text into text box", "lang_replyTo": "Reply-To address", "lang_runtimeConfig": "Limits and Defaults", - "lang_runtimeConfigHeadline": "Configure limits and defaults for bwLehrpool-Suite", + "lang_runtimeConfigHeadline": "Configure Limits and Defaults for bwLehrpool-Suite", "lang_runtimeConfigLimits": "Limitations", "lang_senderAddress": "Sender address", "lang_senderName": "Sender's display name", @@ -81,10 +83,11 @@ "lang_updateTime": "Last update", "lang_user": "User name", "lang_userId": "User id", - "lang_userList": "User list", + "lang_userList": "User List", "lang_userListDescription": "Here you can promote \"super users\", which will have all permissions in the bwLehrpool-Suite. You can also ban users from accessing this server via the bwLehrpool-Suite.", "lang_userListHeader": "Users known to this satellite", - "lang_username": "User name (SMTP auth)", + "lang_username": "Username", + "lang_usernameplaceholder": "SMTP Username", "lang_version": "Version timestamp", "lang_when": "When" } \ No newline at end of file diff --git a/modules-available/dozmod/page.inc.php b/modules-available/dozmod/page.inc.php index 9c247770..24ad00d8 100644 --- a/modules-available/dozmod/page.inc.php +++ b/modules-available/dozmod/page.inc.php @@ -180,6 +180,7 @@ class Page_DozMod extends Page $row['name_extra_class'] = 'slx-strike'; } $row['version'] = date('d.m.Y H:i:s', $row['createtime']); + $row['rawfilesize'] = $row['filesize']; $row['filesize'] = Util::readableFileSize($row['filesize']); $rows[] = $row; } diff --git a/modules-available/dozmod/style.css b/modules-available/dozmod/style.css index 22d769ed..15b0afe0 100644 --- a/modules-available/dozmod/style.css +++ b/modules-available/dozmod/style.css @@ -35,3 +35,15 @@ .table-input-group tr.input-group td:last-child input { border-radius: 0px 4px 4px 0px; } + +.input-group-addon { + min-width:200px; +} + +.table > tbody > tr > td { + vertical-align: middle; +} + +.table > tbody > tr > td > div { + display: inline-block; +} \ No newline at end of file diff --git a/modules-available/dozmod/templates/actionlog-log.html b/modules-available/dozmod/templates/actionlog-log.html index 151d2545..0f84a4ec 100644 --- a/modules-available/dozmod/templates/actionlog-log.html +++ b/modules-available/dozmod/templates/actionlog-log.html @@ -1,41 +1,45 @@ - - - - {{#showActor}} - - {{/showActor}} - {{#showTarget}} - - {{/showTarget}} - - - {{#events}} - - - {{#showActor}} - - {{/showActor}} - {{#showTarget}} - - {{/showTarget}} - - - {{/events}} +
{{lang_when}}{{lang_user}}{{lang_actionTarget}}{{lang_event}}
{{dateline_s}} - {{#uuserid}} - {{ulastname}}, {{ufirstname}} - {{/uuserid}} - {{^uuserid}} - {{lang_system}} - {{/uuserid}} - - {{#targeturl}} - {{targetname}} - {{/targeturl}} - {{^targeturl}} - {{targetname}} - {{^targetname}} - {{targetid}} - {{/targetname}} - {{/targeturl}} - {{description}}
+ + + + {{#showActor}} + + {{/showActor}} + {{#showTarget}} + + {{/showTarget}} + + + + + {{#events}} + + + {{#showActor}} + + {{/showActor}} + {{#showTarget}} + + {{/showTarget}} + + + {{/events}} +
{{lang_when}}{{lang_user}}{{lang_actionTarget}}{{lang_event}}
{{dateline_s}} + {{#uuserid}} + {{ulastname}}, {{ufirstname}} + {{/uuserid}} + {{^uuserid}} + {{lang_system}} + {{/uuserid}} + + {{#targeturl}} + {{targetname}} + {{/targeturl}} + {{^targeturl}} + {{targetname}} + {{^targetname}} + {{targetid}} + {{/targetname}} + {{/targeturl}} + {{description}}
\ No newline at end of file diff --git a/modules-available/dozmod/templates/images-delete.html b/modules-available/dozmod/templates/images-delete.html index 0ee90835..f46ac870 100644 --- a/modules-available/dozmod/templates/images-delete.html +++ b/modules-available/dozmod/templates/images-delete.html @@ -1,8 +1,8 @@ -

{{lang_heading}}

+

{{lang_bwlehrpoolsuite}}

- {{lang_subHeading}} + {{lang_heading}}

{{lang_description_delete_images}}

@@ -10,17 +10,20 @@
- +
- - - + + + - + @@ -28,16 +31,21 @@ {{#images}} - + - - + + {{/images}}
{{lang_image}}{{lang_version}}{{lang_owner}}{{lang_image}}{{lang_version}}{{lang_owner}} {{lang_size}}{{lang_size}} - - +
+ + + +
{{displayname}}
{{imageversionid}}		{{version}}{{version}} {{lastname}}, {{firstname}} {{filesize}}{{filesize}} +
+ + +
+
- +
diff --git a/modules-available/dozmod/templates/mailconfig.html b/modules-available/dozmod/templates/mailconfig.html index 4f8b81fa..8e0a3ce2 100644 --- a/modules-available/dozmod/templates/mailconfig.html +++ b/modules-available/dozmod/templates/mailconfig.html @@ -1,24 +1,25 @@ -

{{lang_mailConfigHeadline}}

+

{{lang_bwlehrpoolsuite}}

{{lang_mailConfig}}
+

{{lang_mailDescription}}

- +
- +
- +
- +
- +
- +
- - + +
- - + +

{{lang_asteriskRequired}}


{{lang_testConfiguration}}

- +

- - - - -
- - +
+ + + + +
+ + +
diff --git a/modules-available/dozmod/templates/orglist.html b/modules-available/dozmod/templates/orglist.html index 21495bba..ef4f8d8b 100644 --- a/modules-available/dozmod/templates/orglist.html +++ b/modules-available/dozmod/templates/orglist.html @@ -1,15 +1,13 @@ -

{{lang_organizationList}}

-
{{lang_organizationListHeader}}
- +
- + @@ -17,8 +15,11 @@ {{#organizations}} - {{/organizations}} @@ -32,6 +33,7 @@ function seto(action, el, orgid) { var box = $(el); + box = box.parent(); var v = el.checked ? '1' : '0'; var old = el.checked == true; box.css('display', 'none'); diff --git a/modules-available/dozmod/templates/runtimeconfig.html b/modules-available/dozmod/templates/runtimeconfig.html index 9bdc44b0..4c92b558 100644 --- a/modules-available/dozmod/templates/runtimeconfig.html +++ b/modules-available/dozmod/templates/runtimeconfig.html @@ -1,4 +1,4 @@ -

{{lang_runtimeConfigHeadline}}

+

{{lang_bwlehrpoolsuite}}

@@ -106,7 +106,9 @@
- +
+ +
diff --git a/modules-available/dozmod/templates/templates.html b/modules-available/dozmod/templates/templates.html index 8a3caf26..56fc6677 100644 --- a/modules-available/dozmod/templates/templates.html +++ b/modules-available/dozmod/templates/templates.html @@ -1,91 +1,98 @@ -

{{lang_mailTemplates}}

+

{{lang_bwlehrpoolsuite}}

-

{{lang_templatePageDescription}}

+
+
+ {{lang_mailTemplates}} +
+
-
- - +

{{lang_templatePageDescription}}

+ + + -
- {{#templates}} +
-
-
-
- {{#conflict}} - - {{/conflict}} - {{#modified}} - - {{/modified}} -

- -

- {{description}} + {{#templates}} -
-
-
-
-
-
+
+
+
+ {{#conflict}} + + {{/conflict}} + {{#modified}} + + {{/modified}} +

+ +

+ {{description}} - -
- +
- -

{{lang_placeholders}}

- - -
    - {{{html_availableVariables}}} -
- {{#original_template}} - -
- - - {{lang_replaceWithOriginal}} - +
+
+
+
+ + +
+ +
+ +

{{lang_placeholders}}

+ + +
    + {{{html_availableVariables}}} +
+ {{#original_template}} + +
+ + + {{lang_replaceWithOriginal}} + +
+ {{/original_template}} +
+ {{lang_modified}}: {{#modified}}{{lang_yes}}{{/modified}}{{^modified}}{{lang_no}}{{/modified}}, + {{lang_hasNewer}}: {{#conflict}}{{lang_yes}}{{/conflict}}{{^conflict}}{{lang_no}}{{/conflict}}, + {{lang_thisVersion}}: {{edit_version}}, + {{lang_latestVersion}}: {{version}} +
- {{/original_template}} -
- {{lang_modified}}: {{#modified}}{{lang_yes}}{{/modified}}{{^modified}}{{lang_no}}{{/modified}}, - {{lang_hasNewer}}: {{#conflict}}{{lang_yes}}{{/conflict}}{{^conflict}}{{lang_no}}{{/conflict}}, - {{lang_thisVersion}}: {{edit_version}}, - {{lang_latestVersion}}: {{version}}
-
-
- {{/templates}} -
+ {{/templates}} +
-
- -
- -
- - -
- + + +
+ + +
+ +
+ +
- -
+
+
{{lang_organization}}{{lang_organization}}
{{displayname}} - + +
+ + +