diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index c9d17ecc4..dda06394b 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -502,11 +502,11 @@ class SurveyAdminSettings { echo '
'; echo ''; - echo ''; + echo ''; echo '
'; echo '
'; echo ''; - echo ''; + echo ''; echo '
'; echo ''; @@ -8802,7 +8802,7 @@ class SurveyAdminSettings { echo $lang['srv_stevilo_vnosov'].':'; echo '
'; echo ''; - echo '(max 1000)'; + echo '(max. 1000)'; echo '
'; echo ''; @@ -8822,20 +8822,22 @@ class SurveyAdminSettings { echo ''.$lang['srv_delete_testdata'].' ('.$total_rows.')'; - echo ''; + + if ($total_rows > 0) { + + echo '
'; echo ''; echo ''; echo ''; echo ''; echo ''; echo ''; - echo '
Labela Veljavni odgovori (Grafični prikaz)
'; - - if ($total_rows > 0) { - + echo ''; + $prevpage = 0; + $sql = sisplet_query("SELECT s.id, s.gru_id, s.tip, s.naslov, g.naslov AS pagename FROM srv_spremenljivka s, srv_grupa g WHERE s.gru_id=g.id AND s.visible='1' AND g.ank_id='$this->anketa' ORDER BY g.vrstni_red, s.vrstni_red"); while ($row = mysqli_fetch_array($sql)) { diff --git a/public/css/admin_new.css b/public/css/admin_new.css index c813a7ab6..9a1c1f257 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -10174,41 +10174,43 @@ div .table-horizontal-scroll-wrapper2 table { padding: 0px; } -.page_num_fieldset { +#anketa_edit .page_num_fieldset { padding-top: 0px; padding-bottom: 0px; - margin: 12px 0px; + margin: 0px; } - -.page_num { - margin-left: 39%; +#anketa_edit .page_num { + text-align: center; color: #333333; position: relative; + margin: 4px 0px; } - -.table_header { +#anketa_edit .table_header { width: 100%; margin: 16px 0px 0px 0px; + background-color: #F8F8F8; font-size: 16px; font-weight: 600; } -.table_header tr { +#anketa_edit .table_header tr { width: 100%; } -.table_header tr td:first-of-type { - width: 40%; +#anketa_edit .table_header tr td:first-of-type { + width: 46%; padding-left: 16px; } -.table_header tr td:last-of-type { - width: 60%; +#anketa_edit .table_header tr td:last-of-type { + width: 54%; padding-left: 16px; } - -.avt_vnosi_table td:first-of-type { - width: 40%; +#anketa_edit .avt_vnosi_table { + margin: 0px; } -.avt_vnosi_table td:last-of-type { - width: 60%; +#anketa_edit .avt_vnosi_table td:first-of-type { + width: 46%; +} +#anketa_edit .avt_vnosi_table td:last-of-type { + width: 54%; } /* diff --git a/resources/sass/admin_new/components/table/table.scss b/resources/sass/admin_new/components/table/table.scss index 009370b3e..c3316f5e0 100644 --- a/resources/sass/admin_new/components/table/table.scss +++ b/resources/sass/admin_new/components/table/table.scss @@ -112,51 +112,67 @@ div { border-top: 1px dashed #E5E5E5; padding: 0px; + + + } -.page_num_fieldset{ - padding-top: 0px; - padding-bottom: 0px; +#anketa_edit { - margin: 12px 0px; -} + .page_num_fieldset{ + padding-top: 0px; + padding-bottom: 0px; + + margin: 0px; + } + + .page_num{ + text-align: center; + color: #333333; + position: relative; -.page_num{ - margin-left: 39%; - color: #333333; - position: relative; -} - - - -.table_header{ - width: 100%; - margin: 16px 0px 0px 0px; - - font-size: 16px; - font-weight: 600; - - tr{ + margin: 4px 0px; + } + + + + .table_header{ width: 100%; + margin: 16px 0px 0px 0px; + background-color: #F8F8F8; + + font-size: 16px; + font-weight: 600; + + tr{ + width: 100%; + + + td:first-of-type { + width: 46%; + padding-left: 16px; + } + td:last-of-type { + width: 54%; + padding-left: 16px; + } + } + } + + .avt_vnosi_table{ + margin: 0px; + td:first-of-type { - width: 40%; - padding-left: 16px; + width: 46%; } td:last-of-type { - width: 60%; - padding-left: 16px; + width: 54%; } } + } -.avt_vnosi_table{ - td:first-of-type { - width: 40%; - } - td:last-of-type { - width: 60%; - } -} +