may/1KA_F2F
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://git.1ka.si/git/1ka

Browse Source
This commit is contained in:
pero1203 2022-07-25 12:22:39 +02:00
commit 2bab78c4a2
7 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
admin/survey/classes/class.GDPR.php
View File

@ -384,7 +384,7 @@ class GDPR{
echo '<tr>'; echo '<tr>';
echo '<th class="center">'.$lang['srv_gdpr_requests_resolved'].'</th>'; echo '<th class="center">'.$lang['srv_gdpr_requests_resolved'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_survey'].'</th>'; echo '<th>'.$lang['srv_gdpr_requests_survey'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_text'].'</th>'; echo '<th class="center">'.$lang['srv_gdpr_requests_text'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_email'].'</th>'; echo '<th>'.$lang['srv_gdpr_requests_email'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_type'].'</th>'; echo '<th>'.$lang['srv_gdpr_requests_type'].'</th>';
echo '<th>'.$lang['srv_gdpr_requests_date_sent'].'</th>'; echo '<th>'.$lang['srv_gdpr_requests_date_sent'].'</th>';
@ -400,7 +400,11 @@ class GDPR{
echo '<label class="empty" for="gdrp_request_'.$request_id.'"></label></td>'; echo '<label class="empty" for="gdrp_request_'.$request_id.'"></label></td>';
echo '<td><div class="gdpr_requests_wrap"><a href="'.$site_url.'admin/survey/index.php?anketa='.$request['ank_id'].'&a=data">'.$request['naslov'].'</a></div></td>'; echo '<td><div class="gdpr_requests_wrap"><a href="'.$site_url.'admin/survey/index.php?anketa='.$request['ank_id'].'&a=data">'.$request['naslov'].'</a></div></td>';
echo '<td><div class="gdpr_requests_wrap">'.$request['text'].'</div></td>'; // echo '<td><div class="gdpr_requests_wrap">'.$request['text'].'</div></td>';
echo '<td><div class="gdpr_requests_wrap center">';
echo '<button> <img src="\public\img\icons\envelope_img.svg" alt="envelope image"> </button> </div></td>';
echo '<td>'.$request['email'].'</td>'; echo '<td>'.$request['email'].'</td>';
echo '<td>'.$lang['srv_gdpr_requests_type_'.$request['type']].'</td>'; echo '<td>'.$lang['srv_gdpr_requests_type_'.$request['type']].'</td>';

3
admin/survey/classes/class.SurveySkupine.php
View File

@ -95,6 +95,7 @@ class SurveySkupine {
echo '<th></th>'; echo '<th></th>';
echo '<th>'.$lang['group_name'].'</th>'; echo '<th>'.$lang['group_name'].'</th>';
echo '<th>'.$lang['group_URL'].'</th>'; echo '<th>'.$lang['group_URL'].'</th>';
echo '<th>'.$lang['group_answer_count'].'</th>';
echo '</tr>'; echo '</tr>';
if($spr_id != 0){ if($spr_id != 0){
@ -108,7 +109,7 @@ class SurveySkupine {
if(isset($vrednost['nice_url'])) if(isset($vrednost['nice_url']))
$link = $vrednost['nice_url']; $link = $vrednost['nice_url'];
echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.$vrednost['naslov'].'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>'; echo '<td><a href="'.$link.'" target="_blank" title="URL skupine '.$vrednost['naslov'].'">'.$link.'</a><a href="#"><span class="faicon copy link-left empty" onclick="CopyToClipboard(\''. $link .'\');" return false;"></span></a></td>';
echo '<td>'.$vrednost['#'].'</td>';
echo '</tr>'; echo '</tr>';
} }
} }

1
lang/1.php
View File

@ -1157,6 +1157,7 @@ $lang = array (
"group_new" => "Nova skupina", "group_new" => "Nova skupina",
"group_name" => "Ime skupine", "group_name" => "Ime skupine",
"group_URL" => "URL Povezava", "group_URL" => "URL Povezava",
"group_answer_count" => "Število odgovorov",
"admin_edit_groups" => "Urejanje skupin za", "admin_edit_groups" => "Urejanje skupin za",
"admin_edit_groups_no" => "Ni skupin. Dodajte jih.", "admin_edit_groups_no" => "Ni skupin. Dodajte jih.",
"mass_select_group" => "Izberite skupino(e) uporabnikov", "mass_select_group" => "Izberite skupino(e) uporabnikov",

1
lang/2.php
View File

@ -1140,6 +1140,7 @@ $lang = array (
"group_new" => "New group", "group_new" => "New group",
"group_name" => "Group name", "group_name" => "Group name",
"group_URL" => "URL Address", "group_URL" => "URL Address",
"group_answer_count" => "Answer count",
"admin_edit_groups" => "Editing groups for", "admin_edit_groups" => "Editing groups for",
"admin_edit_groups_no" => "There are no groups. You should add some", "admin_edit_groups_no" => "There are no groups. You should add some",
"mass_select_group" => "Select group(s) of users", "mass_select_group" => "Select group(s) of users",

2
public/css/admin_new.css
View File

@ -5117,7 +5117,7 @@ p, span {
} }
.bold { .bold {
font-weight: 800; font-weight: 400;
} }
.semi-bold { .semi-bold {

3
public/img/icons/envelope_img.svg Normal file
View File

@ -0,0 +1,3 @@
<svg width="18" height="14" viewBox="0 0 18 14" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M16.5 0.75H1.5C1.16848 0.75 0.850537 0.881696 0.616116 1.11612C0.381696 1.35054 0.25 1.66848 0.25 2V12C0.25 12.3315 0.381696 12.6495 0.616116 12.8839C0.850537 13.1183 1.16848 13.25 1.5 13.25H16.5C16.8315 13.25 17.1495 13.1183 17.3839 12.8839C17.6183 12.6495 17.75 12.3315 17.75 12V2C17.75 1.66848 17.6183 1.35054 17.3839 1.11612C17.1495 0.881696 16.8315 0.75 16.5 0.75ZM15.125 2L9 6.2375L2.875 2H15.125ZM1.5 12V2.56875L8.64375 7.5125C8.74837 7.58508 8.87267 7.62397 9 7.62397C9.12733 7.62397 9.25163 7.58508 9.35625 7.5125L16.5 2.56875V12H1.5Z" fill="#1E88E5"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 674 B

2
resources/sass/admin_new/basic/typography.scss
View File

@ -62,7 +62,7 @@ p,span {
} }
.bold { .bold {
font-weight: $extra-bold; font-weight: $regular;
} }
.semi-bold { .semi-bold {