diff --git a/admin/survey/classes/class.GDPR.php b/admin/survey/classes/class.GDPR.php index d1f73b818..a93b4c806 100644 --- a/admin/survey/classes/class.GDPR.php +++ b/admin/survey/classes/class.GDPR.php @@ -384,7 +384,7 @@ class GDPR{ echo ''; echo ''.$lang['srv_gdpr_requests_resolved'].''; echo ''.$lang['srv_gdpr_requests_survey'].''; - echo ''.$lang['srv_gdpr_requests_text'].''; + echo ''.$lang['srv_gdpr_requests_text'].''; echo ''.$lang['srv_gdpr_requests_email'].''; echo ''.$lang['srv_gdpr_requests_type'].''; echo ''.$lang['srv_gdpr_requests_date_sent'].''; @@ -400,7 +400,11 @@ class GDPR{ echo ''; echo '
'.$request['naslov'].'
'; - echo '
'.$request['text'].'
'; + // echo '
'.$request['text'].'
'; + + echo '
'; + echo '
'; + echo ''.$request['email'].''; echo ''.$lang['srv_gdpr_requests_type_'.$request['type']].''; diff --git a/admin/survey/classes/class.SurveySkupine.php b/admin/survey/classes/class.SurveySkupine.php index c9ab3d3d4..65fbd0cd5 100644 --- a/admin/survey/classes/class.SurveySkupine.php +++ b/admin/survey/classes/class.SurveySkupine.php @@ -95,6 +95,7 @@ class SurveySkupine { echo ''; echo ''.$lang['group_name'].''; echo ''.$lang['group_URL'].''; + echo ''.$lang['group_answer_count'].''; echo ''; if($spr_id != 0){ @@ -108,7 +109,7 @@ class SurveySkupine { if(isset($vrednost['nice_url'])) $link = $vrednost['nice_url']; echo ''.$link.''; - + echo ''.$vrednost['#'].''; echo ''; } } diff --git a/lang/1.php b/lang/1.php index df8f1ed3d..b4f0c7709 100644 --- a/lang/1.php +++ b/lang/1.php @@ -1157,6 +1157,7 @@ $lang = array ( "group_new" => "Nova skupina", "group_name" => "Ime skupine", "group_URL" => "URL Povezava", + "group_answer_count" => "Število odgovorov", "admin_edit_groups" => "Urejanje skupin za", "admin_edit_groups_no" => "Ni skupin. Dodajte jih.", "mass_select_group" => "Izberite skupino(e) uporabnikov", diff --git a/lang/2.php b/lang/2.php index 83b9776e2..917a1f9ff 100644 --- a/lang/2.php +++ b/lang/2.php @@ -1140,6 +1140,7 @@ $lang = array ( "group_new" => "New group", "group_name" => "Group name", "group_URL" => "URL Address", + "group_answer_count" => "Answer count", "admin_edit_groups" => "Editing groups for", "admin_edit_groups_no" => "There are no groups. You should add some", "mass_select_group" => "Select group(s) of users", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 0c6d4660a..f65b1daf5 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -5117,7 +5117,7 @@ p, span { } .bold { - font-weight: 800; + font-weight: 400; } .semi-bold { diff --git a/public/img/icons/envelope_img.svg b/public/img/icons/envelope_img.svg new file mode 100644 index 000000000..bc089494b --- /dev/null +++ b/public/img/icons/envelope_img.svg @@ -0,0 +1,3 @@ + + + diff --git a/resources/sass/admin_new/basic/typography.scss b/resources/sass/admin_new/basic/typography.scss index f5fe515d7..ebcd53d35 100644 --- a/resources/sass/admin_new/basic/typography.scss +++ b/resources/sass/admin_new/basic/typography.scss @@ -62,7 +62,7 @@ p,span { } .bold { - font-weight: $extra-bold; + font-weight: $regular; } .semi-bold {