diff options
Diffstat (limited to '')
75 files changed, 5179 insertions, 2483 deletions
diff --git a/main/survey/app/.htaccess b/main/survey/app/.htaccess index 05cd49a..a6dd393 100644 --- a/main/survey/app/.htaccess +++ b/main/survey/app/.htaccess @@ -1,3 +1,3 @@ -# Ne dovolimo direktnega dostopa do tega direktorija - -deny from al +# Ne dovolimo direktnega dostopa do tega direktorija
+
+deny from al
diff --git a/main/survey/app/Controllers/AjaxController.php b/main/survey/app/Controllers/AjaxController.php index 33662e4..91a524b 100644 --- a/main/survey/app/Controllers/AjaxController.php +++ b/main/survey/app/Controllers/AjaxController.php @@ -10,6 +10,7 @@ namespace App\Controllers; // Osnovni razredi
use App\Controllers\StatisticController as Statistic;
use App\Controllers\Vprasanja\VprasanjaController as Vprasanja;
+use App\Controllers\LanguageController as Language;
use App\Models\Model;
use Common;
use Branching;
@@ -17,57 +18,84 @@ use SurveyAdvancedParadataLog; use SurveySetting;
use MailAdapter;
use GDPR;
+use AppSettings;
+use SurveyEmailAccess;
class AjaxController extends Controller
{
//ajax zahteve
- public function __construct()
- {
+ public function __construct(){
+
if(empty($_GET['a'])){
return '';
}
+
+ // inicializiramo jezik za multilang anketo
+ Language::getInstance()->multilang_init();
+
+
if ($_GET['a'] == 'accept_droppable') {
$this->ajax_accept_droppable();
- } elseif ($_GET['a'] == 'accept_ranking') {
+ }
+ elseif ($_GET['a'] == 'accept_ranking') {
$this->ajax_accept_ranking();
- } elseif ($_GET['a'] == 'accept_dragdrop1') {
+ }
+ elseif ($_GET['a'] == 'accept_dragdrop1') {
$this->ajax_accept_dragdrop1();
- } elseif ($_GET['a'] == 'get_dragdrop1_data') {
+ }
+ elseif ($_GET['a'] == 'get_dragdrop1_data') {
$this->ajax_get_dragdrop1_data();
- } elseif ($_GET['a'] == 'delete_dragdrop1_data') {
+ }
+ elseif ($_GET['a'] == 'delete_dragdrop1_data') {
$this->ajax_delete_dragdrop1_data();
- } elseif ($_GET['a'] == 'delete_dragdrop2_data') {
+ }
+ elseif ($_GET['a'] == 'delete_dragdrop2_data') {
$this->ajax_delete_dragdrop2_data();
- } elseif ($_GET['a'] == 'accept_dragdrop_grid') {
+ }
+ elseif ($_GET['a'] == 'accept_dragdrop_grid') {
$this->ajax_accept_dragdrop_grid();
- } elseif ($_GET['a'] == 'accept_sortable_ranking') {
+ }
+ elseif ($_GET['a'] == 'accept_sortable_ranking') {
$this->ajax_accept_sortable_ranking();
- } elseif ($_GET['a'] == 'edit_size') {
+ }
+ elseif ($_GET['a'] == 'edit_size') {
$this->ajax_edit_size();
- } elseif ($_GET['a'] == 'dodaj_ime') {
+ }
+ elseif ($_GET['a'] == 'dodaj_ime') {
$this->ajax_dodaj_ime();
- } elseif ($_GET['a'] == 'spol') {
+ }
+ elseif ($_GET['a'] == 'spol') {
$this->ajax_glasovanje_spol();
- } elseif ($_GET['a'] == 'vote_spol') {
+ }
+ elseif ($_GET['a'] == 'vote_spol') {
$this->ajax_glasovanje_vote_spol();
- } elseif ($_GET['a'] == 'captcha') {
+ }
+ elseif ($_GET['a'] == 'captcha') {
$this->ajax_captcha();
- } elseif ($_GET['a'] == 'skin') {
+ }
+ elseif ($_GET['a'] == 'skin') {
$this->ajax_skin();
- } elseif ($_GET['a'] == 'grupa_for_if') {
+ }
+ elseif ($_GET['a'] == 'grupa_for_if') {
$this->ajax_grupa_for_if();
- } elseif ($_GET['a'] == 'enable_comments') {
+ }
+ elseif ($_GET['a'] == 'enable_comments') {
$this->ajax_enable_comments();
- } elseif ($_GET['a'] == 'continue_later') {
+ }
+ elseif ($_GET['a'] == 'continue_later') {
$this->ajax_continue_later();
- } elseif ($_GET['a'] == 'continue_later_send') {
+ }
+ elseif ($_GET['a'] == 'continue_later_send') {
$this->ajax_continue_later_send();
- } elseif ($_GET['a'] == 'usr_id_data') {
+ }
+ elseif ($_GET['a'] == 'usr_id_data') {
$this->ajax_delete_signature_data();
- }elseif ($_GET['a'] == 'get_tip_opozorila') {
+ }
+ elseif ($_GET['a'] == 'get_tip_opozorila') {
$this->ajax_get_tip_opozorila();
- } // genericna resitev za vse nadaljne
+ }
+ // genericna resitev za vse nadaljne
else {
$ajax = 'ajax_' . $_GET['a'];
if (method_exists($this, $ajax))
@@ -343,30 +371,22 @@ class AjaxController extends Controller }
//asinhrono pobiranje podatkov za ureditev missing
- public function ajax_get_dragdrop1_data()
- {
+ public function ajax_get_dragdrop1_data(){
+
Model::user_not_lurker();
+
$anketa = $_GET['anketa'];
$spremenljivka = $_GET['spremenljivka'];
+
$vre_id = array();
- //echo 'Spremenljivka: '.$spremenljivka;
- //echo 'Anketa: '.$anketa;
- //$sql1 = sisplet_query("SELECT id FROM srv_vrednost WHERE spr_id='$spremenljivka' AND other!=0 ");
+
$sql1 = sisplet_query("SELECT id FROM srv_vrednost WHERE spr_id='$spremenljivka'");
$num = mysqli_num_rows($sql1);
- /* echo '
- <script>
- console.log('.$num.');
- </script>
- '; */
-
while ($row1 = mysqli_fetch_array($sql1)) {
- //$vre_id[$i] = $row1['id'];
array_push($vre_id, $row1['id']);
}
- //echo 'Podatek je: '.$num;
- //echo $vre_id;
+
echo json_encode($vre_id);
}
@@ -472,14 +492,6 @@ class AjaxController extends Controller }
}
- // respondent se strinja z uporabo piskotvkov - nastavimo piskotek ok
- public function ajax_cookie_ok()
- {
-
- setcookie('cookie_ok', '1', time() + 2500000, '/');
-
- }
-
//izpis statistike glede na spol
public function ajax_glasovanje_spol()
{
@@ -494,7 +506,6 @@ class AjaxController extends Controller *
*/
public function ajax_captcha(){
- global $secret_captcha;
$text = strtoupper($_GET['text']);
$code = $_GET['code'];
@@ -502,7 +513,7 @@ class AjaxController extends Controller $usr_id = $_GET['usr_id'];
$recaptchaResponse = $_POST['g-recaptcha-response'];
- $request = file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=".$secret_captcha."&response=".$recaptchaResponse);
+ $request = file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=".AppSettings::getInstance()->getSetting('google-secret_captcha')."&response=".$recaptchaResponse);
// zdaj pa zabeleži mail (pred pošiljanjem)
// zdaj pa še v bazi tistih ki so se ročno dodali
@@ -556,6 +567,7 @@ class AjaxController extends Controller public function ajax_continue_later(){
save('lang_id', (int)$_GET['language']);
+ save('anketa', (int)$_POST['anketa']);
$url = $_POST['url'] . '&return=1';
@@ -571,13 +583,14 @@ class AjaxController extends Controller $srv_forma_send = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_forma_send' . $_lang);
if ($srv_forma_send == '') $srv_forma_send = self::$lang['srv_forma_send'];
+
echo '<div id="continue_later">';
echo '<p>' . $srv_continue_later_txt . ':</p><p class="url">' . $url . '</p>';
echo '<input type="hidden" name="url" id="url" value="' . $url . '">';
- echo '<p>' . $srv_continue_later_email . ': <input type="email" name="email" id="email" value="" placeholder="' . self::$lang['srv_email_example2'] . '"> <button type="submit" onclick="continue_later_send(\'' . self::$site_url . '\', \'' . get('lang_id') . '\'); return false;">' . $srv_forma_send . '</button></p>';
+ echo '<p>' . $srv_continue_later_email . ': <input type="email" name="email" id="email" value="" placeholder="' . self::$lang['srv_email_example2'] . '"> <button class="blue send_later" type="submit" onclick="continue_later_send(\'' . self::$site_url . '\', \'' . get('lang_id') . '\'); return false;">' . $srv_forma_send . '</button></p>';
echo '</div>';
}
@@ -610,6 +623,38 @@ class AjaxController extends Controller catch (Exception $e) {
}
}
+
+ public function ajax_return_edit_send(){
+ global $mysql_database_name;
+
+ ob_clean();
+
+ $s = self::$lang['srv_return_edit_subject'];
+ $t = self::$lang['srv_return_edit_content'] . ': <a href="' . $_POST['url'] . '">' . $_POST['url'] . '</a>';
+
+ // Podpis
+ $signature = Common::getEmailSignature();
+ $t .= $signature;
+
+ $mail = $_POST['email'];
+
+ if ($mail == ''){
+ echo self::$lang['srv_continue_later_fail'];
+ return;
+ }
+
+ try {
+ $MA = new MailAdapter(get('anketa'), $type='alert');
+ $MA->addRecipients($mail);
+ $result = $MA->sendMail(stripslashes($t), $s);
+ }
+ catch (Exception $e) {
+ echo self::$lang['srv_continue_later_fail'];
+ return;
+ }
+
+ echo self::$lang['srv_continue_later_success'];
+ }
public function ajax_get_tip_opozorila() {
$spr_id = $_POST['spr_id'];
@@ -628,7 +673,7 @@ class AjaxController extends Controller $spremenljivka = $_POST['spremenljivka'];
- echo '<h3>'.self::$lang['srv_prevAnswers'].'</h3>';
+ echo '<h2>'.self::$lang['srv_prevAnswers'].'</h2>';
$sql = sisplet_query("SELECT text FROM srv_data_text" . get('db_table') . " WHERE spr_id='".$spremenljivka."' AND usr_id!='".get('usr_id')."' ORDER BY id DESC");
while($row = mysqli_fetch_array($sql)){
@@ -638,8 +683,8 @@ class AjaxController extends Controller }
// Gumb zapri
- echo '<div class="prevAnswers_button">';
- echo '<a href="#" onClick="hide_prevAnswers_all(\''.$spremenljivka.'\'); return false;"><span>'.self::$lang['srv_zapri'].'</span></a>';
+ echo '<div class="button_holder">';
+ echo ' <button class="medium blue" onClick="hide_prevAnswers_all(\''.$spremenljivka.'\'); return false;">'.self::$lang['srv_zapri'].'</button>';
echo '</div>';
echo '<script>
@@ -656,7 +701,7 @@ class AjaxController extends Controller $gdpr_settings = GDPR::getSurveySettings($anketa);
- echo '<h3>'.$lang['srv_gdpr_survey_gdpr_about'].'</h3>';
+ echo '<h2>'.$lang['srv_gdpr_survey_gdpr_about'].'</h2>';
if($gdpr_settings['about'] == ''){
$about_array = GDPR::getGDPRInfoArray($anketa);
@@ -667,20 +712,42 @@ class AjaxController extends Controller else{
echo nl2br($gdpr_settings['about']);
}
-
- echo '<br />';
+
// Gumb zapri
- echo '<div class="prevAnswers_button">';
- echo '<a href="#" onClick="hide_gdpr_about(); return false;"><span>'.$lang['srv_zapri'].'</span></a>';
+ echo '<div class="button_holder">';
+ echo ' <button class="medium blue" onClick="hide_gdpr_about(); return false;">'.$lang['srv_zapri'].'</button>';
echo '</div>';
echo '<script>
$("#fade").on("click", function() {
hide_gdpr_about();
});</script>';
-
- echo '<br />';
+ }
+
+ // Izpisemo popup s pogoji uporabe za modul dostop z emailom (mju)
+ public function ajax_show_email_access_terms() {
+ global $lang;
+
+ $anketa = $_POST['anketa'];
+
+
+ echo '<h2>'.$lang['user_agreement'].'</h2>';
+
+ $sea = new SurveyEmailAccess($anketa);
+ $terms_text = $sea->getEmailAccessSettings('terms_text');
+ echo nl2br($terms_text);
+
+
+ // Gumb zapri
+ echo '<div class="button_holder">';
+ echo ' <button class="medium blue" onClick="hide_email_access_terms(); return false;">'.$lang['srv_zapri'].'</button>';
+ echo '</div>';
+
+ echo '<script>
+ $("#fade").on("click", function() {
+ hide_email_access_terms();
+ });</script>';
}
diff --git a/main/survey/app/Controllers/BodyController.php b/main/survey/app/Controllers/BodyController.php index 308b30c..7a5f819 100644 --- a/main/survey/app/Controllers/BodyController.php +++ b/main/survey/app/Controllers/BodyController.php @@ -30,7 +30,9 @@ use SurveyGorenje; use SurveyNIJZ;
use GDPR;
use UserAccess;
-
+use AppSettings;
+use BranchingAjax;
+use SurveyEmailAccess;
class BodyController extends Controller
{
@@ -216,10 +218,55 @@ class BodyController extends Controller $lang_array[$rowl['lang_id']] = $rowl['language'];
}
+
echo ' <div class="spremenljivka lang_pick">' . "\n";
+ // Posebna izbira jezika za špance - IAS skin
+ if($row['skin'] == 'IAS'){
+
+ echo '<div class="ias_lang_pick">';
+
+ // Ikona in text
+ echo '<div class="ias_lang_pick_select" onClick="$(\'#ias_lang_pick_options\').toggle();">';
+ echo '<div class="ias_lang_icon"><div class="one"></div><div class="two"></div><div class="three"></div></div>';
+ echo '<span class="ias_lang_text">'.self::$lang['lang'].'</span>';
+ echo '</div>';
+
+ // Div z jeziki ki se prikaze na kkliku na ikono
+ echo '<div id="ias_lang_pick_options">';
+
+ foreach ($lang_array AS $key => $val) {
+ echo '<label for="language_'.$key.'" '.($key == $current ? ' class="active"' : '').'>';
+ echo '<input type="radio" name="language" id="language_'.$key.'"
+ value="'.$key.'"
+ '.($key == $current ? ' checked="checked"' : '').'
+ onchange="window.location.href =
+ \'' . SurveyInfo::getSurveyLink() . '?language=\'+document.getElementById(\'language_' . $key . '\').value+\'' .
+ '&survey-'.get('anketa').'=' . get('cookie_url') . '\'+\'' .
+ (isset($_GET['skupina']) ? '&skupina=' . $_GET['skupina'] : '') . '\'+\'' .
+ (isset($_GET['preview']) ? '&preview=' . $_GET['preview'] : '') . '\'+\'' .
+ (isset($_GET['testdata']) ? '&testdata=' . $_GET['testdata'] : '') . '\'+\'' .
+ (isset($_GET['code']) ? '&code=' . $_GET['code'] : '') . '\'+\'' .
+ (isset($_GET['params']) ? '¶ms=' . $_GET['params'] : '') . '\'+\'' .
+ (isset($_GET['usr_id']) ? '&usr_id=' . $_GET['usr_id'] : '') . '\'+\'' .
+ (isset($_GET['status']) ? '&status=' . $_GET['status'] : '') . '\'+\'' .
+ (isset($_GET['recnum']) ? '&recnum=' . $_GET['recnum'] : '') . '\'+\'' .
+ (isset($_GET['enc']) ? '&enc=' . urlencode($_GET['enc']) : '') . '\';
+ return false;">';
+
+ // Font awesome checkbox
+ //echo '<span class="enka-checkbox-radio" '.((Helper::getCustomCheckbox() != 0) ? 'style="font-size:' . Helper::getCustomCheckbox() . 'px;"' : '').'></span>';
+
+ echo $val;
+
+ echo '</label><br />';
+ }
+
+ echo '</div>';
+ }
// Izbira jezika z dropdown menijem
- if (SurveySetting::getInstance()->getSurveyMiscSetting('resp_change_lang_type') == 1) {
+ else if (SurveySetting::getInstance()->getSurveyMiscSetting('resp_change_lang_type') == 1) {
+
echo ' <h3>' . self::$lang['lang'] . ': ';
echo ' <select
name="language"
@@ -248,40 +295,44 @@ class BodyController extends Controller // Izbira jezika z radio gumbi (default)
else {
echo '<h3>' . self::$lang['lang'] . ': </h3>';
- echo '<span style="font-size:13px;">';
+ echo '<span>';
foreach ($lang_array AS $key => $val) {
- echo '<label for="language_' . $key . '">';
- echo '<input type="radio" name="language" id="language_' . $key . '"
- value="' . $key . '"' . ($key == $current ? '
- checked="checked"' : '') . '
- onchange="window.location.href =
- \'' . SurveyInfo::getSurveyLink() . '?language=\'+document.getElementById(\'language_' . $key . '\').value+\'' .
- '&survey-'.get('anketa').'=' . get('cookie_url') . '\'+\'' .
- (isset($_GET['skupina']) ? '&skupina=' . $_GET['skupina'] : '') . '\'+\'' .
- (isset($_GET['preview']) ? '&preview=' . $_GET['preview'] : '') . '\'+\'' .
- (isset($_GET['testdata']) ? '&testdata=' . $_GET['testdata'] : '') . '\'+\'' .
- (isset($_GET['code']) ? '&code=' . $_GET['code'] : '') . '\'+\'' .
- (isset($_GET['params']) ? '¶ms=' . $_GET['params'] : '') . '\'+\'' .
- (isset($_GET['usr_id']) ? '&usr_id=' . $_GET['usr_id'] : '') . '\'+\'' .
- (isset($_GET['status']) ? '&status=' . $_GET['status'] : '') . '\'+\'' .
- (isset($_GET['recnum']) ? '&recnum=' . $_GET['recnum'] : '') . '\'+\'' .
- (isset($_GET['enc']) ? '&enc=' . urlencode($_GET['enc']) : '') . '\';
- return false;">';
+ echo '<div class="variabla">';
+ echo '<label for="language_'.$key.'">';
+
+ echo '<input type="radio" name="language" id="language_' . $key . '"
+ value="' . $key . '"' . ($key == $current ? '
+ checked="checked"' : '') . '
+ onchange="window.location.href =
+ \'' . SurveyInfo::getSurveyLink() . '?language=\'+document.getElementById(\'language_' . $key . '\').value+\'' .
+ '&survey-'.get('anketa').'=' . get('cookie_url') . '\'+\'' .
+ (isset($_GET['skupina']) ? '&skupina=' . $_GET['skupina'] : '') . '\'+\'' .
+ (isset($_GET['preview']) ? '&preview=' . $_GET['preview'] : '') . '\'+\'' .
+ (isset($_GET['testdata']) ? '&testdata=' . $_GET['testdata'] : '') . '\'+\'' .
+ (isset($_GET['code']) ? '&code=' . $_GET['code'] : '') . '\'+\'' .
+ (isset($_GET['params']) ? '¶ms=' . $_GET['params'] : '') . '\'+\'' .
+ (isset($_GET['usr_id']) ? '&usr_id=' . $_GET['usr_id'] : '') . '\'+\'' .
+ (isset($_GET['status']) ? '&status=' . $_GET['status'] : '') . '\'+\'' .
+ (isset($_GET['recnum']) ? '&recnum=' . $_GET['recnum'] : '') . '\'+\'' .
+ (isset($_GET['enc']) ? '&enc=' . urlencode($_GET['enc']) : '') . '\';
+ return false;"
+ >';
+
// Font awesome checkbox
echo '<span class="enka-checkbox-radio" '.((Helper::getCustomCheckbox() != 0) ? 'style="font-size:' . Helper::getCustomCheckbox() . 'px;"' : '').'></span>';
-
+
echo $val;
-
- echo '</label><br />';
+
+ echo '</label>';
+ echo '</div>';
}
+
echo '</span>';
}
-
echo ' </div>' . "\n";
-
}
echo '</div>' . "\n"; // - grupa
@@ -300,14 +351,11 @@ class BodyController extends Controller // JS na submitu prve strani - lahko da preverjamo privacy ali sprejetje cookija
$survey_privacy = SurveySetting::getInstance()->getSurveyMiscSetting('survey_privacy');
- if(($row['cookie_continue'] == 0 && $row['cookie'] != -1) || $survey_privacy == 2){
+ if($survey_privacy == 2){
$js_submit = ' onclick="';
if($survey_privacy == 2)
- $js_submit .= 'privacy_check();';
-
- if($row['cookie_continue'] == 0 && $row['cookie'] != -1)
- $js_submit .= 'cookie_check();';
+ $js_submit .= 'privacy_check();';
$js_submit .= 'return false;"';
}
@@ -395,14 +443,13 @@ class BodyController extends Controller // Ce imamo staticen uvod in preverjanje s captcho
if($row['intro_static'] == 2){
- global $recaptcha_sitekey;
$captcha_error = (isset($_GET['captcha_error']) && $_GET['captcha_error'] == 1) ? true : false;
echo '<br />';
echo '<p>';
- echo '<div class="g-recaptcha" data-sitekey="' .$recaptcha_sitekey .'"></div>';
+ echo '<div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'"></div>';
echo '</p>';
if($captcha_error){
@@ -427,7 +474,7 @@ class BodyController extends Controller echo GDPR::getSurveyIntro(get('anketa'));
// JS za prikaz popup-a
- echo '<script> $(".gdpr_popup_trigger").click(function(){ show_gdpr_about(\''.get('lang_id').'\'); });</script>';
+ echo '<script> $(".gdpr_popup_trigger").click(function(){ show_gdpr_about(\''.self::$lang['id'].'\'); });</script>';
echo '</div>' . "\n";
// Radio buttons
@@ -445,7 +492,6 @@ class BodyController extends Controller ************************************************/
public function displayStaticIntroduction()
{
-
$row = SurveyInfo::getInstance()->getSurveyRow();
// datapiping
@@ -459,6 +505,24 @@ class BodyController extends Controller elseif (isset($_GET['mobile']) && $_GET['mobile'] == 2)
$class .= ' tablet_preview';
+
+ // Spremenljivke, ki se rabijo v JS
+ echo ' <script> ' . "\n";
+
+ echo ' var srv_meta_anketa_id = ' . get('anketa') . '; ' . "\n";
+ echo ' var srv_site_url = \'' . self::$site_url . '\'; ' . "\n";
+ echo ' var _lang = \'' . self::$lang['language'] . '\'; ' . "\n";
+
+ // GDPR popup
+ echo ' $(".gdpr_popup_trigger").click(function(){ show_gdpr_about(\''.self::$lang['id'].'\'); });' . "\n";
+
+ echo ' </script> ' . "\n";
+
+
+ // crn div za ozadje popupov
+ echo '<div id="fade"></div>';
+ echo '<div id="popup"></div>';
+
echo '<div class="outercontainer_holder ' . $class . ' uvod_static">';
echo '<div class="outercontainer_holder_top"></div>';
@@ -565,12 +629,19 @@ class BodyController extends Controller }
echo ' </select>';
echo '</h3>' . "\n";
- } // Izbira jezika z radio gumbi (default)
+ }
+ // Izbira jezika z radio gumbi (default)
else {
+
echo '<h3>' . self::$lang['lang'] . ': </h3>';
- echo '<span style="font-size:13px;">';
+
+ echo '<span>';
+
foreach ($lang_array AS $key => $val) {
+
+ echo '<div class="variabla">';
echo '<label for="language_' . $key . '">';
+
echo '<input type="radio" name="language" id="language_' . $key . '"
value="' . $key . '"' . ($key == $current ? '
checked="checked"' : '') . '
@@ -593,7 +664,8 @@ class BodyController extends Controller echo $val;
- echo '</label><br />';
+ echo '</label>';
+ echo '</div>';
}
echo '</span>';
}
@@ -610,14 +682,12 @@ class BodyController extends Controller if (!get('printPreview')) {
- // JS na submitu prve strani - lahko da preverjamo privacy ali sprejetje cookija
+ // JS na submitu prve strani - lahko da preverjamo privacy
$survey_privacy = SurveySetting::getInstance()->getSurveyMiscSetting('survey_privacy');
- if(($row['cookie_continue'] == 0 && $row['cookie'] != -1) || $survey_privacy == 2){
- $js_submit = ' onclick="';
+ if($survey_privacy == 2){
+ $js_submit = ' onclick="';
if($survey_privacy == 2)
- $js_submit .= 'privacy_check();';
- if($row['cookie_continue'] == 0 && $row['cookie'] != -1)
- $js_submit .= 'cookie_check();';
+ $js_submit .= 'privacy_check();';
$js_submit .= 'return false;"';
}
else{
@@ -647,6 +717,239 @@ class BodyController extends Controller echo '</div>'; // -outercontainer_holder
}
+ /************************************************
+ * Izrišemo uvod za modul email dostop - ne shranimo nicesar, samo prikazemo email s captcho ali pa polje za kodo
+ ************************************************/
+ public function displayEmailAccessIntroduction($response){
+ global $lang;
+
+ $row = SurveyInfo::getInstance()->getSurveyRow();
+
+ // datapiping
+ $row['introduction'] = Helper::dataPiping($row['introduction']);
+
+ SurveySetting::getInstance()->Init(get('anketa'));
+ $hide_mobile_img = SurveySetting::getInstance()->getSurveyMiscSetting('hide_mobile_img');
+ $class = ($hide_mobile_img == '1') ? 'hide_mobile_img' : '';
+ if (isset($_GET['mobile']) && $_GET['mobile'] == 1)
+ $class .= ' mobile_preview';
+ elseif (isset($_GET['mobile']) && $_GET['mobile'] == 2)
+ $class .= ' tablet_preview';
+
+
+ // Spremenljivke, ki se rabijo v JS
+ echo ' <script> ' . "\n";
+
+ echo ' var srv_meta_anketa_id = ' . get('anketa') . '; ' . "\n";
+ echo ' var srv_site_url = \'' . self::$site_url . '\'; ' . "\n";
+ echo ' var _lang = \'' . self::$lang['language'] . '\'; ' . "\n";
+
+ // GDPR popup
+ echo ' $(".gdpr_popup_trigger").click(function(){ show_gdpr_about(\''.self::$lang['id'].'\'); });' . "\n";
+
+ echo ' </script> ' . "\n";
+
+
+ // crn div za ozadje popupov
+ echo '<div id="fade"></div>';
+ echo '<div id="popup"></div>';
+
+
+ echo '<div class="outercontainer_holder ' . $class . ' uvod_static">';
+ echo '<div class="outercontainer_holder_top"></div>';
+
+ echo '<div id="outercontainer" class="' . $class . ' uvod_static">';
+ echo '<div class="outercontainer_header"></div>';
+
+
+ echo '<div id="container">' . "\n";
+
+ Display::getInstance()->logo();
+
+ Display::getInstance()->progress_bar();
+
+ if (!get('printPreview')) {
+ echo '<h1 ' . (SurveyInfo::getInstance()->checkSurveyModule('uporabnost') ? ' class="evalvacija"' : '') . '>' . Helper::getInstance()->displayAkronim() . '</h1>' . "\n";
+ }
+
+ //opozorilo ce urejamo ze reseno anketo
+ if (get('quick_view') == true) {
+ echo '<div id="edit_warning">';
+ echo self::$lang['srv_quick_view_text'];
+ echo '</div>';
+ }
+ //opozorilo ce urejamo ze reseno anketo
+ if (isset($_GET['urejanje'])) {
+ echo '<div id="edit_warning">';
+ echo self::$lang['srv_edit_text'];
+ echo '</div>';
+
+ // Preverimo ce gre za prvo popravljanje podatkov in avtomatsko ustvarimo arhiv podatkov ce je potrebno
+ ob_flush(); // ZAKAJ JE TUKAJ TA FLUSH? KER POTEM NE DELA NAKNADNO UREJANJE CE IMA ANKETA LOOPE
+ $sas = new SurveyAdminSettings();
+ $sas->checkFirstDataChange();
+
+ // Updatamo tracking (ker gre za editiranje odgovorov)
+ TrackingClass::update(get('anketa'), 4);
+ }
+
+ $sea = new SurveyEmailAccess(get('anketa'));
+
+
+ echo '<form method="post" action="' . SurveyInfo::getSurveyLink(false, false) . '&grupa=0' . Header::getSurveyParams(true) . str_replace('&', '&', get('cookie_url')) . '">' . "\n";
+ //echo '<form method="post" action="' . SurveyInfo::getSurveyLink(false, false) . '">' . "\n";
+
+ echo '<div class="grupa">' . "\n";
+
+ echo ' <input type="hidden" name="dummy" value="foo">' . "\n";
+ echo ' <input type="hidden" name="referer" value="' . (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '') . '">' . "\n";
+
+
+ // Stran s kodo - napaka pri vnosu kode ali poslan email
+ if( (isset($_GET['step']) && $_GET['step'] == 'code')
+ || (isset($_POST['code']) && isset($response['error']))
+ || (isset($_POST['email']) && !isset($response['error']))
+ ){
+ // Vnosno polje za kodo
+ echo '<div class="spremenljivka email_access_code">';
+
+ echo ' <div class="naslov">';
+ echo ' <span class="reminder">*</span>';
+ echo ' <p>Vpišite 6-mestno kodo:</p>';
+ echo ' </div>';
+
+ echo ' <div class="variable_holder">';
+ echo ' <input type="text" name="code" value="" placeholder="000 000">';
+ // Napaka
+ if(isset($response['error'])){
+ echo ' <span class="red">'.$response['error'].'</span>';
+ }
+
+ // Text pod kodo - samo ce smo ravnokar vnesli email
+ if(isset($_POST['email'])){
+
+ $email = isset($_POST['email']) ? $_POST['email'] : '';
+
+ echo '<p>';
+ printf ($lang['srv_email_access_code_text1'], date('H:i'));
+ echo ' <a href="mailto:'.$email.'">'.$email.'</a>';
+ echo '</p>';
+
+ echo '<p><ul>';
+ echo '<span class="bold">'.$lang['srv_email_access_code_text2'].'</span>';
+
+ echo '<li>';
+ echo $lang['srv_email_access_code_text2_1'];
+ echo '</li>';
+
+ echo '<li>';
+ printf ($lang['srv_email_access_code_text2_2'], SurveyInfo::getSurveyLink(false, false));
+ echo '</li>';
+
+ echo '<li>';
+ printf ($lang['srv_email_access_code_text2_3'], '<a href="mailto:'.$email.'">'.$email.'</a>');
+ echo '</li>';
+
+ echo '</ul></p>';
+ }
+
+ echo ' </div>';
+
+ echo '</div>';
+ }
+ // Stran z vnosom emaila
+ else{
+
+ // Na prvi strani nad vnosom emaila prikazemo uvod
+ $this->displayIntroductionContent();
+
+ $email = isset($_POST['email']) ? $_POST['email'] : '';
+
+ // Vnosno polje za email
+ echo '<div class="spremenljivka email_access_email">';
+ echo ' <div class="naslov">';
+ echo ' <span class="reminder">*</span>';
+ echo ' <p>'.$lang['srv_email_access_email_input_title'].'</p>';
+ echo ' <p class="spremenljivka_info">'.$lang['srv_email_access_email_input_title_label'].'</p>';
+ echo ' </div>';
+
+ echo ' <div class="variable_holder '.(isset($response['error']['email']) ? 'error' : '').'">';
+ echo ' <input type="text" name="email" value="'.$email.'" size="30" placeholder="'.$lang['srv_email_access_email_input_placeholder'].'">';
+ // Napaka
+ if(isset($response['error']['email'])){
+ echo '<span class="red">'.$response['error']['email'].'</span>';
+ }
+ echo ' </div>';
+
+ // Pogoji uporabe
+ if(true){
+
+ $terms = isset($_POST['terms']) ? $_POST['terms'] : '';
+
+ echo ' <div class="variable_holder terms '.(isset($response['error']['terms']) ? 'error' : '').'">';
+
+ echo ' <input type="hidden" name="terms" value="0">';
+ echo ' <input type="checkbox" name="terms" id="terms" value="1" '.($terms == '1' ? 'checked="checked"' : '').'>';
+ echo ' <span class="enka-checkbox-radio"></span>';
+ echo ' <label for="terms">Strinjam se s</label> <span class="link" onClick="show_email_access_terms();">pogoji uporabe</span>';
+
+ // Napaka
+ /*if(isset($response['error']['terms'])){
+ echo '<span class="red">'.$response['error']['terms'].'</span>';
+ }*/
+
+ echo ' </div>';
+ }
+
+ echo '</div>';
+
+
+ // Captcha
+ if($sea->getEmailAccessSettings('captcha') == '1'){
+
+ $captcha_error = (isset($_GET['captcha_error']) && $_GET['captcha_error'] == 1) ? true : false;
+ echo '<div class="spremenljivka email_access_captcha '.($captcha_error ? 'required_require' : '').'">';
+ echo ' <div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'"></div>';
+ echo '</div>';
+ }
+ }
+
+ echo ' </div>';
+
+
+ echo '</div>' . "\n"; // - grupa
+
+
+ SurveySetting::getInstance()->Init(get('anketa'));
+ if (get('lang_id') != null) $_lang = '_' . get('lang_id'); else $_lang = '';
+ $srv_nextpage = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_nextpage_uvod' . $_lang);
+ $label = $srv_nextpage != '' ? $srv_nextpage : self::$lang['srv_nextpage_uvod'];
+
+ if (!get('printPreview')) {
+
+ echo ' <div class="buttons"><input class="next" type="submit" value="' . $label . '">' . "\n";
+
+ if (isset($_GET['popup']) && $_GET['popup'] == '1')
+ echo '<input class="next" type="submit" value="' . self::$lang['srv_zapri'] . '" onclick="$(\'#popup_div, #popup_iframe\', window.parent.document).hide(); return false;">' . "\n";
+
+ echo '</div>';
+ }
+
+ echo '</form>' . "\n";
+
+
+ echo '</div>' . "\n"; // - container
+
+ if (!get('printPreview')) {
+ $this->displayFooterNote();
+ }
+
+ echo '</div>' . "\n"; // - outercontainer
+
+ echo '<div class="outercontainer_holder_bottom"></div>';
+ echo '</div>'; // -outercontainer_holder
+ }
+
/************************************************
* Izrišemo konec ankete
@@ -657,7 +960,6 @@ class BodyController extends Controller global $lang;
global $admin_type;
global $site_url;
- global $app_settings;
Header::getInstance()->displaySistemske();
@@ -676,6 +978,7 @@ class BodyController extends Controller $sql4 = sisplet_query("SELECT d.* FROM srv_spremenljivka s, srv_grupa g, srv_data_text" . get('db_table') . " d WHERE g.ank_id='" . get('anketa') . "'AND s.gru_id=g.id AND s.sistem='1' AND s.variable='sifizv1' AND d.spr_id=s.id AND d.usr_id='" . get('usr_id') . "'");
$sql5 = sisplet_query("SELECT s.* FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='" . get('anketa') . "'AND s.gru_id=g.id AND s.sistem='1' AND s.variable='podipl'");
$sql6 = sisplet_query("SELECT s.* FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='" . get('anketa') . "'AND s.gru_id=g.id AND s.sistem='1' AND s.variable='podipl2'");
+ $sql7 = sisplet_query("SELECT s.* FROM srv_spremenljivka s, srv_grupa g WHERE g.ank_id='" . get('anketa') . "'AND s.gru_id=g.id AND s.sistem='1' AND s.variable='podipl3'");
// Ce imamo sifro predmeta gre za anketo za ocenjevanje predmetov
if (mysqli_num_rows($sql2) > 0) {
@@ -714,8 +1017,18 @@ class BodyController extends Controller // Pobrisemo md5 (id studenta) iz zacasne tabele eval_data_user zaradi anonimnosti
sisplet_query("DELETE FROM eval_data_user WHERE usr_id='".get('usr_id')."' AND ank_id='".get('anketa')."'");
}
+ // splosna PODIPLOMSKA anketa 3 (ena na studenta, brez predmetov)
+ elseif (mysqli_num_rows($sql7) > 0) {
+ $row1 = mysqli_fetch_array($sql1);
+
+ // student je v celoti odgovoril na anketo
+ sisplet_query("INSERT INTO eval_data_podipl3 (student, ank_id) VALUES ('$row1[student]', '" . get('anketa') . "')");
+
+ // Pobrisemo md5 (id studenta) iz zacasne tabele eval_data_user zaradi anonimnosti
+ sisplet_query("DELETE FROM eval_data_user WHERE usr_id='".get('usr_id')."' AND ank_id='".get('anketa')."'");
+ }
// SPLOSNA anketa (ena na studenta, brez predmetov)
- elseif (mysqli_num_rows($sql1) > 0) {
+ elseif ($sql1 !== false && mysqli_num_rows($sql1) > 0) {
$row1 = mysqli_fetch_array($sql1);
// student je v celoti odgovoril na anketo
@@ -827,7 +1140,7 @@ class BodyController extends Controller $panel_settings = $sp->getPanelSettings();
// Posebno samo za ipanel - Izraelski projekt
- if($app_settings['app_name'] == 'www.1ka.si' && (get('anketa') == '232992' || get('anketa') == '232795' || get('anketa') == '248217' || get('anketa') == '248757' || get('anketa') == '248762')){
+ if(AppSettings::getInstance()->getSetting('app_settings-app_name') == 'www.1ka.si' && (get('anketa') == '232992' || get('anketa') == '232795' || get('anketa') == '248217' || get('anketa') == '248757' || get('anketa') == '248762')){
// Pridobimo id panelista ki je bil shranjen na zacetku resevanja v sistemsko spremenljivko
$sqlP = sisplet_query("SELECT d.*, s.variable FROM srv_data_text".get('db_table')." d, srv_spremenljivka s, srv_grupa g
@@ -868,10 +1181,25 @@ class BodyController extends Controller $panelist_id = $rowP['text'];
// Pridobimo koncen status panelista (ce ni bil nikjer nastavljen uporabimo default)
- $panel_status = (isset($_COOKIE['panel_status']) && $_COOKIE['panel_status'] != '') ? $_COOKIE['panel_status'] : $panel_settings['status_default'];
+ if(isset($_POST['panel_status']) && $_POST['panel_status'] != ''){
+ $panel_status = $_POST['panel_status'];
+ }
+ elseif(isset($_COOKIE['panel_status']) && $_COOKIE['panel_status'] != ''){
+ $panel_status = $_COOKIE['panel_status'];
+ }
+ else{
+ $panel_status = $panel_settings['status_default'];
+ }
- // Nastavimo koncen url za redirect
- $finishUrl = $row['url'].'?'.$panel_settings['user_id_name'].'='.$panelist_id.'&'.$panel_settings['status_name'].'='.$panel_status;
+ // Dodaten pogoj, ce imamo slucajno ? ze v osnovnem delu urlja (da vracamo tudi recimo fiksen parameter)
+ if(strpos($row['url'], "?") !== false){
+ // Nastavimo koncen url za redirect
+ $finishUrl = $row['url'].'&'.$panel_settings['user_id_name'].'='.$panelist_id.'&'.$panel_settings['status_name'].'='.$panel_status;
+ }
+ else{
+ // Nastavimo koncen url za redirect
+ $finishUrl = $row['url'].'?'.$panel_settings['user_id_name'].'='.$panelist_id.'&'.$panel_settings['status_name'].'='.$panel_status;
+ }
}
}
@@ -890,10 +1218,10 @@ class BodyController extends Controller // Glede na vrednost
$naslednja = array_search($resevanje->koda, $kode) + 1;
- $url = sisplet_query("SELECT url FROM srv_hierarhija_koda WHERE koda='".$kode[$naslednja]."'", "obj");
+ $url = sisplet_query("SELECT h.url, a.hash FROM srv_hierarhija_koda h, srv_anketa a WHERE h.koda='".$kode[$naslednja]."' AND h.anketa_id=a.id", "obj");
$url_encode_spremenljivke = urlencode(base64_encode($url->url . '&supersifra=' . $resevanje->supersifra.'&resujem='.$naslednja));
- $redirect = $site_url .'a/'.get('anketa').'?enc='.$url_encode_spremenljivke;
+ $redirect = $site_url .'a/'.$url->hash.'?enc='.$url_encode_spremenljivke;
header("Location: $redirect");
}
@@ -943,8 +1271,8 @@ class BodyController extends Controller // URL na katerega skocimo ce se zapre okno - pogledamo ce imamo nastavljen custom url (settings_optional.php)
- if(isset($app_settings['survey_finish_url']) && $app_settings['survey_finish_url'] != '')
- $close_url = $app_settings['survey_finish_url'];
+ if(AppSettings::getInstance()->getSetting('app_settings-survey_finish_url') !== false)
+ $close_url = AppSettings::getInstance()->getSetting('app_settings-survey_finish_url');
else
$close_url = 'https://www.1ka.si/';
@@ -1013,7 +1341,6 @@ class BodyController extends Controller echo '</div>' . "\n"; //-grupa
if ($row['user_from_cms'] == 2) {
- //echo '<p style="text-align:center"><a href="'.$site_url.'a/'.$this->anketa.'">'.$lang['srv_nextins'].'</a></p>';
echo '<p style="text-align:center"><a href="' . SurveyInfo::getSurveyLink() . '">' . $lang['srv_nextins'] . '</a></p>';
}
@@ -1088,11 +1415,15 @@ class BodyController extends Controller }
+ // Ce imamo url za naknadno urejanje - posiljanje na mail, posljemo avtomatsko mail, ce je vnesel email
+ if ((int)$row['concl_return_edit'] == 1) {
+ $js = 'continueLaterCheckEmail(\''.self::$lang['srv_continue_later_alert'].'\', function(){'.$js.'});';
+ }
+
+
if (!get('printPreview')) {
$srv_konec = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_konec' . $_lang);
- /*if ($row['text'] != '') // besedilo koncne povezave shranimo v misc setting, da bo konsistentno z ostalimi prevodi
- $text = $row['text'];
- else*/
+
if ($srv_konec != '')
$text = $srv_konec;
else
@@ -1108,7 +1439,7 @@ class BodyController extends Controller if ($row['user_from_cms'] == 2 && $row['user_from_cms_email'] == 1 && $admin_type <= 2) { // vnosos
$sqlg = sisplet_query("SELECT id FROM srv_grupa WHERE ank_id='" . get('anketa') . "'ORDER BY vrstni_red ASC LIMIT 1");
$rowg = mysqli_fetch_array($sqlg);
- //echo '<p class="vnos"><a href="'.$site_url.'a/'.$this->anketa.'&grupa='.$rowg['id'].'">'.$lang['srv_nextins'].'</a> | <a href="'.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'">'.$lang['srv_insend'].'</a></p>';
+
echo '<p class="vnos"><a href="' . SurveyInfo::getSurveyLink() . '&grupa=' . $rowg['id'] . '">' . $lang['srv_nextins'] . '</a> | <a href="' . $site_url . 'admin/survey/index.php?anketa=' . get('anketa') . '">' . $lang['srv_insend'] . '</a></p>';
}
@@ -1230,7 +1561,7 @@ class BodyController extends Controller // SKAVTI - prikaz povzetka odgovorov in grafa
global $mysql_database_name;
- //if($mysql_database_name == '1ka' && get('anketa') == '64'){
+ //if($mysql_database_name == '1ka' && get('anketa') == '52'){
if($mysql_database_name == 'real1kasi' && (get('anketa') == '293926' || get('anketa') == '314856' || get('anketa') == '332793')){
echo '<div id="skavti_answers">';
Display::getInstance()->displaySkavtiAnswers();
@@ -1263,11 +1594,10 @@ class BodyController extends Controller * @desc prikaze konec ankete
*/
public function displayKonecGlasovanje(){
- global $app_settings;
echo '<script>var srv_meta_anketa_id = ' . get('anketa') . ';</script>';
- //izpis zakljucka
+ // izpis zakljucka
if (isset($_GET['glas_end']) && $_GET['glas_end'] == 1) {
if (!get('printPreview')) {
@@ -1287,8 +1617,8 @@ class BodyController extends Controller // URL na katerega skocimo ce se zapre okno - pogledamo ce imamo nastavljen custom url (settings_optional.php)
- if(isset($app_settings['survey_finish_url']) && $app_settings['survey_finish_url'] != '')
- $close_url = $app_settings['survey_finish_url'];
+ if(AppSettings::getInstance()->getSetting('app_settings-survey_finish_url') !== false)
+ $close_url = AppSettings::getInstance()->getSetting('app_settings-survey_finish_url');
else
$close_url = 'https://www.1ka.si/';
@@ -1304,11 +1634,19 @@ class BodyController extends Controller }
}
+ SurveySetting::getInstance()->Init(get('anketa'));
+ $hide_mobile_img = SurveySetting::getInstance()->getSurveyMiscSetting('hide_mobile_img');
+ $class = ($hide_mobile_img == '1') ? 'hide_mobile_img' : '';
+ if (isset($_GET['mobile']) && $_GET['mobile'] == 1)
+ $class .= ' mobile_preview';
+ elseif (isset($_GET['mobile']) && $_GET['mobile'] == 2)
+ $class .= ' tablet_preview';
+
- echo '<div class="outercontainer_holder concl_glasovanje">';
+ echo '<div class="outercontainer_holder '.$class.' concl_glasovanje">';
echo '<div class="outercontainer_holder_top"></div>';
- echo '<div id="outercontainer concl_glasovanje">' . "\n";
+ echo '<div id="outercontainer" class="'.$class.'">' . "\n";
echo '<div class="outercontainer_header"></div>';
echo '<div id="container">' . "\n";
@@ -1328,7 +1666,7 @@ class BodyController extends Controller } else {
$concl = $row['conclusion'];
}
- echo ' <h3><p>' . $concl . '</p></h3>' . "\n";
+ echo ' <div class="naslov"><p>' . $concl . '</p></div>' . "\n";
echo ' </div>' . "\n";
@@ -1397,14 +1735,29 @@ class BodyController extends Controller //ce statistike ne prikazujemo skocimo na zakljucek (ce imammo izklopljeno ali nastavleno na samo urednike in ni urednik)
if ($rows['stat'] == 0 || ($rows['stat'] == 2 && self::$admin_type != 0 && self::$admin_type != 1)) {
- //header('Location: '.self::$site_url.'a/'.get('anketa').'&grupa='.get('grupa').'&glas_end=1'.get('cookie_url').'');
- header('Location: ' . SurveyInfo::getSurveyLink() . '&grupa=' . get('grupa') . (isset($_GET['language']) ? '&language=' . $_GET['language'] : '') . '&glas_end=1' . get('cookie_url') . '');
- } else {
+ header('Location: ' . SurveyInfo::getSurveyLink()
+ . '&grupa=' . get('grupa')
+ . (isset($_GET['language']) ? '&language=' . $_GET['language'] : '')
+ . '&glas_end=1'
+ . (isset($_GET['preview']) ? '&preview=' . $_GET['preview'] : '')
+ . (isset($_GET['mobile']) ? '&mobile=' . $_GET['mobile'] : '')
+ . get('cookie_url') . '');
+ }
+ else {
- echo '<div class="outercontainer_holder concl_statistika">';
+ SurveySetting::getInstance()->Init(get('anketa'));
+ $hide_mobile_img = SurveySetting::getInstance()->getSurveyMiscSetting('hide_mobile_img');
+ $class = ($hide_mobile_img == '1') ? 'hide_mobile_img' : '';
+ if (isset($_GET['mobile']) && $_GET['mobile'] == 1)
+ $class .= ' mobile_preview';
+ elseif (isset($_GET['mobile']) && $_GET['mobile'] == 2)
+ $class .= ' tablet_preview';
+
+
+ echo '<div class="outercontainer_holder '.$class.' concl_statistika">';
echo '<div class="outercontainer_holder_top"></div>';
- echo '<div id="outercontainer concl_statistika">' . "\n";
+ echo '<div id="outercontainer" class="concl_statistika '.$class.'">' . "\n";
echo '<div class="outercontainer_header"></div>';
echo '<div id="container">' . "\n";
@@ -1420,8 +1773,8 @@ class BodyController extends Controller echo '</div>' . "\n";
echo '<div class="buttons">';
- //$url_stat = ''.self::$site_url.'a/'.get('anketa').'&grupa='.get('grupa').'&glas_end=1'.get('cookie_url');
- $url_stat = '' . SurveyInfo::getSurveyLink() . '&grupa=' . get('grupa') . (isset($_GET['language']) ? '&language=' . $_GET['language'] : '') . '&glas_end=1' . get('cookie_url');
+
+ $url_stat = '' . SurveyInfo::getSurveyLink() . '&grupa=' . get('grupa') . (isset($_GET['language']) ? '&language=' . $_GET['language'] : '') . '&glas_end=1' . (isset($_GET['preview']) ? '&preview=' . $_GET['preview'] : '').(isset($_GET['mobile']) ? '&mobile=' . $_GET['mobile'] : '').get('cookie_url');
$js = 'document.location.href=\'' . $url_stat . '\';';
// Gumb nazaj
@@ -1539,7 +1892,7 @@ class BodyController extends Controller elseif (isset($_GET['mobile']) && $_GET['mobile'] == 2)
$class .= ' tablet_preview';
- echo '<div class="outercontainer_holder ' . $class . '">';
+ echo '<div class="outercontainer_holder ' . $class . '" concl_evoli>';
echo '<div class="outercontainer_holder_top"></div>';
echo '<div id="outercontainer" class="' . $class . '">' . "\n";
@@ -1629,8 +1982,8 @@ class BodyController extends Controller if ($row['user_from_cms'] == 2 && $row['user_from_cms_email'] == 1 && $admin_type <= 2) { // vnosos
$sqlg = sisplet_query("SELECT id FROM srv_grupa WHERE ank_id='" . get('anketa') . "'ORDER BY vrstni_red ASC LIMIT 1");
$rowg = mysqli_fetch_array($sqlg);
- //echo '<p class="vnos"><a href="'.$site_url.'a/'.$this->anketa.'&grupa='.$rowg['id'].'">'.$lang['srv_nextins'].'</a> | <a href="'.$site_url.'admin/survey/index.php?anketa='.$this->anketa.'">'.$lang['srv_insend'].'</a></p>';
- echo '<p class="vnos"><a href="' . SurveyInfo::getSurveyLink() . '&grupa=' . $rowg['id'] . '">' . $lang['srv_nextins'] . '</a> | <a href="' . $site_url . 'admin/survey/index.php?anketa=' . get('anketa') . '">' . $lang['srv_insend'] . '</a></p>';
+
+ echo '<p class="vnos"><a href="' . SurveyInfo::getSurveyLink() . '&grupa=' . $rowg['id'] . '">' . $lang['srv_nextins'] . '</a> | <a href="' . $site_url . 'admin/survey/index.php?anketa=' . get('anketa') . '">' . $lang['srv_insend'] . '</a></p>';
}
echo '</div>' . "\n"; // -container
@@ -1664,8 +2017,9 @@ class BodyController extends Controller elseif (isset($_GET['mobile']) && $_GET['mobile'] == 2)
$class .= ' tablet_preview';
+ $grupa_class = 'grupa_'.get('grupa');
- echo '<div class="outercontainer_holder ' . $class . '">';
+ echo '<div class="outercontainer_holder '.$class.' '.$grupa_class.'">';
echo '<div class="outercontainer_holder_top"></div>';
echo '<div id="outercontainer" class="' . $class . '">';
@@ -1693,7 +2047,7 @@ class BodyController extends Controller // Preverimo ce gre za prvo popravljanje podatkov in avtomatsko ustvarimo arhiv podatkov ce je potrebno
//ob_flush(); // ZAKAJ JE TUKAJ TA FLUSH? KER POTEM NE DELA NAKNADNO UREJANJE CE IMA ANKETA LOOPE
- $sas = new SurveyAdminSettings();
+ $sas = new SurveyAdminSettings($action=0, $anketa=get('anketa'));
$sas->checkFirstDataChange();
// Updatamo tracking (ker gre za editiranje odgovorov)
@@ -1730,7 +2084,7 @@ class BodyController extends Controller {
$row = SurveyInfo::getInstance()->getSurveyRow();
- echo '<div class="outercontainer_holder">';
+ echo '<div class="outercontainer_holder all_pages">';
echo '<div class="outercontainer_holder_top"></div>';
echo '<div id="outercontainer">';
@@ -1842,10 +2196,13 @@ class BodyController extends Controller // Izbira jezika z radio gumbi (default)
else {
echo '<h3>' . self::$lang['lang'] . ': </h3>';
- echo '<span style="font-size:13px;">';
+ echo '<span>';
foreach ($lang_array AS $key => $val) {
+
+ echo '<div class="variabla">';
echo '<label for="language_' . $key . '">';
+
echo '<input type="radio" name="language" id="language_' . $key . '"
value="' . $key . '"' . ($key == $current ? '
checked="checked"' : '') . '
@@ -1868,7 +2225,8 @@ class BodyController extends Controller echo $val;
- echo '</label><br />';
+ echo '</label>';
+ echo '</div>';
}
echo '</span>';
}
@@ -1907,7 +2265,7 @@ class BodyController extends Controller public function displayFooterNote(){
- global $mysql_database_name, $app_settings;
+ global $mysql_database_name;
$row = SurveyInfo::getInstance()->getSurveyRow();
@@ -1919,9 +2277,8 @@ class BodyController extends Controller }
// Custom footer
- if(isset($app_settings['footer_survey_custom']) && $app_settings['footer_survey_custom'] == 1){
-
- echo '<p>'.$app_settings['footer_survey_text'].'</p>';
+ if(AppSettings::getInstance()->getSetting('app_settings-footer_survey_custom') !== false){
+ echo '<p>'.AppSettings::getInstance()->getSetting('app_settings-footer_survey_text').'</p>';
}
// Default footer
else{
@@ -1931,49 +2288,14 @@ class BodyController extends Controller $link_privacy = (self::$lang['id'] == '1') ? 'https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-storitve-1ka/politika-zasebnosti' : 'https://www.1ka.si/d/en/about/terms-of-use/privacy-policy';
$link_paradata = (self::$lang['id'] == '1') ? 'https://www.1ka.si/d/sl/o-1ka/pogoji-uporabe-1ka/izklop-parapodatkov' : 'https://www.1ka.si/d/en/about/terms-of-use/turn-off-paradata';
+
+ // 1. vrstica - 1ka - spletne ankete
echo '<p class="footer_survey_UL">Univerza <i>v Ljubljani</i></p>';
echo '<p class="footer_survey_FDV"><i>Fakulteta za družbene vede</i></p>';
echo '<p class="footer_survey_PoweredBy"><a href="'.$link.'" target="_blank">Powered by: 1KA</a></p>';
echo '<p class="footer_1ka"><a href="'.$link.'" target="_blank">1KA - ' . self::$lang['srv_footer_1ka'] . '</a></p>';
- echo '<p class="privacy">';
-
- $survey_ip = SurveySetting::getInstance()->getSurveyMiscSetting('survey_ip');
- $ip_show = SurveySetting::getInstance()->getSurveyMiscSetting('survey_show_ip');
- $survey_browser = SurveySetting::getInstance()->getSurveyMiscSetting('survey_browser');
- $survey_referal = SurveySetting::getInstance()->getSurveyMiscSetting('survey_referal');
- $survey_date = SurveySetting::getInstance()->getSurveyMiscSetting('survey_date');
-
-
- $privacy_text = '';
-
- // Ce imamo vse izklopljeno je anketa brez parapodatkov
- if(($survey_ip == 1 || $ip_show == 0) && $survey_browser == 1 && $survey_referal == 1 && $survey_date == 1){
-
- $privacy_text = '<a href="'.$link_paradata.'" target="_blank">' . self::$lang['srv_no_paradata'] . '</a>';
-
- echo $privacy_text;
- }
- else{
- echo '<a href="'.$link.'" target="_blank">' . self::$lang['srv_no_anketa'] . ' </a>';
-
- // Piskotki
- if ($row['cookie'] == -1)
- $privacy_text .= '<a href="'.$link_cookie.'" target="_blank">' . self::$lang['srv_no_cookie'] . '</a>, ';
-
- // IP sledenje
- if ($survey_ip == 1)
- $privacy_text .= '<a href="'.$link_paradata.'" target="_blank">' . self::$lang['srv_no_ip'] . '</a>, ';
-
- // Email povezovanje
- if ($row['user_base'] == 1 && $row['show_email'] == 0)
- $privacy_text .= '<a href="'.$link_paradata.'" target="_blank">' . self::$lang['srv_no_email'] . '</a>, ';
-
- echo substr($privacy_text, 0, -2);
- }
-
- echo '</p>';
-
+ // 3. vrstica - politika zasebnosti
echo '<p class="privacy_link">';
echo '<a href="' . $link_privacy . '" target="_blank">' . self::$lang['srv_privacy_policy'] . '</a>';
echo '</p>';
@@ -1983,26 +2305,26 @@ class BodyController extends Controller // OKNO Z NASTAVITVAMI ZA PREVIEW / TEST
- if (isset($_GET['preview']) && $_GET['preview'] == 'on' && $_GET['no_preview'] != '1') {
+ if (isset($_GET['preview']) && $_GET['preview'] == 'on' && (!isset($_GET['no_preview']) || $_GET['no_preview'] != '1')) {
echo '<div id="preview-window">';
+ echo '<div id="preview_switch">';
+ // Preklop na celostranski preview
+ echo '<div id="nacina">';
+ echo '<span class="bold">'.self::$lang['srv_mode'] . ':</span>';
+ echo '<span id="normalni" class="'.(get('displayAllPages') ? 'nonactive' : 'active').'"><a href="' . SurveyInfo::getSurveyLink() . Header::getSurveyParams(false, null, array('pages')) . '" title="' . self::$lang['srv_normal_x'] . '">' . self::$lang['srv_normal'] . '</a></span>';
+ echo '<span id="celostranski" class="'.(get('displayAllPages') ? 'active' : 'nonactive').'"><a href="' . SurveyInfo::getSurveyLink() . Header::getSurveyParams(false, array('pages' => 'all', 'mobile' => '0')) . '" title="' . self::$lang['srv_scrolling_x'] . '">' . self::$lang['srv_scrolling'] . '</a></span>';
+ echo '</div>';
+
// Gump za odprtje/zaprtje okna
- echo '<div id="preview_open" '.($_GET['testdata'] == 'on' ? ' class="testdata"' : '').'>';
+ echo '<div id="preview_open" '.(isset($_GET['testdata']) && $_GET['testdata'] == 'on' ? ' class="testdata"' : '').'>';
echo '<a href="#" onclick="preview_popup_open(); return false;" class="preview_icon_open" style="display:none;"><span class="faicon dropdown_blue"></span></a>';
echo '<a href="#" onclick="preview_popup_close(); return false;" class="preview_icon_close"><span class="faicon dropup_blue"></span></a>';
echo '</div>';
-
-
- // Preklop na celostranski preview
- echo '<div id="preview_switch">';
-
- echo '<span class="bold">'.self::$lang['srv_mode'] . ':</span>';
- echo '<span class="'.(get('displayAllPages') ? 'nonactive' : 'active').'"><a href="' . SurveyInfo::getSurveyLink() . Header::getSurveyParams(false, null, array('pages')) . '" title="' . self::$lang['srv_normal_x'] . '">' . self::$lang['srv_normal'] . '</a></span>';
- echo '<span class="'.(get('displayAllPages') ? 'active' : 'nonactive').'"><a href="' . SurveyInfo::getSurveyLink() . Header::getSurveyParams(false, array('pages' => 'all', 'mobile' => '0')) . '" title="' . self::$lang['srv_scrolling_x'] . '">' . self::$lang['srv_scrolling'] . '</a></span>';
echo '</div>';
@@ -2010,9 +2332,9 @@ class BodyController extends Controller // Vsebina - preview-holder
echo '<div id="preview-holder">';
- echo '<div id="preview" class="' . ($_GET['testdata'] == 'on' ? 'testdata' : '') . '">';
+ echo '<div id="preview" class="' . (isset($_GET['testdata']) && $_GET['testdata'] == 'on' ? 'testdata' : '') . '">';
- if ($_GET['testdata'] == 'on')
+ if (isset($_GET['testdata']) && $_GET['testdata'] == 'on')
echo '<p>' . self::$lang['srv_testalert'] . '</p>';
else
echo '<p>' . self::$lang['srv_previewalert'] . '</p>';
@@ -2052,9 +2374,6 @@ class BodyController extends Controller if (isset($_GET['displayvariables']))
echo '<input type="hidden" name="displayvariables" value="' . $_GET['displayvariables'] . '">';
- if (isset($_GET['disablealert']))
- echo '<input type="hidden" name="disablealert" value="' . $_GET['disablealert'] . '">';
-
if (isset($_GET['disablecode']))
echo '<input type="hidden" name="disablecode" value="' . $_GET['disablecode'] . '">';
@@ -2080,7 +2399,7 @@ class BodyController extends Controller // Preklop med preview-ji za mobilnik, tablico in pc
if(!get('displayAllPages')){
- echo '<span id="preview_device"><span>' . self::$lang['srv_para_graph_device'] . ': </span>';
+ echo '<div id="preview_device"><span>' . self::$lang['srv_para_graph_device'] . ': </span>';
if (isset($_GET['mobile']) && $_GET['mobile'] == '1')
$device_value = 1;
@@ -2089,16 +2408,16 @@ class BodyController extends Controller else
$device_value = 0;
- echo '<a href="#" title="PC" onClick="$(\'#device_value\').val(\'0\'); document.change_diable.submit();"><span class="faicon monitor ' . ($device_value == 0 ? ' active' : '') . '"></span></a>';
+ echo '<a href="#" title="PC" onClick="$(\'#device_value\').val(\'0\'); document.change_diable.submit();"><div id="monitor" class="' . ($device_value == 0 ? ' active' : '') . '"><span class="faicon monitor"></span></div></a>';
// Ce imamo izklopljene mobilne prilagoditve ne pustimo preview-ja na mobile, ker itak ne prikaze scalano
$mobile_friendly = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_friendly');
if($mobile_friendly != '0'){
- echo '<a href="#" title="' . self::$lang['srv_preview_tablet'] . '" onClick="$(\'#device_value\').val(\'2\'); document.change_diable.submit();"><span class="faicon tablet ' . ($device_value == 2 ? ' active' : '') . '"></span></a>';
- echo '<a href="#" title="' . self::$lang['srv_preview_mobile'] . '" onClick="$(\'#device_value\').val(\'1\'); document.change_diable.submit();"><span class="faicon mobile ' . ($device_value == 1 ? ' active' : '') . '"></span></a>';
+ echo '<a href="#" title="' . self::$lang['srv_preview_mobile'] . '" onClick="$(\'#device_value\').val(\'1\'); document.change_diable.submit();"><div id="mobile" class="' . ($device_value == 1 ? ' active' : '') . '"><span class="faicon mobile"></span></div></a>';
+ echo '<a href="#" title="' . self::$lang['srv_preview_tablet'] . '" onClick="$(\'#device_value\').val(\'2\'); document.change_diable.submit();"><div id="tablet" class="' . ($device_value == 2 ? ' active' : '') . ' ' . ($device_value == 1 ? ' mobile' : '') . ' ' . ($device_value == 0 ? ' monitor' : '') . '"><span class="faicon tablet"></span></div></a>';
}
- echo '</span>';
+ echo '</div>';
}
@@ -2122,9 +2441,6 @@ class BodyController extends Controller if (isset($_GET['displayvariables']))
echo '<input type="hidden" name="displayvariables" value="' . $_GET['displayvariables'] . '">';
- if (isset($_GET['disablealert']))
- echo '<input type="hidden" name="disablealert" value="' . $_GET['disablealert'] . '">';
-
if (isset($_GET['disablecode']))
echo '<input type="hidden" name="disablecode" value="' . $_GET['disablecode'] . '">';
@@ -2164,7 +2480,13 @@ class BodyController extends Controller // FORM s checkbox nastavitvami
- $link = SurveyInfo::getSurveyLink(get('anketa')) . '' . Header::getSurveyParams(false, null, array('disableif', 'disablealert', 'disablecode', 'displayifs', 'displayvariables', 'hidecomment', 'mobile')) . '&survey-' . get('anketa') . '=' . $_GET['survey-' . get('anketa') . ''] . '&grupa=' . $_GET['grupa'];
+ $link = SurveyInfo::getSurveyLink(get('anketa')) . Header::getSurveyParams(false, null, array('disableif', 'disablecode', 'displayifs', 'displayvariables', 'hidecomment', 'mobile'));
+ if(isset($_GET['survey-'.get('anketa')]))
+ $link .= '&survey-' . get('anketa') . '=' . $_GET['survey-'.get('anketa')];
+ if(isset($_GET['grupa']))
+ $link .= '&grupa=' . $_GET['grupa'];
+
+
echo '<form name="change_diable" action="' . $link . '" method="get">';
echo '<input type="hidden" name="mobile" id="device_value" value="' . $device_value . '">';
@@ -2175,22 +2497,22 @@ class BodyController extends Controller if (isset($_GET['code']))
echo '<input type="hidden" name="code" value="' . $_GET['code'] . '">';
- echo '<p><label for="disableif"><input type="checkbox" value="1" ' . ($_GET['disableif'] == '1' ? ' checked' : '') . ' name="disableif" id="disableif" onchange="document.change_diable.submit();"><span class="enka-checkbox-radio"></span>';
- echo ' ' . self::$lang['srv_disableif'] . '</label></p>';
+ if (isset($_GET['glas_end']))
+ echo '<input type="hidden" name="glas_end" value="' . $_GET['glas_end'] . '">';
- echo '<p><label for="disablealert"><input type="checkbox" value="1" ' . ($_GET['disablealert'] == '1' ? ' checked' : '') . ' name="disablealert" id="disablealert" onchange="document.change_diable.submit();"><span class="enka-checkbox-radio"></span>';
- echo ' ' . self::$lang['srv_disablealert'] . '</label></p>';
+ echo '<p><label for="disableif"><input type="checkbox" value="1" ' . (isset($_GET['disableif']) && $_GET['disableif'] == '1' ? ' checked' : '') . ' name="disableif" id="disableif" onchange="document.change_diable.submit();"><span class="enka-checkbox-radio"></span>';
+ echo ' ' . self::$lang['srv_disableif'] . '</label></p>';
// Pogoj za izlapljanje kode ce imamo email vabila z zahtevano kodo
if ($row['user_base'] == 1 && $row['individual_invitation'] != 0 && $row['usercode_skip'] == 0) {
- echo '<p><label for="disablecode"><input type="checkbox" value="1" ' . ($_GET['disablecode'] == '1' ? ' checked' : '') . ' name="disablecode" id="disablecode" onchange="document.change_diable.submit();"><span class="enka-checkbox-radio"></span>';
+ echo '<p><label for="disablecode"><input type="checkbox" value="1" ' . (isset($_GET['disablecode']) && $_GET['disablecode'] == '1' ? ' checked' : '') . ' name="disablecode" id="disablecode" onchange="document.change_diable.submit();"><span class="enka-checkbox-radio"></span>';
echo ' ' . self::$lang['srv_disablecode'] . '</label></p>';
}
- echo '<p><label for="displayifs"><input type="checkbox" value="1" ' . ($_GET['displayifs'] == '1' ? ' checked' : '') . ' name="displayifs" id="displayifs" onchange="document.change_diable.submit();"><span class="enka-checkbox-radio"></span>';
+ echo '<p><label for="displayifs"><input type="checkbox" value="1" ' . (isset($_GET['displayifs']) && $_GET['displayifs'] == '1' ? ' checked' : '') . ' name="displayifs" id="displayifs" onchange="document.change_diable.submit();"><span class="enka-checkbox-radio"></span>';
echo ' ' . self::$lang['srv_displayifs'] . '</label></p>';
- echo '<p><label for="displayvariables"><input type="checkbox" value="1" ' . ($_GET['displayvariables'] == '1' ? ' checked' : '') . ' name="displayvariables" id="displayvariables" onchange="document.change_diable.submit();"><span class="enka-checkbox-radio"></span>';
+ echo '<p><label for="displayvariables"><input type="checkbox" value="1" ' . (isset($_GET['displayvariables']) && $_GET['displayvariables'] == '1' ? ' checked' : '') . ' name="displayvariables" id="displayvariables" onchange="document.change_diable.submit();"><span class="enka-checkbox-radio"></span>';
echo ' ' . self::$lang['srv_displayvariables'] . '</label></p>';
@@ -2201,7 +2523,7 @@ class BodyController extends Controller $question_resp_comment = SurveySetting::getInstance()->getSurveyMiscSetting('question_resp_comment');
$preview_disable_test_insert = SurveySetting::getInstance()->getSurveyMiscSetting('preview_disable_test_insert');
- if ($_GET['testdata'] == 'on' || $preview_disable_test_insert == 0) {
+ if ((isset($_GET['testdata']) && $_GET['testdata'] == 'on') || $preview_disable_test_insert == 0) {
if ($question_resp_comment == 0) {
echo '<p><a href="#" onclick="$.post(\'' . self::$site_url . '/main/survey/ajax.php?a=enable_comments\', {anketa: ' . get('anketa') . '}, function () { window.location = window.location + \'&testdata=on\' }); return false;">';
@@ -2214,10 +2536,11 @@ class BodyController extends Controller echo '</a></p>';
}
else {
- if ($_GET['testdata'] == 'on') {
+ if (isset($_GET['testdata']) && $_GET['testdata'] == 'on') {
echo '<p><label for="hidecomment"><input type="checkbox" value="1" ' . ($_GET['hidecomment'] == '1' ? ' checked' : '') . ' name="hidecomment" id="hidecomment" onchange="document.change_diable.submit();"><span class="enka-checkbox-radio"></span>';
echo ' ' . self::$lang['srv_preview_comments2'] . '</label></p>';
- } else {
+ }
+ else {
echo '<p><a href="#" onclick="$.post(\'' . self::$site_url . '/main/survey/ajax.php?a=enable_comments\', {anketa: ' . get('anketa') . '}, function () { window.location = window.location + \'&testdata=on\' }); return false;">';
echo self::$lang['srv_savedatapreview'];
echo '</a></p>';
@@ -2246,11 +2569,13 @@ class BodyController extends Controller }
$sqlUserAutor = sisplet_query("SELECT ank_id, uid FROM srv_dostop WHERE ank_id='" . get('anketa') . "' AND uid='" . self::$global_user_id . "'");
+
(mysqli_num_rows($sqlUserAutor) > 0) ? save('userAutor', true) : save('userAutor', false);
+
// Komentarji urednikov na anketo
if (get('userAutor')) {
- echo '<div style="margin: 20px 0 15px; width: 100%;">';
+ echo '<div id="comments_bottom_line">';
$view = 1;
$survey_comment = SurveySetting::getInstance()->getSurveyMiscSetting('survey_comment');
@@ -2258,61 +2583,83 @@ class BodyController extends Controller if ((self::$admin_type <= $survey_comment && $survey_comment != '') && (/*$preview_hide_survey_comment != 1 ||*/
$_GET['testdata'] == 'on')
) {
+ echo '<div class="open_comment_box" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0" onclick="toggleCommentDropdownTestSurvey();">';
+ echo '<span class="faicon fa-comment empty"></span>';
+ echo self::$lang['srv_survey_general_comment'] . ' ';
+ echo '</a>';
- echo '<span class="stngs floatLeft">';
+ echo '</div>'; //.open_comment_box
- $show_survey_comment = $_GET['show_survey_comment'];
- if ($row['forum'] == 0 || $row['thread'] == 0) {
- echo '<a href="#" onclick="return false;" class="surveycomment bold" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
- echo self::$lang['srv_comment_splosen'] . ' ';
- echo '<span class="faicon comment" title="' . self::$lang['srv_survey_comment'] . '" alt="' . self::$lang['srv_survey_comment'] . '"></span>';
- echo '</a>';
- } else {
+ echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/js-lang.php?lang='.self::$lang['lang_short'].'&v=13.06.07"></script>';
+ echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/comments.js"></script>';
+ }
- $sqlf = sisplet_query("SELECT COUNT(*) AS count FROM post WHERE tid='$row[thread]'");
- $rowf = mysqli_fetch_array($sqlf);
- $rowf['count']--; //zaradi 1. avtomatskega posta
- echo '<a href="#" onclick="return false;" class="surveycomment bold" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0">';
- echo self::$lang['srv_comment_splosen'] . ' ';
- echo '<span class="faicon comment" title="' . self::$lang['srv_survey_comment'] . '" alt="' . self::$lang['srv_survey_comment'] . '"></span>';
-
- // ali prikazemo okno odprto - je dodan tak admin komentar
- $sqlf1 = sisplet_query("SELECT * FROM post p WHERE p.tid='$row[thread]' AND p.ocena='5'");
- while ($rowf1 = mysqli_fetch_array($sqlf1)) {
- $s = sisplet_query("SELECT * FROM views WHERE pid='$rowf1[id]' AND uid='self::$global_user_id'");
- if (mysqli_num_rows($s) == 0)
- $show_survey_comment = 1;
- }
- echo '</a>';
- }
+ // Uredniske nastavitve link
+ echo '<a href="' . self::$site_url . '/admin/survey/index.php?anketa=' . get('anketa') . '&a=urejanje" target="_blank" title="' . self::$lang['srv_uredniske_nastavitve'] . '">';
+ echo '<div id="comment_settings">';
+ echo '<span class="faicon settings"></span>';
+ echo '</div></a>';
- echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/js-lang.php?lang='.self::$lang['lang_short'].'&v=13.06.07"></script>';
- // Ce je tole vklopljeno se js porusi?
- //echo '<script type="text/javascript" src="'.self::$site_url.'/admin/survey/minify/g=jsnew?v=13.06.07"></script>';
- echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/jquery/jquery.qtip-1.0.js"></script>';
- echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/script.js"></script>';
- echo '<script> $(function() { load_comment(\'#surveycomment_0_' . $view . '\'' . ($show_survey_comment == '1' ? ', \'2\'' : '') . '); });</script>';
+ echo '</div>'; // #comments_bottom_line
- echo '</span>';
- }
- // Uredniske nastavitve link
- echo '<span class="floatRight bold"><a href="' . self::$site_url . '/admin/survey/index.php?anketa=' . get('anketa') . '&a=testiranje&popup=open" target="_blank" title="' . self::$lang['srv_uredniske_nastavitve'] . '">' . self::$lang['settings'] . ' <span class="faicon settings"></span></a></span>';
+ //dropdown na klik ikone
+ echo '<div id="comment_dropdown_test_survey" class="displayNone">';
+ $anketa = get('anketa');
+ echo '<div class="first_holder_div" id="survey_comment_0_1">';
+ $ba = new BranchingAjax($anketa);
+ $ba->add_comment_field(0, '0', '1', false, false);
echo '</div>';
+
+ echo '<div class="button_holder">';
+ echo ' <button class="small white-blue" onclick="toggleCommentDropdownTestSurvey(); return false;">'.self::$lang['edit1338'].'</button>';
+ echo ' <button class="small blue" onclick="add_comment(\'0\', \'0\', \'1\', $(\'#vsebina_0_1\').val()); actionNotePopup(\'comment_added\', \'success\'); return false;">'.self::$lang['srv_comments_new'].'</button>';
+ echo '</div>';
+
+ echo '</div>'; //comment_dropdown
}
// Komentarji respondentov na anketo
- elseif (self::$global_user_id > 0 || true) {
+ else{
- echo '<p class="stngs">';
+ echo '<div id="comments_bottom_line">';
$view = 1;
$survey_comment_resp = SurveySetting::getInstance()->getSurveyMiscSetting('survey_comment_resp');
$preview_hide_survey_comment = SurveySetting::getInstance()->getSurveyMiscSetting('preview_hide_survey_comment');
if (((self::$admin_type <= $survey_comment_resp && self::$admin_type != -1 && $survey_comment_resp != '') || $survey_comment_resp == 4) && ($preview_hide_survey_comment != 1 || $_GET['testdata'] == 'on')) {
- $show_survey_comment = $_GET['show_survey_comment'];
+ echo '<div class="open_comment_box" id="surveycomment_0_' . $view . '" type="0" view="' . $view . '" spremenljivka="0" onclick="toggleCommentDropdownTestSurvey();">';
+ echo '<span class="faicon fa-comment empty"></span>';
+ echo self::$lang['srv_survey_general_comment'] . ' ';
+ echo '</a>';
+
+ echo '</div>'; //.open_comment_box
+
+ echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/js-lang.php?lang='.self::$lang['lang_short'].'&v=13.06.07"></script>';
+ echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/comments.js"></script>';
+
+ echo '</div>'; // #comments_bottom_line
+
+
+ //dropdown na klik ikone
+ echo '<div id="comment_dropdown_test_survey" class="displayNone">';
+
+ $anketa = get('anketa');
+ echo '<div class="first_holder_div" id="survey_comment_0_1">';
+ $ba = new BranchingAjax($anketa);
+ $ba->add_comment_field(0, '0', '1', false, false);
+ echo '</div>';
+
+ echo '<div class="button_holder">';
+ echo ' <button class="small white-blue" onclick="toggleCommentDropdownTestSurvey(); return false;">'.self::$lang['edit1338'].'</button>';
+ echo ' <button class="small blue" onclick="add_comment(\'0\', \'4\', \'1\', $(\'#vsebina_0_1\').val()); actionNotePopup(\'comment_added\', \'success\'); return false;">'.self::$lang['srv_comments_new'].'</button>';
+ echo '</div>';
+
+ echo '</div>'; //comment_dropdown
+
+ /*$show_survey_comment = $_GET['show_survey_comment'];
if ($row['forum'] == 0 || $row['thread_resp'] == 0) {
echo '<a href="#" onclick="return false;" class="surveycomment bold" id="surveycomment_0_' . $view . '" type="4" view="' . $view . '" spremenljivka="0">';
@@ -2344,10 +2691,10 @@ class BodyController extends Controller //echo '<script type="text/javascript" src="'.self::$site_url.'/admin/survey/minify/g=jsnew?v=13.06.07"></script>';
echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/jquery/jquery.qtip-1.0.js"></script>';
echo '<script type="text/javascript" src="' . self::$site_url . '/admin/survey/script/script.js"></script>';
- echo '<script> $(function() { load_comment(\'#surveycomment_0_' . $view . '\'' . ($show_survey_comment == '1' ? ', \'2\'' : '') . '); });</script>';
+ echo '<script> $(function() { load_comment(\'#surveycomment_0_' . $view . '\'' . ($show_survey_comment == '1' ? ', \'2\'' : '') . '); });</script>';*/
}
- echo '</p>';
+ echo '</div>';
}
}
@@ -2358,8 +2705,6 @@ class BodyController extends Controller ?><script>
if (localStorage.preview_popup == 1) {
- $('#preview-holder, #preview_switch').hide();
-
$('.preview_icon_open').show();
$('.preview_icon_close').hide();
@@ -2391,26 +2736,8 @@ class BodyController extends Controller save('cookie_expire', $row['cookie']);
- // alert za shranjevanje cookiejev
- if (get('cookie_expire') != -1 && !(isset($_COOKIE['cookie_ok']) && $_COOKIE['cookie_ok'] == 1) && !empty($row)) {
-
- echo '<div id="cookie_alert">';
- if($mysql_database_name == 'vprasalnikirsrssi')
- echo self::$lang['srv_cookie_ok_rsrs'];
- else
- echo self::$lang['srv_cookie_ok'];
- echo '</div>';
-
- ?><script>
- $(function () {
- $('#cookie_alert').slideDown();
- });
- $('#cookie_ok').on('click', cookie_ok);
- </script><?
- }
-
// alert da je testna anketa
- if ((get('cookie_expire') == -1 || (isset($_COOKIE['cookie_ok']) && $_COOKIE['cookie_ok'] == 1)) && isset($_GET['testdata']) && $_GET['testdata'] == 'on') {
+ if (isset($_GET['testdata']) && $_GET['testdata'] == 'on') {
echo '<div id="test_alert">';
echo self::$lang['srv_test_alert'];
@@ -2423,7 +2750,7 @@ class BodyController extends Controller </script><?
}
// alert da je predogled
- elseif ((get('cookie_expire') == -1 || (isset($_COOKIE['cookie_ok']) && $_COOKIE['cookie_ok'] == 1)) && isset($_GET['preview']) && $_GET['preview'] == 'on') {
+ elseif (isset($_GET['preview']) && $_GET['preview'] == 'on') {
echo '<div id="test_alert">';
echo self::$lang['srv_preview_alert'];
@@ -2447,12 +2774,6 @@ class BodyController extends Controller return false;
});
</script><?
-
-
- // Alert ce ni javascripta
- echo '<div id="javascript_alert">';
- echo self::$lang['srv_javascript_warning'];
- echo '</div>';
}
}
\ No newline at end of file diff --git a/main/survey/app/Controllers/CheckController.php b/main/survey/app/Controllers/CheckController.php index d39a6c2..36b11b6 100644 --- a/main/survey/app/Controllers/CheckController.php +++ b/main/survey/app/Controllers/CheckController.php @@ -14,7 +14,7 @@ use enkaParameters; use SurveyInfo;
use SurveyMissingValues;
use Common;
-use Mobile_Detect;
+use AppSettings;
class CheckController extends Controller
@@ -51,6 +51,9 @@ class CheckController extends Controller public function checkGrupa()
{
+ if(get('grupa') == '0' || get('grupa') == '')
+ return false;
+
$sql = sisplet_query("SELECT id FROM srv_spremenljivka WHERE gru_id = '" . get('grupa') . "' ORDER BY vrstni_red");
if (!$sql) echo mysqli_error($GLOBALS['connect_db']);
while ($row = mysqli_fetch_array($sql)) {
@@ -197,7 +200,7 @@ class CheckController extends Controller if ($row['operator'] == 0 && mysqli_num_rows($sql3) == 0 && mysqli_num_rows($sql3b) == 0)
return false;
- elseif ($row['operator'] == 0 && mysqli_num_rows($sql3b) > 0 && mysqli_num_rows($sql4b) > 0)
+ elseif ($row['operator'] == 0 && mysqli_num_rows($sql3) == 0 && mysqli_num_rows($sql3b) > 0 && mysqli_num_rows($sql4b) > 0)
return false;
elseif ($row['operator'] == 1 && mysqli_num_rows($sql3) > 0)
return false;
@@ -404,7 +407,7 @@ class CheckController extends Controller $browser_detect = get_browser($useragent, true);
- $detect = New Mobile_Detect();
+ $detect = New \Detection\MobileDetect;
$detect->setUserAgent($useragent);
// Detect naprave (pc, mobi, tablet, robot)
@@ -681,8 +684,7 @@ class CheckController extends Controller */
public function check_captcha()
{
- global $secret_captcha;
-
+
// Ce urejamo podatke v admin vmesniku ne preverjamo nicesar
if(isset($_GET['t']) && $_GET['t'] == 'postprocess' || get('grupa') == '0' || get('grupa') == ''){
return;
@@ -696,7 +698,7 @@ class CheckController extends Controller if ($captcha == 1) {
$recaptchaResponse = $_POST['g-recaptcha-response'];
- $request = file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=".$secret_captcha."&response=".$recaptchaResponse);
+ $request = file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=".AppSettings::getInstance()->getSetting('google-secret_captcha')."&response=".$recaptchaResponse);
// zdaj pa zabeleži mail (pred pošiljanjem)
// zdaj pa še v bazi tistih ki so se ročno dodali
@@ -716,10 +718,9 @@ class CheckController extends Controller *
*/
public function check_captcha_intro(){
- global $secret_captcha;
$recaptchaResponse = $_POST['g-recaptcha-response'];
- $request = file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=".$secret_captcha."&response=".$recaptchaResponse);
+ $request = file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=".AppSettings::getInstance()->getSetting('google-secret_captcha')."&response=".$recaptchaResponse);
if(strstr($request,"true")){
//
@@ -742,7 +743,7 @@ class CheckController extends Controller $qry = sisplet_query("SELECT id FROM srv_vrednost WHERE spr_id='$spremenljivka' AND other IN ('" . implode('\',\'', array_keys($missing_values)) . "')");
$missing_vrednosti = array();
while ($row = mysqli_fetch_assoc($qry)) {
- $missing_vrednosti[] = $row[id];
+ $missing_vrednosti[] = $row['id'];
}
# pogledamo ali imamo kak zapis v srv_data_vrednost. potem je to najbrž missing
diff --git a/main/survey/app/Controllers/DisplayController.php b/main/survey/app/Controllers/DisplayController.php index c0cbf43..a783892 100644 --- a/main/survey/app/Controllers/DisplayController.php +++ b/main/survey/app/Controllers/DisplayController.php @@ -18,6 +18,8 @@ use SurveyInfo; use SurveySetting;
use Common;
use SurveyGorenje;
+use SurveyPanel;
+use AppSettings;
class DisplayController extends Controller
{
@@ -39,8 +41,8 @@ class DisplayController extends Controller return new DisplayController();
}
- public function logo()
- {
+ public function logo(){
+
// Za gorenje posebej prikazemo logo
if(Common::checkModule('gorenje')){
SurveyGorenje::logoGorenje(get('anketa'), get('usr_id'));
@@ -52,12 +54,31 @@ class DisplayController extends Controller // Logo prikazemo angleski v vseh primerih kjer respondentov jezik ni slovenscina in ce ni custom - popravimo tudi link na angleski frontend
if (self::$lang['language'] != 'Slovenščina') {
- $class = ' class="english"';
+
+ $class = 'english';
+
if (strpos(self::$site_url, 'www.1ka.si') !== false)
$url = self::$site_url.'d/en/';
}
- echo '<div id="logo" ' . $class . '><a href="' . $url . '" title="' . self::$lang['srv_1cs'] . ' ' . self::$lang['srv_footer_1ka'] . '" target="_blank">' . self::$lang['srv_1cs'] . '</a><div id="logo_right"></div></div>';
+ // Ce gre za lastno namestitev ali virtualko prikazemo logo "namestitev"
+ if(isLastnaInstalacija() || isVirtual()){
+ $class .= ' namestitev';
+ }
+ // Ce gre za AAI prikazemo logo "arnes"
+ elseif(isAAI()){
+ $class .= ' arnes';
+ }
+
+ // Ce imamo nastavljen custom logo za celo aplikacijo
+ $custom_logo_style = '';
+ $custom_logo = AppSettings::getInstance()->getSetting('app_settings-custom_logo');
+ if($custom_logo != false && $custom_logo != ''){
+ $class = 'custom_logo';
+ $custom_logo_style = 'style="background-image: url(\'../../../public/img/logo/custom_logo/'.$custom_logo.'\');"';
+ }
+
+ echo '<div id="logo" class="'.$class.'" '.$custom_logo_style.'><a href="'.$url.'" title="'.self::$lang['srv_1cs'].' ' .self::$lang['srv_footer_1ka'].'" target="_blank">'.self::$lang['srv_1cs'].'</a><div id="logo_right"></div></div>';
}
/**
@@ -116,13 +137,39 @@ class DisplayController extends Controller // Prikaz opcije "nadaljuj kasneje"
if ($row['continue_later'] == 1) {
+
SurveySetting::getInstance()->Init(get('anketa'));
+
if (get('lang_id') != null) $_lang = '_' . get('lang_id'); else $_lang = '';
$srv_continue_later = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_continue_later' . $_lang);
if ($srv_continue_later == '') $srv_continue_later = self::$lang['srv_continue_later'];
+ // Pri panelu v url samo vnesemo panel id respondenta, ker nimamo piskotkov
+ if(SurveyInfo::getInstance()->checkSurveyModule('panel')){
+
+ $sp = new SurveyPanel(get('anketa'));
+ $panel_id_name = $sp->getPanelSettings('user_id_name');
+
+ if ($panel_id_name != '') {
+
+ $sqlPanel = sisplet_query("SELECT d.text AS panel_id
+ FROM srv_spremenljivka s, srv_data_text".get('db_table')." d
+ WHERE s.variable='".$panel_id_name."' AND s.id=d.spr_id AND d.usr_id='".get('usr_id')."'
+ ");
+
+ if (mysqli_num_rows($sqlPanel) > 0) {
+ $rowPanel = mysqli_fetch_array($sqlPanel);
+ $panel_id = $rowPanel['panel_id'];
+
+ $panel_url = SurveyInfo::getSurveyLink().'?'.$panel_id_name.'='.$panel_id;
+
+ echo '<input type="hidden" id="panel_url" name="panel_url" value="'.$panel_url.'">';
+ }
+ }
+ }
+
echo '<div class="continue_later_setting">';
- echo ' <a href="#" onclick="continue_later(\'' . self::$site_url . '\', \'' . get('lang_id') . '\'); return false;">' . $srv_continue_later . '</a>';
+ echo ' <a href="#" onclick="continue_later(\'' . self::$site_url . '\', \'' . self::$lang['id'] . '\'); return false;">' . $srv_continue_later . '</a>';
echo '</div>';
}
@@ -138,8 +185,9 @@ class DisplayController extends Controller }
// Prikaze ikono za izvoz pdf rezultatov v zakljucku
- public function displayRespondetnPDF()
- {
+ public function displayRespondetnPDF(){
+ global $site_domain;
+
$row = SurveyInfo::getInstance()->getSurveyRow();
if ((int)$row['concl_PDF_link'] == 1) {
@@ -182,7 +230,16 @@ class DisplayController extends Controller }
echo '</p></div>';
- }
+ }
+ elseif( SurveyInfo::getInstance()->checkSurveyModule('nijz_radar_report') ){
+ # parametre zapakiramo v array injih serializiramo in zakodiramo z base64
+ $pdf_url = self::$site_url . 'admin/survey/izvoz.php?dc=' . base64_encode(serialize(array('m' => 'pdf_nijz', 'anketa' => get('anketa'), 'usr_id' => get('usr_id'))));
+
+ #echo '<div id="icon_bar">';
+ echo '<br class="clr"/><div><p>';
+ echo '<a href="' . $pdf_url . '" class="pdfExport" target="_blank"><span class="sprites pdf_white"></span> '.self::$lang['srv_report_pdf'].'</a>';
+ echo '</p></div>';
+ }
else{
# parametre zapakiramo v array injih serializiramo in zakodiramo z base64
$pdf_url = self::$site_url . 'admin/survey/izvoz.php?dc=' . base64_encode(serialize(array('a' => 'pdf_results', 'anketa' => get('anketa'), 'usr_id' => get('usr_id'), 'type' => '0')));
@@ -205,10 +262,21 @@ class DisplayController extends Controller $return_url = $_POST['url'] . '&return=1';
$return_url = SurveyInfo::getSurveyLink() . get('cookie_url') . '&return=1';
- echo '<br class="clr"/><div class="return_edit_url"><p>';
- echo self::$lang['srv_concl_return_edit_URL'].':<br />';
- echo '<a href="'.$return_url.'" title="'.self::$lang['srv_concl_return_edit_URL'].'"><span>'.$return_url.'</span></a>';
- echo '</p></div>';
+ echo '<br class="clr"/>';
+
+ echo '<div id="return_edit" class="return_edit_url">';
+
+ echo ' <p>';
+ echo self::$lang['srv_concl_return_edit_URL'].':<br />';
+ echo ' <a href="'.$return_url.'" title="'.self::$lang['srv_concl_return_edit_URL'].'"><span>'.$return_url.'</span></a>';
+ echo ' </p>';
+
+ echo '<br class="clr"/>';
+
+ echo ' <input type="hidden" name="url" id="url" value="' . $return_url . '">';
+ echo ' <p id="return_edit_email">' . self::$lang['srv_continue_later_email'] . ': <input type="email" name="email" id="email" value="" placeholder="' . self::$lang['srv_email_example2'] . '"> <button type="submit" class="blue" onclick="return_edit_send(\'' . self::$site_url . '\', \'' . get('lang_id') . '\'); return false;">' . self::$lang['srv_forma_send'] . '</button></p>';
+
+ echo '</div>';
}
}
@@ -499,17 +567,23 @@ class DisplayController extends Controller $vprasanja = array();
$spr_ids = '';
- // Loop cez vsa ustrezna vprasanja in njihove vrednosti (jih zakesiramo)
- $sqlS = sisplet_query("SELECT s.id AS spr_id, s.naslov AS spr_naslov, s.variable AS spr_variable
- FROM srv_spremenljivka s, srv_grupa g
+
+ // Loop cez vsa ustrezna vprasanja in njihove vrednosti (jih zakesiramo) in bloke v katerih se nahajajo (pohvale in izzivi morajo biti iz locenih blokov)
+ $sqlS = sisplet_query("SELECT s.id AS spr_id, s.naslov AS spr_naslov, s.variable AS spr_variable, i.label AS block_label, i.id AS block_id
+ FROM srv_spremenljivka s, srv_grupa g, srv_branching b, srv_if i
WHERE g.ank_id='".get('anketa')."' AND s.gru_id=g.id
AND s.variable LIKE 'R%'
+ AND b.ank_id='".get('anketa')."' AND b.element_spr=s.id AND i.id=b.parent AND i.tip='1'
");
+
if (!$sqlS) echo mysqli_error($GLOBALS['connect_db']);
while($rowS = mysqli_fetch_array($sqlS)){
$vprasanje_number = substr($rowS['spr_variable'], 1);
- $vprasanja[$rowS['spr_id']] = $vprasanje_number;
+ $vprasanja[$rowS['spr_id']]['number'] = $vprasanje_number;
+
+ $vprasanja[$rowS['spr_id']]['block_id'] = $rowS['block_id'];
+ $vprasanja[$rowS['spr_id']]['block_label'] = $block_label;
// ID-ji vprasanj za query
$spr_ids .= $rowS['spr_id'].',';
@@ -581,18 +655,28 @@ class DisplayController extends Controller echo '<div class="spremenljivka" style="border-bottom:0;"><div class="naslov">'.$rowNagovor['naslov'].'</div></div>';
$i = 1;
+ $used_block_ids = array();
foreach($pohvale as $pohvala_vrednost => $vrednost){
+ $spr_id = $vrednost['spr_id'];
+
+ $block_id = $vprasanja[$spr_id]['block_id'];
+
+ // Pohvala iz tega bloka je ze bila prikazana
+ if(in_array($block_id, $used_block_ids))
+ continue;
+
+ // Prikazane so bile ze 3 pohvale
if($i > $max_odgovorov)
break;
- $spr_id = $vrednost['spr_id'];
- $vprasanje_number = $vprasanja[$spr_id];
+ $vprasanje_number = $vprasanja[$spr_id]['number'];
echo '<div class="spremenljivka">';
echo ' <div class="naslov">'.$pohvale_besedilo[$vprasanje_number].'</div>';
echo '</div>';
+ $used_block_ids[] = $block_id;
$i++;
}
@@ -608,18 +692,28 @@ class DisplayController extends Controller echo '<div class="spremenljivka" style="border-bottom:0;"><div class="naslov">'.$rowNagovor['naslov'].'</div></div>';
$i = 1;
+ $used_block_ids = array();
foreach($izzivi as $izziv_vrednost => $vrednost){
-
+
+ $spr_id = $vrednost['spr_id'];
+
+ $block_id = $vprasanja[$spr_id]['block_id'];
+
+ // Izziv iz tega bloka je ze bil prikazan
+ if(in_array($block_id, $used_block_ids))
+ continue;
+
+ // Prikazani so bili ze 3 izzivi
if($i > $max_odgovorov)
break;
- $spr_id = $vrednost['spr_id'];
- $vprasanje_number = $vprasanja[$spr_id];
+ $vprasanje_number = $vprasanja[$spr_id]['number'];
echo '<div class="spremenljivka">';
echo ' <div class="naslov">'.$izzivi_besedilo[$vprasanje_number].'</div>';
echo '</div>';
+ $used_block_ids[] = $block_id;
$i++;
}
@@ -700,7 +794,7 @@ class DisplayController extends Controller $json_pohvale = json_encode($pohvale);
$json_izzivi = json_encode($izzivi);
- echo '<br><h2 style="padding-left: 20px;">Pajkova mreža</h2>';
+ echo '<br><h2 style="padding-left: 20px;">PAJKOVA MREŽA</h2>';
// Nagovor za mrezo
$sqlNagovor = sisplet_query("SELECT s.naslov, s.variable
@@ -731,7 +825,7 @@ class DisplayController extends Controller $anketa = get('anketa');
- echo '<div class="outercontainer_holder"><div class="outercontainer_holder_top"></div>';
+ echo '<div class="outercontainer_holder error"><div class="outercontainer_holder_top"></div>';
echo '<div id="outercontainer">';
echo ' <div class="outercontainer_header"></div>';
@@ -781,35 +875,6 @@ class DisplayController extends Controller }
}
- /**
- * @desc konstruktor
- */
- public function PrintSurvey()
- {
-
- if (isset($_GET['anketa'])) {
- save('anketa', $_GET['anketa']);
-
- $rowa = SurveyInfo::getInstance()->getSurveyRow();
-
- // uvodni nagovor
- if ($rowa['show_intro'] != 0) {
- Body::getInstance()->displayIntroduction();
- }
-
- // prikažemo ankete
- do {
- save('grupa', Find::getInstance()->findNextGrupa());
-
- Body::getInstance()->displayAnketa();
- } while (get('grupa') != Find::getInstance()->findNextGrupa() && Find::getInstance()->findNextGrupa() > 0);
-
- // prikažemo konec
- Body::getInstance()->displayKonec();
- } else
- echo 'Ni podatkov o anketi!';
- }
-
/**
* @desc prikaze chat okno za tawk chat, ce je modul vklopljen (js koda)
diff --git a/main/survey/app/Controllers/HeaderController.php b/main/survey/app/Controllers/HeaderController.php index 1a7df13..ad77435 100644 --- a/main/survey/app/Controllers/HeaderController.php +++ b/main/survey/app/Controllers/HeaderController.php @@ -15,6 +15,7 @@ use SurveyAdvancedParadataLog; use SurveyInfo;
use SurveyThemeEditor;
use SurveyPanel;
+use AppSettings;
class HeaderController extends Controller
{
@@ -55,7 +56,6 @@ class HeaderController extends Controller 'urejanje',
'quick_view',
'disableif',
- 'disablealert',
'disablecode',
'displayifs',
'displayvariables',
@@ -116,9 +116,11 @@ class HeaderController extends Controller return header('Location: ' . self::$site_url);
die("Missing anketa id!");
}
- $anketa = (($get->anketa) ? $get->anketa : $_POST['anketa']);
+ $anketa_hash = (($get->anketa) ? $get->anketa : $_POST['anketa']);
+ $anketa = getSurveyIdFromHash($anketa_hash);
// Shranimo vse spremenljivke iz get parametrov v classu VariableClass
+ save('anketa_hash', $anketa_hash);
save('anketa', $anketa);
save('get', $get);
@@ -149,8 +151,6 @@ class HeaderController extends Controller * @desc zgenereira header
*/
public function header(){
- global $app_settings;
-
// preprecimo caching - tudi s klikom na gumb nazaj!
header("Last-Modified: " . gmdate("D, j M Y H:i:s") . " GMT");
@@ -168,8 +168,8 @@ class HeaderController extends Controller $rowv = mysqli_fetch_array($sqlv);
// Custom header title
- if(isset($app_settings['head_title_custom']) && $app_settings['head_title_custom'] == 1){
- echo '<title>'.strip_tags(Helper::getInstance()->displayAkronim(0)).' - '.$app_settings['head_title_text'].'</title>' . "\n";
+ if(AppSettings::getInstance()->getSetting('app_settings-head_title_custom')){
+ echo '<title>'.strip_tags(Helper::getInstance()->displayAkronim(0)).' - '.AppSettings::getInstance()->getSetting('app_settings-head_title_text').'</title>' . "\n";
}
// Default header title
else{
@@ -181,6 +181,9 @@ class HeaderController extends Controller // Preprecimo vklop compatibility moda v IE
echo ' <meta http-equiv="X-UA-Compatible" content="IE=edge" />' . "\n";
+ // Preprecimo indexiranje botov (google...)
+ echo ' <meta name="robots" content="noindex">' . "\n";
+
// nova verzija UI 1.8.10 - includamo minificirano skupaj z script.js (uporabimo iste jQuery fajle kot v adminu)
echo ' <script src="' . self::$site_url . 'admin/survey/minify/g=jsfrontend?v=' . $rowv['value'] . '"></script>' . "\n";
echo '<script src="https://www.google.com/recaptcha/api.js" async defer></script>' . "\n";
@@ -188,13 +191,14 @@ class HeaderController extends Controller // tukaj nalozimo CSS za jquery in template temo
echo ' <link href="' . self::$site_url . 'admin/survey/minify/g=cssfrontend?v=' . $rowv['value'] . '" rel="stylesheet">' . "\n";
- //nalozimo stringe iz langa za JS
+ // nalozimo stringe iz langa za JS
echo '<script type="text/javascript" src="' . self::$site_url . 'admin/survey/script/js-lang.php?lang=' . ($row['lang_admin'] == 1 ? 'si' : 'en') . '&v=' . $rowv['value'] . '"></script>' . "\n";
- // nalozimo open sans fonte za nov design
- echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Open+Sans:400italic,600italic,700italic,400,600,700&subset=latin,latin-ext" rel="stylesheet" />';
- /*echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=PT+Sans+Narrow:400,700&subset=latin,latin-ext" rel="stylesheet">';*/
- echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,500,500i,600,600i,700,700i&subset=latin-ext" rel="stylesheet" />';
+ // nalozimo source sans pro fonte za nov design
+ echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,400i,500,500i,600,600i,700,700i&subset=latin-ext" rel="stylesheet">';
+ // Zaenkrat se obdrzimo montserratt zaradi kompatibilnosti za nazaj
+ echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=Montserrat:400,400i,500,500i,600,600i,700,700i&subset=latin-ext" rel="stylesheet" />';
+
// CSS mobile skin za telefone in tablice
@@ -205,7 +209,15 @@ class HeaderController extends Controller // za MJU anketo nalozimo posebej custom skin
if(SurveyInfo::getInstance()->checkSurveyModule('mju_theme') == '1'){
$this->loadCustomMadeSkin($custom_skin='MJU');
- }
+ }
+ // Custom skin za IAS (Spanci)
+ elseif($row['skin'] == 'IAS'){
+ $this->loadCustomMadeSkin($custom_skin='IAS');
+ }
+ // Custom skin za IAS (Spanci)
+ elseif($row['skin'] == 'Automaticservis'){
+ $this->loadCustomMadeSkin($custom_skin='Automaticservis');
+ }
// CSS samo za mobilne telefone
else{
$this->themeEditorMobileCustom();
@@ -220,6 +232,14 @@ class HeaderController extends Controller if(SurveyInfo::getInstance()->checkSurveyModule('mju_theme') == '1'){
$this->loadCustomMadeSkin($custom_skin='MJU');
}
+ // Custom skin za IAS (Spanci)
+ elseif($row['skin'] == 'IAS'){
+ $this->loadCustomMadeSkin($custom_skin='IAS');
+ }
+ // Custom skin za IAS (Spanci)
+ elseif($row['skin'] == 'Automaticservis'){
+ $this->loadCustomMadeSkin($custom_skin='Automaticservis');
+ }
// profili tem - skinov
else{
$this->themeEditor();
@@ -236,6 +256,14 @@ class HeaderController extends Controller elseif(SurveyInfo::getInstance()->checkSurveyModule('mju_theme') == '1'){
$this->loadCustomMadeSkin($custom_skin='MJU');
}
+ // Custom skin za IAS (Spanci)
+ elseif($row['skin'] == 'IAS'){
+ $this->loadCustomMadeSkin($custom_skin='IAS');
+ }
+ // Custom skin za Automaticservis
+ elseif($row['skin'] == 'Automaticservis'){
+ $this->loadCustomMadeSkin($custom_skin='Automaticservis');
+ }
// profili tem - skinov
else{
$this->themeEditor();
@@ -293,7 +321,7 @@ class HeaderController extends Controller $preview = ' class="preview"';
echo '<body ' . $preview . ' ' . $evoli_copy_disable . '>' . "\n";
- // Zamenjamo class no_js z js -> test javacsripta za userje (javascript_warning)
+
echo "<script>" . "\n";
$tooltips_maxwitdh = "maxWidth: '880'";
if ($row['skin'] == 'Embed2')
@@ -302,7 +330,6 @@ class HeaderController extends Controller $tooltips_maxwitdh = "maxWidth: '680'";
echo "$(document).ready(function(){
- $('html').removeClass('no_js').addClass('js');
$('.tooltip.mouseover').tooltipster({
theme: 'tooltipster-shadow',";
echo $tooltips_maxwitdh;
@@ -314,8 +341,6 @@ class HeaderController extends Controller echo $tooltips_maxwitdh;
echo " });";
- // Tega ne rabimo vec, ker urejamo okvir slik direktno s css-jem (na parenta (.variabla) damo class checked)
- //echo "$('div.variabla input:checkbox, div.variabla input:radio').on('change', function() { activateCehckboxImages($(this)); });"."\n";
# če smo v quick_view disejblamo vse elemente frme
if (get('quick_view') == true) {
@@ -402,7 +427,6 @@ class HeaderController extends Controller public function themeEditor($themePreview = false){
- if (isset($_GET['theme'])) $themePreview = true; // to ne bo vec
if (isset($_GET['theme-preview']) && $_GET['theme-preview'] == '1') $themePreview = true; // to je pri urejanju CSSa da se refresha mimo cachea
$row = SurveyInfo::getSurveyRow();
@@ -410,7 +434,8 @@ class HeaderController extends Controller if (isset($_GET['theme_profile'])) {
$row['skin_profile'] = (int)$_GET['theme_profile'];
}
- if (isset($_GET['theme'])) {//to ne bo vec
+ if (isset($_GET['theme'])) {
+ $themePreview = true;
$row['skin'] = str_replace('.css', '', $_GET['theme']);
$row['skin_profile'] = 0;
}
@@ -456,15 +481,15 @@ class HeaderController extends Controller break;
case '2':
- echo '.spremenljivka';
+ echo '.spremenljivka .naslov';
break;
case '3':
- echo '.variable_holder';
+ echo '.variable_holder .variabla, td.question, td.category';
break;
case '4':
- echo 'table.grid_table tbody tr:nth-child(2n+1)';
+ echo 'table.grid_table tbody tr:nth-child(2n+1), .variable_holder .variabla';
break;
case '5':
@@ -511,7 +536,7 @@ class HeaderController extends Controller break;
case '4':
- echo 'font-size: ' . $rowt['value'] . '%;';
+ echo 'font-size: ' . $rowt['value'] . '% !important;';
break;
case '5':
@@ -600,13 +625,15 @@ class HeaderController extends Controller // Najprej nalozimo mobile template skin
echo ' <link rel="stylesheet" href="' . self::$site_url . 'public/css/main_mobile.css" media="all">' . "\n";
-
+
+ $themePreview = false;
if (isset($_GET['theme_profile'])) {
$row['skin_profile_mobile'] = (int)$_GET['theme_profile'];
}
if (isset($_GET['theme'])) {
$themePreview = true;
$row['mobile_skin'] = str_replace('.css', '', $_GET['theme']);
+ $row['skin_profile_mobile'] = 0;
}
@@ -655,15 +682,15 @@ class HeaderController extends Controller break;
case '3':
- echo '.variable_holder, .variable_holder .variabla label';
+ echo '.variable_holder .variabla label, .grid_mobile_title_text, .grid_mobile_variable_title';
break;
case '4':
- echo 'table.grid_table tbody tr:nth-child(2n+1)';
+ echo 'table.grid_table tbody tr:nth-child(2n+1), .grid_mobile_variable, .variable_holder .variabla';
break;
case '5':
- echo '.spremenljivka';
+ echo 'div.spremenljivka';
break;
case '7':
@@ -708,12 +735,12 @@ class HeaderController extends Controller case '5':
if ($rowt['value'] == '0') {
- echo 'border: 0;';
+ echo 'border: 0 !important;';
} elseif ($rowt['value'] == '2') {
- echo 'border: 1px #B9C5D9 solid;';
+ echo 'border: 1px #B9C5D9 solid !important;';
} else {
echo 'border: 0;';
- echo 'border-top: 1px #B9C5D9 solid;';
+ echo 'border-top: 1px #B9C5D9 solid !important;';
}
break;
@@ -779,7 +806,7 @@ class HeaderController extends Controller $sqla = sisplet_query("SELECT logo FROM srv_theme_profiles WHERE id = '$row[skin_profile]'");
$rowa = mysqli_fetch_array($sqla);
- if ($rowa['logo'] != '') {
+ if (isset($rowa['logo']) && $rowa['logo'] != '') {
$this->customLogoCSS($rowa['logo']);
}
}
@@ -846,6 +873,39 @@ class HeaderController extends Controller echo ' <link rel="stylesheet" href="' . self::$site_url . 'main/survey/skins/___po_narocilu/MJU.css' . ($themePreview ? '?foo=' . mt_rand() : '') . '">' . "\n";
}
}
+ // Custom skin za IAS anketo - spanci
+ elseif($custom_skin == 'IAS'){
+
+ // Font PT sans
+ //echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=PT+Sans:400,700&subset=latin,latin-ext" rel="stylesheet">';
+ echo '<link type="text/css" href="https://fonts.googleapis.com/css2?family=Playfair+Display:wght@700&display=swap" rel="stylesheet"> ';
+
+ // mobitel
+ if (get('mobile') == 1) {
+ echo ' <link rel="stylesheet" href="' . self::$site_url . 'public/css/main_mobile.css" media="all">' . "\n";
+ echo ' <link rel="stylesheet" href="' . self::$site_url . 'main/survey/skins/___po_narocilu/IAS_mobile.css' . ($themePreview ? '?foo=' . mt_rand() : '') . '">' . "\n";
+ }
+ // navaden racunalnik
+ else{
+ echo ' <link rel="stylesheet" href="' . self::$site_url . 'main/survey/skins/___po_narocilu/IAS.css' . ($themePreview ? '?foo=' . mt_rand() : '') . '">' . "\n";
+ }
+ }
+ // Custom skin za automaticservis
+ elseif($custom_skin == 'Automaticservis'){
+
+ // Font PT sans
+ echo '<link type="text/css" href="https://fonts.googleapis.com/css?family=PT+Sans:400,700&subset=latin,latin-ext" rel="stylesheet">';
+
+ // mobitel
+ if (get('mobile') == 1) {
+ echo ' <link rel="stylesheet" href="' . self::$site_url . 'public/css/main_mobile.css" media="all">' . "\n";
+ echo ' <link rel="stylesheet" href="' . self::$site_url . 'main/survey/skins/___po_narocilu/Automaticservis_mobile.css' . ($themePreview ? '?foo=' . mt_rand() : '') . '">' . "\n";
+ }
+ // navaden racunalnik
+ else{
+ echo ' <link rel="stylesheet" href="' . self::$site_url . 'main/survey/skins/___po_narocilu/Automaticservis.css' . ($themePreview ? '?foo=' . mt_rand() : '') . '">' . "\n";
+ }
+ }
}
@@ -875,7 +935,7 @@ class HeaderController extends Controller // Ce je original visji kot 160 ga avtomatsko pomanjsamo
elseif($size_orig[1] > 160) {
- $image = self::$site_url . 'function/thumb.php?src=' . self::$site_url . 'main/survey/uploads/' . $logo . '&h=100';
+ $image = self::$site_url . 'utils/thumb.php?src=' . self::$site_url . 'main/survey/uploads/' . $logo . '&h=100';
$size = @getimagesize($image);
if($size){
@@ -894,9 +954,9 @@ class HeaderController extends Controller // CSS za custom logo
echo '<style type="text/css">';
- echo '#logo, #logo.english, #footer_survey #logo, #footer_survey #logo.english {';
+ echo '#logo, #logo.english, #logo.namestitev, #logo.arnes, #footer_survey #logo, #footer_survey #logo.english, #footer_survey #logo.namestitev, #footer_survey #logo.arnes {';
- echo ' background-image: url('.$css_bg_image.'); ';
+ echo ' background-image: url('.$css_bg_image.') !important; ';
if($css_width != '')
echo ' width: '.$css_width.'; ';
diff --git a/main/survey/app/Controllers/HelperController.php b/main/survey/app/Controllers/HelperController.php index 58e6784..2e6dd71 100644 --- a/main/survey/app/Controllers/HelperController.php +++ b/main/survey/app/Controllers/HelperController.php @@ -52,7 +52,7 @@ class HelperController extends Controller ************************************************/
public static function mobile()
{
- $detect = New \Mobile_Detect();
+ $detect = New \Detection\MobileDetect;
$mobile = 0; // 0 - klasicna, 1 - mobilna, 2 - dlancniki
$ismobile = 0;
@@ -461,8 +461,9 @@ class HelperController extends Controller // Podpis
$signature = Common::getEmailSignature();
- $text = ($rowAlert['finish_text'] == '') ? '[NAME] ' . self::$lang['srv_alert_msg'] . ' [SURVEY] [DATE] ("[URL]")'.$signature : $rowAlert['finish_text'];
- $subject = ($rowAlert['finish_subject'] != '') ? $rowAlert['finish_subject'] : self::$lang['srv_alert_subject'];
+
+ $text = ($rowAlert['finish_text'] == '') ? self::$lang['srv_alert_finish_text'].$signature : $rowAlert['finish_text'];
+ $subject = ($rowAlert['finish_subject'] == '') ? self::$lang['srv_alert_finish_subject'] : $rowAlert['finish_subject'];
$sqlu = sisplet_query("SELECT email FROM users WHERE id = '$row[insert_uid]'");
$rowu = mysqli_fetch_array($sqlu);
@@ -532,7 +533,6 @@ class HelperController extends Controller array($ime,
$row['akronim'], #$row['naslov'],
date("d.m.Y, H:i:s"),
- //'<a href="'.self::$site_url.'a/'.get('anketa').'">'.self::$site_url.'a/'.get('anketa').'</a>',
'<a href="' . SurveyInfo::getSurveyLink() . '">' . SurveyInfo::getSurveyLink() . '</a>',
'<a href="' . self::$site_url . 'admin/survey/index.php?anketa=' . get('anketa') . '">' . self::$site_url . 'admin/survey/index.php?anketa=' . get('anketa') . '</a>',
'<a href="' . $pdf_url . '">' . self::$lang['srv_alert_link_pdf'] . '</a>',
@@ -554,7 +554,6 @@ class HelperController extends Controller array($ime,
$row['naslov'],
date("d.m.Y, H:i:s"),
- //self::$site_url.'a/'.get('anketa'),
SurveyInfo::getSurveyLink(),
self::$site_url . 'admin/survey/index.php?anketa=' . get('anketa'),
'<a href="' . $pdf_url . '">' . self::$lang['srv_alert_link_pdf'] . '</a>',
@@ -646,8 +645,8 @@ class HelperController extends Controller // Podpis
$signature = Common::getEmailSignature();
- $text = ($rowAlert['finish_text'] == '') ? '[NAME] ' . self::$lang['srv_alert_msg'] . ' [SURVEY] [DATE] ("[URL]")'.$signature : $rowAlert['finish_text'];
- $subject = ($rowAlert['finish_subject'] != '') ? $rowAlert['finish_subject'] : self::$lang['srv_alert_subject'];
+ $text = ($rowAlert['finish_text'] == '') ? self::$lang['srv_alert_finish_text'].$signature : $rowAlert['finish_text'];
+ $subject = ($rowAlert['finish_subject'] == '') ? self::$lang['srv_alert_finish_subject'] : $rowAlert['finish_subject'];
$MailReply = $rowTM['email'];
@@ -660,7 +659,8 @@ class HelperController extends Controller serialize(
array('m' => 'pdf_teammeter',
'anketa' => get('anketa'),
- 'skupina' => $rowTM['skupina']
+ 'skupina' => $rowTM['skupina'],
+ 'lang_id' => $rowTM['lang_id']
)));
if ($mail != '' && (strlen($mail) > 1)) {
diff --git a/main/survey/app/Controllers/InitClass.php b/main/survey/app/Controllers/InitClass.php index f0c7dc9..f735419 100644 --- a/main/survey/app/Controllers/InitClass.php +++ b/main/survey/app/Controllers/InitClass.php @@ -17,13 +17,16 @@ use App\Controllers\LanguageController as Language; use App\Models\Model;
use App\Models\SaveSurvey;
use Common;
-use Mobile_Detect;
use SurveyInfo;
use SurveySetting;
use SurveySlideshow;
use GDPR;
use MAZA;
use UserAccess;
+use SurveyCheck;
+use KolektorResponse;
+use SurveyPanel;
+use SurveyEmailAccess;
class InitClass extends Controller
@@ -50,9 +53,12 @@ class InitClass extends Controller private function loadIfPrintPreviewFalse()
{
// cist na zacetku preverimo referer. Ce je prisel od kje drugje (napacno skopiran link itd...) ga preusmerimo na prvo stran ankete
- if (isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], self::$site_url) === false && !isset($_GET['code']) && !isset($_GET['return']) && !isset($_GET['params'])) {
+ if (!SurveyInfo::getInstance()->checkSurveyModule('panel') && isset($_SERVER['HTTP_REFERER']) && strpos($_SERVER['HTTP_REFERER'], self::$site_url) === false && !isset($_GET['code']) && !isset($_GET['return']) && !isset($_GET['params'])) {
- $anketa = (isset($_GET['anketa'])) ? $_GET['anketa'] : ((isset($_POST['anketa'])) ? $_POST['anketa'] : die("Missing anketa id!"));
+ $anketa_hash = (isset($_GET['anketa'])) ? $_GET['anketa'] : ((isset($_POST['anketa'])) ? $_POST['anketa'] : die("Missing anketa id!"));
+ save('anketa_hash', $anketa_hash);
+
+ $anketa = getSurveyIdFromHash($anketa_hash);
save('anketa', $anketa);
// Pri ul evalvaciji tega ne pustimo, ker drugace narobe preusmeri
@@ -69,7 +75,6 @@ class InitClass extends Controller $g .= Header::getSurveyParams();
- //$redirect_url = self::$site_url."a/".get('anketa').$g;
$redirect_url = SurveyInfo::getSurveyLink(false, false) . $g;
$request_url = 'http' . ($_SERVER['HTTPS'] ? 's' : null) . '://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'];
@@ -89,9 +94,18 @@ class InitClass extends Controller }
if (isset($_GET['anketa']) || isset($_POST['anketa'])) {
-
- $anketa = (isset($_GET['anketa'])) ? $_GET['anketa'] : ((isset($_POST['anketa'])) ? $_POST['anketa'] : die("Missing anketa id!"));
- save('anketa', $anketa);
+ $anketa_hash = (isset($_GET['anketa'])) ? $_GET['anketa'] : ((isset($_POST['anketa'])) ? $_POST['anketa'] : die("Missing anketa id!"));
+ save('anketa_hash', $anketa_hash);
+
+ $anketa = getSurveyIdFromHash($anketa_hash);
+ save('anketa', $anketa);
+
+ // Preverimo, ce gre za deaktivirano phishing anketo - vrnemo 404
+ global $mysql_database_name;
+ if($mysql_database_name == 'real1kasi' && in_array(get('anketa'), array('321069','328454','328864','329691')) ){
+ http_response_code(404);
+ die();
+ }
// Preverimo ce gre za POSEBNO webSM anketo (ki ne shranjuje nicesar - samo direktno preusmeri na ustrezno stran)
if (get('anketa') == get('webSMSurvey') && Common::checkModule('websmsurvey') == '1')
@@ -99,8 +113,8 @@ class InitClass extends Controller // polovimo podatke o anketi
SurveyInfo::getInstance()->SurveyInit(get('anketa'));
- if (SurveyInfo::getInstance()->getSurveyColumn('db_table') == 1)
- save('db_table', '_active');
+ $db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();
+ save('db_table', $db_table);
$rowa = SurveyInfo::getInstance()->getSurveyRow();
@@ -136,11 +150,65 @@ class InitClass extends Controller Header::getInstance()->header();
Body::getInstance()->displayStaticIntroduction();
+
die();
- } // Ce imamo staticen uvod s captcho in smo kliknili na naslednjo stran, najprej preverimo captcho
+ }
+ // Ce imamo staticen uvod s captcho in smo kliknili na naslednjo stran, najprej preverimo captcho
elseif ($rowa['intro_static'] == 2 && $rowa['show_intro'] == 1 && count($_POST) != 0 && isset($_GET['grupa']) && $_GET['grupa'] == '0') {
Check::getInstance()->check_captcha_intro();
}
+
+
+ // Modul email dostop - prikazemo prvo stran za vnos emaila
+ if(SurveyInfo::getInstance()->checkSurveyModule('email_access') && (!isset($_GET['grupa']) || $_GET['grupa'] == '0')){
+
+ $sea = new SurveyEmailAccess(get('anketa'));
+
+ $response = array();
+ $code_check = false;
+
+ // Poslana je bila koda - preverimo, ce je ok in spustimo naprej
+ if(isset($_POST['code']) && $_POST['code'] != ''){
+
+ $code = $_POST['code'];
+ $code = str_replace(' ', '', $code);
+
+ // Preverimo kodo - ce je ok, spustimo naprej, drugace prikazemo error
+ $response = $sea->checkAccessCode($code);
+
+ // Koda je ok, pustimo na anketo
+ if($response === true)
+ $code_check = true;
+ }
+ // Poslan je bil email - posljemo kodo
+ elseif(isset($_POST['email'])){
+
+ // Preverimo captcho
+ if($sea->getEmailAccessSettings('captcha') == '1'){
+ Check::getInstance()->check_captcha_intro();
+ }
+
+ $email = $_POST['email'];
+
+ // Posljemo email s kodo
+ $response = $sea->sendAccessCode($email);
+ }
+
+ // Koda ni ok - izpisemo vsebino
+ if($code_check !== true){
+
+ // inicializiramo jezik za multilang anketo
+ Language::getInstance()->multilang_init();
+
+ // konec ukvarjanja s cookieji, prikazemo header
+ Header::getInstance()->header();
+
+ // Izpisemo uvod s kodo
+ Body::getInstance()->displayEmailAccessIntroduction($response);
+
+ die();
+ }
+ }
// ali je respondent avtor ankete (zaradi posebnih opcij prepoznave)
@@ -159,15 +227,18 @@ class InitClass extends Controller if ($row['cookie'] == 0) {
$this->expire = 0;
- } elseif ($row['cookie'] == -1) {
+ }
+ elseif ($row['cookie'] == -1) {
if ($rowa['user_from_cms'] == 1) {
$this->expire = time() - 3600;
} else {
$this->expire = 0;
}
- } elseif ($row['cookie'] == 1) {
+ }
+ elseif ($row['cookie'] == 1) {
$this->expire = time() + 3600;
- } else {
+ }
+ else {
$this->expire = time() + 2500000;
}
@@ -177,9 +248,23 @@ class InitClass extends Controller // da delata oba načina nastavljanja piškotkov, neglede na nastavitve
if (isset($_GET['survey-' . get('anketa')]))
$this->cookie = $_GET['survey-' . get('anketa')]; // Pri nastavitvi brez cookie-ja se cookie string prenaša preko URL-ja
- if (isset($_COOKIE['survey-' . get('anketa')]))
- $this->cookie = $_COOKIE['survey-' . get('anketa')]; // Obicajen cookie
+ // PANEL - preverimo, ce je respondent z istim panel id-jem in ga prepoznamo
+ if(SurveyInfo::getInstance()->checkSurveyModule('panel')){
+ if($this->cookie == null){
+ // Postavimo status panelista na default
+ $sp = new SurveyPanel(get('anketa'));
+ setcookie('panel_status', $sp->getPanelSettings('status_default'), 0, '/');
+
+ // Ustvarimo cookie panelista
+ $this->cookie = $this->panelNovRespondent();
+ }
+ }
+ // Obicajen cookie - pri panelu ga nikoli ne upostevamo
+ else{
+ if (isset($_COOKIE['survey-' . get('anketa')]))
+ $this->cookie = $_COOKIE['survey-' . get('anketa')];
+ }
// EVALVACIJA - Ce je nov respondent preverimo ce se je vrnil (zapis v tabeli eval_data_userCookie) in mu nastavimo ustrezen cookie da ga preusmerimo na ustrezno stran
if (Common::checkModule('evalvacija') == '1' && $this->cookie == null)
@@ -187,10 +272,9 @@ class InitClass extends Controller // HIERARHIJA - UČITELJ, preverimo, če je učitelj ponovno prišel nazaj
if (Common::checkModule('hierarhija') == '1' && SurveyInfo::checkSurveyModule('hierarhija') == 2 && is_null($this->cookie))
- $this->cookie = $this->hierarhijaPreveriCeSeJeUciteljVrnilPonovnoResevatiAnketo();
+ $this->cookie = $this->hierarhijaPreveriCeSeJeUciteljVrnilPonovnoResevatiAnketo();
// poskrbimo za user ID
- //
// tuki je kookie ze nastavljen in ga samo preberemo
if ($this->cookie != null)
$this->cookieExist($this->cookie);
@@ -199,7 +283,7 @@ class InitClass extends Controller if ($this->cookie == null)
$this->cookieIsNull();
-
+
// tukaj bomo dodatno preverjali, ce slucajno kje&kdaj pride do napake da usr_id ni postavljen
if (get('usr_id') == 0) {
$get = '';
@@ -290,13 +374,10 @@ class InitClass extends Controller $this->set_userstatus(6);
Body::getInstance()->displayKonec();
-
}
elseif (get('displayAllPages')) {
- Body::getInstance()->displayAllPages();
-
-
+ Body::getInstance()->displayAllPages();
}
// prikazemo ustrezno stran / grupo
elseif (get('grupa') > 0) {
@@ -304,7 +385,7 @@ class InitClass extends Controller $preskok = false;
// pogledamo ce preskocimo kaksno stran zaradi branchinga
- while (!Check::getInstance()->checkGrupa() && get('grupa') > 0 && $_GET['disableif'] != 1) {
+ while (get('grupa') > 0 && (!isset($_GET['disableif']) || $_GET['disableif'] != 1) && !Check::getInstance()->checkGrupa()) {
SaveSurvey::getInstance()->posted(1);
save('grupa', Find::getInstance()->findNextGrupa());
@@ -368,6 +449,16 @@ class InitClass extends Controller $s = sisplet_query("REPLACE INTO srv_user_grupa" . get('db_table') . " (gru_id, usr_id, time_edit) VALUES ('0', '" . get('usr_id') . "', NOW())");
if (!$s) echo mysqli_error($GLOBALS['connect_db']);
+
+ // Ce imamo napredni modul za belezenje casovc po straneh
+ if(SurveyInfo::getInstance()->checkSurveyModule('advanced_timestamps')){
+ sisplet_query("INSERT INTO srv_advanced_timestamps
+ (gru_id, usr_id, time_edit)
+ VALUES
+ ('0', '".get('usr_id')."', NOW())
+ ");
+ }
+
$this->set_userstatus(4);
}
@@ -405,7 +496,6 @@ class InitClass extends Controller header('Location: ' . SurveyInfo::getSurveyLink(false, false) . '&grupa=' . get('grupa') . '&ime=' . get('ime_AW') . Header::getSurveyParams() . get('cookie_url') . '');
elseif (get('loop_id') != null)
header('Location: ' . SurveyInfo::getSurveyLink(false, false) . '&grupa=' . get('grupa') . '&loop_id=' . get('loop_id') . Header::getSurveyParams() . get('cookie_url') . '');
-
}
else {
@@ -453,11 +543,12 @@ class InitClass extends Controller // polovimo podatke o anketi
\SurveyInfo::getInstance()->SurveyInit(get('anketa'));
- if (\SurveyInfo::getInstance()->getSurveyColumn('db_table') == 1)
- save('db_table', '_active');
+ $db_table = \SurveyInfo::getInstance()->getSurveyArchiveDBString();
+ save('db_table', $db_table);
\SurveySetting::getInstance()->Init(get('anketa'));
- save('usr_id', $_REQUEST['usr_id']);
+ if(isset($_REQUEST['usr_id']))
+ save('usr_id', $_REQUEST['usr_id']);
Language::getInstance()->multilang_init();
}
@@ -510,7 +601,7 @@ class InitClass extends Controller save('grupa', $_GET['grupa']);
// pogledamo ce preskocimo kaksno stran zaradi branchinga
- while (!Check::getInstance()->checkGrupa() && get('grupa') > 0 && $_GET['disableif'] != 1) {
+ while (get('grupa') > 0 && $_GET['disableif'] != 1 && !Check::getInstance()->checkGrupa()) {
save('grupa', Find::getInstance()->findNextGrupa());
}
@@ -598,9 +689,59 @@ class InitClass extends Controller }
+ // PANEL - Ce je nov respondent preverimo ce se je vrnil (ima isti SID) in mu nastavimo ustrezen cookie da ga preusmerimo na ustrezno stran
+ private function panelNovRespondent(){
+
+ $sp = new SurveyPanel(get('anketa'));
+ $panel_id_name = $sp->getPanelSettings('user_id_name');
+
+ $panel_id = ($panel_id_name != '' && isset($_GET[$panel_id_name])) ? $_GET[$panel_id_name] : 0;
+
+ if ($panel_id != '' && $panel_id != '0') {
+
+ $sqlPanel = sisplet_query("SELECT u.cookie
+ FROM srv_spremenljivka s, srv_grupa g, srv_data_text".get('db_table')." d, srv_user u
+ WHERE s.variable='".$panel_id_name."' AND s.gru_id=g.id AND g.ank_id='".get('anketa')."'
+ AND s.id=d.spr_id AND d.text='".$panel_id."'
+ AND u.id=d.usr_id AND u.deleted!='1'
+ ");
+
+ if (mysqli_num_rows($sqlPanel) > 0) {
+ $rowPanel = mysqli_fetch_array($sqlPanel);
+ $cookie = $rowPanel['cookie'];
+ return $cookie;
+ }
+ }
+ }
+
+ // MODUL EMAIL DOSTOP - preverimo kodo mu nastavimo ustrezen cookie
+ private function emailDostopNovRespondent(){
+
+ $sp = new SurveyPanel(get('anketa'));
+ $panel_id_name = $sp->getPanelSettings('user_id_name');
+
+ $panel_id = ($panel_id_name != '' && isset($_GET[$panel_id_name])) ? $_GET[$panel_id_name] : 0;
+
+ if ($panel_id != '' && $panel_id != '0') {
+
+ $sqlPanel = sisplet_query("SELECT u.cookie
+ FROM srv_spremenljivka s, srv_grupa g, srv_data_text".get('db_table')." d, srv_user u
+ WHERE s.variable='".$panel_id_name."' AND s.gru_id=g.id AND g.ank_id='".get('anketa')."'
+ AND s.id=d.spr_id AND d.text='".$panel_id."'
+ AND u.id=d.usr_id AND u.deleted!='1'
+ ");
+
+ if (mysqli_num_rows($sqlPanel) > 0) {
+ $rowPanel = mysqli_fetch_array($sqlPanel);
+ $cookie = $rowPanel['cookie'];
+ return $cookie;
+ }
+ }
+ }
+
// EVALVACIJA - Ce je nov respondent preverimo ce se je vrnil (zapis v tabeli eval_data_userCookie) in mu nastavimo ustrezen cookie da ga preusmerimo na ustrezno stran
- private function evlavacijaNovRespondent()
- {
+ private function evlavacijaNovRespondent(){
+
$student = (isset($_GET['sifstud'])) ? $_GET['sifstud'] : 0;
$predmet = (isset($_GET['sifpredm'])) ? $_GET['sifpredm'] : -1; // Ce resuje splosno anketo ni predmeta -> predmet = -1
@@ -644,7 +785,8 @@ class InitClass extends Controller // Preverimo, ce je ze koncal anketo (in se kasneje vrnil), ce lahko se ureja svoje odgovore
// Dodano v pogoj da se to izvede samo ce nima nastavljene grupe (drugace dela narobe klik nazaj na zakljucku, preklop med bloki...)
- if ($rowa['return_finished'] == 0 && !isset($_GET['grupa']) && !isset($_GET['urejanje']) && !isset($_GET['return'])) {
+ if ($rowa['return_finished'] == 0 && !isset($_GET['grupa']) && !isset($_GET['urejanje']) && !isset($_GET['return']) && !SurveyInfo::getInstance()->checkSurveyModule('panel')) {
+
$sqls = sisplet_query("SELECT MAX(status) AS status FROM srv_userstatus WHERE usr_id='" . get('usr_id') . "'");
$rows = mysqli_fetch_array($sqls);
if ($rows['status'] == 6) { // Koncal anketo
@@ -768,8 +910,10 @@ class InitClass extends Controller Check::getInstance()->check_cookie_return();
}
- // userji iz baze
- } elseif (
+
+ }
+ // userji iz baze
+ elseif (
($rowa['user_base'] == 1) &&
#če imamo neindividualizirana vabila - poslana preko vabil, vendar bez kode in zato brez sledenja (uporabnik se pri pošiljanju NE prenese iz srv_invitations_recipients v srv_user)
$rowa['individual_invitation'] != 0 &&
@@ -844,10 +988,10 @@ class InitClass extends Controller $referal = SurveySetting::getInstance()->getSurveyMiscSetting('survey_referal');
$date = SurveySetting::getInstance()->getSurveyMiscSetting('survey_date');
- if ($ip == 0) $_ip = Helper::remote_address(); else $ip = "";
- if ($date == 0) $_time_insert = "NOW()"; else $_time_insert = "''";
- if ($referal == 0) $_referer = $referer; else $_referer = '';
- if ($browser == 0) $_useragent = $_SERVER['HTTP_USER_AGENT']; else $_useragent = '';
+ if ($ip == 0 || $ip == '') $_ip = Helper::remote_address(); else $ip = "";
+ if ($date == 0 || $date == '') $_time_insert = "NOW()"; else $_time_insert = "''";
+ if ($referal == 0 || $referal == '') $_referer = $referer; else $_referer = '';
+ if ($browser == 0 || $browser == '') $_useragent = $_SERVER['HTTP_USER_AGENT']; else $_useragent = '';
// Ce dovolimo useragent in ce je instaliran browscap
$_browser = '';
@@ -856,7 +1000,7 @@ class InitClass extends Controller if ($_useragent != '' && get_cfg_var('browscap')) {
$browser_detect = get_browser($_useragent, true);
- $detect = New Mobile_Detect();
+ $detect = New \Detection\MobileDetect;
$detect->setUserAgent($_useragent);
// Detect browserja
@@ -871,7 +1015,8 @@ class InitClass extends Controller $_device = 2;
else
$_device = 1;
- } elseif ($browser_detect['crawler'] == 1)
+ }
+ elseif (isset($browser_detect['crawler']) && $browser_detect['crawler'] == 1)
$_device = 3;
else
$_device = 0;
@@ -949,12 +1094,136 @@ class InitClass extends Controller die();
}
}
+ }
+ // Kolektor modul - respondent s kodo - poenostavljeno vabilo
+ elseif(Common::checkModule('kolektor') == '1' && isset($_GET['code'])) {
+
+ $usercode = strtolower($_GET['code']);
+
+ $sql2 = sisplet_query("SELECT id, recnum, cookie FROM srv_user WHERE TRIM(pass) = '$usercode' AND ank_id='".get('anketa')."' AND deleted='0'");
+ if (!$sql2) echo mysqli_error($GLOBALS['connect_db']);
+ $row2 = mysqli_fetch_array($sql2);
+
+ // Pravilna koda
+ if (mysqli_num_rows($sql2) > 0) {
+
+ $rand = $row2['cookie'];
+
+ $this->set_cookie('survey-' . get('anketa'), $rand, $this->expire);
+
+ save('usr_id', $row2['id']);
+
+
+ // Preverimo ce imamo vklopljeno da uporabnik nadaljuje kjer je ostal - potem ga preusmerimo na pravo stran
+ Check::getInstance()->check_cookie_return();
+
+ if ($row2['recnum'] == 0) {
+
+ if (isset($_POST['referer']))
+ $referer = $_POST['referer'];
+ elseif (isset($_SERVER['HTTP_REFERER']))
+ $referer = $_SERVER['HTTP_REFERER'];
+ else
+ $referer = 0;
+
+ SurveySetting::getInstance()->Init(get('anketa'));
+ $ip = SurveySetting::getInstance()->getSurveyMiscSetting('survey_ip');
+ $browser = SurveySetting::getInstance()->getSurveyMiscSetting('survey_browser');
+ $referal = SurveySetting::getInstance()->getSurveyMiscSetting('survey_referal');
+ $date = SurveySetting::getInstance()->getSurveyMiscSetting('survey_date');
+
+ if ($ip == 0 || $ip == '') $_ip = Helper::remote_address(); else $ip = "";
+ if ($date == 0 || $date == '') $_time_insert = "NOW()"; else $_time_insert = "''";
+ if ($referal == 0 || $referal == '') $_referer = $referer; else $_referer = '';
+ if ($browser == 0 || $browser == '') $_useragent = $_SERVER['HTTP_USER_AGENT']; else $_useragent = '';
+
+ // Ce dovolimo useragent in ce je instaliran browscap
+ $_browser = '';
+ $_device = 0;
+ $_os = '';
+ if ($_useragent != '' && get_cfg_var('browscap')) {
+
+ $browser_detect = get_browser($_useragent, true);
+ $detect = New \Detection\MobileDetect;
+ $detect->setUserAgent($_useragent);
+
+ // Detect browserja
+ if ($browser_detect['browser'] == 'Default Browser')
+ $_browser = self::$lang['srv_para_graph_other'];
+ else
+ $_browser = $browser_detect['browser'] . ' ' . $browser_detect['version'];
+
+ // Detect naprave (pc, mobi, tablet, robot)
+ if ($detect->isMobile()) {
+ if ($detect->isTablet())
+ $_device = 2;
+ else
+ $_device = 1;
+ }
+ elseif (isset($browser_detect['crawler']) && $browser_detect['crawler'] == 1)
+ $_device = 3;
+ else
+ $_device = 0;
+
+ // Detect operacijskega sistema
+ if ($browser_detect['platform'] == 'unknown')
+ $_os = self::$lang['srv_para_graph_other'];
+ else
+ $_os = $browser_detect['platform'];
+ }
+
+ $recnum = 0;
+ if (isset($_GET['language'])) save('language', (int)$_GET['language']); else save('language', self::$lang['id']);
+
+ $s = sisplet_query("UPDATE srv_user SET recnum = MAX_RECNUM('" . get('anketa') . "'), time_insert=" . $_time_insert . ", language='" . get('language') . "', ip='" . $_ip . "', useragent='" . $_useragent . "', device='" . $_device . "', browser='" . $_browser . "', os='" . $_os . "' WHERE id = '" . get('usr_id') . "'");
+ if (!$s) {
+ echo 'err3432' . mysqli_error($GLOBALS['connect_db']);
+ die();
+ }
+ }
+
+ // Preverimo, ce je ze koncal anketo (in se kasneje vrnil), ce lahko se ureja svoje odgovore
+ if ($rowa['return_finished'] == 0) {
+ $sqls = sisplet_query("SELECT MAX(status) AS status FROM srv_userstatus WHERE usr_id='" . get('usr_id') . "'");
+ $rows = mysqli_fetch_array($sqls);
+
+ if ($rows['status'] == 6) { // Koncal anketo
+ Header::getInstance()->header();
+ Body::getInstance()->displayKonec();
+
+ die();
+ }
+ }
+
+
+ // ce ze ima kuki in ni poslana grupa pomeni, da se je vrnil se enkrat resevat anketo
+ if (!isset($_GET['grupa'])) {
+ Check::getInstance()->check_cookie_return();
+ }
+ }
+ // koda ne obstaja
+ else {
+ // Pri Ne in Samo avtor prikazemo obvestilo, pri Da spustimo naprej in kreiramo nov cookie
+ SurveySetting::getInstance()->init(get('anketa'));
+ $srv_wrongcode = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_wrongcode' . $_lang);
+ if ($srv_wrongcode == '') $srv_wrongcode = self::$lang['srv_wrongcode'];
+
+ Display::getInstance()->displayNapaka($srv_wrongcode);
+ die();
+ }
}
// drugace gremo kreirat nov cookie
if (get('usr_id') == null) {
+ // Najprej preverimo limit responsov na anketi - zaenkrat ne naredimo nic, samo posljemo mail ko je limit dosezen
+ $check = new SurveyCheck(get('anketa'));
+ if($check->checkLimitResponses()){
+ /*Display::getInstance()->displayNapaka(self::$lang['srv_survey_repsonse_limit']);
+ die();*/
+ }
+
// izberemo random hash, ki se ni v bazi
do {
$rand = md5(mt_rand(1, mt_getrandmax()) . '@' . Helper::remote_address());
@@ -1005,19 +1274,20 @@ class InitClass extends Controller $referal = SurveySetting::getInstance()->getSurveyMiscSetting('survey_referal');
$date = SurveySetting::getInstance()->getSurveyMiscSetting('survey_date');
- if ($ip == 0) $_ip = Helper::remote_address(); else $ip = "";
- if ($date == 0) $_time_insert = "NOW()"; else $_time_insert = "''";
- if ($referal == 0) $_referer = $referer; else $_referer = '';
- if ($browser == 0) $_useragent = $_SERVER['HTTP_USER_AGENT']; else $_useragent = '';
+ if ($ip == 0 || $ip == '') $_ip = Helper::remote_address(); else $_ip = "";
+ if ($date == 0 || $date == '') $_time_insert = "NOW()"; else $_time_insert = "''";
+ if ($referal == 0 || $referal == '') $_referer = $referer; else $_referer = '';
+ if ($browser == 0 || $browser == '') $_useragent = $_SERVER['HTTP_USER_AGENT']; else $_useragent = '';
// Ce dovolimo useragent in ce je instaliran browscap
$_browser = '';
$_device = 0;
$_os = '';
+
if ($_useragent != '' && get_cfg_var('browscap')) {
$browser_detect = get_browser($_useragent, true);
- $detect = New Mobile_Detect();
+ $detect = New \Detection\MobileDetect;
$detect->setUserAgent($_useragent);
// Detect browserja
@@ -1032,7 +1302,8 @@ class InitClass extends Controller $_device = 2;
else
$_device = 1;
- } elseif ($browser_detect['crawler'] == 1)
+ }
+ elseif (isset($browser_detect['crawler']) && $browser_detect['crawler'] == 1)
$_device = 3;
else
$_device = 0;
@@ -1121,16 +1392,14 @@ class InitClass extends Controller */
protected $anketa, $rand, $expire;
- private function set_cookie($anketa, $rand, $expire)
- {
-
- $cookie_ok = isset($_COOKIE['cookie_ok']) ? $_COOKIE['cookie_ok'] : '';
+ private function set_cookie($anketa, $rand, $expire){
- // ce je nastavljeno na brez piskotka ali se ni potrdil shranjevanja piskotkov
- if (get('cookie_expire') == -1 or $cookie_ok != 1) { // cookie prenasamo preko URLja
+ // ce je nastavljeno na brez piskotka
+ if (get('cookie_expire') == -1) { // cookie prenasamo preko URLja
save('cookie_url', '&' . $anketa . '=' . $rand); // ta string se bo dodal vsem URLjem na konec
// & dodamo naknadno samo tam, kjer se pise v html (v header() more bit samo &)
- } else {
+ }
+ else {
setcookie($anketa, $rand, $expire); // ce je cookie, ga obicajno nastavimo
}
}
@@ -1171,7 +1440,7 @@ class InitClass extends Controller SurveySetting::getInstance()->Init(get('anketa'));
$date = SurveySetting::getInstance()->getSurveyMiscSetting('survey_date');
- if ($date == 0) $_time_insert = "NOW()"; else $_time_insert = "''";
+ if ($date == 0 || $date == '') $_time_insert = "NOW()"; else $_time_insert = "''";
if (isset($_GET['language'])) save('language', (int)$_GET['language']); else save('language', self::$lang['id']);
@@ -1188,19 +1457,24 @@ class InitClass extends Controller $u = sisplet_query($sqlString);
}
- // updatamo samo datum - tip se ni spremenil
- } else {
+ // Modul kolektor - shranimo poseben status "koncano - 5" in posljemo opomnik
+ if(Common::checkModule('kolektor') == '1' && $status == '6'){
+ $kr = new KolektorResponse(get('usr_id'));
+ $kr->setStatus($kolektor_status='5');
+ }
+ }
+ // updatamo samo datum - tip se ni spremenil
+ else {
SurveySetting::getInstance()->Init(get('anketa'));
$date = SurveySetting::getInstance()->getSurveyMiscSetting('survey_date');
- if ($date == 0) $_time_insert = "NOW()"; else $_time_insert = "''";
+ if ($date == 0 || $date == '') $_time_insert = "NOW()"; else $_time_insert = "''";
if (isset($_GET['language'])) save('language', (int)$_GET['language']); else save('language', self::$lang['id']);
# osvežimo datum spremembe
sisplet_query("UPDATE srv_user SET time_edit = " . $_time_insert . ", language='" . get('language') . "' WHERE id='" . get('usr_id') . "'");
-
}
// Ce ne belezimo parapodatka za cas responsa, anonimno zabelezimo cas zadnjega responsa
diff --git a/main/survey/app/Controllers/JsController.php b/main/survey/app/Controllers/JsController.php index c9699f8..308fb41 100644 --- a/main/survey/app/Controllers/JsController.php +++ b/main/survey/app/Controllers/JsController.php @@ -14,13 +14,13 @@ use App\Controllers\HelperController as Helper; use App\Models\Model;
use Cache;
use enkaParameters;
-use Mobile_Detect;
use SurveyAdvancedParadataLog;
use SurveyInfo;
use SurveySetting;
use SurveySlideshow;
use Common;
use SurveyPanel;
+use AppSettings;
class JsController extends Controller
{
@@ -64,7 +64,7 @@ class JsController extends Controller {
global $lang;
global $site_url;
- global $secret_captcha;
+ global $site_domain;
global $admin_type;
// Dodaten text pri alertu ce smo v testnem vnosu
@@ -254,8 +254,23 @@ class JsController extends Controller return regex.test(email);
}
+ var missing_hidden = false;
function showMissing(id) {
+
+ // Si zapomnimo, ce so bili missingi skriti - posebej za CDI anketo za posebno vprasanje
+ if($(id).find('.missing:visible').length == 0){
+ missing_hidden = true;
+ }
+ else{
+ missing_hidden = false;
+ }
+
+ // Naknadno prikazemo missing vrednosti
$(id).find('.missing').slideDown();
+
+ // Prikazemo missinge se v dropdownu
+ $(id).find('.active-result').show();
+ $(id).find('option').show();
}
<?
@@ -268,6 +283,7 @@ class JsController extends Controller echo ' var text_num = true; ' . "\n";
echo ' var checkbox_min_limit_alert = false; ' . "\n";
+ $require = '';
$sql = sisplet_query("SELECT * FROM srv_spremenljivka WHERE gru_id='" . get('grupa') . "' AND gru_id != '0' AND reminder > 0 ORDER BY vrstni_red ASC");
while ($row = mysqli_fetch_array($sql)) {
@@ -424,10 +440,9 @@ class JsController extends Controller submitAlert(\'#spremenljivka_' . $row['id'] . '\', \'remove\', \'' . $require . '\', \'' . $bol . '\', validation, false, false, false, false);
}
';
-
-
- // dropdown
- } elseif ($row['tip'] == 3) {
+ }
+ // dropdown
+ elseif ($row['tip'] == 3) {
$ime = 'vrednost_' . $row['id'];
@@ -438,11 +453,10 @@ class JsController extends Controller echo ' } else { ' . "\n";
echo ' submitAlert(\'#spremenljivka_' . $row['id'] . '\', \'remove\', \'require\', \'' . $bol . '\', validation, false, false, false, false); ' . "\n";
echo ' } ' . "\n";
-
- } //tabele @ drag and drop
+ }
+ // tabele @ drag and drop
elseif (($row['tip'] == 6 && $row['enota'] == 9) || ($row['tip'] == 16 && $row['enota'] == 9)) {
echo '
- //console.log("Drag and drop Tabela en odgovorov");
var bol = true;
var prisotno = $("#half_frame_dropping_' . $row['id'] . '").children("div").attr("value");
if (prisotno){
@@ -454,13 +468,27 @@ class JsController extends Controller }else{
submitAlert(\'#spremenljivka_' . $row['id'] . '\', \'remove\', \'' . $require . '\', \'' . $bol . '\', validation, false, false, false, false);
}
-
-
';
+ }
+ // tabela - max diff
+ elseif ($row['tip'] == 6 && $row['enota'] == 5) {
- // tabele
- //} elseif ($row['tip'] == 6 || $row['tip'] == 16 || $row['tip'] == 19 || $row['tip'] == 20) {
- } elseif (($row['tip'] == 6 && $row['enota'] != 9) || $row['tip'] == 16 || $row['tip'] == 19 || $row['tip'] == 20) {
+ echo ' var bol = false; ' . "\n";
+
+ // Preverimo, ce sta oznaceni vrednosti 1 in 2 (min max)
+ echo ' if ($(\'#spremenljivka_'.$row['id'].'\').find(\'input[value="1"]\').is(\':checked\') && $(\'#spremenljivka_'.$row['id'].'\').find(\'input[value="2"]\').is(\':checked\')) { ' . "\n";
+ echo ' var bol = true; ' . "\n";
+ echo ' } ' . "\n";
+
+ echo ' if (!bol) { ' . "\n";
+ echo ' ' . $bol . ' = false; ' . "\n";
+ echo ' if (!validation) submitAlert(\'#spremenljivka_' . $row['id'] . '\', \'add\', \'require\', \'' . $bol . '\', validation, false, false, false, false); ' . "\n";
+ echo ' } else { ' . "\n";
+ echo ' if (!validation) submitAlert(\'#spremenljivka_' . $row['id'] . '\', \'remove\', \'require\', \'' . $bol . '\', validation, false, false, false, false); ' . "\n";
+ echo ' } ' . "\n";
+ }
+ // tabele
+ elseif (($row['tip'] == 6 && $row['enota'] != 9) || $row['tip'] == 16 || $row['tip'] == 19 || $row['tip'] == 20) {
echo ' var totalbol = true; ';
@@ -1015,7 +1043,7 @@ class JsController extends Controller // najprej damo pogoj, da se uposteva, samo ce je vprasanje vidno (ker je lahko v ifu)
//echo ' if ( $(\'#spremenljivka_'.$row['id'].'\').css(\'display\') != \'none\' ) { ' ."\n";
- echo ' if ( document.getElementById(\'spremenljivka_' . $row['id'] . '\').style.display != \'none\' ) { ' . "\n";
+ echo ' if ( $(\'#spremenljivka_' . $row['id'] . '\').length && document.getElementById(\'spremenljivka_' . $row['id'] . '\').style.display != \'none\' ) { ' . "\n";
// vsota
if ($row['tip'] == 18) {
@@ -1219,7 +1247,7 @@ class JsController extends Controller }
- if (isset($_GET['disablealert']) && $_GET['disablealert'] == 1) {
+ if (isset($_GET['disableif']) && $_GET['disableif'] == 1) {
echo ' vsota = true; ' . "\n";
echo ' hard = true; ' . "\n";
echo ' soft = true; ' . "\n";
@@ -1330,6 +1358,17 @@ class JsController extends Controller echo ' alert(\'' . $srv_remind_hard_98 . '\'); ' . "\n";
echo ' else if(\'' . $require . '\' == \'require4\') ' . "\n";
echo ' alert(\'' . $srv_remind_hard_97 . '\'); ' . "\n";
+
+ // alert za posebno vprasanje za SURS anketo 113 (1ka.cdi.si)
+ echo '
+ else if(\'' . $site_domain . '\' == \'1ka.cdi.si\' && \'' . $require . '\' == \'require5\' && \'' . $require . '\' == \'require5\' && $(\'#spremenljivka_18178\').length){
+
+ if(!missing_hidden){
+ alert(\'' . $lang['srv_remind_hard2'] . '\');
+ }
+
+ } ' . "\n";
+
echo ' else if(\'' . $require . '\' == \'require5\') ' . "\n";
echo ' alert(\'' . $srv_remind_hard_multi . '\'); ' . "\n";
echo ' else ' . "\n";
@@ -1593,7 +1632,7 @@ class JsController extends Controller $this->generateComputeJS();
// ce je preverjanje pogojev izklopljeno
- if ($_GET['disableif'] != 1) {
+ if (!isset($_GET['disableif']) || $_GET['disableif'] != 1) {
$this->generateBranching();
@@ -1800,8 +1839,8 @@ class JsController extends Controller }
}
- // roleta
- else if ($row['tip'] == 3) {
+ // roleta - desktop
+ else if ($row['tip'] == 3 && get('mobile') == 0) {
echo ' try { ' . "\n";
echo ' if ( ';
$this->generateCondition($row['if_id']);
@@ -1818,8 +1857,26 @@ class JsController extends Controller echo ' } catch (e) {} ' . "\n";
}
+ // roleta - mobile ali tablica
+ else if ($row['tip'] == 3 && get('mobile') != 0) {
+ echo ' try { ' . "\n";
+ echo ' if ( ';
+ $this->generateCondition($row['if_id']);
+ echo ' ) { ' . "\n";
+
+ echo ' document.getElementById(\'vrednost_if_' . $row['id'] . '\').style.display = \'\'; ' . "\n";
+
+ echo ' } else { ' . "\n";
+ echo ' document.getElementById(\'vrednost_if_' . $row['id'] . '\').style.display = \'none\'; ' . "\n";
+
+ echo ' } ' . "\n";
+
+ echo $sum;
+
+ echo ' } catch (e) {} ' . "\n";
+ }
// ranking premikanje
- else if ($row['tip'] == 17 && $row['design'] == 2) {
+ else if ($row['tip'] == 17 && $row['design'] == 2 && get('mobile') == '0') {
echo ' try { ' . "\n";
echo ' if ( ';
$this->generateCondition($row['if_id']);
@@ -1839,14 +1896,15 @@ class JsController extends Controller echo ' } catch (e) {} ' . "\n";
}
// ranking prestavljanje
- else if ($row['tip'] == 17 && $row['design'] == 0) {
+ else if ($row['tip'] == 17 && $row['design'] == 0 && get('mobile') == '0') {
+
echo ' try { ' . "\n";
echo ' if ( ';
$this->generateCondition($row['if_id']);
echo ' ) { ' . "\n";
echo ' document.getElementById(\'spremenljivka_' . $row['spr_id'] . '_vrednost_' . $row['id'] . '\').style.display = \'\'; ' . "\n";
-
+
echo ' } else { ' . "\n";
echo ' $(\'#spremenljivka_' . $row['spr_id'] . '_vrednost_' . $row['id'] . '\').hide(); ' . "\n";
@@ -1854,10 +1912,52 @@ class JsController extends Controller echo ' } ' . "\n";
+
+ // Pri rankingu prestejemo in skrijemo tudi prazne okvirje na desni
+ // Prestejemo skrite
+ echo ' var count = $(\'#prestavljanje_'.$row['spr_id'].'\').find(\'.ranking:hidden\').length; ' . "\n";
+
+ // Prikazemo vse
+ echo ' $(\'#prestavljanje_'.$row['spr_id'].'\').find(\'.dropholder\').find(\'ul li\').show(); ' . "\n";
+
+ // Skrijemo toliko okvirjev kolikor je skritih elementov
+ echo ' for(var i=0; i<count; i++){ $(\'#prestavljanje_'.$row['spr_id'].'\').find(\'.dropholder\').find(\'ul li:visible\').last().hide(); }' . "\n";
+
+
echo $sum;
echo ' } catch (e) {} ' . "\n";
}
+ // ranking ostevilcevanje
+ else if ($row['tip'] == 17 && ($row['design'] == 1 || get('mobile') != '0')) {
+
+ echo ' try { ' . "\n";
+ echo ' if ( ';
+ $this->generateCondition($row['if_id']);
+ echo ' ) { ' . "\n";
+
+ echo ' document.getElementById(\'vrednost_if_' . $row['id'] . '\').style.display = \'\'; ' . "\n";
+
+ echo ' } else { ' . "\n";
+ echo ' document.getElementById(\'vrednost_if_' . $row['id'] . '\').style.display = \'none\'; ' . "\n";
+
+ echo ' } ' . "\n";
+
+
+ // Pri rankingu prestejemo in skrijemo tudi odvecne vrednosti v dropdownu
+ // Prestejemo vidne
+ echo ' var count_visible = $(\'#spremenljivka_'.$row['spr_id'].'\').find(\'.variabla:visible\').length; ' . "\n";
+
+ // Na novo napolnimo select
+ echo ' $(\'#spremenljivka_'.$row['spr_id'].'\').find(\'select\').empty()' . "\n";
+ echo ' $(\'#spremenljivka_'.$row['spr_id'].'\').find(\'select\').append(\'<option></option>\')' . "\n";
+ echo ' for(var i=1; i<=count_visible; i++){ $(\'#spremenljivka_'.$row['spr_id'].'\').find(\'select\').append(\'<option value="\'+i+\'">\'+i+\'</option>\'); }' . "\n";
+
+
+ echo $sum;
+
+ echo ' } catch (e) {} ' . "\n";
+ }
else {
if ($spremenljivka_dd == $row['spr_id'] && ($orientation_dd == 8 || $enota_dd == 9)) {//ce je drag and drop
echo ' try { ' . "\n";
@@ -2076,7 +2176,7 @@ class JsController extends Controller mt_srand((int)get('usr_id') + (int)$rowb['id']);
// Zgeneriramo random vrstni red
- $order = array_map(create_function('$val', 'return mt_rand();'), range(1, count($questions)));
+ $order = array_map(function($val){return mt_rand();}, range(1, count($questions)));
array_multisort($order, $questions);
$order_in_block = json_encode($questions);
@@ -2104,7 +2204,7 @@ class JsController extends Controller mt_srand((int)get('usr_id') + (int)$rowb['id']);
// Zgeneriramo random vrstni red
- $order = array_map(create_function('$val', 'return mt_rand();'), range(1, count($blocks)));
+ $order = array_map(function($val){return mt_rand();}, range(1, count($blocks)));
array_multisort($order, $blocks);
$order_in_block = json_encode($blocks);
@@ -2716,7 +2816,7 @@ class JsController extends Controller $browser_detect = get_browser($useragent, true);
- $detect = New Mobile_Detect();
+ $detect = New \Detection\MobileDetect;
$detect->setUserAgent($useragent);
// Detect naprave (pc, mobi, tablet, robot)
diff --git a/main/survey/app/Controllers/LanguageController.php b/main/survey/app/Controllers/LanguageController.php index ab47a41..255ef35 100644 --- a/main/survey/app/Controllers/LanguageController.php +++ b/main/survey/app/Controllers/LanguageController.php @@ -70,14 +70,17 @@ class LanguageController extends Controller // mamo prebran cookie in user id, spremenimo language ce je treba -- multilanguage podpora je vezana na usr_id
$row = SurveyInfo::getInstance()->getSurveyRow();
- if ($row['multilang'] == 1) {
- if (isset($_GET['language'])) { // jezik podan preko GETa (podan je ze v linku ali spremenimo v previewu)
+ if ($row['multilang'] == 1 || isset($_GET['language'])) {
+
+ // jezik podan preko GETa (podan je ze v linku ali spremenimo v previewu)
+ if (isset($_GET['language'])) {
if (!empty(get('usr_id'))) { // (v bazo se shrani v displayintroduction - z ostalimi sistemskimi) (usr_id se ni postavljen)
$sqll = sisplet_query("SELECT lang_id FROM srv_language WHERE ank_id='" . get('anketa') . "' AND lang_id='$_GET[language]'");
$rowl = mysqli_fetch_array($sqll);
save('lang_id', $rowl['lang_id']);
- } else { // v GETu, ko lahko v previewu spreminjamo jezik na strani (usr_id je ze postavljen)
+ }
+ else { // v GETu, ko lahko v previewu spreminjamo jezik na strani (usr_id je ze postavljen)
$sql1 = sisplet_query("SELECT s.id FROM srv_spremenljivka s, srv_grupa g WHERE s.variable='language' AND s.gru_id=g.id AND g.ank_id='" . get('anketa') . "'");
$row1 = mysqli_fetch_array($sql1);
if ($row1['id'] > 0)
@@ -85,29 +88,37 @@ class LanguageController extends Controller save('lang_id', $_GET['language']);
}
- } elseif (isset($_POST['language'])) { // jezik podan v POSTu (ce si ga user spremeni na prvi strani)
-
+ }
+ // jezik podan v POSTu (ce si ga user spremeni na prvi strani)
+ elseif (isset($_POST['language'])) {
$sql1 = sisplet_query("SELECT s.id FROM srv_spremenljivka s, srv_grupa g WHERE s.variable='language' AND s.gru_id=g.id AND g.ank_id='" . get('anketa') . "'");
$row1 = mysqli_fetch_array($sql1);
+
if ($row1['id'] > 0)
$sql1 = sisplet_query("UPDATE srv_data_text" . get('db_table') . " dt SET text='$_POST[language]' WHERE spr_id='$row1[id]' AND usr_id='" . get('usr_id') . "'");
+
save('lang_id', $_POST['language']);
-
- } else { // jezik je ze shranjen v bazi, ga preberemo (naslednje strani)
-
+ }
+ // jezik je ze shranjen v bazi, ga preberemo (naslednje strani)
+ else {
$sqll = sisplet_query("SELECT text FROM srv_data_text" . get('db_table') . " dt, srv_spremenljivka s WHERE dt.spr_id=s.id AND s.variable='language' AND dt.usr_id='" . get('usr_id') . "'");
$rowl = mysqli_fetch_array($sqll);
- $sqll = sisplet_query("SELECT lang_id FROM srv_language WHERE ank_id='" . get('anketa') . "' AND lang_id='$rowl[text]'");
- $rowl = mysqli_fetch_array($sqll);
- save('lang_id', $rowl['lang_id']);
-
+
+ if(mysqli_num_rows($sqll) > 0){
+ $sql2 = sisplet_query("SELECT lang_id FROM srv_language WHERE ank_id='" . get('anketa') . "' AND lang_id='$rowl[text]'");
+ $row2 = mysqli_fetch_array($sql2);
+
+ save('lang_id', $row2['lang_id']);
+ }
+
}
if (get('lang_id') == null) { // ni bil podan preko GETa in ni shranjen v bazi -- priredimo default jezik
$_GET['language'] = self::$lang['id']; // to damo samo zato, da se shrani ID default jezika v bazo, namesto -1 (ker pri default jeziku ne podamo nič preko URLja)
// get('lang_id') mora se vedno ostati null !
- } else { // zamenjamo jezik
+ }
+ else { // zamenjamo jezik
$file = lang_path(get('lang_id'));
if (@include($file))
$_SESSION['langX'] = lang_path(get('lang_id'), 1);
@@ -147,10 +158,10 @@ class LanguageController extends Controller $rowl = mysqli_fetch_array($sqll);
if($naslov2){
- if ($rowl['naslov2'] != '')
+ if (isset($rowl['naslov2']) && $rowl['naslov2'] != '')
return $rowl['naslov2'];
}
- elseif ($rowl['naslov'] != ''){
+ elseif (isset($rowl['naslov']) && $rowl['naslov'] != ''){
return $rowl['naslov'];
}
}
@@ -170,7 +181,8 @@ class LanguageController extends Controller $sqll = sisplet_query("SELECT naslov FROM srv_language_grid WHERE ank_id='" . get('anketa') . "' AND spr_id='$spremenljivka' AND grd_id='$grid' AND lang_id='" . get('lang_id') . "'");
$rowl = mysqli_fetch_array($sqll);
- if ($rowl['naslov'] != '') return $rowl['naslov'];
+ if (isset($rowl['naslov']) && $rowl['naslov'] != '')
+ return $rowl['naslov'];
}
return false;
diff --git a/main/survey/app/Controllers/StatisticController.php b/main/survey/app/Controllers/StatisticController.php index 00b01c2..5a74887 100644 --- a/main/survey/app/Controllers/StatisticController.php +++ b/main/survey/app/Controllers/StatisticController.php @@ -138,8 +138,9 @@ class StatisticController extends Controller $sqla = sisplet_query("SELECT starts, expire, statistics, db_table FROM srv_anketa WHERE id ='$row2[ank_id]'");
$rowa = mysqli_fetch_array($sqla);
- if ($rowa['db_table'] == 1)
- save('db_table', '_active');
+ SurveyInfo::getInstance()->SurveyInit($row2['ank_id']);
+ $db_table = SurveyInfo::getInstance()->getSurveyArchiveDBString();
+ save('db_table', $db_table);
$text = $rowa['statistics'];
@@ -262,13 +263,13 @@ class StatisticController extends Controller echo '<ul>';
while ($rowArchive = mysqli_fetch_array($sqlArchive)) {
- $sql4 = sisplet_query("SELECT naslov, starts, insert_uid FROM srv_anketa WHERE id = '$rowArchive[ank_id]'");
+ $sql4 = sisplet_query("SELECT naslov, starts, insert_uid, hash FROM srv_anketa WHERE id = '$rowArchive[ank_id]'");
$row4 = mysqli_fetch_array($sql4);
if($row4['insert_uid'] == $global_user_id){
echo '<li>';
- echo '<a href="' . $site_url . 'a/' . $rowArchive['ank_id'] . '&glas_end=0' . get('cookie_url') . '">' . $row4['naslov'] . '</a>';
+ echo '<a href="' . $site_url . 'a/' . $row4['hash'] . '&glas_end=0' . get('cookie_url') . '">' . $row4['naslov'] . '</a>';
echo ' (' . $row4['starts'] . ')';
echo '</li>';
diff --git a/main/survey/app/Controllers/Vprasanja/ComputeController.php b/main/survey/app/Controllers/Vprasanja/ComputeController.php index d3c9353..6a2b67b 100644 --- a/main/survey/app/Controllers/Vprasanja/ComputeController.php +++ b/main/survey/app/Controllers/Vprasanja/ComputeController.php @@ -48,7 +48,7 @@ class ComputeController extends Controller $sql1 = sisplet_query("SELECT text FROM srv_data_text" . get('db_table') . " WHERE spr_id='$spremenljivka' AND usr_id='" . get('usr_id') . "' AND loop_id $loop_id");
$row1 = mysqli_fetch_array($sql1);
- echo ' <input type="text" name="vrednost_' . $spremenljivka . '" id="vrednost_' . $spremenljivka . '" value="' . $row1['text'] . '">';
+ echo ' <input type="text" name="vrednost_' . $spremenljivka . '" id="vrednost_' . $spremenljivka . '" value="' . ($row1 != null ? $row1['text'] : '') . '">';
Js::getInstance()->generateCompute($spremenljivka);
}
diff --git a/main/survey/app/Controllers/Vprasanja/DatumController.php b/main/survey/app/Controllers/Vprasanja/DatumController.php index 21552b5..964f68c 100644 --- a/main/survey/app/Controllers/Vprasanja/DatumController.php +++ b/main/survey/app/Controllers/Vprasanja/DatumController.php @@ -67,8 +67,8 @@ class DatumController extends Controller $sql1 = sisplet_query("SELECT text FROM srv_data_text" . get('db_table') . " WHERE spr_id='$spremenljivka' AND usr_id='" . get('usr_id') . "' AND loop_id $loop_id");
$row1 = mysqli_fetch_array($sql1);
- echo '<input type="text" id="vrednost_' . $spremenljivka . '" name="vrednost_' . $spremenljivka . '" value="' . $row1['text'] . '"
- onkeyup="checkBranching();" ' . ($is_missing ? ' disabled' : '') . ' readonly="true"> ';
+ $text = isset($row1['text']) ? $row1['text'] : '';
+ echo '<input type="text" id="vrednost_' . $spremenljivka . '" name="vrednost_' . $spremenljivka . '" value="'.$text.'" onkeyup="checkBranching();" ' . ($is_missing ? ' disabled' : '') . ' readonly="true"> ';
echo '</div>' . "\n";
diff --git a/main/survey/app/Controllers/Vprasanja/DoubleController.php b/main/survey/app/Controllers/Vprasanja/DoubleController.php index b357be3..83a68af 100644 --- a/main/survey/app/Controllers/Vprasanja/DoubleController.php +++ b/main/survey/app/Controllers/Vprasanja/DoubleController.php @@ -281,8 +281,8 @@ class DoubleController extends Controller $row1['naslov'] = $naslov;
}
# preverimo izbrano vrednost
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
- $grid_id2 = $srv_data_grid2[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : "";
+ $grid_id2 = isset($srv_data_grid2[$row1['id']]['grd_id']) ? $srv_data_grid2[$row1['id']]['grd_id'] : "";
# ugotovimo ali je na katerem gridu predhodno izbran missing
$is_missing = false;
diff --git a/main/survey/app/Controllers/Vprasanja/DragDropController.php b/main/survey/app/Controllers/Vprasanja/DragDropController.php index 4b4f4bc..aad911e 100644 --- a/main/survey/app/Controllers/Vprasanja/DragDropController.php +++ b/main/survey/app/Controllers/Vprasanja/DragDropController.php @@ -103,7 +103,8 @@ class DragDropController extends Controller echo '<b>' . $srv_ranking_avaliable_categories . ':</b>';
- echo '<div id="half_' . $spremenljivka . '" class="dropzone" style="height:' . $size . 'px">';
+ //echo '<div id="half_' . $spremenljivka . '" class="dropzone" style="height:' . $size . 'px">';
+ echo '<div id="half_' . $spremenljivka . '" class="dropzone" style="min-height:' . $size . 'px">';
$sql1 = sisplet_query("SELECT id, naslov, other FROM srv_vrednost WHERE spr_id='$spremenljivka' AND id NOT IN(SELECT vre_id FROM srv_data_rating WHERE spr_id = '$spremenljivka' AND usr_id='" . get('usr_id') . "' AND loop_id $loop_id) ORDER BY FIELD(vrstni_red, $order)");
echo '<ul>';
@@ -209,7 +210,7 @@ class DragDropController extends Controller echo '<td class="middle_mobile">';
}
echo '<b></b>';
- echo '<img src="' . self::$site_url . 'main/survey/skins/Modern/arrow.png" alt="arrow">';
+ //echo '<img src="' . self::$site_url . 'main/survey/skins/Modern/arrow.png" alt="arrow">';
echo '</td>';
//izris desne strani
@@ -386,7 +387,8 @@ class DragDropController extends Controller echo '<b>' . $srv_ranking_avaliable_categories . ':</b>';
- echo '<div id="half_' . $spremenljivka . '" class="dropzone" style="height:' . $size . 'px">';
+ //echo '<div id="half_' . $spremenljivka . '" class="dropzone" style="height:' . $size . 'px">';
+ echo '<div id="half_' . $spremenljivka . '" class="dropzone" style="min-height:' . $size . 'px">';
$sql1 = sisplet_query("SELECT id, naslov, other FROM srv_vrednost WHERE spr_id='$spremenljivka' AND id NOT IN(SELECT vre_id FROM srv_data_rating WHERE spr_id = '$spremenljivka' AND usr_id='" . get('usr_id') . "' AND loop_id $loop_id) ORDER BY FIELD(vrstni_red, $order)");
if (get('mobile') == 0 || get('mobile') == 2) {// ce respondent uporablja PC ali tablico
@@ -416,13 +418,9 @@ class DragDropController extends Controller $length = strlen($value); //dolzina teksta kategorije odgovora
$style = '';
if (get('mobile') == 0 || get('mobile') == 2) {// ce respondent uporablja PC ali tablico
- //if($display_drag_and_drop_new_look != 1){
- $class = 'ranking';
-/* }else if($display_drag_and_drop_new_look == 1){
- $class = 'drag_and_drop_box';
- } */
-
- } else if (get('mobile') == 1) {
+ $class = 'ranking';
+ }
+ else if (get('mobile') == 1) {
$class = 'ranking_mobile';
}
$c = '';
@@ -490,32 +488,12 @@ class DragDropController extends Controller $(document).ready(function () {
- //if(<?=$display_drag_and_drop_new_look?> == 0){
- GridDraggable(<?=$row['tip']?>, <?=$spremenljivka?>, <?=$vre_id?>, <?=$ajax?>, srv_meta_anketa_id, '<?=self::$site_url?>', usr_id, <?=$other?>, <?=get('mobile')?>, <?=$display_drag_and_drop_new_look?>, <?=$quick_view?>, <?=$preview_spremenljivka?>); //poklici funkcijo za ureditev draggable in droppable
-/* }
- else if(<?=$display_drag_and_drop_new_look?> == 1){
- //GridDraggableBox(<?=$row['tip']?>, <?=$spremenljivka?>, <?=$vre_id?>, <?=$ajax?>, srv_meta_anketa_id, '<?=self::$site_url?>', <?=$usr_id?>, <?=$other?>, <?=get('mobile')?>); //poklici funkcijo za ureditev draggable in droppable
- GridDraggableBox(<?=$row['tip']?>, <?=$spremenljivka?>, <?=$vre_id?>, <?=$ajax?>, srv_meta_anketa_id, '<?=self::$site_url?>', usr_id, <?=$other?>, <?=get('mobile')?>); //poklici funkcijo za ureditev draggable in droppable
- } */
+ GridDraggable(<?=$row['tip']?>, <?=$spremenljivka?>, <?=$vre_id?>, <?=$ajax?>, srv_meta_anketa_id, '<?=self::$site_url?>', usr_id, <?=$other?>, <?=get('mobile')?>, <?=$display_drag_and_drop_new_look?>, <?=$quick_view?>, <?=$preview_spremenljivka?>); //poklici funkcijo za ureditev draggable in droppable
});
</script>
<?
- //echo '<div id="vrednost_if_'.$id.'" class="variabla">';
- //echo '</div>'; //vrednost_if_ID
- //div ki vsebuje vrednost
- //if($length > 30)
- // if($length > 90){
- // $niz = substr($value, 0, 90);
- //echo '<div title="'.strip_tags($value).'" id="'.$class.'_'.$id.'" class="'.$class.'_long '.$c.'">'.$niz.'...</div>'."\n";
- // echo '<div title="'.strip_tags($value).'" id="'.$class.'_'.$vre_id.'" class="'.$class.'_long '.$c.'">'.$niz.'...</div>'."\n";
- // }
- // else
- //echo '<div title="'.strip_tags($value).'" id="'.$class.'_'.$id.'" class="'.$class.'_long '.$c.'">'.$value.'</div>'."\n";
- // echo '<div title="'.strip_tags($value).'" id="'.$class.'_'.$vre_id.'" class="'.$class.'_long '.$c.'">'.$value.'</div>'."\n";
- //else{
- //echo '<div id="'.$class.'_'.$id.'" class="'.$class.' '.$c.'">'.$value.'</div>'."\n";
+
echo '<div id="spremenljivka_' . $spremenljivka . '_vrednost_' . $vre_id . '" class="' . $class . ' ' . $c . '">' . $value . '</div>' . "\n"; //'#spremenljivka_'+spremenljivka+'_vrednost_'+id
- //}
}
echo '</li>' . "\n";
@@ -530,7 +508,7 @@ class DragDropController extends Controller echo '<td class="middle_mobile">';
}
echo '<b></b>';
- echo '<img src="' . self::$site_url . 'main/survey/skins/Modern/arrow.png" alt="arrow">';
+ //echo '<img src="' . self::$site_url . 'main/survey/skins/Modern/arrow.png" alt="arrow">';
echo '</td>';
//izris desne strani***********************************************************************************
diff --git a/main/survey/app/Controllers/Vprasanja/DynamicController.php b/main/survey/app/Controllers/Vprasanja/DynamicController.php index 57e0127..92acc2d 100644 --- a/main/survey/app/Controllers/Vprasanja/DynamicController.php +++ b/main/survey/app/Controllers/Vprasanja/DynamicController.php @@ -183,18 +183,21 @@ class DynamicController extends Controller echo '<thead>';
+
//vrstica z nadnaslovi
echo '<tr '.$display_trak_num_of_titles.' class="display_trak_num_of_titles_respondent_'.$row['id'].'">';
echo ' <td></td>';
echo ' <td></td>';
- //for($j = 1; $j <= $trak_num_of_titles; $j++){
+
for ($j = 1; $j <= $row['grids']; $j++) {
- //echo '<td>'.$j.'</td>';
+
if($j == 1){
$nadnaslov_floating = 'left';
- }else if($j == $row['grids']){
+ }
+ else if($j == $row['grids']){
$nadnaslov_floating = 'right';
- }else{
+ }
+ else{
$nadnaslov_floating = 'none';
}
echo '<td class="trak_inline_nadnaslov" grd="gr_'.$j.'"><div id="trak_nadnaslov_'.$j.'_'.$spremenljivka.'" name="trak_nadnaslov_'.$j.'" class="trak_inline_nadnaslov" style="float:'.$nadnaslov_floating.'; display:inline" '.(strpos($trak_nadnaslov[$j], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $trak_nadnaslov[$j] . '</div></td>';
@@ -203,6 +206,7 @@ class DynamicController extends Controller echo '</tr>';
//vrstica z nadnaslovi - konec
+
echo ' <tr>' . "\n";
echo ' <td></td>' . "\n";
echo ' <td></td>' . "\n";
@@ -220,15 +224,20 @@ class DynamicController extends Controller // Datapiping
$srv_grid['naslov'] = Helper::dataPiping($srv_grid['naslov']);
-
- if($diferencial_trak != 1){ //ce ni traku
+ //ce ni traku
+ if($diferencial_trak != 1){
# izpišemo labelo grida
echo ' <td class="' . ($srv_grid['other'] == 0 ? 'category' : 'missing') . '">' . $srv_grid['naslov'] . '</td>' . "\n";
- }elseif($diferencial_trak == 1){ //ce je trak
+ }
+ //ce je trak
+ elseif($diferencial_trak == 1){
+
# izpišemo ustrezno labelo grida
if($srv_grid['other'] == 0){ //ce je labela za kategorijo odgovora, naj bo prazno
echo ' <td class="' . ($srv_grid['other'] == 0 ? 'category' : 'missing') . ' ' . $cssAlign . '"></td>' . "\n";
- }else { //drugace, ce je labela za missing, izpisi labelo
+ }
+ //drugace, ce je labela za missing, izpisi labelo
+ else {
echo ' <td class="' . ($srv_grid['other'] == 0 ? 'category' : 'missing') . ' ' . $cssAlign . '">' . $srv_grid['naslov'] . '</td>' . "\n";
}
}
@@ -263,15 +272,26 @@ class DynamicController extends Controller // Stevilo vseh vrednosti
echo '<input type="hidden" id="dynamic_multigrid_' . $spremenljivka . '" value="' . $countVar . '" />';
+
// Indikator da v js vemo ali smo ravnokar naloudali stran ali pa smo samo premaknili vrstico (potrebno zaradi prikazovanja glede na ife v dolocenih primerih)
echo '<input type="hidden" id="dynamic_multigrid_' . $spremenljivka . '_load" value="1" />';
while ($row1 = mysqli_fetch_array($sql1)) {
+
# po potrebi prevedemo naslov
$naslov = Language::getInstance()->srv_language_vrednost($row1['id']);
if ($naslov != '') {
$row1['naslov'] = $naslov;
}
+
+ # po potrebi prevedemo naslov2 za diferencial
+ if ($row['enota'] == 1) {
+ $naslov2 = Language::getInstance()->srv_language_vrednost($row1['id'], true);
+ if ($naslov2 != '') {
+ $row1['naslov2'] = $naslov2;
+ }
+ }
+
# preverimo izbrano vrednost
$grid_id = $srv_data_grid[$row1['id']]['grd_id'];
@@ -545,11 +565,22 @@ class DynamicController extends Controller echo '<input type="hidden" id="dynamic_multigrid_' . $spremenljivka . '_load" value="1" />';
while ($row1 = mysqli_fetch_array($sql1)) {
+
# po potrebi prevedemo naslov
$naslov = Language::getInstance()->srv_language_vrednost($row1['id']);
if ($naslov != '') {
$row1['naslov'] = $naslov;
}
+
+ # po potrebi prevedemo naslov2 za diferencial
+ if ($row['enota'] == 1) {
+ $naslov2 = Language::getInstance()->srv_language_vrednost($row1['id'], true);
+ if ($naslov2 != '') {
+ $row1['naslov2'] = $naslov2;
+ }
+ }
+
+
# preverimo izbrano vrednost
$grid_id = $srv_data_grid[$row1['id']]['grd_id'];
diff --git a/main/survey/app/Controllers/Vprasanja/HeatMapController.php b/main/survey/app/Controllers/Vprasanja/HeatMapController.php index 4a255dd..c3f1e2a 100644 --- a/main/survey/app/Controllers/Vprasanja/HeatMapController.php +++ b/main/survey/app/Controllers/Vprasanja/HeatMapController.php @@ -91,8 +91,8 @@ class HeatMapController extends Controller echo '<div id="heatmap_'.$spremenljivka.'" class="hotspot" style="width: 40%; float: left;">';
//imena obmocij iz srv_vrednost
- $sql1 = sisplet_query("SELECT id, naslov FROM srv_vrednost WHERE spr_id='$row[id]' ORDER BY vrstni_red");
- $sqlR = sisplet_query("SELECT region_coords, vre_id FROM srv_hotspot_regions WHERE spr_id='$row[id]' ");
+ $sql1 = sisplet_query("SELECT id, naslov FROM srv_vrednost WHERE spr_id='".$row['id']."' ORDER BY vrstni_red");
+ $sqlR = sisplet_query("SELECT region_coords, vre_id FROM srv_hotspot_regions WHERE spr_id='".$row['id']."'");
//ce so podatki ze v bazi (rec. uporabnik klikne 'Prejsnja stran')
//$sql1a = sisplet_query("SELECT lat, lng, address, text FROM srv_data_map WHERE spr_id='$spremenljivka' AND usr_id='" . get('usr_id') . "' AND loop_id $loop_id");
@@ -102,20 +102,20 @@ class HeatMapController extends Controller $heatmap_data[] = $row1a;
}
- echo '<div id="hotspot_regions_hidden_menu_'.$row[id].'" style="display:none; ">';
- //echo '<div id="hotspot_regions_hidden_menu_'.$row[id].'">';
- //echo ' <div class="variabla" id="variabla_'.$row1['id'].'">';
- if (mysqli_num_rows($sql1) == 0){
- echo ' <div class="variabla">';
+ echo '<div id="hotspot_regions_hidden_menu_'.$row['id'].'" style="display:none; ">';
+
+ if (mysqli_num_rows($sql1) == 0){
+ echo ' <div class="variabla">';
+ echo '</div>';
+ }
+ else{
+ while ($row1 = mysqli_fetch_array($sql1)) {
+
+ echo ' <div class="variabla" id="variabla_'.$row1['id'].'">';
+ echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_vrednost'])!==false || strpos($row1['naslov'], $lang1['srv_new_vrednost'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'</div>';
echo '</div>';
- }else{
- while ($row1 = mysqli_fetch_array($sql1)) {
-
- echo ' <div class="variabla" id="variabla_'.$row1['id'].'">';
- echo '<div id="vre_id_'.$row1['id'].'" class="vrednost_inline" contenteditable="'.(!$locked?'true':'false').'" tabindex="1" vre_id="'.$row1['id'].'" '.(strpos($row1['naslov'], $lang['srv_new_vrednost'])!==false || strpos($row1['naslov'], $lang1['srv_new_vrednost'])!==false || $this->lang_id!=null ? ' default="1"':'').'>' . $row1['naslov'].'</div>';
- echo '</div>';
- }
- }
+ }
+ }
echo '</div>';
diff --git a/main/survey/app/Controllers/Vprasanja/ImageHotSpotController.php b/main/survey/app/Controllers/Vprasanja/ImageHotSpotController.php index 3e0b953..c706d39 100644 --- a/main/survey/app/Controllers/Vprasanja/ImageHotSpotController.php +++ b/main/survey/app/Controllers/Vprasanja/ImageHotSpotController.php @@ -82,11 +82,11 @@ class ImageHotSpotController extends Controller //imena obmocij iz srv_vrednost
- $sql1 = sisplet_query("SELECT id, naslov FROM srv_vrednost WHERE spr_id='$row[id]' ORDER BY vrstni_red");
+ $sql1 = sisplet_query("SELECT id, naslov FROM srv_vrednost WHERE spr_id='".$row['id']."' ORDER BY vrstni_red");
//$sqlR = sisplet_query("SELECT * FROM srv_hotspot_regions WHERE spr_id='$row[id]' ");
- $sqlR = sisplet_query("SELECT region_coords, vre_id FROM srv_hotspot_regions WHERE spr_id='$row[id]' ");
+ $sqlR = sisplet_query("SELECT region_coords, vre_id FROM srv_hotspot_regions WHERE spr_id='".$row['id']."'");
- echo '<div id="hotspot_regions_hidden_menu_'.$row[id].'" style="display:none; ">';
+ echo '<div id="hotspot_regions_hidden_menu_'.$row['id'].'" style="display:none; ">';
if (mysqli_num_rows($sql1) == 0){
echo ' <div class="variabla">';
echo '</div>';
@@ -184,8 +184,9 @@ class ImageHotSpotController extends Controller if ($naslov != '') {
$row1['naslov'] = $naslov;
}
+
# preverimo izbrano vrednost
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : '';
# ugotovimo ali je na katerem gridu predhodno izbran missing
$is_missing = false;
@@ -353,7 +354,7 @@ class ImageHotSpotController extends Controller $mv_count = 0; # koliko je stolpcev z manjkajočimi vrednostmi
# če polje other != 0 je grid kot missing
//$sql_grid = sisplet_query("SELECT * FROM srv_grid WHERE spr_id='$row[id]' ORDER BY vrstni_red");
- $sql_grid = sisplet_query("SELECT id, naslov, other FROM srv_grid WHERE spr_id='$row[id]' ORDER BY vrstni_red");
+ $sql_grid = sisplet_query("SELECT id, naslov, other, variable FROM srv_grid WHERE spr_id='$row[id]' ORDER BY vrstni_red");
while ($row_grid = mysqli_fetch_assoc($sql_grid)) {
# priredimo naslov če prevajamo anketo
@@ -410,7 +411,7 @@ class ImageHotSpotController extends Controller $row1['naslov'] = $naslov;
}
// preverimo izbrano vrednost
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : '';
// ugotovimo ali je na katerem gridu predhodno izbran missing
$is_missing = false;
@@ -464,11 +465,10 @@ class ImageHotSpotController extends Controller # izpišemo radio grida
if ($srv_grid['other'] != 0) {
- $htmltootip[$row1['id']] = $htmltootip[$row1['id']].'<div class=\"missing ' . $cssAlign . '\">';
+ $htmltootip[$row1['id']] = $htmltootip[$row1['id']].'<div class=\"missing\">';
# imamo missing vrednost
$htmltootip[$row1['id']] = $htmltootip[$row1['id']].'<label for=\"im_grid_missing_value_' . $row1['id'] . '_grid_' . $value . '\">';
- //$htmltootip[$row1['id']] = $htmltootip[$row1['id']].'<input type=\"radio\" ' . (!$hideName ? ' name=\"vrednost_' . $row1['id'] . '\"' : '') . ' id=\"im_grid_missing_value_' . $row1['id'] . '_grid_' . $value . '\" value=\"' . $value . '\"' . (($grid_id == $value && $grid_id != '') ? ' checked' : '') . ' data-calculation=\"0\" onclick=\"checkChecked(this); checkTableMissing(this); checkBranching(); setCheckedClass(this, null, ' . $row1['id'] . '); mapdelovanjeRadioGrid(this, ' . $row1['id'] . ');\">';
$htmltootip[$row1['id']] = $htmltootip[$row1['id']].'<input type=\"radio\" ' . (!$hideName ? ' name=\"vrednost_' . $row1['id'] . '\"' : '') . ' id=\"im_grid_missing_value_' . $row1['id'] . '_grid_' . $value . '\" value=\"' . $value . '\"' . (($grid_id == $value && $grid_id != '') ? ' checked' : '') . ' data-calculation=\"0\" onclick=\"checkChecked(this); checkTableMissing(this); if (typeof checkBranching == \'function\'){checkBranching();} setCheckedClass(this, null, ' . $row1['id'] . '); mapdelovanjeRadioGrid(this, ' . $row1['id'] . ');\">';
//$htmltootip[$row1['id']] = $htmltootip[$row1['id']].'<span class="enka-checkbox-radio ' . (($row1['hidden'] == 2) ? ' answer-disabled' : '') .'"'.
@@ -479,7 +479,7 @@ class ImageHotSpotController extends Controller $htmltootip[$row1['id']] = $htmltootip[$row1['id']].'</label>';
$htmltootip[$row1['id']] = $htmltootip[$row1['id']].'</div>';
} else {
- $htmltootip[$row1['id']] = $htmltootip[$row1['id']].'<div class=\"category ' . $cssAlign . '\">';
+ $htmltootip[$row1['id']] = $htmltootip[$row1['id']].'<div class=\"category\">';
# ni missing vrednost
$htmltootip[$row1['id']] = $htmltootip[$row1['id']].'<label for=\"im_vrednost_' . $row1['id'] . '_grid_' . $value . '\">';
$htmltootip[$row1['id']] = $htmltootip[$row1['id']].'<input type=\"radio\" ' . (!$hideName ? ' name=\"vrednost_' . $row1['id'] . '\"' : '') . ' id=\"im_vrednost_' . $row1['id'] . '_grid_' . $value . '\" value=\"' . $value . '\"' . (($grid_id == $value && $grid_id != '' && !$is_missing) ? ' checked' : '') . ($is_missing ? ' disabled' : '') . ' data-calculation=\"' . $srv_grids[$i]['variable'] . '\" onclick=\"checkChecked(this); if (typeof checkBranching == \'function\'){checkBranching();} setCheckedClass(this, null, ' . $row1['id'] . '); mapdelovanjeRadioGrid(this, ' . $row1['id'] . ');\">';
@@ -576,7 +576,7 @@ class ImageHotSpotController extends Controller $sql1 = sisplet_query("SELECT id, naslov, vrstni_red FROM srv_vrednost WHERE spr_id='$row[id]' ORDER BY vrstni_red");
$sqlR = sisplet_query("SELECT region_coords, vre_id FROM srv_hotspot_regions WHERE spr_id='$row[id]' ");
- echo '<div id="hotspot_regions_hidden_menu_'.$row[id].'" style="display:none; ">';
+ echo '<div id="hotspot_regions_hidden_menu_'.$row['id'].'" style="display:none; ">';
// Ali gre za sazu anketo
if(SurveyInfo::getInstance()->checkSurveyModule('sazu'))
@@ -621,35 +621,30 @@ class ImageHotSpotController extends Controller # polovimo vrednosti gridov, prevedemo naslove in hkrati preverimo ali imamo missinge
$srv_grids = array();
$mv_count = 0; # koliko je stolpcev z manjkajočimi vrednostmi
- # če polje other != 0 je grid kot missing
- $sql_grid = sisplet_query("SELECT * FROM srv_hotspot_regions WHERE spr_id='$row[id]' ORDER BY vrstni_red");
+
+ $sql_grid = sisplet_query("SELECT * FROM srv_hotspot_regions WHERE spr_id='".$row['id']."' ORDER BY vrstni_red");
while ($row_grid = mysqli_fetch_assoc($sql_grid)) {
+
# priredimo naslov če prevajamo anketo
$naslov = Language::srv_language_grid($row['id'], $row_grid['id']);
+
if ($naslov != '') {
//$row_grid['naslov'] = $naslov;
$row_grid['vrstni_red'] = $naslov;
}
- $srv_grids[$row_grid['id']] = $row_grid;
- # če je označena kot manjkajoča jo prištejemo k manjkajočim
- if ($row_grid['other'] != 0) {
- $mv_count++;
- }
+ $srv_grids[$row_grid['id']] = $row_grid;
}
# Izpišemo TOP vrstico z labelami
if (count($srv_grids) > 0) {
+
$first_missing_value = true;
+
foreach ($srv_grids AS $i => $srv_grid) {
- if ((string)$srv_grid['other'] != '0' && $first_missing_value == true) {
- # dodamo spejs pred manjkajočimi vrednostmi
- echo ' <td></td>' . "\n";
- $first_missing_value = false;
- }
// Datapiping
- $srv_grid['naslov'] = Helper::dataPiping($srv_grid['naslov']);
+ $srv_grid['region_name'] = Helper::dataPiping($srv_grid['region_name']);
}
}
@@ -674,18 +669,12 @@ class ImageHotSpotController extends Controller if ($naslov != '') {
$row1['naslov'] = $naslov;
}
+
# preverimo izbrano vrednost
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : '';
# ugotovimo ali je na katerem gridu predhodno izbran missing
$is_missing = false;
- if (count($srv_grids) > 0) {
- foreach ($srv_grids AS $i => $srv_grid) {
- if ($srv_grid['other'] != 0 && $srv_grids[$i]['id'] == $grid_id) {
- $is_missing = true;
- }
- }
- }
// Datapiping
$row1['naslov'] = Helper::dataPiping($row1['naslov']);
@@ -704,62 +693,41 @@ class ImageHotSpotController extends Controller $first_missing_value = true;
foreach ($srv_grids AS $i => $srv_grid) {
-
- if ((string)$srv_grid['other'] != '0' && $first_missing_value == true) {
- $first_missing_value = false;
- }
$value = $srv_grids[$i]['id'];
- # izpišemo radio grida
- if ($srv_grid['other'] != 0) {
- $htmltootip[$row1['id']] .= '<div class=\"missing ' . $cssAlign . '\">';
- # imamo missing vrednost
- $htmltootip[$row1['id']] .= '<label for=\"im_grid_missing_value_' . $row1['id'] . '_grid_' . $value . '\">';
-
- $htmltootip[$row1['id']] .= '<input type=\"radio\" ' . (!$hideName ? ' name=\"vrednost_' . $row1['id'] . '\"' : '') . ' id=\"im_grid_missing_value_' . $row1['id'] . '_grid_' . $value . '\" value=\"' . $value . '\"' . (($grid_id == $value && $grid_id != '') ? ' checked' : '') . ' data-calculation=\"0\" onclick=\"checkChecked(this); checkTableMissing(this); if (typeof checkBranching == \'function\'){checkBranching();} setCheckedClass(this, null, ' . $row1['id'] . '); mapdelovanjeRadioGrid(this, ' . $row1['id'] . ');\">';
+ $htmltootip[$row1['id']] .= '<div class=\"category\">';
+
+ // Za SAZU moramo posebej obarvati
+ if(SurveyInfo::getInstance()->checkSurveyModule('sazu')){
+ # ni missing vrednost
+ $htmltootip[$row1['id']] .= '<label for=\"im_vrednost_' . $row1['id'] . '_grid_' . $value . '\">';
+ $htmltootip[$row1['id']] .= '<input vrstni_red='.$srv_grid['vrstni_red'].' type=\"radio\" ' . (!$hideName ? ' name=\"vrednost_' . $row1['id'] . '\"' : '') . ' id=\"im_vrednost_' . $row1['id'] . '_grid_' . $value . '\" value=\"' . $value . '\"' . (($grid_id == $value && $grid_id != '' && !$is_missing) ? ' checked' : '') . ($is_missing ? ' disabled' : '') . ' data-calculation=\"' . $srv_grids[$i]['variable'] . '\" onclick=\"checkChecked(this); if (typeof checkBranching == \'function\'){checkBranching();} setCheckedClass(this, null, ' . $row1['id'] . '); mapdelovanjeRankingSazu(this, ' . $row1['id'] . ');\">';
$htmltootip[$row1['id']] .= '<span class=\"enka-checkbox-radio ' . (($row1['hidden'] == 2) ? ' answer-disabled' : '') .'\"'.
((Helper::getCustomCheckbox() != 0) ? (' style="font-size:' . Helper::getCustomCheckbox().'px;"') : '').
'></span>';
- $htmltootip[$row1['id']] .= $srv_grid['naslov'];
+ //besedilo ob radio buttonu
+ $htmltootip[$row1['id']] .= $srv_grid['vrstni_red'];
+
+ //besedilo ob radio buttonu - konec
+ $htmltootip[$row1['id']] .= '</label>';
+ }
+ else{
+ # ni missing vrednost
+ $htmltootip[$row1['id']] .= '<label for=\"im_vrednost_' . $row1['id'] . '_grid_' . $value . '\">';
+
+ $htmltootip[$row1['id']] .= '<input vrstni_red='.$srv_grid['vrstni_red'].' type=\"radio\" ' . (!$hideName ? ' name=\"vrednost_' . $row1['id'] . '\"' : '') . ' id=\"im_vrednost_' . $row1['id'] . '_grid_' . $value . '\" value=\"' . $value . '\"' . (($grid_id == $value && $grid_id != '' && !$is_missing) ? ' checked' : '') . ($is_missing ? ' disabled' : '') . ' data-calculation=\"' . $srv_grids[$i]['variable'] . '\" onclick=\"checkChecked(this); if (typeof checkBranching == \'function\'){checkBranching();} setCheckedClass(this, null, ' . $row1['id'] . '); mapdelovanjeRanking(this, ' . $row1['id'] . ');\">';
+ $htmltootip[$row1['id']] .= '<span class=\"enka-checkbox-radio ' . (($row1['hidden'] == 2) ? ' answer-disabled' : '') .'\"'.
+ ((Helper::getCustomCheckbox() != 0) ? (' style="font-size:' . Helper::getCustomCheckbox().'px;"') : '').
+ '></span>';
+ //besedilo ob radio buttonu
+ $htmltootip[$row1['id']] .= $srv_grid['vrstni_red'];
+ //besedilo ob radio buttonu - konec
$htmltootip[$row1['id']] .= '</label>';
- $htmltootip[$row1['id']] .= '</div>';
- }
- else {
- $htmltootip[$row1['id']] .= '<div class=\"category ' . $cssAlign . '\">';
-
-
- // Za SAZU moramo posebej obarvati
- if(SurveyInfo::getInstance()->checkSurveyModule('sazu')){
- # ni missing vrednost
- $htmltootip[$row1['id']] .= '<label for=\"im_vrednost_' . $row1['id'] . '_grid_' . $value . '\">';
-
- $htmltootip[$row1['id']] .= '<input vrstni_red='.$srv_grid['vrstni_red'].' type=\"radio\" ' . (!$hideName ? ' name=\"vrednost_' . $row1['id'] . '\"' : '') . ' id=\"im_vrednost_' . $row1['id'] . '_grid_' . $value . '\" value=\"' . $value . '\"' . (($grid_id == $value && $grid_id != '' && !$is_missing) ? ' checked' : '') . ($is_missing ? ' disabled' : '') . ' data-calculation=\"' . $srv_grids[$i]['variable'] . '\" onclick=\"checkChecked(this); if (typeof checkBranching == \'function\'){checkBranching();} setCheckedClass(this, null, ' . $row1['id'] . '); mapdelovanjeRankingSazu(this, ' . $row1['id'] . ');\">';
- $htmltootip[$row1['id']] .= '<span class=\"enka-checkbox-radio ' . (($row1['hidden'] == 2) ? ' answer-disabled' : '') .'\"'.
- ((Helper::getCustomCheckbox() != 0) ? (' style="font-size:' . Helper::getCustomCheckbox().'px;"') : '').
- '></span>';
- //besedilo ob radio buttonu
- $htmltootip[$row1['id']] .= $srv_grid['vrstni_red'];
-
- //besedilo ob radio buttonu - konec
- $htmltootip[$row1['id']] .= '</label>';
- }
- else{
- # ni missing vrednost
- $htmltootip[$row1['id']] .= '<label for=\"im_vrednost_' . $row1['id'] . '_grid_' . $value . '\">';
-
- $htmltootip[$row1['id']] .= '<input vrstni_red='.$srv_grid['vrstni_red'].' type=\"radio\" ' . (!$hideName ? ' name=\"vrednost_' . $row1['id'] . '\"' : '') . ' id=\"im_vrednost_' . $row1['id'] . '_grid_' . $value . '\" value=\"' . $value . '\"' . (($grid_id == $value && $grid_id != '' && !$is_missing) ? ' checked' : '') . ($is_missing ? ' disabled' : '') . ' data-calculation=\"' . $srv_grids[$i]['variable'] . '\" onclick=\"checkChecked(this); if (typeof checkBranching == \'function\'){checkBranching();} setCheckedClass(this, null, ' . $row1['id'] . '); mapdelovanjeRanking(this, ' . $row1['id'] . ');\">';
- $htmltootip[$row1['id']] .= '<span class=\"enka-checkbox-radio ' . (($row1['hidden'] == 2) ? ' answer-disabled' : '') .'\"'.
- ((Helper::getCustomCheckbox() != 0) ? (' style="font-size:' . Helper::getCustomCheckbox().'px;"') : '').
- '></span>';
- //besedilo ob radio buttonu
- $htmltootip[$row1['id']] .= $srv_grid['vrstni_red'];
- //besedilo ob radio buttonu - konec
- $htmltootip[$row1['id']] .= '</label>';
- }
- $htmltootip[$row1['id']] .= '</div>';
}
+
+ $htmltootip[$row1['id']] .= '</div>';
}
}
diff --git a/main/survey/app/Controllers/Vprasanja/MaxDiffController.php b/main/survey/app/Controllers/Vprasanja/MaxDiffController.php index e1807b9..20f991e 100644 --- a/main/survey/app/Controllers/Vprasanja/MaxDiffController.php +++ b/main/survey/app/Controllers/Vprasanja/MaxDiffController.php @@ -163,7 +163,7 @@ class MaxDiffController extends Controller $row1['naslov'] = $naslov;
}
# preverimo izbrano vrednost
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : null;
# ugotovimo ali je na katerem gridu predhodno izbran missing
$is_missing = false;
@@ -271,9 +271,9 @@ class MaxDiffController extends Controller $otherHeight = ($spremenljivkaParams->get('otherHeight') ? $spremenljivkaParams->get('otherHeight') : 1);
if ($otherHeight > 1)
- echo ' <textarea name="textfield_' . $row1['id'] . '" rows="' . $otherHeight . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . '>' . ($is_missing ? '' : $row3['text']) . '</textarea>';
+ echo ' <textarea name="textfield_' . $row1['id'] . '" rows="' . $otherHeight . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . '>' . ((!isset($row3['text']) || $is_missing) ? '' : $row3['text']) . '</textarea>';
else
- echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />';
+ echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ((!isset($row3['text']) || $is_missing) ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />';
}
echo '</td>';
diff --git a/main/survey/app/Controllers/Vprasanja/MultigridController.php b/main/survey/app/Controllers/Vprasanja/MultigridController.php index 85fd49d..cd8887c 100644 --- a/main/survey/app/Controllers/Vprasanja/MultigridController.php +++ b/main/survey/app/Controllers/Vprasanja/MultigridController.php @@ -113,6 +113,7 @@ class MultigridController extends Controller $display_trak_num_of_titles = 'style="display:none;"';
}
+ $trak_nadnaslov = array();
for($i = 1; $i <= $trak_num_of_titles; $i++){
$trak_nadnaslov[$i] = ($spremenljivkaParams->get('trak_nadnaslov_'.$i.'') ? $spremenljivkaParams->get('trak_nadnaslov_'.$i.'') : $lang['srv_new_text']);
}
@@ -159,8 +160,6 @@ class MultigridController extends Controller $spacesize = round(80 / $size / 4);
- $bg = 1;
-
// IZRIS TABELE
echo '<table class="grid_table multigrid">' . "\n";
@@ -220,8 +219,6 @@ class MultigridController extends Controller // Body tabele
echo '<tbody>';
- $bg++;
-
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
# cache tabele srv_data_grid, da se ne dela vsakic posebej nov query (preberemo enkrat vse odgovore userja)
@@ -253,7 +250,7 @@ class MultigridController extends Controller }
# preverimo izbrano vrednost
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id']: '';
# ugotovimo ali je na katerem gridu predhodno izbran missing
$is_missing = false;
@@ -351,7 +348,7 @@ class MultigridController extends Controller echo '<td class="category '.$tabelaSmeski. $_checked.' ' . $cssAlign . '">';
# ni missing vrednost
echo '<label for="vrednost_' . $row1['id'] . '_grid_' . $value . '">';
- echo '<input type="radio" ' . (!$hideName ? ' name="vrednost_' . $row1['id'] . '"' : '') . ' id="vrednost_' . $row1['id'] . '_grid_' . $value . '" value="' . $value . '"' . $_checked . ($is_missing ? ' disabled' : '') . ' data-calculation="' . $srv_grids[$i]['variable'] . '" vre_id = '.$row1['id'].' onclick="checkChecked(this); checkBranching(); setCheckedClass(this, null, ' . $row1['id'] . '); customRadioTableSelect(' . $row1['id'] . ', ' . $value. ');">';
+ echo '<input type="radio" ' . (!$hideName ? ' name="vrednost_' . $row1['id'] . '"' : '') . ' id="vrednost_' . $row1['id'] . '_grid_' . $value . '" value="' . $value . '"' . $_checked . ' data-calculation="' . $srv_grids[$i]['variable'] . '" vre_id = '.$row1['id'].' onclick="checkChecked(this); checkBranching(); setCheckedClass(this, null, ' . $row1['id'] . '); customRadioTableSelect(' . $row1['id'] . ', ' . $value. ');">';
if($row['enota'] == 11){
echo '<span class="enka-vizualna-skala siv-'.$row['grids'].$value.'"></span>';
@@ -377,6 +374,7 @@ class MultigridController extends Controller }
}
}
+
# dodamo še enoto
if ($row['enota'] == 1) {
// Datapiping
@@ -385,9 +383,8 @@ class MultigridController extends Controller echo ' <td></td>' . "\n";
echo ' <td class="differential question_trak">' . $row1['naslov2'] . '</td>' . "\n";
}
+
echo ' </tr>' . "\n";
-
- $bg++;
}
echo '</tbody>';
@@ -472,8 +469,6 @@ class MultigridController extends Controller echo '<tbody>';
- $bg++;
-
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
// cache tabele srv_grid, da se ne bere vsakic znova
@@ -527,7 +522,7 @@ class MultigridController extends Controller }
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : '';
echo '<td ' . $cssAlign . '>';
@@ -568,8 +563,6 @@ class MultigridController extends Controller echo '</td>' . "\n";
echo '</tr>' . "\n";
-
- $bg++;
}
echo '</tbody>';
@@ -631,8 +624,6 @@ class MultigridController extends Controller echo '<tbody>';
- $bg++;
-
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
$missingi = array();
@@ -681,9 +672,9 @@ class MultigridController extends Controller $otherHeight = ($spremenljivkaParams->get('otherHeight') ? $spremenljivkaParams->get('otherHeight') : 1);
if ($otherHeight > 1)
- echo ' <textarea name="textfield_' . $row1['id'] . '" rows="' . $otherHeight . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '">' . $row3['text'] . '</textarea>';
+ echo ' <textarea name="textfield_' . $row1['id'] . '" rows="' . $otherHeight . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '">' . (isset($row3['text']) ? $row3['text'] : '') . '</textarea>';
else
- echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . $row3['text'] . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" />';
+ echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . (isset($row3['text']) ? $row3['text'] : '') . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" />';
//echo ' <input type="text" name="textfield_'.$row1['id'].'" value="'.$row3['text'].'">';
}
@@ -692,7 +683,7 @@ class MultigridController extends Controller }
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : '';
echo '<td ' . $cssAlign . '>';
@@ -771,8 +762,6 @@ class MultigridController extends Controller echo '</td>' . "\n";
echo '</tr>' . "\n";
-
- $bg++;
}
echo '</tbody>';
@@ -893,8 +882,6 @@ class MultigridController extends Controller //$taWidth = 10;
$taWidth = round(50 / $size);
- $bg = 1;
-
// Header tabele
echo '<thead>';
@@ -905,8 +892,6 @@ class MultigridController extends Controller // Body tabele
echo '<tbody>';
- $bg++;
-
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
$srv_data_cache = array();
@@ -924,7 +909,7 @@ class MultigridController extends Controller if ($naslov != '') $row1['naslov'] = $naslov;
# preverimo izbrano vrednost
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : '';
# ugotovimo ali je na katerem gridu predhodno izbran missing
$is_missing = false;
@@ -966,7 +951,7 @@ class MultigridController extends Controller $first_missing_value = true;
foreach ($srv_grids AS $i => $srv_grid) {
- $grid_id = $srv_data_cache[$row1['id']][$i]['grd_id'];
+ $grid_id = isset($srv_data_cache[$row1['id']][$i]['grd_id']) ? $srv_data_cache[$row1['id']][$i]['grd_id'] : '';
$value = $srv_grid['id'];
$vsebina = '';
@@ -1009,8 +994,6 @@ class MultigridController extends Controller }
echo ' </tr>' . "\n";
-
- $bg++;
}
echo '</tbody>';
@@ -1040,13 +1023,16 @@ class MultigridController extends Controller $row = Model::select_from_srv_spremenljivka($spremenljivka);
+ $multiple=array();
$sql1 = sisplet_query("SELECT spr_id FROM srv_grid_multiple WHERE parent='$spremenljivka' ORDER BY vrstni_red");
while ($row1 = mysqli_fetch_array($sql1)) {
$multiple[] = $row1['spr_id'];
}
- if (count($multiple) == 0)
+
+ if (count($multiple) == 0) {
return;
+ }
$spremenljivkaParams = new enkaParameters($row['params']);
// $gridWidth = (($spremenljivkaParams->get('gridWidth') > 0) ? $spremenljivkaParams->get('gridWidth') : 30);
@@ -1136,7 +1122,6 @@ class MultigridController extends Controller $spacesize = round(80 / $size / 4);
- $bg = 1;
echo '<table class="grid_table multigrid">' . "\n";
@@ -1153,7 +1138,7 @@ class MultigridController extends Controller /*for ($i = 1; $i <= $size; $i++)
echo '<col>';*/
foreach ($srv_grids as $grid){
- if($grid['gridmultiple_width'] > 0)
+ if(isset($grid['gridmultiple_width']) && $grid['gridmultiple_width'] > 0)
echo '<col style="width:'.$grid['gridmultiple_width'].'%;">';
else
echo '<col>';
@@ -1231,8 +1216,6 @@ class MultigridController extends Controller echo '<tbody>';
- $bg++;
-
$orderby = Model::generate_order_by_field($multiple[0], get('usr_id'));
# cache tabele srv_data_grid, da se ne dela vsakic posebej nov query (preberemo enkrat vse odgovore userja)
@@ -1323,7 +1306,8 @@ class MultigridController extends Controller $sbSize = ($spr_Params->get('sbSize') ? $spr_Params->get('sbSize') : 3);
$prvaVrstica = ($spr_Params->get('prvaVrstica') ? $spr_Params->get('prvaVrstica') : 1);
$prvaVrstica_roleta = ($spr_Params->get('prvaVrstica_roleta') ? $spr_Params->get('prvaVrstica_roleta') : 1);
- $grid_id = $srv_data_grid[$row_spr['id']][$row2['id']]['grd_id'];
+
+ $grid_id = isset($srv_data_grid[$row_spr['id']][$row2['id']]['grd_id']) ? $srv_data_grid[$row_spr['id']][$row2['id']]['grd_id'] : '';
echo '<td class="category ' . ($srv_grid['vrstni_red'] == 1 && $jj > 1 ? 'double' : '') . ' ' . $cssAlign . '">';
if ($row_spr['enota'] == 2) {//roleta
@@ -1369,9 +1353,9 @@ class MultigridController extends Controller }
echo '</select>';
echo '</td>';
- } else {
-
- $grid_id = $srv_data_grid[$row_spr['id']][$row2['id']]['grd_id'];
+ }
+ else {
+ $grid_id = isset($srv_data_grid[$row_spr['id']][$row2['id']]['grd_id']) ? $srv_data_grid[$row_spr['id']][$row2['id']]['grd_id'] : '';
echo '<td class="category ' . ($srv_grid['vrstni_red'] == 1 && $jj > 1 ? 'double' : '') . ' ' . $cssAlign . '">';
# ni missing vrednost
@@ -1384,7 +1368,6 @@ class MultigridController extends Controller echo '</label>';
echo '</td>' . "\n";
-
}
// multi
@@ -1398,7 +1381,8 @@ class MultigridController extends Controller if ($prvaVrstica != 1) {
$sbSize = $sbSize + 1;
}
- $grid_id = $srv_data_grid[$row_spr['id']][$row2['id']]['grd_id'];
+
+ $grid_id = isset($srv_data_grid[$row_spr['id']][$row2['id']]['grd_id']) ? $srv_data_grid[$row_spr['id']][$row2['id']]['grd_id'] : '';
echo '<td class="category ' . ($srv_grid['vrstni_red'] == 1 && $jj > 1 ? 'double' : '') . ' ' . $cssAlign . '">';
@@ -1427,9 +1411,11 @@ class MultigridController extends Controller }
echo '</select>';
echo '</td>';
- }//multi checkbox
+ }
+ //multi checkbox
elseif ($row_spr['enota'] != 6) {
- $grid_id = $srv_data_checkgrid[$row_spr['id']][$row2['id']][$value]['grd_id'];
+
+ $grid_id = isset($srv_data_checkgrid[$row_spr['id']][$row2['id']][$value]['grd_id']) ? $srv_data_checkgrid[$row_spr['id']][$row2['id']][$value]['grd_id'] : '';
echo '<td class="category ' . ($srv_grid['vrstni_red'] == 1 && $jj > 1 ? 'double' : '') . ' ' . $cssAlign . '">';
echo '<label for="multi_' . $row_spr['id'] . '_' . $row2['id'] . '_grid_' . $value . '">';
@@ -1456,7 +1442,7 @@ class MultigridController extends Controller $taWidth = $taWidth * 10; // da dobimo % (opcije se od 1 - 9)
}
- $vsebina = $srv_data_cache[$row_spr['id']][$row2['id']][$srv_grid['id']]['text'];
+ $vsebina = isset($srv_data_cache[$row_spr['id']][$row2['id']][$srv_grid['id']]['text']) ? $srv_data_cache[$row_spr['id']][$row2['id']][$srv_grid['id']]['text'] : "";
// datum
if ($spr_Params->get('multigrid-datum') == '1') {
@@ -1528,14 +1514,14 @@ class MultigridController extends Controller }
}
}
+
# dodamo še enoto
if ($row['enota'] == 1) {
echo ' <td></td>' . "\n";
echo ' <td class="differential">' . $row1['naslov2'] . '</td>' . "\n";
}
- echo ' </tr>' . "\n";
- $bg++;
+ echo ' </tr>' . "\n";
}
echo '</tbody>';
@@ -1552,9 +1538,9 @@ class MultigridController extends Controller echo '<tr '.$display_trak_num_of_titles.' class="display_trak_num_of_titles_respondent_'.$row['id'].'">';
if ($hideLabels == false) {
- echo ' <td></td>';
- echo ' <td></td>';
- }
+ echo ' <td></td>';
+ echo ' <td></td>';
+ }
for ($j = 1; $j <= $row['grids']; $j++) {
@@ -1568,7 +1554,8 @@ class MultigridController extends Controller $nadnaslov_floating = 'none';
}
- echo '<td class="trak_inline_nadnaslov" grd="gr_'.$j.'"><div id="trak_nadnaslov_'.$j.'_'.$spremenljivka.'" name="trak_nadnaslov_'.$j.'" class="trak_inline_nadnaslov" style="float:'.$nadnaslov_floating.'; display:inline" '.(strpos($trak_nadnaslov[$j], $lang['srv_new_text'])!==false || $this->lang_id!=null ?' default="1"':'').'>' . $trak_nadnaslov[$j] . '</div></td>';
+ if(isset($trak_nadnaslov[$j]))
+ echo '<td class="trak_inline_nadnaslov" grd="gr_'.$j.'"><div id="trak_nadnaslov_'.$j.'_'.$spremenljivka.'" name="trak_nadnaslov_'.$j.'" class="trak_inline_nadnaslov" style="float:'.$nadnaslov_floating.'; display:inline" '.(strpos($trak_nadnaslov[$j], $lang['srv_new_text'])!==false || get('lang_id')!=null ?' default="1"':'').'>' . $trak_nadnaslov[$j] . '</div></td>';
}
// Ce je diferencial
@@ -1644,7 +1631,7 @@ class MultigridController extends Controller }
// Izris naslovne vrstice tabele za checkbox tabelo
- private function displayMulticheckboxHeader($spremenljivka, $row, $srv_grids, $mv_count, $cssAlign, $middle_row=false, $hideLabels){
+ private function displayMulticheckboxHeader($spremenljivka, $row, $srv_grids, $mv_count, $cssAlign, $middle_row, $hideLabels){
global $lang;
// Preverimo, ce ponavljamo glavo - potem ji dodamo class in jo z JS ponovimo
diff --git a/main/survey/app/Controllers/Vprasanja/MultigridMobileController.php b/main/survey/app/Controllers/Vprasanja/MultigridMobileController.php index eaf7eb2..b51f303 100644 --- a/main/survey/app/Controllers/Vprasanja/MultigridMobileController.php +++ b/main/survey/app/Controllers/Vprasanja/MultigridMobileController.php @@ -61,7 +61,9 @@ class MultigridMobileController extends Controller{ // Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
- $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+
+ // Pridobimo nastavitve za prikaz tabele
+ $tables_setting = self::getInstance()->getTableSettings($spremenljivkaParams);
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@@ -95,7 +97,7 @@ class MultigridMobileController extends Controller{ // Izrisemo celotno vsebino tabele za mobietl
- echo '<div class="grid_mobile radio '.($row['enota'] == 11 ? 'visual_scale' : '').' '.($row['enota'] == 12 ? 'smiley_scale' : '').' '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
+ echo '<div class="grid_mobile radio '.($row['enota'] == 11 ? 'visual_scale' : '').' '.($row['enota'] == 12 ? 'smiley_scale' : '').' '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -133,7 +135,7 @@ class MultigridMobileController extends Controller{ echo $row1['naslov'];
// preverimo izbrano vrednost
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : '';
// Ugotovimo ali je na katerem gridu predhodno izbran missing oz. pridobimo text. vrednost izpolnjenega odg.
$is_missing = false;
@@ -169,14 +171,14 @@ class MultigridMobileController extends Controller{ echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
- if($mobile_tables == 2)
+ if($tables_setting == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
echo '</div>';
// IZPOLNJENA VREDNOST, ce obstaja in ce imamo vklopljene mobilne tabele z razpiranjem
- if($mobile_tables == 2){
+ if($tables_setting == 2){
echo '<div class="grid_mobile_result">'.($grid_id != '' ? $grid_data_value : '').'</div>';
}
@@ -386,8 +388,10 @@ class MultigridMobileController extends Controller{ // Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
- $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
-
+
+ // Pridobimo nastavitve za prikaz tabele
+ $tables_setting = self::getInstance()->getTableSettings($spremenljivkaParams);
+
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
$cssAlign = '';
@@ -439,7 +443,7 @@ class MultigridMobileController extends Controller{ // Izrisemo celotno vsebino tabele za mobietl
- echo '<div class="grid_mobile radio double '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
+ echo '<div class="grid_mobile radio double '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -483,8 +487,8 @@ class MultigridMobileController extends Controller{ echo $row1['naslov'];
// preverimo izbrano vrednost
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
- $grid_id2 = $srv_data_grid2[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : '';
+ $grid_id2 = isset($srv_data_grid2[$row1['id']]['grd_id']) ? $srv_data_grid2[$row1['id']]['grd_id'] : '';
// ugotovimo ali je na katerem gridu predhodno izbran missing
$is_missing = false;
@@ -511,10 +515,6 @@ class MultigridMobileController extends Controller{ echo ' </div>';
- // Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
- /*if($mobile_tables == 2)
- echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';*/
-
echo '</div>';
@@ -699,6 +699,218 @@ class MultigridMobileController extends Controller{ echo '</div>';
}
+ /**
+ * @desc prikaze vnosno polje za dinamicen multigrid (vcash postopno resevanje)
+ */
+ public function radioHorizontalDynamicMultigrid($spremenljivka){
+
+ $loop_id = get('loop_id') == null ? " IS NULL" : " = '" . get('loop_id') . "'";
+
+ $row = Model::select_from_srv_spremenljivka($spremenljivka);
+
+ $spremenljivkaParams = new enkaParameters($row['params']);
+ $gridWidth = (($spremenljivkaParams->get('gridWidth') > 0) ? $spremenljivkaParams->get('gridWidth') : 30);
+
+ $diferencial_trak = ($spremenljivkaParams->get('diferencial_trak') ? $spremenljivkaParams->get('diferencial_trak') : 0); //za checkbox trak
+
+
+ // izracuni za sirino celic
+ $size = $row['grids'];
+
+ # polovimo vrednosti gridov, prevedmo naslove in hkrati preverimo ali imamo missinge
+ $srv_grids = array();
+ $mv_count = 0; # koliko je stolpcev z manjkajočimi vrednostmi
+ # če polje other != 0 je grid kot missing
+ $sql_grid = sisplet_query("SELECT * FROM srv_grid WHERE spr_id='$row[id]' ORDER BY vrstni_red");
+
+ while ($row_grid = mysqli_fetch_assoc($sql_grid)) {
+ # priredimo naslov če prevajamo anketo
+ $naslov = Language::srv_language_grid($row['id'], $row_grid['id']);
+ if ($naslov != '') {
+ $row_grid['naslov'] = $naslov;
+ }
+ $srv_grids[$row_grid['id']] = $row_grid;
+ # če je označena kot manjkajoča jo prištejemo k manjkajočim
+ if ($row_grid['other'] != 0) {
+ $mv_count++;
+ }
+
+ }
+
+ # če imamo mankajoče potem dodamo še en prazen stolpec za razmak
+ if ($mv_count > 0) {
+ $size += 1 + $mv_count;
+ }
+ if ($row['enota'] == 1) {
+ $size += 2;
+ }
+
+ $size += 1;
+
+
+ $orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
+
+ # cache tabele srv_data_grid, da se ne dela vsakic posebej nov query (preberemo enkrat vse odgovore userja)
+ $srv_data_grid = array();
+ $sql_grid = sisplet_query("SELECT * FROM srv_data_grid" . get('db_table') . " WHERE spr_id='$row[id]' AND usr_id='" . get('usr_id') . "' AND loop_id $loop_id");
+ while ($row_grid = mysqli_fetch_array($sql_grid)) {
+ $srv_data_grid[$row_grid['vre_id']] = $row_grid;
+ }
+
+ # loop skozi srv_vrednost, da izpišemo vrstice z vrednostmi
+ $gridRow = 1;
+ $hide = false;
+ $sql1 = sisplet_query("SELECT * FROM srv_vrednost WHERE spr_id='$row[id]' ORDER BY FIELD(vrstni_red, $orderby)");
+ $countVar = mysqli_num_rows($sql1);
+
+ // Stevilo vseh vrednosti
+ echo '<input type="hidden" id="dynamic_multigrid_' . $spremenljivka . '" value="' . $countVar . '" />';
+ // Indikator da v js vemo ali smo ravnokar naloudali stran ali pa smo samo premaknili vrstico (potrebno zaradi prikazovanja glede na ife v dolocenih primerih)
+ echo '<input type="hidden" id="dynamic_multigrid_' . $spremenljivka . '_load" value="1" />';
+
+ while ($row1 = mysqli_fetch_array($sql1)) {
+ # po potrebi prevedemo naslov
+ $naslov = Language::getInstance()->srv_language_vrednost($row1['id']);
+ if ($naslov != '') {
+ $row1['naslov'] = $naslov;
+ }
+
+ # preverimo izbrano vrednost
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : '';
+
+ # ugotovimo ali je na katerem gridu predhodno izbran missing
+ $is_missing = false;
+ if (count($srv_grids) > 0) {
+ foreach ($srv_grids AS $i => $srv_grid) {
+ if ($srv_grid['other'] != 0 && $srv_grids[$i]['id'] == $grid_id) {
+ $is_missing = true;
+ }
+ }
+ }
+
+ // Datapiping
+ $row1['naslov'] = Helper::dataPiping($row1['naslov']);
+
+ $ifDisplay = ($row1['if_id'] > 0 ? ' if_hide' : '');
+ // Ce lahko prikazemo vrstico (se ni nobena izrisana in ni skrita z ifom) -> naslednjih ne izrisujemo vec
+ if ($hide == false && $row1['hidden'] == 0 && $row1['if_id'] == 0) {
+ $gridRowDisplay = '';
+ $hide = true;
+ } else
+ $gridRowDisplay = ' style="display:none;"';
+
+ echo ' <div id="vrednost_if_'.$row1['id'].'" seq="'.$gridRow.'" class="'.$spremenljivka.'_gridRow '.$spremenljivka.'_gridRow_'.$gridRow.' '.$ifDisplay.'" '.$gridRowDisplay.'>' . "\n";
+
+ echo '<div>';
+
+ echo '<div class="dynamic_mg_vrednost">';
+ echo $row1['naslov'];
+ if ($row1['other'] == 1) {
+ $sql3 = sisplet_query("SELECT text FROM srv_data_text" . get('db_table') . " WHERE spr_id='$spremenljivka' AND vre_id='$row1[id]' AND usr_id='" . get('usr_id') . "' AND loop_id $loop_id");
+ $row3 = mysqli_fetch_array($sql3);
+
+ $otherWidth = ($spremenljivkaParams->get('otherWidth') ? $spremenljivkaParams->get('otherWidth') : -1);
+ $otherHeight = ($spremenljivkaParams->get('otherHeight') ? $spremenljivkaParams->get('otherHeight') : 1);
+
+ if ($otherHeight > 1)
+ echo ' <textarea name="textfield_' . $row1['id'] . '" rows="' . $otherHeight . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . '>' . ($is_missing ? '' : $row3['text']) . '</textarea>';
+ else
+ echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />';
+
+
+ //echo ' <input type="text" name="textfield_'.$row1['id'].'" value="'.($is_missing ? '' : $row3['text']).'" '.($is_missing ? ' disabled' :'').'>';
+ }
+ echo '</div>';
+
+ if (count($srv_grids) > 0) {
+ $first_missing_value = true;
+ foreach ($srv_grids AS $i => $srv_grid) {
+ if ((string)$srv_grid['other'] != '0' && $first_missing_value == true) {
+ # dodamo spejs pred manjkajočimi vrednostmi
+ $first_missing_value = false;
+ }
+ $value = $srv_grids[$i]['id'];
+ $grid_title = $srv_grids[$i]['naslov'];
+
+ // Datapiping
+ $grid_title = Helper::dataPiping($grid_title);
+
+ $smeski ='';
+ if(in_array($row['enota'], [11,12])){
+ $smeski = 'visual-radio-scale visual-radio-block';
+ }
+
+ # izpišemo radio grida
+ echo '<div class="variabla '.$smeski.'">';
+ if ($srv_grid['other'] != 0) {
+ # imamo missing vrednost
+ echo '<label for="grid_missing_value_' . $row1['id'] . '_grid_' . $value . '">';
+ if ($gridRow < $countVar)
+ echo '<input type="radio" name="vrednost_' . $row1['id'] . '" id="grid_missing_value_' . $row1['id'] . '_grid_' . $value . '" value="' . $value . '"' . (($grid_id == $value && $grid_id != '') ? ' checked' : '') . ' data-calculation="0" onclick="checkChecked(this); checkTableMissing(this); checkBranching(); setCheckedClass(this, \'mm\', ' . $row1['id'] . '); rowSlide(\'' . $spremenljivka . '\', \'' . $gridRow . '\', \'' . ($gridRow + 1) . '\');">';
+ else
+ echo '<input type="radio" name="vrednost_' . $row1['id'] . '" id="grid_missing_value_' . $row1['id'] . '_grid_' . $value . '" value="' . $value . '"' . (($grid_id == $value && $grid_id != '') ? ' checked' : '') . ' data-calculation="0" onclick="checkChecked(this); checkTableMissing(this); checkBranching(); setCheckedClass(this, \'mm\', ' . $row1['id'] . ');' . ($row['onchange_submit'] == 1 ? ' submitForm();' : '') . '">';
+
+ // Font awesome
+ echo '<span class="enka-checkbox-radio ' . (($row1['hidden'] == 2) ? ' answer-disabled' : '') .'"'.
+ ((Helper::getCustomCheckbox() != 0) ? (' style="font-size:' . Helper::getCustomCheckbox().'px;"') : '').
+ '></span>';
+
+ echo ' ' . $grid_title . '</label>';
+ } else {
+ # ni missing vrednost
+ echo '<label for="vrednost_' . $row1['id'] . '_grid_' . $value . '">';
+ if ($gridRow < $countVar)
+ echo '<input type="radio" name="vrednost_' . $row1['id'] . '" id="vrednost_' . $row1['id'] . '_grid_' . $value . '" value="' . $value . '"' . (($grid_id == $value && $grid_id != '' && !$is_missing) ? ' checked' : '') . ($is_missing ? ' disabled' : '') . ' data-calculation="' . $srv_grids[$i]['variable'] . '" onclick="checkChecked(this); checkBranching(); setCheckedClass(this, \'mm\', ' . $row1['id'] . '); rowSlide(\'' . $spremenljivka . '\', \'' . $gridRow . '\', \'' . ($gridRow + 1) . '\');">';
+ else
+ echo '<input type="radio" name="vrednost_' . $row1['id'] . '" id="vrednost_' . $row1['id'] . '_grid_' . $value . '" value="' . $value . '"' . (($grid_id == $value && $grid_id != '' && !$is_missing) ? ' checked' : '') . ($is_missing ? ' disabled' : '') . ' data-calculation="' . $srv_grids[$i]['variable'] . '" onclick="checkChecked(this); checkBranching(); setCheckedClass(this, \'mm\', ' . $row1['id'] . '); ' . ($row['onchange_submit'] == 1 ? ' submitForm();' : '') . '">';
+
+ // Font awesome
+ if($row['enota'] == 11){
+ echo '<span class="enka-vizualna-skala siv-'.$row['grids'].$value.'"></span>';
+ }elseif($row['enota'] == 12){
+ echo '<span class="enka-custom-radio '.$spremenljivkaParams->get('customRadio').'"></span>';
+ }else {
+ echo '<span class="enka-checkbox-radio ' . (($row1['hidden'] == 2) ? ' answer-disabled' : '') . '"' .
+ ((Helper::getCustomCheckbox() != 0) ? (' style="font-size:' . Helper::getCustomCheckbox() . 'px;"') : '') .
+ '></span>';
+ }
+
+ echo ' ' . $grid_title . '</label>';
+ }
+ echo '</div>';
+ }
+ }
+
+ // Dodamo se drug naslov ce imamo semanticni diferencial
+ if ($row['enota'] == 1) {
+
+ // Datapiping
+ $row1['naslov2'] = Helper::dataPiping($row1['naslov2']);
+
+ echo '<div class="dynamic_mg_vrednost">';
+ echo $row1['naslov2'];
+ echo '</div>';
+ }
+
+ echo '</div>';
+
+
+ echo '</tr><tr class="gridRowArrows ' . $spremenljivka . '_gridRowArrows_' . $gridRow . ' ' . $ifDisplay . '" ' . $gridRowDisplay . '><td colspan="' . $colspan . '">';
+ echo ' <table class="dynamic_mg_orientation"><tr>' . "\n";
+ for ($i = 1; $i <= $countVar; $i++) {
+ echo ' <td><div title="' . $i . '" id="sequence_number_' . $i . '" class="sequence_number sequence_number_'.$i.' ' . ($i == $gridRow ? ' active' : '') . '" onClick="rowSlide(\'' . $spremenljivka . '\', \'' . $gridRow . '\', \'' . $i . '\');">' . $i . '</div></td>';
+ }
+ echo ' </tr></table>' . "\n";
+ echo '</td>';
+
+
+ echo ' </div>' . "\n";
+
+ $bg++;
+ $gridRow++;
+ }
+ }
+
/**
* @desc prikaze vnosno polje za tabelo checkbox
@@ -714,8 +926,10 @@ class MultigridMobileController extends Controller{ // Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
- $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
-
+
+ // Pridobimo nastavitve za prikaz tabele
+ $tables_setting = self::getInstance()->getTableSettings($spremenljivkaParams);
+
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
@@ -750,7 +964,7 @@ class MultigridMobileController extends Controller{ // Izrisemo celotno vsebino tabele za mobitel
- echo '<div class="grid_mobile checkbox '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
+ echo '<div class="grid_mobile checkbox '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -788,7 +1002,7 @@ class MultigridMobileController extends Controller{ echo $row1['naslov'];
# preverimo izbrano vrednost
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : '';
# ugotovimo ali je na katerem gridu predhodno izbran missing
$is_missing = false;
@@ -819,7 +1033,7 @@ class MultigridMobileController extends Controller{ echo '</div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
- if($mobile_tables == 2)
+ if($tables_setting == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
echo '</div>';
@@ -834,7 +1048,7 @@ class MultigridMobileController extends Controller{ foreach ($srv_grids AS $i => $srv_grid) {
- $grid_id = $srv_data_cache[$row1['id']][$i]['grd_id'];
+ $grid_id = isset($srv_data_cache[$row1['id']][$i]['grd_id']) ? $srv_data_cache[$row1['id']][$i]['grd_id'] : '';
$value = $srv_grid['id'];
@@ -931,8 +1145,10 @@ class MultigridMobileController extends Controller{ // Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
- $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
-
+
+ // Pridobimo nastavitve za prikaz tabele
+ $tables_setting = self::getInstance()->getTableSettings($spremenljivkaParams);
+
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
$cssAlign = '';
@@ -985,7 +1201,7 @@ class MultigridMobileController extends Controller{ // Izrisemo celotno vsebino tabele za mobietl
- echo '<div class="grid_mobile checkbox double '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
+ echo '<div class="grid_mobile checkbox double '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -1059,11 +1275,7 @@ class MultigridMobileController extends Controller{ echo ' <input type="text" name="textfield_' . $row1['id'] . '" value="' . ($is_missing ? '' : $row3['text']) . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($is_missing ? ' disabled' : '') . ' />';
}
- echo ' </div>';
-
- // Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
- /*if($mobile_tables == 2)
- echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';*/
+ echo ' </div>';
echo '</div>';
@@ -1078,8 +1290,8 @@ class MultigridMobileController extends Controller{ if (count($srv_grids) > 0) {
foreach ($srv_grids AS $i => $srv_grid) {
-
- $grid_id = $srv_data_cache[$row1['id']][$i]['grd_id'];
+
+ $grid_id = isset($srv_data_cache[$row1['id']][$i]['grd_id']) ? $srv_data_cache[$row1['id']][$i]['grd_id'] : '';
// izpišemo radio grida
// Other oz. missing
@@ -1169,7 +1381,7 @@ class MultigridMobileController extends Controller{ foreach ($srv_grids2 AS $j => $srv_grid) {
- $grid_id = $srv_data_cache[$row1['id']][$j]['grd_id'];
+ $grid_id = isset($srv_data_cache[$row1['id']][$j]['grd_id']) ? $srv_data_cache[$row1['id']][$j]['grd_id'] : '';
// izpišemo radio grida
// Other oz. missing
@@ -1269,8 +1481,10 @@ class MultigridMobileController extends Controller{ // Nastavitev za prilagoditev mobilnih tabel (z razpiranjem ali brez)
SurveySetting::getInstance()->Init(get('anketa'));
- $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
-
+
+ // Pridobimo nastavitve za prikaz tabele
+ $tables_setting = self::getInstance()->getTableSettings($spremenljivkaParams);
+
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
$cssAlign = '';
@@ -1325,7 +1539,7 @@ class MultigridMobileController extends Controller{ // Izrisemo celotno vsebino tabele za mobitel
- echo '<div class="grid_mobile text '.($mobile_tables == 2 ? 'mobile_expanding' : '').'">';
+ echo '<div class="grid_mobile text '.($tables_setting == 2 ? 'mobile_expanding' : '').'">';
$orderby = Model::generate_order_by_field($spremenljivka, get('usr_id'));
@@ -1361,7 +1575,7 @@ class MultigridMobileController extends Controller{ if ($naslov != '') $row1['naslov'] = $naslov;
# preverimo izbrano vrednost
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : '';
# ugotovimo ali je na katerem gridu predhodno izbran missing
$is_missing = false;
@@ -1397,7 +1611,7 @@ class MultigridMobileController extends Controller{ echo ' </div>';
// Puscica za razpiranje ce imamo vklopljene mobilne tabele z razpiranjem
- if($mobile_tables == 2)
+ if($tables_setting == 2)
echo '<span class="faicon arrow_up mobile_expanding_arrow"></span>';
echo '</div>';
@@ -1618,4 +1832,29 @@ class MultigridMobileController extends Controller{ // END grid_mobile
echo '</div>';
}
+
+
+ // Pridobimo nastavitve tabele (prikaz na mobile ali pc)
+ public function getTableSettings($spremenljivkaParams){
+
+ // Pridobimo nastavitve za mobile tabele
+ if(get('mobile') == 1){
+ $tables_setting = $spremenljivkaParams->get('mobile_tables','-1');
+
+ // Ce nimamo individualnih nastavitev pridobimo splosne nastavitve tabel
+ if($tables_setting == -1)
+ $tables_setting = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+
+ }
+ // Pridobimo nastavitve za pc tabele
+ else{
+ $tables_setting = $spremenljivkaParams->get('pc_tables','-1');
+
+ // Ce nimamo individualnih nastavitev pridobimo splosne nastavitve tabel
+ if($tables_setting == -1)
+ $tables_setting = SurveySetting::getInstance()->getSurveyMiscSetting('pc_tables');
+ }
+
+ return $tables_setting;
+ }
}
\ No newline at end of file diff --git a/main/survey/app/Controllers/Vprasanja/NumberController.php b/main/survey/app/Controllers/Vprasanja/NumberController.php index 13f312c..d8adf4b 100644 --- a/main/survey/app/Controllers/Vprasanja/NumberController.php +++ b/main/survey/app/Controllers/Vprasanja/NumberController.php @@ -60,6 +60,7 @@ class NumberController extends Controller //**************************************************************************************************
//***************************
+ $limit = ''; $limit2 = '';
if ($row['num_useMin'] == 1 && $row['num_useMax'] == 1 && $row['vsota_min'] == $row['vsota_limit'])
$limit = '(' . $row['vsota_min'] . ')';
@@ -69,8 +70,6 @@ class NumberController extends Controller $limit = '(min ' . $row['vsota_min'] . ')';
elseif ($row['num_useMax'] == 1)
$limit = '(max ' . $row['vsota_limit'] . ')';
- else
- $limit = '';
if ($row['size'] == 2) {
if ($row['num_useMin2'] == 1 && $row['num_useMax2'] == 1 && $row['num_min2'] == $row['num_max2'])
@@ -81,8 +80,6 @@ class NumberController extends Controller $limit2 = '(min ' . $row['num_min2'] . ')';
elseif ($row['num_useMax2'] == 1)
$limit2 = '(max ' . $row['num_max2'] . ')';
- else
- $limit2 = '';
}
# preverimo ali je vrednost v bazi missing
@@ -102,11 +99,11 @@ class NumberController extends Controller $taWidth = 10;
//preverjanje praznega vnosa (-1)
- $row1['text'] != -1 ? $text = $row1['text'] : $text = '';
- $row1['text2'] != -1 ? $text2 = $row1['text2'] : $text2 = '';
+ $text = (isset($row1['text']) && $row1['text'] != -1) ? $row1['text'] : '';
+ $text2 = (isset($row1['text2']) && $row1['text2'] != -1) ? $row1['text2'] : '';
- $row1['text'] != -1 ? $value[1] = $row1['text'] : $value[1] = '';
- $row1['text2'] != -1 ? $value[2] = $row1['text2'] : $value[2] = '';
+ $value[1] = (isset($row1['text']) && $row1['text'] != -1) ? $row1['text']: '';
+ $value[2] = (isset($row1['text2']) && $row1['text2'] != -1) ? $row1['text2']: '';
$sql2 = sisplet_query("SELECT id, naslov, vrstni_red, other FROM srv_vrednost WHERE spr_id='$spremenljivka' order BY vrstni_red");
$array_others = array();
@@ -130,11 +127,11 @@ class NumberController extends Controller echo '<br>';
}
- echo '<label for="spremenljivka_' . $spremenljivka . '_vrednost_' . $row2['vrstni_red'] . '" ' . ($row['ranking_k'] == '1' && get('mobile') == 0 ? ' style="display:none;"' : '') . '>';
-
# če imamo enoto na levi jo izpišemo
if ($row['enota'] == 1) {
+ echo '<label for="spremenljivka_' . $spremenljivka . '_vrednost_' . $row2['vrstni_red'] . '" ' . ($row['ranking_k'] == '1' && get('mobile') == 0 ? ' style="display:none;"' : '') . '>';
echo $naslov;
+ echo '</label>';
}
echo ' <input type="text" class="width_' . $taWidth . '" name="vrednost_' . $spremenljivka . '[]"'
@@ -143,19 +140,20 @@ class NumberController extends Controller . ' onkeypress="checkNumber(this, ' . $row['cela'] . ', ' . $row['decimalna'] . ');"'
. ' onkeyup="checkNumber(this, ' . $row['cela'] . ', ' . $row['decimalna'] . '); checkBranching();"'
. (!$missing ? '' : ' disabled') . '> ' . "\n";
+
# če imamo enoto na desni jo izpišemo
if ($row['enota'] == 2) {
+ echo '<label for="spremenljivka_' . $spremenljivka . '_vrednost_' . $row2['vrstni_red'] . '" ' . ($row['ranking_k'] == '1' && get('mobile') == 0 ? ' style="display:none;"' : '') . '>';
echo $naslov;
- }
-
- echo '</label>';
+ echo '</label>';
+ }
} else {
# imamo polje drugo - ne vem, zavrnil...
$array_others[$row2['id']] = array(
'naslov' => $naslov,
'vrstni_red' => $row2['vrstni_red'],
- 'value' => $text[$row2['vrstni_red']],
+ 'value' => (isset($text[$row2['vrstni_red']]) ? $text[$row2['vrstni_red']] : ''),
);
}
@@ -226,7 +224,8 @@ class NumberController extends Controller //za custom opisne labele
//moznosti urejanja opisnih label drsnika
- if($slider_VmesneDescrLabel){
+ if($slider_VmesneDescrLabel){
+ $slider_CustomDescriptiveLabels = '';
for($i=1; $i<=$slider_NumofDescrLabels; $i++){
if($custom == ''){ //ce nimamo prevoda opisnih label za drsnika
$slider_CustomDescriptiveLabelsTmp = ($spremenljivkaParams->get('slider_Labela_opisna_'.$i) ? $spremenljivkaParams->get('slider_Labela_opisna_'.$i) : '');
@@ -327,7 +326,7 @@ class NumberController extends Controller # missing vrednost
$_id = 'missing_value_spremenljivka_' . $spremenljivka . '_vrednost_' . $oKey;
- if ($srv_data_vrednost[$oKey]) {
+ if (isset($srv_data_vrednost[$oKey]) && $srv_data_vrednost[$oKey]) {
$sel = true;
} else {
$sel = false;
@@ -357,11 +356,12 @@ class NumberController extends Controller $hide_missing = true;
echo '<div class="variabla' . $oblika['cssFloat'] . ' missing" id="vrednost_if_' . $oKey . '"' . ' ' . ($hide_missing ? ' style="display:none"' : '') . '>';
- echo '<label for="' . $_id . '">';
- echo '<input type="checkbox" name="vrednost_mv_' . $spremenljivka . '[]" id="' . $_id . '" value="' . $oKey . '"' . $_checked . ($_disabled ? ' disabled' : '') . ' data-calculation="0" onclick="checkBranching(); ' . ($checkbox_limit > 0 ? 'checkboxLimit(\'' . $spremenljivka . '\', \'' . $oKey . '\', \'' . $checkbox_limit . '\');' : '') . ' checkMissing(this);"> ';
+ echo ' <label for="'.$_id.'">';
+ echo ' <input type="checkbox" name="vrednost_mv_' . $spremenljivka . '[]" id="' . $_id . '" value="' . $oKey . '"' . $_checked . ($_disabled ? ' disabled' : '') . ' data-calculation="0" onclick="checkBranching(); ' . ($checkbox_limit > 0 ? 'checkboxLimit(\'' . $spremenljivka . '\', \'' . $oKey . '\', \'' . $checkbox_limit . '\');' : '') . ' checkMissing(this);"> ';
// Font awesome checkbox
- echo '<span class="enka-checkbox-radio" '.((Helper::getCustomCheckbox() != 0) ? 'style="font-size:' . Helper::getCustomCheckbox() . 'px;"' : '').'></span>';
- echo '' . $other['naslov'] . '</label>';
+ echo ' <span class="enka-checkbox-radio" '.((Helper::getCustomCheckbox() != 0) ? 'style="font-size:' . Helper::getCustomCheckbox() . 'px;"' : '').'></span>';
+ echo $other['naslov'];
+ echo ' </label>';
echo '</div>';
}
}
diff --git a/main/survey/app/Controllers/Vprasanja/OneAgainstAnotherController.php b/main/survey/app/Controllers/Vprasanja/OneAgainstAnotherController.php index de5581d..9da537e 100644 --- a/main/survey/app/Controllers/Vprasanja/OneAgainstAnotherController.php +++ b/main/survey/app/Controllers/Vprasanja/OneAgainstAnotherController.php @@ -42,11 +42,7 @@ class OneAgainstAnotherController extends Controller /**
* @desc prikaze vnosno polje za one against another
*/
- function display($spremenljivka)
- {
-
- //echo "One against another!";
-
+ function display($spremenljivka){
$loop_id = get('loop_id') == null ? " IS NULL" : " = '" . get('loop_id') . "'";
@@ -59,13 +55,12 @@ class OneAgainstAnotherController extends Controller $gridWidth = (($spremenljivkaParams->get('gridWidth') > 0) ? $spremenljivkaParams->get('gridWidth') : 30);
$gridAlign = (($spremenljivkaParams->get('gridAlign') > 0) ? $spremenljivkaParams->get('gridAlign') : 0);
$cssAlign = '';
- //$gridAlign = 1;
+
if ($gridAlign == 1)
$cssAlign = ' alignLeft';
elseif ($gridAlign == 2)
$cssAlign = ' alignRight';
- //$css = ' style = "width: '.$gridWidth.'%;" ';
// izracuni za sirino celic
$size = $row['grids'];
@@ -94,10 +89,9 @@ class OneAgainstAnotherController extends Controller if ($mv_count > 0) {
$size += 1 + $mv_count;
}
+
// diferencial
- //if ($row['enota'] == 1) {
$size += 2;
- //}
# če imamo nastavljno sirino prvega grida ostalih ne nastavljamo
if ($gridWidth == 30) {
@@ -112,39 +106,6 @@ class OneAgainstAnotherController extends Controller echo '<table class="grid_table multigrid" >' . "\n";
-
- // echo '<colgroup class="question">';
- // //echo '<col class="width_'.$gridWidth.'">';
- // echo '<col class="width_15">';
- // echo '</colgroup>';
- // echo '<colgroup>';
- // //echo '<col class="space">';
- // echo '<col class="width_20">';
- // echo '</colgroup>';
- // echo '<colgroup class="category">';
- // for ($i=1; $i<=$row['grids']; $i++)
- // echo '<col>';
- // echo '</colgroup>';
- // if ($mv_count > 0) {
- // echo '<colgroup>';
- // echo '<col class="space">';
- // echo '</colgroup>';
- // echo '<colgroup class="missing">';
- // for ($i=1; $i<=$mv_count; $i++)
- // echo '<col>';
- // echo '</colgroup>';
- // }
- // if ($row['enota'] > 0) {
- // echo '<colgroup>';
- // //echo '<col class="space">';
- // echo '<col class="width_20">';
- // echo '</colgroup>';
- // //echo '<colgroup class="differential">';
- // //echo '<col class="width_'.$gridWidth.'">';
-
- // //echo '</colgroup>';
- // }
-
echo '<tbody>';
$bg++;
@@ -161,11 +122,19 @@ class OneAgainstAnotherController extends Controller # loop skozi srv_vrednost, da izpišemo vrstice z vrednostmi
$sql1 = sisplet_query("SELECT * FROM srv_vrednost WHERE spr_id='$row[id]' ORDER BY FIELD(vrstni_red, $orderby)");
while ($row1 = mysqli_fetch_array($sql1)) {
+
# po potrebi prevedemo naslov
$naslov = Language::getInstance()->srv_language_vrednost($row1['id']);
if ($naslov != '') {
$row1['naslov'] = $naslov;
}
+
+ # po potrebi prevedemo naslov2 za diferencial
+ $naslov2 = Language::getInstance()->srv_language_vrednost($row1['id'], true);
+ if ($naslov2 != '') {
+ $row1['naslov2'] = $naslov2;
+ }
+
# preverimo izbrano vrednost
$grid_id = $srv_data_grid[$row1['id']]['grd_id'];
@@ -193,37 +162,20 @@ class OneAgainstAnotherController extends Controller //radio buttoni
-
if (count($srv_grids) > 0) {
$first_missing_value = true;
foreach ($srv_grids AS $i => $srv_grid) {
-/* if ((string)$srv_grid['other'] != '0' && $first_missing_value == true) {
- # dodamo spejs pred manjkajočimi vrednostmi
- echo ' <td></td>' . "\n";
- $first_missing_value = false;
- } */
$value = $srv_grids[$i]['id'];
# izpišemo radio grida
if ($srv_grid['other'] != 0) {
-/* echo '<td class="missing' . ((Helper::getCustomCheckbox() != 0) ? ' custom-radio custom-size-' . Helper::getCustomCheckbox() : '') . ' ' . $cssAlign . '">';
- # imamo missing vrednost
- echo '<label for="grid_missing_value_' . $row1['id'] . '_grid_' . $value . '">';
- echo '<input type="radio" ' . (!$hideName ? ' name="vrednost_' . $row1['id'] . '"' : '') . ' id="grid_missing_value_' . $row1['id'] . '_grid_' . $value . '" value="' . $value . '"' . (($grid_id == $value && $grid_id != '') ? ' checked' : '') . ' data-calculation="0" onclick="checkChecked(this); checkTableMissing(this); checkBranching(); setCheckedClass(this, null, ' . $row1['id'] . ');">';
- echo '<span ' . (($row1['hidden'] == 2) ? 'class="answer-disabled"' : '') . '></span>';
- echo '</label>';
- echo '</td>' . "\n";
- if ($i == 1) { //ce je to prvi radio button, dodaj ali
- //echo '<td style="text-align: center;"> ali </td>';
- echo '<td style="text-align: center;"> ' . self::$lang['srv_tip_sample_t6_4_vmes'] . ' </td>';
- }
+ }
+ else {
- */
- }else {
- //echo '<td class="category ' . $cssAlign . '">';
echo '<td class="category style="text-align: center;">';
+
# ni missing vrednost
echo '<label for="vrednost_' . $row1['id'] . '_grid_' . $value . '">';
echo '<input type="radio" ' . (!$hideName ? ' name="vrednost_' . $row1['id'] . '"' : '') . ' id="vrednost_' . $row1['id'] . '_grid_' . $value . '" value="' . $value . '"' . (($grid_id == $value && $grid_id != '' && !$is_missing) ? ' checked' : '') . ($is_missing ? ' disabled' : '') . ' data-calculation="' . $srv_grids[$i]['variable'] . '" onclick="checkChecked(this); checkBranching(); setCheckedClass(this, null, ' . $row1['id'] . ');">';
diff --git a/main/survey/app/Controllers/Vprasanja/RadioCheckboxSelectController.php b/main/survey/app/Controllers/Vprasanja/RadioCheckboxSelectController.php index 9de8d5f..5c93cf7 100644 --- a/main/survey/app/Controllers/Vprasanja/RadioCheckboxSelectController.php +++ b/main/survey/app/Controllers/Vprasanja/RadioCheckboxSelectController.php @@ -182,7 +182,7 @@ class RadioCheckboxSelectController extends Controller while ($row1 = mysqli_fetch_array($sql1)) {
if ($row1['other'] == 0 || $row1['other'] == 1) {
} else {
- if ($srv_data_vrednost[$row1['id']]) {
+ if (isset($srv_data_vrednost[$row1['id']])) {
$is_missing = true;
}
}
@@ -272,7 +272,7 @@ class RadioCheckboxSelectController extends Controller echo '<table class="width_30">';
echo '<tr>';
- echo '<td><label for="' . $_id . '">' . $row1['naslov'] . ' </label>';
+ echo '<td><label for="' . $_id . '"><span class="variabla_text">' . $row1['naslov'] . '</span></label>';
if ($row1['other'] == 1) {
$sql3 = sisplet_query("SELECT text FROM srv_data_text" . get('db_table') . " WHERE spr_id='$spremenljivka' AND vre_id='$row1[id]' AND usr_id='" . get('usr_id') . "' AND loop_id $loop_id");
@@ -282,11 +282,9 @@ class RadioCheckboxSelectController extends Controller $otherHeight = ($spremenljivkaParams->get('otherHeight') ? $spremenljivkaParams->get('otherHeight') : 1);
if ($otherHeight > 1)
- echo ' <textarea name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" rows="' . $otherHeight . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="$(\'#spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '\').attr(\'checked\',true); checkBranching();">' . $row3['text'] . '</textarea>';
+ echo ' <textarea name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" class="input_other" rows="' . $otherHeight . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="$(\'#spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '\').attr(\'checked\',true); checkBranching();">' . $row3['text'] . '</textarea>';
else
- echo ' <input type="text" name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" value="' . $row3['text'] . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="$(\'#spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '\').attr(\'checked\',true); checkBranching();" />';
-
- //echo ' <input type="text" name="textfield_'.$row1['id'].'" id="spremenljivka_'.$spremenljivka.'_textfield_'.$row1['id'].'" value="'.$row3['text'].'" '.($_disabled ? ' disabled' : '').' onclick="$(\'#spremenljivka_'.$spremenljivka.'_vrednost_'.$row1['id'].'\').attr(\'checked\',true); checkBranching();">';
+ echo ' <input type="text" name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" class="input_other" value="' . $row3['text'] . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="$(\'#spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '\').attr(\'checked\',true); checkBranching();" />';
}
echo '</td>';
@@ -326,10 +324,12 @@ class RadioCheckboxSelectController extends Controller // Vizualna analogna skala
elseif ($row['orientation'] == 11) {
$stOdgovorov = mysqli_num_rows($sql1);
+ //ali so smeskoti pobarvani ali samo sivi
+ $colored = ($spremenljivkaParams->get('visual_type') == 1 ? 'colored' : '');
echo '<div class="variabla custom_radio visual-radio-scale ' . (($row1['hidden'] == 2) ? ' answer-disabled ' : '') . $oblika['cssFloat'] . ' ' . ($missing == 1 ? 'missing' : '') . ' ' . $_checked . ' ' . $hideRadio . '" id="vrednost_if_' . $row1['id'] . '"' . ($row1['if_id'] > 0 ? ' style="display:none"' : '') . ($hide_missing ? ' style="display:none"' : '') . '>';
echo '<label for="' . $_id . '"><input type="radio" ' . (!$hideName ? ' name="vrednost_' . $spremenljivka . '"' : '') . ' id="' . $_id . '" value="' . $row1['id'] . '"' . $_checked . ($_disabled ? ' disabled' : '') . ' data-calculation="' . ($missing == 1 ? '0' : $row1['variable']) . '" onclick="checkChecked(this); checkBranching(); ' . ($row['onchange_submit'] == 1 ? ' submitForm();' : '') . ' setCheckedClass(this, \'1\');"> ';
- echo '<span class="enka-vizualna-skala siv-'.$stOdgovorov.$row1['naslov'].' '.((Helper::getCustomCheckbox() != 0) ? 'size-' . Helper::getCustomCheckbox(): '').'"></span>';
+ echo '<span class="enka-vizualna-skala siv-'.$stOdgovorov.$row1['naslov'].' '.((Helper::getCustomCheckbox() != 0) ? 'size-' . Helper::getCustomCheckbox(): '').' '.$colored.'"></span>';
echo '<div class="custom_radio_answer '.((Helper::getCustomCheckbox() != 0) ? 'size-' . Helper::getCustomCheckbox(): '').'">(' . $row1['naslov'] . ')</div>';
echo '</label>';
}
@@ -342,7 +342,7 @@ class RadioCheckboxSelectController extends Controller echo '<span class="enka-checkbox-radio ' . (($row1['hidden'] == 2) ? ' answer-disabled' : '') . '"' .
((Helper::getCustomCheckbox() != 0) ? 'style="font-size:' . Helper::getCustomCheckbox() . 'px;"' : '') .
'></span>';
- echo '' . $row1['naslov'] . '</label>';
+ echo '<span class="variabla_text">' . $row1['naslov'] . '</span></label>';
// Ce je vprasanje disabled moramo vseeno postati vrednost
if($disabled_vprasanje){
@@ -370,7 +370,7 @@ class RadioCheckboxSelectController extends Controller ((Helper::getCustomCheckbox() != 0) ? (' style="font-size:' . Helper::getCustomCheckbox() . 'px;"') : '') .
'></span>';
- echo '' . $row1['naslov'] . '</label>';
+ echo '<span class="variabla_text">' . $row1['naslov'] . '</span></label>';
//v kolikor je odgovor skrit(1) ali disable(2), mu damo vrednost -2
if ($row1['hidden'] == 1 || $row1['hidden'] == 2)
echo '<input id="branch_' . $_id . '" name="cond_vrednost_' . $spremenljivka . '[]" value="' . $row1['id'] . '" type="hidden">';
@@ -382,12 +382,12 @@ class RadioCheckboxSelectController extends Controller }
// Checkbox - navpicno - text levo
elseif ($row['orientation'] == 7) {
+
echo '<div class="variabla' . $oblika['cssFloat'] . ' ' . ($missing == 1 ? 'missing' : '') . ' ' . $_checked . ' ' . $hideRadio . '" id="vrednost_if_' . $row1['id'] . '"' . ($row1['if_id'] > 0 ? ' style="display:none"' : '') . ($hide_missing ? ' style="display:none"' : '') . (($row1['hidden'] == 2) ? ' disabled' : '') . '>';
+
echo '<table class="width_30">';
- //echo '<table style="width:30%">';
echo '<tr>';
- //echo '<td><label for="'.$_id.'">'.$row1['naslov'].' </label></td>';
- echo '<td><label for="' . $_id . '">' . $row1['naslov'] . ' </label>';
+ echo '<td><label for="' . $_id . '"><span class="variabla_text">' . $row1['naslov'] . '</span></label>';
if ($row1['other'] == 1) {
$sql3 = sisplet_query("SELECT text FROM srv_data_text" . get('db_table') . " WHERE spr_id='$spremenljivka' AND vre_id='$row1[id]' AND usr_id='" . get('usr_id') . "' AND loop_id $loop_id");
@@ -397,11 +397,9 @@ class RadioCheckboxSelectController extends Controller $otherHeight = ($spremenljivkaParams->get('otherHeight') ? $spremenljivkaParams->get('otherHeight') : 1);
if ($otherHeight > 1)
- echo ' <textarea name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" rows="' . $otherHeight . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="$(\'#spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '\').attr(\'checked\',true); checkBranching();">' . $row3['text'] . '</textarea>';
+ echo ' <textarea name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" class="input_other" rows="' . $otherHeight . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="$(\'#spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '\').attr(\'checked\',true); checkBranching();">' . $row3['text'] . '</textarea>';
else
- echo ' <input type="text" name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" value="' . $row3['text'] . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="$(\'#spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '\').attr(\'checked\',true); checkBranching();" />';
-
- //echo ' <input type="text" name="textfield_'.$row1['id'].'" id="spremenljivka_'.$spremenljivka.'_textfield_'.$row1['id'].'" value="'.$row3['text'].'" '.($_disabled ? ' disabled' : '').' onclick="$(\'#spremenljivka_'.$spremenljivka.'_vrednost_'.$row1['id'].'\').attr(\'checked\',true); checkBranching();">';
+ echo ' <input type="text" name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" class="input_other" value="' . $row3['text'] . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="$(\'#spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '\').attr(\'checked\',true); checkBranching();" />';
}
echo '</td>';
echo '<td align="right">';
@@ -438,9 +436,9 @@ class RadioCheckboxSelectController extends Controller $otherHeight = ($spremenljivkaParams->get('otherHeight') ? $spremenljivkaParams->get('otherHeight') : 1);
if ($otherHeight > 1)
- echo ' <textarea name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" rows="' . $otherHeight . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="$(\'#spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '\').attr(\'checked\',true); checkBranching(); '.($checkbox_limit > 0 ? 'checkboxLimitTextbox(\'' . $spremenljivka . '\', \'' . $row1['id'] . '\', \'' . $checkbox_limit . '\');' : '').'" >' . $row3['text'] . '</textarea>';
+ echo ' <textarea name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" class="input_other" rows="' . $otherHeight . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="$(\'#spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '\').attr(\'checked\',true); checkBranching(); '.($checkbox_limit > 0 ? 'checkboxLimitTextbox(\'' . $spremenljivka . '\', \'' . $row1['id'] . '\', \'' . $checkbox_limit . '\');' : '').'" >' . $row3['text'] . '</textarea>';
else
- echo ' <input type="text" name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" value="' . $row3['text'] . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="$(\'#spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '\').attr(\'checked\',true); checkBranching(); '.($checkbox_limit > 0 ? 'checkboxLimitTextbox(\'' . $spremenljivka . '\', \'' . $row1['id'] . '\', \'' . $checkbox_limit . '\');' : '').'" />';
+ echo ' <input type="text" name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" class="input_other" value="' . $row3['text'] . '" style="' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="$(\'#spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '\').attr(\'checked\',true); checkBranching(); '.($checkbox_limit > 0 ? 'checkboxLimitTextbox(\'' . $spremenljivka . '\', \'' . $row1['id'] . '\', \'' . $checkbox_limit . '\');' : '').'" />';
}
}
echo '</div>' . "\n";
@@ -485,9 +483,9 @@ class RadioCheckboxSelectController extends Controller $otherHeight = ($spremenljivkaParams->get('otherHeight') ? $spremenljivkaParams->get('otherHeight') : 1);
if ($otherHeight > 1)
- echo '<br /><textarea name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" class="drugo_' . $spremenljivka . '" rows="' . $otherHeight . '" style="display:none; ' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="checkBranching();">' . $row3['text'] . '</textarea>';
+ echo '<br /><textarea name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" class="input_other drugo_' . $spremenljivka . '" rows="' . $otherHeight . '" style="display:none; ' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="checkBranching();">' . $row3['text'] . '</textarea>';
else
- echo '<br /><input type="text" name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" class="drugo_' . $spremenljivka . '" value="' . $row3['text'] . '" style="display:none; ' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="checkBranching();" />';
+ echo '<br /><input type="text" name="textfield_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_textfield_' . $row1['id'] . '" class="input_other drugo_' . $spremenljivka . '" value="' . $row3['text'] . '" style="display:none; ' . ($otherWidth != -1 ? ' width:' . $otherWidth . '%;' : '') . '" ' . ($_disabled ? ' disabled' : '') . ' onclick="checkBranching();" />';
}
}
diff --git a/main/survey/app/Controllers/Vprasanja/RankingController.php b/main/survey/app/Controllers/Vprasanja/RankingController.php index 014bb37..b91bd6f 100644 --- a/main/survey/app/Controllers/Vprasanja/RankingController.php +++ b/main/survey/app/Controllers/Vprasanja/RankingController.php @@ -94,7 +94,7 @@ class RankingController extends Controller // prestavljanje za SAZU - n>k
else if ($row['design'] == 0 && get('mobile') == 0
&& SurveyInfo::getInstance()->checkSurveyModule('sazu')
- && in_array($spremenljivka, array('11092569','11092563'))
+ && in_array($spremenljivka, array('11092569','11092563','763259','763254'))
)
$this->displayPrestavljanjeSAZU($spremenljivka, $preview_spremenljivka, $quick_view, $ajax);
@@ -196,7 +196,8 @@ class RankingController extends Controller // Datapiping
$row2['naslov'] = Helper::dataPiping($row2['naslov']);
- $value = $row2['naslov'];
+ $value = strip_tags($row2['naslov'], '<p><br>');
+
$vre_id = $row2['id'];
array_push($vre_idCache1, $vre_id);
$length = strlen($value); //dolzina teksta kategorije odgovora
@@ -286,7 +287,8 @@ class RankingController extends Controller // Datapiping
$row2['naslov'] = Helper::dataPiping($row2['naslov']);
- $value = $row2['naslov'];
+ $value = strip_tags($row2['naslov'], '<p><br>');
+
$vre_id = $row2['id'];
array_push($vre_idCache2, $vre_id);
$length = strlen($value); //dolzina teksta kategorije odgovora
@@ -372,7 +374,7 @@ class RankingController extends Controller //izracun visine
$num = mysqli_num_rows($sql1);
- $size = $num * 37;
+ $size = $num * 40;
//nastavimo $max (maximum prenesenih vrednosti) -> ce lahko nosimo vse vrednosti ($row['ranking_k'] == 0) je $max stevilo vseh vrednotsti
if ($row['ranking_k'] == 0)
@@ -394,7 +396,6 @@ class RankingController extends Controller echo "<script>
$(document).ready(
function(){
-
$('#half_$spremenljivka div').dblclick(function() {
var litem = $(this).clone();
litem.appendTo($('#half2_$spremenljivka'));
@@ -419,7 +420,7 @@ class RankingController extends Controller $('#half_$spremenljivka, #half2_$spremenljivka').sortable({
opacity: '0.7',
connectWith: ['#half_$spremenljivka, #half2_$spremenljivka'],
-
+
placeholder: 'frame_ranking_hover',
//stop: function (){
@@ -493,7 +494,7 @@ class RankingController extends Controller echo '<table class="ranking_table">';
echo '<tr>';
//zaslon razdelimo na dva dela - izris leve strani
- echo '<td>';
+ echo '<td class="first">';
if (get('lang_id') != null) $_lang = '_' . get('lang_id'); else $_lang = '';
$srv_ranking_avaliable_categories = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_ranking_avaliable_categories' . $_lang);
@@ -501,7 +502,8 @@ class RankingController extends Controller echo '<b>' . $srv_ranking_avaliable_categories . ':</b>';
- echo '<div id="half_' . $spremenljivka . '" class="dropzone" style="height:' . $size . 'px">';
+ //echo '<div id="half_' . $spremenljivka . '" class="dropzone" style="height:' . $size . 'px">';
+ echo '<div id="half_' . $spremenljivka . '" class="dropzone" style="min-height:' . $size . 'px">';
$sql1 = sisplet_query("SELECT id, naslov, other FROM srv_vrednost WHERE spr_id='$spremenljivka' AND id NOT IN(SELECT vre_id FROM srv_data_rating WHERE spr_id = '$spremenljivka' AND usr_id='" . get('usr_id') . "' AND loop_id $loop_id) ORDER BY FIELD(vrstni_red, $order)");
$vre_idCacheL = array();
@@ -515,7 +517,8 @@ class RankingController extends Controller // Datapiping
$row1['naslov'] = Helper::dataPiping($row1['naslov']);
- $value = $row1['naslov'];
+ $value = strip_tags($row1['naslov'], '<p><br>');
+
$vre_id = $row1['id'];
array_push($vre_idCacheL, $vre_id);
$other = $row1['other']; //drugo, po navadi missing
@@ -529,7 +532,9 @@ class RankingController extends Controller $class = 'ranking_mobile';
}
- $c = '';
+ $c = '';
+
+
echo '<div id="spremenljivka_' . $spremenljivka . '_vrednost_' . $vre_id . '" class="' . $class . ' ' . $c . '">' . $value . '</div>' . "\n"; //'#spremenljivka_'+spremenljivka+'_vrednost_'+id
}
@@ -544,7 +549,7 @@ class RankingController extends Controller ?>
<script>
$(document).ready(function () {
- customizeImageView4Respondent(<?=$row['tip']?>, <?=$spremenljivka?>, <?=$vre_id?>, <?=$ajax?>, srv_meta_anketa_id, '<?=self::$site_url?>', usr_id, <?=$otherCacheL[$indeksVre_idCacheL]?>, <?=get('mobile')?>, <?=$quick_view?>, <?=$preview_spremenljivka?>); //poklici funkcijo za ureditev draggable in droppable
+ customizeImageView4Respondent(<?=$row['tip']=0?>, <?=$spremenljivka?>, <?=$vre_id?>, <?=$ajax?>, srv_meta_anketa_id, '<?=self::$site_url?>', usr_id, <?=$otherCacheL[$indeksVre_idCacheL]?>, <?=get('mobile')?>, <?=$quick_view?>, <?=$preview_spremenljivka?>); //poklici funkcijo za ureditev ureditev draggable in droppable
});
</script>
<?
@@ -553,10 +558,11 @@ class RankingController extends Controller //ureditev gladkega delovanja prikazovanja visjih blokov odgovorov (vecvrsticni, s slikami, ipd.) - konec
//srednja celica (stevilo prenesenih in spodaj puscica)
- echo '<td class="middle">';
+ /* echo '<td class="middle">';
echo '<b>' . $count . '/' . $max . '</b>';
- echo '<img src="' . self::$site_url . 'main/survey/skins/Modern/arrow.png" alt="arrow">';
- echo '</td>';
+ //echo '<img src="' . self::$site_url . 'main/survey/skins/Modern/arrow.png" alt="arrow">';
+ echo '<div class="arrow_dnd"> </div>';
+ echo '</td>'; */
//izris desne strani
echo '<td>';
@@ -565,7 +571,7 @@ class RankingController extends Controller $srv_ranking_ranked_categories = SurveySetting::getInstance()->getSurveyMiscSetting('srvlang_srv_ranking_ranked_categories' . $_lang);
if ($srv_ranking_ranked_categories == '') $srv_ranking_ranked_categories = self::$lang['srv_ranking_ranked_categories'];
- echo '<b>' . $srv_ranking_ranked_categories . ':</b>';
+ echo '<b>' . $srv_ranking_ranked_categories . '(' . $count . '/' . $max . '):</b>';
echo '<div class="dropholder">'; // ker na td ne primer position relative za nastavit position absolute na dropzone
@@ -586,8 +592,8 @@ class RankingController extends Controller // Datapiping
$row1['naslov'] = Helper::dataPiping($row1['naslov']);
+ $value = strip_tags($row1['naslov'], '<p><br>');
- $value = $row1['naslov'];
$vre_id = $row1['id'];
array_push($vre_idCacheD, $vre_id);
$length = strlen($value); //dolzina teksta kategorije odgovora
@@ -626,6 +632,7 @@ class RankingController extends Controller <script>
$(document).ready(function () {
question_height_ranking(<?=$spremenljivka?>);
+ //console.log("tukaj!");
});
</script>
<?
@@ -965,7 +972,7 @@ class RankingController extends Controller type="hidden"
name="spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '"
id="spremenljivka_' . $spremenljivka . '_ranking_cifre_' . $counter . '"
- value="' . $row2['vrstni_red'] . '"
+ value="' . (isset($row2['vrstni_red']) ? $row2['vrstni_red'] : '') . '"
> ';
echo '<br />';
@@ -985,7 +992,7 @@ class RankingController extends Controller type="hidden"
name="spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '"
id="spremenljivka_' . $spremenljivka . '_ranking_cifre_' . $counter . '"
- value="' . $row2['vrstni_red'] . '"
+ value="' . (isset($row2['vrstni_red']) ? $row2['vrstni_red'] : '') . '"
> ';
echo '<br />';
diff --git a/main/survey/app/Controllers/Vprasanja/TextController.php b/main/survey/app/Controllers/Vprasanja/TextController.php index 03c3fd3..ae0ca9d 100644 --- a/main/survey/app/Controllers/Vprasanja/TextController.php +++ b/main/survey/app/Controllers/Vprasanja/TextController.php @@ -21,6 +21,7 @@ use App\Controllers\LanguageController as Language; use App\Controllers\Vprasanja\SystemVariableController as SystemVariable;
use App\Models\Model;
use enkaParameters;
+use AppSettings;
class TextController extends Controller
{
@@ -229,7 +230,7 @@ class TextController extends Controller if ($naslov != '') $row1['naslov'] = $naslov;
# preverimo izbrano vrednost
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : '';
# ugotovimo ali je na katerem gridu predhodno izbran missing
$is_missing = false;
@@ -272,19 +273,18 @@ class TextController extends Controller $first_missing_value = true;
foreach ($srv_grids AS $i => $srv_grid) {
- if ($srv_grid['other'] != 0)
- $grid_id = $srv_data_grid[$row1['id']]['grd_id'];
- else
- $grid_id = $srv_data_cache[$row1['id']][$i]['grd_id'];
+ if ($srv_grid['other'] != 0){
+ $grid_id = isset($srv_data_grid[$row1['id']]['grd_id']) ? $srv_data_grid[$row1['id']]['grd_id'] : '';
+ }
+ else{
+ $grid_id = isset($srv_data_cache[$row1['id']][$i]['grd_id']) ? $srv_data_cache[$row1['id']][$i]['grd_id'] : '';
+ }
$value = $srv_grid['id'];
$vsebina = '';
if ($grid_id == $value) {
-
$vsebina = $srv_data_cache[$row1['id']][$i]['text'];
-
- //$row2 = mysqli_fetch_array($sql2);
}
if ((string)$srv_grid['other'] != '0' && $first_missing_value == true) {
@@ -480,7 +480,6 @@ class TextController extends Controller ************************************************/
public function textbox($spremenljivka, $oblika)
{
- global $recaptcha_sitekey;
global $lang;
$row = Model::select_from_srv_spremenljivka($spremenljivka);
@@ -575,7 +574,7 @@ class TextController extends Controller $captcha = ($spremenljivkaParams->get('captcha') ? $spremenljivkaParams->get('captcha') : 0);
if ($captcha == 1) {
- echo '<div class="g-recaptcha" data-sitekey="' .$recaptcha_sitekey .'"></div>';
+ echo '<div class="g-recaptcha" data-sitekey="'.AppSettings::getInstance()->getSetting('google-recaptcha_sitekey').'"></div>';
}
else {
$char_counter_events = $limit ? 'charCounter(this);' : '';
@@ -583,12 +582,11 @@ class TextController extends Controller // Ce gre za email preverjamo pravilnost na blur in ne na keyup
$js_trigger = ($email_verify == 1) ? 'onBlur' : 'onKeyUp';
- echo '<label for="spremenljivka_' . $spremenljivka . '_vrednost_' . $i . '">';
if ($taSize > 1) {
echo '<textarea name="vrednost_' . $spremenljivka . '_kos_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_vrednost_' . $i . '" '.($disabled_vprasanje ? ' disabled="disabled"' : '').' rows="' . $taSize . '" class="width_' . $input . '" onkeyup="checkBranching();'.$char_counter_events.'"' . (!$missing && !$disabled_vprasanje ? '' : ' disabled') . $max_text_length. '>' . (!$missing ? $row2['text'] : '') . '</textarea>';
} else {
- echo '<input type="text" name="vrednost_' . $spremenljivka . '_kos_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_vrednost_' . $i . '" class="width_' . $input . '" '.($disabled_vprasanje ? ' disabled="disabled"' : '').' '.$js_trigger.'="checkBranching();'.$char_counter_events.'" value="' . (!$missing ? $row2['text'] : '') . '" ' . (!$missing && !$disabled_vprasanje ? '' : ' disabled') . $max_text_length. '>';
+ echo '<input type="text" name="vrednost_' . $spremenljivka . '_kos_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_vrednost_' . $i . '" class="width_' . $input . '" '.($disabled_vprasanje ? ' disabled="disabled"' : '').' '.$js_trigger.'="checkBranching();'.$char_counter_events.'" value="' . (!$missing && isset($row2['text']) ? $row2['text'] : '') . '" ' . (!$missing && !$disabled_vprasanje ? '' : ' disabled') . $max_text_length. '>';
}
// Ce je vprasanje disabled moramo vseeno postati vrednost
@@ -602,6 +600,7 @@ class TextController extends Controller echo '<script>set_charCounter(\'spremenljivka_' . $spremenljivka . '_vrednost_' . $i . '\');</script>';
}
+ echo '<label for="spremenljivka_' . $spremenljivka . '_vrednost_' . $i . '">';
echo '</label>';
}
@@ -632,9 +631,9 @@ class TextController extends Controller //***novo
- //$sqlSignature = sisplet_query("SELECT filename FROM srv_data_upload WHERE usr_id = '" . get('usr_id') . "'");
$sqlSignature = sisplet_query("SELECT filename FROM srv_data_upload WHERE usr_id = '" . get('usr_id') . "' AND code='" . $spremenljivka . "' ");
if (mysqli_num_rows($sqlSignature) > 0) {
+
$rowSignature = mysqli_fetch_array($sqlSignature);
$signaturefile = $rowSignature[0];
@@ -752,22 +751,24 @@ class TextController extends Controller <div id="canvas_' . $spremenljivka . '">
<div class="sig sigWrapper">
- <canvas width="'.$width.'" height="'.$height.'" style="border:1px solid black"></canvas>
+ <canvas width="'.$width.'" height="'.$height.'"></canvas>
</div>
</div>
<div id="podpis_slika_' . $spremenljivka . '" hidden>
<img src="' . self::$site_url . 'main/survey/uploads/' . $signaturefile . '" style="width: '.$width.'px; height: '.$height.'px; border:1px solid black">
</div>
- <div>
-
- <input id="clear_spremenljivka_' . $spremenljivka . '" type="button" value="' . self::$lang['srv_signature_clear'] . '" class="sig_clear_button" style="width: '.$width.'px;">
-
- <input id="signature-data_spremenljivka_' . $spremenljivka . '" type="text" value="" name="signature-data_spremenljivka_' . $spremenljivka . '" hidden><br />
+
+ <div class="sig_clear_button_wrapper">
+ <input id="clear_spremenljivka_' . $spremenljivka . '" type="button" value="' . self::$lang['srv_signature_clear'] . '" class="sig_clear_button" >
+
+ <input id="signature-data_spremenljivka_' . $spremenljivka . '" type="text" value="" name="signature-data_spremenljivka_' . $spremenljivka . '" hidden>
+ </div>
';
echo '
- ' . self::$lang['srv_signature_name'] . ' ' . '<input type="text" name="vrednost_' . $spremenljivka . '_kos_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_vrednost_' . $i . '" ' . (!$missing ? '' : ' disabled') . '><br />
+ <div class="sig_input_wrapper">
+ ' . self::$lang['srv_signature_name'] . ' ' . '<input type="text" name="vrednost_' . $spremenljivka . '_kos_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_vrednost_' . $i . '" ' . (!$missing ? '' : ' disabled') . '><br />
</div>
</div>
@@ -775,7 +776,7 @@ class TextController extends Controller }
// Smo v admin podatkih in uplodamo datoteko ali fotografijo
- elseif( ($row['upload'] == 1 || $row['upload'] == 2) && ($_GET['t'] == 'postprocess' || $_GET['m'] == 'quick_edit') ){
+ elseif( ($row['upload'] == 1 || $row['upload'] == 2) && ((isset($_GET['t']) && $_GET['t'] == 'postprocess') || (isset($_GET['m']) && $_GET['m'] == 'quick_edit')) ){
$sqlUpload = sisplet_query("SELECT filename FROM srv_data_upload WHERE usr_id='".get('usr_id')."' AND code='".$row2['text']."'");
@@ -937,7 +938,7 @@ class TextController extends Controller # missing vrednost
$_id = 'missing_value_spremenljivka_' . $spremenljivka . '_vrednost_' . $oKey;
- if ($srv_data_vrednost[$oKey]) {
+ if (isset($srv_data_vrednost[$oKey]) && $srv_data_vrednost[$oKey]) {
$sel = true;
} else {
$sel = false;
diff --git a/main/survey/app/Controllers/Vprasanja/VprasanjaController.php b/main/survey/app/Controllers/Vprasanja/VprasanjaController.php index c34b1c3..baeb207 100644 --- a/main/survey/app/Controllers/Vprasanja/VprasanjaController.php +++ b/main/survey/app/Controllers/Vprasanja/VprasanjaController.php @@ -227,21 +227,17 @@ class VprasanjaController extends Controller $zaporedna++;
}
-
+
// JS za mobilno razpiranje tabel
- SurveySetting::getInstance()->Init(get('anketa'));
- $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
- if($mobile_tables == 2){
-
- echo '<script>
- $(document).ready(
- function(){
- mobileMultigridExpandable();
- }
- );
- </script>';
- }
+ echo '<script>
+ $(document).ready(
+ function(){
+ mobileMultigridExpandable();
+ }
+ );
+ </script>';
+
// JS za razpiranje tabel znotraj bloka s to nastavitvijo
echo '<script>
$(document).ready(
@@ -251,12 +247,12 @@ class VprasanjaController extends Controller );
</script>';
-
+
echo '<script>
var comments = init_comments_save();
// GDPR popup
- $(".gdpr_popup_trigger").click(function(){ show_gdpr_about(\''.get('lang_id').'\'); });
+ $(".gdpr_popup_trigger").click(function(){ show_gdpr_about(\''. self::$lang['id'] .'\'); });
</script>';
}
@@ -323,12 +319,22 @@ class VprasanjaController extends Controller $sql = sisplet_query("SELECT text FROM srv_data_text" . get('db_table') . " WHERE spr_id='0' AND vre_id='$spremenljivka' AND usr_id='" . get('usr_id') . "' AND loop_id $loop_id");
$row = mysqli_fetch_array($sql);
- echo '<div class="comment red" onclick="$(\'#question_resp_comment_' . $spremenljivka . '\').toggle();" >' . $comment . '</div>
- <div class="variable_holder ' . ($question_resp_comment_show_open == 1 ? 'display_none' : '') . '" id="question_resp_comment_' . $spremenljivka . '">
- <div class="variabla question_comment">
- <textarea name="question_comment_' . $spremenljivka . '" id="question_comment_' . $spremenljivka . '">' . $row['text'] . '</textarea>
- </div>
- </div>';
+
+ echo '<div class="comment_holder">';
+
+ echo ' <div class="comment red" onclick="$(\'#question_resp_comment_' . $spremenljivka . '\').toggle();" >' . $comment . '</div>';
+
+ echo ' <div class="variable_holder ' . ($question_resp_comment_show_open == 1 ? 'display_none' : '') . '" id="question_resp_comment_' . $spremenljivka . '">';
+ echo ' <div class="variabla question_comment">';
+ echo ' <textarea name="question_comment_' . $spremenljivka . '" id="question_comment_' . $spremenljivka . '">' . $row['text'] . '</textarea>';
+ echo ' </div>';
+ echo ' </div>';
+
+ echo ' <div class="comment_autosave">';
+ echo ' <span class="faicon bottom_saving"></span>'.self::$lang['srv_vprasalnik_autosave'];
+ echo ' </div>';
+
+ echo '</div>';
}
/**
@@ -342,9 +348,9 @@ class VprasanjaController extends Controller $row = Model::select_from_srv_spremenljivka($spremenljivka);
$rowl = Language::srv_language_spremenljivka($spremenljivka);
- if (strip_tags($rowl['naslov']) != '') $row['naslov'] = $rowl['naslov'];
- if (strip_tags($rowl['info']) != '') $row['info'] = $rowl['info'];
- if ($rowl['vsota'] != '') $row['vsota'] = $rowl['vsota'];
+ if (isset($rowl['naslov']) && strip_tags($rowl['naslov']) != '') $row['naslov'] = $rowl['naslov'];
+ if (isset($rowl['info']) && strip_tags($rowl['info']) != '') $row['info'] = $rowl['info'];
+ if (isset($rowl['vsota']) && $rowl['vsota'] != '') $row['vsota'] = $rowl['vsota'];
// da dela tudi userjem brez JS, po defaultu vedno prikazemo vsa vprasanja, ki jih potem skrivamo z JS
@@ -534,8 +540,9 @@ class VprasanjaController extends Controller echo '<div class="variable_holder vodoravno_ob_vprasanju '.$oblika['divClear'].'" '.($row['hidden_default'] == 1 ? 'style="display:none"' : '').'>';
}
else{
+ $visual_scale = ($row['tip'] == 1 && $row['orientation'] == 11) ? 'analog_visual_scale' : '';
//echo '<div class="variable_holder '.$oblika['divClear'].'" ' . ($row['hidden_default'] == 1 ? 'style="display:none"' : 'style="display:inline"').'>';
- echo '<div class="variable_holder '.$oblika['divClear'].'" ' . ($row['hidden_default'] == 1 ? 'style="display:none"' : '').'>';
+ echo '<div class="variable_holder '.$oblika['divClear'].' '.$visual_scale.'" ' . ($row['hidden_default'] == 1 ? 'style="display:none"' : '').'>';
}
}
@@ -701,11 +708,11 @@ class VprasanjaController extends Controller // Tabela - radio
case 6:
-
- SurveySetting::getInstance()->Init(get('anketa'));
- $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
- // Izris multigrida s postopnim resevanjem
+ // Pridobimo nastavitve za prikaz tabele
+ $tables_setting = MultigridMobile::getInstance()->getTableSettings($spremenljivkaParams);
+
+ // Izris multigrida s postopnim resevanjem - ostanek za stare ankete
if($row['dynamic_mg'] > 0 && !get('printPreview')){
if ($row['dynamic_mg'] == 1 || $row['dynamic_mg'] == 3 || $row['dynamic_mg'] == 5)
@@ -713,16 +720,23 @@ class VprasanjaController extends Controller else
Dynamic::getInstance()->verticalMultigrid($spremenljivka);
}
- // Izris radio multigrida na mobitelu
- elseif (get('mobile') == 1 && $mobile_tables > 0) {
-
- // Dvojni multigrid
- if($row['enota'] == 3)
- MultigridMobile::getInstance()->radioDoubleMultigrid($spremenljivka);
- else
- MultigridMobile::getInstance()->radioMultigrid($spremenljivka);
+ // Izris multigrida na mobitelu
+ elseif (get('mobile') == 1 && $tables_setting > 0) {
+
+ // Prilagojena tabela s horizontalnim pomikanjem
+ if ($tables_setting == 3) {
+ MultigridMobile::getInstance()->radioHorizontalDynamicMultigrid($spremenljivka);
+ }
+ else{
+
+ // Dvojni multigrid
+ if($row['enota'] == 3)
+ MultigridMobile::getInstance()->radioDoubleMultigrid($spremenljivka);
+ else
+ MultigridMobile::getInstance()->radioMultigrid($spremenljivka);
+ }
}
- // Ostali podtipi tabel
+ // Podtipi tabel
else{
// Izris glede na podtip
@@ -735,7 +749,19 @@ class VprasanjaController extends Controller // Dvojni multigrid
case 3:
- Double::getInstance()->grid($spremenljivka);
+
+ // Prilagojena tabela
+ if ($tables_setting == 1 || $tables_setting == 2) {
+ MultigridMobile::getInstance()->radioDoubleMultigrid($spremenljivka);
+ }
+ // Prilagojena tabela s horizontalnim pomikanjem
+ elseif ($tables_setting == 3) {
+ MultigridMobile::getInstance()->radioHorizontalDynamicMultigrid($spremenljivka);
+ }
+ else{
+ Double::getInstance()->grid($spremenljivka);
+ }
+
break;
// OneAgainstAnother
@@ -765,7 +791,19 @@ class VprasanjaController extends Controller // Navaden multigrid
default:
- Multigrid::getInstance()->display($spremenljivka);
+
+ // Prilagojena tabela
+ if (($tables_setting == 1 || $tables_setting == 2) && !get('printPreview')) {
+ MultigridMobile::getInstance()->radioMultigrid($spremenljivka);
+ }
+ // Prilagojena tabela s horizontalnim pomikanjem
+ elseif ($tables_setting == 3 && !get('printPreview')) {
+ MultigridMobile::getInstance()->radioHorizontalDynamicMultigrid($spremenljivka);
+ }
+ else{
+ Multigrid::getInstance()->display($spremenljivka);
+ }
+
break;
}
}
@@ -776,11 +814,11 @@ class VprasanjaController extends Controller // Tabela - checkbox
case 16:
- SurveySetting::getInstance()->Init(get('anketa'));
- $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+ // Pridobimo nastavitve za prikaz tabele
+ $tables_setting = MultigridMobile::getInstance()->getTableSettings($spremenljivkaParams);
// Izris checkbox multigrida na mobitelu
- if (get('mobile') == 1 && $mobile_tables > 0) {
+ if (get('mobile') == 1 && $tables_setting > 0) {
// Dvojni multigrid
if($row['enota'] == 3)
@@ -794,7 +832,15 @@ class VprasanjaController extends Controller // Dvojni multicheckboxa
case 3:
- Double::getInstance()->checkGrid($spremenljivka);
+
+ // Prilagojena tabela
+ if ($tables_setting > 0) {
+ MultigridMobile::getInstance()->checkboxDoubleMultigrid($spremenljivka);
+ }
+ else{
+ Double::getInstance()->checkGrid($spremenljivka);
+ }
+
break;
// SelectBox
@@ -804,7 +850,15 @@ class VprasanjaController extends Controller // Navaden checkbox
case 0:
- Multigrid::getInstance()->checkbox($spremenljivka);
+
+ // Prilagojena tabela
+ if ($tables_setting > 0 && !get('printPreview')) {
+ MultigridMobile::getInstance()->checkboxDoubleMultigrid($spremenljivka);
+ }
+ else{
+ Multigrid::getInstance()->checkbox($spremenljivka);
+ }
+
break;
// Grid drag and drop
@@ -821,14 +875,13 @@ class VprasanjaController extends Controller case 19:
case 20:
- SurveySetting::getInstance()->Init(get('anketa'));
- $mobile_tables = SurveySetting::getInstance()->getSurveyMiscSetting('mobile_tables');
+ // Pridobimo nastavitve za prikaz tabele
+ $tables_setting = MultigridMobile::getInstance()->getTableSettings($spremenljivkaParams);
- // Izris text in number multigrida na mobitelu
- if (get('mobile') == 1 && $mobile_tables > 0) {
+ // Prilagojena tabela
+ if ($tables_setting > 0) {
MultigridMobile::getInstance()->textMultigrid($spremenljivka);
}
- // Izris navadnega text in number multigrida
else{
Text::getInstance()->multitext($spremenljivka);
}
diff --git a/main/survey/app/Controllers/Vprasanja/VsotaController.php b/main/survey/app/Controllers/Vprasanja/VsotaController.php index ad79de7..b69d190 100644 --- a/main/survey/app/Controllers/Vprasanja/VsotaController.php +++ b/main/survey/app/Controllers/Vprasanja/VsotaController.php @@ -71,20 +71,21 @@ class VsotaController extends Controller $row2 = mysqli_fetch_array($sql2);
//preverjanje skritega vprasanja(-2)
- $row2['text'] != -2 ? $text = $row2['text'] : $text = '';
+ $text = isset($row2['text']) && $row2['text'] != -2 ? $row2['text'] : '';
echo '<div class="variabla_sum width_' . $gridWidth . '" id="vrednost_if_' . $row1['id'] . '" ' . ($row1['if_id'] > 0 ? ' style="display:none"' : '') . '>';
//echo ' <label for="spremenljivka_' . $spremenljivka . '_sestevanec_' . $counter . '">' . $row1['naslov'] . '</label>';
//echo ' <label style="width:200px;display: inline-block;" for="spremenljivka_' . $spremenljivka . '_sestevanec_' . $counter . '">' . $row1['naslov'] . '</label>';
- echo ' <label class="vsota_besedilo" for="spremenljivka_' . $spremenljivka . '_sestevanec_' . $counter . '">' . $row1['naslov'] . '</label>';
- echo ' <input type="text" name="spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_sestevanec_' . $counter . '" value="' . $text . '" onkeypress="checkNumber(this, ' . $row['cela'] . ', ' . $row['decimalna'] . ');" onkeyup="checkNumber(this, ' . $row['cela'] . ', ' . $row['decimalna'] . '); calcSum(' . $spremenljivka . ', ' . $max . ', ' . $row['vsota_limit'] . ');" onBlur="checkBranching();" ' . ($selected ? ' disabled' : '') . '>';
+ echo '<label class="vsota_besedilo" for="spremenljivka_' . $spremenljivka . '_sestevanec_' . $counter . '">' . $row1['naslov'] . '</label>';
+ echo '<input type="text" name="spremenljivka_' . $spremenljivka . '_vrednost_' . $row1['id'] . '" id="spremenljivka_' . $spremenljivka . '_sestevanec_' . $counter . '" value="' . $text . '" onkeypress="checkNumber(this, ' . $row['cela'] . ', ' . $row['decimalna'] . ');" onkeyup="checkNumber(this, ' . $row['cela'] . ', ' . $row['decimalna'] . '); calcSum(' . $spremenljivka . ', ' . $max . ', ' . $row['vsota_limit'] . ');" onBlur="checkBranching();" ' . ($selected ? ' disabled' : '') . '>';
echo '</div>' . "\n";
$counter++;
$sum += (double)$text;
}
+ $limit = '';
if ($row['vsota_limit'] != 0 && $row['vsota_limit'] == $row['vsota_min'])
$limit = '(' . $row['vsota_min'] . ')';
elseif ($row['vsota_limit'] != 0 && $row['vsota_min'] != 0)
@@ -95,14 +96,15 @@ class VsotaController extends Controller $limit = '(min ' . $row['vsota_min'] . ')';
$rowl = Language::srv_language_spremenljivka($spremenljivka);
- if ($rowl['vsota'] != '') $row['vsota'] = $rowl['vsota'];
- if ($row['vsota'] == '') $row['vsota'] = self::$lang['srv_vsota_text'];
+ if (isset($rowl['vsota']) && $rowl['vsota'] != '')
+ $row['vsota'] = $rowl['vsota'];
+
+ if ($row['vsota'] == '')
+ $row['vsota'] = self::$lang['srv_vsota_text'];
echo '<div class="variabla_sum width_' . $gridWidth . ' sum" id="vsota_' . $row['id'] . '">';
- //echo ' <label for="spremenljivka_' . $spremenljivka . '_vsota">' . $row['vsota'] . '</label>';
- //echo ' <label style="width:200px;display: inline-block;" for="spremenljivka_' . $spremenljivka . '_vsota">' . $row['vsota'] . '</label>';
- echo ' <label class="vsota_besedilo" for="spremenljivka_' . $spremenljivka . '_vsota">' . $row['vsota'] . '</label>';
- echo ' <input type="text" name="spremenljivka_' . $spremenljivka . '_vsota_' . $row['id'] . '" id="spremenljivka_' . $spremenljivka . '_vsota" value="' . $sum . '" disabled class="def">';
+ echo ' <label class="vsota_besedilo" for="spremenljivka_' . $spremenljivka . '_vsota">' . $row['vsota'] . '</label>';
+ echo ' <input type="text" name="spremenljivka_' . $spremenljivka . '_vsota_' . $row['id'] . '" id="spremenljivka_' . $spremenljivka . '_vsota" value="' . $sum . '" disabled class="def">';
echo '</div>' . "\n";
if ($row['vsota_show'] == 1)
diff --git a/main/survey/app/Models/Model.php b/main/survey/app/Models/Model.php index dbeab7e..a87dde1 100644 --- a/main/survey/app/Models/Model.php +++ b/main/survey/app/Models/Model.php @@ -172,7 +172,7 @@ class Model // Ce nismo v admin vmesniku (preview) ne shranjujemo vrstnega reda
- if(!isset($_GET['a']) || $_GET['a'] != 'preview_spremenljivka'){
+ if(!isset($_GET['a']) || ($_GET['a'] != 'preview_spremenljivka' && $_GET['a'] != 'showspremenljivkaSingleVarPopup')){
// Shranimo vrstni red ce imamo random
if($randomsort){
@@ -282,12 +282,14 @@ class Model return $getOtherValue[$spremenljivka];
}
- $stringOther = "SELECT vre_id FROM srv_specialdata_vrednost WHERE spr_id='" . $spremenljivka . "' AND usr_id='" . get('usr_id') . "'";
+ $sqlOther = sisplet_query("SELECT vre_id FROM srv_specialdata_vrednost WHERE spr_id='" . $spremenljivka . "' AND usr_id='" . get('usr_id') . "'");
- $sqlOther = sisplet_query($stringOther);
- $rowOther = mysqli_fetch_assoc($sqlOther);
+ if(mysqli_num_rows($sqlOther) > 0){
+ $rowOther = mysqli_fetch_assoc($sqlOther);
+ return save('getOtherValue[' . $spremenljivka . ']', $rowOther['vre_id'], 1);
+ }
- return save('getOtherValue[' . $spremenljivka . ']', $rowOther['vre_id'], 1);
+ return false;
}
/**
@@ -301,7 +303,8 @@ class Model "ON DUPLICATE KEY UPDATE vre_id='" . $vrednost . "'");
else
$sqlDelete = sisplet_query("DELETE from srv_specialdata_vrednost WHERE spr_id = '" . $spremenljivka . "' AND usr_id = '" . get('usr_id') . "'");
- return mysqli_affected_rows($GLOBALS['connect_db']);
+
+ return mysqli_affected_rows($GLOBALS['connect_db']);
}
diff --git a/main/survey/app/Models/SaveSurvey.php b/main/survey/app/Models/SaveSurvey.php index be62517..8bbd372 100644 --- a/main/survey/app/Models/SaveSurvey.php +++ b/main/survey/app/Models/SaveSurvey.php @@ -92,7 +92,7 @@ class SaveSurvey extends Model SurveySetting::getInstance()->Init(get('anketa'));
$date = SurveySetting::getInstance()->getSurveyMiscSetting('survey_date');
- if ($date == 0) $_time_insert = "NOW()"; else $_time_insert = "''";
+ if ($date == 0 || $date == '') $_time_insert = "NOW()"; else $_time_insert = "''";
if (isset($_GET['language'])) save('language', (int)$_GET['language']); else save('language', $lang['id']);
// popravimo cas updata
@@ -105,6 +105,15 @@ class SaveSurvey extends Model sisplet_query("REPLACE INTO srv_user_grupa" . get('db_table') . " (gru_id, usr_id, time_edit, preskocena) VALUES ('" . get('grupa') . "', '" . get('usr_id') . "', " . $_time_insert . ", '$preskocena')");
if ($preskocena == 1) save('preskocena_first', 0);
+ // Ce imamo napredni modul za belezenje casovc po straneh
+ if(SurveyInfo::getInstance()->checkSurveyModule('advanced_timestamps')){
+ sisplet_query("INSERT INTO srv_advanced_timestamps
+ (gru_id, usr_id, time_edit)
+ VALUES
+ ('".get('grupa')."', '".get('usr_id')."', NOW())
+ ");
+ }
+
# potrebno bo osvežit seznam anket
Model::setUpdateSurveyList();
}
@@ -169,15 +178,17 @@ class SaveSurvey extends Model // vnesemo komentar vprasanja
if ($question_resp_comment == 1) {
- $text = $_POST['question_comment_' . $row['id']];
+
+ $text = isset($_POST['question_comment_' . $row['id']]) ? strip_tags($_POST['question_comment_' . $row['id']]) : '';
+
sisplet_query("DELETE FROM srv_data_text" . get('db_table') . " WHERE spr_id='0' AND vre_id='$row[id]' AND usr_id='" . get('usr_id') . "'");
+
if ($text != '') {
if (isset($_POST['inicialke']) && $_POST['inicialke'] != '')
$text = '<b>' . $_POST['inicialke'] . '</b> (__DATE__):' . "\n\r" . $text;
$s = sisplet_query("INSERT INTO srv_data_text" . get('db_table') . " (spr_id, vre_id, text, usr_id) VALUES ('0', '$row[id]', '$text', '" . get('usr_id') . "')");
if (!$s) echo mysqli_error($GLOBALS['connect_db']);
}
-
}
if (($row['tip'] < 14) || ($row['tip'] > 15)) {
@@ -249,7 +260,7 @@ class SaveSurvey extends Model Model::user_not_lurker();
- if ($_POST['textfield_' . $vrednost] != '')
+ if (isset($_POST['textfield_' . $vrednost]) && $_POST['textfield_' . $vrednost] != '')
$srv_data_text .= "('$row[id]', '$vrednost', '" . $_POST['textfield_' . $vrednost] . "', '', '" . get('usr_id') . "', $loop_id),";
}
else {
@@ -321,7 +332,7 @@ class SaveSurvey extends Model $sql1 = sisplet_query("SELECT id FROM srv_vrednost WHERE spr_id = '$row[id]'");
while ($row1 = mysqli_fetch_array($sql1)) {
- $grid_id = $_POST['vrednost_' . $row1['id']];
+ $grid_id = isset($_POST['vrednost_' . $row1['id']]) ? $_POST['vrednost_' . $row1['id']] : '';
// $grid_id > 0
if ((string)$grid_id != "") {
@@ -337,7 +348,7 @@ class SaveSurvey extends Model }
// vsebino text polja vnesemo v vsakem primeru
- if ($_POST['textfield_' . $row1['id']] != '') {
+ if (isset($_POST['textfield_' . $row1['id']]) && $_POST['textfield_' . $row1['id']] != '') {
$srv_data_text .= "('$row[id]', '$row1[id]', '" . $_POST['textfield_' . $row1['id']] . "', '', '" . get('usr_id') . "', $loop_id),";
Model::user_not_lurker();
}
@@ -364,8 +375,8 @@ class SaveSurvey extends Model $sql1 = sisplet_query("SELECT id FROM srv_vrednost WHERE spr_id = '$row[id]'");
while ($row1 = mysqli_fetch_array($sql1)) {
- $grid_id = $_POST['vrednost_' . $row1['id']];
- $grid_id2 = $_POST['vrednost_' . $row1['id'] . '_part_2'];
+ $grid_id = isset($_POST['vrednost_' . $row1['id']]) ? $_POST['vrednost_' . $row1['id']] : "";
+ $grid_id2 = isset($_POST['vrednost_' . $row1['id'] . '_part_2']) ? $_POST['vrednost_' . $row1['id'] . '_part_2'] : "";
if ((string)$grid_id != "") // $grid_id > 0
{ # grid_id je lahko tudi negativen za missing vrednosti
@@ -416,7 +427,7 @@ class SaveSurvey extends Model } else {
while ($row2 = mysqli_fetch_array($sql2)) {
- $grid_id = $_POST['vrednost_' . $row1['id'] . '_grid_' . $row2['id']];
+ $grid_id = isset($_POST['vrednost_' . $row1['id'] . '_grid_' . $row2['id']]) ? $_POST['vrednost_' . $row1['id'] . '_grid_' . $row2['id']] : "";
// $grid_id > 0
if ((string)$grid_id != ""){
@@ -490,7 +501,7 @@ class SaveSurvey extends Model }
// vsebino text polja vnesemo v vsakem primeru
- if ($_POST['textfield_' . $row1['id']] != '') {
+ if (isset($_POST['textfield_' . $row1['id']]) && $_POST['textfield_' . $row1['id']] != '') {
$srv_data_text .= "('$row[id]', '$row1[id]', '" . $_POST['textfield_' . $row1['id']] . "', '', '" . get('usr_id') . "', $loop_id),";
Model::user_not_lurker();
}
@@ -572,7 +583,7 @@ class SaveSurvey extends Model }
// vsebino text polja vnesemo v vsakem primeru
- if ($_POST['textfield_' . $row1['id']] != '') {
+ if (isset($_POST['textfield_' . $row1['id']]) && $_POST['textfield_' . $row1['id']] != '') {
//sisplet_query("INSERT INTO srv_data_text (spr_id, vre_id, text, usr_id) VALUES ('$row[id]', '$row1[id]', '".$_POST['textfield_'.$row1['id']]."', '".get('usr_id')."')");
$srv_data_text .= "('$row[id]', '$row1[id]', '" . $_POST['textfield_' . $row1['id']] . "', '', '" . get('usr_id') . "', $loop_id),";
Model::user_not_lurker();
@@ -602,7 +613,7 @@ class SaveSurvey extends Model $sql1 = sisplet_query("SELECT id FROM srv_vrednost WHERE spr_id = '" . $spr_row['id'] . "'");
while ($row1 = mysqli_fetch_array($sql1)) {
- $grid_id = $_POST['multi_' . $spr_row['id'] . '_' . $row1['id']];
+ $grid_id = isset($_POST['multi_' . $spr_row['id'] . '_' . $row1['id']]) ? $_POST['multi_' . $spr_row['id'] . '_' . $row1['id']] : "";
if ((string)$grid_id != "") // $grid_id > 0
{ # grid_id je lahko tudi negativen za missing vrednosti
@@ -614,7 +625,7 @@ class SaveSurvey extends Model //$srv_data_grid .= "('$row[id]', '$row1[id]', '".get('usr_id')."', '-1'),";
}
// vsebino text polja vnesemo v vsakem primeru
- if ($_POST['textfield_' . $row1['id']] != '') {
+ if (isset($_POST['textfield_' . $row1['id']]) && $_POST['textfield_' . $row1['id']] != '') {
//sisplet_query("INSERT INTO srv_data_text (spr_id, vre_id, text, usr_id) VALUES ('$row[id]', '$row1[id]', '".$_POST['textfield_'.$row1['id']]."', '".get('usr_id')."')");
$srv_data_text .= "('$spr_row[id]', '$row1[id]', '" . $_POST['textfield_' . $row1['id']] . "', '', '" . get('usr_id') . "', $loop_id),";
Model::user_not_lurker();
@@ -698,7 +709,7 @@ class SaveSurvey extends Model }
// vsebino text polja vnesemo v vsakem primeru
- if ($_POST['textfield_' . $row1['id']] != '') {
+ if (isset($_POST['textfield_' . $row1['id']]) && $_POST['textfield_' . $row1['id']] != '') {
//sisplet_query("INSERT INTO srv_data_text (spr_id, vre_id, text, usr_id) VALUES ('$row[id]', '$row1[id]', '".$_POST['textfield_'.$row1['id']]."', '".get('usr_id')."')");
$srv_data_text .= "('$spr_row[id]', '$row1[id]', '" . $_POST['textfield_' . $row1['id']] . "', '', '" . get('usr_id') . "', $loop_id),";
Model::user_not_lurker();
@@ -799,7 +810,7 @@ class SaveSurvey extends Model $file_allowed = true;
// Preverimo ce je file type dovoljen (prava koncnica)
- if( !in_array(strtolower($ext), array("jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx")) ){
+ if( !in_array(strtolower($ext), array("jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "zip", "rar", "rds", "rdata", "rmd", "qmd")) ){
$file_allowed = false;
}
@@ -1174,36 +1185,38 @@ class SaveSurvey extends Model $input = $spremenljivkaParams->get('multi_input_type');
- foreach ($_POST['vrednost_' . $row['id']] AS $key => $val) {
+ if(isset($_POST['vrednost_' . $row['id']])){
+ foreach ($_POST['vrednost_' . $row['id']] AS $key => $val) {
- $data = explode("|", $val);
+ $data = explode("|", $val);
- //izberi lokacijo
- if($enota == 3){
- $je_odgovoril = (isset($_POST[$data[0] . '_text']) && $_POST[$data[0] . '_text'] != '');
- $srv_data_map .= "(" . get('usr_id') . ", '$row[id]', $loop_id, $data[0], ". get('anketa') . ", '', '', '', '".
- ($je_odgovoril ? $_POST[$data[0] . '_text'] : '-1')."', ''),";
- if($je_odgovoril)
- Model::user_not_lurker();
- }
- else{
- //linija ali poligon
- if($enota == 2 && $input != 'marker'){
- $srv_data_map .= "(" . get('usr_id') . ", '$row[id]', $loop_id, NULL, ". get('anketa') . ", '$data[1]', '$data[2]', '', '', '$data[0]'),";
+ //izberi lokacijo
+ if($enota == 3){
+ $je_odgovoril = (isset($_POST[$data[0] . '_text']) && $_POST[$data[0] . '_text'] != '');
+ $srv_data_map .= "(" . get('usr_id') . ", '$row[id]', $loop_id, $data[0], ". get('anketa') . ", '', '', '', '".
+ ($je_odgovoril ? $_POST[$data[0] . '_text'] : '-1')."', ''),";
+ if($je_odgovoril)
+ Model::user_not_lurker();
}
- //marker
else{
- //nastavi odgovor na podvprasanje
- if(isset($_POST[$data[0] . '_text']))
- $marker_text = $_POST[$data[0] . '_text'] != '' ? $_POST[$data[0] . '_text'] : '-1';
- else
- $marker_text = '-4';
-
- $srv_data_map .= "(" . get('usr_id') . ", '$row[id]', $loop_id, NULL, ". get('anketa') . ", '$data[1]', '$data[2]', '$data[3]', '".
- $marker_text."', ''),";
+ //linija ali poligon
+ if($enota == 2 && $input != 'marker'){
+ $srv_data_map .= "(" . get('usr_id') . ", '$row[id]', $loop_id, NULL, ". get('anketa') . ", '$data[1]', '$data[2]', '', '', '$data[0]'),";
+ }
+ //marker
+ else{
+ //nastavi odgovor na podvprasanje
+ if(isset($_POST[$data[0] . '_text']))
+ $marker_text = $_POST[$data[0] . '_text'] != '' ? $_POST[$data[0] . '_text'] : '-1';
+ else
+ $marker_text = '-4';
+
+ $srv_data_map .= "(" . get('usr_id') . ", '$row[id]', $loop_id, NULL, ". get('anketa') . ", '$data[1]', '$data[2]', '$data[3]', '".
+ $marker_text."', ''),";
+ }
+ Model::user_not_lurker();
}
- Model::user_not_lurker();
- }
+ }
}
}
else {
@@ -1218,20 +1231,25 @@ class SaveSurvey extends Model elseif ($row['tip'] == 27) {
if ($_POST['visible_' . $row['id']] == 1) {
+
//za koordinate
- foreach ($_POST['vrednost_' . $row['id']] AS $key => $val) {
+ if(isset($_POST['vrednost_' . $row['id']])){
+ foreach ($_POST['vrednost_' . $row['id']] AS $key => $val) {
$data = explode("|", $val);
-
+
$srv_data_heatmap .= "(" . get('usr_id') . ", '$row[id]', $loop_id, NULL, ". get('anketa') . ", '$data[1]', '$data[2]', '$data[3]', '".
(isset($_POST[$data[0] . '_text']) ? $_POST[$data[0] . '_text'] : '-2')."', ''),";
Model::user_not_lurker();
$empty = false;
- }//za koordinate - konec
+ }
+ }
+ //za koordinate - konec
//za checkbox
- foreach ($_POST['vrednostHeatmap_' . $row['id']] AS $key => $val) {
-
+ if(isset($_POST['vrednostHeatmap_' . $row['id']])){
+ foreach ($_POST['vrednostHeatmap_' . $row['id']] AS $key => $val) {
+
if ($val > 0) {
//sisplet_query("INSERT INTO srv_data_vrednost".get('db_table')." (spr_id, vre_id, usr_id) VALUES ('$row[id]', '$val', '".get('usr_id')."')");
$srv_data_vrednost .= "('$row[id]', '$val', '" . get('usr_id') . "', $loop_id),";
@@ -1240,7 +1258,9 @@ class SaveSurvey extends Model //sisplet_query("INSERT INTO srv_data_text (spr_id, vre_id, text, usr_id) VALUES ('$row[id]', '$val', '".$_POST['textfield_'.$val]."', '".get('usr_id')."')");
$srv_data_text .= "('$row[id]', '$val', '" . $_POST['textfield_' . $val] . "', '', '" . get('usr_id') . "', $loop_id),";
}
- }//za checkbox - konec
+ }
+ }
+ //za checkbox - konec
// če imamo if na vprašanjij, imamo v arrayu vrednosti katere so -2
if (isset($_POST['cond_vrednost_' . $row['id']])) {
@@ -1391,7 +1411,10 @@ class SaveSurvey extends Model if (!$s) {
echo 'err08: ' . mysqli_error($GLOBALS['connect_db']);
}
- //$s = sisplet_query("DELETE FROM srv_data_glasovanje WHERE spr_id IN ($delete) AND usr_id='".get('usr_id')."'"); if (!$s) echo 'err07: '.mysqli_error($GLOBALS['connect_db']);
+ $s = sisplet_query("DELETE FROM srv_data_vrednost_cond WHERE spr_id IN ($delete) AND usr_id='" . get('usr_id') . "' AND loop_id $loop_id");
+ if (!$s) {
+ echo 'err09: ' . mysqli_error($GLOBALS['connect_db']);
+ }
}
// odrezemo zadnjo vejico, ker smo jo dodajali kar povsod
@@ -1481,11 +1504,17 @@ class SaveSurvey extends Model $sql2 = sisplet_query("SELECT id FROM srv_vrednost WHERE spr_id = '$row1[id]' AND naslov='$password'");
$row2 = mysqli_fetch_array($sql2);
+
$s = sisplet_query("DELETE FROM srv_data_vrednost" . get('db_table') . " WHERE spr_id='$row1[id]' AND usr_id='" . get('usr_id') . "'");
if (!$s) echo mysqli_error($GLOBALS['connect_db']);
+
$data = $row2['id'];
+
$s = sisplet_query("INSERT INTO srv_data_vrednost" . get('db_table') . " (spr_id, vre_id, usr_id) VALUES ('$row1[id]', '$data', '" . get('usr_id') . "')");
if (!$s) echo 'err6543' . mysqli_error($GLOBALS['connect_db']);
+
+ // Na koncu pocistimo piskotek z geslom
+ setcookie('password_'. get('anketa'), '', time() - 3600);
}
}
@@ -1530,7 +1559,7 @@ class SaveSurvey extends Model $student = $url_params['sifstud'];
- $s = sisplet_query("INSERT INTO eval_data_user (student, ank_id, usr_id) VALUES ('".$student."', '".get('anketa')."', '".get('usr_id')."')");
+ $s = sisplet_query("INSERT INTO eval_data_user (student, ank_id, usr_id) VALUES ('".$student."', '".get('anketa')."', '".get('usr_id')."') ON DUPLICATE KEY UPDATE student='".$student."'");
if (!$s) echo 'err9988' . mysqli_error($GLOBALS['connect_db']);
}
diff --git a/main/survey/app/use_classes.php b/main/survey/app/use_classes.php index 9121124..2bfe8d3 100644 --- a/main/survey/app/use_classes.php +++ b/main/survey/app/use_classes.php @@ -30,7 +30,6 @@ use Cache; use SurveyInfo;
use SurveySetting;
use SurveySlideshow;
-use Mobile_Detect;
use SurveyMissingValues;
use AdvancedParadata;
use Branching;
diff --git a/main/survey/edit_anketa.php b/main/survey/edit_anketa.php index f57a1ed..24632e9 100644 --- a/main/survey/edit_anketa.php +++ b/main/survey/edit_anketa.php @@ -2,9 +2,11 @@ include_once('../../function.php');
-$anketa = $_GET['anketa'];
+$anketa_hash = $_GET['anketa'];
+$anketa = getSurveyIdFromHash($anketa_hash);
+
$usr_id = $_GET['usr_id'];
-$preview = $_GET['preview'];
+$preview = isset($_GET['preview']) ? $_GET['preview'] : null;
$code = isset($_GET['code']) ? '&code='.$_GET['code'] : '';
$sql1 = sisplet_query("SELECT cookie FROM srv_anketa WHERE id = '$anketa'");
@@ -13,7 +15,7 @@ $row1 = mysqli_fetch_array($sql1); $sql = sisplet_query("SELECT cookie FROM srv_user WHERE id = '$usr_id'");
$row = mysqli_fetch_array($sql);
-if ($_GET['quick_view'] == 1) {
+if (isset($_GET['quick_view']) && $_GET['quick_view'] == 1) {
$urejanje = '&quick_view=1';
} else {
$urejanje = '&urejanje=1';
@@ -21,9 +23,9 @@ if ($_GET['quick_view'] == 1) { if ($row1['cookie'] == -1) {
- header("Location: ".$site_url."main/survey/index.php?anketa=$anketa&survey-".$anketa."=".$row['cookie'].$urejanje.$code);
+ header("Location: ".$site_url."main/survey/index.php?anketa=".$anketa_hash."&survey-".$anketa."=".$row['cookie'].$urejanje.$code);
} else {
setcookie('survey-'.$anketa, $row['cookie'], 0);
- header("Location: ".$site_url."main/survey/index.php?anketa=$anketa".$urejanje.$code);
+ header("Location: ".$site_url."main/survey/index.php?anketa=".$anketa_hash.$urejanje.$code);
}
?>
\ No newline at end of file diff --git a/main/survey/embed_out.php b/main/survey/embed_out.php index c8bbe2f..d00de87 100644 --- a/main/survey/embed_out.php +++ b/main/survey/embed_out.php @@ -1,9 +1,10 @@ <?php
include_once('../../function.php');
-$anketa = $_GET['anketa'];
+
+$anketa_hash = $_GET['anketa'];
$grupa = $_GET['grupa'];
-echo 'URI = '.$site_url.'main/survey/index.php?anketa='.$anketa.'&grupa='.$grupa;
+echo 'URI = '.$site_url.'main/survey/index.php?anketa='.$anketa_hash.'&grupa='.$grupa;
?>
\ No newline at end of file diff --git a/main/survey/index.php b/main/survey/index.php index 8c1769b..51f01af 100644 --- a/main/survey/index.php +++ b/main/survey/index.php @@ -28,7 +28,7 @@ ob_start(); header('Cache-Control: no-cache');
header('Pragma: no-cache');
-echo '<!DOCTYPE html><html class="no_js">';
+echo '<!DOCTYPE html><html>';
// začetek aplikacije
new \App\Controllers\SurveyController();
diff --git a/main/survey/js/ChartJS/chart_init.js b/main/survey/js/ChartJS/chart_init.js index 3f96134..97d6feb 100644 --- a/main/survey/js/ChartJS/chart_init.js +++ b/main/survey/js/ChartJS/chart_init.js @@ -238,6 +238,9 @@ function init_skavti_radar(labels, pohvale, izzivi){ // Nastavitve grafa
var options = {
+ /*responsive: true,
+ maintainAspectRatio: true,
+ aspectRatio: 0.8,*/
scale: {
angleLines: {
display: false
diff --git a/main/survey/js/customizeImageView4Respondent.js b/main/survey/js/customizeImageView4Respondent.js index 2b2c2d3..3a20434 100644 --- a/main/survey/js/customizeImageView4Respondent.js +++ b/main/survey/js/customizeImageView4Respondent.js @@ -2,7 +2,7 @@ function customizeImageView4Respondent(tip, spremenljivka, vre_id, ajax, anketa, site_url, usr_id, other, mobile, quick_view, preview_spremenljivka){
-
+
if(quick_view || preview_spremenljivka){ //ce je le predogled
$('#spremenljivka_'+spremenljivka+'_vrednost_'+vre_id).draggable( "option", "disabled", true ); //disable-anje drag and drop
}
@@ -80,6 +80,7 @@ function customizeImageView4Respondent(tip, spremenljivka, vre_id, ajax, anketa, if (final_height != 0){
$('#spremenljivka_'+spremenljivka+'_vrednost_'+vre_id).css({'height':final_height}); //dodaj style atributu še novo višino za levi blok
}
+ //console.log(final_height);
//ureditev visine kategorije (div) glede na prisotnost slike ali vecvrsticnega teksta - konec********************************************
//ureditev visine celotnega vprasanja****************************************************************************************************
@@ -279,6 +280,7 @@ function question_height_ranking(spremenljivka){ function frame_height_ranking (ui, spremenljivka){
var trenutna_visina_prenesenega = ui.item.height();
//console.log(trenutna_visina_prenesenega);
+ //console.log('prvo');
var trenutni_okvir = $('#half2_'+spremenljivka);
var stevilo_prisotnih = trenutni_okvir.children('div').length;
//console.log(stevilo_prisotnih);
diff --git a/main/survey/js/script.js b/main/survey/js/script.js index dc30154..9f44af3 100644 --- a/main/survey/js/script.js +++ b/main/survey/js/script.js @@ -1011,90 +1011,103 @@ function dynamicMultigridFixAllArrows(spremenljivka){ // Razpiranje mobilnih tabel
function mobileMultigridExpandable(){
-
+
+ // Na zacetku skrijemo vedno vse razen prvega
+ $(".grid_mobile.mobile_expanding.radio:not(.double)").find("div.grid_mobile_variables:visible:not(:first)").hide("fast", function(){
+ mobileMultigridExpandableArrow(this, 0);
+ });
+
+
// Pri kliku na naslov podvprasanja razpremo/zapremo podvprasanje
- $(".grid_mobile_title").click(function(){
+ $(".grid_mobile.mobile_expanding .grid_mobile_title").click(function(){
// Double gridi imajo zaenkrat to izklopljeno
if(!$(this).parent().parent().hasClass("double")){
+ let grid_mobile_variables_element = $(this).parent().find(".grid_mobile_variables");
+ let show = 1;
+
+ if($(grid_mobile_variables_element).is(':visible')){
+ show = 0;
+ }
+
// Dobimo pripadajoc div z vsemi vrednostmi
- $(this).parent().find(".grid_mobile_variables").toggle("fast", function(){
- mobileMultigridExpandableArrow(this);
+ $(this).parent().find(".grid_mobile_variables").toggle(300, function(){
+ mobileMultigridExpandableArrow(this, show);
});
}
});
- // Posebna obravnava radio tabel (avtomatsko razpiranje in pomikanje)
- mobileMultigridExpandableRadio();
-}
-// Razpiranje mobilnih tabel pri radio tabelah
-function mobileMultigridExpandableRadio(){
-
- // Na zacetku skrijemo vedno vse razen prvega
- $(".grid_mobile.radio:not(.double)").find("div.grid_mobile_variables:not(:first)").hide(function(){
- mobileMultigridExpandableArrow(this);
- });
-
- // Obrnemo puscico za razpiranje
- $(".grid_mobile.radio:not(.double)").find("div.grid_mobile_variables:not(:first)").parent().find(".mobile_expanding_arrow").toggleClass("arrow_down").toggleClass("arrow_up");
-
- // Pokazemo div z rezultatom
- $(".grid_mobile.radio:not(.double)").find("div.grid_mobile_variables:not(:first)").parent().find(".grid_mobile_result").show();
-
+
// Pri kliku na radio zapremo in razpremo naslednji segment
$("input[type=\"radio\"]").click(function(){
// Ce gre za radio znotraj tabele
- if($(this).closest(".grid_mobile_variables").length > 0 && !$(this).closest(".grid_mobile_variables").parent().parent().hasClass("double")){
+ if($(this).closest(".grid_mobile.mobile_expanding .grid_mobile_variables").length > 0 && !$(this).closest(".grid_mobile_variables").parent().parent().hasClass("double")){
- var podvprasanje_current = $(this).closest(".grid_mobile_variables");
- var podvprasanje_next = $(podvprasanje_current).parent().next().find(".grid_mobile_variables");
+ // Posebna obravnava radio tabel (avtomatsko razpiranje in pomikanje)
+ mobileMultigridExpandableRadio(this);
+ }
+ });
+}
+// Razpiranje mobilnih tabel pri radio tabelah
+function mobileMultigridExpandableRadio(el){
- // Zapremo trenutno podvprasanje
- $(podvprasanje_current).hide("fast", function(){
- mobileMultigridExpandableArrow(this);
- });
+ let podvprasanje_current = $(el).closest(".grid_mobile_variables");
+ let podvprasanje_next = $(podvprasanje_current).parent().nextAll(".grid_mobile_question:visible:first").find(".grid_mobile_variables");
+
+ // Dodamo delay, da lahko konca prejsnja animacija (nastavljanje okvirja na oznacen radio), drugace se izvede istocasno in "pobliskne"
+ setTimeout(function(){
+
+ // Zapremo trenutno podvprasanje
+ mobileMultigridExpandableArrow(podvprasanje_current, 0);
+ $(podvprasanje_current).hide(300, function(){
// Razpremo naslednje vprasanje ce obstaja
- $(podvprasanje_next).show("fast", function(){
- mobileMultigridExpandableArrow(this);
+ mobileMultigridExpandableArrow(podvprasanje_next, 1);
+ $(podvprasanje_next).show(300, function(){
});
+ });
- // Zascrollamo do naslednjega podvprasanja
- $("html, body").animate({
- scrollTop: $(podvprasanje_current).offset().top
- }, 300, "swing");
- }
- });
+ // Zascrollamo do naslednjega podvprasanja
+ $("html, body").animate({
+ scrollTop: $(podvprasanje_current).offset().top - 50
+ }, 300, "swing");
+
+ }, 100);
}
-// Razpiranje mobilnih tabel - zamenjava puscice
-function mobileMultigridExpandableArrow(el){
-
- var arrow = $(el).parent().find(".mobile_expanding_arrow");
- $(arrow).toggleClass("arrow_down").toggleClass("arrow_up");
- mobileMultigridExpandableData(arrow);
-}
-// Prikazemo/skrijemo text odgovora pod naslovom
-function mobileMultigridExpandableData(arrow){
-
- var result = $(arrow).parent().parent().find(".grid_mobile_result");
+// Razpiranje mobilnih tabel - zamenjava puscice in prikaz rezultata
+function mobileMultigridExpandableArrow(el, show){
- // Dobimo text oznacenega radia in ga zapisemo v result div
- var text = $(arrow).parent().parent().find("input[type=radio]:checked").parent().parent().find(".grid_mobile_variable_title").text();
- $(result).text(text);
+ // Element puscice
+ let arrow = $(el).parent().find(".mobile_expanding_arrow");
- // Glede na puscico prikazemo oz. skrijemo result div
- if($(arrow).hasClass("arrow_down")){
- $(result).show('fast');
- }
- else{
- $(result).hide('fast');
- }
-
+ // Element (div pod naslovom) s trenutno oznacenim textom
+ let result = $(arrow).parent().parent().find(".grid_mobile_result");
+
+ // Dobimo text oznacenega radia in ga zapisemo v result div
+ let text = $(arrow).parent().parent().find("input[type=radio]:checked").parent().parent().find(".grid_mobile_variable_title").text();
+
+ // Razpremo
+ if(show == 1){
+ // Obrnemo puscico
+ $(arrow).removeClass("arrow_down").addClass("arrow_up");
+
+ // Skrijemo text
+ $(result).hide('fast');
+ }
+ // Skrcimo
+ else{
+ // Obrnemo puscico
+ $(arrow).removeClass("arrow_up").addClass("arrow_down");
+
+ // Prikazemo text
+ $(result).text(text).show('fast');
+ }
}
+
// Razpiranje vprasanj v bloku - init
function questionsExpandable(){
@@ -1211,16 +1224,19 @@ function questionExpandableData(spremenljivka){ function continue_later (site_url, lang_id) {
- if ( $('#continue_later').length ) {
-
+ if ( $('#continue_later').length ) {
$('#continue_later').remove();
-
- } else {
- $.post(site_url+'main/survey/ajax.php?a=continue_later&language='+lang_id, {anketa: srv_meta_anketa_id, url: window.location.href}, function (data) {
-
+ }
+ else {
+
+ var url = window.location.href;
+
+ if( $('#panel_url').length )
+ url = $('#panel_url').val();
+
+ $.post(site_url+'main/survey/ajax.php?a=continue_later&language='+lang_id, {anketa: srv_meta_anketa_id, url: url}, function (data) {
$('#continue_later').remove();
$('#container h1').after( data );
-
});
}
}
@@ -1231,17 +1247,22 @@ function continue_later_send (site_url, lang_id) { email = $('#email').val();
$.post(site_url+'main/survey/ajax.php?a=continue_later_send&language='+lang_id, {anketa: srv_meta_anketa_id, url:url, email:email}, function (data) {
-
$('#continue_later').remove();
-
});
+}
+
+function return_edit_send (site_url, lang_id) {
+ url = $('#url').val();
+ email = $('#email').val();
+
+ $.post(site_url+'main/survey/ajax.php?a=return_edit_send&language='+lang_id, {anketa: srv_meta_anketa_id, url:url, email:email}, function (data) {
+ $('#return_edit_email').text(data);
+ });
}
function preview_popup_close () {
- $('#preview-holder, #preview_switch').fadeOut('medium');
-
$('#preview-window').addClass('closed');
$('.preview_icon_open').show();
@@ -1252,8 +1273,6 @@ function preview_popup_close () { function preview_popup_open () {
- $('#preview-holder, #preview_switch').fadeIn('medium');
-
$('#preview-window').removeClass('closed');
$('.preview_icon_open').hide();
@@ -1324,26 +1343,6 @@ function init_comments_save () { }();
}
-// respondent se strinja z uporabo piskotkov
-function cookie_ok () {
-
- $.post(srv_site_url+'main/survey/ajax.php?a=cookie_ok', {anketa: srv_meta_anketa_id}, function (data) {
- window.location.reload();
- });
-
- return false;
-}
-
-function cookie_check() {
-
- if ( $('#cookie_alert').css('display') == 'block' ) {
- alert(lang['srv_cookie_continue_alert']);
- return false;
- }
-
- $('#container form').submit();
-}
-
function privacy_check() {
if ( $('#privacy_box').length ) {
@@ -1757,6 +1756,27 @@ function hide_gdpr_about(){ $('#popup').removeClass('gdpr_about');
}
+
+// popup "pogoji uporabe" pri modulu email dostop (mju)
+function show_email_access_terms() {
+
+ $('#popup').addClass('email_access_terms');
+
+ $('#popup').load(srv_site_url+'main/survey/ajax.php?a=show_email_access_terms', {anketa: srv_meta_anketa_id}, function(){
+ $('#fade').fadeTo('fast', 0.5, function(){
+ $('#popup').fadeIn("fast");
+ });
+ });
+}
+function hide_email_access_terms(){
+
+ $('#fade').fadeOut();
+ $('#popup').hide();
+
+ $('#popup').removeClass('email_access_terms');
+}
+
+
/**
* Show notification, that respondent has reached maximum number of chars
* @param {type} input - input or textarea
@@ -1776,7 +1796,11 @@ function handleMaxTextParam(input, sid){ * @returns {undefined}
*/
function charCounter(field){
- document.getElementById(field.id+'_counter').innerHTML = field.value.length;
+
+ var char_counter = field.value.length;
+ char_counter = (char_counter == 0) ? '' : char_counter;
+
+ $('#'+field.id+'_counter').html(char_counter);
}
/**
@@ -1785,7 +1809,11 @@ function charCounter(field){ * @returns {undefined}
*/
function set_charCounter(field_id){
- document.getElementById(field_id+'_counter').innerHTML = document.getElementById(field_id).value.length;
+
+ var char_counter = $('#'+field_id).val().length;
+ char_counter = (char_counter == 0) ? '' : char_counter;
+
+ $('#'+field_id+'_counter').html(char_counter);
}
@@ -1883,11 +1911,13 @@ function gridRepeatHeader(repeat_every, spr_id){ // Za tabelo najprej pobrisemo vse ponovljene vrstice ce so ze prisotne
$(table).find('tbody tr.repeat_header').remove();
+ var count_rows = $(table).find("tbody tr:visible").size();
+
// Loopamo cez vidne vrstice in vstavimo header vsakih "repeat_every" vrstic
$(table).find("tbody tr:visible").each(function(index) {
// Insetamo naslovno vrstico na pravo mesto
- if((index+1) % repeat_every == 0){
+ if((index+1) % repeat_every == 0 && count_rows > (index+1)){
$(this).after(table_header);
}
});
@@ -1914,7 +1944,7 @@ function checkUpload(upload, id){ // File extensions allowed
- let extAllowed = ["jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx"];
+ let extAllowed = ["jpeg", "jpg", "png", "gif", "pdf", "doc", "docx", "xls", "xlsx", "ppt", "pptx", "zip", "rar", "rdata", "rds", "rmd", "qmd"];
// Get file ext
let fileNameFull = upload.files[0].name;
@@ -1969,3 +1999,21 @@ function disableSubsequentAnswers(){ });
}
+
+// Preverimo, ce je vnesel mail za posiljanje url-ja za nadaljevanje kasneje in je pozabil klikniti "poslji"
+function continueLaterCheckEmail(alert_text, callback) {
+
+ let close_survey = true;
+
+ if($('#return_edit_email').find('input#email').length && $('#return_edit_email').find('input#email').val() != ''){
+
+ if (!confirm(alert_text)){
+ close_survey = false;
+ }
+ }
+
+ // Zapremo anketo, ker itak ni vnesel maila
+ if (close_survey) {
+ callback();
+ }
+}
\ No newline at end of file diff --git a/main/survey/sa_koda.php b/main/survey/sa_koda.php index b7d00b6..8cbc54d 100644 --- a/main/survey/sa_koda.php +++ b/main/survey/sa_koda.php @@ -10,7 +10,7 @@ include_once('../../function.php'); if (!empty($_POST['koda'])) {
$koda = strtolower($_POST['koda']);
- $sql = sisplet_query("SELECT url, anketa_id FROM srv_hierarhija_koda WHERE koda='" . $koda . "'");
+ $sql = sisplet_query("SELECT h.url, h.anketa_id, a.hash FROM srv_hierarhija_koda h, srv_anketa a WHERE h.koda='".$koda."' AND h.anketa_id=a.id");
if ($sql->num_rows > 0) {
$row = $sql->fetch_object();
@@ -19,7 +19,7 @@ if (!empty($_POST['koda'])) { $url_encode_spremenljivke = urlencode(base64_encode($row->url));
//celotni url do ankete
- header("Location: " . $site_url . "a/" . $row->anketa_id . "?enc=" . $url_encode_spremenljivke);
+ header("Location: " . $site_url . "a/" . $row->hash . "?enc=" . $url_encode_spremenljivke);
die();
}
@@ -35,7 +35,7 @@ if (!empty($_POST['koda'])) { $url_encode_spremenljivke = urlencode(base64_encode($koda_resevanje->url . '&supersifra=' . $koda.'&resujem=0'));
//celotni url do ankete
- header("Location: " . $site_url . "a/" . $row->anketa_id . "?enc=" . $url_encode_spremenljivke);
+ header("Location: " . $site_url . "a/" . $row->hash . "?enc=" . $url_encode_spremenljivke);
die();
}
diff --git a/main/survey/skins/1kaBlack.css b/main/survey/skins/1kaBlack.css index 48698bd..39958bc 100644 --- a/main/survey/skins/1kaBlack.css +++ b/main/survey/skins/1kaBlack.css @@ -6,13 +6,14 @@ /*
Osnovna tema ankete - 1ka - brez definiranih barv
*/
+/* Barve */
/* Fonti */
body {
margin: 0;
padding: 0;
- color: #505050;
+ color: #333333;
font-size: 100%;
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
background: #ffffff;
}
@@ -28,13 +29,15 @@ body.preview, body.testdata { position: absolute;
width: 100%;
height: 80px;
- border-bottom: 6px #333333 solid;
+ border-bottom: 2px #333333 solid;
}
#outercontainer #container {
position: relative;
width: 100%;
max-width: 1200px;
- margin: 0px auto 10px;
+ margin: 0px auto;
+ padding: 0 16px;
+ box-sizing: border-box;
}
/* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata { /* Header - logo, naslov, progressbar */
h1 {
- margin: 0px auto 30px;
- padding: 120px 0 50px 0;
- font-size: 28px;
+ margin: 0px auto;
+ padding: 114px 0 32px 0;
+ font-size: 32px;
+ font-weight: 600;
+ line-height: 40px;
color: #333333;
text-align: center;
- border-bottom: 1px solid #eaeaea;
+ border-bottom: 1px solid #E5E5E5;
}
h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija { #logo {
right: auto;
- left: 25px;
+ left: 16px;
top: 13px;
max-height: 56px !important;
- background: url("../../../public/img/logo/1ka_slo.svg");
+ background: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat !important;
background-size: auto 100% !important;
}
@@ -96,7 +101,19 @@ h1.evalvacija { }
#logo.english {
- background: url("../../../public/img/logo/1ka_eng.svg");
+ background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+ background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+ background: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
.header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija { left: auto;
}
.header_settings_holder .progress_bar span {
- float: left !important;
- /* ie6,7 doesnt support inline-block */
+ float: left !important; /* ie6,7 doesnt support inline-block */
display: block;
width: 20px;
- font-size: 11px;
+ font-size: 14px;
+ line-height: 16px;
color: #6D87AF;
}
.header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija { color: #595959;
}
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+ margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+ margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+ padding: 7px 20px;
+ margin-left: 4px;
+}
+
/* Spremenljivke */
.spremenljivka {
- margin: 20px 10px 20px 10px;
- padding: 20px 2px 50px 12px !important;
- border-bottom: 1px #eaeaea solid;
+ margin: 0;
+ padding: 48px 16px !important;
+ border-bottom: 1px #E5E5E5 solid;
}
.spremenljivka .naslov {
- padding: 5px 0 15px 5px;
- font-size: 18px;
+ padding: 0 !important;
+ margin: 0 0 24px 0;
+ font-size: 20px;
font-weight: 600;
}
.spremenljivka .naslov .spremenljivka_info {
font-size: 14px;
font-weight: 400;
- padding-top: 7px;
+ padding-top: 8px;
}
.spremenljivka .sequence_number {
background-color: #eaeaea;
@@ -183,6 +217,10 @@ h1.evalvacija { .spremenljivka .arrow:hover {
color: #595959;
}
+.spremenljivka span.reminder {
+ left: 3px;
+ text-indent: 0;
+}
.spremenljivka.limited {
outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija { outline: 1px #F15A24 solid;
}
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+ display: flex;
+ align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+ margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+ display: flex;
+ line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+ margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+ display: inline-block;
+ margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+ display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+ margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+ margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+ padding: 0;
+}
+
div.variabla,
td.variabla,
td.question,
td.differential,
.variabla_sum label {
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder {
- padding: 10px 0 0 0;
+ padding: 0 !important;
+}
+div.variable_holder .variabla {
+ padding: 0;
+ margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+ margin-bottom: 0;
}
div.variable_holder thead,
div.variable_holder tr.table-header {
font-weight: normal;
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder thead td,
div.variable_holder tr.table-header td {
padding: 10px 5px;
}
-table.grid_table thead tr td {
- border-bottom: 2px #444444 solid;
-}
-table.grid_table thead tr.middle_row td {
- border-top: 2px #444444 solid;
-}
table.grid_table tbody tr.table-header td {
- border-bottom: 2px #444444 solid;
border-top: 2px #444444 solid;
background-color: #ffffff;
}
table.grid_table tbody tr:nth-child(2n+1) {
- background-color: #ffffff;
+ background-color: #eaeaea;
}
table.grid_table tbody tr:nth-child(2n) {
- background-color: #eaeaea;
+ background-color: #ffffff;
}
table.grid_table td {
- padding: 10px 10px;
-}
-
-span.reminder {
- left: 3px;
+ padding: 12px 16px;
}
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select { /* ranking */
.dropzone {
- border-top: 1px #eaeaea solid;
margin-top: 12px;
padding-top: 17px;
}
@@ -273,8 +352,8 @@ table.ranking_table ul { .frame_dropping,
.frame_dropping_hover,
.frame_moving {
- font-size: 13px;
- padding: 7px 10px 9px;
+ font-size: 16px;
+ padding: 8px 12px 14px;
border: 2px solid #333333;
background-color: #ffffff;
}
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover { }
table.ranking_table b {
- font-size: 13px;
+ font-size: 16px;
font-weight: 600;
}
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Slider */
.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
- color: #505050;
+ color: #333333;
}
.grupa .spremenljivka .slider.ui-widget-content {
/*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { }
.grupa .spremenljivka .sliderText {
padding-top: 2px;
- color: #505050;
+ color: #333333;
background-color: #444444;
border: 0;
}
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Gumbi na dnu */
div.buttons {
- padding: 20px 20px 35px;
- margin: 0 10px;
+ padding: 64px 0;
+ margin: 0;
}
div.buttons input {
cursor: pointer;
margin: 8px 10px;
- /*padding: 7px 11px;*/
- padding: 10px 20px;
+ padding: 0 32px;
+ height: 40px;
text-align: center;
- font-size: 12px;
- letter-spacing: 1px;
+ font-size: 16px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
div.buttons input.next {
background-color: #333333;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus { /* Footer */
#footer_survey {
- padding: 40px;
+ padding: 48px 0 64px 0;
background-color: #ffffff;
- border-top: 1px #eaeaea solid;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey p, #footer_survey a, #footer_survey a:visited {
- color: #505050;
+ color: #333333;
font-size: 14px;
line-height: 25px;
font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus { }
.frame_dropping_titles {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
border-top: 2px solid #b9c5d9;
border-left: 2px solid #b9c5d9;
border-right: 2px solid #b9c5d9;
- font-size: 13px;
+ font-size: 16px;
}
.drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus { }
.frame_dropping_titles_box {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
- font-size: 13px;
+ font-size: 16px;
}
.frame_dropping {
+ width: 234px;
padding: 7px 10px 9px;
}
diff --git a/main/survey/skins/1kaBlue.css b/main/survey/skins/1kaBlue.css index 06bba47..f2d783c 100644 --- a/main/survey/skins/1kaBlue.css +++ b/main/survey/skins/1kaBlue.css @@ -6,13 +6,14 @@ /*
Osnovna tema ankete - 1ka - brez definiranih barv
*/
+/* Barve */
/* Fonti */
body {
margin: 0;
padding: 0;
- color: #505050;
+ color: #333333;
font-size: 100%;
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
background: #ffffff;
}
@@ -28,13 +29,15 @@ body.preview, body.testdata { position: absolute;
width: 100%;
height: 80px;
- border-bottom: 6px #1e88e5 solid;
+ border-bottom: 2px #1e88e5 solid;
}
#outercontainer #container {
position: relative;
width: 100%;
max-width: 1200px;
- margin: 0px auto 10px;
+ margin: 0px auto;
+ padding: 0 16px;
+ box-sizing: border-box;
}
/* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata { /* Header - logo, naslov, progressbar */
h1 {
- margin: 0px auto 30px;
- padding: 120px 0 50px 0;
- font-size: 28px;
+ margin: 0px auto;
+ padding: 114px 0 32px 0;
+ font-size: 32px;
+ font-weight: 600;
+ line-height: 40px;
color: #1e88e5;
text-align: center;
- border-bottom: 1px solid #ddeffd;
+ border-bottom: 1px solid #E5E5E5;
}
h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija { #logo {
right: auto;
- left: 25px;
+ left: 16px;
top: 13px;
max-height: 56px !important;
- background: url("../../../public/img/logo/1ka_slo.svg");
+ background: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat !important;
background-size: auto 100% !important;
}
@@ -96,7 +101,19 @@ h1.evalvacija { }
#logo.english {
- background: url("../../../public/img/logo/1ka_eng.svg");
+ background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+ background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+ background: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
.header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija { left: auto;
}
.header_settings_holder .progress_bar span {
- float: left !important;
- /* ie6,7 doesnt support inline-block */
+ float: left !important; /* ie6,7 doesnt support inline-block */
display: block;
width: 20px;
- font-size: 11px;
+ font-size: 14px;
+ line-height: 16px;
color: #6D87AF;
}
.header_settings_holder .progress_bar div {
@@ -129,43 +146,60 @@ h1.evalvacija { text-decoration: none;
}
.header_settings_holder .progress_bar p a:hover {
- color: #ffa608;
+ color: #1360a4;
}
.header_settings_holder .continue_later_setting a {
color: #1e88e5;
}
.header_settings_holder .continue_later_setting a:hover {
- color: #ffa608;
+ color: #1360a4;
}
.header_settings_holder .tawk_chat a {
color: #1e88e5;
}
.header_settings_holder .tawk_chat a:hover {
- color: #ffa608;
+ color: #1360a4;
+}
+
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+ margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+ margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+ padding: 7px 20px;
+ margin-left: 4px;
}
/* Spremenljivke */
.spremenljivka {
- margin: 20px 10px 20px 10px;
- padding: 20px 2px 50px 12px !important;
- border-bottom: 1px #ddeffd solid;
+ margin: 0;
+ padding: 48px 16px !important;
+ border-bottom: 1px #E5E5E5 solid;
}
.spremenljivka .naslov {
- padding: 5px 0 15px 5px;
- font-size: 18px;
+ padding: 0 !important;
+ margin: 0 0 24px 0;
+ font-size: 20px;
font-weight: 600;
}
.spremenljivka .naslov .spremenljivka_info {
font-size: 14px;
font-weight: 400;
- padding-top: 7px;
+ padding-top: 8px;
}
.spremenljivka .sequence_number {
- background-color: #ddeffd;
+ background-color: #F1F8FD;
color: #42A5F5;
}
.spremenljivka .sequence_number:hover {
- background-color: #add8fb;
+ background-color: #c4e2f7;
}
.spremenljivka .sequence_number.active {
background-color: #42A5F5;
@@ -181,7 +215,11 @@ h1.evalvacija { color: #1e88e5;
}
.spremenljivka .arrow:hover {
- color: #ffa608;
+ color: #1360a4;
+}
+.spremenljivka span.reminder {
+ left: 3px;
+ text-indent: 0;
}
.spremenljivka.limited {
@@ -192,55 +230,97 @@ h1.evalvacija { outline: 1px #F15A24 solid;
}
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+ display: flex;
+ align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+ margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+ display: flex;
+ line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+ margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+ display: inline-block;
+ margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+ display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+ margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+ margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+ padding: 0;
+}
+
div.variabla,
td.variabla,
td.question,
td.differential,
.variabla_sum label {
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder {
- padding: 10px 0 0 0;
+ padding: 0 !important;
+}
+div.variable_holder .variabla {
+ padding: 0;
+ margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+ margin-bottom: 0;
}
div.variable_holder thead,
div.variable_holder tr.table-header {
font-weight: normal;
- font-size: 14px;
+ font-size: 16px;
}
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;
+ background-color: #F1F8FD;
}
table.grid_table tbody tr:nth-child(2n) {
- background-color: #ddeffd;
+ background-color: #ffffff;
}
table.grid_table td {
- padding: 10px 10px;
-}
-
-span.reminder {
- left: 3px;
+ padding: 12px 16px;
}
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select { /* ranking */
.dropzone {
- border-top: 1px #ddeffd solid;
margin-top: 12px;
padding-top: 17px;
}
@@ -273,8 +352,8 @@ table.ranking_table ul { .frame_dropping,
.frame_dropping_hover,
.frame_moving {
- font-size: 13px;
- padding: 7px 10px 9px;
+ font-size: 16px;
+ padding: 8px 12px 14px;
border: 2px solid #1e88e5;
background-color: #ffffff;
}
@@ -285,7 +364,7 @@ table.ranking_table ul { div.variable_holder .frame_ranking_hover {
border: 2px #1e88e5 solid;
- background-color: #ddeffd;
+ background-color: #F1F8FD;
}
div.variable_holder .frame_ranking,
@@ -294,11 +373,11 @@ div.variable_holder .frame_dropping, div.variable_holder .frame_dropping_hover {
text-indent: -35px;
border: 2px #42A5F5 solid;
- background-color: #ddeffd;
+ background-color: #F1F8FD;
}
table.ranking_table b {
- font-size: 13px;
+ font-size: 16px;
font-weight: 600;
}
@@ -310,10 +389,10 @@ button.record_foto::before { color: #1e88e5;
}
button.record_foto:hover, button.record_foto:focus {
- border-color: #ffa608;
+ border-color: #1360a4;
}
button.record_foto:hover::before, button.record_foto:focus::before {
- color: #ffa608;
+ color: #1360a4;
}
/* Koledar */
@@ -325,12 +404,12 @@ button.ui-datepicker-trigger { color: #1e88e5;
}
button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
- color: #ffa608;
+ color: #1360a4;
}
/* Slider */
.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
- color: #505050;
+ color: #333333;
}
.grupa .spremenljivka .slider.ui-widget-content {
/*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { }
.grupa .spremenljivka .sliderText {
padding-top: 2px;
- color: #505050;
+ color: #333333;
background-color: #42A5F5;
border: 0;
}
@@ -375,7 +454,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { text-align: center;
font-size: 11px;
line-height: 14px;
- background-color: #ddeffd;
+ background-color: #F1F8FD;
border: 2px solid red;
padding: 4px 7px;
border-radius: 4px;
@@ -384,29 +463,28 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Gumbi na dnu */
div.buttons {
- padding: 20px 20px 35px;
- margin: 0 10px;
+ padding: 64px 0;
+ margin: 0;
}
div.buttons input {
cursor: pointer;
margin: 8px 10px;
- /*padding: 7px 11px;*/
- padding: 10px 20px;
+ padding: 0 32px;
+ height: 40px;
text-align: center;
- font-size: 12px;
- letter-spacing: 1px;
+ font-size: 16px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
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;
+ background-color: #1360a4;
+ border: 1px solid #1360a4;
}
div.buttons input.prev {
color: #1e88e5;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus { /* Footer */
#footer_survey {
- padding: 40px;
+ padding: 48px 0 64px 0;
background-color: #ffffff;
- border-top: 1px #ddeffd solid;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey p, #footer_survey a, #footer_survey a:visited {
- color: #505050;
+ color: #333333;
font-size: 14px;
line-height: 25px;
font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus { }
.frame_dropping_titles {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
border-top: 2px solid #b9c5d9;
border-left: 2px solid #b9c5d9;
border-right: 2px solid #b9c5d9;
- font-size: 13px;
+ font-size: 16px;
}
.drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus { }
.frame_dropping_titles_box {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
- font-size: 13px;
+ font-size: 16px;
}
.frame_dropping {
+ width: 234px;
padding: 7px 10px 9px;
}
diff --git a/main/survey/skins/1kaGreen.css b/main/survey/skins/1kaGreen.css index 10b97fb..4c24857 100644 --- a/main/survey/skins/1kaGreen.css +++ b/main/survey/skins/1kaGreen.css @@ -6,13 +6,14 @@ /*
Osnovna tema ankete - 1ka - brez definiranih barv
*/
+/* Barve */
/* Fonti */
body {
margin: 0;
padding: 0;
- color: #505050;
+ color: #333333;
font-size: 100%;
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
background: #ffffff;
}
@@ -28,13 +29,15 @@ body.preview, body.testdata { position: absolute;
width: 100%;
height: 80px;
- border-bottom: 6px #2e7d3a solid;
+ border-bottom: 2px #2e7d3a solid;
}
#outercontainer #container {
position: relative;
width: 100%;
max-width: 1200px;
- margin: 0px auto 10px;
+ margin: 0px auto;
+ padding: 0 16px;
+ box-sizing: border-box;
}
/* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata { /* Header - logo, naslov, progressbar */
h1 {
- margin: 0px auto 30px;
- padding: 120px 0 50px 0;
- font-size: 28px;
+ margin: 0px auto;
+ padding: 114px 0 32px 0;
+ font-size: 32px;
+ font-weight: 600;
+ line-height: 40px;
color: #2e7d3a;
text-align: center;
- border-bottom: 1px solid #e2f2e2;
+ border-bottom: 1px solid #E5E5E5;
}
h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija { #logo {
right: auto;
- left: 25px;
+ left: 16px;
top: 13px;
max-height: 56px !important;
- background: url("../../../public/img/logo/1ka_slo.svg");
+ background: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat !important;
background-size: auto 100% !important;
}
@@ -96,7 +101,19 @@ h1.evalvacija { }
#logo.english {
- background: url("../../../public/img/logo/1ka_eng.svg");
+ background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+ background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+ background: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
.header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija { left: auto;
}
.header_settings_holder .progress_bar span {
- float: left !important;
- /* ie6,7 doesnt support inline-block */
+ float: left !important; /* ie6,7 doesnt support inline-block */
display: block;
width: 20px;
- font-size: 11px;
+ font-size: 14px;
+ line-height: 16px;
color: #6D87AF;
}
.header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija { color: #43b554;
}
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+ margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+ margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+ padding: 7px 20px;
+ margin-left: 4px;
+}
+
/* Spremenljivke */
.spremenljivka {
- margin: 20px 10px 20px 10px;
- padding: 20px 2px 50px 12px !important;
- border-bottom: 1px #e2f2e2 solid;
+ margin: 0;
+ padding: 48px 16px !important;
+ border-bottom: 1px #E5E5E5 solid;
}
.spremenljivka .naslov {
- padding: 5px 0 15px 5px;
- font-size: 18px;
+ padding: 0 !important;
+ margin: 0 0 24px 0;
+ font-size: 20px;
font-weight: 600;
}
.spremenljivka .naslov .spremenljivka_info {
font-size: 14px;
font-weight: 400;
- padding-top: 7px;
+ padding-top: 8px;
}
.spremenljivka .sequence_number {
background-color: #e2f2e2;
@@ -183,6 +217,10 @@ h1.evalvacija { .spremenljivka .arrow:hover {
color: #43b554;
}
+.spremenljivka span.reminder {
+ left: 3px;
+ text-indent: 0;
+}
.spremenljivka.limited {
outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija { outline: 1px #F15A24 solid;
}
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+ display: flex;
+ align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+ margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+ display: flex;
+ line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+ margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+ display: inline-block;
+ margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+ display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+ margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+ margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+ padding: 0;
+}
+
div.variabla,
td.variabla,
td.question,
td.differential,
.variabla_sum label {
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder {
- padding: 10px 0 0 0;
+ padding: 0 !important;
+}
+div.variable_holder .variabla {
+ padding: 0;
+ margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+ margin-bottom: 0;
}
div.variable_holder thead,
div.variable_holder tr.table-header {
font-weight: normal;
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder thead td,
div.variable_holder tr.table-header td {
padding: 10px 5px;
}
-table.grid_table thead tr td {
- border-bottom: 2px #66bb6a solid;
-}
-table.grid_table thead tr.middle_row td {
- border-top: 2px #66bb6a solid;
-}
table.grid_table tbody tr.table-header td {
- border-bottom: 2px #66bb6a solid;
border-top: 2px #66bb6a solid;
background-color: #ffffff;
}
table.grid_table tbody tr:nth-child(2n+1) {
- background-color: #ffffff;
+ background-color: #e2f2e2;
}
table.grid_table tbody tr:nth-child(2n) {
- background-color: #e2f2e2;
+ background-color: #ffffff;
}
table.grid_table td {
- padding: 10px 10px;
-}
-
-span.reminder {
- left: 3px;
+ padding: 12px 16px;
}
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select { /* ranking */
.dropzone {
- border-top: 1px #e2f2e2 solid;
margin-top: 12px;
padding-top: 17px;
}
@@ -273,8 +352,8 @@ table.ranking_table ul { .frame_dropping,
.frame_dropping_hover,
.frame_moving {
- font-size: 13px;
- padding: 7px 10px 9px;
+ font-size: 16px;
+ padding: 8px 12px 14px;
border: 2px solid #2e7d3a;
background-color: #ffffff;
}
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover { }
table.ranking_table b {
- font-size: 13px;
+ font-size: 16px;
font-weight: 600;
}
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Slider */
.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
- color: #505050;
+ color: #333333;
}
.grupa .spremenljivka .slider.ui-widget-content {
/*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { }
.grupa .spremenljivka .sliderText {
padding-top: 2px;
- color: #505050;
+ color: #333333;
background-color: #66bb6a;
border: 0;
}
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Gumbi na dnu */
div.buttons {
- padding: 20px 20px 35px;
- margin: 0 10px;
+ padding: 64px 0;
+ margin: 0;
}
div.buttons input {
cursor: pointer;
margin: 8px 10px;
- /*padding: 7px 11px;*/
- padding: 10px 20px;
+ padding: 0 32px;
+ height: 40px;
text-align: center;
- font-size: 12px;
- letter-spacing: 1px;
+ font-size: 16px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
div.buttons input.next {
background-color: #2e7d3a;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus { /* Footer */
#footer_survey {
- padding: 40px;
+ padding: 48px 0 64px 0;
background-color: #ffffff;
- border-top: 1px #e2f2e2 solid;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey p, #footer_survey a, #footer_survey a:visited {
- color: #505050;
+ color: #333333;
font-size: 14px;
line-height: 25px;
font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus { }
.frame_dropping_titles {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
border-top: 2px solid #b9c5d9;
border-left: 2px solid #b9c5d9;
border-right: 2px solid #b9c5d9;
- font-size: 13px;
+ font-size: 16px;
}
.drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus { }
.frame_dropping_titles_box {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
- font-size: 13px;
+ font-size: 16px;
}
.frame_dropping {
+ width: 234px;
padding: 7px 10px 9px;
}
diff --git a/main/survey/skins/1kaGrey.css b/main/survey/skins/1kaGrey.css index 7a981e1..5612a57 100644 --- a/main/survey/skins/1kaGrey.css +++ b/main/survey/skins/1kaGrey.css @@ -182,7 +182,7 @@ table.grid_table td { /* ranking */
.dropzone{
- border-top: 1px #dfe2e7 solid;
+ /* border-top: 1px #dfe2e7 solid; */
margin-top: 12px;
padding-top: 17px;
}
diff --git a/main/survey/skins/1kaNature.css b/main/survey/skins/1kaNature.css index 7103d81..61552da 100644 --- a/main/survey/skins/1kaNature.css +++ b/main/survey/skins/1kaNature.css @@ -6,13 +6,14 @@ /*
Osnovna tema ankete - 1ka - brez definiranih barv
*/
+/* Barve */
/* Fonti */
body {
margin: 0;
padding: 0;
- color: #505050;
+ color: #333333;
font-size: 100%;
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
background: #ffffff;
}
@@ -28,13 +29,15 @@ body.preview, body.testdata { position: absolute;
width: 100%;
height: 80px;
- border-bottom: 6px #1e88e5 solid;
+ border-bottom: 2px #1e88e5 solid;
}
#outercontainer #container {
position: relative;
width: 100%;
max-width: 1200px;
- margin: 0px auto 10px;
+ margin: 0px auto;
+ padding: 0 16px;
+ box-sizing: border-box;
}
/* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata { /* Header - logo, naslov, progressbar */
h1 {
- margin: 0px auto 30px;
- padding: 120px 0 50px 0;
- font-size: 28px;
+ margin: 0px auto;
+ padding: 114px 0 32px 0;
+ font-size: 32px;
+ font-weight: 600;
+ line-height: 40px;
color: #505050;
text-align: center;
- border-bottom: 1px solid #ddeffd;
+ border-bottom: 1px solid #E5E5E5;
}
h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija { #logo {
right: auto;
- left: 25px;
+ left: 16px;
top: 13px;
max-height: 56px !important;
- background: url("../../../public/img/logo/1ka_slo.svg");
+ background: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat !important;
background-size: auto 100% !important;
}
@@ -96,7 +101,19 @@ h1.evalvacija { }
#logo.english {
- background: url("../../../public/img/logo/1ka_eng.svg");
+ background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+ background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+ background: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
.header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija { left: auto;
}
.header_settings_holder .progress_bar span {
- float: left !important;
- /* ie6,7 doesnt support inline-block */
+ float: left !important; /* ie6,7 doesnt support inline-block */
display: block;
width: 20px;
- font-size: 11px;
+ font-size: 14px;
+ line-height: 16px;
color: #6D87AF;
}
.header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija { color: #ffa608;
}
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+ margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+ margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+ padding: 7px 20px;
+ margin-left: 4px;
+}
+
/* Spremenljivke */
.spremenljivka {
- margin: 20px 10px 20px 10px;
- padding: 20px 2px 50px 12px !important;
- border-bottom: 1px #ddeffd solid;
+ margin: 0;
+ padding: 48px 16px !important;
+ border-bottom: 1px #E5E5E5 solid;
}
.spremenljivka .naslov {
- padding: 5px 0 15px 5px;
- font-size: 18px;
+ padding: 0 !important;
+ margin: 0 0 24px 0;
+ font-size: 20px;
font-weight: 600;
}
.spremenljivka .naslov .spremenljivka_info {
font-size: 14px;
font-weight: 400;
- padding-top: 7px;
+ padding-top: 8px;
}
.spremenljivka .sequence_number {
background-color: #ddeffd;
@@ -183,6 +217,10 @@ h1.evalvacija { .spremenljivka .arrow:hover {
color: #ffa608;
}
+.spremenljivka span.reminder {
+ left: 3px;
+ text-indent: 0;
+}
.spremenljivka.limited {
outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija { outline: 1px #F15A24 solid;
}
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+ display: flex;
+ align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+ margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+ display: flex;
+ line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+ margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+ display: inline-block;
+ margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+ display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+ margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+ margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+ padding: 0;
+}
+
div.variabla,
td.variabla,
td.question,
td.differential,
.variabla_sum label {
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder {
- padding: 10px 0 0 0;
+ padding: 0 !important;
+}
+div.variable_holder .variabla {
+ padding: 0;
+ margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+ margin-bottom: 0;
}
div.variable_holder thead,
div.variable_holder tr.table-header {
font-weight: normal;
- font-size: 14px;
+ font-size: 16px;
}
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;
+ background-color: #ddeffd;
}
table.grid_table tbody tr:nth-child(2n) {
- background-color: #ddeffd;
+ background-color: #ffffff;
}
table.grid_table td {
- padding: 10px 10px;
-}
-
-span.reminder {
- left: 3px;
+ padding: 12px 16px;
}
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select { /* ranking */
.dropzone {
- border-top: 1px #ddeffd solid;
margin-top: 12px;
padding-top: 17px;
}
@@ -273,8 +352,8 @@ table.ranking_table ul { .frame_dropping,
.frame_dropping_hover,
.frame_moving {
- font-size: 13px;
- padding: 7px 10px 9px;
+ font-size: 16px;
+ padding: 8px 12px 14px;
border: 2px solid #1e88e5;
background-color: #ffffff;
}
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover { }
table.ranking_table b {
- font-size: 13px;
+ font-size: 16px;
font-weight: 600;
}
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Slider */
.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
- color: #505050;
+ color: #333333;
}
.grupa .spremenljivka .slider.ui-widget-content {
/*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { }
.grupa .spremenljivka .sliderText {
padding-top: 2px;
- color: #505050;
+ color: #333333;
background-color: #42A5F5;
border: 0;
}
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Gumbi na dnu */
div.buttons {
- padding: 20px 20px 35px;
- margin: 0 10px;
+ padding: 64px 0;
+ margin: 0;
}
div.buttons input {
cursor: pointer;
margin: 8px 10px;
- /*padding: 7px 11px;*/
- padding: 10px 20px;
+ padding: 0 32px;
+ height: 40px;
text-align: center;
- font-size: 12px;
- letter-spacing: 1px;
+ font-size: 16px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
div.buttons input.next {
background-color: #1e88e5;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus { /* Footer */
#footer_survey {
- padding: 40px;
+ padding: 48px 0 64px 0;
background-color: #ffffff;
- border-top: 1px #ddeffd solid;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey p, #footer_survey a, #footer_survey a:visited {
- color: #505050;
+ color: #333333;
font-size: 14px;
line-height: 25px;
font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus { }
.frame_dropping_titles {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
border-top: 2px solid #b9c5d9;
border-left: 2px solid #b9c5d9;
border-right: 2px solid #b9c5d9;
- font-size: 13px;
+ font-size: 16px;
}
.drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus { }
.frame_dropping_titles_box {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
- font-size: 13px;
+ font-size: 16px;
}
.frame_dropping {
+ width: 234px;
padding: 7px 10px 9px;
}
diff --git a/main/survey/skins/1kaOffice.css b/main/survey/skins/1kaOffice.css index d15f058..e4fac17 100644 --- a/main/survey/skins/1kaOffice.css +++ b/main/survey/skins/1kaOffice.css @@ -6,13 +6,14 @@ /*
Osnovna tema ankete - 1ka - brez definiranih barv
*/
+/* Barve */
/* Fonti */
body {
margin: 0;
padding: 0;
- color: #505050;
+ color: #333333;
font-size: 100%;
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
background: #ffffff;
}
@@ -28,13 +29,15 @@ body.preview, body.testdata { position: absolute;
width: 100%;
height: 80px;
- border-bottom: 6px #1e88e5 solid;
+ border-bottom: 2px #1e88e5 solid;
}
#outercontainer #container {
position: relative;
width: 100%;
max-width: 1200px;
- margin: 0px auto 10px;
+ margin: 0px auto;
+ padding: 0 16px;
+ box-sizing: border-box;
}
/* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata { /* Header - logo, naslov, progressbar */
h1 {
- margin: 0px auto 30px;
- padding: 120px 0 50px 0;
- font-size: 28px;
+ margin: 0px auto;
+ padding: 114px 0 32px 0;
+ font-size: 32px;
+ font-weight: 600;
+ line-height: 40px;
color: #505050;
text-align: center;
- border-bottom: 1px solid #ddeffd;
+ border-bottom: 1px solid #E5E5E5;
}
h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija { #logo {
right: auto;
- left: 25px;
+ left: 16px;
top: 13px;
max-height: 56px !important;
- background: url("../../../public/img/logo/1ka_slo.svg");
+ background: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat !important;
background-size: auto 100% !important;
}
@@ -96,7 +101,19 @@ h1.evalvacija { }
#logo.english {
- background: url("../../../public/img/logo/1ka_eng.svg");
+ background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+ background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+ background: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
.header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija { left: auto;
}
.header_settings_holder .progress_bar span {
- float: left !important;
- /* ie6,7 doesnt support inline-block */
+ float: left !important; /* ie6,7 doesnt support inline-block */
display: block;
width: 20px;
- font-size: 11px;
+ font-size: 14px;
+ line-height: 16px;
color: #6D87AF;
}
.header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija { color: #ffa608;
}
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+ margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+ margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+ padding: 7px 20px;
+ margin-left: 4px;
+}
+
/* Spremenljivke */
.spremenljivka {
- margin: 20px 10px 20px 10px;
- padding: 20px 2px 50px 12px !important;
- border-bottom: 1px #ddeffd solid;
+ margin: 0;
+ padding: 48px 16px !important;
+ border-bottom: 1px #E5E5E5 solid;
}
.spremenljivka .naslov {
- padding: 5px 0 15px 5px;
- font-size: 18px;
+ padding: 0 !important;
+ margin: 0 0 24px 0;
+ font-size: 20px;
font-weight: 600;
}
.spremenljivka .naslov .spremenljivka_info {
font-size: 14px;
font-weight: 400;
- padding-top: 7px;
+ padding-top: 8px;
}
.spremenljivka .sequence_number {
background-color: #ddeffd;
@@ -183,6 +217,10 @@ h1.evalvacija { .spremenljivka .arrow:hover {
color: #ffa608;
}
+.spremenljivka span.reminder {
+ left: 3px;
+ text-indent: 0;
+}
.spremenljivka.limited {
outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija { outline: 1px #F15A24 solid;
}
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+ display: flex;
+ align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+ margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+ display: flex;
+ line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+ margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+ display: inline-block;
+ margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+ display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+ margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+ margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+ padding: 0;
+}
+
div.variabla,
td.variabla,
td.question,
td.differential,
.variabla_sum label {
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder {
- padding: 10px 0 0 0;
+ padding: 0 !important;
+}
+div.variable_holder .variabla {
+ padding: 0;
+ margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+ margin-bottom: 0;
}
div.variable_holder thead,
div.variable_holder tr.table-header {
font-weight: normal;
- font-size: 14px;
+ font-size: 16px;
}
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;
+ background-color: #ddeffd;
}
table.grid_table tbody tr:nth-child(2n) {
- background-color: #ddeffd;
+ background-color: #ffffff;
}
table.grid_table td {
- padding: 10px 10px;
-}
-
-span.reminder {
- left: 3px;
+ padding: 12px 16px;
}
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select { /* ranking */
.dropzone {
- border-top: 1px #ddeffd solid;
margin-top: 12px;
padding-top: 17px;
}
@@ -273,8 +352,8 @@ table.ranking_table ul { .frame_dropping,
.frame_dropping_hover,
.frame_moving {
- font-size: 13px;
- padding: 7px 10px 9px;
+ font-size: 16px;
+ padding: 8px 12px 14px;
border: 2px solid #1e88e5;
background-color: #ffffff;
}
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover { }
table.ranking_table b {
- font-size: 13px;
+ font-size: 16px;
font-weight: 600;
}
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Slider */
.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
- color: #505050;
+ color: #333333;
}
.grupa .spremenljivka .slider.ui-widget-content {
/*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { }
.grupa .spremenljivka .sliderText {
padding-top: 2px;
- color: #505050;
+ color: #333333;
background-color: #42A5F5;
border: 0;
}
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Gumbi na dnu */
div.buttons {
- padding: 20px 20px 35px;
- margin: 0 10px;
+ padding: 64px 0;
+ margin: 0;
}
div.buttons input {
cursor: pointer;
margin: 8px 10px;
- /*padding: 7px 11px;*/
- padding: 10px 20px;
+ padding: 0 32px;
+ height: 40px;
text-align: center;
- font-size: 12px;
- letter-spacing: 1px;
+ font-size: 16px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
div.buttons input.next {
background-color: #1e88e5;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus { /* Footer */
#footer_survey {
- padding: 40px;
+ padding: 48px 0 64px 0;
background-color: #ffffff;
- border-top: 1px #ddeffd solid;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey p, #footer_survey a, #footer_survey a:visited {
- color: #505050;
+ color: #333333;
font-size: 14px;
line-height: 25px;
font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus { }
.frame_dropping_titles {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
border-top: 2px solid #b9c5d9;
border-left: 2px solid #b9c5d9;
border-right: 2px solid #b9c5d9;
- font-size: 13px;
+ font-size: 16px;
}
.drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus { }
.frame_dropping_titles_box {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
- font-size: 13px;
+ font-size: 16px;
}
.frame_dropping {
+ width: 234px;
padding: 7px 10px 9px;
}
diff --git a/main/survey/skins/1kaOrange.css b/main/survey/skins/1kaOrange.css index 5d1792c..b33596d 100644 --- a/main/survey/skins/1kaOrange.css +++ b/main/survey/skins/1kaOrange.css @@ -6,13 +6,14 @@ /*
Osnovna tema ankete - 1ka - brez definiranih barv
*/
+/* Barve */
/* Fonti */
body {
margin: 0;
padding: 0;
- color: #505050;
+ color: #333333;
font-size: 100%;
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
background: #ffffff;
}
@@ -28,13 +29,15 @@ body.preview, body.testdata { position: absolute;
width: 100%;
height: 80px;
- border-bottom: 6px #ef6c00 solid;
+ border-bottom: 2px #ef6c00 solid;
}
#outercontainer #container {
position: relative;
width: 100%;
max-width: 1200px;
- margin: 0px auto 10px;
+ margin: 0px auto;
+ padding: 0 16px;
+ box-sizing: border-box;
}
/* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata { /* Header - logo, naslov, progressbar */
h1 {
- margin: 0px auto 30px;
- padding: 120px 0 50px 0;
- font-size: 28px;
+ margin: 0px auto;
+ padding: 114px 0 32px 0;
+ font-size: 32px;
+ font-weight: 600;
+ line-height: 40px;
color: #ef6c00;
text-align: center;
- border-bottom: 1px solid #ffe9c9;
+ border-bottom: 1px solid #E5E5E5;
}
h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija { #logo {
right: auto;
- left: 25px;
+ left: 16px;
top: 13px;
max-height: 56px !important;
- background: url("../../../public/img/logo/1ka_slo.svg");
+ background: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat !important;
background-size: auto 100% !important;
}
@@ -96,7 +101,19 @@ h1.evalvacija { }
#logo.english {
- background: url("../../../public/img/logo/1ka_eng.svg");
+ background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+ background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+ background: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
.header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija { left: auto;
}
.header_settings_holder .progress_bar span {
- float: left !important;
- /* ie6,7 doesnt support inline-block */
+ float: left !important; /* ie6,7 doesnt support inline-block */
display: block;
width: 20px;
- font-size: 11px;
+ font-size: 14px;
+ line-height: 16px;
color: #6D87AF;
}
.header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija { color: #ff943d;
}
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+ margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+ margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+ padding: 7px 20px;
+ margin-left: 4px;
+}
+
/* Spremenljivke */
.spremenljivka {
- margin: 20px 10px 20px 10px;
- padding: 20px 2px 50px 12px !important;
- border-bottom: 1px #ffe9c9 solid;
+ margin: 0;
+ padding: 48px 16px !important;
+ border-bottom: 1px #E5E5E5 solid;
}
.spremenljivka .naslov {
- padding: 5px 0 15px 5px;
- font-size: 18px;
+ padding: 0 !important;
+ margin: 0 0 24px 0;
+ font-size: 20px;
font-weight: 600;
}
.spremenljivka .naslov .spremenljivka_info {
font-size: 14px;
font-weight: 400;
- padding-top: 7px;
+ padding-top: 8px;
}
.spremenljivka .sequence_number {
background-color: #ffe9c9;
@@ -183,6 +217,10 @@ h1.evalvacija { .spremenljivka .arrow:hover {
color: #ff943d;
}
+.spremenljivka span.reminder {
+ left: 3px;
+ text-indent: 0;
+}
.spremenljivka.limited {
outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija { outline: 1px #F15A24 solid;
}
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+ display: flex;
+ align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+ margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+ display: flex;
+ line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+ margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+ display: inline-block;
+ margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+ display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+ margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+ margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+ padding: 0;
+}
+
div.variabla,
td.variabla,
td.question,
td.differential,
.variabla_sum label {
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder {
- padding: 10px 0 0 0;
+ padding: 0 !important;
+}
+div.variable_holder .variabla {
+ padding: 0;
+ margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+ margin-bottom: 0;
}
div.variable_holder thead,
div.variable_holder tr.table-header {
font-weight: normal;
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder thead td,
div.variable_holder tr.table-header td {
padding: 10px 5px;
}
-table.grid_table thead tr td {
- border-bottom: 2px #ffa726 solid;
-}
-table.grid_table thead tr.middle_row td {
- border-top: 2px #ffa726 solid;
-}
table.grid_table tbody tr.table-header td {
- border-bottom: 2px #ffa726 solid;
border-top: 2px #ffa726 solid;
background-color: #ffffff;
}
table.grid_table tbody tr:nth-child(2n+1) {
- background-color: #ffffff;
+ background-color: #ffe9c9;
}
table.grid_table tbody tr:nth-child(2n) {
- background-color: #ffe9c9;
+ background-color: #ffffff;
}
table.grid_table td {
- padding: 10px 10px;
-}
-
-span.reminder {
- left: 3px;
+ padding: 12px 16px;
}
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select { /* ranking */
.dropzone {
- border-top: 1px #ffe9c9 solid;
margin-top: 12px;
padding-top: 17px;
}
@@ -273,8 +352,8 @@ table.ranking_table ul { .frame_dropping,
.frame_dropping_hover,
.frame_moving {
- font-size: 13px;
- padding: 7px 10px 9px;
+ font-size: 16px;
+ padding: 8px 12px 14px;
border: 2px solid #ef6c00;
background-color: #ffffff;
}
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover { }
table.ranking_table b {
- font-size: 13px;
+ font-size: 16px;
font-weight: 600;
}
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Slider */
.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
- color: #505050;
+ color: #333333;
}
.grupa .spremenljivka .slider.ui-widget-content {
/*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { }
.grupa .spremenljivka .sliderText {
padding-top: 2px;
- color: #505050;
+ color: #333333;
background-color: #ffa726;
border: 0;
}
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Gumbi na dnu */
div.buttons {
- padding: 20px 20px 35px;
- margin: 0 10px;
+ padding: 64px 0;
+ margin: 0;
}
div.buttons input {
cursor: pointer;
margin: 8px 10px;
- /*padding: 7px 11px;*/
- padding: 10px 20px;
+ padding: 0 32px;
+ height: 40px;
text-align: center;
- font-size: 12px;
- letter-spacing: 1px;
+ font-size: 16px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
div.buttons input.next {
background-color: #ef6c00;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus { /* Footer */
#footer_survey {
- padding: 40px;
+ padding: 48px 0 64px 0;
background-color: #ffffff;
- border-top: 1px #ffe9c9 solid;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey p, #footer_survey a, #footer_survey a:visited {
- color: #505050;
+ color: #333333;
font-size: 14px;
line-height: 25px;
font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus { }
.frame_dropping_titles {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
border-top: 2px solid #b9c5d9;
border-left: 2px solid #b9c5d9;
border-right: 2px solid #b9c5d9;
- font-size: 13px;
+ font-size: 16px;
}
.drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus { }
.frame_dropping_titles_box {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
- font-size: 13px;
+ font-size: 16px;
}
.frame_dropping {
+ width: 234px;
padding: 7px 10px 9px;
}
diff --git a/main/survey/skins/1kaPurple.css b/main/survey/skins/1kaPurple.css index d2c62e3..4860028 100644 --- a/main/survey/skins/1kaPurple.css +++ b/main/survey/skins/1kaPurple.css @@ -6,13 +6,14 @@ /*
Osnovna tema ankete - 1ka - brez definiranih barv
*/
+/* Barve */
/* Fonti */
body {
margin: 0;
padding: 0;
- color: #505050;
+ color: #333333;
font-size: 100%;
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
background: #ffffff;
}
@@ -28,13 +29,15 @@ body.preview, body.testdata { position: absolute;
width: 100%;
height: 80px;
- border-bottom: 6px #4527a0 solid;
+ border-bottom: 2px #4527a0 solid;
}
#outercontainer #container {
position: relative;
width: 100%;
max-width: 1200px;
- margin: 0px auto 10px;
+ margin: 0px auto;
+ padding: 0 16px;
+ box-sizing: border-box;
}
/* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata { /* Header - logo, naslov, progressbar */
h1 {
- margin: 0px auto 30px;
- padding: 120px 0 50px 0;
- font-size: 28px;
+ margin: 0px auto;
+ padding: 114px 0 32px 0;
+ font-size: 32px;
+ font-weight: 600;
+ line-height: 40px;
color: #4527a0;
text-align: center;
- border-bottom: 1px solid #e3daf2;
+ border-bottom: 1px solid #E5E5E5;
}
h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija { #logo {
right: auto;
- left: 25px;
+ left: 16px;
top: 13px;
max-height: 56px !important;
- background: url("../../../public/img/logo/1ka_slo.svg");
+ background: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat !important;
background-size: auto 100% !important;
}
@@ -96,7 +101,19 @@ h1.evalvacija { }
#logo.english {
- background: url("../../../public/img/logo/1ka_eng.svg");
+ background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+ background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+ background: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
.header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija { left: auto;
}
.header_settings_holder .progress_bar span {
- float: left !important;
- /* ie6,7 doesnt support inline-block */
+ float: left !important; /* ie6,7 doesnt support inline-block */
display: block;
width: 20px;
- font-size: 11px;
+ font-size: 14px;
+ line-height: 16px;
color: #6D87AF;
}
.header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija { color: #6642d1;
}
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+ margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+ margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+ padding: 7px 20px;
+ margin-left: 4px;
+}
+
/* Spremenljivke */
.spremenljivka {
- margin: 20px 10px 20px 10px;
- padding: 20px 2px 50px 12px !important;
- border-bottom: 1px #e3daf2 solid;
+ margin: 0;
+ padding: 48px 16px !important;
+ border-bottom: 1px #E5E5E5 solid;
}
.spremenljivka .naslov {
- padding: 5px 0 15px 5px;
- font-size: 18px;
+ padding: 0 !important;
+ margin: 0 0 24px 0;
+ font-size: 20px;
font-weight: 600;
}
.spremenljivka .naslov .spremenljivka_info {
font-size: 14px;
font-weight: 400;
- padding-top: 7px;
+ padding-top: 8px;
}
.spremenljivka .sequence_number {
background-color: #e3daf2;
@@ -183,6 +217,10 @@ h1.evalvacija { .spremenljivka .arrow:hover {
color: #6642d1;
}
+.spremenljivka span.reminder {
+ left: 3px;
+ text-indent: 0;
+}
.spremenljivka.limited {
outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija { outline: 1px #F15A24 solid;
}
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+ display: flex;
+ align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+ margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+ display: flex;
+ line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+ margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+ display: inline-block;
+ margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+ display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+ margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+ margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+ padding: 0;
+}
+
div.variabla,
td.variabla,
td.question,
td.differential,
.variabla_sum label {
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder {
- padding: 10px 0 0 0;
+ padding: 0 !important;
+}
+div.variable_holder .variabla {
+ padding: 0;
+ margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+ margin-bottom: 0;
}
div.variable_holder thead,
div.variable_holder tr.table-header {
font-weight: normal;
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder thead td,
div.variable_holder tr.table-header td {
padding: 10px 5px;
}
-table.grid_table thead tr td {
- border-bottom: 2px #7e57c2 solid;
-}
-table.grid_table thead tr.middle_row td {
- border-top: 2px #7e57c2 solid;
-}
table.grid_table tbody tr.table-header td {
- border-bottom: 2px #7e57c2 solid;
border-top: 2px #7e57c2 solid;
background-color: #ffffff;
}
table.grid_table tbody tr:nth-child(2n+1) {
- background-color: #ffffff;
+ background-color: #e3daf2;
}
table.grid_table tbody tr:nth-child(2n) {
- background-color: #e3daf2;
+ background-color: #ffffff;
}
table.grid_table td {
- padding: 10px 10px;
-}
-
-span.reminder {
- left: 3px;
+ padding: 12px 16px;
}
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select { /* ranking */
.dropzone {
- border-top: 1px #e3daf2 solid;
margin-top: 12px;
padding-top: 17px;
}
@@ -273,8 +352,8 @@ table.ranking_table ul { .frame_dropping,
.frame_dropping_hover,
.frame_moving {
- font-size: 13px;
- padding: 7px 10px 9px;
+ font-size: 16px;
+ padding: 8px 12px 14px;
border: 2px solid #4527a0;
background-color: #ffffff;
}
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover { }
table.ranking_table b {
- font-size: 13px;
+ font-size: 16px;
font-weight: 600;
}
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Slider */
.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
- color: #505050;
+ color: #333333;
}
.grupa .spremenljivka .slider.ui-widget-content {
/*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { }
.grupa .spremenljivka .sliderText {
padding-top: 2px;
- color: #505050;
+ color: #333333;
background-color: #7e57c2;
border: 0;
}
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Gumbi na dnu */
div.buttons {
- padding: 20px 20px 35px;
- margin: 0 10px;
+ padding: 64px 0;
+ margin: 0;
}
div.buttons input {
cursor: pointer;
margin: 8px 10px;
- /*padding: 7px 11px;*/
- padding: 10px 20px;
+ padding: 0 32px;
+ height: 40px;
text-align: center;
- font-size: 12px;
- letter-spacing: 1px;
+ font-size: 16px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
div.buttons input.next {
background-color: #4527a0;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus { /* Footer */
#footer_survey {
- padding: 40px;
+ padding: 48px 0 64px 0;
background-color: #ffffff;
- border-top: 1px #e3daf2 solid;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey p, #footer_survey a, #footer_survey a:visited {
- color: #505050;
+ color: #333333;
font-size: 14px;
line-height: 25px;
font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus { }
.frame_dropping_titles {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
border-top: 2px solid #b9c5d9;
border-left: 2px solid #b9c5d9;
border-right: 2px solid #b9c5d9;
- font-size: 13px;
+ font-size: 16px;
}
.drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus { }
.frame_dropping_titles_box {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
- font-size: 13px;
+ font-size: 16px;
}
.frame_dropping {
+ width: 234px;
padding: 7px 10px 9px;
}
diff --git a/main/survey/skins/1kaRed.css b/main/survey/skins/1kaRed.css index 7a68f3a..987f306 100644 --- a/main/survey/skins/1kaRed.css +++ b/main/survey/skins/1kaRed.css @@ -6,13 +6,14 @@ /*
Osnovna tema ankete - 1ka - brez definiranih barv
*/
+/* Barve */
/* Fonti */
body {
margin: 0;
padding: 0;
- color: #505050;
+ color: #333333;
font-size: 100%;
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
background: #ffffff;
}
@@ -28,13 +29,15 @@ body.preview, body.testdata { position: absolute;
width: 100%;
height: 80px;
- border-bottom: 6px #c62828 solid;
+ border-bottom: 2px #c62828 solid;
}
#outercontainer #container {
position: relative;
width: 100%;
max-width: 1200px;
- margin: 0px auto 10px;
+ margin: 0px auto;
+ padding: 0 16px;
+ box-sizing: border-box;
}
/* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata { /* Header - logo, naslov, progressbar */
h1 {
- margin: 0px auto 30px;
- padding: 120px 0 50px 0;
- font-size: 28px;
+ margin: 0px auto;
+ padding: 114px 0 32px 0;
+ font-size: 32px;
+ font-weight: 600;
+ line-height: 40px;
color: #c62828;
text-align: center;
- border-bottom: 1px solid #fde6e6;
+ border-bottom: 1px solid #E5E5E5;
}
h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija { #logo {
right: auto;
- left: 25px;
+ left: 16px;
top: 13px;
max-height: 56px !important;
- background: url("../../../public/img/logo/1ka_slo.svg");
+ background: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat !important;
background-size: auto 100% !important;
}
@@ -96,7 +101,19 @@ h1.evalvacija { }
#logo.english {
- background: url("../../../public/img/logo/1ka_eng.svg");
+ background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+ background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+ background: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
.header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija { left: auto;
}
.header_settings_holder .progress_bar span {
- float: left !important;
- /* ie6,7 doesnt support inline-block */
+ float: left !important; /* ie6,7 doesnt support inline-block */
display: block;
width: 20px;
- font-size: 11px;
+ font-size: 14px;
+ line-height: 16px;
color: #6D87AF;
}
.header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija { color: #de5c5c;
}
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+ margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+ margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+ padding: 7px 20px;
+ margin-left: 4px;
+}
+
/* Spremenljivke */
.spremenljivka {
- margin: 20px 10px 20px 10px;
- padding: 20px 2px 50px 12px !important;
- border-bottom: 1px #fde6e6 solid;
+ margin: 0;
+ padding: 48px 16px !important;
+ border-bottom: 1px #E5E5E5 solid;
}
.spremenljivka .naslov {
- padding: 5px 0 15px 5px;
- font-size: 18px;
+ padding: 0 !important;
+ margin: 0 0 24px 0;
+ font-size: 20px;
font-weight: 600;
}
.spremenljivka .naslov .spremenljivka_info {
font-size: 14px;
font-weight: 400;
- padding-top: 7px;
+ padding-top: 8px;
}
.spremenljivka .sequence_number {
background-color: #fde6e6;
@@ -183,6 +217,10 @@ h1.evalvacija { .spremenljivka .arrow:hover {
color: #de5c5c;
}
+.spremenljivka span.reminder {
+ left: 3px;
+ text-indent: 0;
+}
.spremenljivka.limited {
outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija { outline: 1px #F15A24 solid;
}
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+ display: flex;
+ align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+ margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+ display: flex;
+ line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+ margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+ display: inline-block;
+ margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+ display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+ margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+ margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+ padding: 0;
+}
+
div.variabla,
td.variabla,
td.question,
td.differential,
.variabla_sum label {
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder {
- padding: 10px 0 0 0;
+ padding: 0 !important;
+}
+div.variable_holder .variabla {
+ padding: 0;
+ margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+ margin-bottom: 0;
}
div.variable_holder thead,
div.variable_holder tr.table-header {
font-weight: normal;
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder thead td,
div.variable_holder tr.table-header td {
padding: 10px 5px;
}
-table.grid_table thead tr td {
- border-bottom: 2px #ef5350 solid;
-}
-table.grid_table thead tr.middle_row td {
- border-top: 2px #ef5350 solid;
-}
table.grid_table tbody tr.table-header td {
- border-bottom: 2px #ef5350 solid;
border-top: 2px #ef5350 solid;
background-color: #ffffff;
}
table.grid_table tbody tr:nth-child(2n+1) {
- background-color: #ffffff;
+ background-color: #fde6e6;
}
table.grid_table tbody tr:nth-child(2n) {
- background-color: #fde6e6;
+ background-color: #ffffff;
}
table.grid_table td {
- padding: 10px 10px;
-}
-
-span.reminder {
- left: 3px;
+ padding: 12px 16px;
}
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select { /* ranking */
.dropzone {
- border-top: 1px #fde6e6 solid;
margin-top: 12px;
padding-top: 17px;
}
@@ -273,8 +352,8 @@ table.ranking_table ul { .frame_dropping,
.frame_dropping_hover,
.frame_moving {
- font-size: 13px;
- padding: 7px 10px 9px;
+ font-size: 16px;
+ padding: 8px 12px 14px;
border: 2px solid #c62828;
background-color: #ffffff;
}
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover { }
table.ranking_table b {
- font-size: 13px;
+ font-size: 16px;
font-weight: 600;
}
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Slider */
.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
- color: #505050;
+ color: #333333;
}
.grupa .spremenljivka .slider.ui-widget-content {
/*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { }
.grupa .spremenljivka .sliderText {
padding-top: 2px;
- color: #505050;
+ color: #333333;
background-color: #ef5350;
border: 0;
}
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Gumbi na dnu */
div.buttons {
- padding: 20px 20px 35px;
- margin: 0 10px;
+ padding: 64px 0;
+ margin: 0;
}
div.buttons input {
cursor: pointer;
margin: 8px 10px;
- /*padding: 7px 11px;*/
- padding: 10px 20px;
+ padding: 0 32px;
+ height: 40px;
text-align: center;
- font-size: 12px;
- letter-spacing: 1px;
+ font-size: 16px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
div.buttons input.next {
background-color: #c62828;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus { /* Footer */
#footer_survey {
- padding: 40px;
+ padding: 48px 0 64px 0;
background-color: #ffffff;
- border-top: 1px #fde6e6 solid;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey p, #footer_survey a, #footer_survey a:visited {
- color: #505050;
+ color: #333333;
font-size: 14px;
line-height: 25px;
font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus { }
.frame_dropping_titles {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
border-top: 2px solid #b9c5d9;
border-left: 2px solid #b9c5d9;
border-right: 2px solid #b9c5d9;
- font-size: 13px;
+ font-size: 16px;
}
.drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus { }
.frame_dropping_titles_box {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
- font-size: 13px;
+ font-size: 16px;
}
.frame_dropping {
+ width: 234px;
padding: 7px 10px 9px;
}
diff --git a/main/survey/skins/Cdi.css b/main/survey/skins/Cdi.css new file mode 100644 index 0000000..73f1b6f --- /dev/null +++ b/main/survey/skins/Cdi.css @@ -0,0 +1,617 @@ +/*
+ CDI tema - Siva barva z logotipom
+*/
+/* Barve */
+/* Import osnovne postavitve */
+/*
+ Osnovna tema ankete - 1ka - brez definiranih barv
+*/
+/* Barve */
+/* Fonti */
+body {
+ margin: 0;
+ padding: 0;
+ color: #333333;
+ font-size: 100%;
+ font-family: Source Sans Pro, 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: 2px #666666 solid;
+}
+#outercontainer #container {
+ position: relative;
+ width: 100%;
+ max-width: 1200px;
+ margin: 0px auto;
+ padding: 0 16px;
+ box-sizing: border-box;
+}
+
+/* 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;
+ padding: 114px 0 32px 0;
+ font-size: 32px;
+ font-weight: 600;
+ line-height: 40px;
+ color: #666666;
+ text-align: center;
+ border-bottom: 1px solid #E5E5E5;
+}
+
+h1.evalvacija {
+ margin-bottom: 0;
+}
+
+#logo {
+ right: auto;
+ left: 16px;
+ 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");
+}
+
+#logo.namestitev {
+ background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+ background: url("../../../public/img/logo/1ka_logo_arnes.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: 14px;
+ line-height: 16px;
+ 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: #666666;
+}
+.header_settings_holder .progress_bar p a {
+ color: #666666;
+ text-decoration: none;
+}
+.header_settings_holder .progress_bar p a:hover {
+ color: #8c8c8c;
+}
+.header_settings_holder .continue_later_setting a {
+ color: #666666;
+}
+.header_settings_holder .continue_later_setting a:hover {
+ color: #8c8c8c;
+}
+.header_settings_holder .tawk_chat a {
+ color: #666666;
+}
+.header_settings_holder .tawk_chat a:hover {
+ color: #8c8c8c;
+}
+
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+ margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+ margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+ padding: 7px 20px;
+ margin-left: 4px;
+}
+
+/* Spremenljivke */
+.spremenljivka {
+ margin: 0;
+ padding: 48px 16px !important;
+ border-bottom: 1px #E5E5E5 solid;
+}
+.spremenljivka .naslov {
+ padding: 0 !important;
+ margin: 0 0 24px 0;
+ font-size: 20px;
+ font-weight: 600;
+}
+.spremenljivka .naslov .spremenljivka_info {
+ font-size: 14px;
+ font-weight: 400;
+ padding-top: 8px;
+}
+.spremenljivka .sequence_number {
+ background-color: #eeeeee;
+ color: #888888;
+}
+.spremenljivka .sequence_number:hover {
+ background-color: #d5d5d5;
+}
+.spremenljivka .sequence_number.active {
+ background-color: #888888;
+ color: #ffffff;
+}
+.spremenljivka .counter {
+ font-size: 18px;
+}
+.spremenljivka #dynamic_count {
+ color: #666666;
+}
+.spremenljivka .arrow {
+ color: #666666;
+}
+.spremenljivka .arrow:hover {
+ color: #8c8c8c;
+}
+.spremenljivka span.reminder {
+ left: 3px;
+ text-indent: 0;
+}
+
+.spremenljivka.limited {
+ outline: 1px #F15A24 solid;
+}
+
+.required, .required_require, .required_limit {
+ outline: 1px #F15A24 solid;
+}
+
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+ display: flex;
+ align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+ margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+ display: flex;
+ line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+ margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+ display: inline-block;
+ margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+ display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+ margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+ margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+ padding: 0;
+}
+
+div.variabla,
+td.variabla,
+td.question,
+td.differential,
+.variabla_sum label {
+ font-size: 16px;
+}
+
+div.variable_holder {
+ padding: 0 !important;
+}
+div.variable_holder .variabla {
+ padding: 0;
+ margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+ margin-bottom: 0;
+}
+div.variable_holder thead,
+div.variable_holder tr.table-header {
+ font-weight: normal;
+ font-size: 16px;
+}
+div.variable_holder thead td,
+div.variable_holder tr.table-header td {
+ padding: 10px 5px;
+}
+
+table.grid_table tbody tr.table-header td {
+ border-top: 2px #888888 solid;
+ background-color: #ffffff;
+}
+table.grid_table tbody tr:nth-child(2n+1) {
+ background-color: #eeeeee;
+}
+table.grid_table tbody tr:nth-child(2n) {
+ background-color: #ffffff;
+}
+table.grid_table td {
+ padding: 12px 16px;
+}
+
+/* Textboxi, textarea, select */
+input, textarea, select {
+ font-family: Source Sans Pro, 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 {
+ 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: 16px;
+ padding: 8px 12px 14px;
+ border: 2px solid #666666;
+ background-color: #ffffff;
+}
+
+.ranking:hover {
+ background-color: #f5fafe;
+}
+
+div.variable_holder .frame_ranking_hover {
+ border: 2px #666666 solid;
+ background-color: #eeeeee;
+}
+
+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 #888888 solid;
+ background-color: #eeeeee;
+}
+
+table.ranking_table b {
+ font-size: 16px;
+ font-weight: 600;
+}
+
+/* Photo upload button */
+button.record_foto {
+ border: 2px solid #666666;
+}
+button.record_foto::before {
+ color: #666666;
+}
+button.record_foto:hover, button.record_foto:focus {
+ border-color: #8c8c8c;
+}
+button.record_foto:hover::before, button.record_foto:focus::before {
+ color: #8c8c8c;
+}
+
+/* Koledar */
+.ui-datepicker {
+ font-size: 14px;
+}
+
+button.ui-datepicker-trigger {
+ color: #666666;
+}
+button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
+ color: #8c8c8c;
+}
+
+/* Slider */
+.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
+ color: #333333;
+}
+.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: #666666 !important;
+ background-image: none !important;
+}
+.grupa .spremenljivka .ui-slider-handle:active {
+ background-color: #666666 !important;
+}
+.grupa .spremenljivka .sliderText {
+ padding-top: 2px;
+ color: #333333;
+ background-color: #888888;
+ border: 0;
+}
+.grupa .spremenljivka .sliderText::after {
+ border-color: #888888 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: #eeeeee;
+ border: 2px solid red;
+ padding: 4px 7px;
+ border-radius: 4px;
+ box-shadow: none;
+}
+
+/* Gumbi na dnu */
+div.buttons {
+ padding: 64px 0;
+ margin: 0;
+}
+div.buttons input {
+ cursor: pointer;
+ margin: 8px 10px;
+ padding: 0 32px;
+ height: 40px;
+ text-align: center;
+ font-size: 16px;
+ font-weight: 600;
+ color: #FFFFFF;
+ border: 0;
+ transition: 0.3s;
+}
+div.buttons input.next {
+ background-color: #666666;
+ border: 1px solid #666666;
+}
+div.buttons input.next:hover, div.buttons input.next:focus {
+ background-color: #8c8c8c;
+ border: 1px solid #8c8c8c;
+}
+div.buttons input.prev {
+ color: #666666;
+ background-color: #fff;
+ border: 1px solid #666666;
+}
+div.buttons input.prev:hover, div.buttons input.prev:focus {
+ color: #fff;
+ background-color: #666666;
+}
+
+/* Footer */
+#footer_survey {
+ padding: 48px 0 64px 0;
+ background-color: #ffffff;
+ border-top: 1px #E5E5E5 solid;
+}
+#footer_survey p, #footer_survey a, #footer_survey a:visited {
+ color: #333333;
+ 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: #888888;
+ 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: #484848;
+}
+
+input[type=text]:focus,
+input[type=number]:focus,
+input[type=email]:focus,
+input[type=password]:focus,
+textarea:focus {
+ border-color: #888888;
+}
+
+/* Ranking drag drop */
+.drag_and_drop {
+ top: -9px;
+ left: -12px;
+}
+
+.drag_and_drop_right {
+ top: -9px !important;
+ left: -12px !important;
+}
+
+.frame_dropping_titles {
+ width: 244px;
+ padding: 5px;
+ margin: 0px auto 0px auto;
+ height: 20px;
+ text-align: center;
+ background-color: #FFFFFF;
+ border-top: 2px solid #b9c5d9;
+ border-left: 2px solid #b9c5d9;
+ border-right: 2px solid #b9c5d9;
+ font-size: 16px;
+}
+
+.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: 244px;
+ padding: 5px;
+ margin: 0px auto 0px auto;
+ height: 20px;
+ text-align: center;
+ background-color: #FFFFFF;
+ font-size: 16px;
+}
+
+.frame_dropping {
+ width: 234px;
+ padding: 7px 10px 9px;
+}
+
+.frame_dropping_box {
+ padding: 7px 10px 9px;
+}
+
+/* Popravimo se logo */
+#logo {
+ background-image: url("../../../public/img/logo/cdi_slo.png") !important;
+}
+
+#logo.english {
+ background-image: url("../../../public/img/logo/cdi_eng.png") !important;
+}
+
+/*# sourceMappingURL=Cdi.css.map */
diff --git a/main/survey/skins/Default/arrowD.png b/main/survey/skins/Default/arrowD.png Binary files differnew file mode 100644 index 0000000..d7ebd4e --- /dev/null +++ b/main/survey/skins/Default/arrowD.png diff --git a/main/survey/skins/Default/arrowD2.png b/main/survey/skins/Default/arrowD2.png Binary files differnew file mode 100644 index 0000000..676b840 --- /dev/null +++ b/main/survey/skins/Default/arrowD2.png diff --git a/main/survey/skins/Default/arrowL.png b/main/survey/skins/Default/arrowL.png Binary files differnew file mode 100644 index 0000000..fcf6bfe --- /dev/null +++ b/main/survey/skins/Default/arrowL.png diff --git a/main/survey/skins/Default/arrowL2.png b/main/survey/skins/Default/arrowL2.png Binary files differnew file mode 100644 index 0000000..d7dfb56 --- /dev/null +++ b/main/survey/skins/Default/arrowL2.png diff --git a/main/survey/skins/Default/arrowR.png b/main/survey/skins/Default/arrowR.png Binary files differnew file mode 100644 index 0000000..68481f6 --- /dev/null +++ b/main/survey/skins/Default/arrowR.png diff --git a/main/survey/skins/Default/arrowR2.png b/main/survey/skins/Default/arrowR2.png Binary files differnew file mode 100644 index 0000000..eb1b035 --- /dev/null +++ b/main/survey/skins/Default/arrowR2.png diff --git a/main/survey/skins/Default/arrowU.png b/main/survey/skins/Default/arrowU.png Binary files differnew file mode 100644 index 0000000..9cf2cd8 --- /dev/null +++ b/main/survey/skins/Default/arrowU.png diff --git a/main/survey/skins/Default/arrowU2.png b/main/survey/skins/Default/arrowU2.png Binary files differnew file mode 100644 index 0000000..dde25fa --- /dev/null +++ b/main/survey/skins/Default/arrowU2.png diff --git a/main/survey/skins/Default/logo-small.png b/main/survey/skins/Default/logo-small.png Binary files differnew file mode 100644 index 0000000..d0d20e1 --- /dev/null +++ b/main/survey/skins/Default/logo-small.png diff --git a/main/survey/skins/Default/logo_transparent.png b/main/survey/skins/Default/logo_transparent.png Binary files differnew file mode 100644 index 0000000..883833d --- /dev/null +++ b/main/survey/skins/Default/logo_transparent.png diff --git a/main/survey/skins/Default/webcam_record.png b/main/survey/skins/Default/webcam_record.png Binary files differnew file mode 100644 index 0000000..c8a061d --- /dev/null +++ b/main/survey/skins/Default/webcam_record.png diff --git a/main/survey/skins/Fdv.css b/main/survey/skins/Fdv.css index 05b140c..048cc02 100644 --- a/main/survey/skins/Fdv.css +++ b/main/survey/skins/Fdv.css @@ -6,13 +6,14 @@ /*
Osnovna tema ankete - 1ka - brez definiranih barv
*/
+/* Barve */
/* Fonti */
body {
margin: 0;
padding: 0;
- color: #505050;
+ color: #333333;
font-size: 100%;
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
background: #ffffff;
}
@@ -28,13 +29,15 @@ body.preview, body.testdata { position: absolute;
width: 100%;
height: 80px;
- border-bottom: 6px #666666 solid;
+ border-bottom: 2px #666666 solid;
}
#outercontainer #container {
position: relative;
width: 100%;
max-width: 1200px;
- margin: 0px auto 10px;
+ margin: 0px auto;
+ padding: 0 16px;
+ box-sizing: border-box;
}
/* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata { /* Header - logo, naslov, progressbar */
h1 {
- margin: 0px auto 30px;
- padding: 120px 0 50px 0;
- font-size: 28px;
+ margin: 0px auto;
+ padding: 114px 0 32px 0;
+ font-size: 32px;
+ font-weight: 600;
+ line-height: 40px;
color: #666666;
text-align: center;
- border-bottom: 1px solid #eeeeee;
+ border-bottom: 1px solid #E5E5E5;
}
h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija { #logo {
right: auto;
- left: 25px;
+ left: 16px;
top: 13px;
max-height: 56px !important;
- background: url("../../../public/img/logo/1ka_slo.svg");
+ background: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat !important;
background-size: auto 100% !important;
}
@@ -96,7 +101,19 @@ h1.evalvacija { }
#logo.english {
- background: url("../../../public/img/logo/1ka_eng.svg");
+ background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+ background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+ background: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
.header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija { left: auto;
}
.header_settings_holder .progress_bar span {
- float: left !important;
- /* ie6,7 doesnt support inline-block */
+ float: left !important; /* ie6,7 doesnt support inline-block */
display: block;
width: 20px;
- font-size: 11px;
+ font-size: 14px;
+ line-height: 16px;
color: #6D87AF;
}
.header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija { color: #8c8c8c;
}
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+ margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+ margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+ padding: 7px 20px;
+ margin-left: 4px;
+}
+
/* Spremenljivke */
.spremenljivka {
- margin: 20px 10px 20px 10px;
- padding: 20px 2px 50px 12px !important;
- border-bottom: 1px #eeeeee solid;
+ margin: 0;
+ padding: 48px 16px !important;
+ border-bottom: 1px #E5E5E5 solid;
}
.spremenljivka .naslov {
- padding: 5px 0 15px 5px;
- font-size: 18px;
+ padding: 0 !important;
+ margin: 0 0 24px 0;
+ font-size: 20px;
font-weight: 600;
}
.spremenljivka .naslov .spremenljivka_info {
font-size: 14px;
font-weight: 400;
- padding-top: 7px;
+ padding-top: 8px;
}
.spremenljivka .sequence_number {
background-color: #eeeeee;
@@ -183,6 +217,10 @@ h1.evalvacija { .spremenljivka .arrow:hover {
color: #8c8c8c;
}
+.spremenljivka span.reminder {
+ left: 3px;
+ text-indent: 0;
+}
.spremenljivka.limited {
outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija { outline: 1px #F15A24 solid;
}
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+ display: flex;
+ align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+ margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+ display: flex;
+ line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+ margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+ display: inline-block;
+ margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+ display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+ margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+ margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+ padding: 0;
+}
+
div.variabla,
td.variabla,
td.question,
td.differential,
.variabla_sum label {
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder {
- padding: 10px 0 0 0;
+ padding: 0 !important;
+}
+div.variable_holder .variabla {
+ padding: 0;
+ margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+ margin-bottom: 0;
}
div.variable_holder thead,
div.variable_holder tr.table-header {
font-weight: normal;
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder thead td,
div.variable_holder tr.table-header td {
padding: 10px 5px;
}
-table.grid_table thead tr td {
- border-bottom: 2px #888888 solid;
-}
-table.grid_table thead tr.middle_row td {
- border-top: 2px #888888 solid;
-}
table.grid_table tbody tr.table-header td {
- border-bottom: 2px #888888 solid;
border-top: 2px #888888 solid;
background-color: #ffffff;
}
table.grid_table tbody tr:nth-child(2n+1) {
- background-color: #ffffff;
+ background-color: #eeeeee;
}
table.grid_table tbody tr:nth-child(2n) {
- background-color: #eeeeee;
+ background-color: #ffffff;
}
table.grid_table td {
- padding: 10px 10px;
-}
-
-span.reminder {
- left: 3px;
+ padding: 12px 16px;
}
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select { /* ranking */
.dropzone {
- border-top: 1px #eeeeee solid;
margin-top: 12px;
padding-top: 17px;
}
@@ -273,8 +352,8 @@ table.ranking_table ul { .frame_dropping,
.frame_dropping_hover,
.frame_moving {
- font-size: 13px;
- padding: 7px 10px 9px;
+ font-size: 16px;
+ padding: 8px 12px 14px;
border: 2px solid #666666;
background-color: #ffffff;
}
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover { }
table.ranking_table b {
- font-size: 13px;
+ font-size: 16px;
font-weight: 600;
}
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Slider */
.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
- color: #505050;
+ color: #333333;
}
.grupa .spremenljivka .slider.ui-widget-content {
/*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { }
.grupa .spremenljivka .sliderText {
padding-top: 2px;
- color: #505050;
+ color: #333333;
background-color: #888888;
border: 0;
}
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Gumbi na dnu */
div.buttons {
- padding: 20px 20px 35px;
- margin: 0 10px;
+ padding: 64px 0;
+ margin: 0;
}
div.buttons input {
cursor: pointer;
margin: 8px 10px;
- /*padding: 7px 11px;*/
- padding: 10px 20px;
+ padding: 0 32px;
+ height: 40px;
text-align: center;
- font-size: 12px;
- letter-spacing: 1px;
+ font-size: 16px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
div.buttons input.next {
background-color: #666666;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus { /* Footer */
#footer_survey {
- padding: 40px;
+ padding: 48px 0 64px 0;
background-color: #ffffff;
- border-top: 1px #eeeeee solid;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey p, #footer_survey a, #footer_survey a:visited {
- color: #505050;
+ color: #333333;
font-size: 14px;
line-height: 25px;
font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus { }
.frame_dropping_titles {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
border-top: 2px solid #b9c5d9;
border-left: 2px solid #b9c5d9;
border-right: 2px solid #b9c5d9;
- font-size: 13px;
+ font-size: 16px;
}
.drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus { }
.frame_dropping_titles_box {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
- font-size: 13px;
+ font-size: 16px;
}
.frame_dropping {
+ width: 234px;
padding: 7px 10px 9px;
}
@@ -528,7 +607,7 @@ textarea:focus { /* Popravimo se logo */
#logo, #logo.english {
- background-image: url("../../../public/img/logo/fdv.png");
+ background-image: url("../../../public/img/logo/fdv.png") !important;
}
/*# sourceMappingURL=Fdv.css.map */
diff --git a/main/survey/skins/MobileBlack.css b/main/survey/skins/MobileBlack.css index 33c9a26..2459f0e 100644 --- a/main/survey/skins/MobileBlack.css +++ b/main/survey/skins/MobileBlack.css @@ -9,26 +9,26 @@ */
/* Fonti */
body {
- font-family: Montserrat, Arial, Sans-Serif !important;
- color: #505050;
+ font-family: Source Sans Pro, sans-serif !important;
+ color: #333;
background-color: white;
}
span, label {
- color: #505050;
+ color: #333;
}
/* GLAVNI ELEMENTI */
#container h1 {
color: #333333;
background-color: #ffffff;
- border-bottom: 8px #333333 solid;
+ border-bottom: 2px #333333 solid;
}
/* INPUT ELEMENTI */
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -49,17 +49,17 @@ input[type=radio] + span.enka-checkbox-radio, .grupa .spremenljivka {
background-color: white;
border: 0;
- border-bottom: 1px #444444 solid;
+ border-bottom: 1px #E5E5E5 solid;
/* Mejnik pri dvojni tabeli */
}
.grupa .spremenljivka:last-of-type {
border-bottom: 0;
}
.grupa .spremenljivka .naslov {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .naslov .spremenljivka_info {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .sequence_number {
background-color: #eaeaea;
@@ -116,7 +116,7 @@ input[type=radio] + span.enka-checkbox-radio, }
.variable_holder .variabla {
- color: #505050;
+ color: #333;
}
/* Koledar */
@@ -146,21 +146,19 @@ button.ui-datepicker-trigger:hover { margin-top: 20px;
margin-bottom: 10px;
padding-top: 10px;
- border-top: 1px #444444 solid !important;
+ border-top: 1px #E5E5E5 solid !important;
}
.buttons input {
cursor: pointer;
margin: 8px 5px;
- padding: 10px 20px;
+ padding: 10px 24px !important;
text-align: center;
font-size: 15px;
letter-spacing: 0px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
- -moz-border-radius: 20px 20px 20px 20px;
- -webkit-border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
.buttons input.next {
background-color: #333333;
@@ -182,13 +180,13 @@ button.ui-datepicker-trigger:hover { /* FOOTER */
#footer_survey {
- color: #505050;
- border-top: 3px #333333 solid;
+ color: #333;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey a {
font-weight: normal;
text-decoration: none;
- color: #505050;
+ color: #333;
}
/* LOGO */
@@ -204,7 +202,7 @@ button.ui-datepicker-trigger:hover { margin: 10px auto 30px auto;
left: 0;
right: 0;
- background-image: url("../../../public/img/logo/1ka_slo.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat;
background-size: auto 100% !important;
background-position: center;
@@ -222,7 +220,19 @@ button.ui-datepicker-trigger:hover { }
#footer_survey #logo.english {
- background-image: url("../../../public/img/logo/1ka_eng.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+ background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+ background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
/*# sourceMappingURL=MobileBlack.css.map */
diff --git a/main/survey/skins/MobileBlue.css b/main/survey/skins/MobileBlue.css index 980420a..4720d21 100644 --- a/main/survey/skins/MobileBlue.css +++ b/main/survey/skins/MobileBlue.css @@ -8,26 +8,26 @@ */
/* Fonti */
body {
- font-family: Montserrat, Arial, Sans-Serif !important;
- color: #505050;
+ font-family: Source Sans Pro, sans-serif !important;
+ color: #333;
background-color: white;
}
span, label {
- color: #505050;
+ color: #333;
}
/* GLAVNI ELEMENTI */
#container h1 {
color: #1e88e5;
background-color: #ffffff;
- border-bottom: 8px #1e88e5 solid;
+ border-bottom: 2px #1e88e5 solid;
}
/* INPUT ELEMENTI */
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -48,17 +48,17 @@ input[type=radio] + span.enka-checkbox-radio, .grupa .spremenljivka {
background-color: white;
border: 0;
- border-bottom: 1px #42A5F5 solid;
+ border-bottom: 1px #E5E5E5 solid;
/* Mejnik pri dvojni tabeli */
}
.grupa .spremenljivka:last-of-type {
border-bottom: 0;
}
.grupa .spremenljivka .naslov {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .naslov .spremenljivka_info {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .sequence_number {
background-color: #ddeffd;
@@ -115,7 +115,7 @@ input[type=radio] + span.enka-checkbox-radio, }
.variable_holder .variabla {
- color: #505050;
+ color: #333;
}
/* Koledar */
@@ -123,7 +123,7 @@ button.ui-datepicker-trigger { color: #1e88e5;
}
button.ui-datepicker-trigger:hover {
- color: #ffa608;
+ color: #1360a4;
}
/* Opcija nadaljuj kasneje */
@@ -131,13 +131,13 @@ button.ui-datepicker-trigger:hover { color: #1e88e5;
}
.header_settings_holder .continue_later_setting a:hover {
- color: #ffa608;
+ color: #1360a4;
}
.header_settings_holder .tawk_chat a {
color: #1e88e5;
}
.header_settings_holder .tawk_chat a:hover {
- color: #ffa608;
+ color: #1360a4;
}
/* GUMBI NAPREJ/NAZAJ */
@@ -145,29 +145,27 @@ button.ui-datepicker-trigger:hover { margin-top: 20px;
margin-bottom: 10px;
padding-top: 10px;
- border-top: 1px #42A5F5 solid !important;
+ border-top: 1px #E5E5E5 solid !important;
}
.buttons input {
cursor: pointer;
margin: 8px 5px;
- padding: 10px 20px;
+ padding: 10px 24px !important;
text-align: center;
font-size: 15px;
letter-spacing: 0px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
- -moz-border-radius: 20px 20px 20px 20px;
- -webkit-border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
.buttons input.next {
background-color: #1e88e5;
border: 1px solid #1e88e5;
}
.buttons input.next:hover {
- background-color: #ffa608;
- border: 1px solid #ffa608;
+ background-color: #1360a4;
+ border: 1px solid #1360a4;
}
.buttons input.prev {
color: #1e88e5;
@@ -181,13 +179,13 @@ button.ui-datepicker-trigger:hover { /* FOOTER */
#footer_survey {
- color: #505050;
- border-top: 3px #1e88e5 solid;
+ color: #333;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey a {
font-weight: normal;
text-decoration: none;
- color: #505050;
+ color: #333;
}
/* LOGO */
@@ -203,7 +201,7 @@ button.ui-datepicker-trigger:hover { margin: 10px auto 30px auto;
left: 0;
right: 0;
- background-image: url("../../../public/img/logo/1ka_slo.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat;
background-size: auto 100% !important;
background-position: center;
@@ -221,7 +219,19 @@ button.ui-datepicker-trigger:hover { }
#footer_survey #logo.english {
- background-image: url("../../../public/img/logo/1ka_eng.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+ background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+ background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
/*# sourceMappingURL=MobileBlue.css.map */
diff --git a/main/survey/skins/MobileCdi.css b/main/survey/skins/MobileCdi.css index 81973d6..27c2cc1 100644 --- a/main/survey/skins/MobileCdi.css +++ b/main/survey/skins/MobileCdi.css @@ -9,26 +9,26 @@ */
/* Fonti */
body {
- font-family: Montserrat, Arial, Sans-Serif !important;
- color: #505050;
+ font-family: Source Sans Pro, sans-serif !important;
+ color: #333;
background-color: white;
}
span, label {
- color: #505050;
+ color: #333;
}
/* GLAVNI ELEMENTI */
#container h1 {
color: #666666;
background-color: #ffffff;
- border-bottom: 8px #666666 solid;
+ border-bottom: 2px #666666 solid;
}
/* INPUT ELEMENTI */
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -49,17 +49,17 @@ input[type=radio] + span.enka-checkbox-radio, .grupa .spremenljivka {
background-color: white;
border: 0;
- border-bottom: 1px #888888 solid;
+ border-bottom: 1px #E5E5E5 solid;
/* Mejnik pri dvojni tabeli */
}
.grupa .spremenljivka:last-of-type {
border-bottom: 0;
}
.grupa .spremenljivka .naslov {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .naslov .spremenljivka_info {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .sequence_number {
background-color: #eeeeee;
@@ -116,7 +116,7 @@ input[type=radio] + span.enka-checkbox-radio, }
.variable_holder .variabla {
- color: #505050;
+ color: #333;
}
/* Koledar */
@@ -146,21 +146,19 @@ button.ui-datepicker-trigger:hover { margin-top: 20px;
margin-bottom: 10px;
padding-top: 10px;
- border-top: 1px #888888 solid !important;
+ border-top: 1px #E5E5E5 solid !important;
}
.buttons input {
cursor: pointer;
margin: 8px 5px;
- padding: 10px 20px;
+ padding: 10px 24px !important;
text-align: center;
font-size: 15px;
letter-spacing: 0px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
- -moz-border-radius: 20px 20px 20px 20px;
- -webkit-border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
.buttons input.next {
background-color: #666666;
@@ -182,13 +180,13 @@ button.ui-datepicker-trigger:hover { /* FOOTER */
#footer_survey {
- color: #505050;
- border-top: 3px #666666 solid;
+ color: #333;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey a {
font-weight: normal;
text-decoration: none;
- color: #505050;
+ color: #333;
}
/* LOGO */
@@ -204,7 +202,7 @@ button.ui-datepicker-trigger:hover { margin: 10px auto 30px auto;
left: 0;
right: 0;
- background-image: url("../../../public/img/logo/1ka_slo.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat;
background-size: auto 100% !important;
background-position: center;
@@ -222,16 +220,28 @@ button.ui-datepicker-trigger:hover { }
#footer_survey #logo.english {
- background-image: url("../../../public/img/logo/1ka_eng.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+ background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+ background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
/* Popravimo se logo */
#footer_survey #logo {
- background-image: url("../../../public/img/logo/cdi_slo.png");
+ background-image: url("../../../public/img/logo/cdi_slo.png") !important;
}
#footer_survey #logo.english {
- background-image: url("../../../public/img/logo/cdi_eng.png");
+ background-image: url("../../../public/img/logo/cdi_eng.png") !important;
}
/*# sourceMappingURL=MobileCdi.css.map */
diff --git a/main/survey/skins/MobileFdv.css b/main/survey/skins/MobileFdv.css index d206d11..743592d 100644 --- a/main/survey/skins/MobileFdv.css +++ b/main/survey/skins/MobileFdv.css @@ -9,26 +9,26 @@ */
/* Fonti */
body {
- font-family: Montserrat, Arial, Sans-Serif !important;
- color: #505050;
+ font-family: Source Sans Pro, sans-serif !important;
+ color: #333;
background-color: white;
}
span, label {
- color: #505050;
+ color: #333;
}
/* GLAVNI ELEMENTI */
#container h1 {
color: #666666;
background-color: #ffffff;
- border-bottom: 8px #666666 solid;
+ border-bottom: 2px #666666 solid;
}
/* INPUT ELEMENTI */
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -49,17 +49,17 @@ input[type=radio] + span.enka-checkbox-radio, .grupa .spremenljivka {
background-color: white;
border: 0;
- border-bottom: 1px #888888 solid;
+ border-bottom: 1px #E5E5E5 solid;
/* Mejnik pri dvojni tabeli */
}
.grupa .spremenljivka:last-of-type {
border-bottom: 0;
}
.grupa .spremenljivka .naslov {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .naslov .spremenljivka_info {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .sequence_number {
background-color: #eeeeee;
@@ -116,7 +116,7 @@ input[type=radio] + span.enka-checkbox-radio, }
.variable_holder .variabla {
- color: #505050;
+ color: #333;
}
/* Koledar */
@@ -146,21 +146,19 @@ button.ui-datepicker-trigger:hover { margin-top: 20px;
margin-bottom: 10px;
padding-top: 10px;
- border-top: 1px #888888 solid !important;
+ border-top: 1px #E5E5E5 solid !important;
}
.buttons input {
cursor: pointer;
margin: 8px 5px;
- padding: 10px 20px;
+ padding: 10px 24px !important;
text-align: center;
font-size: 15px;
letter-spacing: 0px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
- -moz-border-radius: 20px 20px 20px 20px;
- -webkit-border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
.buttons input.next {
background-color: #666666;
@@ -182,13 +180,13 @@ button.ui-datepicker-trigger:hover { /* FOOTER */
#footer_survey {
- color: #505050;
- border-top: 3px #666666 solid;
+ color: #333;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey a {
font-weight: normal;
text-decoration: none;
- color: #505050;
+ color: #333;
}
/* LOGO */
@@ -204,7 +202,7 @@ button.ui-datepicker-trigger:hover { margin: 10px auto 30px auto;
left: 0;
right: 0;
- background-image: url("../../../public/img/logo/1ka_slo.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat;
background-size: auto 100% !important;
background-position: center;
@@ -222,12 +220,24 @@ button.ui-datepicker-trigger:hover { }
#footer_survey #logo.english {
- background-image: url("../../../public/img/logo/1ka_eng.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+ background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+ background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
/* Popravimo se logo */
#footer_survey #logo {
- background-image: url("../../../public/img/logo/fdv.png");
+ background-image: url("../../../public/img/logo/fdv.png") !important;
}
/*# sourceMappingURL=MobileFdv.css.map */
diff --git a/main/survey/skins/MobileGreen.css b/main/survey/skins/MobileGreen.css index 6ef6572..94abca1 100644 --- a/main/survey/skins/MobileGreen.css +++ b/main/survey/skins/MobileGreen.css @@ -8,26 +8,26 @@ */
/* Fonti */
body {
- font-family: Montserrat, Arial, Sans-Serif !important;
- color: #505050;
+ font-family: Source Sans Pro, sans-serif !important;
+ color: #333;
background-color: white;
}
span, label {
- color: #505050;
+ color: #333;
}
/* GLAVNI ELEMENTI */
#container h1 {
color: #2e7d3a;
background-color: #ffffff;
- border-bottom: 8px #2e7d3a solid;
+ border-bottom: 2px #2e7d3a solid;
}
/* INPUT ELEMENTI */
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -48,17 +48,17 @@ input[type=radio] + span.enka-checkbox-radio, .grupa .spremenljivka {
background-color: white;
border: 0;
- border-bottom: 1px #66bb6a solid;
+ border-bottom: 1px #E5E5E5 solid;
/* Mejnik pri dvojni tabeli */
}
.grupa .spremenljivka:last-of-type {
border-bottom: 0;
}
.grupa .spremenljivka .naslov {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .naslov .spremenljivka_info {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .sequence_number {
background-color: #e2f2e2;
@@ -115,7 +115,7 @@ input[type=radio] + span.enka-checkbox-radio, }
.variable_holder .variabla {
- color: #505050;
+ color: #333;
}
/* Koledar */
@@ -145,21 +145,19 @@ button.ui-datepicker-trigger:hover { margin-top: 20px;
margin-bottom: 10px;
padding-top: 10px;
- border-top: 1px #66bb6a solid !important;
+ border-top: 1px #E5E5E5 solid !important;
}
.buttons input {
cursor: pointer;
margin: 8px 5px;
- padding: 10px 20px;
+ padding: 10px 24px !important;
text-align: center;
font-size: 15px;
letter-spacing: 0px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
- -moz-border-radius: 20px 20px 20px 20px;
- -webkit-border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
.buttons input.next {
background-color: #2e7d3a;
@@ -181,13 +179,13 @@ button.ui-datepicker-trigger:hover { /* FOOTER */
#footer_survey {
- color: #505050;
- border-top: 3px #2e7d3a solid;
+ color: #333;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey a {
font-weight: normal;
text-decoration: none;
- color: #505050;
+ color: #333;
}
/* LOGO */
@@ -203,7 +201,7 @@ button.ui-datepicker-trigger:hover { margin: 10px auto 30px auto;
left: 0;
right: 0;
- background-image: url("../../../public/img/logo/1ka_slo.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat;
background-size: auto 100% !important;
background-position: center;
@@ -221,7 +219,19 @@ button.ui-datepicker-trigger:hover { }
#footer_survey #logo.english {
- background-image: url("../../../public/img/logo/1ka_eng.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+ background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+ background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
/*# sourceMappingURL=MobileGreen.css.map */
diff --git a/main/survey/skins/MobileOrange.css b/main/survey/skins/MobileOrange.css index 37c26a1..57c6727 100644 --- a/main/survey/skins/MobileOrange.css +++ b/main/survey/skins/MobileOrange.css @@ -8,26 +8,26 @@ */
/* Fonti */
body {
- font-family: Montserrat, Arial, Sans-Serif !important;
- color: #505050;
+ font-family: Source Sans Pro, sans-serif !important;
+ color: #333;
background-color: white;
}
span, label {
- color: #505050;
+ color: #333;
}
/* GLAVNI ELEMENTI */
#container h1 {
color: #ef6c00;
background-color: #ffffff;
- border-bottom: 8px #ef6c00 solid;
+ border-bottom: 2px #ef6c00 solid;
}
/* INPUT ELEMENTI */
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -48,17 +48,17 @@ input[type=radio] + span.enka-checkbox-radio, .grupa .spremenljivka {
background-color: white;
border: 0;
- border-bottom: 1px #ffa726 solid;
+ border-bottom: 1px #E5E5E5 solid;
/* Mejnik pri dvojni tabeli */
}
.grupa .spremenljivka:last-of-type {
border-bottom: 0;
}
.grupa .spremenljivka .naslov {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .naslov .spremenljivka_info {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .sequence_number {
background-color: #ffe9c9;
@@ -115,7 +115,7 @@ input[type=radio] + span.enka-checkbox-radio, }
.variable_holder .variabla {
- color: #505050;
+ color: #333;
}
/* Koledar */
@@ -145,21 +145,19 @@ button.ui-datepicker-trigger:hover { margin-top: 20px;
margin-bottom: 10px;
padding-top: 10px;
- border-top: 1px #ffa726 solid !important;
+ border-top: 1px #E5E5E5 solid !important;
}
.buttons input {
cursor: pointer;
margin: 8px 5px;
- padding: 10px 20px;
+ padding: 10px 24px !important;
text-align: center;
font-size: 15px;
letter-spacing: 0px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
- -moz-border-radius: 20px 20px 20px 20px;
- -webkit-border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
.buttons input.next {
background-color: #ef6c00;
@@ -181,13 +179,13 @@ button.ui-datepicker-trigger:hover { /* FOOTER */
#footer_survey {
- color: #505050;
- border-top: 3px #ef6c00 solid;
+ color: #333;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey a {
font-weight: normal;
text-decoration: none;
- color: #505050;
+ color: #333;
}
/* LOGO */
@@ -203,7 +201,7 @@ button.ui-datepicker-trigger:hover { margin: 10px auto 30px auto;
left: 0;
right: 0;
- background-image: url("../../../public/img/logo/1ka_slo.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat;
background-size: auto 100% !important;
background-position: center;
@@ -221,7 +219,19 @@ button.ui-datepicker-trigger:hover { }
#footer_survey #logo.english {
- background-image: url("../../../public/img/logo/1ka_eng.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+ background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+ background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
/*# sourceMappingURL=MobileOrange.css.map */
diff --git a/main/survey/skins/MobilePurple.css b/main/survey/skins/MobilePurple.css index c25c8db..f5e7a7b 100644 --- a/main/survey/skins/MobilePurple.css +++ b/main/survey/skins/MobilePurple.css @@ -9,26 +9,26 @@ */
/* Fonti */
body {
- font-family: Montserrat, Arial, Sans-Serif !important;
- color: #505050;
+ font-family: Source Sans Pro, sans-serif !important;
+ color: #333;
background-color: white;
}
span, label {
- color: #505050;
+ color: #333;
}
/* GLAVNI ELEMENTI */
#container h1 {
color: #4527a0;
background-color: #ffffff;
- border-bottom: 8px #4527a0 solid;
+ border-bottom: 2px #4527a0 solid;
}
/* INPUT ELEMENTI */
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -49,17 +49,17 @@ input[type=radio] + span.enka-checkbox-radio, .grupa .spremenljivka {
background-color: white;
border: 0;
- border-bottom: 1px #7e57c2 solid;
+ border-bottom: 1px #E5E5E5 solid;
/* Mejnik pri dvojni tabeli */
}
.grupa .spremenljivka:last-of-type {
border-bottom: 0;
}
.grupa .spremenljivka .naslov {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .naslov .spremenljivka_info {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .sequence_number {
background-color: #e3daf2;
@@ -116,7 +116,7 @@ input[type=radio] + span.enka-checkbox-radio, }
.variable_holder .variabla {
- color: #505050;
+ color: #333;
}
/* Koledar */
@@ -146,21 +146,19 @@ button.ui-datepicker-trigger:hover { margin-top: 20px;
margin-bottom: 10px;
padding-top: 10px;
- border-top: 1px #7e57c2 solid !important;
+ border-top: 1px #E5E5E5 solid !important;
}
.buttons input {
cursor: pointer;
margin: 8px 5px;
- padding: 10px 20px;
+ padding: 10px 24px !important;
text-align: center;
font-size: 15px;
letter-spacing: 0px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
- -moz-border-radius: 20px 20px 20px 20px;
- -webkit-border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
.buttons input.next {
background-color: #4527a0;
@@ -182,13 +180,13 @@ button.ui-datepicker-trigger:hover { /* FOOTER */
#footer_survey {
- color: #505050;
- border-top: 3px #4527a0 solid;
+ color: #333;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey a {
font-weight: normal;
text-decoration: none;
- color: #505050;
+ color: #333;
}
/* LOGO */
@@ -204,7 +202,7 @@ button.ui-datepicker-trigger:hover { margin: 10px auto 30px auto;
left: 0;
right: 0;
- background-image: url("../../../public/img/logo/1ka_slo.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat;
background-size: auto 100% !important;
background-position: center;
@@ -222,7 +220,19 @@ button.ui-datepicker-trigger:hover { }
#footer_survey #logo.english {
- background-image: url("../../../public/img/logo/1ka_eng.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+ background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+ background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
/*# sourceMappingURL=MobilePurple.css.map */
diff --git a/main/survey/skins/MobileRed.css b/main/survey/skins/MobileRed.css index c05ed57..c46f5aa 100644 --- a/main/survey/skins/MobileRed.css +++ b/main/survey/skins/MobileRed.css @@ -9,26 +9,26 @@ */
/* Fonti */
body {
- font-family: Montserrat, Arial, Sans-Serif !important;
- color: #505050;
+ font-family: Source Sans Pro, sans-serif !important;
+ color: #333;
background-color: white;
}
span, label {
- color: #505050;
+ color: #333;
}
/* GLAVNI ELEMENTI */
#container h1 {
color: #c62828;
background-color: #ffffff;
- border-bottom: 8px #c62828 solid;
+ border-bottom: 2px #c62828 solid;
}
/* INPUT ELEMENTI */
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -49,17 +49,17 @@ input[type=radio] + span.enka-checkbox-radio, .grupa .spremenljivka {
background-color: white;
border: 0;
- border-bottom: 1px #ef5350 solid;
+ border-bottom: 1px #E5E5E5 solid;
/* Mejnik pri dvojni tabeli */
}
.grupa .spremenljivka:last-of-type {
border-bottom: 0;
}
.grupa .spremenljivka .naslov {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .naslov .spremenljivka_info {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .sequence_number {
background-color: #fde6e6;
@@ -116,7 +116,7 @@ input[type=radio] + span.enka-checkbox-radio, }
.variable_holder .variabla {
- color: #505050;
+ color: #333;
}
/* Koledar */
@@ -146,21 +146,19 @@ button.ui-datepicker-trigger:hover { margin-top: 20px;
margin-bottom: 10px;
padding-top: 10px;
- border-top: 1px #ef5350 solid !important;
+ border-top: 1px #E5E5E5 solid !important;
}
.buttons input {
cursor: pointer;
margin: 8px 5px;
- padding: 10px 20px;
+ padding: 10px 24px !important;
text-align: center;
font-size: 15px;
letter-spacing: 0px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
- -moz-border-radius: 20px 20px 20px 20px;
- -webkit-border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
.buttons input.next {
background-color: #c62828;
@@ -182,13 +180,13 @@ button.ui-datepicker-trigger:hover { /* FOOTER */
#footer_survey {
- color: #505050;
- border-top: 3px #c62828 solid;
+ color: #333;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey a {
font-weight: normal;
text-decoration: none;
- color: #505050;
+ color: #333;
}
/* LOGO */
@@ -204,7 +202,7 @@ button.ui-datepicker-trigger:hover { margin: 10px auto 30px auto;
left: 0;
right: 0;
- background-image: url("../../../public/img/logo/1ka_slo.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat;
background-size: auto 100% !important;
background-position: center;
@@ -222,7 +220,19 @@ button.ui-datepicker-trigger:hover { }
#footer_survey #logo.english {
- background-image: url("../../../public/img/logo/1ka_eng.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+ background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+ background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
/*# sourceMappingURL=MobileRed.css.map */
diff --git a/main/survey/skins/MobileUni.css b/main/survey/skins/MobileUni.css index d7f4af8..3322414 100644 --- a/main/survey/skins/MobileUni.css +++ b/main/survey/skins/MobileUni.css @@ -9,26 +9,26 @@ */
/* Fonti */
body {
- font-family: Montserrat, Arial, Sans-Serif !important;
- color: #505050;
+ font-family: Source Sans Pro, sans-serif !important;
+ color: #333;
background-color: white;
}
span, label {
- color: #505050;
+ color: #333;
}
/* GLAVNI ELEMENTI */
#container h1 {
color: #666666;
background-color: #ffffff;
- border-bottom: 8px #666666 solid;
+ border-bottom: 2px #666666 solid;
}
/* INPUT ELEMENTI */
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -49,17 +49,17 @@ input[type=radio] + span.enka-checkbox-radio, .grupa .spremenljivka {
background-color: white;
border: 0;
- border-bottom: 1px #888888 solid;
+ border-bottom: 1px #E5E5E5 solid;
/* Mejnik pri dvojni tabeli */
}
.grupa .spremenljivka:last-of-type {
border-bottom: 0;
}
.grupa .spremenljivka .naslov {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .naslov .spremenljivka_info {
- color: #505050;
+ color: #333;
}
.grupa .spremenljivka .sequence_number {
background-color: #eeeeee;
@@ -116,7 +116,7 @@ input[type=radio] + span.enka-checkbox-radio, }
.variable_holder .variabla {
- color: #505050;
+ color: #333;
}
/* Koledar */
@@ -146,21 +146,19 @@ button.ui-datepicker-trigger:hover { margin-top: 20px;
margin-bottom: 10px;
padding-top: 10px;
- border-top: 1px #888888 solid !important;
+ border-top: 1px #E5E5E5 solid !important;
}
.buttons input {
cursor: pointer;
margin: 8px 5px;
- padding: 10px 20px;
+ padding: 10px 24px !important;
text-align: center;
font-size: 15px;
letter-spacing: 0px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
- -moz-border-radius: 20px 20px 20px 20px;
- -webkit-border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
.buttons input.next {
background-color: #666666;
@@ -182,13 +180,13 @@ button.ui-datepicker-trigger:hover { /* FOOTER */
#footer_survey {
- color: #505050;
- border-top: 3px #666666 solid;
+ color: #333;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey a {
font-weight: normal;
text-decoration: none;
- color: #505050;
+ color: #333;
}
/* LOGO */
@@ -204,7 +202,7 @@ button.ui-datepicker-trigger:hover { margin: 10px auto 30px auto;
left: 0;
right: 0;
- background-image: url("../../../public/img/logo/1ka_slo.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat;
background-size: auto 100% !important;
background-position: center;
@@ -222,12 +220,24 @@ button.ui-datepicker-trigger:hover { }
#footer_survey #logo.english {
- background-image: url("../../../public/img/logo/1ka_eng.svg");
+ background-image: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#footer_survey #logo.namestitev {
+ background-image: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#footer_survey #logo.namestitev.english {
+ background-image: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#footer_survey #logo.arnes {
+ background-image: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
/* Popravimo se logo */
#footer_survey #logo {
- background-image: url("../../../public/img/logo/uni.png");
+ background-image: url("../../../public/img/logo/uni.png") !important;
}
/*# sourceMappingURL=MobileUni.css.map */
diff --git a/main/survey/skins/Otroci3.css b/main/survey/skins/Otroci3.css index a8c1a23..5320137 100644 --- a/main/survey/skins/Otroci3.css +++ b/main/survey/skins/Otroci3.css @@ -1,309 +1,304 @@ -/*
- Tema Otroci 3
-*/
-/*$font_family: Open Sans, Arial, Sans-Serif;*/
-/* Barve */
-body {
- margin: 0;
- padding: 0;
- color: #333;
- font-size: 75%;
- font-family: Montserrat, Arial, Sans-Serif !important;
- background: #b0e8ff url(Otroci/otroci-3-footer.png) left bottom repeat-x;
-}
-
-body.preview, body.testdata {
- margin-top: 26px;
-}
-
-#outercontainer {
- width: 100%;
- padding-top: 130px;
- margin: 0 auto;
- min-height: 600px;
- background: url(Otroci/otroci-3-top.png) center top no-repeat;
-}
-
-#container {
- position: relative;
- width: 100%;
- width: 980px;
- margin: 0px auto 10px;
- background: #fff;
- -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
- -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
- box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
- border: 5px solid rgba(255, 255, 255, 0.5);
-}
-
-/* Warning bar (preview, cookie) */
-#cookie_alert, #test_alert {
- height: 26px;
- 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 50px;
- padding: 40px 0 0 0;
- font-size: 24px;
- color: #333;
- text-align: center;
-}
-
-h1.evalvacija {
- margin-bottom: 0;
-}
-
-#logo {
- position: absolute;
- top: -120px;
- left: -40px;
- width: 650px;
- height: 230px;
- background: url(Otroci/otroci-3-levo.png) left bottom no-repeat;
-}
-#logo #logo_right {
- display: inline;
- position: absolute;
- top: 102px;
- right: -475px;
- width: 158px;
- height: 311px;
- background: url(Otroci/otroci-3-desno.png) right bottom no-repeat;
-}
-
-.header_settings_holder {
- top: 0px;
- right: -105px;
- width: auto;
- height: 110px;
- padding-right: 150px;
- padding-bottom: 25px;
-}
-.header_settings_holder .progress_bar span {
- float: left !important;
- /* ie6,7 doesnt support inline-block */
- display: block;
- width: 20px;
- font-size: 11px;
- color: #333;
-}
-.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: #f26b16;
-}
-.header_settings_holder .progress_bar p a {
- color: #ef6c00;
- text-decoration: none;
-}
-.header_settings_holder .progress_bar p a:hover {
- color: #ff943d;
-}
-
-/* Spremenljivke */
-.spremenljivka {
- margin: 20px 10px 20px 10px;
- padding: 20px 2px 20px 12px !important;
- border-top: 1px #B9C5D9 solid;
-}
-.spremenljivka .naslov {
- padding-left: 5px;
- padding-bottom: 15px;
- font-size: 16px;
- font-weight: 600;
- color: #333;
-}
-.spremenljivka .naslov .spremenljivka_info {
- font-size: 70%;
-}
-
-.spremenljivka.limited {
- outline: 1px #F15A24 solid;
-}
-
-.required, .required_require, .required_limit {
- outline: 1px #F15A24 solid;
-}
-
-div.variabla,
-td.variabla,
-td.question,
-td.differential {
- font-size: 13px;
-}
-
-div.variable_holder {
- padding: 0 30px;
-}
-div.variable_holder thead,
-div.variable_holder tr.table-header {
- font-weight: 600;
-}
-div.variable_holder .frame_ranking {
- border: 1px #B9C5D9 solid;
- background-color: #f7f7f7;
-}
-div.variable_holder .frame_ranking_hover {
- border: 1px #8A9FBF solid;
- background-color: #e2e4e7;
-}
-
-table.grid_table tbody tr:nth-child(2n+1) {
- background-color: #f7f7f7;
-}
-
-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 #B9C5D9;
- border-radius: 3px;
- background-color: #fff;
-}
-
-button.ui-datepicker-trigger {
- color: #ef6c00;
-}
-button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
- color: #ff943d;
-}
-
-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: #777;
-}
-
-/* Photo upload button */
-button.record_foto {
- border: 2px solid #ef6c00;
-}
-button.record_foto::before {
- color: #ef6c00;
-}
-button.record_foto:hover, button.record_foto:focus {
- border-color: #ff943d;
-}
-button.record_foto:hover::before, button.record_foto:focus::before {
- color: #ff943d;
-}
-
-/* Gumbi na dnu */
-div.buttons {
- padding: 30px 20px 35px;
- margin: 0 10px;
- border-top: 1px #B9C5D9 solid;
-}
-div.buttons input {
- cursor: pointer;
- margin: 8px 10px;
- 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: #ef6c00;
- border: 1px solid #ef6c00;
- color: #fff;
-}
-div.buttons input.next:hover, div.buttons input.next:focus {
- background-color: #ff943d;
- border: 1px solid #ff943d;
- color: #fff;
-}
-div.buttons input.prev {
- background-color: #fff;
- border: 1px solid #ef6c00;
- color: #ef6c00;
-}
-div.buttons input.prev:hover, div.buttons input.prev:focus {
- background-color: #ef6c00;
- border: 1px solid #ef6c00;
- color: #fff;
-}
-
-/* Footer */
-#footer_survey {
- padding: 20px;
-}
-#footer_survey a, #footer_survey a:visited {
- color: #333;
- text-decoration: none;
-}
-#footer_survey a:hover, #footer_survey a:active {
- text-decoration: underline;
-}
-
-/* #Tablet (Portrait) */
-@media only screen and (min-width: 768px) and (max-width: 959px) {
- #container {
- width: 760px;
- }
-
- #logo {
- width: 550px;
- }
-}
-/* #Mobile (Portrait) */
-@media only screen and (max-width: 767px) {
- #container {
- width: 280px;
- }
-
- #logo {
- width: 350px;
- }
-}
-/* #Mobile (Landscape) */
-@media only screen and (min-width: 480px) and (max-width: 767px) {
- #container {
- width: 480px;
- }
-
- #logo {
- width: 450px;
- }
-}
-
-/*# sourceMappingURL=Otroci3.css.map */
+/* + Tema Otroci 3 +*/ +/* Barve */ +body { + margin: 0; + padding: 0; + color: #333; + font-size: 75%; + font-family: Montserrat, sans-serif !important; + background: #b0e8ff url(Otroci/otroci-3-footer.png) left bottom repeat-x; +} + +body.preview, body.testdata { + margin-top: 26px; +} + +#outercontainer { + width: 100%; + padding-top: 130px; + margin: 0 auto; + min-height: 600px; + background: url(Otroci/otroci-3-top.png) center top no-repeat; +} + +#container { + position: relative; + width: 100%; + width: 980px; + margin: 0px auto 10px; + background: #fff; + -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + border: 5px solid rgba(255, 255, 255, 0.5); +} + +/* Warning bar (preview, cookie) */ +#cookie_alert, #test_alert { + height: 26px; + 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 50px; + padding: 40px 0 0 0; + font-size: 24px; + color: #333; + text-align: center; +} + +h1.evalvacija { + margin-bottom: 0; +} + +#logo { + position: absolute; + top: -120px; + left: -40px; + width: 650px; + height: 230px; + background: url(Otroci/otroci-3-levo.png) left bottom no-repeat; +} +#logo #logo_right { + display: inline; + position: absolute; + top: 102px; + right: -475px; + width: 158px; + height: 311px; + background: url(Otroci/otroci-3-desno.png) right bottom no-repeat; +} + +.header_settings_holder { + top: 0px; + right: -105px; + width: auto; + height: 110px; + padding-right: 150px; + padding-bottom: 25px; +} +.header_settings_holder .progress_bar span { + float: left !important; /* ie6,7 doesnt support inline-block */ + display: block; + width: 20px; + font-size: 11px; + color: #333; +} +.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: #f26b16; +} +.header_settings_holder .progress_bar p a { + color: #ef6c00; + text-decoration: none; +} +.header_settings_holder .progress_bar p a:hover { + color: #ff943d; +} + +/* Spremenljivke */ +.spremenljivka { + margin: 20px 10px 20px 10px; + padding: 20px 2px 20px 12px !important; + border-top: 1px #B9C5D9 solid; +} +.spremenljivka .naslov { + padding-left: 5px; + padding-bottom: 15px; + font-size: 16px; + font-weight: 600; + color: #333; +} +.spremenljivka .naslov .spremenljivka_info { + font-size: 70%; +} + +.spremenljivka.limited { + outline: 1px #F15A24 solid; +} + +.required, .required_require, .required_limit { + outline: 1px #F15A24 solid; +} + +div.variabla, +td.variabla, +td.question, +td.differential { + font-size: 13px; +} + +div.variable_holder { + padding: 0 30px; +} +div.variable_holder thead, +div.variable_holder tr.table-header { + font-weight: 600; +} +div.variable_holder .frame_ranking { + border: 1px #B9C5D9 solid; + background-color: #f7f7f7; +} +div.variable_holder .frame_ranking_hover { + border: 1px #8A9FBF solid; + background-color: #e2e4e7; +} + +table.grid_table tbody tr:nth-child(2n+1) { + background-color: #f7f7f7; +} + +span.reminder { + left: 3px; +} + +/* Textboxi, textarea, select */ +input, textarea, select { + font-family: Montserrat, sans-serif !important; +} + +input[type=text], textarea, select { + padding: 10px 15px; + border-radius: 3px; + border: 1px solid #B9C5D9; + border-radius: 3px; + background-color: #fff; +} + +button.ui-datepicker-trigger { + color: #ef6c00; +} +button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { + color: #ff943d; +} + +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: #777; +} + +/* Photo upload button */ +button.record_foto { + border: 2px solid #ef6c00; +} +button.record_foto::before { + color: #ef6c00; +} +button.record_foto:hover, button.record_foto:focus { + border-color: #ff943d; +} +button.record_foto:hover::before, button.record_foto:focus::before { + color: #ff943d; +} + +/* Gumbi na dnu */ +div.buttons { + padding: 30px 20px 35px; + margin: 0 10px; + border-top: 1px #B9C5D9 solid; +} +div.buttons input { + cursor: pointer; + margin: 8px 10px; + 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: #ef6c00; + border: 1px solid #ef6c00; + color: #fff; +} +div.buttons input.next:hover, div.buttons input.next:focus { + background-color: #ff943d; + border: 1px solid #ff943d; + color: #fff; +} +div.buttons input.prev { + background-color: #fff; + border: 1px solid #ef6c00; + color: #ef6c00; +} +div.buttons input.prev:hover, div.buttons input.prev:focus { + background-color: #ef6c00; + border: 1px solid #ef6c00; + color: #fff; +} + +/* Footer */ +#footer_survey { + padding: 20px; +} +#footer_survey a, #footer_survey a:visited { + color: #333; + text-decoration: none; +} +#footer_survey a:hover, #footer_survey a:active { + text-decoration: underline; +} + +/* #Tablet (Portrait) */ +@media only screen and (min-width: 768px) and (max-width: 959px) { + #container { + width: 760px; + } + #logo { + width: 550px; + } +} +/* #Mobile (Portrait) */ +@media only screen and (max-width: 767px) { + #container { + width: 280px; + } + #logo { + width: 350px; + } +} +/* #Mobile (Landscape) */ +@media only screen and (min-width: 480px) and (max-width: 767px) { + #container { + width: 480px; + } + #logo { + width: 450px; + } +} + +/*# sourceMappingURL=Otroci3.css.map */ diff --git a/main/survey/skins/Otroci4.css b/main/survey/skins/Otroci4.css index 32cabe5..63e2282 100644 --- a/main/survey/skins/Otroci4.css +++ b/main/survey/skins/Otroci4.css @@ -1,293 +1,291 @@ -/*
- Tema Otroci 4
-*/
-/*$font_family: Open Sans, Arial, Sans-Serif;*/
-/* Barve */
-body {
- margin: 0;
- padding: 0;
- color: #333;
- font-size: 75%;
- font-family: Montserrat, Arial, Sans-Serif !important;
- background: #fff url(Otroci/otroci-4-footer.png) left bottom repeat-x;
-}
-
-body.preview, body.testdata {
- margin-top: 26px;
-}
-
-#outercontainer {
- width: 100%;
- padding-top: 130px;
- margin: 0 auto;
- background: url(Otroci/otroci-4-top.png) left top repeat-x;
-}
-
-#container {
- position: relative;
- width: 100%;
- width: 980px;
- margin: 0px auto 10px;
- background: #fff;
- -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
- -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
- box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5);
- border: 5px solid rgba(255, 255, 255, 0.5);
-}
-
-/* Warning bar (preview, cookie) */
-#cookie_alert, #test_alert {
- height: 26px;
- 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 50px;
- padding: 40px 0 0 0;
- font-size: 24px;
- color: #333;
- text-align: center;
-}
-
-h1.evalvacija {
- margin-bottom: 0;
-}
-
-#logo {
- position: absolute;
- top: -50px;
- left: -20px;
-}
-#logo #logo_right {
- display: inline;
- position: absolute;
- top: 31px;
- right: -125px;
- width: 158px;
- height: 311px;
- background: url(Otroci/otroci-3-desno.png) right bottom no-repeat;
-}
-
-.header_settings_holder {
- top: 0px;
- right: -105px;
- width: auto;
- height: 110px;
- padding-right: 150px;
- padding-bottom: 25px;
-}
-.header_settings_holder .progress_bar span {
- float: left !important;
- /* ie6,7 doesnt support inline-block */
- display: block;
- width: 20px;
- font-size: 11px;
- color: #333;
-}
-.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: #f26b16;
-}
-.header_settings_holder .progress_bar p a {
- color: #ef6c00;
- text-decoration: none;
-}
-.header_settings_holder .progress_bar p a:hover {
- color: #ff943d;
-}
-
-/* Spremenljivke */
-.spremenljivka {
- margin: 20px 10px 20px 10px;
- padding: 20px 2px 20px 12px !important;
- border-top: 1px #B9C5D9 solid;
-}
-.spremenljivka .naslov {
- padding-left: 5px;
- padding-bottom: 15px;
- font-size: 16px;
- font-weight: 600;
- color: #333;
-}
-.spremenljivka .naslov .spremenljivka_info {
- font-size: 70%;
-}
-
-.spremenljivka.limited {
- outline: 1px #F15A24 solid;
-}
-
-.required, .required_require, .required_limit {
- outline: 1px #F15A24 solid;
-}
-
-div.variabla,
-td.variabla,
-td.question,
-td.differential {
- font-size: 13px;
-}
-
-div.variable_holder {
- padding: 0 30px;
-}
-div.variable_holder thead,
-div.variable_holder tr.table-header {
- font-weight: 600;
-}
-div.variable_holder .frame_ranking {
- border: 1px #B9C5D9 solid;
- background-color: #f7f7f7;
-}
-div.variable_holder .frame_ranking_hover {
- border: 1px #8A9FBF solid;
- background-color: #e2e4e7;
-}
-
-table.grid_table tbody tr:nth-child(2n+1) {
- background-color: #f7f7f7;
-}
-
-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 #B9C5D9;
- border-radius: 3px;
- background-color: #fff;
-}
-
-button.ui-datepicker-trigger {
- color: #ef6c00;
-}
-button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus {
- color: #ff943d;
-}
-
-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: #777;
-}
-
-/* Photo upload button */
-button.record_foto {
- border: 2px solid #ef6c00;
-}
-button.record_foto::before {
- color: #ef6c00;
-}
-button.record_foto:hover, button.record_foto:focus {
- border-color: #ff943d;
-}
-button.record_foto:hover::before, button.record_foto:focus::before {
- color: #ff943d;
-}
-
-/* Gumbi na dnu */
-div.buttons {
- padding: 30px 20px 35px;
- margin: 0 10px;
- border-top: 1px #B9C5D9 solid;
-}
-div.buttons input {
- cursor: pointer;
- margin: 8px 10px;
- 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: #ef6c00;
- border: 1px solid #ef6c00;
- color: #fff;
-}
-div.buttons input.next:hover, div.buttons input.next:focus {
- background-color: #ff943d;
- border: 1px solid #ff943d;
- color: #fff;
-}
-div.buttons input.prev {
- background-color: #fff;
- border: 1px solid #ef6c00;
- color: #ef6c00;
-}
-div.buttons input.prev:hover, div.buttons input.prev:focus {
- background-color: #ef6c00;
- border: 1px solid #ef6c00;
- color: #fff;
-}
-
-/* Footer */
-#footer_survey {
- padding: 20px;
-}
-#footer_survey a, #footer_survey a:visited {
- color: #333;
- text-decoration: none;
-}
-#footer_survey a:hover, #footer_survey a:active {
- text-decoration: underline;
-}
-
-/* #Tablet (Portrait) */
-@media only screen and (min-width: 768px) and (max-width: 959px) {
- #container {
- width: 760px;
- }
-}
-/* #Mobile (Portrait) */
-@media only screen and (max-width: 767px) {
- #container {
- width: 280px;
- }
-}
-/* #Mobile (Landscape) */
-@media only screen and (min-width: 480px) and (max-width: 767px) {
- #container {
- width: 480px;
- }
-}
-
-/*# sourceMappingURL=Otroci4.css.map */
+/* + Tema Otroci 4 +*/ +/* Barve */ +body { + margin: 0; + padding: 0; + color: #333; + font-size: 75%; + font-family: Montserrat, sans-serif !important; + background: #fff url(Otroci/otroci-4-footer.png) left bottom repeat-x; +} + +body.preview, body.testdata { + margin-top: 26px; +} + +#outercontainer { + width: 100%; + padding-top: 130px; + margin: 0 auto; + background: url(Otroci/otroci-4-top.png) left top repeat-x; +} + +#container { + position: relative; + width: 100%; + width: 980px; + margin: 0px auto 10px; + background: #fff; + -webkit-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + -moz-box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + box-shadow: 0px 0px 5px rgba(0, 0, 0, 0.5); + border: 5px solid rgba(255, 255, 255, 0.5); +} + +/* Warning bar (preview, cookie) */ +#cookie_alert, #test_alert { + height: 26px; + 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 50px; + padding: 40px 0 0 0; + font-size: 24px; + color: #333; + text-align: center; +} + +h1.evalvacija { + margin-bottom: 0; +} + +#logo { + position: absolute; + top: -50px; + left: -20px; +} +#logo #logo_right { + display: inline; + position: absolute; + top: 31px; + right: -125px; + width: 158px; + height: 311px; + background: url(Otroci/otroci-3-desno.png) right bottom no-repeat; +} + +.header_settings_holder { + top: 0px; + right: -105px; + width: auto; + height: 110px; + padding-right: 150px; + padding-bottom: 25px; +} +.header_settings_holder .progress_bar span { + float: left !important; /* ie6,7 doesnt support inline-block */ + display: block; + width: 20px; + font-size: 11px; + color: #333; +} +.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: #f26b16; +} +.header_settings_holder .progress_bar p a { + color: #ef6c00; + text-decoration: none; +} +.header_settings_holder .progress_bar p a:hover { + color: #ff943d; +} + +/* Spremenljivke */ +.spremenljivka { + margin: 20px 10px 20px 10px; + padding: 20px 2px 20px 12px !important; + border-top: 1px #B9C5D9 solid; +} +.spremenljivka .naslov { + padding-left: 5px; + padding-bottom: 15px; + font-size: 16px; + font-weight: 600; + color: #333; +} +.spremenljivka .naslov .spremenljivka_info { + font-size: 70%; +} + +.spremenljivka.limited { + outline: 1px #F15A24 solid; +} + +.required, .required_require, .required_limit { + outline: 1px #F15A24 solid; +} + +div.variabla, +td.variabla, +td.question, +td.differential { + font-size: 13px; +} + +div.variable_holder { + padding: 0 30px; +} +div.variable_holder thead, +div.variable_holder tr.table-header { + font-weight: 600; +} +div.variable_holder .frame_ranking { + border: 1px #B9C5D9 solid; + background-color: #f7f7f7; +} +div.variable_holder .frame_ranking_hover { + border: 1px #8A9FBF solid; + background-color: #e2e4e7; +} + +table.grid_table tbody tr:nth-child(2n+1) { + background-color: #f7f7f7; +} + +span.reminder { + left: 3px; +} + +/* Textboxi, textarea, select */ +input, textarea, select { + font-family: Montserrat, sans-serif !important; +} + +input[type=text], textarea, select { + padding: 10px 15px; + border-radius: 3px; + border: 1px solid #B9C5D9; + border-radius: 3px; + background-color: #fff; +} + +button.ui-datepicker-trigger { + color: #ef6c00; +} +button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { + color: #ff943d; +} + +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: #777; +} + +/* Photo upload button */ +button.record_foto { + border: 2px solid #ef6c00; +} +button.record_foto::before { + color: #ef6c00; +} +button.record_foto:hover, button.record_foto:focus { + border-color: #ff943d; +} +button.record_foto:hover::before, button.record_foto:focus::before { + color: #ff943d; +} + +/* Gumbi na dnu */ +div.buttons { + padding: 30px 20px 35px; + margin: 0 10px; + border-top: 1px #B9C5D9 solid; +} +div.buttons input { + cursor: pointer; + margin: 8px 10px; + 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: #ef6c00; + border: 1px solid #ef6c00; + color: #fff; +} +div.buttons input.next:hover, div.buttons input.next:focus { + background-color: #ff943d; + border: 1px solid #ff943d; + color: #fff; +} +div.buttons input.prev { + background-color: #fff; + border: 1px solid #ef6c00; + color: #ef6c00; +} +div.buttons input.prev:hover, div.buttons input.prev:focus { + background-color: #ef6c00; + border: 1px solid #ef6c00; + color: #fff; +} + +/* Footer */ +#footer_survey { + padding: 20px; +} +#footer_survey a, #footer_survey a:visited { + color: #333; + text-decoration: none; +} +#footer_survey a:hover, #footer_survey a:active { + text-decoration: underline; +} + +/* #Tablet (Portrait) */ +@media only screen and (min-width: 768px) and (max-width: 959px) { + #container { + width: 760px; + } +} +/* #Mobile (Portrait) */ +@media only screen and (max-width: 767px) { + #container { + width: 280px; + } +} +/* #Mobile (Landscape) */ +@media only screen and (min-width: 480px) and (max-width: 767px) { + #container { + width: 480px; + } +} + +/*# sourceMappingURL=Otroci4.css.map */ diff --git a/main/survey/skins/Uni.css b/main/survey/skins/Uni.css index 182f2a0..8c91143 100644 --- a/main/survey/skins/Uni.css +++ b/main/survey/skins/Uni.css @@ -6,13 +6,14 @@ /*
Osnovna tema ankete - 1ka - brez definiranih barv
*/
+/* Barve */
/* Fonti */
body {
margin: 0;
padding: 0;
- color: #505050;
+ color: #333333;
font-size: 100%;
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
background: #ffffff;
}
@@ -28,13 +29,15 @@ body.preview, body.testdata { position: absolute;
width: 100%;
height: 80px;
- border-bottom: 6px #666666 solid;
+ border-bottom: 2px #666666 solid;
}
#outercontainer #container {
position: relative;
width: 100%;
max-width: 1200px;
- margin: 0px auto 10px;
+ margin: 0px auto;
+ padding: 0 16px;
+ box-sizing: border-box;
}
/* Warning bar (preview, cookie) */
@@ -69,12 +72,14 @@ body.preview, body.testdata { /* Header - logo, naslov, progressbar */
h1 {
- margin: 0px auto 30px;
- padding: 120px 0 50px 0;
- font-size: 28px;
+ margin: 0px auto;
+ padding: 114px 0 32px 0;
+ font-size: 32px;
+ font-weight: 600;
+ line-height: 40px;
color: #666666;
text-align: center;
- border-bottom: 1px solid #eeeeee;
+ border-bottom: 1px solid #E5E5E5;
}
h1.evalvacija {
@@ -83,10 +88,10 @@ h1.evalvacija { #logo {
right: auto;
- left: 25px;
+ left: 16px;
top: 13px;
max-height: 56px !important;
- background: url("../../../public/img/logo/1ka_slo.svg");
+ background: url("../../../public/img/logo/1ka_logo_slo.svg");
background-repeat: no-repeat !important;
background-size: auto 100% !important;
}
@@ -96,7 +101,19 @@ h1.evalvacija { }
#logo.english {
- background: url("../../../public/img/logo/1ka_eng.svg");
+ background: url("../../../public/img/logo/1ka_logo_eng.svg");
+}
+
+#logo.namestitev {
+ background: url("../../../public/img/logo/1ka_logo_namestitev.svg");
+}
+
+#logo.namestitev.english {
+ background: url("../../../public/img/logo/1ka_logo_installation.svg");
+}
+
+#logo.arnes {
+ background: url("../../../public/img/logo/1ka_logo_arnes.svg");
}
.header_settings_holder {
@@ -105,11 +122,11 @@ h1.evalvacija { left: auto;
}
.header_settings_holder .progress_bar span {
- float: left !important;
- /* ie6,7 doesnt support inline-block */
+ float: left !important; /* ie6,7 doesnt support inline-block */
display: block;
width: 20px;
- font-size: 11px;
+ font-size: 14px;
+ line-height: 16px;
color: #6D87AF;
}
.header_settings_holder .progress_bar div {
@@ -144,21 +161,38 @@ h1.evalvacija { color: #8c8c8c;
}
+/* Uvod in zakljucek */
+.intro .spremenljivka .naslov,
+.concl .spremenljivka .naslov {
+ margin: 0;
+}
+
+#continue_later input[type=email],
+#return_edit input[type=email] {
+ margin-left: 4px;
+}
+#continue_later button,
+#return_edit button {
+ padding: 7px 20px;
+ margin-left: 4px;
+}
+
/* Spremenljivke */
.spremenljivka {
- margin: 20px 10px 20px 10px;
- padding: 20px 2px 50px 12px !important;
- border-bottom: 1px #eeeeee solid;
+ margin: 0;
+ padding: 48px 16px !important;
+ border-bottom: 1px #E5E5E5 solid;
}
.spremenljivka .naslov {
- padding: 5px 0 15px 5px;
- font-size: 18px;
+ padding: 0 !important;
+ margin: 0 0 24px 0;
+ font-size: 20px;
font-weight: 600;
}
.spremenljivka .naslov .spremenljivka_info {
font-size: 14px;
font-weight: 400;
- padding-top: 7px;
+ padding-top: 8px;
}
.spremenljivka .sequence_number {
background-color: #eeeeee;
@@ -183,6 +217,10 @@ h1.evalvacija { .spremenljivka .arrow:hover {
color: #8c8c8c;
}
+.spremenljivka span.reminder {
+ left: 3px;
+ text-indent: 0;
+}
.spremenljivka.limited {
outline: 1px #F15A24 solid;
@@ -192,55 +230,97 @@ h1.evalvacija { outline: 1px #F15A24 solid;
}
+.spremenljivka.tip_1 .variabla,
+.spremenljivka.tip_2 .variabla {
+ display: flex;
+ align-items: center;
+}
+.spremenljivka.tip_1 .variabla.floatLeft,
+.spremenljivka.tip_2 .variabla.floatLeft {
+ margin-right: 16px;
+}
+.spremenljivka.tip_1 .variabla label,
+.spremenljivka.tip_2 .variabla label {
+ display: flex;
+ line-height: 23px;
+}
+.spremenljivka.tip_1 .variabla input[type=text].input_other,
+.spremenljivka.tip_1 .variabla textarea.input_other,
+.spremenljivka.tip_2 .variabla input[type=text].input_other,
+.spremenljivka.tip_2 .variabla textarea.input_other {
+ margin: 0 0 0 8px;
+}
+.spremenljivka.tip_1 .custom_radio_picture,
+.spremenljivka.tip_1 .visual-radio-scale,
+.spremenljivka.tip_2 .custom_radio_picture,
+.spremenljivka.tip_2 .visual-radio-scale {
+ display: inline-block;
+ margin-right: 24px;
+}
+.spremenljivka.tip_1 .custom_radio_picture label,
+.spremenljivka.tip_1 .visual-radio-scale label,
+.spremenljivka.tip_2 .custom_radio_picture label,
+.spremenljivka.tip_2 .visual-radio-scale label {
+ display: inline-block !important;
+}
+
+.spremenljivka.tip_7 input.width_100:not(:first-of-type) {
+ margin-top: 16px;
+}
+
+.variabla.missing:first-of-type {
+ margin-top: 16px;
+}
+
+.spremenljivka .variabla.missing label {
+ padding: 0;
+}
+
div.variabla,
td.variabla,
td.question,
td.differential,
.variabla_sum label {
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder {
- padding: 10px 0 0 0;
+ padding: 0 !important;
+}
+div.variable_holder .variabla {
+ padding: 0;
+ margin-bottom: 16px;
+}
+div.variable_holder .variabla:last-child {
+ margin-bottom: 0;
}
div.variable_holder thead,
div.variable_holder tr.table-header {
font-weight: normal;
- font-size: 14px;
+ font-size: 16px;
}
div.variable_holder thead td,
div.variable_holder tr.table-header td {
padding: 10px 5px;
}
-table.grid_table thead tr td {
- border-bottom: 2px #888888 solid;
-}
-table.grid_table thead tr.middle_row td {
- border-top: 2px #888888 solid;
-}
table.grid_table tbody tr.table-header td {
- border-bottom: 2px #888888 solid;
border-top: 2px #888888 solid;
background-color: #ffffff;
}
table.grid_table tbody tr:nth-child(2n+1) {
- background-color: #ffffff;
+ background-color: #eeeeee;
}
table.grid_table tbody tr:nth-child(2n) {
- background-color: #eeeeee;
+ background-color: #ffffff;
}
table.grid_table td {
- padding: 10px 10px;
-}
-
-span.reminder {
- left: 3px;
+ padding: 12px 16px;
}
/* Textboxi, textarea, select */
input, textarea, select {
- font-family: Montserrat, Arial, Sans-Serif !important;
+ font-family: Source Sans Pro, sans-serif !important;
}
input[type=text], textarea, select {
@@ -253,7 +333,6 @@ input[type=text], textarea, select { /* ranking */
.dropzone {
- border-top: 1px #eeeeee solid;
margin-top: 12px;
padding-top: 17px;
}
@@ -273,8 +352,8 @@ table.ranking_table ul { .frame_dropping,
.frame_dropping_hover,
.frame_moving {
- font-size: 13px;
- padding: 7px 10px 9px;
+ font-size: 16px;
+ padding: 8px 12px 14px;
border: 2px solid #666666;
background-color: #ffffff;
}
@@ -298,7 +377,7 @@ div.variable_holder .frame_dropping_hover { }
table.ranking_table b {
- font-size: 13px;
+ font-size: 16px;
font-weight: 600;
}
@@ -330,7 +409,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Slider */
.grupa .spremenljivka .ui-slider-pips .ui-slider-pip {
- color: #505050;
+ color: #333333;
}
.grupa .spremenljivka .slider.ui-widget-content {
/*background-color: $color_light !important;*/
@@ -355,7 +434,7 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { }
.grupa .spremenljivka .sliderText {
padding-top: 2px;
- color: #505050;
+ color: #333333;
background-color: #888888;
border: 0;
}
@@ -384,21 +463,20 @@ button.ui-datepicker-trigger:hover, button.ui-datepicker-trigger:focus { /* Gumbi na dnu */
div.buttons {
- padding: 20px 20px 35px;
- margin: 0 10px;
+ padding: 64px 0;
+ margin: 0;
}
div.buttons input {
cursor: pointer;
margin: 8px 10px;
- /*padding: 7px 11px;*/
- padding: 10px 20px;
+ padding: 0 32px;
+ height: 40px;
text-align: center;
- font-size: 12px;
- letter-spacing: 1px;
+ font-size: 16px;
font-weight: 600;
color: #FFFFFF;
- border-radius: 20px;
border: 0;
+ transition: 0.3s;
}
div.buttons input.next {
background-color: #666666;
@@ -420,12 +498,12 @@ div.buttons input.prev:hover, div.buttons input.prev:focus { /* Footer */
#footer_survey {
- padding: 40px;
+ padding: 48px 0 64px 0;
background-color: #ffffff;
- border-top: 1px #eeeeee solid;
+ border-top: 1px #E5E5E5 solid;
}
#footer_survey p, #footer_survey a, #footer_survey a:visited {
- color: #505050;
+ color: #333333;
font-size: 14px;
line-height: 25px;
font-weight: 400;
@@ -472,16 +550,16 @@ textarea:focus { }
.frame_dropping_titles {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
border-top: 2px solid #b9c5d9;
border-left: 2px solid #b9c5d9;
border-right: 2px solid #b9c5d9;
- font-size: 13px;
+ font-size: 16px;
}
.drag_and_drop_box {
@@ -509,16 +587,17 @@ textarea:focus { }
.frame_dropping_titles_box {
- width: 240px;
+ width: 244px;
padding: 5px;
margin: 0px auto 0px auto;
- height: 15px;
+ height: 20px;
text-align: center;
background-color: #FFFFFF;
- font-size: 13px;
+ font-size: 16px;
}
.frame_dropping {
+ width: 234px;
padding: 7px 10px 9px;
}
@@ -528,7 +607,7 @@ textarea:focus { /* Popravimo se logo */
#logo, #logo.english {
- background-image: url("../../../public/img/logo/uni.png");
+ background-image: url("../../../public/img/logo/uni.png") !important;
}
/*# sourceMappingURL=Uni.css.map */
diff --git a/main/survey/skins/glasovanje/Classic.css b/main/survey/skins/glasovanje/Classic.css index c0c943f..4d31084 100644 --- a/main/survey/skins/glasovanje/Classic.css +++ b/main/survey/skins/glasovanje/Classic.css @@ -36,7 +36,7 @@ }
.spol_buttons input{
cursor: pointer;
- width: 75px;
+ width: 80px;
padding: 2px;
margin: 0 4px 0 4px;
diff --git a/main/survey/skins/glasovanje/Modern.css b/main/survey/skins/glasovanje/Modern.css index 9face9a..a081a28 100644 --- a/main/survey/skins/glasovanje/Modern.css +++ b/main/survey/skins/glasovanje/Modern.css @@ -31,8 +31,9 @@ text-align: center;
}
.spol_buttons input{
- width: 60px;
+ width: 80px;
margin: 0 2px 0 2px;
+ padding: 2px;
}
.spol_buttons input.active{
font-weight: bold;
diff --git a/main/survey/uporabnost.php b/main/survey/uporabnost.php index 413746d..e5ba09f 100644 --- a/main/survey/uporabnost.php +++ b/main/survey/uporabnost.php @@ -14,7 +14,8 @@ echo ' <title>OneClick Survey</title>'."\n\r"; echo ' <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />'."\n\r";
echo '</head>';
-$anketa = $_GET['anketa'];
+$anketa_hash = $_GET['anketa'];
+$anketa = getSurveyIdFromHash($anketa_hash);
$sql = sisplet_query("SELECT uporabnost_link FROM srv_anketa WHERE id = '$anketa'");
$row = mysqli_fetch_array($sql);
@@ -26,13 +27,13 @@ if (true || ($row['uporabnost_link'] != null && $row['uporabnost_link'] != "")) echo '
<frameset '.($uporabnost_razdeli!=1?'rows':'cols').'="50%,50%">
<frame name="link" src="'.(strlen($row['uporabnost_link'])>7?$row['uporabnost_link']:'').'">
- <frame name="survey" src="'.$site_url.'main/survey/index.php?anketa='.$anketa.''.($_GET['preview']=='on'?'&preview=on':'').''.(isset($_GET['sist_link'])?'&sist_link='.$_GET['sist_link']:'').(isset($_GET['code'])?'&code='.$_GET['code']:'').'">
+ <frame name="survey" src="'.$site_url.'main/survey/index.php?anketa='.$anketa_hash.''.($_GET['preview']=='on'?'&preview=on':'').''.(isset($_GET['sist_link'])?'&sist_link='.$_GET['sist_link']:'').(isset($_GET['code'])?'&code='.$_GET['code']:'').'">
</frameset>
';
} else {
echo '
<frameset>
- <frame name="survey" src="'.$site_url.'main/survey/index.php?anketa='.$anketa.''.($_GET['preview']=='on'?'&preview=on':'').''.(isset($_GET['sist_link'])?'&sist_link='.$_GET['sist_link']:'').(isset($_GET['code'])?'&code='.$_GET['code']:'').'">
+ <frame name="survey" src="'.$site_url.'main/survey/index.php?anketa='.$anketa_hash.''.($_GET['preview']=='on'?'&preview=on':'').''.(isset($_GET['sist_link'])?'&sist_link='.$_GET['sist_link']:'').(isset($_GET['code'])?'&code='.$_GET['code']:'').'">
</frameset>
';
}
|
