diff --git a/admin/survey/classes/class.SurveyStaticHtml.php b/admin/survey/classes/class.SurveyStaticHtml.php index e2c922c87..39f905ded 100644 --- a/admin/survey/classes/class.SurveyStaticHtml.php +++ b/admin/survey/classes/class.SurveyStaticHtml.php @@ -334,14 +334,17 @@ class SurveyStaticHtml $borderLeft = ' class="borderLeft"'; } // Preklop na vpogled, hitri seznam, spremenljivke (podatki) - elseif ($podstran == 'data') { + elseif ($podstran == 'data' || $podstran == 'quick_edit' || $podstran == 'variables') { echo '
'; + // Link na osnovno tabelo s podatki + echo ''.$lang['srv_lnk_data'].''; + // Link na vpogled - echo ''.$lang['srv_lnk_vpogled'].''; + echo ''.$lang['srv_lnk_vpogled'].''; // Link na spremenljivke - echo ''.$lang['srv_lnk_pregled_variabel'].''; + echo ''.$lang['srv_lnk_pregled_variabel'].''; // Link na hitri seznam echo ''.$lang['srv_data_print_preview_link'].' '.Help:: display('srv_data_print_preview').''; @@ -349,31 +352,7 @@ class SurveyStaticHtml echo '
'; $borderLeft = ' class="borderLeft"'; - } - // Link nazaj na podatke - vpogled - elseif ($podstran == 'quick_edit') { - echo '
'; - - echo ''; - - echo ''.$lang['srv_data_title_quick_view'].''; - - echo '
'; - - $borderLeft = ' class="borderLeft"'; - } - // Link nazaj na podatke - Spremenljivke - elseif ($podstran == 'variables') { - echo '
'; - - echo ''; - - echo ''.$lang['srv_data_title_variable_view'].''; - - echo '
'; - - $borderLeft = ' class="borderLeft"'; - } + } // Link nazaj na diagnostiko - Ocenjevanje trajanja elseif ($podstran == 'ocena_trajanja') { echo '
'; diff --git a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php index 6ed375553..0eb32fe70 100644 --- a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php +++ b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php @@ -2604,22 +2604,11 @@ class SurveyDataDisplay{ echo ""."\n"; } - echo '
'; - echo '
'; - // title - echo '
'; - - //echo $rowa['naslov']; - if (self::$quickEdit_recnum[3]['hasPrev'] == true) { - echo ''; - } - echo 'Recnum '.self::$quickEdit_recnum[2]; - if (self::$quickEdit_recnum[3]['hasNext'] == true) { - echo ''; - } - - echo '
'; + echo '
'; + + + echo '
'; if ($quick_view == false) { echo '
'."\n"; @@ -2738,33 +2727,33 @@ class SurveyDataDisplay{ while (get('grupa') != \App\Controllers\FindController::getInstance()->findNextGrupa() && (\App\Controllers\FindController::getInstance()->findNextGrupa() > 0 || (get('loop_id') != null && \App\Controllers\FindController::getInstance()->findNextLoopId() != null))); } - if ($quick_view == false) { - //echo ' ';... - echo ''; - echo ''; - #echo '
'."\n"; - } - else{ + if ($quick_view == false) { echo ''."\n"; } - echo '
'; # inner - - echo '
'; + echo '
'; self::displayVnosIcons(); - echo '
'; - - echo '



'; - + + if ($quick_view == false) { + echo '
'; + echo ' '; + echo ' '; + echo '
'; + } + echo '
'; + echo '
'; # inner + + // Div na desni z metapodatki + echo '
'; + self::displayQuickEditMeta(); + echo '
'; - // Div na desni z metapodatki - echo '
'; - self::displayQuickEditMeta(); echo '
'; + // Preverimo ce gre za prvo urejanje - potem avtomatsko ustvarimo arhiv podatkov if ($quick_view == false && isset($_GET['post']) && $_GET['post'] == '1') { ob_flush(); @@ -2778,18 +2767,19 @@ class SurveyDataDisplay{ global $lang; global $site_path; - //echo '

'.$lang['srv_data_title_quick_view'].'

'; - if (self::$dataFileStatus == FILE_STATUS_NO_DATA || self::$dataFileStatus == FILE_STATUS_NO_FILE || self::$dataFileStatus == FILE_STATUS_SRV_DELETED){ return false; } - + + // Paginacija self::displayQuickEditPagination(); - echo '
'; + + // Filtri - ?? todo ?? + /*echo '
'; echo '
    '; # div za filtre statusov SurveyStatusProfiles::DisplayLink(false); @@ -2821,11 +2811,18 @@ class SurveyDataDisplay{ if ($doNewLine) { echo '
    '; - } + }*/ - echo '
    '; + + // Zgrnja vrstica z ikonami in naslovom + echo '
    '; self::displayVnosIcons(); + + // title + echo '
    '; + echo $lang['srv_recnum_long'].': '.self::$quickEdit_recnum[2]; + echo '
    '; echo '
    '; } @@ -2882,27 +2879,19 @@ class SurveyDataDisplay{ $current = count($uids)-1; } - echo '