From bd87dbcd477066551e5af8ca269c35a1e9248d1b Mon Sep 17 00:00:00 2001 From: pero1203 Date: Fri, 13 May 2022 12:22:28 +0200 Subject: [PATCH 1/5] Redesign - popravki napak - obvescanje --- admin/survey/SurveyAdminSettings.php | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index bae10175d..90a63ac1d 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -3117,8 +3117,10 @@ class SurveyAdminSettings { // respondent - ne prikazemo ce gre za glasovanje oz. volitve if($rowS['survey_type'] != 0 && !SurveyInfo::getInstance()->checkSurveyModule('voting')){ echo '
'; - echo ''; + + //echo ''; $this->display_alert_label('finish_respondent',($rowAlert['finish_respondent'] == 1)); + echo '
'; // Ce imamo vec prevodov omogocimo za vsak prevod svoj email @@ -3130,11 +3132,12 @@ class SurveyAdminSettings { if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){ echo '
'; - echo ''; + //echo ''; $this->display_alert_label('finish_respondent_cms',($rowAlert['finish_respondent_cms'] == 1)); - echo '
'; - + + echo ''; } + //Avtor ankete oz. souredniki echo '
'; echo ''; @@ -3153,7 +3156,7 @@ class SurveyAdminSettings { echo '
'; echo ''; - echo ''; + echo ''; echo '
'; echo '
'; @@ -5068,7 +5071,7 @@ class SurveyAdminSettings { case 'finish_respondent_language': // respondent ki je zakljucil anketo v drugem jeziku (mu omogocimo nastavljanje custom maila za obvescanje) if ($isChecked) { - $p = new Prevajanje($anketa); + $p = new Prevajanje($this->anketa); $p->dostop(); $jeziki = $p->get_all_translation_langs(); if(!empty($jeziki)){ @@ -5128,7 +5131,7 @@ class SurveyAdminSettings { $ime_ok = true; } } - echo ''; + echo ''; echo ''; if ($email_ok && $ime_ok) { @@ -5164,7 +5167,7 @@ class SurveyAdminSettings { // preverimo sistemske nastavitve in spremenljivke ime } else { - echo ''; + echo ''; echo ''; } break; @@ -5172,7 +5175,7 @@ class SurveyAdminSettings { case 'finish_respondent_cms': // respondent prepoznan iz CMS ko je izpolnil anketo //respondent iz cms - echo ''; + echo ''; echo ''; if ($isChecked) { @@ -5203,7 +5206,7 @@ class SurveyAdminSettings { case 'delete_author': // obveščanje o izbrisu ankete // preberemo nastavitve alertov - $sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '$anketa'"); + $sqlAlert = sisplet_query("SELECT * FROM srv_alert WHERE ank_id = '$this->anketa'"); if (!$sqlAlert) echo mysqli_error($GLOBALS['connect_db']); @@ -5211,7 +5214,7 @@ class SurveyAdminSettings { $rowAlert = mysqli_fetch_array($sqlAlert); } else { - SurveyAlert::getInstance()->Init($anketa, $global_user_id); + SurveyAlert::getInstance()->Init($this->anketa, $global_user_id); $rowAlert = SurveyAlert::setDefaultAlertBeforeExpire(); } From 36dc0b1d3d654f62e797741ba5341f344dc5faf2 Mon Sep 17 00:00:00 2001 From: pero1203 Date: Fri, 13 May 2022 12:29:37 +0200 Subject: [PATCH 2/5] Odstranjen napredni modul prezentacija in ustrezna tema --- admin/survey/SurveyAdmin.php | 4 ++-- admin/survey/classes/class.SurveyTheme.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 1701864bc..2555301a8 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -3329,8 +3329,8 @@ class SurveyAdmin echo 'checkUserAccess($what='social_network') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_8'] . ' '; # Prezentacija - echo '
  • '; - echo 'checkUserAccess($what='slideshow') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_9'] . '
    • '; + /*echo '
  • '; + echo 'checkUserAccess($what='slideshow') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_9'] . '
    • ';*/ # Telefonska anketa echo '
  • '; diff --git a/admin/survey/classes/class.SurveyTheme.php b/admin/survey/classes/class.SurveyTheme.php index d95ef9cac..8b6f3abb3 100644 --- a/admin/survey/classes/class.SurveyTheme.php +++ b/admin/survey/classes/class.SurveyTheme.php @@ -64,7 +64,7 @@ class SurveyTheme { 10 => 'Otroci4.css', 11 => 'Embed.css', 12 => 'Embed2.css', - 13 => 'Slideshow.css' + //13 => 'Slideshow.css' ); $standard_skins[14] = 'Uni.css'; From a2cc972a715526da8226d4e8a9e009cdfe7f031d Mon Sep 17 00:00:00 2001 From: pero1203 Date: Fri, 13 May 2022 12:29:49 +0200 Subject: [PATCH 3/5] Popravek typo - odobeljena --- lang/1.php | 2 +- main/survey/skins/1046_1kaBlue.css | 529 ++++++++++++++++++ utils/cache/index.html | 0 utils/cache/timthumb_cacheLastCleanTime.touch | 0 ...d143384997b4a319a3a0afddea174.timthumb.txt | Bin 0 -> 3360 bytes 5 files changed, 530 insertions(+), 1 deletion(-) create mode 100644 main/survey/skins/1046_1kaBlue.css create mode 100644 utils/cache/index.html create mode 100644 utils/cache/timthumb_cacheLastCleanTime.touch create mode 100644 utils/cache/timthumb_int_aaad143384997b4a319a3a0afddea174.timthumb.txt diff --git a/lang/1.php b/lang/1.php index 1c7a1a8bb..b2e98ba73 100644 --- a/lang/1.php +++ b/lang/1.php @@ -6290,7 +6290,7 @@ $lang = array ( 'srv_te_custom_border_radius' => 'Ostrina roba', 'srv_te_custom_background_keywords' => 'Barva ozadja', 'srv_te_custom_font_style_keywords' => 'Stil', - 'srv_te_custom_font_style_keywords_bold' => 'Odobeljeno', + 'srv_te_custom_font_style_keywords_bold' => 'Odebeljeno', 'srv_te_custom_font_style_keywords_italic' => 'Poševno', 'srv_te_custom_font_style_keywords_underline'=> 'Podčrtano', 'srv_mv_Neustrezno' => 'Neustrezno', diff --git a/main/survey/skins/1046_1kaBlue.css b/main/survey/skins/1046_1kaBlue.css new file mode 100644 index 000000000..db110abf2 --- /dev/null +++ b/main/survey/skins/1046_1kaBlue.css @@ -0,0 +1,529 @@ +/* + Default tema ankete - 1ka - Modra barva +*/ +/* Barve */ +/* Import osnovne postavitve */ +/* + Osnovna tema ankete - 1ka - brez definiranih barv +*/ +/* Fonti */ +body { + margin: 0; + padding: 0; + color: #505050; + font-size: 100%; + font-family: Montserrat, Arial, Sans-Serif !important; + background: #ffffff; +} + +body.preview, body.testdata { + margin-top: 26px; +} + +#outercontainer { + width: 100%; + margin: 0 auto; +} +#outercontainer .outercontainer_header { + position: absolute; + width: 100%; + height: 80px; + border-bottom: 6px #1e88e5 solid; +} +#outercontainer #container { + position: relative; + width: 100%; + max-width: 1200px; + margin: 0px auto 10px; +} + +/* Warning bar (preview, cookie) */ +#cookie_alert, +#test_alert { + height: 26px; + font-size: 15px; + line-height: 25px; + color: #ffffff; + background-color: #ffa608; + border-bottom: 1px solid #ffa608; +} +#cookie_alert a, +#test_alert a { + text-decoration: none; + font-weight: bold; + color: #ffffff; +} +#cookie_alert a:hover, +#test_alert a:hover { + text-decoration: underline; +} +#cookie_alert span, +#test_alert span { + color: #ffffff; +} +#cookie_alert span a, +#test_alert span a { + color: #ffffff; + font-weight: normal; +} + +/* Header - logo, naslov, progressbar */ +h1 { + margin: 0px auto 30px; + padding: 120px 0 50px 0; + font-size: 28px; + color: #1e88e5; + text-align: center; + border-bottom: 1px solid #ddeffd; +} + +h1.evalvacija { + margin-bottom: 0; +} + +#logo { + right: auto; + left: 25px; + top: 13px; + max-height: 56px !important; + background: url("../../../public/img/logo/1ka_logo_slo.svg"); + background-repeat: no-repeat !important; + background-size: auto 100% !important; +} +#logo a { + width: 250px; + height: 56px; +} + +#logo.english { + background: url("../../../public/img/logo/1ka_logo_eng.svg"); +} + +.header_settings_holder { + top: 0px; + right: 20px; + left: auto; +} +.header_settings_holder .progress_bar span { + float: left !important; + /* ie6,7 doesnt support inline-block */ + display: block; + width: 20px; + font-size: 11px; + color: #6D87AF; +} +.header_settings_holder .progress_bar div { + height: 10px; + width: 130px; + padding: 2px; + margin: 0 5px; + border: 1px #cccccc solid; + background-color: #ffffff; +} +.header_settings_holder .progress_bar div span { + height: 10px; + background-color: #1e88e5; +} +.header_settings_holder .progress_bar p a { + color: #1e88e5; + text-decoration: none; +} +.header_settings_holder .progress_bar p a:hover { + color: #ffa608; +} +.header_settings_holder .continue_later_setting a { + color: #1e88e5; +} +.header_settings_holder .continue_later_setting a:hover { + color: #ffa608; +} +.header_settings_holder .tawk_chat a { + color: #1e88e5; +} +.header_settings_holder .tawk_chat a:hover { + color: #ffa608; +} + +/* Spremenljivke */ +.spremenljivka { + margin: 20px 10px 20px 10px; + padding: 20px 2px 50px 12px !important; + border-bottom: 1px #ddeffd solid; +} +.spremenljivka .naslov { + padding: 5px 0 15px 5px; + font-size: 18px; + font-weight: 600; +} +.spremenljivka .naslov .spremenljivka_info { + font-size: 14px; + font-weight: 400; + padding-top: 7px; +} +.spremenljivka .sequence_number { + background-color: #ddeffd; + color: #42A5F5; +} +.spremenljivka .sequence_number:hover { + background-color: #add8fb; +} +.spremenljivka .sequence_number.active { + background-color: #42A5F5; + color: #ffffff; +} +.spremenljivka .counter { + font-size: 18px; +} +.spremenljivka #dynamic_count { + color: #1e88e5; +} +.spremenljivka .arrow { + color: #1e88e5; +} +.spremenljivka .arrow:hover { + color: #ffa608; +} + +.spremenljivka.limited { + outline: 1px #F15A24 solid; +} + +.required, .required_require, .required_limit { + outline: 1px #F15A24 solid; +} + +div.variabla, +td.variabla, +td.question, +td.differential, +.variabla_sum label { + font-size: 14px; +} + +div.variable_holder { + padding: 10px 0 0 0; +} +div.variable_holder thead, +div.variable_holder tr.table-header { + font-weight: normal; + font-size: 14px; +} +div.variable_holder thead td, +div.variable_holder tr.table-header td { + padding: 10px 5px; +} + +table.grid_table thead tr td { + border-bottom: 2px #42A5F5 solid; +} +table.grid_table thead tr.middle_row td { + border-top: 2px #42A5F5 solid; +} +table.grid_table tbody tr.table-header td { + border-bottom: 2px #42A5F5 solid; + border-top: 2px #42A5F5 solid; + background-color: #ffffff; +} +table.grid_table tbody tr:nth-child(2n+1) { + background-color: #ffffff; +} +table.grid_table tbody tr:nth-child(2n) { + background-color: #ddeffd; +} +table.grid_table td { + padding: 10px 10px; +} + +span.reminder { + left: 3px; +} + +/* Textboxi, textarea, select */ +input, textarea, select { + font-family: Montserrat, Arial, Sans-Serif !important; +} + +input[type=text], textarea, select { + padding: 10px 15px; + border-radius: 3px; + border: 1px solid #d1d1d1; + border-radius: 3px; + background-color: #fff; +} + +/* ranking */ +.dropzone { + border-top: 1px #ddeffd solid; + margin-top: 12px; + padding-top: 17px; +} + +table.ranking_table ul { + margin-top: 19px; +} + +.ranking, +.ranking_long, +.handle, +.handle_long, +.ime, +.izbran, +.frame_ranking, +.frame_ranking_hover, +.frame_dropping, +.frame_dropping_hover, +.frame_moving { + font-size: 13px; + padding: 7px 10px 9px; + border: 2px solid #1e88e5; + background-color: #ffffff; +} + +.ranking:hover { + background-color: #f5fafe; +} + +div.variable_holder .frame_ranking_hover { + border: 2px #1e88e5 solid; + background-color: #ddeffd; +} + +div.variable_holder .frame_ranking, +div.variable_holder .frame_moving, +div.variable_holder .frame_dropping, +div.variable_holder .frame_dropping_hover { + text-indent: -35px; + border: 2px #42A5F5 solid; + background-color: #ddeffd; +} + +table.ranking_table b { + font-size: 13px; + font-weight: 600; +} + +/* Photo upload button */ +button.record_foto { + border: 2px solid #1e88e5; +} +button.record_foto::before { + color: #1e88e5; +} +button.record_foto:hover, button.record_foto:focus { + border-color: #ffa608; +} +button.record_foto:hover::before, button.record_foto:focus::before { + color: #ffa608; +} + +/* Koledar */ +.ui-datepicker { + font-size: 14px; +} + +button.ui-datepicker-trigger { + color: #1e88e5; +} +button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { + color: #ffa608; +} + +/* Slider */ +.grupa .spremenljivka .ui-slider-pips .ui-slider-pip { + color: #505050; +} +.grupa .spremenljivka .slider.ui-widget-content { + /*background-color: $color_light !important;*/ + background-image: none !important; + border: 0; +} +.grupa .spremenljivka .ui-slider-horizontal { + height: 8px; +} +.grupa .spremenljivka .ui-slider-handle { + cursor: pointer; + height: 10px !important; + width: 18px !important; + margin-top: 1px; + border: 0; + border-radius: 15px 15px !important; + background-color: #1e88e5 !important; + background-image: none !important; +} +.grupa .spremenljivka .ui-slider-handle:active { + background-color: #1e88e5 !important; +} +.grupa .spremenljivka .sliderText { + padding-top: 2px; + color: #505050; + background-color: #42A5F5; + border: 0; +} +.grupa .spremenljivka .sliderText::after { + border-color: #42A5F5 transparent; +} + +/* Warning levo od vprasanja */ +.validation_alert { + position: absolute; + z-index: 51; + top: 20px; + left: -150px; + width: 130px; + min-height: 29px; + margin: 0; + text-align: center; + font-size: 11px; + line-height: 14px; + background-color: #ddeffd; + border: 2px solid red; + padding: 4px 7px; + border-radius: 4px; + box-shadow: none; +} + +/* Gumbi na dnu */ +div.buttons { + padding: 20px 20px 35px; + margin: 0 10px; +} +div.buttons input { + cursor: pointer; + margin: 8px 10px; + /*padding: 7px 11px;*/ + padding: 10px 20px; + text-align: center; + font-size: 12px; + letter-spacing: 1px; + font-weight: 600; + color: #FFFFFF; + border-radius: 20px; + border: 0; +} +div.buttons input.next { + background-color: #1e88e5; + border: 1px solid #1e88e5; +} +div.buttons input.next:hover, div.buttons input.next:focus { + background-color: #ffa608; + border: 1px solid #ffa608; +} +div.buttons input.prev { + color: #1e88e5; + background-color: #fff; + border: 1px solid #1e88e5; +} +div.buttons input.prev:hover, div.buttons input.prev:focus { + color: #fff; + background-color: #1e88e5; +} + +/* Footer */ +#footer_survey { + padding: 40px; + background-color: #ffffff; + border-top: 1px #ddeffd solid; +} +#footer_survey p, #footer_survey a, #footer_survey a:visited { + color: #505050; + font-size: 14px; + line-height: 25px; + font-weight: 400; + text-decoration: none; +} +#footer_survey a:hover, #footer_survey a:active { + text-decoration: none; +} + +/* awesome radio in checkboxi */ +input[type=checkbox] + span.enka-checkbox-radio, +input[type=radio] + span.enka-checkbox-radio, +.custom_radio_picture.obarvan > label > span.enka-custom-radio:before, +.visual-radio-scale.checked .enka-vizualna-skala { + color: #42A5F5; + font-size: 20px; + vertical-align: -1px; +} + +input[type=checkbox]:focus + span.enka-checkbox-radio:before, +input[type=radio]:focus + span.enka-checkbox-radio:before, +input[type=radio]:focus + span.enka-custom-radio:before, +input[type=radio]:focus + span.enka-vizualna-skala::before { + color: #0965ae; +} + +input[type=text]:focus, +input[type=number]:focus, +input[type=email]:focus, +input[type=password]:focus, +textarea:focus { + border-color: #42A5F5; +} + +/* Ranking drag drop */ +.drag_and_drop { + top: -9px; + left: -12px; +} + +.drag_and_drop_right { + top: -9px !important; + left: -12px !important; +} + +.frame_dropping_titles { + width: 240px; + padding: 5px; + margin: 0px auto 0px auto; + height: 15px; + text-align: center; + background-color: #FFFFFF; + border-top: 2px solid #b9c5d9; + border-left: 2px solid #b9c5d9; + border-right: 2px solid #b9c5d9; + font-size: 13px; +} + +.drag_and_drop_box { + top: -9px; + left: -12px; +} +.drag_and_drop_box img { + display: block; + margin-left: auto; + margin-right: auto; +} + +.drag_and_drop_box_right { + top: 19px !important; + left: -12px !important; +} + +.drag_and_drop_box_right_after_refresh { + /*top: 44px!important;*/ + left: -12px !important; +} + +.drag_and_drop_box_right_over { + left: -12px !important; +} + +.frame_dropping_titles_box { + width: 240px; + padding: 5px; + margin: 0px auto 0px auto; + height: 15px; + text-align: center; + background-color: #FFFFFF; + font-size: 13px; +} + +.frame_dropping { + padding: 7px 10px 9px; +} + +.frame_dropping_box { + padding: 7px 10px 9px; +} + +/*# sourceMappingURL=1kaBlue.css.map */ diff --git a/utils/cache/index.html b/utils/cache/index.html new file mode 100644 index 000000000..e69de29bb diff --git a/utils/cache/timthumb_cacheLastCleanTime.touch b/utils/cache/timthumb_cacheLastCleanTime.touch new file mode 100644 index 000000000..e69de29bb diff --git a/utils/cache/timthumb_int_aaad143384997b4a319a3a0afddea174.timthumb.txt b/utils/cache/timthumb_int_aaad143384997b4a319a3a0afddea174.timthumb.txt new file mode 100644 index 0000000000000000000000000000000000000000..5f494232eca2e826b8e6135ac469a293d94c7ef0 GIT binary patch literal 3360 zcmbW1c{J4T+s8j+W{hRR#4z~ANV0!r-;IbuHI~X&Nyt*jma&Jje+h*|LX6=Xk6nm} z>@>)lWrhgJ%p}G(^P7IpbAHb`&tJdabKTc<&VA1PzV7pWo$Efg9_GHseYC5mn~byx z&dnt#(9_ok?ds;^>EZ@;rGlW`lr#yJo2)Smyu)0X;6Ee3qTx${BXjPe3I) zy^urFsJa7bO{APsz3m^v$t5U+5*Cp3r}n=4nZ+1lAV zxVXCAarf}_3J45(5R3~6jeYbuEZyPh&4Pg0>A+67G}AsP80Z_Xe(2XApljBFQQgiR&JlO z2pYZ=G(ySjE|-)q?vv{+d{&%}LhMoLlj*5LwC^=msk#WR%eIYbPkp^NA5^*2^2Tesr{m`K+ToabQ`LsB4t!jvm$g&g$cdW87xlFU4QG7Gw&X(JLP5eU!?>7UHdiytlOyJ}l%!cU7leFCz(i9YOuDjUL z^nH(4VfGUvn*3$QgnJ0Ru^60Xx&4c8u+y(&mPS_lGR}lGfiZCbPJ=Ykp3CWqrH%d) zTOUu0`OL^SwL3FDYR-K|a>|ZUMTc;gVu#k$mFZwa9BPSH8PFBQi=GVJdn34Rfh$4n z8QwN{4vD-q8KT~$aoBgt&*#T?_9&ezw9@3Sa^J!Ty_LSd9QX(#Ps^pWTJS!NV+_vX zH?k%l9q`2l9P|=OttCCUyjS?<#^pPpKRbc9dYfo5jKs^%CWiwiK(2~m0;E4Fk%exc zRN3W(vS7mxlj-z`2<@tvpc6U~l9o-i&BiCXj-!^1r(%;BwTog>T`SvOw^U`N6Ne&)(d%ZpfbK|8^*yNb?GD^O*P`{e6{guu$HE)nmM0HVC&#p!Y6pKQP^=vFU47a7OJdCIy z@jh;@&x)sl&$YH+nn=74&U5!!H1v6w2wTfNVsBsqmIdYvS1LdIx}PHa+|rM72ZO%| z{Y)TO<$!pAfsUt*%XR37Y|%U&w`%1)YmZq*G)$;x$ZDCLNUFB<`&9KuQsaG^WtM9$acABHdbKwN<+kzH?K4BrMTzeo_=Nd52kRK1KC%MZVi{=gPXMQ zEsXYT?bqql)|EE@e3aH)fv;@cwuZuB=p&=`2^oCS#myY8z4uzZddpU7zRrKt9_608 z3e78~8ScyuIXh0#6X@%mI}11KVmr^wTsICX5;eS&wLFmXmET>iyfE%dK;Gmf!rXg> zRjj&Z4WE!+W@_itvazqtP>s3g$pK{fuvyRJUGKW4dfA1z{1`;k(Optnico|sU&}W`c^LsrG`>8<3 z5LNM_gKbjLQrl$i-HDw;-ozyxg4_0*W<~zdy@Ia+Plkkxk{H<-A;F}JXijmcxF89wAw&w~p?D;3VNY3A;=yNqC$i!~XN1Z|x1bQsb8 zxm&X<&Eoh?kqZW{wqhxuQtk`LSPsc+f5enQBSRS@On`DVU+HR7vN`>YJ5QGVBR_hq zS>nu>{8{V^K?|8aaHuQ)OLqCq3SJa0nCu;Moo>@JQR`@AVP+5;?CFnkDb6wjz*Q*q z!x1Shj~z^8^Ox^C61qtQgGG_xMPM6@>}z<3$HB~-TdA5UZ!YJ)GH+~d&D!~>-Z8vt znP8i0U>Qma3(uzRGPp7qmDr4fN^wx$l={cEPMc8ZJ;f;>(VF{X-trmzK-!W(QHfFz zbYhjbPzUSgXcNQfcqo>L&pO29cw34;2cbM8lXSw;x14xfGc$+0=zQVl=zAo6rH`5u zIt2;7zJ-I0cYTm%wyqLL!1BejhDCq&(3NIhy7jyc6DYK?VFK?1oQQf#aRaoJ<44Lr&|gtn!Jy;@hb^U@f#pMP&O02zok zGSo{eMB2QG*mf;_TJ+;Nbu>BIFQfLXi6Zh`g2yYOAvApLz#bRppNoxOd}{RfU%~Q1 z+G-NEoU{_^cN4vz5Pph z*D^f)w885PU2<*d=i9lC4~r~9;J%`$;j8grJPKviqrT1r>JJX}l9#Z_Xu6}@?m>h;ysFB5$AD4Z)V z7ZtdDCsAS#^A>qaJZ8N3*9|Ux@v2biopm`&`(e`x53A7Ht-RhPI2mkhUhrx!e!J@G z(F>nLVRx!(=g)BC#@vk#LPe)KYSI67v1Hk)7@qgt7Pn&SG_(u9J&H^?)NaZoEqs4R zNwch{a!sEu*2NlRG+VyBJF9!QC0fBC>_QPzR^e7-zbP>$1UYvoMxQR6r)kZCD%jvaN)=v^bwyz@w*Jic<-5;jQ$`hAaj;#TFz0H3q7zb#J4MJ{gQ!E#y6gjuAZnrIqZ@iRbg!gQ@ zV=1~zKiWwJ(Jv8{l7;xXih-~ba-wFWiFrt1){$4D(MKH+^Af<$g7Kc)rCj1%HhO4~lyGoJs<82PDqMP6NOQmxgv z@)G%y!wn-`QJk5e8jUnpZ*;OKx+#-*-p0PEC~4m-kYtL$UviMOS2~5eDlL~8@S-KO w+T(Rmohr{bO8{JSCC(?wpsXLT_SQP1p+pll0pgUE2^i4%{l~M)62_eV2YA0WT>t<8 literal 0 HcmV?d00001 From bc2ac8d9548bd8685249b066ad4c00cfc9a0c96d Mon Sep 17 00:00:00 2001 From: pero1203 Date: Fri, 13 May 2022 12:31:24 +0200 Subject: [PATCH 4/5] no message --- utils/cache/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 utils/cache/.gitignore diff --git a/utils/cache/.gitignore b/utils/cache/.gitignore new file mode 100644 index 000000000..c96a04f00 --- /dev/null +++ b/utils/cache/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore \ No newline at end of file From 8d6c99f35d698236b69d7f65d0d5e03ba96f0c0b Mon Sep 17 00:00:00 2001 From: pero1203 Date: Fri, 13 May 2022 13:03:39 +0200 Subject: [PATCH 5/5] Redesign - manjsi popravki texta, paddinga --- admin/survey/SurveyAdminSettings.php | 90 ++++++++++--------- .../class.SurveyInvitationsNew.php | 10 ++- lang/1.php | 6 +- 3 files changed, 59 insertions(+), 47 deletions(-) diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 90a63ac1d..63a685f44 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -5704,14 +5704,14 @@ class SurveyAdminSettings { global $lang; $expected_time = array(); - $expected_time_block = array(); - $block_labels_by_number = array(); + $expected_time_block = array(); + $block_labels_by_number = array(); $expected_vprasanja = array(); $verjetnost = array(); - $verjetnost_block = array(); + $verjetnost_block = array(); - //from php 7.2 this helps to round numbers calculated in bcmod() - without it, it always rounds down to int - bcscale(1); + //from php 7.2 this helps to round numbers calculated in bcmod() - without it, it always rounds down to int + bcscale(1); $sql = sisplet_query("SELECT introduction FROM srv_anketa WHERE id = '$this->anketa'"); $row = mysqli_fetch_array($sql); @@ -5725,7 +5725,7 @@ class SurveyAdminSettings { $expected_time[0][0] = $expected_vprasanja[0][0] + GlobalMisc::getMisc('timing_stran'); $expected_time[0][1] = $expected_time[0][0]; - $block_spr_data = $this->get_block_data_by_spr_id(); + $block_spr_data = $this->get_block_data_by_spr_id(); $sql = sisplet_query("SELECT id, naslov, vrstni_red FROM srv_grupa g WHERE g.ank_id='$this->anketa' ORDER BY g.vrstni_red ASC"); while ($row = mysqli_fetch_array($sql)) { @@ -5753,49 +5753,56 @@ class SurveyAdminSettings { $expected_time[$row['vrstni_red']][1] += GlobalMisc::getMisc('timing_stran'); } - $sql = sisplet_query("SELECT * FROM srv_if as bl LEFT JOIN srv_branching as br ON br.parent = bl.id WHERE bl.enabled='0' AND bl.tip='1' AND br.ank_id = '$this->anketa' ORDER BY bl.number ASC, br.vrstni_red ASC"); - $last_block_st = -1; + $sql = sisplet_query("SELECT * FROM srv_if as bl LEFT JOIN srv_branching as br ON br.parent = bl.id WHERE bl.enabled='0' AND bl.tip='1' AND br.ank_id = '$this->anketa' ORDER BY bl.number ASC, br.vrstni_red ASC"); + $last_block_st = -1; while ($row = mysqli_fetch_array($sql)) { - $new_block = $last_block_st != $row['number']; - if($new_block){ - $last_block_st = $row['number']; - $label = $row['label'] ? $row['label']: $lang['srv_blok'].' '.$last_block_st; - $block_labels_by_number[$last_block_st] = $label; - $expected_time_block[$last_block_st-1][0] = 0; - $expected_time_block[$last_block_st-1][1] = 0; - } - - if(!$row['element_if']){ - $expected_time_block[$last_block_st-1][0] += $expected_vprasanja[$row['element_spr']][0] * $expected_vprasanja[$row['element_spr']][1]; // dejanski - $expected_time_block[$last_block_st-1][1] += $expected_vprasanja[$row['element_spr']][0]; // bruto - z vsemi vprasanji - - if ( $expected_vprasanja[$row['element_spr']][1] > $verjetnost_block[$last_block_st-1]) - $verjetnost_block[$last_block_st-1] = $expected_vprasanja[$row['element_spr']][1]; - } - else{ - $sql1 = sisplet_query("SELECT * FROM srv_branching WHERE parent='".$row['element_if']."' ORDER BY vrstni_red ASC"); - while ($row1 = mysqli_fetch_array($sql1)) { - $expected_time_block[$last_block_st-1][0] += $expected_vprasanja[$row1['element_spr']][0] * $expected_vprasanja[$row1['element_spr']][1]; // dejanski - $expected_time_block[$last_block_st-1][1] += $expected_vprasanja[$row1['element_spr']][0]; // bruto - z vsemi vprasanji - $expected_vprasanja[$row1['element_spr']][4] = $label; - if ( $expected_vprasanja[$row1['element_spr']][1] > $verjetnost_block[$last_block_st-1]) - $verjetnost_block[$last_block_st-1] = $expected_vprasanja[$row1['element_spr']][1]; - } - } - - if($new_block){ - $expected_time_block[$last_block_st-1][0] += GlobalMisc::getMisc('timing_stran') * $verjetnost_block[$last_block_st-1]; // pri dejanskem trajanju strani upostevamo verjetnost najverjetnejsega vprasanja na strani (stran se pojavi z najvisjo verjetnostjo vseh vprasanj na strani) - $expected_time_block[$last_block_st-1][1] += GlobalMisc::getMisc('timing_stran'); - } + $new_block = $last_block_st != $row['number']; + + if($new_block){ + $last_block_st = $row['number']; + $label = $row['label'] ? $row['label']: $lang['srv_blok'].' '.$last_block_st; + $block_labels_by_number[$last_block_st] = $label; + $expected_time_block[$last_block_st-1][0] = 0; + $expected_time_block[$last_block_st-1][1] = 0; + } + + if(!$row['element_if']){ + $expected_time_block[$last_block_st-1][0] += $expected_vprasanja[$row['element_spr']][0] * $expected_vprasanja[$row['element_spr']][1]; // dejanski + $expected_time_block[$last_block_st-1][1] += $expected_vprasanja[$row['element_spr']][0]; // bruto - z vsemi vprasanji + + if ( $expected_vprasanja[$row['element_spr']][1] > $verjetnost_block[$last_block_st-1]) + $verjetnost_block[$last_block_st-1] = $expected_vprasanja[$row['element_spr']][1]; + } + else{ + $sql1 = sisplet_query("SELECT * FROM srv_branching WHERE parent='".$row['element_if']."' ORDER BY vrstni_red ASC"); + while ($row1 = mysqli_fetch_array($sql1)) { + $expected_time_block[$last_block_st-1][0] += $expected_vprasanja[$row1['element_spr']][0] * $expected_vprasanja[$row1['element_spr']][1]; // dejanski + $expected_time_block[$last_block_st-1][1] += $expected_vprasanja[$row1['element_spr']][0]; // bruto - z vsemi vprasanji + $expected_vprasanja[$row1['element_spr']][4] = $label; + + if ( $expected_vprasanja[$row1['element_spr']][1] > $verjetnost_block[$last_block_st-1]) + $verjetnost_block[$last_block_st-1] = $expected_vprasanja[$row1['element_spr']][1]; + } + } + + if($new_block){ + $expected_time_block[$last_block_st-1][0] += GlobalMisc::getMisc('timing_stran') * $verjetnost_block[$last_block_st-1]; // pri dejanskem trajanju strani upostevamo verjetnost najverjetnejsega vprasanja na strani (stran se pojavi z najvisjo verjetnostjo vseh vprasanj na strani) + $expected_time_block[$last_block_st-1][1] += GlobalMisc::getMisc('timing_stran'); + } } // izpis za strani $max = 0; $total = 0; + $total_brez_pogojev = 0; foreach ($expected_time AS $key => $val) { - if ($val[1] > $max) $max = $val[1]; + + if ($val[1] > $max) + $max = $val[1]; + $total += $val[0]; + $total_brez_pogojev += $val[1]; } if ($max == 0) return; @@ -5804,6 +5811,7 @@ class SurveyAdminSettings { } $skupni_cas = (bcdiv($total, 60, 0)>0?bcdiv($total, 60, 0).'min ':'').''.round(bcmod($total, 60), 0).'s'; + $skupni_cas_brez_pogojev = (bcdiv($total_brez_pogojev, 60, 0)>0?bcdiv($total_brez_pogojev, 60, 0).'min ':'').''.round(bcmod($total_brez_pogojev, 60), 0).'s'; if ($samo_izracunaj_skupini_cas == 1) return $skupni_cas; @@ -5846,7 +5854,7 @@ class SurveyAdminSettings { echo ''; } - echo ''.$lang['srv_casi_po_vprasanjih_skupaj'].''.$skupni_cas.''; + echo ''.$lang['srv_casi_po_vprasanjih_skupaj'].''.$skupni_cas.' / '.$skupni_cas_brez_pogojev.''; echo ''; echo '
    '; diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php index 91459185b..b6e09fa06 100644 --- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php +++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php @@ -101,9 +101,7 @@ class SurveyInvitationsNew { } if ($NoNavi == false) { - echo '
    '; $this->displayNavigation(); - echo '
    '; } // Warning za nastavitev streznika @@ -1677,7 +1675,7 @@ class SurveyInvitationsNew { echo '
    '; echo '
    '; - echo ' '; + echo ' '; echo '
    '; echo '
    '; @@ -2957,6 +2955,9 @@ class SurveyInvitationsNew { if($isEmail) { + echo '
    '; + + // Step 1 - nastavitve echo '
    '; echo ' '; @@ -3047,6 +3048,9 @@ class SurveyInvitationsNew { echo ' '; echo '
    '; + echo '
    '; + + echo '
    '; } diff --git a/lang/1.php b/lang/1.php index b2e98ba73..8b91d4120 100644 --- a/lang/1.php +++ b/lang/1.php @@ -4436,7 +4436,7 @@ $lang = array ( "srv_invitation_nonActivated_title" => "Pošiljanje vabil v anketo", "srv_invitation_nonActivated_text1" => "V spletnih anketah običajno zadoščata dve splošni emaili vabili vsem enotam (drugo vabilo je hkrati zahvala respondentom). V primeru manjšega števila enot (npr. nekaj sto) uporabimo kar privzeti email sistem (npr. Gmail, Outlook...), če je enot več, pa orodja za masovno pošiljanje (npr. SqualoMail, MailChimp...).", "srv_invitation_nonActivated_text2" => "Večje število vabil in sledenje respondentom je večinoma nepotrebno, hkrati pa tudi zahtevno (glej priporočila za pošiljanje vabil).", - "srv_invitation_nonActivated_text3" => "Email vabila lahko pošiljamo tudi preko sistema 1KA, in to tako splošna kot individualizirana vabila s kodo in sledenjem. Sistem 1KA poleg tega podpira (dokumentira) tudi pošiljanje vabil na preko pošta, SMS, ipd.", + "srv_invitation_nonActivated_text3" => "Email vabila lahko pošiljamo tudi preko sistema 1KA, in to tako splošna kot individualizirana vabila s kodo in sledenjem. Sistem 1KA poleg tega podpira (dokumentira) tudi pošiljanje vabil preko pošte, SMS, ipd.", "srv_invitation_nonActivated_button_details" => "Podrobnosti o 1KA sistemu vabil", "srv_invitation_nonActivated_button_activate" => "Omogoči 1KA sistem vabil", "srv_invitation_nonActivated_more" => "Več >>", @@ -4989,7 +4989,7 @@ $lang = array ( 'srv_inv_recipiens_from_list' => "Ročni vnos", 'srv_inv_recipiens_from_file' => "Datoteke (csv)", 'srv_inv_recipiens_from_system' => "Iz obstoječe spremenljivke", - 'srv_inv_recipiens_temporary_list' => "Začasni seznam", + 'srv_inv_recipiens_temporary_list' => "Začasen seznam", 'srv_inv_recipiens_list_created_by' => "Kreiral: ", 'srv_inv_recipiens_list_created_day' => "Kreiral dne: ", 'srv_inv_recipiens_list_comment' => "komentar: ", @@ -6206,7 +6206,7 @@ $lang = array ( 'srv_inv_list_edit_from_all_surveys' => 'Vse moje ankete', 'srv_inv_list_edit_from_archive' => 'Arhivi pošiljanja', 'srv_inv_list_table_name' => 'Ime seznama', - 'srv_inv_list_table_cnt_receive' => 'Št.prej.', + 'srv_inv_list_table_cnt_receive' => 'Št. prej.', 'srv_inv_list_table_comment' => 'Komentar', 'srv_inv_list_table_date_create' => 'Datum kreiranja', 'srv_inv_list_table_author' => 'Avtor',