]> git.ipfire.org Git - ipfire.org.git/commitdiff
Bootstrap 4 migration: login
authorSven Hoehn <shoehn@ipfire.org>
Wed, 6 Dec 2017 17:09:11 +0000 (18:09 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 25 Apr 2018 10:17:19 +0000 (12:17 +0200)
templates/auth/login.html
templates/error-500.html
templates/error.html

index 477c290ed4a5267a7254cd0848fa9fcee8834e75..046186e52e4dfe02e09ab28ad86ab81bbea02b4a 100644 (file)
@@ -3,26 +3,28 @@
 {% block title %}{{ _("Log in") }}{% end block %}
 
 {% block body %}
-       <div class="row">
-               <div class="col-md-6 col-md-offset-3">
-                       <div class="well well-lg ac">
-                               <h2>{{ _("Log In") }}</h2>
-                               <br class="separator-small">
-
-                               <div class="row">
-                                       <div class="col-sm-10 col-sm-offset-1">
-                                               <form action="" method="POST">
-                                                       <input type="text" class="form-control" id="inputUsername"
-                                                               name="username" placeholder="{{ _("Username") }}" required autofocus>
-                                                       <input type="password" class="form-control" id="inputPassword"
-                                                               name="password" placeholder="{{ _("Password") }}" required>
-                                                       <br>
-                                                       <button type="submit" class="btn btn-primary">{{ _("Log in") }}</button>
-                                                       {% raw xsrf_form_html() %}
-                                               </form>
-                                       </div>
-                               </div>
+<div class="container">
+       <section class="features-content col-12">
+               
+               <div class="row">
+                       <div class="col-md-6 offset-md-3">
+                               <h3>{{ _("Log In") }}</h3>
+                       </div>
+               </div>
+               
+               <div class="row">
+                       <div class="col-md-6 offset-md-3">
+                               <form action="" method="POST">
+                                       <input type="text" class="form-control" id="inputUsername"
+                                               name="username" placeholder="{{ _("Username") }}" required autofocus>
+                                       <input type="password" class="form-control" id="inputPassword"
+                                               name="password" placeholder="{{ _("Password") }}" required>
+                                       <br>
+                                       <button type="submit" class="btn btn-primary">{{ _("Log in") }}</button>
+                                       {% raw xsrf_form_html() %}
+                               </form>
                        </div>
                </div>
-       </div>
+       </section>
+</div>
 {% end block %}
index aec6150e4998a461b0f8383013677b12b397acf3..e499b9704b5248560797b4921aeee700f20dc97c 100644 (file)
@@ -2,17 +2,19 @@
 
 {% block explanation %}
        <div class="row">
-               <div class="col-lg-offset-2 col-lg-8 col-md-8">
-                       <h2>{{ _("Detailed information") }}</h2>
+               <div class="col-md-8 offset-2">
+                       <h4>{{ _("Detailed information") }}</h4>
 
                        <p>
                                {% if lang == "de" %}
                                        Bei der Verarbeitung der Anfrage kam es zu einem internen Problem
-                                       des Webservers.<br />Sollten nähere Informationen verfügbar sein, so
-                                       sind diese untenstehend angehangen.
+                                       des Webservers.<br />
+                                       Sollten nähere Informationen verfügbar sein, so
+                                       sind diese unterstehend angehangen.
                                {% else %}
                                        While processing the request, there was an internal problem
-                                       of the web server. <br /> If there are more information available,
+                                       of the web server.<br />
+                                       If there are more information available,
                                        they would be appended below.
                                {% end %}
                        </p>
index 2829892d60c9d94dc777cf62b1cc9075b5c179b0..eff3a821ee09480dc2ec46ff5c0abd36e1e54b46 100644 (file)
@@ -7,7 +7,7 @@
        <section class="features-content col-12">
                <h2 class="display-2 text-center">{{ code }} - {{ message }}</h2>
                
-               <div class="row">
+               <div class="row mb-6">
                        <div class="col-md-8 offset-md-2">
                                {% if lang == "de" %}
                                        <p class="lead">
@@ -32,8 +32,6 @@
                        </div>
                </div>
 
-               <hr>
-
                {% block explanation %}{% end block %}
 
                {% if exception %}