diff options
7 files changed, 49 insertions, 10 deletions
diff --git a/modules-available/webinterface/lang/de/template-tags.json b/modules-available/webinterface/lang/de/template-tags.json index 64ba84d0..e193938d 100644 --- a/modules-available/webinterface/lang/de/template-tags.json +++ b/modules-available/webinterface/lang/de/template-tags.json @@ -12,6 +12,7 @@ "lang_httpsSettings": "HTTPS-Konfiguration", "lang_installAndRestart": "Zertifikat installieren und Webserver neustarten", "lang_logoBackground": "Hintergrundfarbe des Logos", + "lang_moduleHeading": "Web-Schnittstelle", "lang_noHttps": "HTTPS wieder deaktivieren, aktuelles Zertifikat l\u00f6schen", "lang_offSelected": "HTTPS ist derzeit deaktiviert.", "lang_pageTitlePrefix": "Pr\u00e4fix f\u00fcr den Seitentitel", diff --git a/modules-available/webinterface/lang/en/template-tags.json b/modules-available/webinterface/lang/en/template-tags.json index 0fb4cc96..28129e64 100644 --- a/modules-available/webinterface/lang/en/template-tags.json +++ b/modules-available/webinterface/lang/en/template-tags.json @@ -12,6 +12,7 @@ "lang_httpsSettings": "HTTPS settings", "lang_installAndRestart": "Installing certificate and restarting web server", "lang_logoBackground": "Logo background color", + "lang_moduleHeading": "Web Interface", "lang_noHttps": "Disable HTTPS, delete current certificate", "lang_offSelected": "HTTPS is currently disabled.", "lang_pageTitlePrefix": "Page title prefix", diff --git a/modules-available/webinterface/page.inc.php b/modules-available/webinterface/page.inc.php index e576807e..6dfc9faa 100644 --- a/modules-available/webinterface/page.inc.php +++ b/modules-available/webinterface/page.inc.php @@ -73,6 +73,7 @@ class Page_WebInterface extends Page protected function doRender() { + Render::addTemplate("heading"); // // HTTPS // diff --git a/modules-available/webinterface/templates/customization.html b/modules-available/webinterface/templates/customization.html index 7949f95b..c949c1f2 100644 --- a/modules-available/webinterface/templates/customization.html +++ b/modules-available/webinterface/templates/customization.html @@ -23,7 +23,7 @@ </label> </div> <div class="pull-right"> - <button type="submit" class="btn btn-primary">{{lang_save}}</button> + <button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button> </div> </div> </div> diff --git a/modules-available/webinterface/templates/heading.html b/modules-available/webinterface/templates/heading.html new file mode 100644 index 00000000..d68360f1 --- /dev/null +++ b/modules-available/webinterface/templates/heading.html @@ -0,0 +1 @@ +<h1>{{lang_moduleHeading}}</h1>
\ No newline at end of file diff --git a/modules-available/webinterface/templates/https.html b/modules-available/webinterface/templates/https.html index ecfe5f5d..365e2fee 100644 --- a/modules-available/webinterface/templates/https.html +++ b/modules-available/webinterface/templates/https.html @@ -28,7 +28,12 @@ {{#httpsEnabled}} <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="input-group-addon"> + <div class="radio" style="margin: 0; line-height: normal; text-align: left"> + <input id="moff" type="radio" name="mode" value="off"> + <label style="padding: 0"></label> + </div> + </span> <span class="form-control"> {{lang_noHttps}} </span> @@ -36,14 +41,24 @@ {{/httpsEnabled}} <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="input-group-addon"> + <div class="radio" style="margin: 0; line-height: normal; text-align: left"> + <input id="mrandom" type="radio" name="mode" value="random"> + <label style="padding: 0"></label> + </div> + </span> <span class="form-control"> {{lang_randomCert}} </span> </div> <div class="input-group" onclick="$('#mcustom').prop('checked', true); $('#wcustom').show()"> - <span class="input-group-addon"><input id="mcustom" type="radio" name="mode" value="custom"></span> + <span class="input-group-addon"> + <div class="radio" style="margin: 0; line-height: normal; text-align: left"> + <input id="mcustom" type="radio" name="mode" value="custom"> + <label style="padding: 0"></label> + </div> + </span> <span class="form-control"> {{lang_customCert}} </span> @@ -73,13 +88,23 @@ MIIFfTCCA... <br> <div class="input-group"> - <span class="input-group-addon"><input id="httpsredirect" type="checkbox" name="httpsredirect" value="on" {{redirect_checked}}></span> + <span class="input-group-addon"> + <div class="checkbox" style="margin: 0; line-height: normal; text-align: left"> + <input id="httpsredirect" type="checkbox" name="httpsredirect" value="on" {{redirect_checked}}> + <label style="padding: 0"></label> + </div> + </span> <span class="form-control" onclick="$('#httpsredirect').prop('checked', !$('#httpsredirect').prop('checked'))"> {{lang_httpsRedirect}} </span> </div> <div class="input-group"> - <span class="input-group-addon"><input id="usehsts" type="checkbox" name="usehsts" value="on" {{hsts_checked}}></span> + <span class="input-group-addon"> + <div class="checkbox" style="margin: 0; line-height: normal; text-align: left"> + <input id="usehsts" type="checkbox" name="usehsts" value="on" {{hsts_checked}}> + <label style="padding: 0"></label> + </div> + </span> <span class="form-control" onclick="$('#usehsts').prop('checked', !$('#usehsts').prop('checked'))"> {{lang_useHsts}} </span> @@ -87,7 +112,7 @@ MIIFfTCCA... <br> <div class="pull-right"> - <button type="submit" class="btn btn-primary">{{lang_save}}</button> + <button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button> </div> </div> </div> diff --git a/modules-available/webinterface/templates/passwords.html b/modules-available/webinterface/templates/passwords.html index 8481d884..b9ff5550 100644 --- a/modules-available/webinterface/templates/passwords.html +++ b/modules-available/webinterface/templates/passwords.html @@ -6,20 +6,30 @@ <div class="panel-body"> <p>{{lang_passwordsDescription}}</p> <div class="input-group" onclick="$('#pmshow').prop('checked', true)"> - <span class="input-group-addon"><input id="pmshow" type="radio" name="mode" value="show" {{selected_show}}></span> + <span class="input-group-addon"> + <div class="radio" style="margin: 0; line-height: normal; text-align: left"> + <input id="pmshow" type="radio" name="mode" value="show" {{selected_show}}> + <label style="padding: 0"></label> + </div> + </span> <span class="form-control"> {{lang_showPasswords}} </span> </div> <div class="input-group" onclick="$('#pmhide').prop('checked', true)"> - <span class="input-group-addon"><input id="pmhide" type="radio" name="mode" value="hide" {{selected_hide}}></span> + <span class="input-group-addon"> + <div class="radio" style="margin: 0; line-height: normal; text-align: left"> + <input id="pmhide" type="radio" name="mode" value="hide" {{selected_hide}}> + <label style="padding: 0"></label> + </div> + </span> <span class="form-control"> {{lang_hidePasswords}} </span> </div> <br> <div class="pull-right"> - <button type="submit" class="btn btn-primary">{{lang_save}}</button> + <button type="submit" class="btn btn-primary"><span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}}</button> </div> </div> </div> |