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

Merge branch 'master' of https://bitbucket.org/1ka/1ka

Browse Source
This commit is contained in:
pero1203 2020-12-05 11:30:46 +01:00
commit 8713f0214c
22 changed files with 125 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/survey/modules/mod_EVOLI/R/Evoli_org_employ_meter_ang.R
View File

@ -79,7 +79,7 @@ data <- subset(data, skupina == ID)
# ?e oddelek nima podatka oziroma je manjkajo?a vrednost,
# ga odstranimo v izogib errorju pri izdelavi frekven?ne tabele
data <- subset(data, oddelek_ime != -1)
#data <- subset(data, oddelek_ime != -1)
# Izberemo samo koncane ankete
data <- subset(data, status == 6)

2
admin/survey/modules/mod_EVOLI/R/Evoli_org_employ_meter_dan.R
View File

@ -81,7 +81,7 @@ if (data[1, 1] == ("Ustreznost") |
# Izberemo dokon?ane ankete skupine 1 in odstranimo podatke brez oddelka
data <- data %>%
subset(skupina == ID) %>%
subset(oddelek_ime != -1) %>%
#subset(oddelek_ime != -1) %>%
subset(status == 6)
# Odstranimo vrstice, ki vsebujejo vrednosti neveljavnih odgovorov (od -1 do -5)

2
admin/survey/modules/mod_EVOLI/R/Evoli_org_employ_meter_slo.R
View File

@ -82,7 +82,7 @@ if (data[1, 1] == ("Ustreznost") |
# Izberemo dokon?ane ankete skupine 1 in odstranimo podatke brez oddelka
data <- data %>%
subset(skupina == ID) %>%
subset(oddelek_ime != -1) %>%
#subset(oddelek_ime != -1) %>%
subset(status == 6)
# Odstranimo vrstice, ki vsebujejo vrednosti neveljavnih odgovorov (od -1 do -5)

32
admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_ang.R
View File

@ -72,13 +72,11 @@ if (data[1, 1] == ("Ustreznost") |
data <- subset(data, skupina == ID)
# Če oddelek nima podatka oziroma je manjkajoča vrednost,
# ga odstranimo v izogib errorju pri izdelavi frekvenčne tabele
data <- subset(data, oddelek_ime != -1)
#data <- subset(data, oddelek_ime != -1)
# Izberemo samo koncane ankete
data <- subset(data, status == 6)
#--------------------------- //IMPORT DATA// --------------------------#
# Preverimo ali oddelki obstajajo v nasprotnem bomo na to opozorili
if(nrow(data) > 0) {
# TEAMS / ODDELKI #
####################
@ -464,7 +462,7 @@ p <- ggplot(df, aes(x = factor(name))) +
# Rest of theme
coord_flip() +
scale_y_continuous(
position = "top",
position = "right",
# položaj osi je na vrgu grafa
expand = c(0, 0),
breaks = seq(min(0), max(0, 102), by = 10),
@ -498,7 +496,7 @@ p1 <- p + theme(axis.text.x = element_text(colour="black",size=11,face="plain"),
plot.title = element_text(hjust = 0.4,size = 15, face = "bold")) #+
#ggtitle("Employeeship for all teams")
p1 + theme(axis.ticks=element_blank())
print(p1 + theme(axis.ticks=element_blank()))
dev.off() # END: Save ggplot to pdf
# Shranimo sliko in vklju\u010Dimo v pdf: LATEX
@ -849,7 +847,7 @@ if (nrow(oddelek_length) > 0) {
# Rest of theme
coord_flip() +
scale_y_continuous(position = "top", # položaj osi je na vrgu grafa
scale_y_continuous(position = "right", # položaj osi je na vrgu grafa
expand = c(0, 0),
breaks = seq(min(0), max(0,102), by = 10),
limits = c(0,102),
@ -1002,28 +1000,8 @@ tex.izbor <- c(
drugi_del_tex,
"\\end{document}"
)
# Compile PDF
setwd(paste(Rdirektorij, "modules/mod_EVOLI/results", sep="/")) # File folder
cat(unlist(tex.izbor), file=paste0("Quality-climate.tex"), sep="\n") # Name of tex file
tools::texi2pdf(file=paste0("Quality-climate.tex"), quiet=TRUE, clean=TRUE) # Pdf file
setwd(Rdirektorij)
} else {
# Če ni oddelkov to napiši
Rdirektorij <- getwd() # Get working diretory
# Compiling file
tex.izbor <- c(
"\\documentclass{article}
\\begin{document}
Data for department (department name) is missing in the data. Please check!
\\end{document}"
)
setwd(paste(Rdirektorij, "modules/mod_EVOLI/results", sep="/")) # File folder
cat(unlist(tex.izbor), file=paste0("Quality-climate.tex"), sep="\n") # Name of tex file
tools::texi2pdf(file=paste0("Quality-climate.tex"), quiet=TRUE, clean=TRUE) # Pdf file
setwd(Rdirektorij)
}

37
admin/survey/modules/mod_EVOLI/R/Evoli_quality_clime_slo.R
View File

@ -80,17 +80,15 @@ if (data[1, 1] == ("Ustreznost") |
data <- data[2:nrow(data),]
}
data <- subset(data, skupina == ID)
# Če oddelek nima podatka oziroma je manjkajoča vrednost,
# ga odstranimo v izogib errorju pri izdelavi frekvenčne tabele
data <- subset(data, oddelek_ime != -1)
#data <- subset(data, oddelek_ime != -1)
# Izberemo samo koncane ankete
data <- subset(data, status == 6)
#--------------------------- //IMPORT DATA// --------------------------#
# Preverimo ali oddelki obstajajo v nasprotnem bomo na to opozorili
if(nrow(data) > 0) {
# TEAMS / ODDELKI #
####################
# Skupine na podlagi katerih se bodo ra\u010Dunale vrednosti in izrisovale v grafih (glej SINTAX SPODAJ)
@ -477,7 +475,7 @@ p <- ggplot(df, aes(x = factor(name))) +
# Rest of theme
coord_flip() +
scale_y_continuous(
position = "top",
position = "right",
# položaj osi je na vrgu grafa
expand = c(0, 0),
breaks = seq(min(0), max(0, 102), by = 10),
@ -511,7 +509,7 @@ p1 <- p + theme(axis.text.x = element_text(colour="black",size=11,face="plain"),
plot.title = element_text(hjust = 0.4,size = 15, face = "bold")) #+
#ggtitle("Employeeship for all teams")
p1 + theme(axis.ticks=element_blank())
print(p1 + theme(axis.ticks=element_blank()))
dev.off() # END: Save ggplot to pdf
# Shranimo sliko in vklju\u010Dimo v pdf: LATEX
@ -862,7 +860,7 @@ if (nrow(oddelek_length) > 0) {
# Rest of theme
coord_flip() +
scale_y_continuous(position = "top", # položaj osi je na vrgu grafa
scale_y_continuous(position = "right", # položaj osi je na vrgu grafa
expand = c(0, 0),
breaks = seq(min(0), max(0,102), by = 10),
limits = c(0,102),
@ -947,7 +945,7 @@ customer <-
tex.glava <- scan("modules/mod_EVOLI/latexkosi/glava-evoli_klima_slo.tex", character(0), sep="\n", quiet=TRUE,encoding='UTF-8') # Define document (first page, ...)
tex.17.znakov <- scan("modules/mod_EVOLI/latexkosi/klima_17_znakov.tex", character(0), sep="\n", quiet=TRUE,encoding='UTF-8')
tex.glava <- gsub(pattern='!organisation!', replacement=Hmisc::latexTranslate(organisation), x=tex.glava) # Organisation name
tex.glava <- gsub(pattern='!date!', replacement=Hmisc::latexTranslate(date), x=tex.glava) # Organisation name
tex.glava <- gsub(pattern='!date!', replacement=Hmisc::latexTranslate(date[1]), x=tex.glava) # Organisation name
tex.glava <- gsub(pattern='COMPANY NAME', replacement=Hmisc::latexTranslate(organisation), x=tex.glava, fixed = TRUE) # Organisation name
tex.glava <- gsub(pattern='!name!', replacement=Hmisc::latexTranslate(customer), x=tex.glava, fixed = TRUE) # Customer name
tex.noga <- scan("modules/mod_EVOLI/latexkosi/z-noga.tex", character(0), sep="\n", quiet=TRUE) # End latex document
@ -967,29 +965,8 @@ tex.izbor <- c(
tex.17.znakov,
tex.noga
)
# Compile PDF
setwd(paste(Rdirektorij, "modules/mod_EVOLI/results", sep="/")) # File folder
cat(unlist(tex.izbor), file=paste0("Klima-kakovosti.tex"), sep="\n") # Name of tex file
tools::texi2pdf(file=paste0("Klima-kakovosti.tex"), quiet=TRUE, clean=TRUE) # Pdf file
setwd(Rdirektorij)
} else {
# Če ni oddelkov to napiši
Rdirektorij <- getwd() # Get working diretory
# Compiling file
tex.izbor <- c(
"\\documentclass{article}
\\begin{document}
V podatkih manjka podatek za oddelek (ime oddelka). Prosimo preverite!
\\end{document}"
)
setwd(paste(Rdirektorij, "modules/mod_EVOLI/results", sep="/")) # File folder
cat(unlist(tex.izbor), file=paste0("Quality-climate.tex"), sep="\n") # Name of tex file
tools::texi2pdf(file=paste0("Quality-climate.tex"), quiet=TRUE, clean=TRUE) # Pdf file
setwd(Rdirektorij)
}

2
admin/survey/modules/mod_EVOLI/R/Evoli_teamship_meter_ang.R
View File

@ -77,7 +77,7 @@ data <- subset(data, skupina == ID)
# ?e oddelek nima podatka oziroma je manjkajo?a vrednost,
# ga odstranimo v izogib errorju pri izdelavi frekven?ne tabele
data <- subset(data, oddelek_ime != -1)
#data <- subset(data, oddelek_ime != -1)
# Izberemo samo koncane ankete
data <- subset(data, status == 6)

2
admin/survey/modules/mod_EVOLI/R/Evoli_teamship_meter_slo.R
View File

@ -83,7 +83,7 @@ if (data[1, 1] == ("Ustreznost") |
# Izberemo dokon?ane ankete skupine 1 in odstranimo podatke brez oddelka
data <- data %>%
subset(skupina == ID) %>%
subset(oddelek_ime != -1) %>%
# subset(oddelek_ime != -1) %>%
subset(status == 6)
# Odstranimo vrstice, ki vsebujejo vrednosti neveljavnih odgovorov (od -1 do -5)

2
admin/survey/modules/mod_EVOLI/latexkosi/drugi_del-quality_clime_ang.tex
View File

@ -398,7 +398,7 @@ of organisational systems and policies.
and online diagnostic tools to companies and organisations worldwide to enable them \\
to achieve long-lasting results at the personal, team and organisational levels. }
\end{center}
\\ \\
\ \\ \\
\begin{center}
{\small Claus M{\o}ller Consulting helps organisations to measure, improve and manage \\
productivity, relationships, quality, and leadership}.

2
admin/survey/modules/mod_EVOLI/latexkosi/glava-evoli_klima_slo.tex
View File

@ -734,7 +734,7 @@ samodisciplino".
\begin{center}
{\large \textbf{Kako uporabite orodje za posameznika}}
\end{center}
\\
\ \\
\renewcommand\labelitemi{\large$\bullet$}
\begin{itemize}
\item Vsak član tima mora pazljivo pregledati svoje lastne odgovore \\

2
admin/survey/modules/mod_EVOLI/latexkosi/glava-quality_clime_ang.tex
View File

@ -674,7 +674,7 @@ strengthen your self-discipline''.
\begin{center}
{\large \textbf{How the individual can use the tool}}
\end{center}
\\
\ \\
\renewcommand\labelitemi{\large$\bullet$}
\begin{itemize}
\item Every employee should carefully study the \textit{Quality Climate} \\

8
frontend/drupal/sites/all/modules/prijava_1ka/prijava_1ka.module
View File

@ -229,7 +229,7 @@ function prijava_1ka_block_view($delta = '')
$html = '';
// Modul izpišemo samo če uporabnik ni prijavljen
if(empty($_COOKIE['unam'])) {
$html = '<div class="rexister-modal" id="modal-lost-password">
$html = '<div class="rexister-modal" id="modal-lost-password" data-clarity-mask="True" >
<div class="modal-box"><img src="/d/sites/all/themes/nova1ka/img/ikone/zapri.svg" class="closemodal">';
// Naslov
@ -283,7 +283,7 @@ function prijava_1ka_block_view($delta = '')
$html = '';
// Modul izpišemo samo če uporabnik ni prijavljen
if(empty($_COOKIE['unam'])) {
$html = '<div class="rexister-modal" id="modal-lost-password-activate">
$html = '<div class="rexister-modal" id="modal-lost-password-activate" data-clarity-mask="True">
<div class="modal-box"><img src="/d/sites/all/themes/nova1ka/img/ikone/zapri.svg" class="closemodal">';
// Naslov
@ -340,7 +340,7 @@ function prijava_1ka_block_view($delta = '')
$html = '';
// Modul izpišemo samo če uporabnik ni prijavljen
if(empty($_COOKIE['unam'])) {
$html = '<div class="rexister-modal" id="modal-other-login">
$html = '<div class="rexister-modal" id="modal-other-login" data-clarity-mask="True">
<div class="modal-box"><img src="/d/sites/all/themes/nova1ka/img/ikone/zapri.svg" class="closemodal">';
// Naslov
@ -497,7 +497,7 @@ function prijava_1ka_block_view($delta = '')
}else {
$html_user = '<div class="block-prijava-iskanje"><span id="iskanje"><img alt="' . $lang['cms_search'] . '" src="/d/sites/all/themes/nova1ka/img/ikone/iskanje.svg" style="height:18px; width:19px" /></span>';
$html_user .= '<span class="only-pc">';
$html_user .= '<span class="only-pc" data-clarity-mask="True">';
// Izpišemo podaztke o registriranem uporabniku ali možnost za prijavo
if (!empty($_COOKIE['unam'])) {
$html_user .= '| <div id="user-1ka"><span class="user-name">' . base64_decode($_COOKIE['unam']) . '<span class="arrow-down"></span></span>';

2
frontend/drupal/sites/all/themes/pro1ka/css/pro1ka_compiled.css
View File

File diff suppressed because one or more lines are too long

2
frontend/drupal/sites/all/themes/pro1ka/css/pro1ka_custom.css
View File

@ -720,7 +720,7 @@ li.search-result:hover {
}
.poslovni-uporabniki.paketi .compare-descr{
min-height: 120px;
min-height: 168px;
}

2
frontend/drupal/sites/all/themes/pro1ka/sass/parts/nakup-paketa.scss
View File

@ -59,7 +59,7 @@
.poslovni-uporabniki.paketi {
.compare-descr {
min-height: 120px;
min-height: 168px;
}
}

2
frontend/drupal/sites/all/themes/pro1ka/sass/parts/prijava-registracija.scss
View File

@ -73,6 +73,7 @@
&.gumb-aai{
background: #e35205;
letter-spacing: 0.5px;
&:hover{
background: #fa6c21;
@ -104,6 +105,7 @@
.gumb-aai{
background: #e35205;
letter-spacing: 0.5px;
&:hover{
background: #fa6c21;

137
frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-cenik-poslovni-uporabniki.tpl.php
View File

@ -49,27 +49,27 @@ global $language;
<div class="compare-col">
<div class="ct">
<?php if ($language->language == 'sl'): ?>
Virtualna domena
PAKET 1KA PRO
<?php else: ?>
Virtual domain
PACKAGE 1KA PRO
<?php endif; ?>
</div>
</div>
<div class="compare-col">
<div class="ct">
<?php if ($language->language == 'sl'): ?>
Lastna inštalacija na 1KA strežniku
PAKET 2KA PRO
<?php else: ?>
Own installation on 1KA server
PACKAGE 2KA PRO
<?php endif; ?>
</div>
</div>
<div class="compare-col">
<div class="ct">
<?php if ($language->language == 'sl'): ?>
Namestitev na lastnem strežniku
PAKET 3KA PO MERI
<?php else: ?>
Installation on your own server
PACKAGE 3KA CUSTOM
<?php endif; ?>
</div>
</div>
@ -78,8 +78,21 @@ global $language;
<div class="compare-col leftcol compare-toggle-btn">
<div class="collapse-row razpri-zapri-vse">
<div class="zapri-razpri">
<a href="#" class="razpri">Expand</a>
<a href="#" class="zapri">Close</a> all
<a href="#" class="razpri">
<?php if ($language->language == 'sl'): ?>
Razpri
<?php else: ?>
Expand
<?php endif; ?>
</a>
<a href="#" class="zapri">
<?php if ($language->language == 'sl'): ?>
Zapri
<?php else: ?>
Close
<?php endif; ?>
</a>
<?php print ($language->language == 'sl' ? 'vse' : 'all'); ?>
</div>
<img src="/tema1ka/svg/icons8-chevron-down.svg" alt="" class="puscica">
</div>
@ -89,13 +102,13 @@ global $language;
<?php if ($language->language == 'sl'): ?>
<div class="price-paket">330 € / leto</div>
<p class="compare-descr">
Ažurni procesi, potekajo na isti matični 1KA namestitvi. Stalna profesionalna strežniška podpora.
Virtualna domena White label rešitev za manjše organizacije. Ažurni procesi, potekajo na isti matični 1KA namestitvi. Stalna profesionalna strežniška podpora.
</p>
<a href="/d/sl/narocilo-poslovni-uporabniki/virtualna-domena" class="cta w-button">Naročilo</a>
<?php else: ?>
<div class="price-paket">330 € / year</div>
<p class="compare-descr">
Up-to-date processes take place on the same parent 1KA installation. Constant professional server support.
Virtual Domain White label solution for smaller organizations. Update processes take place on the same 1KA home installation. Ongoing professional server support.
</p>
<a href="/d/en/business-purchase/virtual-domain" class="cta w-button">Order</a>
<?php endif; ?>
@ -106,12 +119,12 @@ global $language;
<?php if ($language->language == 'sl'): ?>
<div class="price-paket">450 € / leto</div>
<p
class="compare-descr">Lastna inštalacija, lastna baza. Dostop do sistemskih nastavitev, nadzor nad uporabniki.</p>
class="compare-descr">Lastna inštalacija, lastna baza. Rešitev za večje organizacije. Dostop do sistemskih nastavitev, nadzor nad uporabniki.</p>
<a href="/d/sl/narocilo-poslovni-uporabniki/lastna-domena" class="cta w-button">Naročilo</a>
<?php else: ?>
<div class="price-paket">450 € / year</div>
<p
class="compare-descr">Own installation, own base. Access to system settings, user control.</p>
class="compare-descr">Own installation, own base. A solution for larger organizations. Access to system settings, user control.</p>
<a href="/d/en/business-purchase/own-installation-1ka" class="cta w-button">Order</a>
<?php endif; ?>
@ -119,15 +132,16 @@ global $language;
<div class="compare-col">
<?php if ($language->language == 'sl'): ?>
<div class="price-paket">BREZPLAČNA NAMESTITEV</div>
<div class="price-paket">PO DOGOVORU</div>
<p
class="compare-descr">Popolna kontrola pri zagotavljanju tehnične varnosti in urejanju dostopa uporabnikom. </p>
<a href="/d/sl/narocilo-poslovni-uporabniki/lastna-instalacija" class="cta w-button">Naročilo</a>
class="compare-descr">Izbira za podjetja, ki iščejo rešitev po meri. Izberite tip inštalacije, število uporabnikov in druge prilagoditve. Za individualizirano podporo nas kontaktirajte.
</p>
<a href="https://www.1ka.si/1KAPROcustom" class="cta w-button">Kontaktirajte nas</a>
<?php else: ?>
<div class="price-paket">FREE INSTALLATION</div>
<p
class="compare-descr">Full control over access, both in terms of persons having access and in terms of ensuring technical security.</p>
<a href="/d/en/business-purchase/own-installation" class="cta w-button">Order</a>
class="compare-descr">The choice for companies looking for a custom solution. Select installation type, number of users and other adjustments. Contact us for individualized support.</p>
<a href="https://www.1ka.si/1KAPROcustom?language=2" class="cta w-button">Contact us</a>
<?php endif; ?>
</div>
@ -174,21 +188,21 @@ global $language;
</div>
<div class="compare-col"><img src="/tema1ka/svg/icons8-checkmark-3.svg" alt="" class="compare-icon"></div>
<div class="compare-col"><img src="/tema1ka/svg/icons8-checkmark-3.svg" alt="" class="compare-icon"></div>
<div class="compare-col"></div>
<div class="compare-col"><img src="/tema1ka/svg/icons8-checkmark-3.svg" alt="" class="compare-icon"></div>
</div>
<div class="compare-row">
<div class="compare-col leftcol">
<div class="cd">
<?php if ($language->language == 'sl'): ?>
Vključen SSL protokol
Vključen TLS protokol
<?php else: ?>
SSL protocol included
TLS protocol included
<?php endif; ?>
</div>
</div>
<div class="compare-col"><img src="/tema1ka/svg/icons8-checkmark-3.svg" alt="" class="compare-icon"></div>
<div class="compare-col"><img src="/tema1ka/svg/icons8-checkmark-3.svg" alt="" class="compare-icon"></div>
<div class="compare-col"></div>
<div class="compare-col"><img src="/tema1ka/svg/icons8-checkmark-3.svg" alt="" class="compare-icon"></div>
</div>
<div class="compare-row">
<div class="compare-col leftcol">
@ -210,21 +224,29 @@ global $language;
(additional upgrade 100 €)
<?php endif; ?>
</div>
<div class="compare-col"></div>
<div class="compare-col">
<?php if ($language->language == 'sl'): ?>
Na zahtevo naročnika <br/>
(dodatna nadgradnja 100€)
<?php else: ?>
At the request of the client<br/>
(additional upgrade 100 €)
<?php endif; ?>
</div>
</div>
<div class="compare-row">
<div class="compare-col leftcol">
<div class="cd">
<?php if ($language->language == 'sl'): ?>
Gostovanje lastne inštalacije na strežniku 1KA
Lokacija strežnika
<?php else: ?>
Hosting your own installation on 1KA server
Server location
<?php endif; ?>
</div>
</div>
<div class="compare-col"></div>
<div class="compare-col"><img src="/tema1ka/svg/icons8-checkmark-3.svg" alt="" class="compare-icon"></div>
<div class="compare-col"></div>
<div class="compare-col">1KA</div>
<div class="compare-col">1KA</div>
<div class="compare-col">1KA</div>
</div>
<div class="compare-row">
<div class="compare-col leftcol">
@ -244,7 +266,13 @@ global $language;
At the request of the client 100 €
<?php endif; ?>
</div>
<div class="compare-col"></div>
<div class="compare-col">
<?php if ($language->language == 'sl'): ?>
Na zahtevo naročnika 100€
<?php else: ?>
At the request of the client 100 €
<?php endif; ?>
</div>
</div>
</div>
</div>
@ -292,7 +320,13 @@ global $language;
</div>
<div class="compare-col">manager</div>
<div class="compare-col">administrator</div>
<div class="compare-col">administrator</div>
<div class="compare-col">
<?php if ($language->language == 'sl'): ?>
po meri
<?php else: ?>
custom
<?php endif; ?>
</div>
</div>
<div class="compare-row">
<div class="compare-col leftcol">
@ -306,28 +340,23 @@ global $language;
</div>
<div class="compare-col">
<?php if ($language->language == 'sl'): ?>
Neomejeno
5 uporabnikov
<?php else: ?>
Unlimited
<?php endif; ?>
<?php //if ($language->language == 'sl'): ?>
<!-- 5 <br/> (10 € / mesec za vsak dodaten uporabniški račun)-->
<?php //else: ?>
<!-- 5 <br/> (10 € / month for each additional user account)-->
<?php //endif; ?>
</div>
<div class="compare-col">
<?php if ($language->language == 'sl'): ?>
Neomejeno
<?php else: ?>
Unlimited
5 users
<?php endif; ?>
</div>
<div class="compare-col">
<?php if ($language->language == 'sl'): ?>
Neomejeno
neomejeno
<?php else: ?>
Unlimited
unlimited
<?php endif; ?>
</div>
<div class="compare-col">
<?php if ($language->language == 'sl'): ?>
po meri
<?php else: ?>
custom
<?php endif; ?>
</div>
</div>
@ -395,19 +424,7 @@ global $language;
</div>
<div class="compare-col"><img src="/tema1ka/svg/icons8-checkmark-3.svg" alt="" class="compare-icon"></div>
<div class="compare-col"><img src="/tema1ka/svg/icons8-checkmark-3.svg" alt="" class="compare-icon"></div>
<div
class="compare-col">
<?php if ($language->language == 'sl'): ?>
Posredovanje navodil in datotek za samostojno inštalacijo brezplačno, pomoč pri inštalaciji<br/>
50 € / uro <br/>
(75 € / uro na lokaciji naročnika).
<?php else: ?>
Providing free installation manuals and files for your own installation, installation assistance<br/>
50 € / hour <br />
(75 € / hour at the client's location).
<?php endif; ?>
</div>
<div class="compare-col"><img src="/tema1ka/svg/icons8-checkmark-3.svg" alt="" class="compare-icon"></div>
</div>
</div>
</div>
@ -418,9 +435,9 @@ global $language;
<div class="container">
<div class="col veljavnost-cenika">
<?php if ($language->language == 'sl'): ?>
Cenik velja od 2. 7. 2020. Pridržujemo si pravico do spremembe brez obvestila. Vse cene so v EUR in brez DDV.
Cenik velja od 5. 12. 2020. Pridržujemo si pravico do spremembe brez obvestila. Vse cene so v EUR in brez DDV.
<?php else: ?>
The price list is valid from July 2, 2020. We reserve the right to change without notice. All prices are in EUR and exclude VAT.
The price list is valid from December 5, 2020. We reserve the right to change without notice. All prices are in EUR and exclude VAT.
<?php endif; ?>
</div>
</div>

84
frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-kosarica.tpl.php
View File

@ -1,6 +1,6 @@
<?php global $language; ?>
<div id="nakup-1ka" class="nakup-1ka">
<div id="nakup-1ka" class="nakup-1ka" data-clarity-mask="True">
<div class="header">
<div class="center">
<?php if ($language->language == 'sl'): ?>
@ -577,7 +577,7 @@
<!-- Predogled naročila -->
<div id="predogled-nakupa-1ka" class="nakup-1ka">
<div id="predogled-nakupa-1ka" class="nakup-1ka" data-clarity-mask="True">
<div class="header">
<div class="center">
<?php if ($language->language == 'sl'): ?>
@ -613,7 +613,7 @@
<?php endif; ?>
<span id="forma-email">/</span>
</div>
<div class="col podatki-za-placilo-racuna">
<div class="col podatki-za-placilo-racuna" data-clarity-mask="True">
<?php if ($language->language == 'sl'): ?>
Ime in priimek:
<?php else: ?>
@ -621,7 +621,7 @@
<?php endif; ?>
<span id="forma-ime">/</span>
</div>
<div class="col" style="display: none;" id="col-forma-telefon">
<div class="col" style="display: none;" id="col-forma-telefon" data-clarity-mask="True">
<?php if ($language->language == 'sl'): ?>
Telefon:
<?php else: ?>
@ -629,13 +629,13 @@
<?php endif; ?>
<span id="forma-telefon">/</span>
</div>
<div class="col" id="col-forma-d-drzava">
<div class="col" id="col-forma-d-drzava" data-clarity-mask="True">
<?php if ($language->language == 'sl'): ?>
Država:
<?php else: ?>
Country:
<?php endif; ?>
<span id="forma-d-drzava">/</span>
<span id="forma-d-drzava" data-clarity-mask="True">/</span>
</div>
<!-- Račun na podjetje -->
@ -646,7 +646,7 @@
<?php else: ?>
Company name:
<?php endif; ?>
<span id="forma-p-naziv">/</span>
<span id="forma-p-naziv" data-clarity-mask="True">/</span>
</div>
<!-- <div class="col">-->
<!-- --><?php //if ($language->language == 'sl'): ?>
@ -671,8 +671,8 @@
<?php else: ?>
Address:
<?php endif; ?>
<span id="forma-d-naslov"></span>, <span id="forma-d-postna-st"></span> <span
id="forma-d-posta-ime"></span>
<span id="forma-d-naslov" data-clarity-mask="True"></span>, <span id="forma-d-postna-st" data-clarity-mask="True"></span> <span
id="forma-d-posta-ime" data-clarity-mask="True"></span>
</div>
</div>
@ -682,7 +682,7 @@
<?php else: ?>
Payment method:
<?php endif; ?>
<span id="forma-nacin-placila">/</span>
<span id="forma-nacin-placila" data-clarity-mask="True">/</span>
</div>
<div class="col cena-brez-popusta-sklop">
@ -701,72 +701,8 @@
<?php endif; ?>
</div>
<!-- <div class="col placilo-kartica">-->
<!-- <h5>-->
<!-- --><?php //if ($language->language == 'sl'): ?>
<!-- Kreditna kartica-->
<!-- --><?php //else: ?>
<!-- Credit card-->
<!-- --><?php //endif; ?>
<!-- </h5>-->
<!---->
<!-- <form id="form-stripe-placilo" method="post">-->
<?php include($_SERVER["DOCUMENT_ROOT"].'/settings_optional.php'); ?>
<input type="hidden" id="stripe-token" name="stripe-token" value="<?php printf($stripe_key); ?>" />
<!---->
<!-- <input type="hidden" name="stripe-robotsko-narocilo" value="" />-->
<!---->
<!-- <div class="w-clearfix">-->
<!-- <div class="col _3-3-3-12">-->
<!-- <input type="text"-->
<!-- id="stripe-name"-->
<!-- class="input-field w-input"-->
<!-- name="name"-->
<!-- placeholder=" --><?php //printf ($language->language == 'sl' ? 'Ime uporabnika kartice' : 'Card Holder Name'); ?><!--" required="required">-->
<!-- </div>-->
<!-- </div>-->
<!---->
<!-- <div class="w-clearfix">-->
<!-- <div class="col _3-3-3-12">-->
<!-- <input type="text"-->
<!-- id="stripe-card-number"-->
<!-- class="input-field w-input"-->
<!-- name="card-number"-->
<!-- placeholder="--><?php //printf ($language->language == 'sl' ? 'Številka kartice' : 'Card Number'); ?><!--" required="required">-->
<!-- </div>-->
<!-- </div>-->
<!---->
<!-- <div class="w-clearfix">-->
<!-- <div class="col _3-3-3-12 kreditna-mesec-cvc">-->
<!-- <div>-->
<!-- <label>--><?php //printf ($language->language == 'sl' ? 'Mesec / Leto izteka' : 'Expiry Month / Year'); ?><!--</label>-->
<!-- <span id="userEmail-info" class="info"></span>-->
<!-- <select name="month" id="stripe-month" class="input-field w-input">-->
<!-- --><?php //for($i=1; $i < 13; $i++): ?>
<!-- <option value="--><?php //printf("%02d", $i); ?><!--">--><?php //printf("%02d", $i); ?><!--</option>-->
<!-- --><?php //endfor; ?>
<!-- </select>-->
<!---->
<!-- <select name="year" id="stripe-year" class="input-field w-input">-->
<!-- --><?php //for($i=0; $i < 10; $i++): ?>
<!-- <option value="--><?php //echo date('y') + $i; ?><!--">--><?php //echo date('Y') + $i; ?><!--</option>-->
<!-- --><?php //endfor; ?>
<!-- </select>-->
<!---->
<!-- </div>-->
<!-- <div>-->
<!-- <label>CVC</label>-->
<!-- <span id="cvv-info" class="info"></span>-->
<!-- <input type="number" maxlength="3" name="cvc" id="stripe-cvc"-->
<!-- class="input-field w-input">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </form>-->
<!-- <div id="stripe-error-message"></div>-->
<!-- </div>-->
</div>

2
frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-narocilo-poslovni-uporabniki-lastna-instalacija.tpl.php
View File

@ -1,6 +1,6 @@
<?php global $language; ?>
<div id="nakup-1ka-poslovni-uporabniki" class="nakup-1ka padding-1">
<div id="nakup-1ka-poslovni-uporabniki" class="nakup-1ka padding-1" data-clarity-mask="True">
<div class="w-form">
<form id="narocilo-poslovni-uporabniki" METHOD="post">

2
frontend/drupal/sites/all/themes/pro1ka/templates/nakupovanje-1ka-narocilo-poslovni-uporabniki-virtualna-domena.tpl.php
View File

@ -1,6 +1,6 @@
<?php global $language; ?>
<div id="nakup-1ka-poslovni-uporabniki" class="nakup-1ka padding-1">
<div id="nakup-1ka-poslovni-uporabniki" class="nakup-1ka padding-1" data-clarity-mask="True">
<div class="w-form">
<form id="narocilo-poslovni-uporabniki" METHOD="post">

2
frontend/drupal/sites/all/themes/pro1ka/templates/page.tpl.php
View File

@ -49,7 +49,7 @@
<?php endif; ?>
<?php if (! empty($_COOKIE['unam'])): ?>
<li class="nav-li-a">
<li class="nav-li-a" data-clarity-mask="True">
<a href="#" id="submenu-login"><?php print base64_decode($_COOKIE['unam']); ?><span
class="arrow-down"></span></a>
<div id="user-menu">

8
lang/1.php
View File

@ -1640,8 +1640,8 @@ $lang = array (
"cms_login_module_title" => '<span class="strong">PRIJAVA</span> in <br /><span class="strong">REGISTRACIJA</span>',
"cms_login_title" => 'Prijava uporabnika 1KA',
"cms_aai_login_redirect_text" => '<b>Študenti, raziskovalci, učitelji</b> in drugi z <b>ArnesAAI računom</b> se lahko prijavite na <a href="https://1ka.arnes.si">1KA.ARNES.SI</a>, kjer lahko <b>brezplačno in neomejeno uporabljate vse napredne 1KA nastavitve</b>.',
"cms_aai_login_redirect_text_2" => 'Na <b>1KA.ARNES.SI</b> se prijavite z vašim »uporabniškim imenom ArnesAAI«, ki ga dobite od organizacije, kjer ste zaposleni ali se izobražujete. Običajno ima obliko <b>uporabnik@domenaorganizacije.si</b>.',
"cms_aai_login_redirect_text_3" => '<b>Študenti Univerze v Ljubljani</b> ste ob začetku študija prejeli <b>avtomatsko dodeljen AAI račun (digitalna identiteta na UL)</b>. Za prijavo uporabite <b>uporabniško ime (npr. up1234@student.uni-lj.si)</b> in geslo vaše digitalne identitete na UL.',
"cms_aai_login_redirect_text_2" => 'Na <b>1KA.ARNES.SI</b> se prijavite z vašim »uporabniškim imenom ArnesAAI«, <b>ki ga že uporabljate oziroma imate v organizaciji</b>, kjer ste zaposleni ali se izobražujete. Običajno ima obliko <b>uporabnik@domenaorganizacije.si</b>.',
"cms_aai_login_redirect_text_3" => '<b>Študenti Univerze v Ljubljani</b> ste ob začetku študija prejeli avtomatsko dodeljen AAI račun (digitalna identiteta na UL). Za prijavo uporabite uporabniško ime (npr. up1234@student.uni-lj.si) in geslo vaše <b>digitalne identitete na UL</b>.',
"cms_aai_login_redirect_text_4" => 'V primeru nejasnosti si lahko ogledate pogosta vprašanja glede:<ul><li>pridobivanja in delovanja <a href="https://www.arnes.si/pomoc-uporabnikom/aai/odgovori-na-pogosto-zastavljena-vprasanja/">AAI računa</a>,</li><li>uporabe 1KA z <a href="https://www.1ka.si/d/sl/pomoc/pogosta-vprasanja/pogosta-vprasanja-o-zasebni-poslovni-aai-uporabi-orodja-1ka">ARNES AAI računom (digitalno identiteto)</a>.</li></ul>',
"cms_aai_login_redirect_button" => 'Prijava na 1ka.arnes.si',
"cms_buy_login_description" => 'Za nadaljevanje nakupa morate biti najprej prijavljeni v 1KA sistem.',
@ -6494,9 +6494,9 @@ $lang = array (
'login_with_account' => 'Prijavi se z ra&#269;unom',
'login_with_google' => 'Gmail prijava',
'login_with_facebook' => 'Facebook prijava',
'login_with_aai' => 'AAI prijava',
'login_with_aai' => 'ARNES AAI-prijava',
'login_with_aai_title' => 'PRIJAVA Z AAI NA 1KA.ARNES.SI ZA BREZPLAČNO NEOMEJENO UPORABO 1KA',
'login_with_aai_small_text' => '<b>Študenti, raziskovalci, učitelji</b> 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_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_yahoo' => 'Prijava z Yahoo ra&#269;unom',
'login_with_msn' => 'Prijava z MSN ra&#269;unom',
'login_register' => 'Registrirajte se',

2
lang/2.php
View File

@ -6377,7 +6377,7 @@ $lang = array (
'login_with_account' => 'Login with account',
'login_with_google' => 'Gmail account',
'login_with_facebook' => 'Facebook account',
'login_with_aai' => 'AAI-account',
'login_with_aai' => 'ARNES AAI-account',
'login_with_aai_title' => 'REGISTRATION WITH AAI ON 1KA.ARNES.SI FOR FREE UNLIMITED USE OF 1KA',
'login_with_aai_small_text' => '<b>Students, researchers, teachers</b> and others with AAI access can sign up for <b> free use </b> of all 1KA functionality with their <b> existing AAI account </b> or <b> digital identity </b>.',
'login_with_yahoo' => 'Login with Yahoo account',