diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module index ed191f879..31b92857f 100644 --- a/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module +++ b/frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module @@ -8,9 +8,9 @@ function prijava_1ka_theme() { if(\Drupal::languageManager()->getCurrentLanguage()->getId() == 'sl') { - include_once(__DIR__ . '/../../../../../../lang/1.php'); + include (__DIR__ . '/../../../../../../lang/1.php'); }else{ - include_once(__DIR__ . '/../../../../../../lang/2.php'); + include (__DIR__ . '/../../../../../../lang/2.php'); } $google2fa =false; @@ -95,7 +95,13 @@ function prijava_1ka_theme() 'ime' => (isset($_COOKIE['unam']) ? base64_decode($_COOKIE['unam']) : null), 'from1ka' => (isset($_GET['from1ka']) ? $_GET['from1ka'] : false) , ] - ] + ], + + 'prijava_individualno_svetovanje_modal_block' => [ + 'variables' => [ + 'lang' => $lang, + ] + ], ]; } diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php new file mode 100644 index 000000000..edbb89405 --- /dev/null +++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php @@ -0,0 +1,29 @@ + 'prijava_individualno_svetovanje_modal_block', + ]; + } + +} diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php index 12f1d7ac3..ee0f25082 100644 --- a/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php +++ b/frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php @@ -6,12 +6,11 @@ use Drupal\Core\Block\BlockBase; /** - * Arnes prijavni modal - * Prikažemo, samo če uporabnik ni prijavljen (nima piškotka) + * Prijava z drugimi računi * * @Block( - * id = "prijava_arnes_modal_block", - * admin_label = @Translation("Prijava: Arnes modal"), + * id = "prijava_z_racuni_modal_block", + * admin_label = @Translation("Prijava: Prijava z računi (FB, Google)"), * category = @Translation("1KA"), * ) */ @@ -23,8 +22,8 @@ class PrijavaArnesModalBlock extends BlockBase { public function build() { return [ - '#theme' => 'prijava_arnes_modal_block', + '#theme' => 'prijava_z_racuni_modal_block', ]; } -} \ No newline at end of file +} diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-individualno-svetovanje-modal-block.html.twig b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-individualno-svetovanje-modal-block.html.twig new file mode 100644 index 000000000..0b224d8ae --- /dev/null +++ b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-individualno-svetovanje-modal-block.html.twig @@ -0,0 +1,41 @@ + + diff --git a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-intro-block.html.twig b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-intro-block.html.twig index 7b6420292..07a55ebd4 100644 --- a/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-intro-block.html.twig +++ b/frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-intro-block.html.twig @@ -2,7 +2,6 @@ @@ -48,7 +37,6 @@ -

{{ lang['cms_intro_modal_1ka_text'] | raw }}

diff --git a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css index 39fea336f..c6fe531ba 100644 --- a/frontend/drupal9/web/themes/custom/pro1ka/css/style.css +++ b/frontend/drupal9/web/themes/custom/pro1ka/css/style.css @@ -2184,6 +2184,9 @@ input.error-field { .sidebar_menu h4 a:hover { color: #0082ff; } +.sidebar_menu #forma-iskanje-second { + display: flex; +} .sidebar_menu ul { display: block; margin: 0px; @@ -2331,6 +2334,42 @@ a { flex: 1; } +.gumb-svetovanje { + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + width: 100px; + height: 100px; + margin-left: 20px; + padding: 14px; + float: right; + margin-bottom: 1rem; + -webkit-box-pack: center; + -webkit-justify-content: center; + -ms-flex-pack: center; + justify-content: center; + -webkit-box-align: center; + -webkit-align-items: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-flex: 0; + -webkit-flex: 0 0 100px; + -ms-flex: 0 0 100px; + flex: 0 0 100px; + border-radius: 50% 50% 50% 0px; + background-color: #D4F0FC; + cursor: pointer; +} +.gumb-svetovanje .besedilo { + color: #0040A9; + font-size: 11px; + line-height: 17px; + font-weight: 700; + text-align: center; + text-transform: uppercase; +} + .blue-section .secondary-button-white { color: white; } diff --git a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js index ed8aceccc..f55031058 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/js/script.js +++ b/frontend/drupal9/web/themes/custom/pro1ka/js/script.js @@ -17,8 +17,15 @@ }*/ jQuery(document).ready(function () { + // Če je admin menu + if(jQuery('#toolbar-administration').length == 1){ + jQuery('.nav-menu').css('top', '2%'); + jQuery('.searchform').css('top', '2%'); + } + // Prikaži polje za iskanje jQuery('.searchbutton').on('click', function(){ + jQuery('.searchform').css('transform', 'translate3d(0px, 0px, 0px)'); }); @@ -154,7 +161,7 @@ /** gumb svetovanje **/ if(urlPars[3] == 'pomoc' || urlPars[3] == 'iskanje'){ - jQuery('.container h1').append('
Individualno
svetovanje
'); + jQuery('.container h1').append('
Individualno
svetovanje
'); } diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_main.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_main.scss index 48c8b0c8d..2840a2def 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_main.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_main.scss @@ -38,3 +38,41 @@ a { } } + +.gumb-svetovanje{ + display: -webkit-box; + display: -webkit-flex; + display: -ms-flexbox; + display: flex; + width: 100px; + height: 100px; + margin-left: 20px; + padding: 14px; + float: right; + margin-bottom: 1rem; + -webkit-box-pack: center; + -webkit-justify-content: center; + -ms-flex-pack: center; + justify-content: center; + -webkit-box-align: center; + -webkit-align-items: center; + -ms-flex-align: center; + align-items: center; + -webkit-box-flex: 0; + -webkit-flex: 0 0 100px; + -ms-flex: 0 0 100px; + flex: 0 0 100px; + border-radius: 50% 50% 50% 0px; + background-color: #D4F0FC; + cursor: pointer; + + + .besedilo{ + color: #0040A9; + font-size: 11px; + line-height: 17px; + font-weight: 700; + text-align: center; + text-transform: uppercase; + } +} diff --git a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_menu.scss b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_menu.scss index 210fd78c0..91643b360 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_menu.scss +++ b/frontend/drupal9/web/themes/custom/pro1ka/sass/components/_menu.scss @@ -194,6 +194,10 @@ } } + #forma-iskanje-second{ + display: flex; + } + ul{ display: block; margin: 0px; diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--node--1306.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--node--1306.html.twig new file mode 100644 index 000000000..940ac8333 --- /dev/null +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--node--1306.html.twig @@ -0,0 +1,158 @@ +
+
+
+
+
+
+
+
+

Izbira pravega paketa glede na vrsto uporabnika

+

Izbirate lahko tudi med poslovnimi paketi, ki omogočajo “white label” rešitve, nadzor nad uporabniki v primeru večjega števila uporabnikov (društva, organizacije, podjetja). V primeru individualne uporabe (en uporabnik) priporočamo spodnje pakete. (Pogosta vprašanja)

+
+
+
+
+
+
+ +
Posamezniki
+ + +
Skupine
+ + +
Ostale storitve
+ +
+
+
+
+{# {{ content }}#} + {{ page.content }} +
+
+
+
+
+
+
+
+
+ + + + +{# OLD#} + diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig index 0faf51eba..b0dab58fb 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig @@ -35,7 +35,7 @@
Skupine
 - +
Ostale storitve
@@ -1428,8 +1428,6 @@
-
-
diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig index a79722b8d..c60468743 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig @@ -35,7 +35,7 @@ END HEADER #}
Skupine
 - +
Ostale storitve
 diff --git a/frontend/drupal9/web/themes/custom/pro1ka/templates/page.html.twig b/frontend/drupal9/web/themes/custom/pro1ka/templates/page.html.twig index a8ee964d0..b4985a53e 100755 --- a/frontend/drupal9/web/themes/custom/pro1ka/templates/page.html.twig +++ b/frontend/drupal9/web/themes/custom/pro1ka/templates/page.html.twig @@ -29,36 +29,32 @@ {# Desni meni #} {#{% if page.sidebar_menu %} #} {# Na produkcije je potrebno vpisat mechanic name od bloka za meni #} - {#% if page.sidebar_menu.mainnavigation_3|render is not same as('') %#} -
- {# Polje za iskanje #} -
-
- - -
-
-
Thank you! Your submission has been received!
-
-
-
Oops! Something went wrong while submitting the form.
-
-
- {# end polje za iskanje#} +{# {% if page.sidebar_menu.menu_second|render is not same as('') %}#} +
- {{ page.sidebar_menu }} -
- {#% endif %#} + {# Polje za iskanje #} +
+
+ + +
+
+ {# end polje za iskanje#} + + {{ page.sidebar_menu }} +
+{# {% endif %}#} {# END desni meni #}
{# breadcrumb #} - {{ page.breadcrumb }} +{# Začasno so skriti, ker jih ne prikazuje pravilno #} +{# {{ page.breadcrumb }}#} {# END breadcrumb #}
-{#
Individualno svetovanje
#} + {{ title_prefix }} {% if title %}

{{ title }}