diff --git a/admin/survey/classes/class.SurveyVariableView.php b/admin/survey/classes/class.SurveyVariableView.php index 0bff22bfc..cd47ef12a 100644 --- a/admin/survey/classes/class.SurveyVariableView.php +++ b/admin/survey/classes/class.SurveyVariableView.php @@ -44,18 +44,14 @@ class VariableView { public static function displayVariables() { global $lang; - echo ''; + echo '
'; - echo ''; - echo ''; + echo ''; + echo ''; echo ''; - echo ''; - echo ''; - echo ''; echo ''; - echo ''; - - echo ''; + echo ''; + echo ''; foreach (self::$_HEADERS AS $skey => $spremenljivka) { @@ -71,15 +67,12 @@ class VariableView { echo ''; echo ''; echo ''; - echo ''; - echo ''; - echo ''; echo ''; + echo ''; echo ''; } } - echo ''; echo '
'.$lang['srv_variableView_h_'].'
'.$lang['srv_variableView_h_name'].''.$lang['srv_variableView_h_type'].''.$lang['srv_variableView_h_width'].''.$lang['srv_variableView_h_decimals'].''.$lang['srv_variableView_h_label'].''.$lang['srv_variableView_h_measure'].'
'.$lang['srv_variableView_h_label'].'
'.$spremenljivka['variable'].''.$legenda['izrazanje'].''.(int)$spss_length['0'].''.(int)$spss_length['1'].''.$spremenljivka['naslov'].''.$legenda['skala'].''.$spremenljivka['naslov'].'
'; } } \ No newline at end of file diff --git a/admin/survey/classes/tracking/CrossRoad.php b/admin/survey/classes/tracking/CrossRoad.php index 4c3478fab..989a481ac 100644 --- a/admin/survey/classes/tracking/CrossRoad.php +++ b/admin/survey/classes/tracking/CrossRoad.php @@ -318,7 +318,7 @@ class CrossRoad { if ($_GET['m'] == 'anal_arch') { $layout_menu = 'menu_left'; } - + $status = 2; break; @@ -372,6 +372,9 @@ class CrossRoad { $layout_width = 'wide'; $layout_menu = 'menu_left'; } + elseif ($_GET['m'] == 'variables') { + $layout_width = 'narrow'; + } $status = 4; diff --git a/lang/1.php b/lang/1.php index 527f0ed29..bb82114a5 100644 --- a/lang/1.php +++ b/lang/1.php @@ -6176,12 +6176,12 @@ $lang = array ( 'srv_te_profile_name' => 'Izbrana prilagoditev teme', 'srv_te_theme_edit' => 'Prilagodi', 'srv_te_no_profiles' => 'Nimate še lastnih tem. Za prilagoditev teme, kliknite na "Prilagodi" poleg imena trenutne teme. Uporabite lahko tudi naprednješe CSS urejanje teme.', - 'srv_variableView_h_name' => 'Ime', + 'srv_variableView_h_name' => 'Spremenljivka', 'srv_variableView_h_type' => 'Tip', 'srv_variableView_h_width' => 'Št. celih mest', 'srv_variableView_h_decimals' => 'Št. decimalk', 'srv_variableView_h_label' => 'Labela', - 'srv_variableView_h_measure' => 'Merjenje', + 'srv_variableView_h_measure' => 'Merska lestvica', 'srv_save_set_theme' => 'Izberi to temo za temo ankete', 'srv_lnk_back_to_data' => 'Nazaj', 'srv_lnk_vpogled' => 'Vpogled', diff --git a/lang/2.php b/lang/2.php index 9cb012751..aa46deb37 100644 --- a/lang/2.php +++ b/lang/2.php @@ -6074,12 +6074,12 @@ $lang = array ( 'srv_te_profile_name' => 'Selected theme modification', 'srv_te_theme_edit' => 'Customize', 'srv_te_no_profiles' => 'You have no user themes. To customize a theme, click on the "Customize" option, found next to the current theme name. You can also use more advanced CSS editing options.', - 'srv_variableView_h_name' => 'Name', + 'srv_variableView_h_name' => 'Variable', 'srv_variableView_h_type' => 'Type', 'srv_variableView_h_width' => 'Width', 'srv_variableView_h_decimals' => 'Decimals', 'srv_variableView_h_label' => 'Label', - 'srv_variableView_h_measure' => 'Measure', + 'srv_variableView_h_measure' => 'Scale', 'srv_save_set_theme' => 'Select this theme for current theme', 'srv_lnk_back_to_data' => 'Back to data', 'srv_lnk_vpogled' => 'Insight into cases', diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 246f8d516..8bbc82205 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -9991,6 +9991,10 @@ span.faicon.st-besede-popup { pointer-events: none; } +table.variableView { + width: 100%; +} + .dashboard_top_settings { display: flex; align-items: center; diff --git a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss index cdb93679d..964ce860e 100644 --- a/resources/sass/admin_new/pages/my_surveys/my_surveys.scss +++ b/resources/sass/admin_new/pages/my_surveys/my_surveys.scss @@ -6,5 +6,6 @@ @import "archives"; @import "import_export"; @import "missing_values"; -@import "standardne_besede" +@import "standardne_besede"; +@import "podatki"; diff --git a/resources/sass/admin_new/pages/my_surveys/podatki.scss b/resources/sass/admin_new/pages/my_surveys/podatki.scss new file mode 100644 index 000000000..7fbc5a348 --- /dev/null +++ b/resources/sass/admin_new/pages/my_surveys/podatki.scss @@ -0,0 +1,3 @@ +table.variableView { + width: 100%; +} \ No newline at end of file