drupal - popravki vseh pojavnih oken za prijave in registracije

This commit is contained in:
urospodkriznik 2022-09-19 18:27:34 +02:00
parent c45926b660
commit 333d711c68
7 changed files with 133 additions and 75 deletions

View File

@ -5,8 +5,8 @@
{# // Naslov#}
<div class="row">
<div class="col">
<h3 class="color-arnes center">{{ lang['login_with_aai_title'] }}</h3>
<div class="col naslov-url plain">
{{ lang['login_with_aai_title_2'] }}
</div>
</div>

View File

@ -8,8 +8,8 @@
{# // Naslov#}
<div class="row">
<div class="col">
<h3>{{ title_login }}</h3>
<div class="col naslov-url plain">
{{ title_login }}
</div>
<div class="col nakup-prijava">
{{ lang['cms_buy_login_description'] }}
@ -49,14 +49,12 @@
{% else %}
<div class="row">
<div class="col">
<h3 class="modra center">
<div class="col naslov-url plain">
{{ lang['cms_login_title_block'] }}
{% if(jezik == 'sl') %}
NA
{% endif %}
WWW.1KA.SI
</h3>
</div>
</div>
@ -81,20 +79,22 @@
<div class="w-clearfix">
<div class="col _3-3-3-12">
<input type="text" id="em" class="input-field w-input {{ (email == 'error' ? "error-field" : "") }}" name="email" value="{{ (email != 'error' ? email : null) }}" size="30" placeholder="E-mail" onClick="this.value=\'\'" required="required"/>
<label>{{ lang['email'] }}</label>
<input type="text" id="em" class="input-field w-input {{ (email == 'error' ? "error-field" : "") }}" name="email" value="{{ (email != 'error' ? email : null) }}" size="30" onClick="this.value=\'\'" required="required"/>
</div>
</div>
<div class="w-clearfix">
<div class="col _3-3-3-12">
<input type="password" name="pass" class="input-field prijava-password-input w-input {% if(email == 'error' or password) %}error-field{% endif %}" size="30" placeholder="Geslo" required="required"/>
<label>{{ lang['password'] }}</label>
<input type="password" name="pass" class="input-field prijava-password-input w-input {% if(email == 'error' or password) %}error-field{% endif %}" size="30" required="required"/>
</div>
</div>
<div class="w-clearfix">
<div class="col _3-3-3-12">
<div class="checkbox-field w-checkbox">
<input type="checkbox" id="rememberMe" name="remember" value="1" class="cb w-checkbox-input">
<div class="checkbox-field">
<input type="checkbox" id="rememberMe" name="remember" value="1" class="cb">
<span class="checkbox-display"></span>
<span id="rememberMelabel">
<label for="rememberMe" class="checkbox-label w-form-label">
@ -108,8 +108,8 @@
<div class="col w-clearfix">
<input type="button" value="{{ lang['login_short'] }}" data-wait="Please wait..." class="submit-prijava submit-btn w-button">
<p class="paragraph">
<a href="#" id="open-modal-lost-password">
<p>
<a href="#" class="" id="open-modal-lost-password">
{{ lang['forgot_password'] }}
</a>
</p>

View File

@ -2,8 +2,8 @@
<div class="modal-box modal-registration w-max-1024"><img src="/tema1ka/img/ikone/zapri.svg" class="closemodal">
<div class="row glavni-naslov">
<div class="col">
<h3 class="modra center">{{ lang['cms_register_title'] }}</h3>
<div class="col naslov-url plain">
{{ lang['cms_register_title'] }}
</div>
</div>
@ -25,19 +25,23 @@
<div class="w-clearfix input_row">
<div class="left_col">
<input type="email" class="input-field w-input {% if obvestila['error_email'] %} error-field {% endif %}" name="email" placeholder="{{ lang['email'] }}" onchange="InsertName();" onblur="CheckEmail(\'{{ lang['cms_register_user_email_incorrect'] }}\');CheckEmailTypo(\'{{ lang['cms_register_user_typo_email'] }}\')" value="{% if parametri['email'] %} {{ parametri['email'] }} {% endif %}">
<label>{{ lang['email'] }}</label>
<input type="email" class="input-field w-input {% if obvestila['error_email'] %} error-field {% endif %}" name="email" onchange="InsertName();" onblur="CheckEmail(\'{{ lang['cms_register_user_email_incorrect'] }}\');CheckEmailTypo(\'{{ lang['cms_register_user_typo_email'] }}\')" value="{% if parametri['email'] %} {{ parametri['email'] }} {% endif %}">
</div>
<div class="right_col">
<input type="text" id="registracija-vzdevek" class="input-field w-input {% if obvestila['error_ime'] %} error-field {% endif %}" name="ime" placeholder="{{ lang['cms_register_user_nickname'] }}" value="{% if parametri['ime'] %} {{ parametri['ime'] }} {% endif %}">
<label>{{ lang['cms_register_user_nickname'] }}</label>
<input type="text" id="registracija-vzdevek" class="input-field w-input {% if obvestila['error_ime'] %} error-field {% endif %}" name="ime" value="{% if parametri['ime'] %} {{ parametri['ime'] }} {% endif %}">
</div>
</div>
<div class="w-clearfix input_row">
<div class="left_col">
<input type="password" class="input-field w-input {% if obvestila['error_geslo'] %} error-field {% endif %}" value="" id="geslo" name="geslo" placeholder="{{ lang['cms_register_user_password'] }}">
<label>{{ lang['cms_register_user_password'] }}</label>
<input type="password" class="input-field w-input {% if obvestila['error_geslo'] %} error-field {% endif %}" value="" id="geslo" name="geslo">
</div>
<div class="right_col">
<input type="password" class="input-field w-input {% if obvestila['error_geslo'] %} error-field {% endif %}" value="" id="geslo2" name="geslo2" placeholder="{{ lang['cms_register_user_repeat_password'] }}">
<label>{{ lang['cms_register_user_repeat_password'] }}</label>
<input type="password" class="input-field w-input {% if obvestila['error_geslo'] %} error-field {% endif %}" value="" id="geslo2" name="geslo2">
</div>
</div>
@ -46,7 +50,7 @@
{% if recaptcha_sitekey %}
<div class="w-clearfix">
<div class="col _6-6-6-12">
<div style="margin-bottom: 10px;">
<div class="g-recaptcha" data-sitekey="{{ recaptcha_sitekey }}"></div>
</div>
</div>
@ -61,8 +65,8 @@
<div
class="toppadding">
{# // Pogoji uporabe#}
<div class="w-checkbox">
<input type="checkbox" id="IAgree" name="agree" value="1" class="cb w-checkbox-input" required="required">
<div class="checkbox-field">
<input type="checkbox" id="IAgree" name="agree" value="1" class="cb" required="required">
<span class="checkbox-display {% if obvestila['missing_agree'] %} error-field {% endif %}"></span>
<span id="agreelabel" {% if obvestila['missing_agree'] %} error-field {% endif %}>
<label for="IAgree" class="checkbox-label w-form-label">
@ -71,15 +75,16 @@
</div>
{# // GDPR strinjanje za email obveščanje - v bazi vse nove zahtevke postavimo na 2 ali 0, če se ne strinja#}
<div class="w-checkbox">
<input type="checkbox" id="GdprAgree" name="gdpr-agree" value="1" class="cb w-checkbox-input cb_multiple_lines" {% if parametri['gdpr'] and parametri['gdpr'] == 1 %} checked="checked" {% endif %}>
<div class="checkbox-field" style="display: flex;">
<input type="checkbox" id="GdprAgree" name="gdpr-agree" value="1" class="cb" {% if parametri['gdpr'] and parametri['gdpr'] == 1 %} checked="checked" {% endif %}>
&nbsp;
<span class="checkbox-display"></span>
<span>
<label for="GdprAgree" class="checkbox-label w-form-label">
{{ lang['cms_register_gdpr_agree'] }}
<a id="gdpr-more">
{# <a id="gdpr-more">
{{ lang['srv_invitation_nonActivated_more'] }}
</a>
</a> #}
</label>
</span>
<div id="gdpr-vec-text">{{ lang['cms_register_gdpr_agree_explain'] | raw }}</div>
@ -156,7 +161,7 @@
{# // Email#}
<div class="col pb">
<span class="label">{{ lang['email'] }}:</span>
<span class="field oznacen-rdec" id="reg-confirm-email"></span>
<span class="field modra" id="reg-confirm-email"></span>
</div>
{# // Vzdevek#}

View File

@ -1057,6 +1057,8 @@ ul.seznam-tem {
max-width: 1000px; }
.modal .modal-box .paragraph, .rexister-modal .modal-box .paragraph {
text-align: center; }
.modal .modal-box p a, .rexister-modal .modal-box p a {
text-decoration: underline; }
.modal .modal-box .closemodal, .rexister-modal .modal-box .closemodal {
position: absolute;
left: auto;
@ -1076,9 +1078,6 @@ ul.seznam-tem {
.modal .modal-box h3.center, .rexister-modal .modal-box h3.center {
margin: auto;
padding-bottom: 25px; }
.modal .modal-box h4, .rexister-modal .modal-box h4 {
font-weight: 400;
padding-bottom: 16px; }
.modal .modal-box .w-input, .rexister-modal .modal-box .w-input {
border-style: solid;
border-width: 1px;
@ -1228,12 +1227,16 @@ ul.seznam-tem {
margin: auto; }
.modal .error, .modal .oznacen-rdec, .rexister-modal .error, .rexister-modal .oznacen-rdec {
color: red; }
.modal label, .rexister-modal label {
font-weight: 600;
margin: 0; }
.dva-stolpca {
display: flex; }
.dva-stolpca h4 {
margin-left: auto;
margin-right: auto; }
margin-left: 25px;
font-weight: 600;
margin-bottom: 14px; }
.dva-stolpca .preko-racunov {
border-left: 1px solid #d1d1d1; }
.dva-stolpca .preko-racunov .ostale-prijave {
@ -1244,6 +1247,7 @@ ul.seznam-tem {
margin-left: auto;
margin-right: auto;
margin-bottom: 16px;
text-transform: uppercase;
color: #1e88e5;
border: 1px solid #1e88e5;
padding: 11px 7px 11px 17px;
@ -1251,7 +1255,6 @@ ul.seznam-tem {
padding: 0.5rem 1rem;
max-width: 250px;
font-weight: 600;
letter-spacing: 1px;
cursor: pointer;
transition: 0.2s; }
.dva-stolpca .preko-racunov .ostale-prijave .op-gumb:hover {
@ -1310,13 +1313,6 @@ ul.seznam-tem {
.dva-stolpca .intro-modal {
display: flex;
flex-direction: column; }
.dva-stolpca .intro-modal .naslov-url {
font-size: 20px;
text-align: center;
text-transform: uppercase;
font-weight: bold;
color: #1e88e5;
margin-bottom: 20px; }
.dva-stolpca .intro-modal .siv-url {
text-transform: uppercase;
color: #d1d1d1; }
@ -1356,6 +1352,31 @@ ul.seznam-tem {
padding-left: 1rem;
color: #e35205 !important;
font-weight: bold; }
.dva-stolpca .checkbox-field {
padding-left: 0;
margin-bottom: 16px; }
.dva-stolpca .checkbox-field input {
width: 18px;
height: 18px;
min-width: 18px;
min-height: 18px;
margin-top: 4px; }
.dva-stolpca .checkbox-field label {
font-weight: 400; }
.naslov-url {
font-size: 21px;
text-align: center;
text-transform: uppercase;
font-weight: bold;
color: #1e88e5;
margin-bottom: 20px; }
.naslov-url.plain {
color: #333;
justify-content: center; }
.modra {
color: #1e88e5; }
#modal-individualno-svetovanje h3 {
margin-top: 20px;
@ -1365,8 +1386,6 @@ ul.seznam-tem {
font-weight: 700;
text-transform: uppercase;
padding-bottom: 0px; }
#modal-individualno-svetovanje .modra {
color: #1e88e5; }
#modal-individualno-svetovanje .center {
text-align: center; }
#modal-individualno-svetovanje .flexrow {

View File

@ -40,6 +40,12 @@
text-align: center;
}
p{
a{
text-decoration: underline;
}
}
.closemodal{
position: absolute;
left: auto;
@ -66,11 +72,6 @@
}
}
h4{
font-weight: 400;
padding-bottom: 16px;
}
.w-input{
border-style: solid;
border-width: 1px;
@ -313,6 +314,11 @@
.error, .oznacen-rdec{
color: red;
}
label{
font-weight: 600;
margin: 0;
}
}
.dva-stolpca {
@ -320,8 +326,9 @@
//margin-bottom: 25px;
h4{
margin-left: auto;
margin-right: auto;
margin-left: 25px;
font-weight: 600;
margin-bottom: 14px;
}
.preko-racunov {
@ -337,6 +344,8 @@
margin-left: auto;
margin-right: auto;
margin-bottom: 16px;
text-transform: uppercase;
color: #1e88e5;
border: 1px solid #1e88e5;
@ -346,7 +355,7 @@
padding: 0.5rem 1rem;
max-width: 250px;
font-weight: 600;
letter-spacing: 1px;
//letter-spacing: 1px;
cursor: pointer;
transition: 0.2s;
@ -437,15 +446,6 @@
display: flex;
flex-direction: column;
.naslov-url {
font-size: 20px;
text-align: center;
text-transform: uppercase;
font-weight: bold;
color: $modra;
margin-bottom: 20px;
}
.siv-url{
text-transform: uppercase;
color: #d1d1d1;
@ -511,6 +511,42 @@
}
}
.checkbox-field{
padding-left: 0;
margin-bottom: 16px;
input{
width: 18px;
height: 18px;
min-width: 18px;
min-height: 18px;
margin-top: 4px;
}
label{
font-weight: 400;
}
}
}
.naslov-url {
font-size: 21px;
text-align: center;
text-transform: uppercase;
font-weight: bold;
color: $modra;
margin-bottom: 20px;
&.plain{
color: #333;
justify-content: center;
}
}
.modra {
color: #1e88e5;
}
#modal-individualno-svetovanje{
@ -524,10 +560,6 @@
padding-bottom: 0px;
}
.modra {
color: #1e88e5;
}
.center {
text-align: center;
}

View File

@ -672,6 +672,7 @@ $lang = array (
"remember_me" => "Naj me stran prepozna",
"check_login_data" => "Zelo pogosto se namreč pojavljajo naslednje težave:<ul>
<li>zatipkanje pri vnosu email naslova, npr. 'peter.novakk@gmali.com';</li>
<li>eden od drugih email naslovov, zato preverite vse svoje email račune;</li>
<li>nepotreben presledek, npr. peter.novak_@gmail.com;</li>
<li>napačna končnica, npr. 'peter.novak@gmali.si'</li>
</ul>",
@ -1635,14 +1636,14 @@ $lang = array (
"cms_register_link" => "Registracija",
"cms_login_link" => "Prijava",
"cms_register_title" => "Registracija novega uporabnika",
"cms_register_new_user_email" => "Z elektronskim naslovom",
"cms_register_new_user_email" => "Registracija z elektronskim naslovom",
"cms_register_other_email" => "Z uporabniškim računom",
"cms_login_title_block" => "Prijava uporabnika",
"cms_register_login_link" => "Že imate račun? <a href='#URL#' id=\"odpri-prijavo\">Prijavite se</a>",
"cms_login_registration_link" => "Še nimate računa na 1KA? <a href='#URL#' id=\"odpri-registracijo\">Registrirajte se</a>",
"cms_register_mandatory_field" => "Odgovor je obvezen",
"cms_search" => "Iskanje",
"cms_register_user_terms_of_use" => "Strinjam se s pogoji uporabe! <strong><a href='https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka' target='_blank'>Splošni pogoji uporabe.</a></strong>",
"cms_register_user_terms_of_use" => "Strinjam se <a href='https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka' target='_blank'>splošnimi pogoji uporabe</a>.",
"cms_register_user_terms_of_use2" => "Strinjam se s <a href='#'>pogoji uporabe! </a> ",
"cms_register_gdpr_agree" => "Strinjam se, da mi na zgoraj navedeni elektronski naslov enkrat letno pošljete pomembna obvestila (pomembne informacije o novostih 1KA, vabilo na dogodek).",
"cms_register_gdpr_agree_explain" => "Vaš email bomo uporabljali in hranili zgolj za potrebe uporabe uporabniškega imena v orodju 1KA in ga bom skrbno varovali v skladu s predpisi.
@ -3476,16 +3477,16 @@ $lang = array (
"alternative_email_delete" => "Ste prepričani, da želite odstraniti alternativni email",
"confirm_user_in_db" => "Potrdi",
"delete_user_in_db" => "Izbriši",
"user_confirm_h" => "Potrditev veljavnosti e-naslova",
"user_confirm_p" => "Na email <span class=\"oznacen-rdec\">SFMAIL</span>, smo poslali navodila za uspešen zaključek registracije.<br />
"user_confirm_h" => "Potrditev veljavnosti emaila",
"user_confirm_p" => "Na email <span class=\"modra\">SFMAIL</span>, smo poslali navodila za zaključek registracije.<br />
Če v nekaj minutah ne boste prejeli našega sporočila:<ul>
<li>preverite sporočila v nezaželeni pošti (spam);</li>
<li>preverite pravilnost vpisanega emaila, predvsem:</li><ul>
<li>zatipkanje email naslova, npr. 'peter.novakk@gmali.com';</li>
<li>nepotreben presledek, npr. peter.novak_@gmail.com;</li>
<li>napačna končnica, npr. 'peter.novak@gmali.si'.</li></ul>
<li>če je email <span class=\"oznacen-rdec\">SFMAIL</span> pravilen, sporočila pa še vedno ne najdete, kontaktirajte <a href=\"mailto:info@1ka.si\">info@1ka.si</a>.</li></ul>
<p><strong>Na to spletno mesto se boste lahko prijavili šele po potrditvi registracije preko e-pošte!</strong></p>",
<li>če je email <span class=\"modra\">SFMAIL</span> pravilen, sporočila pa še vedno ne najdete, kontaktirajte <a href=\"mailto:info@1ka.si\">info@1ka.si</a>.</li></ul>
<p><strong>Na to spletno mesto se boste lahko prijavili šele po potrditvi registracije na povezavi, ki smo jo poslali po emailu!</strong></p>",
"user_confirm_p_admin" => "Administrator aplikacije je bil obveščen o vaši registraciji. Prijavili se boste lahko šele ko bo potrdil vašo registracijo.<br />
<p><strong>Na to spletno mesto se boste lahko prijavili šele po potrditvi registracije s strani administratorja!</strong></p>",
"user_confirm_p_admin_success" => "Uporabnik je bil uspešno aktiviran.",
@ -6939,7 +6940,8 @@ $lang = array (
'login_with_facebook' => 'Facebook prijava',
'login_with_aai' => 'ARNES AAI-prijava',
'login_with_aai_title' => '1KA.ARNES.SI',
'login_with_aai_small_text' => '<span style="color:#e35205;font-weight:bold;">Študenti, raziskovalci, učitelji</span> in drugi z AAI dostopom se lahko za <b> brezplačno uporabo</b> vseh funkcionalnosti orodja 1KA prijavite s svojim <b>obstoječim AAI računom</b> oz. <b>digitalno identiteto</b>.',
'login_with_aai_title_2' => 'Prijava uporabnika na 1KA.ARNES.SI',
'login_with_aai_small_text' => '<span style="color:#e35205;font-weight:bold;">Študenti, raziskovalci, učitelji</span> in <b>drugi z ArnesAAI računom</b> oziroma digitalno identiteto lahko na ločeni namestitvi <a href="https://1ka.arnes.si/" target="_blank">1KA.ARNES.SI</a> uporabljajo 1KA <b>brezplačno</b> in <b>brez omejitev</b>.',
'login_with_yahoo' => 'Prijava z Yahoo ra&#269;unom',
'login_with_msn' => 'Prijava z MSN ra&#269;unom',
'login_register' => 'Registrirajte se',

View File

@ -660,7 +660,7 @@ $lang = array (
"check_login_data" => "Namely, often do the following problems occur:<ul>
<li>Typos when entering an email address, for example: 'eenklikanketa@gmali.com'</li>
<li>Wrong address, for example, you logged in with another email address, so check all you email accounts</li>
<li>Unnecessary space, for example 'enklikanketa @ gmail.com'</li>
<li>Unnecessary space, for example 'enklikanketa_@gmail.com'</li>
<li>Incorrect domain extension, for example, instead of 'enklikanketa@gmail.com' you entered 'enklikanketa@gmail.si' or 'enklikanketa@gmail.net'</li>
</ul>",
"check_login_data_intro" => "Please, check if data are correct, especially the email address, since you will receive a confirmation email at the given email account.",
@ -1622,14 +1622,14 @@ $lang = array (
"cms_register_link" => 'Register',
"cms_login_link" => 'Login',
"cms_register_title" => "Registering a new user",
"cms_register_new_user_email" => "With email",
"cms_register_new_user_email" => "Registration with email",
"cms_register_other_email" => "With account",
"cms_login_title_block" => "Login user",
"cms_register_login_link" => "Do you have an account? <a href='#URL#' id=\"odpri-prijavo\">Sign in</a>",
"cms_login_registration_link" => "Do not have an account at 1KA? <a href='#URL#' id=\"odpri-registracijo\">Register</a>",
"cms_register_mandatory_field" => "Mandatory field",
"cms_search" => "Search",
"cms_register_user_terms_of_use" => "I agree to user agreement! <strong><a href='https://www.1ka.si/d/en/about/terms-of-use' target='_blank'>General terms of use.</a></strong>",
"cms_register_user_terms_of_use" => "I agree to <a href='https://www.1ka.si/d/en/about/terms-of-use' target='_blank'>general terms of use</a>.",
"cms_register_user_terms_of_use2" => "I agree to <a href='#'>user agreement! </a> ",
"cms_register_gdpr_agree" => "I agree that you send me notifications to the above-mentioned email address (important information about 1KA, 1KA evaluation, event invitation - once a year).",
"cms_register_gdpr_agree_explain" => "We will use and store your email only for the purposes of using the 1KA username and will carefully protect it in accordance with the regulations.
@ -1637,7 +1637,7 @@ $lang = array (
For each user, we store the following information: email address, name(nickname), user type, interface language, registration date, last login date, order(subscription) to receiving news.<br /><br />
In the event that you agree to receive notifications, we will send you important information about 1KA news, an invitation to an event, etc. on your email once a year.
The exception is the first year of registration when we also send you an invitation to an evaluation survey. You can cancel receiving notifications at any time.",
"cms_register_user_nickname" => "Name (username)",
"cms_register_user_nickname" => "Username",
"cms_register_user_password" => "Password",
"cms_register_user_repeat_password" => "Repeat password",
"cms_register_user_email_incorrect" => "Please, check your email!",
@ -3448,7 +3448,7 @@ $lang = array (
"confirm_user_in_db" => "Confirm",
"delete_user_in_db" => "Delete",
"user_confirm_h" => "E-mail confirmation",
"user_confirm_p" => "We have sent instructions on how to finish your registration to the entered email address (<span class=\"oznacen-rdec\">SFMAIL</span>).<br />
"user_confirm_p" => "We have sent instructions on how to finish your registration to the entered email address (<span class=\"modra\">SFMAIL</span>).<br />
If you don't receive an e-mail in a few minutes, don't forget to check your spam folder.<br /><br />
Also, check if the entered email address is correct. <b>Namely, often do the following problems occur:</b><ul>
<li>Typos when entering an email address, for example: 'enkllikanketa@gmali.com'</li>