CSS: Replace form-group/form-row/form-inline

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/templates/auth/login.html b/src/templates/auth/login.html
index c7ae6c0dccce12055acaa356bcdc012468c0f137..5810d4a1d4b3956a3a4b16606df47a06d4f8f3c1 100644 (file)
--- a/src/templates/auth/login.html
+++ b/src/templates/auth/login.html
@@ -21,13 +21,13 @@
 
                                {% if next %}<input type="hidden" name="next" value="{{ next }}">{% end %}
 
-                               <div class="form-group">
+                               <div class="mb-3">
                                        <input type="text" class="form-control form-control-lg"
                                                name="username" placeholder="{{ _("Username") }}"
                                                value="{{ username or "" }}" required autofocus>
                                </div>
 
-                               <div class="form-group">
+                               <div class="mb-3">
                                        <input type="password" class="form-control form-control-lg"
                                                name="password" placeholder="{{ _("Password") }}" required>
                                </div>

diff --git a/src/templates/auth/password-reset-initiation.html b/src/templates/auth/password-reset-initiation.html
index c1306d7f580dbfbf9b0a9a7208213b1c4cf4dbe2..b3d09056a8b72c3fc11df8f2c56f37eb4bf353ce 100644 (file)
--- a/src/templates/auth/password-reset-initiation.html
+++ b/src/templates/auth/password-reset-initiation.html
@@ -12,7 +12,7 @@
                                        <form action="" method="POST">
                                                {% raw xsrf_form_html() %}
 
-                                               <div class="form-group">
+                                               <div class="mb-3">
                                                        <input type="text" class="form-control form-control-lg"
                                                                name="username" placeholder="{{ _("Username") }}"
                                                                value="{{ username or "" }}" required autofocus>

diff --git a/src/templates/auth/register.html b/src/templates/auth/register.html
index ecebf604364778bb69f4ba9cdeeb180d53c76dfa..bff577fa0eb1f6b5aabbf34797938ece87bcf3bb 100644 (file)
--- a/src/templates/auth/register.html
+++ b/src/templates/auth/register.html
@@ -16,7 +16,7 @@
 
                                <input type="hidden" name="next" value="{{ next or "" }}">
 
-                               <div class="form-group">
+                               <div class="mb-3">
                                        <div class="input-group">
                                                <span class="input-group-text">@</span>
                                                <input type="text" class="form-control form-control-lg"
@@ -31,15 +31,15 @@
                                        </div>
                                </div>
 
-                               <div class="form-row mb-3">
-                                       <div class="col">
+                               <div class="row mb-3">
+                                       <div class="col-12 col-sm-6">
                                                <label>{{ _("First Name") }}</label>
 
                                                <input type="text" class="form-control" name="first_name"
                                                        placeholder="{{ _("First Name") }}" required>
                                        </div>
 
-                                       <div class="col">
+                                       <div class="col-12 col-sm-6">
                                                <label>{{ _("Last Name") }}</label>
 
                                                <input type="text" class="form-control" name="last_name"
@@ -47,7 +47,7 @@
                                        </div>
                                </div>
 
-                               <div class="form-group">
+                               <div class="mb-3">
                                        <input type="email" class="form-control"
                                                name="email" placeholder="{{ _("Email Address") }}" required>
                                        <div id="email-invalid" class="invalid-feedback invalid-feedback-email">

diff --git a/src/templates/base.html b/src/templates/base.html
index 1095be5cdc10830e2c8ed12a3575400ff0fc3d0f..6db06e0204ece18938db2d04f9519f2f4f3c66ae 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -185,7 +185,7 @@
                                                                                {% end %}
                                                                        </ul>
 
-                                                                       <form class="form-inline my-2 my-lg-0" action="/search" method="GET">
+                                                                       <form class="my-2 my-lg-0" action="/search" method="GET">
                                                                                <input class="form-control form-control-sm mr-sm-2" type="search" name="q"
                                                                                        placeholder="{{ _("Search") }}" aria-label="{{ _("Search") }}" value="{% try %}{{ q }}{% except %}{% end %}">
                                                                        </form>
@@ -198,7 +198,7 @@
                                                        </button>
 
                                                        <div class="collapse navbar-collapse" id="navbar">
-                                                               <form class="form-inline ml-auto my-2 my-lg-0" action="/search" method="GET">
+                                                               <form class=" ml-auto my-2 my-lg-0" action="/search" method="GET">
                                                                        <input class="form-control form-control-sm" type="search" name="q"
                                                                                placeholder="{{ _("Search...") }}" aria-label="{{ _("Search") }}" value="{% try %}{{ q }}{% except %}{% end %}">
                                                                </form>

diff --git a/src/templates/blog/compose.html b/src/templates/blog/compose.html
index 8aad111c0188944cae4b05ad7d3697addc5b4612..880869bb9819cb7c4a226cb9a283156aeeb77ecf 100644 (file)
--- a/src/templates/blog/compose.html
+++ b/src/templates/blog/compose.html
@@ -8,17 +8,17 @@
                        <form action="" method="POST">
                                {% raw xsrf_form_html() %}
 
-                               <div class="form-group">
+                               <div class="mb-3">
                                        <input type="text" class="form-control" name="title" placeholder="{{ _("Title") }}"
                                                {% if post %}value="{{ post.title }}"{% end %} required>
                                </div>
 
-                               <div class="form-group">
+                               <div class="mb-3">
                                        <textarea class="form-control" rows="16" name="text" placeholder="{{ _("Text") }}"
                                                required>{% if post %}{{ post.text }}{% end %}</textarea>
                                </div>
 
-                               <div class="form-group row">
+                               <div class="mb-3 row">
                                        <label class="col-sm-2 col-form-label">{{ _("Tags") }}</label>
                                        <div class="col-sm-10">
                                                <input type="text" class="form-control" name="tags"

diff --git a/src/templates/blog/publish.html b/src/templates/blog/publish.html
index fa29b18c97a35aa4ddef0927a0d03f3cc48882c5..2714b4967281c99aa94958807e471a3e7ac439d4 100644 (file)
--- a/src/templates/blog/publish.html
+++ b/src/templates/blog/publish.html
@@ -13,7 +13,7 @@
 
                                <input type="hidden" name="when">
 
-                               <div class="form-group">
+                               <div class="mb-3">
                                        <label>{{ _("Time to Publish") }}</label>
 
                                        <input type="datetime-local" class="form-control"

diff --git a/src/templates/donate/donate.html b/src/templates/donate/donate.html
index 174c699326defef748c57549c5c6bf22c528cbdd..11928550326457fcbff8aa65a680a24ec07fc9ca 100644 (file)
--- a/src/templates/donate/donate.html
+++ b/src/templates/donate/donate.html
@@ -67,7 +67,7 @@
                                                        </p>
 
                                                        <div class="collapse" id="more">
-                                                               <div class="form-group row">
+                                                               <div class="mb-3 row">
                                                                        <label class="col-sm-5 col-form-label col-form-label-lg">
                                                                                Enter your own
                                                                        </label>
@@ -91,30 +91,26 @@
 
                                                        <div class="row my-5">
                                                                <div class="col d-flex flex-column">
-                                                                       <div class="form-row">
-                                                                               <div class="col">
-                                                                                       <div class="form-check form-check-inline mb-3">
-                                                                                               <input class="form-check-input" type="radio" name="title" id="mr" value="Mr." checked>
-                                                                                               <label class="form-check-label" for="mr">{{ _("Mr.") }}</label>
-                                                                                       </div>
-                                                                                       <div class="form-check form-check-inline mb-3">
-                                                                                               <input class="form-check-input" type="radio" name="title" id="mrs" value="Mrs.">
-                                                                                               <label class="form-check-label" for="mrs">{{ _("Mrs.") }}</label>
-                                                                                       </div>
-                                                                               </div>
+                                                                       <div class="form-check form-check-inline mb-3">
+                                                                               <input class="form-check-input" type="radio" name="title" id="mr" value="Mr." checked>
+                                                                               <label class="form-check-label" for="mr">{{ _("Mr.") }}</label>
+                                                                       </div>
+                                                                       <div class="form-check form-check-inline mb-3">
+                                                                               <input class="form-check-input" type="radio" name="title" id="mrs" value="Mrs.">
+                                                                               <label class="form-check-label" for="mrs">{{ _("Mrs.") }}</label>
                                                                        </div>
 
-                                                                       <div class="form-row">
-                                                                               <div class="col-sm-6">
-                                                                                       <div class="form-group">
+                                                                       <div class="row">
+                                                                               <div class="col-12 col-sm-6">
+                                                                                       <div class="mb-3">
                                                                                                <input type="text" class="form-control" name="first_name"
                                                                                                        placeholder="{{ _("First Name" )}}" required
                                                                                                        {% if first_name %}value="{{ first_name }}"{% end %}>
                                                                                        </div>
                                                                                </div>
 
-                                                                               <div class="col-sm-6">
-                                                                                       <div class="form-group">
+                                                                               <div class="col-12 col-sm-6">
+                                                                                       <div class="mb-3">
                                                                                                <input type="text" class="form-control" name="last_name"
                                                                                                        placeholder="{{ _("Last Name" )}}" required
                                                                                                        {% if last_name %}value="{{ last_name }}"{% end %}>
@@ -122,40 +118,40 @@
                                                                                </div>
                                                                        </div>
 
-                                                                       <div class="form-group">
+                                                                       <div class="mb-3">
                                                                                <input type="email" class="form-control" name="email"
                                                                                        placeholder="{{ _("Email Address") }}" required>
                                                                        </div>
 
-                                                                       <div class="form-group">
+                                                                       <div class="mb-3">
                                                                                <input type="text" class="form-control" name="street1"
                                                                                        placeholder="{{ _("Address Line 1") }}" required>
                                                                        </div>
 
-                                                                       <div class="form-group">
+                                                                       <div class="mb-3">
                                                                                <input type="text" class="form-control" name="street2"
                                                                                        placeholder="{{ _("Address Line 2") }}">
                                                                        </div>
 
-                                                                       <div class="form-row">
-                                                                               <div class="col-sm-6">
-                                                                                       <div class="form-group">
+                                                                       <div class="row">
+                                                                               <div class="col-12 col-sm-6">
+                                                                                       <div class="mb-3">
                                                                                                <input type="text" class="form-control" name="city"
                                                                                                        placeholder="{{ _("City") }}" required>
                                                                                        </div>
                                                                                </div>
 
-                                                                               <div class="col-sm-6">
-                                                                                       <div class="form-group">
+                                                                               <div class="col-12 col-sm-6">
+                                                                                       <div class="mb-3">
                                                                                                <input type="text" class="form-control" name="post_code"
                                                                                                        placeholder="{{ _("Post Code") }}" required>
                                                                                        </div>
                                                                                </div>
                                                                        </div>
 
-                                                                       <div class="form-row">
-                                                                               <div class="col-sm-6">
-                                                                                       <div class="form-group">
+                                                                       <div class="row">
+                                                                               <div class="col-12 col-sm-6">
+                                                                                       <div class="mb-3">
                                                                                                <select class="form-control" name="country_code" required>
                                                                                                        <option value="">- {{ _("Country") }} -</option>
 
@@ -166,8 +162,8 @@
                                                                                        </div>
                                                                                </div>
 
-                                                                               <div class="col-sm-6">
-                                                                                       <div class="form-group">
+                                                                               <div class="col-12 col-sm-6">
+                                                                                       <div class="mb-3">
                                                                                                <input type="text" class="form-control" name="state"
                                                                                                        placeholder="{{ _("State (optional)") }}">
                                                                                        </div>

diff --git a/src/templates/nopaste/create.html b/src/templates/nopaste/create.html
index b3d3dcbd57f85a1e7eb304f290e8048b99e2ea94..dc44809b5a0d345d5d79d4c8b4926071202eb6b5 100644 (file)
--- a/src/templates/nopaste/create.html
+++ b/src/templates/nopaste/create.html
@@ -34,13 +34,13 @@
                        <input type="hidden" name="mode" value="{{ mode }}">
 
                        {% if mode == "paste" %}
-                               <div class="form-group">
+                               <div class="mb-3">
                                        <input type="text" class="form-control" name="subject"
                                                placeholder="{{ _("Subject") }} ({{ _("optional") }})">
                                </div>
                        {% end %}
 
-                       <div class="form-group">
+                       <div class="mb-3">
                                {% if mode == "paste" %}
                                        <textarea class="form-control" rows="12" name="content"
                                                placeholder="{{ _("Paste your content here...") }}"></textarea>
@@ -56,7 +56,7 @@
                                {% end %}
                        </div>
 
-                       <div class="form-group">
+                       <div class="mb-3">
                                <label>{{ _("Expires") }}</label>
 
                                <select class="form-control" name="expires">

diff --git a/src/templates/people/modules/password.html b/src/templates/people/modules/password.html
index f5d273b3279b98d858250250106298e95527fc6d..a5e791cf6b3ae8ef1d962cdcad14cb1a57094e94 100644 (file)
--- a/src/templates/people/modules/password.html
+++ b/src/templates/people/modules/password.html
@@ -1,5 +1,5 @@
 <fieldset>
-       <div class="form-group">
+       <div class="mb-3">
                <label>{{ _("New Password") }}</label>
 
                <input type="password" class="form-control" name="password1"
@@ -7,7 +7,7 @@
                        data-user-input="{% if account %}{{ " ".join((account.first_name, account.last_name)) }}{% end %}">
        </div>
 
-       <div class="form-group">
+       <div class="mb-3">
                <input type="password" class="form-control" name="password2"
                        id="password2" placeholder="{{ _("Repeat Password") }}" required>
 
@@ -16,13 +16,13 @@
                </div>
        </div>
 
-       <div class="form-group">
+       <div class="mb-3">
                <div class="progress">
                        <div class="progress-bar" id="password-strength" role="progressbar"></div>
                </div>
        </div>
 
-       <div class="form-group text-muted">
+       <div class="mb-3 text-muted">
                <p class="mb-0" id="password-warning"></p>
 
                <small class="form-text">

diff --git a/src/templates/people/passwd.html b/src/templates/people/passwd.html
index 405dad37fa11a06e87e528e6bdfda551e358fd20..76f7840722ee3099601d021a8fed212ee429d832 100644 (file)
--- a/src/templates/people/passwd.html
+++ b/src/templates/people/passwd.html
@@ -10,7 +10,7 @@
                        <form method="POST" action="">
                                {% raw xsrf_form_html() %}
 
-                               <div class="form-group">
+                               <div class="mb-3">
                                        <label>{{ _("Current Password") }}</label>
 
                                        <input type="password" class="form-control" name="password"

diff --git a/src/templates/people/user-edit.html b/src/templates/people/user-edit.html
index 70f32713b1afbed36ffec5adbd1146ee47b7ec8b..bfd541c76316babb838aaee1268816fdbd12e5b4 100644 (file)
--- a/src/templates/people/user-edit.html
+++ b/src/templates/people/user-edit.html
@@ -18,15 +18,15 @@
                        <form method="POST" action="" enctype="multipart/form-data">
                                {% raw xsrf_form_html() %}
 
-                               <div class="form-row mb-3">
-                                       <div class="col">
+                               <div class="row mb-3">
+                                       <div class="col-12 col-sm-6">
                                                <label>{{ _("First Name") }}</label>
 
                                                <input type="text" class="form-control" name="first_name"
                                                        placeholder="{{ _("First Name") }}" value="{{ account.first_name }}" required>
                                        </div>
 
-                                       <div class="col">
+                                       <div class="col-12 col-sm-6">
                                                <label>{{ _("Last Name") }}</label>
 
                                                <input type="text" class="form-control" name="last_name"
@@ -34,29 +34,29 @@
                                        </div>
                                </div>
 
-                               <div class="form-group">
+                               <div class="mb-3">
                                        <label>{{ _("Nickname") }} ({{ _("optional") }})</label>
 
                                        <input type="text" class="form-control" name="nickname"
                                                placeholder="{{ _("Nickname") }}" value="{{ account.nickname or "" }}">
                                </div>
 
-                               <div class="form-group">
+                               <div class="mb-3">
                                        <label>{{ _("Address") }}</label>
 
                                        <textarea type="text" class="form-control" name="street" rows="3"
                                                placeholder="{{ _("Address") }}">{{ account.street or "" }}</textarea>
                                </div>
 
-                               <div class="form-row mb-3">
-                                       <div class="col">
+                               <div class="row mb-3">
+                                       <div class="col-12 col-sm-6">
                                                <label>{{ _("City") }}</label>
 
                                                <input type="text" class="form-control" name="city"
                                                        placeholder="{{ _("City") }}" value="{{ account.city }}">
                                        </div>
 
-                                       <div class="col">
+                                       <div class="col-12 col-sm-6">
                                                <label>{{ _("Postal Code") }}</label>
 
                                                <input type="text" class="form-control" name="postal_code"
@@ -64,7 +64,7 @@
                                        </div>
                                </div>
 
-                               <div class="form-group">
+                               <div class="mb-3">
                                        <label>{{ _("Country") }}</label>
 
                                        <select class="form-control" name="country_code">
@@ -79,7 +79,7 @@
                                <fieldset>
                                        <legend>{{ _("Tell Us Who You Are") }}</legend>
 
-                                       <div class="form-group" id="description">
+                                       <div class="mb-3" id="description">
                                                <textarea type="text" class="form-control" name="description" rows="5"
                                                        placeholder="{{ _("Tell Us Who You Are") }}">{{ account.description or "" }}</textarea>
 
@@ -88,7 +88,7 @@
                                                </small>
                                        </div>
 
-                                       <div class="form-group" id="avatar">
+                                       <div class="mb-3" id="avatar">
                                                <label>{{ _("Avatar") }}</label>
 
                                                <input type="file" class="form-control-file" name="avatar">
@@ -103,7 +103,7 @@
                                        <fieldset>
                                                <legend>{{ _("Email") }}</legend>
 
-                                               <div class="form-group">
+                                               <div class="mb-3">
                                                        <label>{{ _("Forward Emails") }}</label>
 
                                                        <input type="mail" class="form-control" name="mail_routing_address"
@@ -119,7 +119,7 @@
                                <fieldset>
                                        <legend>{{ _("Telephone") }}</legend>
 
-                                       <div class="form-group">
+                                       <div class="mb-3">
                                                <label>{{ _("Phone Numbers") }}</label>
 
                                                <textarea type="text" class="form-control" name="phone_numbers" rows="3"
@@ -131,7 +131,7 @@
                                        </div>
 
                                        {% if account.has_sip() %}
-                                               <div class="form-group">
+                                               <div class="mb-3">
                                                        <label>{{ _("Forward Calls") }}</label>
 
                                                        <input type="text" class="form-control" name="sip_routing_address"

diff --git a/src/templates/wiki/confirm-restore.html b/src/templates/wiki/confirm-restore.html
index 7bebd42c155273e0291d7c3ce7fd1f64dd37bc32..5fce19f1b3b48f3af4d375733db553862b82f16c 100644 (file)
--- a/src/templates/wiki/confirm-restore.html
+++ b/src/templates/wiki/confirm-restore.html
@@ -18,7 +18,7 @@
                                        <input type="hidden" name="path" value="{{ page.page }}">
                                        <input type="hidden" name="revision" value="{{ page.timestamp.isoformat() }}">
 
-                                       <div class="form-group">
+                                       <div class="mb-3">
                                                <input class="form-control" type="text" name="comment"
                                                        placeholder="{{ _("Comment") }}">
                                        </div>

diff --git a/src/templates/wiki/edit.html b/src/templates/wiki/edit.html
index c8fe2ad7a0c68d8f9811c6d4c990e16ec4bd0d48..4f727fd77aa87564b263c81b6d2f1173c5480757 100644 (file)
--- a/src/templates/wiki/edit.html
+++ b/src/templates/wiki/edit.html
@@ -22,7 +22,7 @@
                        <form action="" method="POST" class="editor" data-render_url="{{ os.path.join(path, "_render") }}">
                                {% raw xsrf_form_html() %}
 
-                               <div class="form-group">
+                               <div class="mb-3">
                                        <div class="btn-toolbar mb-3" role="toolbar">
                                                <div class="btn-group btn-group-sm mr-2" role="group">
                                                        <button type="button" class="btn btn-secondary"
@@ -69,7 +69,7 @@
                                                >{% if page and page.markdown %}{{ page.markdown }}{% end %}</textarea>
                                </div>
 
-                               <div class="form-group row">
+                               <div class="mb-3 row">
                                        <label class="col-sm-4 col-form-label">{{ _("What has changed?") }}</label>
                                        <div class="col-sm-8">
                                                <input type="text" class="form-control" name="changes" required>
@@ -77,7 +77,7 @@
                                </div>
 
                                {% if page and not page.is_watched_by(current_user) %}
-                                       <div class="form-group form-check">
+                                       <div class="mb-3 form-check">
                                                <div class="form-check">
                                                        <input class="form-check-input" type="checkbox" name="watch" id="watch" checked>
                                                        <label class="form-check-label" for="watch">{{ _("Watch this page") }}</label>