Skip to content
Snippets Groups Projects
Verified Commit 54ad26b8 authored by Pavel Břoušek's avatar Pavel Břoušek
Browse files

fixes

parent 2d995838
No related branches found
No related tags found
No related merge requests found
......@@ -18,9 +18,9 @@
{% for idp in configuration.identities %}
<div class="{% if muni_jvs %}margin-bottom-12{% endif %}{% if loop.index0 >= configuration.number_shown %} idp-hidden d-none vhide{% endif %}">
<button class="btn-individual-identity btn {% if muni_jvs %}btn-primary btn-border color-{{ configuration.priority }} hover-none-{{ configuration.priority }}{% else %}btn-light border-{{ configuration.priority }} border-2 btn-lg{% endif %}" type="submit" name="idpentityid" value="{{ idp.upstream_idp }}">
<button class="btn-individual-identity btn {% if muni_jvs %}btn-primary btn-border color-{{ configuration.priority }} hover-none-{{ configuration.priority }}{% else %}btn-light {% if configuration.priority == 'primary' %}border-dark text-dark{% else %}border-muted text-muted{% endif %} border-2 btn-lg{% endif %}" type="submit" name="idpentityid" value="{{ idp.upstream_idp }}">
{% if muni_jvs %}<span class="no-uppercase color-{{ configuration.priority }} individual-identity-span-wrap">{% endif %}
<img class="individual-identity-logo{% if not muni_jvs %} border-end border-2 border-{{ configuration.priority }}{% endif %}" {% if idp.background_color is defined %}style="background-color: {{ idp.background_color }}"{% endif %} src="{{ idp.logo }}" alt=""/>
<img class="individual-identity-logo{% if not muni_jvs %} border-end border-2 border-{% if configuration.priority == 'primary' %}dark{% else %}muted{% endif %}{% endif %}" {% if idp.background_color is defined %}style="background-color: {{ idp.background_color }}"{% endif %} src="{{ idp.logo }}" alt=""/>
<span class="idp-text">{{ '{campusmultiauth:sign_in_with}'|trans }}{{ " " }}{% if attribute(idp.name, currentLanguage) is defined %}{{ attribute(idp.name, currentLanguage) }}
{% elseif idp.name is defined and idp.name is iterable and idp.name is not empty %}{{ idp.name | first }}
{% else %}{{ idp.name }}
......
......@@ -23,7 +23,7 @@
{% block contentwrapper %}
<div class="window {% if muni_jvs %}framework_muni{% else %}framework_bootstrap5 bg-light{% endif %}">
<h3 class="margin-bottom-12 header-text">
<h3 class="header-text">
{{ '{campusmultiauth:login_title}'|trans }}
</h3>
<div id="content">
......
......@@ -81,12 +81,12 @@ html, body {
}
.header-text {
margin: 36px 0 0 36px;
margin: 36px;
text-align: left;
}
.framework_muni .header-text {
margin: 24px 0 0 24px;
margin: 24px;
}
.header-img {
......@@ -336,8 +336,8 @@ html, body {
}
.framework_muni #content {
margin: 0 24px 0 24px;
border: 1px solid #757575;
margin: 0 24px 0 24px;
}
#userpass_login_button {
......@@ -381,6 +381,10 @@ body {
flex-direction: column;
}
.header-container {
text-align: left;
}
@media screen and (min-width: 768px) {
.wrap {
margin: 0 11px 36px 13px;
......@@ -402,7 +406,7 @@ body {
}
.framework_muni .header-text {
margin: 72px 0 0 40px;
margin: 72px 0 0 36px;
}
.header-wrap {
......@@ -419,6 +423,7 @@ body {
flex-direction: column;
flex-wrap: wrap-reverse;
height: 50px;
text-align: center;
}
.header-img {
......@@ -477,6 +482,7 @@ body {
}
.framework_muni #content {
margin: 0;
border: none;
}
......
......@@ -98,6 +98,8 @@ document.addEventListener("DOMContentLoaded", function () {
password.setAttribute("type", type);
this.classList.toggle("icon-eye-slash");
this.querySelector("i").classList.toggle("fa-eye");
this.querySelector("i").classList.toggle("fa-eye-slash");
});
}
......
......@@ -128,7 +128,7 @@ $t->data['cookie_username'] = Campusidp::getCookie(Campusidp::COOKIE_USERNAME);
$t->data['cookie_password'] = Campusidp::getCookie(Campusidp::COOKIE_PASSWORD);
$t->data['searchbox_indexes'] = json_encode(array_values(array_filter(array_map(function($config, $index) {
return $config['name'] === 'searchbox' ? $index : null;
}, $wayfConfig['components'], array_keys($wayfConfig['components'])))));
}, $wayfConfig['components'], array_keys($wayfConfig['components'])), function($a){return $a !== null;})));
$currentLanguage = $t->getTranslator()->getLanguage()->getLanguage();
$t->data['searchbox_placeholders'] = json_encode(array_map(function($config) use ($currentLanguage) {
if ($config['name'] !== 'searchbox') {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment