Merge branch 'master' of https://git.1ka.si:/git/1ka
This commit is contained in:
commit
7d393427ff
@ -3329,8 +3329,8 @@ class SurveyAdmin
|
||||
echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_SOCIAL_NETWORK . '" title="' . $lang['srv_vrsta_survey_type_8'] . '" '.(!$userAccess->checkUserAccess($what='social_network') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_8'] . '</a></li> ';
|
||||
|
||||
# Prezentacija
|
||||
echo '<li ' . ($get == A_SLIDESHOW ? 'class="active"' : '') . '>';
|
||||
echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_SLIDESHOW . '" title="' . $lang['srv_vrsta_survey_type_9'] . '" '.(!$userAccess->checkUserAccess($what='slideshow') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_9'] . '</a></li> ';
|
||||
/*echo '<li ' . ($get == A_SLIDESHOW ? 'class="active"' : '') . '>';
|
||||
echo '<a href="index.php?anketa=' . $this->anketa . '&a=' . A_SLIDESHOW . '" title="' . $lang['srv_vrsta_survey_type_9'] . '" '.(!$userAccess->checkUserAccess($what='slideshow') ? 'class="paid_locked"' : '').'>' . $lang['srv_vrsta_survey_type_9'] . '</a></li> ';*/
|
||||
|
||||
# Telefonska anketa
|
||||
echo '<li ' . ($get == A_TELEPHONE ? 'class="active"' : '') . '>';
|
||||
|
@ -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 '<div class="setting_item" id="label_alert_finish_respondent">';
|
||||
echo '<input type="checkbox" name="alert_finish_respondent" id="alert_finish_respondent" value="1" onChange="change_alert_respondent(\'finish_respondent\', $(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent'] == 1 ? ' checked' : '') . '>';
|
||||
|
||||
//echo '<input type="checkbox" name="alert_finish_respondent" id="alert_finish_respondent" value="1" onChange="change_alert_respondent(\'finish_respondent\', $(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent'] == 1 ? ' checked' : '') . '>';
|
||||
$this->display_alert_label('finish_respondent',($rowAlert['finish_respondent'] == 1));
|
||||
|
||||
echo '</div>';
|
||||
|
||||
// Ce imamo vec prevodov omogocimo za vsak prevod svoj email
|
||||
@ -3130,11 +3132,12 @@ class SurveyAdminSettings {
|
||||
if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){
|
||||
echo '<div class="setting_item" id="label_alert_finish_respondent_cms">';
|
||||
|
||||
echo '<input type="checkbox" name="alert_finish_respondent_cms" id="alert_finish_respondent_cms" value="1" onChange="change_alert_respondent(\'finish_respondent_cms\', $(this)); change_alert_instruction($(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent_cms'] == 1 ? ' checked' : '') . '>';
|
||||
//echo '<input type="checkbox" name="alert_finish_respondent_cms" id="alert_finish_respondent_cms" value="1" onChange="change_alert_respondent(\'finish_respondent_cms\', $(this)); change_alert_instruction($(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . ($rowAlert['finish_respondent_cms'] == 1 ? ' checked' : '') . '>';
|
||||
$this->display_alert_label('finish_respondent_cms',($rowAlert['finish_respondent_cms'] == 1));
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
//Avtor ankete oz. souredniki
|
||||
echo '<div class="setting_item" id="label_alert_finish_author">';
|
||||
echo '<input type="checkbox" name="alert_finish_author" id="alert_finish_author" value="1" onChange="change_alert_respondent(\'finish_author\', $(this));return false;"' . ($rowAlert['finish_author'] == 1 ? ' checked' : '') . '>';
|
||||
@ -3153,7 +3156,7 @@ class SurveyAdminSettings {
|
||||
|
||||
echo '<div class="setting_holder alert_other_emails '.($rowAlert['finish_other'] == 0 ? 'displayNone' : '' ).'" id="alert_holder_finish_other_emails">';
|
||||
echo '<label for="alert_finish_other_emails">' . $lang['email_prejemniki_one_per_line'] . ':</label>';
|
||||
echo '<textarea class="alert_other_emails" name="alert_finish_other_emails" id="alert_finish_other_emails">' . $rowAlert['delete_other_emails'] . '</textarea>';
|
||||
echo '<textarea class="alert_other_emails" name="alert_finish_other_emails" id="alert_finish_other_emails">' . $rowAlert['finish_other_emails'] . '</textarea>';
|
||||
echo '</div>';
|
||||
echo '</div>';
|
||||
|
||||
@ -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 '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;"' . (($isChecked) ? ' checked' : '') . '>';
|
||||
echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); $(\'form[name=alertanketa_' . $this->anketa . ']\').submit(); return false;"' . (($isChecked) ? ' checked' : '') . '>';
|
||||
echo '<label for="alert_'.$what.'">'.$lang['srv_alert_respondent'].'</label>';
|
||||
|
||||
if ($email_ok && $ime_ok) {
|
||||
@ -5164,7 +5167,7 @@ class SurveyAdminSettings {
|
||||
// preverimo sistemske nastavitve in spremenljivke ime
|
||||
|
||||
} else {
|
||||
echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;"' . (($isChecked) ? ' checked' : '') . '>';
|
||||
echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); $(\'form[name=alertanketa_' . $this->anketa . ']\').submit(); return false;"' . (($isChecked) ? ' checked' : '') . '>';
|
||||
echo '<label for="alert_'.$what.'">'.$lang['srv_alert_respondent'].'</label>';
|
||||
}
|
||||
break;
|
||||
@ -5172,7 +5175,7 @@ class SurveyAdminSettings {
|
||||
case 'finish_respondent_cms': // respondent prepoznan iz CMS ko je izpolnil anketo
|
||||
|
||||
//respondent iz cms
|
||||
echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); change_alert_instruction($(this)); $(\'form[name=alertanketa_' . $anketa . ']\').submit(); return false;" ' . (($isChecked) ? ' checked' : '') . '>';
|
||||
echo '<input type="checkbox" name="alert_'.$what.'" id="alert_'.$what.'" value="1" onChange="change_alert_respondent(\''.$what.'\', $(this)); change_alert_instruction($(this)); $(\'form[name=alertanketa_' . $this->anketa . ']\').submit(); return false;" ' . (($isChecked) ? ' checked' : '') . '>';
|
||||
echo '<label for="alert_finish_respondent_cms">'.$lang['srv_alert_respondent_cms'].'</label>';
|
||||
|
||||
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();
|
||||
}
|
||||
|
||||
@ -5701,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);
|
||||
@ -5722,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)) {
|
||||
@ -5750,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;
|
||||
|
||||
@ -5801,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;
|
||||
@ -5843,7 +5854,7 @@ class SurveyAdminSettings {
|
||||
|
||||
echo '</tr>';
|
||||
}
|
||||
echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right time">'.$skupni_cas.'</td><td></td></tr>';
|
||||
echo '<tr class="semi-bold"><td>'.$lang['srv_casi_po_vprasanjih_skupaj'].'</td><td class="right time">'.$skupni_cas.' / <span class="gray">'.$skupni_cas_brez_pogojev.'</span></td><td></td></tr>';
|
||||
echo '</table>';
|
||||
|
||||
echo '<div class="tabela_trajanje_legenda">';
|
||||
|
@ -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';
|
||||
|
@ -101,9 +101,7 @@ class SurveyInvitationsNew {
|
||||
}
|
||||
|
||||
if ($NoNavi == false) {
|
||||
echo '<div id="inv_top_navi">';
|
||||
$this->displayNavigation();
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
// Warning za nastavitev streznika
|
||||
@ -1677,7 +1675,7 @@ class SurveyInvitationsNew {
|
||||
echo '<div id="inv_rec_filter">';
|
||||
|
||||
echo '<div class="setting">';
|
||||
echo ' <label for="inv_rec_filter_value">'.$lang['srv_invitation_recipients_filter'].':</label><input id="inv_rec_filter_value" class="small" type="text" onchange="inv_filter_recipients(); return false;" value="'.$_SESSION['inv_filter']['value'].'">';
|
||||
echo ' <label for="inv_rec_filter_value">'.$lang['srv_invitation_recipients_filter'].'</label><input id="inv_rec_filter_value" class="small" type="text" onchange="inv_filter_recipients(); return false;" value="'.$_SESSION['inv_filter']['value'].'">';
|
||||
echo '</div>';
|
||||
|
||||
echo '<div class="setting">';
|
||||
@ -2957,6 +2955,9 @@ class SurveyInvitationsNew {
|
||||
|
||||
if($isEmail) {
|
||||
|
||||
echo '<div id="inv_top_navi">';
|
||||
|
||||
|
||||
// Step 1 - nastavitve
|
||||
echo '<div class="inv_step '.$active_step[1].'">';
|
||||
echo ' <a href="'.$this->addUrl('inv_settings').'" class="noline">';
|
||||
@ -3047,6 +3048,9 @@ class SurveyInvitationsNew {
|
||||
echo ' </a>';
|
||||
echo '</div>';
|
||||
|
||||
echo '</div>';
|
||||
|
||||
|
||||
echo '</div>';
|
||||
}
|
||||
|
||||
|
@ -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 <a class=\"bold\" href=\"%s\">priporočila za pošiljanje vabil</a>).",
|
||||
"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',
|
||||
@ -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',
|
||||
|
529
main/survey/skins/1046_1kaBlue.css
Normal file
529
main/survey/skins/1046_1kaBlue.css
Normal file
@ -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 */
|
2
utils/cache/.gitignore
vendored
Normal file
2
utils/cache/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
||||
*
|
||||
!.gitignore
|
0
utils/cache/index.html
vendored
Normal file
0
utils/cache/index.html
vendored
Normal file
0
utils/cache/timthumb_cacheLastCleanTime.touch
vendored
Normal file
0
utils/cache/timthumb_cacheLastCleanTime.touch
vendored
Normal file
BIN
utils/cache/timthumb_int_aaad143384997b4a319a3a0afddea174.timthumb.txt
vendored
Normal file
BIN
utils/cache/timthumb_int_aaad143384997b4a319a3a0afddea174.timthumb.txt
vendored
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user