may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Popravki modul in teme

Browse Source
This commit is contained in:
Robert 2022-07-18 16:42:20 +02:00
parent cc9e35d18b
commit 6286c6b165
13 changed files with 350 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
frontend/drupal9/web/modules/custom/prijava_1ka/prijava_1ka.module
View File

@ -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,
]
],
];
}

29
frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaIndividualnoSvetovanjeModalBlock.php Normal file
View File

@ -0,0 +1,29 @@
<?php
namespace Drupal\prijava_1ka\Plugin\Block;
use Drupal\Core\Block\BlockBase;
/**
* Individualno svetovanje
*
* @Block(
* id = "prijava_individualno_svetovanje_modal_block",
* admin_label = @Translation("Prijava: Individualno svetovanje modal"),
* category = @Translation("1KA"),
* )
*/
class PrijavaIndividualnoSvetovanjeModalBlock extends BlockBase {
/**
* {@inheritdoc}
*/
public function build() {
return [
'#theme' => 'prijava_individualno_svetovanje_modal_block',
];
}
}

9
frontend/drupal9/web/modules/custom/prijava_1ka/src/Plugin/Block/PrijavaZRacuniModalBlock.php
View File

@ -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,7 +22,7 @@ class PrijavaArnesModalBlock extends BlockBase {
public function build() {
return [
'#theme' => 'prijava_arnes_modal_block',
'#theme' => 'prijava_z_racuni_modal_block',
];
}

41
frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-individualno-svetovanje-modal-block.html.twig Normal file
View File

@ -0,0 +1,41 @@
<div class="rexister-modal" id="modal-individualno-svetovanje">
<div class="modal-box">
<img src="/tema1ka/img/ikone/zapri.svg" class="closemodal">
{# Title #}
<div class="row">
<div class="col">
<h3 class="modra center">INDIVIDUALNO SVETOVANJE</h3>
</div>
</div>';
<div class="w-clearfix center">
<div class="col _4-4-12-12">
<p>Za uporabnike 1KA nudimo individualno svetovanje na področjih</p>
</div>
</div>
<div class="flexrow center">
<div class="flexcol _3c-center">
<a href="https://www.go-tel.si/instrukcije/1KA" target="_blank" title="Uporaba 1KA">
<i class="fas fa-cog fa-3x"></i>
<div class="w-clearfix"><b>UPORABA 1KA</b></div>
</a>
</div>
<div class="flexcol _3c-center">
<a href="https://www.go-tel.si/instrukcije/statistika" target="_blank" title="Statistika">
<i class="fas fa-chart-line fa-3x"></i>
<div class="w-clearfix"><b>STATISTIKA</b></div>
</a>
</div>
<div class="flexcol _3c-center">
<a href="https://www.1ka.si/d/sl/cenik/ostale-storitve" target="_blank" title="Metodologija">
<i class="fas fa-sync fa-3x"></i>
<div class="w-clearfix "><b>METODOLOGIJA</b></div>
</a>
</div>
</div>
</div>
</div>

12
frontend/drupal9/web/modules/custom/prijava_1ka/templates/prijava-intro-block.html.twig
View File

@ -3,7 +3,6 @@
<div class="modal-box">
<img src="/tema1ka/img/ikone/zapri.svg" class="closemodal">
<div class="dva-stolpca">
<div class="intro-modal intro-aai crta">
@ -13,7 +12,6 @@
</div>
</div>
<div class="display-block">
<div class="col">
<p class="besedilo" style="padding-top: 0.5rem;">{{ lang['cms_intro_modal_aai_text'] | raw }}</p>
@ -25,15 +23,6 @@
</div>
</div>
{# <div class="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 src="/tema1ka/svg/arnes-pogosta-vprasanja.svg">
</div>
<div class="tekst"> {{ lang['cms_intro_modal_aai_qa'] | raw }}</div>
</a>
</div> #}
</div>
</div>
@ -48,7 +37,6 @@
</div>
</div>
<div class="display-block">
<div class="col">
<p class="besedilo" style="padding-top: 0.5rem;">{{ lang['cms_intro_modal_1ka_text'] | raw }}<br /><br /></p>

39
frontend/drupal9/web/themes/custom/pro1ka/css/style.css
View File

@ -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;
}

9
frontend/drupal9/web/themes/custom/pro1ka/js/script.js
View File

@ -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('<div class="w-clearfix gumb-svetovanje"><a href="#"><div class="ikona-svetovanje"><i class="fas fa-external-link-alt"></i></div><div class="besedilo">Individualno <br />svetovanje</div></a></div>');
jQuery('.container h1').append('<div class="w-clearfix gumb-svetovanje"><div class="besedilo">Individualno <br />svetovanje</div></div>');
}

38
frontend/drupal9/web/themes/custom/pro1ka/sass/components/_main.scss
View File

@ -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;
}
}

4
frontend/drupal9/web/themes/custom/pro1ka/sass/components/_menu.scss
View File

@ -194,6 +194,10 @@
}
}
#forma-iskanje-second{
display: flex;
}
ul{
display: block;
margin: 0px;

158
frontend/drupal9/web/themes/custom/pro1ka/templates/page--node--1306.html.twig Normal file
View File

@ -0,0 +1,158 @@
<div class="content">
<div class="topnav w-clearfix">
<div data-w-id="251a98d8-19f7-4f9a-bc79-92e7e9596d22" data-animation-type="lottie" data-src="documents/icons8-menu-11.json" data-loop="0" data-direction="1" data-autoplay="0" data-is-ix2-target="1" data-renderer="svg" data-default-duration="1.1666666666666667" data-duration="0" class="burger"></div>
</div>
<div class="">
<div class="container">
<div class="row pcenter">
<div class="vrsta">
<h1>Izbira pravega paketa glede na vrsto uporabnika</h1>
<p class="intro">Izbirate lahko tudi med <a href="#" class="textlink">poslovnimi paketi</a>, 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. (<a href="#" class="textlink">Pogosta vprašanja</a>)</p>
</div>
</div>
<div class="row flex">
<div class="col">
<div data-duration-in="300" data-duration-out="100" class="tabs-pricing w-tabs">
<div class="tabs-menu-pricing w-tab-menu">
<a data-w-tab="Tab 1" href="/d/sl/cenik/zasebni-paketi" class="tab w-inline-block w-tab-link">
<div>Posamezniki</div>
</a>
<a data-w-tab="Tab 2" href="/d/sl/cenik/poslovni-paketi" class="tab w-inline-block w-tab-link">
<div>Skupine</div>
</a>
<a data-w-tab="Tab 3" class="tab w-inline-block w-tab-link w--current">
<div>Ostale storitve</div>
</a>
</div>
<div class="tabs-content-copy w-tab-content">
<div data-w-tab="Tab 3" class="tab-pane-tab-1-2 w-tab-pane w--tab-active">
<div class="section paketi">
{# {{ content }}#}
{{ page.content }}
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
{# OLD#}
<!--<div class="section inner-content vsebina">
<div
class="container <?php print (!empty($content_class) ? $content_class : ''); ?>">
<div class="maincontent">
<div class="container">
&lt;!&ndash; BREADCRUM &ndash;&gt;
<div class="col">
<?php if ($breadcrumb): ?>
<?php print $breadcrumb; ?>
<?php endif; ?>
</div>
<div class="col">
<div class='nakupovanje-meni'>
<div class='container'>
<ul class='nakupovanje-tabs'>
<li>
<a
href='<?php print ($language->language == 'sl' ? '/d/sl/cenik/zasebni-paketi' : '/d/en/price-list/private-packages'); ?>'
class='nakupovanje-tabs-link'>
<div class='ikona-tab'>
<i class='fas fa-user'
style='font-size: 2rem;'
aria-hidden='true'>
</i>
</div>
<?php print ($language->language == 'sl' ? 'Posamezniki' : 'Individuals'); ?>
</a>
</li>
<li>
<a
href='<?php print ($language->language == 'sl' ? '/d/sl/cenik/poslovni-paketi' : '/d/en/price-list/business-packages'); ?>'
class='nakupovanje-tabs-link'>
<div class='ikona-tab'>
<i class='fas fa-users'
style='font-size: 2rem;'
aria-hidden='true'>
</i>
</div>
<?php print ($language->language == 'sl' ? 'Skupine' : 'Groups'); ?>
</a>
</li>
<li class='active'>
<a
href='<?php print ($language->language == 'sl' ? '/d/sl/cenik/ostale-storitve' : '/d/en/pricelist/other-services'); ?>'
class='nakupovanje-tabs-link'>
<div class='ikona-tab'>
<i class='far fa-window-restore'
style='font-size: 2rem;'
aria-hidden='true'>
</i>
</div>
<?php print ($language->language == 'sl' ? 'Ostale storitve' : 'Other services'); ?>
</a>
</li>
</ul>
</div>
</div>
<?php //print render($title_prefix); ?>
<?php //if ($title): ?>
&lt;!&ndash; <h1>&ndash;&gt;<?php //print $title; ?>&lt;!&ndash;</h1>&ndash;&gt;
<?php //endif; ?>
<?php //print render($title_suffix); ?>
&lt;!&ndash;&ndash;&gt;
<?php //print $messages; ?>
&lt;!&ndash;&ndash;&gt;
&lt;!&ndash;&ndash;&gt;
<?php //print render($tabs); ?>
<?php //print render($page['help']); ?>
<?php //if ($action_links): ?>
&lt;!&ndash; <ul class="action-links">&ndash;&gt;<?php //print render($action_links); ?>&lt;!&ndash;</ul>&ndash;&gt;
<?php //endif; ?>
<div class="section paketi">
<?php print render($page['content']); ?>
</div>
<?php print $feed_icons; ?>
&lt;!&ndash; </main>&ndash;&gt;
&lt;!&ndash; &ndash;&gt;<?php ///*<div class="layout-swap__top layout-3col__full">
//
// <?php /*<a href="#skip-link" class="visually-hidden visually-hidden&#45;&#45;focusable" id="main-menu" tabindex="-1">Back to top</a>
//
// </div>*/ ?>
</div>
</div>
</div>
</div>
<?php print render($page['footer']); ?>
</div>
<?php if ($page['bottom']): ?>
<div class="section greysection noga">
<div class="container">
<div class="section-2">
<div class="container-2"></div>
</div>
<?php print render($page['bottom']); ?>
</div>
</div>
<?php endif; ?>-->

4
frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-poslovni-uporabniki.html.twig
View File

@ -35,7 +35,7 @@
<a data-w-tab="Tab 2" class="tab w-inline-block w-tab-link w--current">
<div>Skupine</div>
</a>
<a data-w-tab="Tab 3" class="tab w-inline-block w-tab-link">
<a data-w-tab="Tab 3" href="/d/sl/cenik/ostale-storitve" class="tab w-inline-block w-tab-link">
<div>Ostale storitve</div>
</a>
</div>
@ -1428,8 +1428,6 @@
</div>
</div>
</div>
<div data-w-tab="Tab 2" class="w-tab-pane"></div>
<div data-w-tab="Tab 3" class="w-tab-pane"></div>
</div>
</div>
</div>

2
frontend/drupal9/web/themes/custom/pro1ka/templates/page--paketi-zasebni.html.twig
View File

@ -35,7 +35,7 @@ END HEADER #}
<a data-w-tab="Tab 2" href="/d/sl/cenik/poslovni-paketi" class="tab w-inline-block w-tab-link">
<div>Skupine</div>
</a>
<a data-w-tab="Tab 3" class="tab w-inline-block w-tab-link">
<a data-w-tab="Tab 3" href="/d/sl/cenik/ostale-storitve" class="tab w-inline-block w-tab-link">
<div>Ostale storitve</div>
</a>
</div>

38
frontend/drupal9/web/themes/custom/pro1ka/templates/page.html.twig
View File

@ -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('') %#}
<div class="sidenav searchform">
{# Polje za iskanje #}
<div class="w-form ">
<div id="forma-iskanje-second" data-action="{{ site_url }}">
<input type="text" class="text-field w-input" maxlength="256" name="name" id="iskanje-input-second">
<input type="submit" value="" data-wait="Please wait..." class="submit-button w-button">
</div>
<div class="w-form-done">
<div>Thank you! Your submission has been received!</div>
</div>
<div class="w-form-fail">
<div>Oops! Something went wrong while submitting the form.</div>
</div>
</div>
{# end polje za iskanje#}
{# {% if page.sidebar_menu.menu_second|render is not same as('') %}#}
<div class="sidenav sidebar_menu">
{{ page.sidebar_menu }}
</div>
{#% endif %#}
{# Polje za iskanje #}
<div class="w-form ">
<div id="forma-iskanje-second" data-action="{{ site_url }}">
<input type="text" class="text-field w-input" maxlength="256" name="name" id="iskanje-input-second">
<input type="submit" value="" data-wait="Please wait..." class="submit-button w-button">
</div>
</div>
{# end polje za iskanje#}
{{ page.sidebar_menu }}
</div>
{# {% endif %}#}
{# END desni meni #}
<div class="col">
{# breadcrumb #}
{{ page.breadcrumb }}
{# Začasno so skriti, ker jih ne prikazuje pravilno #}
{# {{ page.breadcrumb }}#}
{# END breadcrumb #}
<div class="div-block-22">
{# <div class="badge">Individualno svetovanje</div>#}
{{ title_prefix }}
{% if title %}
<h1>{{ title }}</h1>