Drupal: dodan intro pred prijavo v sistem.
This commit is contained in:
Robert
parent
db9d3ed2da
commit
73bdbbeb7f
@ -5,6 +5,10 @@
|
||||
function prijava_1ka_block_info()
|
||||
{
|
||||
|
||||
$blocks['prijava_1ka_izbira'] = [
|
||||
'info' => t('Izbira pred prijavo v 1ka - modal'),
|
||||
];
|
||||
|
||||
$blocks['prijava_1ka'] = [
|
||||
'info' => t('Prijavni obrazec 1ka - modal'),
|
||||
];
|
||||
@ -48,6 +52,101 @@ function prijava_1ka_block_view($delta = '')
|
||||
|
||||
$block = [];
|
||||
switch ($delta) {
|
||||
case 'prijava_1ka_izbira':
|
||||
|
||||
//$html = '';
|
||||
// Modul izpišemo samo če uporabnik ni prijavljen
|
||||
|
||||
$html = '<div class="rexister-modal" id="modal-info-login">
|
||||
<div class="modal-box">
|
||||
<img src="/d/sites/all/themes/nova1ka/img/ikone/zapri.svg" class="closemodal">';
|
||||
|
||||
// Naslov
|
||||
$html .= '<div class="dva-stolpca">';
|
||||
$html .= '<div class="intro-modal intro-aai crta">';
|
||||
|
||||
$html .= '<div class="row siv-url">
|
||||
<div class="col">
|
||||
1ka.arnes.si
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
$html .= '<div class="row">
|
||||
<div class="col">
|
||||
<h4>PRIJAVA ZA ŠTUDENTE RAZISKOVALCE IN UČITELJE</h4>
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
$html .= '<div class="row">
|
||||
<div class="col">
|
||||
<p><b>Študenti, raziskovalci, učitelji</b> in drugi z AAI dostopom lahko 1KA uporabljate <b>brezplačno in neomejeno.</b></p>
|
||||
|
||||
<div class="ikona ikona-custom-login ikona-aai" data-login="aai">
|
||||
<div class="w-button submit-btn gumb-aai">
|
||||
NAPREJ
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row pojasnilo">
|
||||
<a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/pogosta-vprasanja-o-zasebni-poslovni-aai-uporabi-orodja-1ka">
|
||||
<div class="ikona">
|
||||
<img alt="KAJ JE AAI RAČUN IN DIGITALNA IDENTITETA?" src="/tema1ka/svg/arnes-pogosta-vprasanja.svg">
|
||||
</div>
|
||||
<div class="tekst">
|
||||
KAJ JE AAI RAČUN IN<br /> DIGITALNA IDENTITETA?
|
||||
</div>
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
$html .= '</div>';
|
||||
|
||||
|
||||
$html .= '<div class="intro-modal intro-1ka">';
|
||||
$html .= '<div class="row siv-url">
|
||||
<div class="col">
|
||||
www.1ka.si
|
||||
</div>
|
||||
</div>';
|
||||
$html .= '<div class="row">
|
||||
<div class="col">
|
||||
<h4>PRIJAVA ZA SPLOŠNE UPORABNIKE</h4>
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
$html .= '<div class="row">
|
||||
<div class="col">
|
||||
<p>Splošni uporabniki se lahko prijavite s svojim elektronskim naslovom ali z <b>uporabniškim računom za Facebook ali Gmail.</b></p>
|
||||
|
||||
<div class="submit-btn w-button modal-open-login-obrazec">
|
||||
NADALJUJ
|
||||
</div>
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
$html .= '</div>';
|
||||
|
||||
//$html .= '<div class="w-clearfix">
|
||||
// <div class="col _4-4-12-12">
|
||||
// <p>Prosimo, da pred klicem pregledate spodnja pogosta vprašanja, posebej študenti in drugi z AAI (Arnes) računom.</p>
|
||||
// </div>
|
||||
// </div>';
|
||||
//
|
||||
//$html .= '<div class="w-clearfix">
|
||||
// <div class="col _4-4-12-12">
|
||||
// <p>Za razjasnjevanja glede plačljive pomoči nas lahko kontaktirate po telefonu <b>030/702-788</b> ali pa izpolnete <a href="https://www.1ka.si/help1KA">OBRAZEC 1KA CENTRA ZA POMOČ UPORABNIKOM</a>.</p>
|
||||
// </div>
|
||||
// </div>';
|
||||
$html .= '</div>';
|
||||
|
||||
|
||||
$html .= ' </div>
|
||||
</div>';
|
||||
|
||||
$block['content'] = $html;
|
||||
break;
|
||||
|
||||
case 'prijava_1ka' :
|
||||
|
||||
$parametri = drupal_get_query_parameters();
|
||||
@ -126,6 +225,16 @@ function prijava_1ka_block_view($delta = '')
|
||||
|
||||
}else{
|
||||
|
||||
$html .= '<div class="vrni-na-intro-page modal-open-intro-obrazec">
|
||||
<< '.$lang['back'].'
|
||||
</div>';
|
||||
|
||||
$html .= '<div class="row siv-url">
|
||||
<div class="col">
|
||||
www.1ka.si
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
$html .= '<div class="row">
|
||||
<div class="col">
|
||||
<h3 class="modra center">' . $lang['cms_login_title_block'] . '</h3>
|
||||
@ -450,10 +559,14 @@ function prijava_1ka_block_view($delta = '')
|
||||
$html = '<div class="rexister-modal" id="modal-aai-obvestilo">
|
||||
<div class="modal-box"><img src="/d/sites/all/themes/nova1ka/img/ikone/zapri.svg" class="closemodal">';
|
||||
|
||||
$html .= '<div class="vrni-na-intro-page modal-open-intro-obrazec">
|
||||
<< '.$lang['back'].'
|
||||
</div>';
|
||||
|
||||
// Naslov
|
||||
$html .= '<div class="row">
|
||||
<div class="col">
|
||||
<h3>' . $lang['login_with_aai_title'] . '</h3>
|
||||
<h3 class="color-arnes">' . $lang['login_with_aai_title'] . '</h3>
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
@ -471,7 +584,6 @@ function prijava_1ka_block_view($delta = '')
|
||||
|
||||
$html .= '<div>
|
||||
<div class="col w-clearfix">
|
||||
<button class="submit-btn w-button prijava-ostale-nazaj" style="float: left;">'.$lang['back'].'</button>
|
||||
<a href="https://1ka.arnes.si" class="submit-btn w-button gumb-aai">'.$lang['cms_aai_login_redirect_button'] .'</a>
|
||||
</div>
|
||||
</div>';
|
||||
@ -494,7 +606,7 @@ function prijava_1ka_block_view($delta = '')
|
||||
break;
|
||||
|
||||
case 'prijava_telefonska_pomoc':
|
||||
$html = '';
|
||||
|
||||
// Modul izpišemo samo če uporabnik ni prijavljen
|
||||
|
||||
$html = '<div class="rexister-modal" id="modal-telefonska-pomoc">
|
||||
@ -609,25 +721,21 @@ function ostale_prijave_gumbi(){
|
||||
$lang = nalozi_ustrezen_jezik();
|
||||
|
||||
$text = '<div class="ostale-prijave">';
|
||||
|
||||
$text .= '<div class="ikona ikona-custom-login ikona-facebook" data-login="facebook">
|
||||
<div class="gumb">
|
||||
<img alt="Facebook prijava" src="/tema1ka/svg/prijava-facebook.svg"/>
|
||||
'.$lang['login_with_facebook'].'
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
$text .= '<div class="ikona ikona-custom-login ikona-google" data-login="google">
|
||||
<div class="gumb">
|
||||
<img alt="Gmail prijava" src="/tema1ka/svg/prijava-gmail.svg" style="height: 1.5rem;"/>
|
||||
'.$lang['login_with_google'].'
|
||||
</div>
|
||||
</div>';
|
||||
$text .= '<div class="aai-prijava-small">'.$lang['login_with_aai_small_text'].'</div>';
|
||||
$text .= '<div class="ikona ikona-custom-login ikona-aai" data-login="aai">
|
||||
<div class="gumb gumb-aai">
|
||||
<img alt="Arnes AAI prijava - 1ka.arnes.si" src="/tema1ka/svg/prijava-aai.svg"/>
|
||||
'.$lang['login_with_aai'].'
|
||||
</div>
|
||||
</div>';
|
||||
|
||||
$text .= '</div>';
|
||||
|
||||
drupal_add_js('sites/all/modules/prijava_1ka/prijava_1ka_script.js');
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -173,6 +173,17 @@
|
||||
// Nova 1ka
|
||||
// Prijava modal
|
||||
jQuery('#modal-open-login').on('click', function () {
|
||||
jQuery('#modal-info-login').show();
|
||||
});
|
||||
|
||||
jQuery('.modal-open-intro-obrazec').on('click', function () {
|
||||
jQuery('.rexister-modal').hide();
|
||||
jQuery('#modal-info-login').show();
|
||||
});
|
||||
|
||||
// Prijava modal
|
||||
jQuery('.modal-open-login-obrazec').on('click', function () {
|
||||
jQuery('.rexister-modal').hide();
|
||||
jQuery('#modal-login').show();
|
||||
});
|
||||
|
||||
|
||||
@ -20,6 +20,12 @@
|
||||
color: white;
|
||||
}
|
||||
}
|
||||
|
||||
.siv-url{
|
||||
text-transform: uppercase;
|
||||
color: #d1d1d1;
|
||||
text-align: center;
|
||||
}
|
||||
}
|
||||
|
||||
.w-max-1024 {
|
||||
@ -33,7 +39,6 @@
|
||||
.dva-stolpca {
|
||||
display: flex;
|
||||
|
||||
|
||||
.preko-racunov {
|
||||
padding-left: 1rem;
|
||||
border-left: 1px solid $siva;
|
||||
@ -101,11 +106,76 @@
|
||||
padding-right: 1rem;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.intro-modal{
|
||||
.siv-url{
|
||||
text-transform: uppercase;
|
||||
color: #d1d1d1;
|
||||
}
|
||||
|
||||
.w-button{
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
}
|
||||
// 1ka prijava
|
||||
&.intro-1ka{
|
||||
width: 100%;
|
||||
padding-left: 1rem;
|
||||
|
||||
h4 {
|
||||
color: $modra;
|
||||
}
|
||||
}
|
||||
|
||||
// Arnes prijava
|
||||
&.intro-aai {
|
||||
padding-right: 1rem;
|
||||
border-right: 1px solid $siva;
|
||||
width: 100%;
|
||||
|
||||
h4 {
|
||||
color: $arnes;
|
||||
}
|
||||
|
||||
.pojasnilo{
|
||||
.ikona{
|
||||
float: left;
|
||||
}
|
||||
.tekst {
|
||||
float: left;
|
||||
padding-left: 1rem;
|
||||
color: $arnes !important;
|
||||
font-weight: bold;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.vrni-na-intro-page{
|
||||
position: absolute;
|
||||
top: 1rem;
|
||||
cursor: pointer;
|
||||
display: inline-block;
|
||||
padding: 9px 15px;
|
||||
color: $modra;
|
||||
transition: .2s;
|
||||
|
||||
&:hover{
|
||||
color: darken($modra, 15%);
|
||||
}
|
||||
}
|
||||
|
||||
.color-arnes{
|
||||
color: $arnes;
|
||||
}
|
||||
|
||||
.gumb-aai{
|
||||
background: #e35205;
|
||||
background: $arnes;
|
||||
letter-spacing: 0.5px;
|
||||
width: 100%;
|
||||
text-align: center;
|
||||
|
||||
&:hover{
|
||||
background: #fa6c21;
|
||||
|
||||
@ -4,6 +4,8 @@ $modra: #1E88E5;
|
||||
$siva: #D1D1D1;
|
||||
$siva-burger: #979797;
|
||||
|
||||
$arnes: #E35205;
|
||||
|
||||
/* Privzete stvari, ki jih na začetku skrijemo */
|
||||
.visually-hidden {
|
||||
display: none;
|
||||
|
||||
@ -215,12 +215,11 @@
|
||||
.ostale-prijave {
|
||||
width: 100%;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
|
||||
.ikona {
|
||||
.gumb {
|
||||
max-width: 100%;
|
||||
padding: 0.5rem;
|
||||
padding: 1 rem;
|
||||
|
||||
img {
|
||||
height: 1.6rem;
|
||||
|
||||
@ -0,0 +1,55 @@
|
||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<svg
|
||||
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||
xmlns:cc="http://creativecommons.org/ns#"
|
||||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||
xmlns:svg="http://www.w3.org/2000/svg"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
fill="#ffffff"
|
||||
viewBox="0 0 50 50"
|
||||
width="50px"
|
||||
height="50px"
|
||||
version="1.1"
|
||||
id="svg4"
|
||||
sodipodi:docname="arnes-pogosta-vprasanja.svg"
|
||||
inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)">
|
||||
<metadata
|
||||
id="metadata10">
|
||||
<rdf:RDF>
|
||||
<cc:Work
|
||||
rdf:about="">
|
||||
<dc:format>image/svg+xml</dc:format>
|
||||
<dc:type
|
||||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||
</cc:Work>
|
||||
</rdf:RDF>
|
||||
</metadata>
|
||||
<defs
|
||||
id="defs8" />
|
||||
<sodipodi:namedview
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1"
|
||||
objecttolerance="10"
|
||||
gridtolerance="10"
|
||||
guidetolerance="10"
|
||||
inkscape:pageopacity="0"
|
||||
inkscape:pageshadow="2"
|
||||
inkscape:window-width="2128"
|
||||
inkscape:window-height="1457"
|
||||
id="namedview6"
|
||||
showgrid="false"
|
||||
inkscape:zoom="14.62"
|
||||
inkscape:cx="25"
|
||||
inkscape:cy="25"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="50"
|
||||
inkscape:window-maximized="0"
|
||||
inkscape:current-layer="svg4" />
|
||||
<path
|
||||
d="M 22 0 C 19.789063 0 18 1.789063 18 4 L 18 20 C 18 22.210938 19.789063 24 22 24 L 37.625 24 L 45.34375 30.75 C 45.640625 31.007813 46.054688 31.066406 46.414063 30.90625 C 46.769531 30.746094 47 30.390625 47 30 L 47 23.8125 C 48.714844 23.363281 50 21.855469 50 20 L 50 4 C 50 1.789063 48.210938 0 46 0 Z M 22 2 L 46 2 C 47.191406 2 48 2.808594 48 4 L 48 20 C 48 21.191406 47.191406 22 46 22 C 45.449219 22 45 22.449219 45 23 L 45 27.8125 L 38.65625 22.25 C 38.476563 22.089844 38.242188 22 38 22 L 22 22 C 20.808594 22 20 21.191406 20 20 L 20 4 C 20 2.808594 20.808594 2 22 2 Z M 33 6.09375 L 30.5 17.59375 L 32.3125 17.59375 L 32.90625 14.59375 L 35.09375 14.59375 L 35.6875 17.59375 L 37.5 17.59375 L 35.09375 6.09375 Z M 34 8 L 34.09375 8 C 34.195313 8.800781 34.300781 9.894531 34.5 10.59375 L 35 13.1875 L 33.09375 13.1875 L 33.59375 10.59375 C 33.695313 9.894531 33.898438 8.800781 34 8 Z M 4 19 C 1.789063 19 0 20.789063 0 23 L 0 39 C 0 40.855469 1.285156 42.363281 3 42.8125 L 3 49 C 3 49.390625 3.230469 49.746094 3.585938 49.90625 C 3.945313 50.066406 4.359375 50.007813 4.65625 49.75 L 12.375 43 L 28 43 C 30.210938 43 32 41.210938 32 39 L 32 25 L 30 25 L 30 39 C 30 40.191406 29.191406 41 28 41 L 12 41 C 11.757813 41 11.523438 41.089844 11.34375 41.25 L 5 46.8125 L 5 42 C 5 41.449219 4.550781 41 4 41 C 2.808594 41 2 40.191406 2 39 L 2 23 C 2 21.808594 2.808594 21 4 21 L 17 21 L 17 19 Z M 15.59375 25 C 13.292969 25 12 27.414063 12 30.8125 C 12 34.710938 13.304688 36.6875 15.40625 36.6875 C 15.507813 36.6875 15.707031 36.804688 15.90625 36.90625 C 16.605469 37.304688 17.789063 37.914063 18.6875 38.3125 L 19.3125 36.90625 C 18.613281 36.707031 17.792969 36.394531 17.09375 36.09375 L 17.09375 36 C 18.195313 35.398438 18.90625 33.6875 18.90625 30.6875 C 18.90625 27.585938 17.992188 25 15.59375 25 Z M 15.5 26.5 C 16.601563 26.5 17 28.488281 17 30.6875 C 17 33.085938 16.601563 35.09375 15.5 35.09375 C 14.300781 35.09375 13.90625 33.085938 13.90625 30.6875 C 13.90625 28.585938 14.300781 26.5 15.5 26.5 Z"
|
||||
id="path2"
|
||||
style="fill:#E35205;fill-opacity:1" />
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 3.5 KiB |
Loading…
x
Reference in New Issue
Block a user