loleaflet/admin/admin.strings.js | 1
loleaflet/admin/adminSettings.html | 87 +++++++++++++++++++++++++++++--------
2 files changed, 71 insertions(+), 17 deletions(-)
New commits:
commit 101530354dfdc1bdaa6b9e9cd88079bd7641b07d
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Wed Jan 23 09:02:35 2019 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Jan 23 09:02:35 2019 +0100
Make "shutdown" button translatable
Change-Id: Idc3d25b1e1e7a927c5658ac6395f15599fa0c20c
diff --git a/loleaflet/admin/admin.strings.js b/loleaflet/admin/admin.strings.js
index 5dabb9702..29713a8df 100644
--- a/loleaflet/admin/admin.strings.js
+++ b/loleaflet/admin/admin.strings.js
@@ -39,6 +39,7 @@ l10nstrings.strLimitFileSizeMb = _('Maximum file size allowed
to write to disk (
l10nstrings.strDocuments = _('Documents:');
l10nstrings.strExpired = _('Expired:');
l10nstrings.strRefresh = _('Refresh');
+l10nstrings.strShutdown = _('Shutdown Server');
if (module) {
module.exports = l10nstrings;
diff --git a/loleaflet/admin/adminSettings.html
b/loleaflet/admin/adminSettings.html
index 95f144d30..0d669beab 100644
--- a/loleaflet/admin/adminSettings.html
+++ b/loleaflet/admin/adminSettings.html
@@ -146,7 +146,7 @@
</div>
</form>
<br />
- <input id="btnShutdown" type="submit" value="Shutdown" class="btn
btn-danger"/>
+ <button id="btnShutdown" type="submit" class="btn
btn-danger"><script>document.write(l10nstrings.strShutdown)</script></button>
</div>
</div>
</div>
commit 8f5bc6a60abcd2dbc2c75fc6cbfd0d6a15a19dac
Author: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
AuthorDate: Wed Jan 23 08:57:43 2019 +0100
Commit: Samuel Mehrbrodt <samuel.mehrbr...@cib.de>
CommitDate: Wed Jan 23 08:57:43 2019 +0100
Improve admin settings form
* Add bootstrap form markup
* Use input type "number" instead of text
* Colorify buttons
Change-Id: Id3658a269305e935f1aea5768820b1f7faf3b90f
diff --git a/loleaflet/admin/adminSettings.html
b/loleaflet/admin/adminSettings.html
index 8cf1e33c5..95f144d30 100644
--- a/loleaflet/admin/adminSettings.html
+++ b/loleaflet/admin/adminSettings.html
@@ -75,25 +75,78 @@
</div>
<div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
<h1
class="page-header"><script>document.write(l10nstrings.strSettings)</script></h1>
- <form id="admin_settings">
- <label
for="mem_stats_size"><script>document.write(l10nstrings.strMemoryStatsCachesize)</script></label>
- <input type="text" id="mem_stats_size" name="Memory Stats
Size"><br/>
- <label
for="mem_stats_interval"><script>document.write(l10nstrings.strMemoryStatsInterval)</script></label>
- <input type="text" id="mem_stats_interval" name="Memory Stats
Interval"><br/>
- <label
for="cpu_stats_size"><script>document.write(l10nstrings.strCpuStatsCachesize)</script></label>
- <input type="text" id="cpu_stats_size" name="Cpu Stats Size"><br/>
- <label
for="cpu_stats_interval"><script>document.write(l10nstrings.strCpuStatsInterval)</script></label>
- <input type="text" id="cpu_stats_interval" name="Cpu Stats
Interval"><br/>
- <label
for="limit_virt_mem_mb"><script>document.write(l10nstrings.strLimitVirtMemMb)</script></label>
- <input type="text" id="limit_virt_mem_mb" name="Max Document
Virtual Memory MB"><br/>
- <label
for="limit_stack_mem_kb"><script>document.write(l10nstrings.strLimitStackMemKb)</script></label>
- <input type="text" id="limit_stack_mem_kb" name="Max Document
Stack Memory Kb"><br/>
- <label
for="limit_file_size_mb"><script>document.write(l10nstrings.strLimitFileSizeMb)</script></label>
- <input type="text" id="limit_file_size_mb" name="Max File Write
Size Mb"><br/>
- <script>document.write('<input type="submit" value="' +
l10nstrings.strSave + '"/><br/>')</script>
+ <form id="admin_settings" class="form-horizontal">
+ <div class="form-group">
+ <label for="mem_stats_size" class="col-md-4 control-label">
+
<script>document.write(l10nstrings.strMemoryStatsCachesize)</script>
+ </label>
+ <div class="col-md-2">
+ <input type="number" id="mem_stats_size" class="form-control"
name="Memory Stats Size">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="mem_stats_interval" class="col-md-4 control-label">
+
<script>document.write(l10nstrings.strMemoryStatsInterval)</script>
+ </label>
+ <div class="col-md-2">
+ <input type="number" id="mem_stats_interval"
class="form-control" name="Memory Stats Interval">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="cpu_stats_size" class="col-md-4 control-label">
+ <script>document.write(l10nstrings.strCpuStatsSize)</script>
+ </label>
+ <div class="col-md-2">
+ <input type="number" id="cpu_stats_size" class="form-control"
name="Cpu Stats Size">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="cpu_stats_interval" class="col-md-4 control-label">
+
<script>document.write(l10nstrings.strCpuStatsInterval)</script>
+ </label>
+ <div class="col-md-2">
+ <input type="number" id="cpu_stats_interval"
class="form-control" name="Cpu Stats Size">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="limit_virt_mem_mb" class="col-md-4 control-label">
+ <script>document.write(l10nstrings.strLimitVirtMemMb)</script>
+ </label>
+ <div class="col-md-2">
+ <input type="number" id="limit_virt_mem_mb"
class="form-control" name="Max Document Virtual Memory MB">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="limit_stack_mem_kb" class="col-md-4 control-label">
+ <script>document.write(l10nstrings.strLimitStackMemKb)</script>
+ </label>
+ <div class="col-md-2">
+ <input type="number" id="limit_stack_mem_kb"
class="form-control" name="Max Document Stack Memory Kb">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <label for="limit_file_size_mb" class="col-md-4 control-label">
+ <script>document.write(l10nstrings.strLimitFileSizeMb)</script>
+ </label>
+ <div class="col-md-2">
+ <input type="number" id="limit_file_size_mb"
class="form-control" name="Max File Write Size Mb">
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-md-offset-4 col-md-8">
+ <button type="submit" class="btn
btn-primary"><script>document.write(l10nstrings.strSave)</script></button>
+ </div>
+ </div>
</form>
<br />
- <input id="btnShutdown" type="submit" value="Shutdown"/>
+ <input id="btnShutdown" type="submit" value="Shutdown" class="btn
btn-danger"/>
</div>
</div>
</div>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
