diff options
| author | Christian Hofmaier | 2017-10-16 16:12:40 +0200 |
|---|---|---|
| committer | Christian Hofmaier | 2017-10-16 16:12:40 +0200 |
| commit | a799645243d30ab17fce4239772f86d89028137c (patch) | |
| tree | 1ae63b6cb27acae3faf1cb874f32c55f28fdc856 /modules-available/statistics_reporting | |
| parent | [rebootcontrol] added text to settings-button and put him next to the header (diff) | |
| download | slx-admin-a799645243d30ab17fce4239772f86d89028137c.tar.gz slx-admin-a799645243d30ab17fce4239772f86d89028137c.tar.xz slx-admin-a799645243d30ab17fce4239772f86d89028137c.zip | |
[statistics_reporting] moved export button from header to first panel, renamed "apply" button to "show" button, made panel-headers not being <strong> anymore
Diffstat (limited to 'modules-available/statistics_reporting')
3 files changed, 21 insertions, 18 deletions
diff --git a/modules-available/statistics_reporting/lang/de/template-tags.json b/modules-available/statistics_reporting/lang/de/template-tags.json index 8d00978c..f8829b79 100644 --- a/modules-available/statistics_reporting/lang/de/template-tags.json +++ b/modules-available/statistics_reporting/lang/de/template-tags.json @@ -16,6 +16,7 @@ "lang_reportingLabel": "Anonymisierte Nutzungsstatistiken \u00fcbermitteln", "lang_sessions": "Sitzungen", "lang_shortSessions": "Sitzungen < 60s", + "lang_show": "Anzeigen", "lang_total": "Gesamt", "lang_totalOffTime": "Gesamtzeit offline", "lang_totalTime": "Gesamtzeit", diff --git a/modules-available/statistics_reporting/lang/en/template-tags.json b/modules-available/statistics_reporting/lang/en/template-tags.json index 407b52b6..73c21112 100644 --- a/modules-available/statistics_reporting/lang/en/template-tags.json +++ b/modules-available/statistics_reporting/lang/en/template-tags.json @@ -16,6 +16,7 @@ "lang_reportingLabel": "Send anonymized usage statistics", "lang_sessions": "Sessions", "lang_shortSessions": "Sessions < 60s", + "lang_show": "Show", "lang_total": "Total", "lang_totalOffTime": "Total Time Offline", "lang_totalTime": "Total Time", diff --git a/modules-available/statistics_reporting/templates/columnChooser.html b/modules-available/statistics_reporting/templates/columnChooser.html index 9ce92367..0059e681 100644 --- a/modules-available/statistics_reporting/templates/columnChooser.html +++ b/modules-available/statistics_reporting/templates/columnChooser.html @@ -2,36 +2,24 @@ <input type="hidden" name="do" value="statistics_reporting"> <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> + <button id="button-settings" type="button" class="btn btn-{{settingsButtonClass}} pull-right" data-toggle="modal" data-target="#modal-settings"><span class="glyphicon glyphicon-cog"></span> Settings</button> <h1>{{lang_moduleName}}</h1> </div> <div class="panel panel-default"> <div class="panel-heading"> - <strong class="text-capitalize">{{lang_displaySelection}}</strong> + {{lang_displaySelection}} </div> <div class="panel-body"> <div class="row top-row"> - <div class="col-md-4"> + <div class="col-md-2"> <select name="type" id="select-table" class="form-control"> {{#tables}} <option value="{{value}}" {{selected}}>{{name}}</option> {{/tables}} </select> </div> - <div class="col-md-3"> + <div class="col-md-2"> <select name="cutoff" id="select-cutoff" class="form-control"> {{#days}} <option value="{{days}}" {{selected}}>{{days}} {{lang_days}}</option> @@ -47,8 +35,21 @@ </div> </div> <div class="col-md-1"> - <button type="submit" class="btn btn-primary">{{lang_apply}}</button> + <button type="submit" class="btn btn-primary">{{lang_show}}</button> </div> + <div class="col-md-3"> + <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> + </div> + </div> </div> @@ -56,7 +57,7 @@ <div class="panel panel-default"> <div class="panel-heading"> - <strong class="text-capitalize">{{lang_displayColumns}}</strong> + {{lang_displayColumns}} </div> <div class="panel-body"> <div class="row top-row"> |