summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorSimon Rettberg2015-09-28 16:08:37 +0200
committerSimon Rettberg2015-09-28 16:08:37 +0200
commit8fc0fb48b4b1c7faa1728c59fcde269d9ab744f6 (patch)
tree3ea1985c7ca4484a36c0bdc452f2eec7706440e1 /templates
parentUse systemctl to start/stop services (diff)
downloadslx-admin-8fc0fb48b4b1c7faa1728c59fcde269d9ab744f6.tar.gz
slx-admin-8fc0fb48b4b1c7faa1728c59fcde269d9ab744f6.tar.xz
slx-admin-8fc0fb48b4b1c7faa1728c59fcde269d9ab744f6.zip
Improved several translations, added help texts, fixed module grouping, layout
Diffstat (limited to 'templates')
-rw-r--r--templates/baseconfig/_page.html1
-rw-r--r--templates/page-vmstore.html4
-rw-r--r--templates/sysconfig/_page.html6
-rw-r--r--templates/sysconfig/sshconfig-start.html5
-rw-r--r--templates/webinterface/https.html6
5 files changed, 13 insertions, 9 deletions
diff --git a/templates/baseconfig/_page.html b/templates/baseconfig/_page.html
index 054e0a6c..9bef717b 100644
--- a/templates/baseconfig/_page.html
+++ b/templates/baseconfig/_page.html
@@ -1,4 +1,5 @@
<h1>{{lang_basicConfiguration}}</h1>
+<p>{{lang_clientRelatedConfig}}</p>
<form action="?do=BaseConfig" method="post">
{{#categories}}
<div class="panel panel-default">
diff --git a/templates/page-vmstore.html b/templates/page-vmstore.html
index 0fc53e92..c7c9e846 100644
--- a/templates/page-vmstore.html
+++ b/templates/page-vmstore.html
@@ -92,14 +92,14 @@
{{lang_nfsHelp1}}
</p>
<pre>
-/mnt/images 1.2.3.4(rw,no_root_squash,async,nolock)
+/mnt/images 1.2.3.4(rw,no_root_squash,async)
/mnt/images *(ro,async,nolock)
</pre>
<p>
{{lang_nfsHelp2}}
</p>
<pre>
-/mnt/images 1.2.3.4(rw,all_squash,anon_uid=1234,async,nolock)
+/mnt/images 1.2.3.4(rw,all_squash,anon_uid=1234,async)
/mnt/images *(ro,async,nolock)
</pre>
</div>
diff --git a/templates/sysconfig/_page.html b/templates/sysconfig/_page.html
index 438294e8..6d99e1e2 100644
--- a/templates/sysconfig/_page.html
+++ b/templates/sysconfig/_page.html
@@ -11,8 +11,8 @@
<input type="hidden" name="action" value="config">
<table id="conftable" class="slx-table" style="max-width:100px !important">
{{#configs}}
- <tr class="slx-pointer" data-modlist="{{modlist}}" onclick="showmod(this, 'bold')" onmouseover="showmod(this, 'fade')" onmouseout="showmod(this, 'reset')">
- <td class="slx-width-ignore slx-nowrap"><div class="slx-dyn-ellipsis">{{config}}</div></td>
+ <tr data-modlist="{{modlist}}" onclick="showmod(this, 'bold')" onmouseover="showmod(this, 'fade')" onmouseout="showmod(this, 'reset')">
+ <td class="slx-pointer slx-width-ignore slx-nowrap"><div class="slx-dyn-ellipsis">{{config}}</div></td>
<td>
{{^current}}
<button class="btn btn-primary btn-xs" name="activate" value="{{configid}}">
@@ -21,7 +21,7 @@
</button>
{{/current}}
{{#current}}
- <span class="btn btn-success btn-xs">
+ <span class="btn btn-success btn-xs slx-nopointer">
<span class="glyphicon glyphicon-ok"></span>
{{lang_active}}
</span>
diff --git a/templates/sysconfig/sshconfig-start.html b/templates/sysconfig/sshconfig-start.html
index 9d1426d1..2aa409d3 100644
--- a/templates/sysconfig/sshconfig-start.html
+++ b/templates/sysconfig/sshconfig-start.html
@@ -6,10 +6,11 @@
<input type="text" name="title" value="{{title}}" class="form-control" autofocus="autofocus">
</div>
<div class="form-group">
- <label class="checkbox" for="allow-pw">{{lang_allowPass}}
+ <label>
<input type="checkbox" name="allowPasswordLogin" value="yes" {{#apl}}checked{{/apl}}>
+ {{lang_allowPass}}
</label>
- <i>{{lang_allowPassInfo}}</i>
+ <p><i>{{lang_allowPassInfo}}</i></p>
</div>
<div class="form-group">
<label for="root-key">{{lang_rootKey}}</label>
diff --git a/templates/webinterface/https.html b/templates/webinterface/https.html
index ca2a9d04..d2b4c69a 100644
--- a/templates/webinterface/https.html
+++ b/templates/webinterface/https.html
@@ -5,13 +5,15 @@
<div class="panel-heading">{{lang_httpsSettings}}</div>
<div class="panel-body">
<p>{{lang_description}}</p>
- <div class="input-group" onclick="$('#moff').prop('checked', true)">
+ <div class="input-group" onclick="$('#moff').prop('checked', true);
+ $('#wcustom').hide()">
<span class="input-group-addon"><input id="moff" type="radio" name="mode" value="off"></span>
<span class="form-control">
{{lang_noHttps}}
</span>
</div>
- <div class="input-group" onclick="$('#mrandom').prop('checked', true)">
+ <div class="input-group" onclick="$('#mrandom').prop('checked', true);
+ $('#wcustom').hide()">
<span class="input-group-addon"><input id="mrandom" type="radio" name="mode" value="random"></span>
<span class="form-control">
{{lang_randomCert}}