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

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
pero1203 2022-03-25 11:32:38 +01:00
commit 9a95e455d8
18 changed files with 829 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
admin/survey/SurveyAdminAjax.php
View File

@ -6741,7 +6741,7 @@ class SurveyAdminAjax {
$code = '<a href="'.SurveyInfo::getSurveyLink().'">'.$lang['srv_complete_survey'].'</a>';
echo '<h2><span class="fa-brands red html5">'.$lang['srv_anketa_href'].'</h2>';
echo '<h2><span class="fa-brands red html5"></span>'.$lang['srv_anketa_href'].'</h2>';
echo '<div class="popup_content publish">';
echo '<textarea onclick="this.select();" readonly>';
@ -6755,7 +6755,7 @@ class SurveyAdminAjax {
$code = '<a href="'.SurveyInfo::getSurveyLink().'">'.$lang['srv_complete_survey'].'</a><img src="'.$site_url.'main/survey/view_count.php?a='.$this->anketa.'" style="display:none"/>';
echo '<h2><span class="fa-brands red html5">'.$lang['srv_anketa_href_count'].'</h2>';
echo '<h2><span class="fa-brands red html5"></span>'.$lang['srv_anketa_href_count'].'</h2>';
echo '<div class="popup_content publish">';
echo '<textarea onclick="this.select();" readonly>';
@ -6765,6 +6765,18 @@ class SurveyAdminAjax {
echo '</div>';
break;
case 'QR':
$img = 'classes/phpqrcode/imgs/code'.$this->anketa.'.png';
QRcode::png(SurveyInfo::getSurveyLink(), $img, 'L', 4, 2);
echo '<h2><span class="faicon fa-qrcode"></span>'.$lang['srv_anketa_href_friends'].'</h2>';
echo '<div class="popup_content publish qr">';
echo '<img src="'.$site_url.'admin/survey/'.$img.'">';
echo '</div>';
break;
case 'iframejs':
$code = SurveyAdmin::getEmbed();
@ -6772,7 +6784,8 @@ class SurveyAdminAjax {
echo '<h2><span class="faicon fa-window-maximize"></span>'.$lang['srv_anketa_href_ijs'].'</h2>';
echo '<div class="popup_content publish">';
echo '<textarea onclick="this.select();" readonly>';
echo '<p class="bottom16">'.$lang['srv_anketa_href_ijs_text2'].'</p>';
echo '<textarea class="iframe" onclick="this.select();" readonly>';
echo $code;
echo '</textarea>';
@ -6786,6 +6799,7 @@ class SurveyAdminAjax {
echo '<h2><span class="faicon fa-window-maximize empty"></span>'.$lang['srv_anketa_href_inojs'].'</h2>';
echo '<div class="popup_content publish">';
echo '<p class="bottom16">'.$lang['srv_anketa_href_inojs_text2'].'</p>';
echo '<textarea onclick="this.select();" readonly>';
echo $code;
echo '</textarea>';
@ -6794,6 +6808,7 @@ class SurveyAdminAjax {
break;
case 'settings': // še v delu
$d = new Dostop();
echo '<h2><span class="faicon wheel_32 blue"></span>'.$lang['srv_publication_survey_settings'].'</h2>';
@ -7149,19 +7164,17 @@ class SurveyAdminAjax {
echo '</div>';
}
echo '</div>';
break;
}
echo '<div class="button_holder">';
if ($name != 'settings') {
echo '<button class="medium white-blue" onclick="popupClose(); return false;">'.$lang['srv_zapri'].'</button>';
echo '<button class="medium blue" onclick="CopyToClipboard(\'copy_link_v_delu_@TG\'); actionNotePopup(\'link_copied\', \'success\'); popupClose(); return false;">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
if ($name == 'settings' || $name == 'QR') {
echo '<button class="medium blue" id="'.$name.'" onclick="popupClose(); return false;">'.$lang['srv_zapri'].'</button>';
}
else {
echo '<button class="medium blue" onclick="popupClose(); return false;">'.$lang['srv_zapri'].'</button>';
echo '<button class="medium white-blue" onclick="popupClose(); return false;">'.$lang['srv_zapri'].'</button>';
echo '<button class="medium blue" onclick="CopyToClipboard(\''.$code.'\'); actionNotePopup(\'link_copied\', \'success\'); popupClose(); return false;">'.$lang['srv_diagnostika_testiranje_copy'].'</button>';
}
echo '</div>';
}

11
admin/survey/SurveyAdminSettings.php
View File

@ -2569,7 +2569,7 @@ class SurveyAdminSettings {
$this->niceUrlSettings();
// Več načinov deljenja ankete
echo '<div class="title"><div class="title_icon"><span class="faicon edit_square empty"></span></div><h2>'.$lang['srv_publication_survey_more'].'</h2></div>';
echo '<div class="title"><div class="title_icon"><span class="faicon share-arrow"></span></div><h2>'.$lang['srv_publication_survey_more'].'</h2></div>';
echo '<div class="more">';
@ -2600,21 +2600,20 @@ class SurveyAdminSettings {
echo $lang['srv_anketa_href_count_text'];
echo '</div>';
//Delite s prijatelji
echo '<div class="more_block">';
//QR koda
echo '<div class="more_block" onclick="publishPopupOpen(\'QR\');">';
echo '<div class="more_title">';
echo '<div class="more_title_icon"><span class="faicon fa-qrcode"></span></div>';
echo $lang['srv_anketa_href_friends'];
echo '</div>';
echo $lang['srv_anketa_href_friends_text'];
echo '<a href="https://www.addthis.com/bookmark.php?v=250" class="addthis_button_compact" addthis:url="SurveyInfo::getSurveyLink()" addthis:title="$row[\'akronim\']">friend share</a>';
echo '</div>';
// iFrame - js
echo '<div class="more_block" onclick="publishPopupOpen(\'iframejs\');">';
echo '<div class="more_title">';
echo '<div class="more_title_icon"><span class="faicon fa-window-maximize"></span></div>';
echo $lang['srv_anketa_href_ijs'].Help :: display('srv_embed_js');
echo $lang['srv_anketa_href_ijs'];
echo '</div>';
echo $lang['srv_anketa_href_ijs_text'];
echo '</div>';
@ -2623,7 +2622,7 @@ class SurveyAdminSettings {
echo '<div class="more_block" onclick="publishPopupOpen(\'iframenojs\');">';
echo '<div class="more_title">';
echo '<div class="more_title_icon"><span class="faicon fa-window-maximize empty"></span></div>';
echo $lang['srv_anketa_href_inojs'].Help :: display('srv_embed_fixed');
echo $lang['srv_anketa_href_inojs'];
echo '</div>';
echo $lang['srv_anketa_href_inojs_text'];
echo '</div>';

40
admin/survey/classes/class.Notifications.php
View File

@ -18,21 +18,32 @@ class Notifications {
public function display($tab=0){
global $admin_type, $global_user_id, $lang;
// Prikazemo poslana sporocila
if((isset($_GET['t']) && $_GET['t']=='sent') || $tab == 1){
echo '<div class="title">';
echo '<div class="title_icon"><span class="faicon inv_sent_1"></span></div>';
echo '<h2>'.$lang['srv_notifications_sent'].'</h2>';
echo '</div>';
echo '<div class="notifications_content">';
// Izpis vseh poslanih sporocil
if($admin_type == 0){
echo '<div class="notifications_content_left">';
echo '<div class="sent_list">';
$this->displaySentMessages();
echo '</div>';
echo '</div>';
// obrazec za posiljanje sporocil
$this->sendMessageForm();
}
else
echo $lang['srv_notifications_admin_alert'];
echo $lang['srv_notifications_admin_alert'];
echo '</div>';
}
// Prikazemo prejeta sporocila
else{
@ -42,8 +53,6 @@ class Notifications {
echo '<div id="message" style="display:none;"></div>';
}
echo '<div class="clr"></div>';
}
private function displayRecievedMessages($active=0){
@ -85,9 +94,7 @@ class Notifications {
private function displaySentMessages(){
global $admin_type, $global_user_id, $lang;
echo '<span class="bold">'.$lang['srv_notifications_sent'].':</span>';
// Napolnimo array poslanih sporocil
$sentMessages = array();
@ -103,11 +110,20 @@ class Notifications {
foreach($sentMessages as $message_id => $message){
//echo '<li '.($message['viewed'] == 0 ? ' class="unread"':'').'>';
echo '<li>';
echo '<div class="title_row">'; //sem noter pride v 2. fazi še oznaka, če je obvestilo ali sporočilo
echo '<div class="subject">';
echo $message['title'];
echo '</div>';
echo '<div class="date">';
echo $message['date'];
echo '</div>';
echo '</div>';
echo '<span class="bold">'.$message['title'].' <span class="italic">('.$message['date'].')</span></span>';
$text = strip_tags((strlen($message['text']) > 70) ? substr($message['text'], 0, 70).'...' : $message['text']);
echo '<br />'.$text;
$text = strip_tags((strlen($message['text']) > 60) ? substr($message['text'], 0, 60).'...' : $message['text']);
echo '<div class="content">';
echo $text;
echo '</div>';
// Gumb da se sporocilo razresi vsem (kot da so ga pregledali)
$sqlN = sisplet_query("SELECT message_id FROM srv_notifications WHERE message_id='".$message_id."' AND viewed='0'");

16
admin/survey/classes/class.SurveyAktivnost.php
View File

@ -166,7 +166,6 @@ class SurveyAktivnost{
echo ' </div>';
echo '</div>'; //div#dataSettingsCheckboxes
// Datum
echo '<div id="end">';
echo '<div class="dataSettingsBasic">';
@ -231,6 +230,21 @@ class SurveyAktivnost{
echo '</div>';
echo '</div>'; //div#dataSettingsCheckboxes_Date
// Klik izven razprith nastavitev - zapremo okno
echo '<script>
$(document).mouseup(function(e){
var container1 = $("#dataSettingsCheckboxes");
var container2 = $("#dataSettingsCheckboxes_Date");
if (!container1.is(e.target) && container1.has(e.target).length === 0){
$("#dataSettingsCheckboxes").addClass("displayNone");
}
if (!container2.is(e.target) && container2.has(e.target).length === 0){
$("#dataSettingsCheckboxes_Date").addClass("displayNone");
}
});
</script>';
echo '</div>'; // div.data_table_top_holder

6
lang/1.php
View File

@ -1901,12 +1901,14 @@ $lang = array (
"srv_anketa_href_text" => "Delite povezavo do ankete na vaši spletni strani.",
"srv_anketa_href_count" => "HTML koda s števcem ogledov",
"srv_anketa_href_count_text" => "Delite povezavo do ankete na vaši spletni strani in beležite število ogledov povezave na anketo. ",
"srv_anketa_href_friends" => "Delite s prijatelji",
"srv_anketa_href_friends_text" => "Delite povezavo do ankete s prijatelji na družbenih medijih (Facebook, Twitter, Linkedin, itd.)",
"srv_anketa_href_friends" => "QR koda",
"srv_anketa_href_friends_text" => "Delite povezavo do ankete s QR kodo.",
"srv_anketa_href_ijs" => "iFrame - JavaScript verzija",
"srv_anketa_href_ijs_text" => "Vdelajte anketo na vašo spletno stran, da lahko respondenti anketo rešujejo na vaši strani.",
"srv_anketa_href_ijs_text2" => "Tu lahko skopirate kodo vaše ankete (Javascript verzija) in jo vdelate v vašo spletno stran.",
"srv_anketa_href_inojs" => "iFrame - brez JavaScripta",
"srv_anketa_href_inojs_text" => "Vdelajte anketo na vašo spletno stran, da lahko respondenti anketo rešujejo na vaši strani.",
"srv_anketa_href_inojs_text2" => "Tu lahko skopirate kodo vaše ankete (verzija brez Javascript-a) in jo vdelate v vašo spletno stran.",
"srv_anketa_noactive_email" => "Ozna&#269;i anketo kot 'Email vabila''.",
"srv_anketa_setActive_email" => "aktiviraj 'Email vabila'",
"srv_anketa_active_email" => "Anketa je ozna&#269;ena kot 'Email vabila'.",

6
lang/2.php
View File

@ -1894,12 +1894,14 @@ $lang = array (
"srv_anketa_href_text" => "Share the link to the survey on your website.",
"srv_anketa_href_count" => "HTML code with view counter",
"srv_anketa_href_count_text" => "Share the link to the survey on your website and keep track of the number of views of the survey link. ",
"srv_anketa_href_friends" => "Share with friends",
"srv_anketa_href_friends_text" => "Share the link to the survey with your friends on social media (Facebook, Twitter, Linkedin, etc.)",
"srv_anketa_href_friends" => "QR code",
"srv_anketa_href_friends_text" => "Share the link to the survey with a QR code.",
"srv_anketa_href_ijs" => "iFrame - JavaScript version",
"srv_anketa_href_ijs_text" => "Embed the survey on your website so that respondents can complete the survey on your website.",
"srv_anketa_href_ijs_text2" => "You can copy the code of your survey (Javascript version) and embed it into your own website.",
"srv_anketa_href_inojs" => "iFrame - without JavaScripta",
"srv_anketa_href_inojs_text" => "Embed the survey on your website so that respondents can complete the survey on your website.",
"srv_anketa_href_inojs_text2" => "You can copy the code of your survey (version without Javascript) and embed it into your own website.",
"srv_anketadelete" => "Delete survey",
"srv_anketarename_txt" => "Rename",
"srv_anketadelete_txt" => "Delete",

365
public/css/admin_new.css
View File

@ -5242,31 +5242,31 @@ span.faicon.yellow,
a.faicon.yellow,
span.fa-brands.yellow,
a.fa-brands.yellow {
color: #FFC700;
color: #FFC700 !important;
}
span.faicon.blue,
a.faicon.blue,
span.fa-brands.blue,
a.fa-brands.blue {
color: #1E88E5;
color: #1E88E5 !important;
}
span.faicon.red,
a.faicon.red,
span.fa-brands.red,
a.fa-brands.red {
color: #FF0000;
color: #FF0000 !important;
}
span.faicon.ultra_dark_gray,
a.faicon.ultra_dark_gray,
span.fa-brands.ultra_dark_gray,
a.fa-brands.ultra_dark_gray {
color: #555555;
color: #555555 !important;
}
span.faicon.green,
a.faicon.green,
span.fa-brands.green,
a.fa-brands.green {
color: #00C437;
color: #00C437 !important;
}
span.faicon.aslink,
a.faicon.aslink,
@ -6637,6 +6637,10 @@ span.faicon.arhiv_mail::before {
content: "";
}
span.faicon.share-arrow::before {
content: "\f14d";
}
/*
To change this license header, choose License Headers in Project Properties.
To change this template file, choose Tools | Templates
@ -6985,12 +6989,16 @@ a.help {
margin-block-start: 0;
}
.divPopUp h2 span.faicon,
.divPopUp .divPopUp_top span.faicon {
.divPopUp h2 span.fa-brands,
.divPopUp .divPopUp_top span.faicon,
.divPopUp .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
.divPopUp h2 span.faicon:before,
.divPopUp .divPopUp_top span.faicon:before {
.divPopUp h2 span.fa-brands:before,
.divPopUp .divPopUp_top span.faicon:before,
.divPopUp .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
.divPopUp p {
@ -7500,12 +7508,16 @@ body.waitlong #loading {
margin-block-start: 0;
}
#check_pogoji h2 span.faicon,
#check_pogoji .divPopUp_top span.faicon {
#check_pogoji h2 span.fa-brands,
#check_pogoji .divPopUp_top span.faicon,
#check_pogoji .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
#check_pogoji h2 span.faicon:before,
#check_pogoji .divPopUp_top span.faicon:before {
#check_pogoji h2 span.fa-brands:before,
#check_pogoji .divPopUp_top span.faicon:before,
#check_pogoji .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
#check_pogoji p {
@ -7673,12 +7685,16 @@ body.waitlong #loading {
margin-block-start: 0;
}
#dropped_alert h2 span.faicon,
#dropped_alert .divPopUp_top span.faicon {
#dropped_alert h2 span.fa-brands,
#dropped_alert .divPopUp_top span.faicon,
#dropped_alert .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
#dropped_alert h2 span.faicon:before,
#dropped_alert .divPopUp_top span.faicon:before {
#dropped_alert h2 span.fa-brands:before,
#dropped_alert .divPopUp_top span.faicon:before,
#dropped_alert .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
#dropped_alert p {
@ -7855,12 +7871,16 @@ body.waitlong #loading {
margin-block-start: 0;
}
#popup_user_access h2 span.faicon,
#popup_user_access .divPopUp_top span.faicon {
#popup_user_access h2 span.fa-brands,
#popup_user_access .divPopUp_top span.faicon,
#popup_user_access .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
#popup_user_access h2 span.faicon:before,
#popup_user_access .divPopUp_top span.faicon:before {
#popup_user_access h2 span.fa-brands:before,
#popup_user_access .divPopUp_top span.faicon:before,
#popup_user_access .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
#popup_user_access p {
@ -10798,12 +10818,16 @@ div#theme-edit-wrap div#theme-editor #picker .divPopUp_top {
margin-block-start: 0;
}
div#theme-edit-wrap div#theme-editor #picker h2 span.faicon,
div#theme-edit-wrap div#theme-editor #picker .divPopUp_top span.faicon {
div#theme-edit-wrap div#theme-editor #picker h2 span.fa-brands,
div#theme-edit-wrap div#theme-editor #picker .divPopUp_top span.faicon,
div#theme-edit-wrap div#theme-editor #picker .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
div#theme-edit-wrap div#theme-editor #picker h2 span.faicon:before,
div#theme-edit-wrap div#theme-editor #picker .divPopUp_top span.faicon:before {
div#theme-edit-wrap div#theme-editor #picker h2 span.fa-brands:before,
div#theme-edit-wrap div#theme-editor #picker .divPopUp_top span.faicon:before,
div#theme-edit-wrap div#theme-editor #picker .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
div#theme-edit-wrap div#theme-editor #picker p {
@ -11055,7 +11079,7 @@ div#vabila div.title {
display: flex;
flex-direction: row;
align-items: center;
margin-bottom: 24px;
margin-bottom: 16px;
margin-top: 48px;
}
div#vabila div.title:first-of-type {
@ -11122,6 +11146,7 @@ div#vabila div.button_holder div#nice_url_holder input {
}
div#vabila div.button_holder div#nice_url_holder button {
margin-right: 8px;
margin-left: 0;
}
div#vabila div#nice_url_error {
width: 100%;
@ -11153,7 +11178,7 @@ div#vabila div.more {
div#vabila div.more div.more_block {
height: auto;
width: 298px;
background-color: #F8F8F8;
background-color: #FFFFFF;
border: 1px solid #E5E5E5;
padding: 16px;
font-size: 14px;
@ -11161,7 +11186,7 @@ div#vabila div.more div.more_block {
transition: 0.2s;
}
div#vabila div.more div.more_block:hover {
background-color: #ebebeb;
background-color: #f2f2f2;
}
div#vabila div.more div.more_block div.more_title {
display: flex;
@ -11196,11 +11221,20 @@ div#vabila div.more div.more_block div.more_title a.help {
margin-left: 5px;
}
div.popup_content.publish textarea {
div#general_popup div.popup_content.publish {
max-width: 600px;
}
div#general_popup div.popup_content.publish textarea {
width: 568px;
padding: 8px;
display: block;
overflow: auto;
height: auto;
}
div#general_popup div.popup_content.publish textarea.iframe {
height: 155px;
}
div#general_popup div.popup_content.publish.qr {
display: flex;
justify-content: center;
}
.dashboard_top_settings {
@ -15194,12 +15228,16 @@ textarea#addusers, textarea#addusers_note {
margin-block-start: 0;
}
#vrednost_edit h2 span.faicon,
#vrednost_edit .divPopUp_top span.faicon {
#vrednost_edit h2 span.fa-brands,
#vrednost_edit .divPopUp_top span.faicon,
#vrednost_edit .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
#vrednost_edit h2 span.faicon:before,
#vrednost_edit .divPopUp_top span.faicon:before {
#vrednost_edit h2 span.fa-brands:before,
#vrednost_edit .divPopUp_top span.faicon:before,
#vrednost_edit .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
#vrednost_edit p {
@ -15382,12 +15420,16 @@ textarea#addusers, textarea#addusers_note {
margin-block-start: 0;
}
#calculation h2 span.faicon,
#calculation .divPopUp_top span.faicon {
#calculation h2 span.fa-brands,
#calculation .divPopUp_top span.faicon,
#calculation .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
#calculation h2 span.faicon:before,
#calculation .divPopUp_top span.faicon:before {
#calculation h2 span.fa-brands:before,
#calculation .divPopUp_top span.faicon:before,
#calculation .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
#calculation p {
@ -15617,12 +15659,16 @@ and open the template in the editor.
margin-block-start: 0;
}
#preview_spremenljivka h2 span.faicon,
#preview_spremenljivka .divPopUp_top span.faicon {
#preview_spremenljivka h2 span.fa-brands,
#preview_spremenljivka .divPopUp_top span.faicon,
#preview_spremenljivka .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
#preview_spremenljivka h2 span.faicon:before,
#preview_spremenljivka .divPopUp_top span.faicon:before {
#preview_spremenljivka h2 span.fa-brands:before,
#preview_spremenljivka .divPopUp_top span.faicon:before,
#preview_spremenljivka .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
#preview_spremenljivka p {
@ -16573,12 +16619,16 @@ dl.arch_email dd {
margin-block-start: 0;
}
#inv_view_arch_recipients h2 span.faicon,
#inv_view_arch_recipients .divPopUp_top span.faicon {
#inv_view_arch_recipients h2 span.fa-brands,
#inv_view_arch_recipients .divPopUp_top span.faicon,
#inv_view_arch_recipients .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
#inv_view_arch_recipients h2 span.faicon:before,
#inv_view_arch_recipients .divPopUp_top span.faicon:before {
#inv_view_arch_recipients h2 span.fa-brands:before,
#inv_view_arch_recipients .divPopUp_top span.faicon:before,
#inv_view_arch_recipients .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
#inv_view_arch_recipients p {
@ -17444,12 +17494,16 @@ and open the template in the editor.
margin-block-start: 0;
}
#div_export_setting_show h2 span.faicon,
#div_export_setting_show .divPopUp_top span.faicon {
#div_export_setting_show h2 span.fa-brands,
#div_export_setting_show .divPopUp_top span.faicon,
#div_export_setting_show .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
#div_export_setting_show h2 span.faicon:before,
#div_export_setting_show .divPopUp_top span.faicon:before {
#div_export_setting_show h2 span.fa-brands:before,
#div_export_setting_show .divPopUp_top span.faicon:before,
#div_export_setting_show .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
#div_export_setting_show p {
@ -19928,12 +19982,16 @@ and open the template in the editor.
margin-block-start: 0;
}
#dsp_inspect_cover h2 span.faicon,
#dsp_inspect_cover .divPopUp_top span.faicon {
#dsp_inspect_cover h2 span.fa-brands,
#dsp_inspect_cover .divPopUp_top span.faicon,
#dsp_inspect_cover .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
#dsp_inspect_cover h2 span.faicon:before,
#dsp_inspect_cover .divPopUp_top span.faicon:before {
#dsp_inspect_cover h2 span.fa-brands:before,
#dsp_inspect_cover .divPopUp_top span.faicon:before,
#dsp_inspect_cover .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
#dsp_inspect_cover p {
@ -20447,12 +20505,16 @@ input#endDate {
margin-block-start: 0;
}
.mc_table_settings h2 span.faicon,
.mc_table_settings .divPopUp_top span.faicon {
.mc_table_settings h2 span.fa-brands,
.mc_table_settings .divPopUp_top span.faicon,
.mc_table_settings .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
.mc_table_settings h2 span.faicon:before,
.mc_table_settings .divPopUp_top span.faicon:before {
.mc_table_settings h2 span.fa-brands:before,
.mc_table_settings .divPopUp_top span.faicon:before,
.mc_table_settings .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
.mc_table_settings p {
@ -20649,12 +20711,16 @@ input#endDate {
margin-block-start: 0;
}
#newMCTable h2 span.faicon,
#newMCTable .divPopUp_top span.faicon {
#newMCTable h2 span.fa-brands,
#newMCTable .divPopUp_top span.faicon,
#newMCTable .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
#newMCTable h2 span.faicon:before,
#newMCTable .divPopUp_top span.faicon:before {
#newMCTable h2 span.fa-brands:before,
#newMCTable .divPopUp_top span.faicon:before,
#newMCTable .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
#newMCTable p {
@ -20827,12 +20893,16 @@ input#endDate {
margin-block-start: 0;
}
#renameMCTable h2 span.faicon,
#renameMCTable .divPopUp_top span.faicon {
#renameMCTable h2 span.fa-brands,
#renameMCTable .divPopUp_top span.faicon,
#renameMCTable .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
#renameMCTable h2 span.faicon:before,
#renameMCTable .divPopUp_top span.faicon:before {
#renameMCTable h2 span.fa-brands:before,
#renameMCTable .divPopUp_top span.faicon:before,
#renameMCTable .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
#renameMCTable p {
@ -21005,12 +21075,16 @@ input#endDate {
margin-block-start: 0;
}
#deleteMCTable h2 span.faicon,
#deleteMCTable .divPopUp_top span.faicon {
#deleteMCTable h2 span.fa-brands,
#deleteMCTable .divPopUp_top span.faicon,
#deleteMCTable .divPopUp_top span.fa-brands {
margin-right: 6px;
color: #1E88E5;
}
#deleteMCTable h2 span.faicon:before,
#deleteMCTable .divPopUp_top span.faicon:before {
#deleteMCTable h2 span.fa-brands:before,
#deleteMCTable .divPopUp_top span.faicon:before,
#deleteMCTable .divPopUp_top span.fa-brands:before {
font-size: 14px;
}
#deleteMCTable p {
@ -22217,6 +22291,20 @@ div.page_diagnostics table#aktivnost_ankete_table td.graph_cell div.graph_cell .
height: 24px;
margin-right: 8px;
}
div.page_diagnostics table.aktivnost_paradata_table td.graph_cell {
width: 100%;
}
div.page_diagnostics table.aktivnost_paradata_table td.graph_cell div.graph_cell {
display: flex;
flex-direction: row;
}
div.page_diagnostics table.aktivnost_paradata_table td.graph_cell div.graph_cell .graph_full {
background-color: #1E88E5;
height: 16px;
margin-right: 8px;
}
div.page_diagnostics .time_span_container {
position: relative;
height: 160px;
@ -22333,18 +22421,199 @@ div.page_diagnostics .time_span.month_11 {
div.page_diagnostics .time_span.month_12 {
background-color: #4bacc6;
}
div.page_diagnostics table.aktivnost_paradata_table td.graph_cell {
width: 100%;
}
div.page_diagnostics table.aktivnost_paradata_table td.graph_cell div.graph_cell {
div.page_obvestila div.title {
display: flex;
flex-direction: row;
align-items: center;
margin-bottom: 32px;
}
div.page_diagnostics table.aktivnost_paradata_table td.graph_cell div.graph_cell .graph_full {
background-color: #1E88E5;
height: 16px;
div.page_obvestila div.title div.title_icon {
height: 30px;
width: 30px;
border-radius: 2px;
background-color: #EAF9FE;
color: #1E88E5;
display: flex;
align-items: center;
justify-content: center;
margin-right: 8px;
}
div.page_obvestila div.title h2 {
width: 100%;
overflow: hidden;
font-weight: 300;
font-size: 24px;
margin-block-start: 0;
margin-block-end: 0;
}
div.page_obvestila div.title h2:after {
content: "";
display: inline-block;
height: 0.5em;
vertical-align: bottom;
width: 100%;
box-sizing: border-box;
margin-right: -100%;
margin-left: 8px;
border-top: 1px solid #E5E5E5;
}
div.page_obvestila #notifications .notifications_content {
display: flex;
flex-direction: row;
gap: 32px;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left {
display: flex;
flex-direction: column;
height: 660px;
box-sizing: border-box;
width: 50%;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .sent_list {
overflow-y: auto;
border: solid 1px #E5E5E5;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .sent_list ul {
padding-left: 0;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .sent_list ul li {
list-style-type: none;
margin: 0;
padding: 16px;
min-height: 58px;
background-color: #FFFFFF;
border-bottom: solid 1px #E5E5E5;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .sent_list ul li:last-of-type {
border-bottom: none;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .sent_list ul li div.title_row {
display: flex;
flex-direction: row;
margin-bottom: 8px;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .sent_list ul li div.title_row div.subject {
font-weight: 600;
margin-right: 8px;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .sent_list ul li div.title_row div.date {
font-style: italic;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .sent_list ul li div.content {
font-size: 14px;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .sent_list ul li.unread {
border: 1px #FF0000 solid;
background-color: #FF0000;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .recieved_list {
display: inline;
float: left;
width: 470px;
min-height: 200px;
margin-right: 60px;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .recieved_list ul {
padding-left: 0;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .recieved_list ul li {
list-style-type: none;
margin: 5px 0;
padding: 5px 8px;
background-color: #1E88E5;
border: 1px #1E88E5 solid;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .recieved_list ul li:hover {
cursor: pointer;
background-color: #1E88E5;
border: 1px #1E88E5 solid;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .recieved_list ul li.unread {
border: 1px #FF0000 solid;
background-color: #FF0000;
}
div.page_obvestila #notifications .notifications_content .notifications_content_left .recieved_list ul li.active {
cursor: pointer;
border: 1px #1E88E5 solid;
}
div.page_obvestila #notifications .notifications_content #message {
display: inline;
float: left;
margin-top: 30px;
padding: 20px;
width: 415px;
background-color: #1E88E5;
border: 1px #E5E5E5 solid;
}
div.page_obvestila #notifications .notifications_content .send_form {
display: inline;
float: left;
margin-top: 30px;
padding: 20px;
width: 415px;
background-color: #1E88E5;
border: 1px #E5E5E5 solid;
color: #333333 !important;
}
div.page_obvestila #notifications .notifications_content .send_form input[type=text] {
width: 400px;
padding: 3px 5px;
border: 1px solid #E5E5E5 !important;
color: #333333 !important;
}
div.page_obvestila #notifications .notifications_content .send_form textarea {
width: 400px;
padding: 3px 5px;
border: 1px solid #E5E5E5 !important;
color: #333333 !important;
}
div.page_obvestila #new_notification_alert {
cursor: pointer;
position: absolute;
top: 15px;
left: 0;
right: 0;
margin: 0 auto;
padding: 5px 8px;
width: 300px;
height: 20px;
line-height: 20px;
text-align: center;
vertical-align: middle;
font-weight: 600;
font-size: 13px;
color: white;
background-color: #FF0000;
}
div.page_obvestila #unread_notifications {
display: none;
height: auto;
width: 500px;
margin: 0 auto;
}
div.page_obvestila #unread_notifications > ul {
padding-left: 0;
margin-bottom: 50px;
line-height: 18px;
}
div.page_obvestila #unread_notifications > ul > li {
list-style-type: none;
margin: 5px 0;
padding: 5px 8px;
background-color: #1E88E5;
border: 1px #1E88E5 solid;
}
div.page_obvestila #unread_notifications a {
color: #1E88E5;
}
div.page_obvestila #unread_notifications .gdpr_popup_radio {
padding-top: 6px;
}
div.page_obvestila #unread_notifications .gdpr_popup_radio input {
vertical-align: top;
margin-top: 2px;
}
@media (max-width: 1100px) {
#quick_comments_link.newCss {

19
resources/fonts/FontAwesome5/scss/solid.scss
View File

@ -16,25 +16,8 @@
url('#{$fa-font-path}/fa-solid-900.svg#fontawesome') format('svg');
}
@font-face {
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: 400;
src: url('#{$fa-font-path}/fa-brands-400.eot');
src: url('#{$fa-font-path}/fa-brands-400.eot?#iefix') format('embedded-opentype'),
url('#{$fa-font-path}/fa-brands-400.woff2') format('woff2'),
url('#{$fa-font-path}/fa-brands-400.woff') format('woff'),
url('#{$fa-font-path}/fa-brands-400.ttf') format('truetype'),
url('#{$fa-font-path}/fa-brands-400.svg#fontawesome') format('svg');
}
.fa,
.fas {
font-family: 'Font Awesome 5 Free';
font-weight: 900;
}
.fa-brands {
font-family: 'Font Awesome 5 Brands';
font-weight: 400;
}
}

5
resources/sass/admin_new/basic/font.scss
View File

@ -13,6 +13,11 @@ body {
font-family: $font_family;
}
.fa-brands {
font-family: 'Font Awesome 5 Brands';
font-weight: 400;
}
//font-weight
$light: 300;
$regular: 400;

3
resources/sass/admin_new/basic/icons/export.scss
View File

@ -130,3 +130,6 @@ span.faicon.arhiv_mail::before{
font-weight: 400;
content: "\f14d";
}
span.faicon.share-arrow::before{
content: "\f14d";
}

14
resources/sass/admin_new/basic/icons/icons.scss
View File

@ -59,25 +59,25 @@ a.fa-brands {
//BARVE
&.yellow {
color: $yellow;
color: $yellow !important;
}
&.blue {
color: $blue;
color: $blue !important;
}
&.red {
color: $red;
color: $red !important;
}
&.ultra_dark_gray {
color: $ultra-dark-gray;
color: $ultra-dark-gray !important;
}
&.green {
color: $green;
color: $green !important;
}
&.red {
$color: $red;
$color: $red !important;
}
&.dark_gray2 {
$color: $dark-gray2;
$color: $dark-gray2 !important;
}
//ikona kot link

3
resources/sass/admin_new/components/popup/basic.scss
View File

@ -102,7 +102,8 @@
margin-block-start: 0;
span.faicon {
span.faicon,
span.fa-brands {
margin-right: 6px;
color: $blue;

149
resources/sass/admin_new/pages/aktivnost/aktivnost.scss
View File

@ -204,151 +204,8 @@ div.page_diagnostics {
}
}
}
}
// Grafi (Tedenska, mesečna, etc)
.time_span_container {
position: relative;
height: 160px;
width: 100%;
margin-bottom: 32px;
&:last-of-type {
margin-bottom: 0;
}
margin-top: 4px;
border: 1px solid $gray;
}
.time_span_header {
clear: both;
}
.time_span {
background-color: $gray;
width: 1px;
display: inline-block;
vertical-align: bottom;
}
@import "parapodatki";
@import "weekyearmonth";
$background_color_125: #9bbb59;
$background_color_126: #c0504d;
$background_color_127: #92a9cf;
$background_color_128: #f79646;
$background_color_129: #4bacc6;
$background_color_130: #8064a2;
$background_color_131: #4f81bd;
.time_span.year_2022 {
background-color: $background_color_128;
}.time_span.year_2021 {
background-color: $background_color_129;
}
.time_span.year_2020 {
background-color: $background_color_130;
}
.time_span.year_2019 {
background-color: $background_color_131;
}
.time_span.year_2018 {
background-color: $background_color_125;
}
.time_span.year_2017 {
background-color: $background_color_126;
}
.time_span.year_2016 {
background-color: $background_color_127;
}
.time_span.year_2015 {
background-color: $background_color_128;
}
.time_span.year_2014 {
background-color: $background_color_129;
}
.time_span.year_2013 {
background-color: $background_color_130;
}
.time_span.year_2012 {
background-color: $background_color_125;
}
.time_span.year_2011 {
background-color: $background_color_126;
}
.time_span.year_2010 {
background-color: $background_color_131;
}
.time_span.day_1 {
background-color: $background_color_131;
}
.time_span.day_2 {
background-color: $background_color_126;
}
.time_span.day_3 {
background-color: $background_color_125;
}
.time_span.day_4 {
background-color: $background_color_130;
}
.time_span.day_5 {
background-color: $background_color_129;
}
.time_span.day_6 {
background-color: $background_color_128;
}
.time_span.day_7 {
background-color: $background_color_127;
}
.time_span.month_1 {
background-color: $background_color_131;
}
.time_span.month_2 {
background-color: $background_color_126;
}
.time_span.month_3 {
background-color: $background_color_125;
}
.time_span.month_4 {
background-color: $background_color_130;
}
.time_span.month_5 {
background-color: $background_color_129;
}
.time_span.month_6 {
background-color: $background_color_128;
}
.time_span.month_7 {
background-color: $background_color_127;
}
.time_span.month_8 {
background-color: $background_color_131;
}
.time_span.month_9 {
background-color: $background_color_126;
}
.time_span.month_10 {
background-color: $background_color_125;
}
.time_span.month_11 {
background-color: $background_color_130;
}
.time_span.month_12 {
background-color: $background_color_129;
}
//Parapodatki
table.aktivnost_paradata_table {
td.graph_cell {
width: 100%;
div.graph_cell {
display:flex;
flex-direction: row;
.graph_full {
background-color: $blue;
height: 16px;
margin-right: 8px;
}
}
}
}
}

24
resources/sass/admin_new/pages/aktivnost/parapodatki.scss Normal file
View File

@ -0,0 +1,24 @@
div.page_diagnostics {
//Parapodatki
table.aktivnost_paradata_table {
td.graph_cell {
width: 100%;
div.graph_cell {
display:flex;
flex-direction: row;
.graph_full {
background-color: $blue;
height: 16px;
margin-right: 8px;
}
}
}
}
}

132
resources/sass/admin_new/pages/aktivnost/weekyearmonth.scss Normal file
View File

@ -0,0 +1,132 @@
div.page_diagnostics {
// Grafi (Tedenska, mesečna, etc)
.time_span_container {
position: relative;
height: 160px;
width: 100%;
margin-bottom: 32px;
&:last-of-type {
margin-bottom: 0;
}
margin-top: 4px;
border: 1px solid $gray;
}
.time_span_header {
clear: both;
}
.time_span {
background-color: $gray;
width: 1px;
display: inline-block;
vertical-align: bottom;
}
$background_color_125: #9bbb59;
$background_color_126: #c0504d;
$background_color_127: #92a9cf;
$background_color_128: #f79646;
$background_color_129: #4bacc6;
$background_color_130: #8064a2;
$background_color_131: #4f81bd;
.time_span.year_2023 {
background-color: $background_color_127;
}
.time_span.year_2022 {
background-color: $background_color_128;
}
.time_span.year_2021 {
background-color: $background_color_129;
}
.time_span.year_2020 {
background-color: $background_color_130;
}
.time_span.year_2019 {
background-color: $background_color_131;
}
.time_span.year_2018 {
background-color: $background_color_125;
}
.time_span.year_2017 {
background-color: $background_color_126;
}
.time_span.year_2016 {
background-color: $background_color_127;
}
.time_span.year_2015 {
background-color: $background_color_128;
}
.time_span.year_2014 {
background-color: $background_color_129;
}
.time_span.year_2013 {
background-color: $background_color_130;
}
.time_span.year_2012 {
background-color: $background_color_125;
}
.time_span.year_2011 {
background-color: $background_color_126;
}
.time_span.year_2010 {
background-color: $background_color_131;
}
.time_span.day_1 {
background-color: $background_color_131;
}
.time_span.day_2 {
background-color: $background_color_126;
}
.time_span.day_3 {
background-color: $background_color_125;
}
.time_span.day_4 {
background-color: $background_color_130;
}
.time_span.day_5 {
background-color: $background_color_129;
}
.time_span.day_6 {
background-color: $background_color_128;
}
.time_span.day_7 {
background-color: $background_color_127;
}
.time_span.month_1 {
background-color: $background_color_131;
}
.time_span.month_2 {
background-color: $background_color_126;
}
.time_span.month_3 {
background-color: $background_color_125;
}
.time_span.month_4 {
background-color: $background_color_130;
}
.time_span.month_5 {
background-color: $background_color_129;
}
.time_span.month_6 {
background-color: $background_color_128;
}
.time_span.month_7 {
background-color: $background_color_127;
}
.time_span.month_8 {
background-color: $background_color_131;
}
.time_span.month_9 {
background-color: $background_color_126;
}
.time_span.month_10 {
background-color: $background_color_125;
}
.time_span.month_11 {
background-color: $background_color_130;
}
.time_span.month_12 {
background-color: $background_color_129;
}
}

34
resources/sass/admin_new/pages/my_surveys/objava.scss
View File

@ -113,7 +113,7 @@ div#vabila {
flex-direction: row;
align-items: center;
margin-bottom: 24px;
margin-bottom: 16px;
margin-top: 48px;
&:first-of-type {
margin-top: 0;
@ -193,6 +193,7 @@ div#vabila {
button {
margin-right: 8px;
margin-left: 0;
}
}
}
@ -234,7 +235,7 @@ div#vabila {
height: auto;
width: 298px;
background-color: $light-gray;
background-color: $white;
border: 1px solid $gray;
padding: 16px;
@ -245,7 +246,7 @@ div#vabila {
transition: 0.2s;
&:hover {
background-color: darken($light-gray, 5%);
background-color: darken($white, 5%);
}
div.more_title {
@ -299,13 +300,24 @@ div#vabila {
// Več načinov deljenja - popup
div.popup_content {
&.publish {
textarea {
width: 568px;
padding: 8px;
display: block;
overflow: auto;
div#general_popup {
div.popup_content {
&.publish {
max-width: 600px;
textarea {
width: 568px;
padding: 8px;
height: auto;
&.iframe {
height: 155px;
}
}
&.qr {
display: flex;
justify-content: center;
}
}
}
}
}

1
resources/sass/admin_new/pages/pages.scss
View File

@ -20,3 +20,4 @@
@import "narocila";
@import "aktivnost/aktivnost";
@import "sporocila/sporocila";

233
resources/sass/admin_new/pages/sporocila/sporocila.scss Normal file
View File

@ -0,0 +1,233 @@
div.page_obvestila {
// Naslovi z ikonami
div.title {
display: flex;
flex-direction: row;
align-items: center;
margin-bottom: 32px;
div.title_icon {
height: 30px;
width: 30px;
border-radius: 2px;
background-color: $light-blue;
color: $blue;
display: flex;
align-items: center;
justify-content: center;
margin-right: 8px;
}
h2 {
width: 100%;
overflow: hidden;
font-weight: $light;
font-size: 24px;
margin-block-start: 0;
margin-block-end: 0;
&:after {
content: "";
display: inline-block;
height: 0.5em;
vertical-align: bottom;
width: 100%;
box-sizing: border-box;
margin-right: -100%;
margin-left: 8px;
border-top: 1px solid $gray;
}
}
}
#notifications {
.notifications_content {
display: flex;
flex-direction: row;
gap: 32px;
.notifications_content_left {
display: flex;
flex-direction: column;
height: 660px;
box-sizing: border-box;
width: 50%;
// Poslana sporočila
.sent_list {
overflow-y: auto;
border: solid 1px $gray;
ul {
padding-left: 0;
li {
list-style-type: none;
margin: 0;
padding: 16px;
min-height: 58px;
background-color: $white;
border-bottom: solid 1px $gray;
&:last-of-type {
border-bottom: none;
}
div.title_row {
display: flex;
flex-direction: row;
margin-bottom: 8px;
div.subject {
font-weight: $semi-bold;
margin-right: 8px;
}
div.date {
font-style: italic;
}
}
div.content {
font-size: 14px;
}
}
li.unread {
border: 1px $red solid;
background-color: $red;
}
}
}
//Prejeta sporočila
.recieved_list {
display: inline;
float: left;
width: 470px;
min-height: 200px;
margin-right: 60px;
ul {
padding-left: 0;
li {
list-style-type: none;
margin: 5px 0;
padding: 5px 8px;
background-color: $blue;
border: 1px $blue solid;
&:hover {
cursor: pointer;
background-color: $blue;
border: 1px $blue solid;
}
}
li.unread {
border: 1px $red solid;
background-color: $red;
}
li.active {
cursor: pointer;
border: 1px $blue solid;
}
}
}
}
#message {
display: inline;
float: left;
margin-top: 30px;
padding: 20px;
width: 415px;
background-color: $blue;
border: 1px $gray solid;
}
.send_form {
display: inline;
float: left;
margin-top: 30px;
padding: 20px;
width: 415px;
background-color: $blue;
border: 1px $gray solid;
color: $black !important;
input[type="text"] {
width: 400px;
padding: 3px 5px;
border: 1px solid $gray !important;
color: $black !important;
}
textarea {
width: 400px;
padding: 3px 5px;
border: 1px solid $gray !important;
color: $black !important;
}
}
}
}
#new_notification_alert {
cursor: pointer;
position: absolute;
top: 15px;
left: 0;
right: 0;
margin: 0 auto;
padding: 5px 8px;
width: 300px;
height: 20px;
line-height: 20px;
text-align: center;
vertical-align: middle;
font-weight: 600;
font-size: 13px;
color: white;
background-color: $red;
}
#unread_notifications {
display: none;
height: auto;
width: 500px;
margin: 0 auto;
> ul {
padding-left: 0;
margin-bottom: 50px;
line-height: 18px;
> li {
list-style-type: none;
margin: 5px 0;
padding: 5px 8px;
background-color: $blue;
border: 1px $blue solid;
}
}
a {
color: $blue;
}
.gdpr_popup_radio {
padding-top: 6px;
input {
vertical-align: top;
margin-top: 2px;
}
}
}
}