diff options
| author | Christian Hofmaier | 2017-09-29 13:36:54 +0200 |
|---|---|---|
| committer | Christian Hofmaier | 2017-09-29 13:36:54 +0200 |
| commit | 5f6e43734d8fb60b74e47b91f81adac41ae69597 (patch) | |
| tree | 1189b1fc32890ace80e76dedd6b904f56c932c99 | |
| parent | [statistics] fixed inconsistencies (diff) | |
| download | slx-admin-5f6e43734d8fb60b74e47b91f81adac41ae69597.tar.gz slx-admin-5f6e43734d8fb60b74e47b91f81adac41ae69597.tar.xz slx-admin-5f6e43734d8fb60b74e47b91f81adac41ae69597.zip | |
[baseconfig][baseconfig_partitions_cdn][eventlog][minilinux][permissionmanager][rebootcontrol][statisics_reporting][syslog] fixed inconsistencies
23 files changed, 204 insertions, 133 deletions
diff --git a/modules-available/baseconfig/lang/de/template-tags.json b/modules-available/baseconfig/lang/de/template-tags.json index 7d6da790..b96586bd 100644 --- a/modules-available/baseconfig/lang/de/template-tags.json +++ b/modules-available/baseconfig/lang/de/template-tags.json @@ -2,6 +2,7 @@ "lang_basicConfiguration": "Basiskonfiguration", "lang_clientRelatedConfig": "Die Optionen auf dieser Seite beziehen sich auf das Verhalten der bwLehrpool-Clients.", "lang_defaultValue": "Standard", + "lang_discardChanges": "Änderungen verwerfen", "lang_editOverrideNotice": "Sie bearbeiten die Einstellungen f\u00fcr einen Unterbereich", "lang_enableOverride": "\u00dcberschreiben", "lang_inheritSource": "Geerbt von", diff --git a/modules-available/baseconfig/lang/en/template-tags.json b/modules-available/baseconfig/lang/en/template-tags.json index 1a32cb0d..b39bf9aa 100644 --- a/modules-available/baseconfig/lang/en/template-tags.json +++ b/modules-available/baseconfig/lang/en/template-tags.json @@ -2,6 +2,7 @@ "lang_basicConfiguration": "Basic Configuration", "lang_clientRelatedConfig": "The options on this page are related to the bwLehrpool client machines.", "lang_defaultValue": "Default", + "lang_discardChanges": "Discard Changes", "lang_editOverrideNotice": "You're editing the settings of a sub-section", "lang_enableOverride": "Override", "lang_inheritSource": "Inherited from", diff --git a/modules-available/baseconfig/templates/_page.html b/modules-available/baseconfig/templates/_page.html index 1042d83a..46fccac6 100644 --- a/modules-available/baseconfig/templates/_page.html +++ b/modules-available/baseconfig/templates/_page.html @@ -65,7 +65,7 @@ </div> {{/categories}} <div class="text-right"> - <button class="btn btn-warning" type="reset"><span class="glyphicon glyphicon-refresh"></span> {{lang_reset}}</button> + <button class="btn btn-warning" type="reset"><span class="glyphicon glyphicon-refresh"></span> {{lang_discardChanges}}</button> {{^override}} <a class="btn btn-default" href="api.php?do=baseconfig&user={{userid}}"><span class="glyphicon glyphicon-download-alt"></span> Download</a> {{/override}} diff --git a/modules-available/baseconfig_partitions_cdn/lang/de/template-tags.json b/modules-available/baseconfig_partitions_cdn/lang/de/template-tags.json index ea4f9f5c..99e0a487 100644 --- a/modules-available/baseconfig_partitions_cdn/lang/de/template-tags.json +++ b/modules-available/baseconfig_partitions_cdn/lang/de/template-tags.json @@ -1,6 +1,8 @@ { + "lang_areYouSureNoUndo": "Sind Sie sicher? Diese Aktion kann nicht r\u00fcckg\u00e4ngig gemacht werden.", "lang_confirm": "Wollen Sie die Einstellungen unter \/srv\/openslx\/www\/boot\/config speichern?", "lang_create": "Anlegen", + "lang_discardChanges": "Änderungen verwerfen", "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", diff --git a/modules-available/baseconfig_partitions_cdn/lang/en/template-tags.json b/modules-available/baseconfig_partitions_cdn/lang/en/template-tags.json index 819d2273..04ce6c80 100644 --- a/modules-available/baseconfig_partitions_cdn/lang/en/template-tags.json +++ b/modules-available/baseconfig_partitions_cdn/lang/en/template-tags.json @@ -1,6 +1,8 @@ { + "lang_areYouSureNoUndo": "Are you sure? This cannot be undone!", "lang_confirm": "Would you like to save the settings on [ \/srv\/openslx\/www\/boot\/config ] ?", "lang_create": "Create", + "lang_discardChanges": "Discard Changes", "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\/", diff --git a/modules-available/baseconfig_partitions_cdn/templates/_page.html b/modules-available/baseconfig_partitions_cdn/templates/_page.html index f7331186..71cbb7db 100644 --- a/modules-available/baseconfig_partitions_cdn/templates/_page.html +++ b/modules-available/baseconfig_partitions_cdn/templates/_page.html @@ -23,7 +23,6 @@ <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> @@ -31,24 +30,52 @@ {{/partitions}} <div class='list-group-item clearfix'> <div class="pull-right"> - <a class='btn btn-default ' data-toggle='modal' data-target='#add-partition'> + <a class='btn btn-success ' 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> + <div class="pull-right"> + <a class="btn btn-default" data-toggle="modal" data-target="#downloadModal"><span class="glyphicon glyphicon-download-alt"></span> Download</a> + <button class="btn btn-warning" type="reset"><span class="glyphicon glyphicon-refresh"></span> {{lang_discardChanges}}</button> + <button class="btn btn-primary" type="submit"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button> + </div> + + <div class ="modal fade" id="downloadModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> + <div class="modal-dialog" style="width: 400px" role="document"> + <div class="modal-content"> + <div class="modal-body"> + {{lang_confirm}} + </div> + <div class="modal-footer"> + <button type="button" onclick="saveConfig(false)" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button> + <button type="button" onclick="saveConfig(true)" class="btn btn-sm btn-danger" name="download"> Download</button> + </div> + </div> + </div> + </div> </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> -</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-danger" type="button" data-toggle="modal" data-target="#resetDefaultModal">{{lang_resetDefault}}</button> + + <div class ="modal fade" id="resetDefaultModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"> + <div class="modal-dialog" style="width: 400px" role="document"> + <div class="modal-content"> + <div class="modal-body"> + {{lang_areYouSureNoUndo}} + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button> + <button type="submit" class="btn btn-sm btn-danger" name="resetDefault"> {{lang_resetDefault}}</button> + </div> + </div> + </div> + </div> +</form> <!-- Create Partition Window --> <form action="?do=BaseConfig_Partitions_CDN" method="post"> @@ -56,32 +83,37 @@ <div class="modal-dialog"> <div class="modal-content"> - <div class="modal-header">{{lang_newPartition}}</div> - <div class="modal-body"> + <div class="modal-header"> + <h4><b>{{lang_newPartition}}</b></h4> + </div> + <div class="modal-body"> <div class="input-group"> - <span class="input-group-addon">{{lang_partitionId}}</span> + <span class="input-group-addon" style="min-width:140px;">{{lang_partitionId}}</span> <input name="new-partition-id" class="form-control" type="text"> </div> <p class="help-block">{{lang_helpId}}</p> <div class="input-group"> - <span class="input-group-addon">{{lang_partitionSize}}</span> + <span class="input-group-addon" style="min-width:140px;">{{lang_partitionSize}}</span> <input name="new-partition-size" class="form-control" type="text"> </div> <p class="help-block">{{lang_helpSize}}</p> <div class="input-group"> - <span class="input-group-addon">{{lang_partitionMountPoint}}</span> + <span class="input-group-addon" style="min-width:140px;">{{lang_partitionMountPoint}}</span> <input name="new-partition-mount-point" class="form-control" type="text"> </div> <p class="help-block">{{lang_helpMountPoint}}</p> <div class="input-group"> - <span class="input-group-addon">{{lang_partitionOptions}}</span> + <span class="input-group-addon" style="min-width:140px;">{{lang_partitionOptions}}</span> <input name="new-partition-options" class="form-control" type="text"> </div> <p class="help-block">{{lang_helpOptions}}</p> + </div> + + <div class="modal-footer"> + <a class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</a> <input type="submit" class="btn btn-primary" value="{{lang_create}}"> </div> - <div class="modal-footer"><a class="btn btn-primary" data-dismiss="modal">{{lang_close}}</a></div> </div> </div> </div> @@ -89,8 +121,8 @@ <input type="hidden" name="token" value="{{token}}"> </form> <script type="text/javascript"> - function saveConfig(){ - if(confirm('{{lang_confirm}}')) + function saveConfig(download){ + if(download) window.location = 'api.php?do=baseconfig&user={{user}}&save=true'; else window.location = 'api.php?do=baseconfig&user={{user}}'; diff --git a/modules-available/eventlog/lang/de/module.json b/modules-available/eventlog/lang/de/module.json index 8217fc02..61ce4d0f 100644 --- a/modules-available/eventlog/lang/de/module.json +++ b/modules-available/eventlog/lang/de/module.json @@ -1,3 +1,3 @@ { - "module_name": "Server-Log" + "module_name": "Event Log" }
\ No newline at end of file diff --git a/modules-available/eventlog/lang/en/module.json b/modules-available/eventlog/lang/en/module.json index 0fc536f3..61ce4d0f 100644 --- a/modules-available/eventlog/lang/en/module.json +++ b/modules-available/eventlog/lang/en/module.json @@ -1,3 +1,3 @@ { - "module_name": "Server Log" + "module_name": "Event Log" }
\ No newline at end of file diff --git a/modules-available/eventlog/templates/_page.html b/modules-available/eventlog/templates/_page.html index 2e657805..0875664e 100644 --- a/modules-available/eventlog/templates/_page.html +++ b/modules-available/eventlog/templates/_page.html @@ -3,18 +3,18 @@ <table class="table table-striped table-condensed"> <thead> <th width="1"></th> - <th>{{lang_when}}</th> - <th>{{lang_event}}</th> + <th class="text-center">{{lang_when}}</th> + <th class="text-center">{{lang_event}}</th> <th width="1">{{lang_details}}</th> </thead> <tbody> {{#list}} <tr> <td><span class="glyphicon glyphicon-{{icon}}" title="{{logtypeid}}"></span></td> - <td class="text-right" nowrap="nowrap">{{date}}</td> + <td class="text-center" nowrap="nowrap">{{date}}</td> <td class="{{color}}">{{description}}</td> - <td>{{#extra}} - <a class="btn btn-default btn-xs pull-left" onclick="$('#details-body').html($('#extra-{{logid}}').html())" data-toggle="modal" data-target="#myModal">»</a> + <td class="text-center">{{#extra}} + <a class="btn btn-default btn-xs" onclick="$('#details-body').html($('#extra-{{logid}}').html())" data-toggle="modal" data-target="#myModal">»</a> <div class="hidden" id="extra-{{logid}}">{{extra}}</div> {{/extra}}</td> </tr> @@ -33,9 +33,6 @@ <div class="modal-body"> <pre id="details-body"></pre> </div> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> - </div> </div> </div> </div> diff --git a/modules-available/minilinux/templates/filelist.html b/modules-available/minilinux/templates/filelist.html index ca94f4d0..ec3aee57 100644 --- a/modules-available/minilinux/templates/filelist.html +++ b/modules-available/minilinux/templates/filelist.html @@ -1,9 +1,6 @@ {{#systems}} - <div class="panel panel-default"> - <div class="panel-heading"> - <h4>{{title}}</h4> - </div> - <div class="panel-body" id="download-{{id}}"> + <h1>{{title}}</h1> + <div id="download-{{id}}"> <div class="input-group pull-right" style="max-width: 400px"> <span class="input-group-addon slx-ga">{{lang_desiredVersion}}</span> <select id="versionbox" class="form-control" onchange="loadSystemList($('#versionbox').val())"> diff --git a/modules-available/permissionmanager/lang/de/template-tags.json b/modules-available/permissionmanager/lang/de/template-tags.json index e9146d2c..23b2dc68 100644 --- a/modules-available/permissionmanager/lang/de/template-tags.json +++ b/modules-available/permissionmanager/lang/de/template-tags.json @@ -19,5 +19,7 @@ "lang_selected": "ausgewählte", "lang_Permissions": "Rechte", "lang_selectizePlaceholder": "Nach Rollen filtern...", - "lang_searchPlaceholder": "Nach Rollen suchen..." + "lang_searchPlaceholder": "Nach Rollen suchen...", + "lang_moduleName": "Rechtemanager", + "lang_roleEditor": "Rollen Editor" }
\ No newline at end of file diff --git a/modules-available/permissionmanager/lang/en/template-tags.json b/modules-available/permissionmanager/lang/en/template-tags.json index ce35a6ce..01056632 100644 --- a/modules-available/permissionmanager/lang/en/template-tags.json +++ b/modules-available/permissionmanager/lang/en/template-tags.json @@ -19,5 +19,7 @@ "lang_selected": "selected", "lang_Permissions": "Permissions", "lang_selectizePlaceholder": "Filter for roles...", - "lang_searchPlaceholder": "Search for roles..." + "lang_searchPlaceholder": "Search for roles...", + "lang_moduleName": "Permission Manager", + "lang_roleEditor": "Role Editor" }
\ No newline at end of file diff --git a/modules-available/permissionmanager/style.css b/modules-available/permissionmanager/style.css index 504df511..f1d0646f 100644 --- a/modules-available/permissionmanager/style.css +++ b/modules-available/permissionmanager/style.css @@ -4,10 +4,9 @@ } #saveButton { - margin-right: 10px; + margin-left: 10px; } - #roleName { width: 200px; display: inline-block; @@ -38,7 +37,7 @@ background-image: none; } -.panel, .row { +.panel{ margin-bottom: 20px; } diff --git a/modules-available/permissionmanager/templates/_page.html b/modules-available/permissionmanager/templates/_page.html index 3b436eda..65a52c52 100644 --- a/modules-available/permissionmanager/templates/_page.html +++ b/modules-available/permissionmanager/templates/_page.html @@ -1,20 +1,27 @@ -<form id="switchForm" method="GET" action="?do=permissionmanager"> - <input type="hidden" name="do" value="permissionmanager"> +<div class="col-md-12" style="margin-bottom: 0px;"> + <div class='page-header'> + <div class='pull-right'> + <form id="switchForm" method="GET" action="?do=permissionmanager"> + <input type="hidden" name="do" value="permissionmanager"> - <div class="btn-group"> - <button class="btn {{rolesButtonClass}}" type="submit" name="show" value="roles"> - <span class="glyphicon glyphicon-education"></span> - {{lang_Roles}} - </button> + <div class="btn-group"> + <button class="btn {{rolesButtonClass}}" type="submit" name="show" value="roles"> + <span class="glyphicon glyphicon-education"></span> + {{lang_Roles}} + </button> - <button class="btn {{usersButtonClass}}" type="submit" name="show" value="users"> - <span class="glyphicon glyphicon-user"></span> - {{lang_Users}} - </button> + <button class="btn {{usersButtonClass}}" type="submit" name="show" value="users"> + <span class="glyphicon glyphicon-user"></span> + {{lang_Users}} + </button> - <button class="btn {{locationsButtonClass}}" type="submit" name="show" value="locations"> - <span class="glyphicon glyphicon-home"></span> - {{lang_Locations}} - </button> + <button class="btn {{locationsButtonClass}}" type="submit" name="show" value="locations"> + <span class="glyphicon glyphicon-home"></span> + {{lang_Locations}} + </button> + </div> + </form> + </div> + <h1>{{lang_moduleName}}</h1> </div> -</form>
\ No newline at end of file +</div>
\ No newline at end of file diff --git a/modules-available/permissionmanager/templates/roleeditor.html b/modules-available/permissionmanager/templates/roleeditor.html index d1535332..fd78fc54 100644 --- a/modules-available/permissionmanager/templates/roleeditor.html +++ b/modules-available/permissionmanager/templates/roleeditor.html @@ -1,16 +1,17 @@ +<h1>{{lang_roleEditor}}</h1> <form method="post" action="?do=permissionmanager"> <input type="hidden" name="action" value="saveRole"> <input type="hidden" name="token" value="{{token}}"> <input type="hidden" name="roleid" value="{{roleid}}"> <div class="row"> - <div class="col-md-12"> + <div class="col-md-12" style="margin-bottom: 20px;"> <b>{{lang_Name}}:</b> <input name="roleName" value="{{roleName}}" type="text" id="roleName" class="form-control"> - <button type="button" id="cancelButton" class="btn btn-default pull-right"><span class="glyphicon glyphicon-remove"></span> {{lang_Cancel}}</button> <button type="submit" id="saveButton" class="btn btn-primary pull-right"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_Save}}</button> + <button type="button" id="cancelButton" class="btn btn-default pull-right">{{lang_Cancel}}</button> </div> </div> - <div class="row"> + <div class="row" style="margin-bottom: 20px;"> <div class="col-md-3"> <b style="line-height: 34px">{{lang_Locations}}:</b> <div class="pull-right"><input name="allLocations" {{allLocChecked}} type="checkbox" id="allLocations"></div> diff --git a/modules-available/permissionmanager/templates/rolestable.html b/modules-available/permissionmanager/templates/rolestable.html index a3e31e15..dab0faeb 100644 --- a/modules-available/permissionmanager/templates/rolestable.html +++ b/modules-available/permissionmanager/templates/rolestable.html @@ -16,8 +16,8 @@ <thead> <tr> <th data-sort="string">{{lang_Roles}}</th> - <th>{{lang_Edit}}</th> - <th>{{lang_Delete}}</th> + <th class="text-center">{{lang_Edit}}</th> + <th class="text-center">{{lang_Delete}}</th> </tr> </thead> @@ -25,11 +25,11 @@ {{#roles}} <tr class="rolesRow"> <td class="rolesData">{{roleName}}</td> - <td> - <a href="?do=permissionmanager&show=roleEditor&roleid={{roleId}}">{{lang_Edit}}</a> + <td class="text-center"> + <a class="btn btn-xs btn-info" href="?do=permissionmanager&show=roleEditor&roleid={{roleId}}"><span class="glyphicon glyphicon-edit"></span></a> </td> - <td> - <a href="#deleteModal" data-toggle="modal" data-target="#deleteModal" onclick="deleteRole('{{roleId}}')">{{lang_Delete}}</a> + <td class="text-center"> + <a class="btn btn-xs btn-danger" href="#deleteModal" data-toggle="modal" data-target="#deleteModal" onclick="deleteRole('{{roleId}}')"><span class="glyphicon glyphicon-trash"></span></a> </td> </tr> {{/roles}} diff --git a/modules-available/rebootcontrol/lang/de/template-tags.json b/modules-available/rebootcontrol/lang/de/template-tags.json index 57164f02..c5bd1670 100644 --- a/modules-available/rebootcontrol/lang/de/template-tags.json +++ b/modules-available/rebootcontrol/lang/de/template-tags.json @@ -15,6 +15,7 @@ "lang_rebootAt": "Neustart um:", "lang_rebootButton": "Neustarten", "lang_rebootCheck": "Wollen Sie die ausgew\u00e4hlten Rechner wirklich neustarten?", + "lang_rebootControl": "Reboot Control", "lang_rebooting": "Neustart...", "lang_selectall": "Alle ausw\u00e4hlen", "lang_selected": "Ausgew\u00e4hlt", diff --git a/modules-available/rebootcontrol/lang/en/template-tags.json b/modules-available/rebootcontrol/lang/en/template-tags.json index ca44171a..63a5b4a8 100644 --- a/modules-available/rebootcontrol/lang/en/template-tags.json +++ b/modules-available/rebootcontrol/lang/en/template-tags.json @@ -15,6 +15,7 @@ "lang_rebootAt": "Reboot at:", "lang_rebootButton": "Reboot", "lang_rebootCheck": "Do you really want to reboot the selected clients?", + "lang_rebootControl": "Reboot Control", "lang_rebooting": "Rebooting...", "lang_selectall": "Select all", "lang_selected": "Selected", diff --git a/modules-available/rebootcontrol/templates/_page.html b/modules-available/rebootcontrol/templates/_page.html index 4d2bf60e..dfbd6835 100644 --- a/modules-available/rebootcontrol/templates/_page.html +++ b/modules-available/rebootcontrol/templates/_page.html @@ -1,3 +1,8 @@ +<div class="page-header"> + <h1>{{lang_rebootControl}}</h1> +</div> + + <form id="tableDataForm" method="post" action="?do=rebootcontrol" class="form-inline"> <input type="hidden" name="token" value="{{token}}"> <div class="row"> diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json index fb624fad..8d00978c 100644 --- a/modules-available/statistics_reporting/lang/de/template-tags.json +++ b/modules-available/statistics_reporting/lang/de/template-tags.json @@ -10,6 +10,7 @@ "lang_location": "Ort", "lang_longSessions": "Sitzungen \u2265 60s", "lang_medianSessionLength": "Sitzungsdauer Median", + "lang_moduleName": "Statistikauswertung", "lang_reportMoreInfo": "Weitere Informationen...", "lang_reportingDescription": "Helfen Sie uns bwLehrpool durch das w\u00f6chentliche Verschicken eines anonymisierten Statistikberichts zu verbessern. Wenn Sie den Inhalt eines solchen Reports genauer inspizieren wollen, k\u00f6nnen Sie \u00fcber den untenstehenden Button einen aktuellen Report Ihres Servers herunterladen.", "lang_reportingLabel": "Anonymisierte Nutzungsstatistiken \u00fcbermitteln", diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json index 4e33ffed..407b52b6 100644 --- a/modules-available/statistics_reporting/lang/en/template-tags.json +++ b/modules-available/statistics_reporting/lang/en/template-tags.json @@ -10,6 +10,7 @@ "lang_location": "Location", "lang_longSessions": "Sessions \u2265 60s", "lang_medianSessionLength": "Median Session Length", + "lang_moduleName": "Statistics Reporting", "lang_reportMoreInfo": "More information...", "lang_reportingDescription": "Help us improve bwLehrpool by automatically sending an anonymized statistics report once a week. If you want to check what data the report contains, you can download such a report for reference below.", "lang_reportingLabel": "Send anonymized usage statistics", diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html index d0408b6f..9ce92367 100644 --- a/modules-available/statistics_reporting/templates/columnChooser.html +++ b/modules-available/statistics_reporting/templates/columnChooser.html @@ -1,64 +1,78 @@ <form method="get" id="controlsForm"> <input type="hidden" name="do" value="statistics_reporting"> - <div class="row"> - <div class="col-md-12"> - <button id="button-settings" type="button" class="pull-right btn btn-{{settingsButtonClass}}" data-toggle="modal" data-target="#modal-settings"><span class="glyphicon glyphicon-cog"></span></button> - <strong class="text-capitalize">{{lang_displaySelection}}</strong> + + <div class="page-header"> + <div class="form-inline pull-right"> + <div class="input-group"> + <select class="form-control" name="format"> + <option value="json">JSON</option> + <option value="csv">CSV (Excel)</option> + <option value="xml">XML</option> + </select> + <div class="input-group-btn"> + <button type="submit" class="btn btn-default" name="action" value="export">{{lang_export}}</button> + </div> + </div> + <button id="button-settings" type="button" class="btn btn-{{settingsButtonClass}}" data-toggle="modal" data-target="#modal-settings"><span class="glyphicon glyphicon-cog"></span> Settings</button> </div> + <h1>{{lang_moduleName}}</h1> </div> - <div class="row top-row"> - <div class="col-md-4"> - <select name="type" id="select-table" class="form-control"> - {{#tables}} - <option value="{{value}}" {{selected}}>{{name}}</option> - {{/tables}} - </select> - </div> - <div class="col-md-4"> - <select name="cutoff" id="select-cutoff" class="form-control"> - {{#days}} - <option value="{{days}}" {{selected}}>{{days}} {{lang_days}}</option> - {{/days}} - </select> + + <div class="panel panel-default"> + <div class="panel-heading"> + <strong class="text-capitalize">{{lang_displaySelection}}</strong> </div> - <div class="col-md-3"> - <div id="slider"> - <div id="lower-handle" class="ui-slider-handle"></div> - <div id="upper-handle" class="ui-slider-handle"></div> - <input type="hidden" id="lower-field" name="lower" value="{{lower}}"> - <input type="hidden" id="upper-field" name="upper" value="{{upper}}"> + <div class="panel-body"> + <div class="row top-row"> + <div class="col-md-4"> + <select name="type" id="select-table" class="form-control"> + {{#tables}} + <option value="{{value}}" {{selected}}>{{name}}</option> + {{/tables}} + </select> + </div> + <div class="col-md-3"> + <select name="cutoff" id="select-cutoff" class="form-control"> + {{#days}} + <option value="{{days}}" {{selected}}>{{days}} {{lang_days}}</option> + {{/days}} + </select> + </div> + <div class="col-md-3" style="margin-top: 10px;"> + <div id="slider"> + <div id="lower-handle" class="ui-slider-handle"></div> + <div id="upper-handle" class="ui-slider-handle"></div> + <input type="hidden" id="lower-field" name="lower" value="{{lower}}"> + <input type="hidden" id="upper-field" name="upper" value="{{upper}}"> + </div> + </div> + <div class="col-md-1"> + <button type="submit" class="btn btn-primary">{{lang_apply}}</button> + </div> </div> + </div> </div> - <div class="row top-row"> - <div class="col-md-12 form-inline"> - <div><strong class="text-capitalize">{{lang_displayColumns}}</strong></div> - {{#columns}} - <div class="checkbox"> - <input id="id_{{id}}" name="{{id}}" value="on" type="checkbox" class="column-toggle form-control" {{checked}}> - <label for="id_{{id}}">{{name}}</label> - </div> - {{/columns}} + + <div class="panel panel-default"> + <div class="panel-heading"> + <strong class="text-capitalize">{{lang_displayColumns}}</strong> </div> - </div> - <div class="row top-row"> - <div class="col-md-12 form-inline"> - <div class="pull-right input-group"> - <select class="form-control" name="format"> - <option value="json">JSON</option> - <option value="csv">CSV (Excel)</option> - <option value="xml">XML</option> - </select> - <div class="input-group-btn"> - <button type="submit" class="btn btn-default" name="action" value="export">{{lang_export}}</button> + <div class="panel-body"> + <div class="row top-row"> + <div class="col-md-12 form-inline"> + {{#columns}} + <div class="checkbox"> + <input id="id_{{id}}" name="{{id}}" value="on" type="checkbox" class="column-toggle form-control" {{checked}}> + <label for="id_{{id}}">{{name}}</label> + </div> + {{/columns}} </div> </div> - <button type="submit" class="btn btn-primary">{{lang_apply}}</button> </div> </div> </form> -<hr> <div id="modal-settings" class="modal fade" role="dialog"> <div class="modal-dialog"> @@ -81,6 +95,7 @@ </div> </div> <div class="modal-footer"> + <button type="button" class="btn btn-default" data-dismiss="modal">{{lang_cancel}}</button> <button type="button" class="btn btn-primary" data-dismiss="modal" onclick="saveSettings()">{{lang_save}}</button> </div> </div> diff --git a/modules-available/syslog/templates/page-syslog.html b/modules-available/syslog/templates/page-syslog.html index cb20a93a..9287d855 100644 --- a/modules-available/syslog/templates/page-syslog.html +++ b/modules-available/syslog/templates/page-syslog.html @@ -10,37 +10,43 @@ <label for="filterstring">{{lang_filter}}</label> </div> <div class="clearfix"></div> - <div class="input-group"> - <input id="filterstring" placeholder="id" value="{{filter}}" name="filter"> - <span class="input-group-btn"> - <button class="btn btn-default" type="submit">{{lang_go}}</button> - </span> - </div> - <div class="pull-left"> - <div class="checkbox"> - <input id="notbox" type="checkbox" name="not" {{#not}}checked="checked"{{/not}}> - <label for="notbox">{{lang_not}}</label> + + + <div class="row"> + <div class="col-sm-1"> + <div class="checkbox"> + <input id="notbox" type="checkbox" name="not" {{#not}}checked="checked"{{/not}}> + <label for="notbox">{{lang_not}}</label> + </div> + </div> + <div class="col-sm-10"> + <input id="filterstring" placeholder="id" value="{{filter}}" name="filter"> + </div> + <div class="col-sm-1"> + <button class="btn btn-primary" style="display: inline-block;" type="submit">{{lang_go}}</button> </div> </div> </form> {{{pagenav}}} + + <table class="table table-striped table-condensed"> <thead> <th width="1"></th> - <th>{{lang_when}}</th> - <th>{{lang_client}}</th> - <th>{{lang_event}}</th> + <th class="text-center">{{lang_when}}</th> + <th class="text-center">{{lang_client}}</th> + <th class="text-center">{{lang_event}}</th> <th width="1">{{lang_details}}</th> </thead> <tbody> {{#list}} <tr> <td><span class="type-button glyphicon {{icon}}" title="{{logtypeid}}"></span></td> - <td class="text-right" nowrap="nowrap">{{date}}</td> - <td>{{clientip}}</td> + <td class="text-center" nowrap="nowrap">{{date}}</td> + <td class="text-left">{{clientip}}</td> <td>{{description}}</td> - <td>{{#extra}} - <a class="btn btn-default btn-xs pull-left" onclick="$('#details-body').html($('#extra-{{logid}}').html())" + <td class="text-center">{{#extra}} + <a class="btn btn-default btn-xs" onclick="$('#details-body').html($('#extra-{{logid}}').html())" data-toggle="modal" data-target="#myModal">»</a> <div class="hidden" id="extra-{{logid}}">{{extra}}</div> {{/extra}}</td> @@ -48,6 +54,7 @@ {{/list}} </tbody> </table> + {{{pagenav}}} <div class="modal fade" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> @@ -61,9 +68,6 @@ <div class="modal-body"> <pre id="details-body"></pre> </div> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">Close</button> - </div> </div> </div> </div> |