diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 9fe80b8c6..690ebc1a9 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -495,7 +495,7 @@ class SurveyAdmin // REKODIRANJE - echo '
'; + echo '
'; echo '
'; diff --git a/admin/survey/classes/class.RecodeValues.php b/admin/survey/classes/class.RecodeValues.php index d10b90caf..8709750f9 100644 --- a/admin/survey/classes/class.RecodeValues.php +++ b/admin/survey/classes/class.RecodeValues.php @@ -444,7 +444,7 @@ class RecodeValues { echo '
  • '; echo ''; printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']); - echo ' '; foreach (self::$_operators AS $value => $operator) { $selected = ($value == '0') ? ' selected="selected"' : ''; echo ''; @@ -462,7 +462,7 @@ class RecodeValues { echo ' '.$lang['srv_recode_number_to']; - echo ''; foreach (self::$options AS $oKey => $option) { if ($option['variable'] == null && $oKey != '_0_') { echo ''; @@ -494,7 +494,7 @@ class RecodeValues { echo '
  • '; echo ''; printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']); - echo ' '; foreach (self::$_operators AS $value => $operator) { $selected = ($value == '0') ? ' selected="selected"' : ''; echo ''; @@ -514,7 +514,7 @@ class RecodeValues { # imamo rekodiranje v novo spremenljivko $recode['vred_id'] = '-1'; - echo ''; if (is_array($new_spr_vrednosti) && count($new_spr_vrednosti)>0) { foreach ($new_spr_vrednosti AS $oKey => $option) { if ($option['variable'] == null) { @@ -667,12 +667,12 @@ class RecodeValues { } $sugestedName = strip_tags(self::$cacheSpremenljivka['naslov'].' - recoded'); echo'
    '; - echo ''; + echo ''; if ( $_GET['t'] == 'charts' || $_POST['recIsCharts'] == 1 ) { echo $lang['srv_recode_to_spr_same']; } else { - echo ''; - echo ''; + echo ''; + echo ''; } echo '
    '; if ((int)$recode_type == 1) { @@ -680,12 +680,12 @@ class RecodeValues { echo''; if ((int)$to_spr_id == 0) { - echo '
    '; - echo $lang['srv_recode_to_spr_add_spr'].'
    '; + echo '
    '; + //echo $lang['srv_recode_to_spr_add_spr'].'
    '; echo '
    '; - echo '

    '.$lang['srv_recode_to_spr_name'].' '; + echo '

    '.$lang['srv_recode_to_spr_name'].' '; #echo ''.$lang['add'].''; - echo ''; + echo ''; echo '

    '; echo '
    '; echo '
    '; @@ -708,7 +708,6 @@ class RecodeValues { } echo ''; } - echo'
    '; } if ( $displayType == 1 ) { if (count(self::$variables)> 0) { @@ -753,7 +752,7 @@ class RecodeValues { echo ''; if ((int)$recode_type == 0) { # imamo klasično rekodiranje - echo ''; foreach (self::$options AS $oKey => $option) { if ($option['variable'] == null) { @@ -774,7 +773,7 @@ class RecodeValues { if (!isset($recodedFrom[$vKey])) { $recodedFrom[$vKey] = '-1'; } - echo ''; if (is_array($new_spr_vrednosti) && count($new_spr_vrednosti)>0) { foreach ($new_spr_vrednosti AS $oKey => $option) { if ($option['variable'] == null) { @@ -816,7 +815,7 @@ class RecodeValues { echo '
  • '; echo ''; printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']); - echo ' '; foreach (self::$_operators AS $value => $operator) { $selected = ($value == $recode['operator']) ? ' selected="selected"' : ''; echo ''; @@ -834,7 +833,7 @@ class RecodeValues { echo ' '.$lang['srv_recode_number_to']; $is_missing_value = false; - echo ''; foreach (self::$options AS $oKey => $option) { if ($oKey == '_0_' || $oKey == '_1_' || $oKey == '_2_') { # privzeto izberemo prvi odgovor - veljavni, nato spodaj popravimo @@ -875,7 +874,7 @@ class RecodeValues { echo '
  • '; echo ''; printf($lang['srv_recode_number_if'],self::$cacheSpremenljivka['variable']); - echo ' '; foreach (self::$_operators AS $value => $operator) { $selected = ($value == $recode['operator']) ? ' selected="selected"' : ''; echo ''; @@ -896,7 +895,7 @@ class RecodeValues { $recodedFrom[$rKey] = '-1'; } # imamo rekodiranje v novo spremenljivko - echo ''; if (is_array($new_spr_vrednosti) && count($new_spr_vrednosti)>0) { foreach ($new_spr_vrednosti AS $oKey => $option) { if ($option['variable'] == null) { diff --git a/admin/survey/classes/class.SurveyRecoding.php b/admin/survey/classes/class.SurveyRecoding.php index 29f368de8..92c42207e 100644 --- a/admin/survey/classes/class.SurveyRecoding.php +++ b/admin/survey/classes/class.SurveyRecoding.php @@ -268,12 +268,12 @@ class SurveyRecoding $vmv = new RecodeValues($this->anketa,$spr_id); $vmv->DisplayMissingValuesForQuestion(); #echo ''; - - echo '
    '; - echo ''; - echo ''; - echo '
    '; + + echo '
    '; + echo ''; + echo ''; echo '
    '; + } else { echo 'Napaka!'; } diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 33b54338e..4d7c5af07 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -8352,6 +8352,10 @@ fieldset.statusProfileFieldset .setting_holder.disabled .setting_item label { color: #C4C4C4; } +#rec_spremenljivka_naslov { + margin-right: 4px; +} + /* Header scss - top line, menu... */ diff --git a/resources/sass/admin_new/components/popup/page_specific.scss b/resources/sass/admin_new/components/popup/page_specific.scss index a710c9bd4..0bf3ae3a3 100644 --- a/resources/sass/admin_new/components/popup/page_specific.scss +++ b/resources/sass/admin_new/components/popup/page_specific.scss @@ -258,7 +258,7 @@ div#div_analiza_archive_name { } -/////PODATKI/////@ +/////PODATKI///// //Javna povezava #div_survey_links { min-width: 600px; @@ -311,4 +311,10 @@ fieldset.statusProfileFieldset { } } +} + +//Izračuni + +#rec_spremenljivka_naslov { + margin-right: 4px; } \ No newline at end of file