diff --git a/src/plainui/jinja2/plainui/components/form_elements.html b/src/plainui/jinja2/plainui/components/form_elements.html index 7ef15fca543b5bc22d52fd93ac9902965923149c..54570bcc41916c9cd134b8d2325ef43a25fd1427 100644 --- a/src/plainui/jinja2/plainui/components/form_elements.html +++ b/src/plainui/jinja2/plainui/components/form_elements.html @@ -4,7 +4,7 @@ {% macro input(form, name, type_) -%} {% set el = form[name] -%} <div class="row form-group"> - <div class="col-sm-12 col-lg-4"> + <div class="col-sm-12 col-lg-4 mb-2 mb-lg-0"> <label class="shadow-darkmorphism d-block font-headings p-3 text-center" for="id_{{name}}" @@ -44,7 +44,7 @@ {% macro textarea(form, name) -%} {% set el = form[name] -%} <div class="row form-group"> - <div class="col-sm-12 col-lg-4"> + <div class="col-sm-12 col-lg-4 mb-2 mb-lg-0"> <label class="shadow-darkmorphism font-headings d-block p-3 text-center" for="id_{{name}}" @@ -74,7 +74,7 @@ {% macro checkbox(form, name) -%} {% set el = form[name] -%} <div class="row form-group"> - <div class="col-sm-12 col-lg-4"> + <div class="col-sm-12 col-lg-4 mb-2 mb-lg-0"> <p class="shadow-darkmorphism d-block font-headings p-3 text-center mb-0" for="id_{{name}}" @@ -108,7 +108,7 @@ {% macro select(form, name) -%} {% set el = form[name] -%} <div class="row form-group"> - <div class="col-sm-12 col-lg-4"> + <div class="col-sm-12 col-lg-4 mb-2 mb-lg-0"> <label for="id_{{name}}" class="shadow-darkmorphism d-block font-headings p-3 text-center" diff --git a/src/plainui/jinja2/plainui/components/title.html b/src/plainui/jinja2/plainui/components/title.html index 8216bb5e5d9ece59e851a1b8fe14c5a2755537b8..afe065ad11633ed817a24a85639c0e0d1a7d132b 100644 --- a/src/plainui/jinja2/plainui/components/title.html +++ b/src/plainui/jinja2/plainui/components/title.html @@ -9,7 +9,7 @@ {% macro title(title="", fav_id=false, fav_type=false, fav_is=false, sch_id=false, sch_is=false, share_url=false, stream_url=false, report_url=false, report_kind="url") -%} <div class="row w-100 my-11"> <div class="col"> - <h1 class="" title="{{ title }}">{{ title }}</h1> + <h1 class="mb-xl-0" title="{{ title }}">{{ title }}</h1> </div> {% if conf %} <div class="col-sm-auto text-righ align-self-center"> diff --git a/src/plainui/jinja2/plainui/header.html b/src/plainui/jinja2/plainui/header.html index 3d421a8372f0bf6527d283cc9e9bb59ad1714dc2..9a666804bd075b8ca149bcd914028a335377f5ab 100644 --- a/src/plainui/jinja2/plainui/header.html +++ b/src/plainui/jinja2/plainui/header.html @@ -55,7 +55,7 @@ <a class="btn btn-block rc3-header__additional-linkbox {{ 'btn-primary' if view_name == 'plainui:personal_message' else 'btn-secondary' }}" href="{{ url('plainui:personal_message', conf_slug=conf.slug) }}" title="{{ _("Messages") }}"> {{ _("Mess ages") -}} {% set num_unread = num_of_unread_messages(request) -%} - {% if num_unread %}<span class="rc3-header__additional-linkbox-badge bg-info badge badge-info border border-primary">{{num_unread}}</span>{% endif %} + {% if num_unread %}<span class="rc3-header__additional-linkbox-badge badge badge-info font-headings">{{num_unread}}</span>{% endif %} </a> <a class="btn rc3-header__additional-linkbox {{ 'btn-primary' if view_name == 'plainui:fahrplan' else 'btn-secondary' }}" href="{{ url('plainui:fahrplan', conf_slug=conf.slug) }}" title="{{ _("Fahrplan") }}"> {{ _("Fahr plan") }} diff --git a/src/plainui/jinja2/plainui/personal_message_list.html b/src/plainui/jinja2/plainui/personal_message_list.html index f1a697dadf7691f1e3ee70d07c375636f0d946ce..e59c7980b3c37030cddbd0c73937734a7fbb0889 100644 --- a/src/plainui/jinja2/plainui/personal_message_list.html +++ b/src/plainui/jinja2/plainui/personal_message_list.html @@ -5,24 +5,32 @@ {% block content %} {{ titleMacro.title(_("Personal Messages") ) }} -<div class="mb-2"> - <a role="button" class="btn btn-primary mb-1" href="{{ url('plainui:personal_message', conf_slug=conf.slug) }}">{{_("Inbox")}}</a> - <a role="button" class="btn btn-primary mb-1" href="{{ url('plainui:personal_message_outbox', conf_slug=conf.slug) }}">{{_("Outbox")}}</a> - <a role="button" class="btn btn-primary mb-1" href="{{ url('plainui:personal_message_send', conf_slug=conf.slug) }}">{{_("New PM")}}</a> +<div class="border border-tertiary my-8 p-6 text-center"> + <ul class="row mb-0 list-unstyled mw-664 mx-auto"> + <li class="col-12 col-sm-4 mb-3 mb-sm-0"> + <a role="button" class="btn btn-block btn-lg btn-secondary" href="{{ url('plainui:personal_message', conf_slug=conf.slug) }}">{{_("Inbox")}}</a> + </li> + <li class="col-12 col-sm-4 mb-3 mb-sm-0"> + <a role="button" class="btn btn-block btn-lg btn-secondary" href="{{ url('plainui:personal_message_outbox', conf_slug=conf.slug) }}">{{_("Outbox")}}</a> + </li> + <li class="col-12 col-sm-4"> + <a role="button" class="btn btn-block btn-lg btn-primary" href="{{ url('plainui:personal_message_send', conf_slug=conf.slug) }}">{{_("New PM")}}</a> + </li> + </ul> </div> -<div class="border border-tertiary p-6 text-light mx-0"> - <h2 class="w-100 bg bg-info p-2 px-5 h3 text-white text-center">{% if not sent_mode %}{{ _("Received Messages") }} {% else %}{{ _("Sent Messages") }}{% endif %}</h2> +<div class="border border-tertiary p-6 mx-0 mt-8 mb-11"> + <h2 class="text-center bg-info p-3 text-white h3">{% if not sent_mode %}{{ _("Received Messages") }} {% else %}{{ _("Sent Messages") }}{% endif %}</h2> <form method="POST" action="{{ url('plainui:personal_message_delete', conf_slug=conf.slug) }}"> {{ csrf_input }} <table class="table"> <thead> - <tr> - <th scope="col">{% if not sent_mode %}{{ _("messages_from") }} {% else %}{{ _("messages_to") }}{% endif %}</th> - <th scope="col">{{ _("messages_subject") }}</th> - <th scope="col">{{ _("messages_date") }}</th> - <th scope="col"></th> - </tr> + <tr> + <th scope="col">{% if not sent_mode %}{{ _("messages_from") }} {% else %}{{ _("messages_to") }}{% endif %}</th> + <th scope="col">{{ _("messages_subject") }}</th> + <th scope="col">{{ _("messages_date") }}</th> + <th scope="col"></th> + </tr> </thead> <tbody> @@ -61,8 +69,9 @@ </svg> {% endif %} {% endif %} - <a href="{{ url('plainui:personal_message_show', conf_slug=conf.slug, msg_id=msg.id) }}">{{msg.subject}}</a></td> - <td>{{msg.timestamp | strftime}}</td></a> + <a href="{{ url('plainui:personal_message_show', conf_slug=conf.slug, msg_id=msg.id) }}">{{msg.subject}}</a> + </td> + <td>{{msg.timestamp | strftime}}</td> <td> {# {% not implemented? should color the flag button instead! if msg.flagged_for_abuse %}[{ _("messages_flagged") }]{% endif %} #} {% if not sent_mode %} diff --git a/src/plainui/jinja2/plainui/personal_message_send.html b/src/plainui/jinja2/plainui/personal_message_send.html index 5c1980e5a6fad60bfa204894544404f0d7f51a01..2c1c138dc852309f10d0cf0f85261d45c3531402 100644 --- a/src/plainui/jinja2/plainui/personal_message_send.html +++ b/src/plainui/jinja2/plainui/personal_message_send.html @@ -4,8 +4,11 @@ {% block content %} {{ titleMacro.title(_("Send Personal Message")) }} -<form class="border border-tertiary p-6 text-light mx-0" method="POST"> - <h2 class="w-100 bg bg-info p-2 px-5 h3 text-white text-center">{{ _("new message") }}</h2> +<form + method="POST" + class="border p-6 mx-auto mb-11{% if form.errors %} border-danger{% else %} border-tertiary{% endif %}" +> + <h2 class="text-center bg-info p-3 text-white h3">{{ _("new message") }}</h2> {{ csrf_input }} {{ form_elements.errors(form) }} @@ -14,9 +17,9 @@ {{ form_elements.text(form, 'subject') }} {{ form_elements.textarea(form, 'body') }} - <ul class="list-unstyled row justify-content-end "> - <li class="col-1 order-last"> - <button type="submit" class="btn btn-primary order-last">{{ _("Send") }}</button> + <ul class="list-unstyled row row-cols-1 row-cols-lg-3 justify-content-end"> + <li class="col"> + <button type="submit" class="btn btn-xl btn-block btn-primary">{{ _("Send") }}</button> </li> </ul> </form> diff --git a/src/plainui/styles/components/_header.scss b/src/plainui/styles/components/_header.scss index c1cdc10f5b4c8855473823e1b658a371cd2aa2f8..37baabc2018aa364d10cf79af60e9674e0496f1b 100644 --- a/src/plainui/styles/components/_header.scss +++ b/src/plainui/styles/components/_header.scss @@ -51,10 +51,14 @@ } &-linkbox-badge { - position: absolute !important; - left: -0.4rem !important; - top: -0.4rem !important; - padding: 0.1rem 0.5rem !important; + position: absolute; + left: -0.4rem; + top: -0.4rem; + padding: 0.19rem 0.5rem; + background: $body-bg; + border: 1px solid $primary; + font-size: $small-font-size; + line-height: 1; } &-box-2x1 {