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

[Redizajn 1KA] Nastavitve --> Moj profil - v2

Browse Source
This commit is contained in:
tejagerjovic 2022-01-03 15:30:44 +01:00
parent b5ec502240
commit 69530db333
6 changed files with 1427 additions and 1388 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
admin/survey/SurveyAdminSettings.php
View File

@ -9995,7 +9995,7 @@ class SurveyAdminSettings {
// Ni nobenega paketa
if(mysqli_num_rows($sqlA) == 0){
$package_string = '1ka ('.$lang['srv_access_package_free'].')</div><div class="setting_holder"><button class="medium yellow" type="button" onClick="window.location.href=\''.$drupal_url.''.$lang['srv_narocila_buyurl'].'\';">'.$lang['srv_narocila_buy'].'</button>';
$package_string = $lang['paket_opis_1ka'].' ('.$lang['srv_access_package_free'].')</div><div class="setting_holder"><button class="medium yellow" type="button" onClick="window.location.href=\''.$drupal_url.''.$lang['srv_narocila_buyurl'].'\';">'.$lang['srv_narocila_buy'].'</button>';
}
else{
$rowA = mysqli_fetch_array($sqlA);
@ -10018,8 +10018,6 @@ class SurveyAdminSettings {
$package_string .= ' ('.$lang['srv_access_package_valid'].' '.date("d.m.Y", strtotime($rowA['time_expire'])).')';
$package_string .= '</div><div class="setting_holder"><button class="medium yellow" type="button" onClick="window.location.href=\''.$drupal_url.'izvedi-nakup/'.$rowA['package_id'].'/podatki/\';">'.$lang['srv_narocila_extend'].'</button>';
$package_string .= '<div class="setting_item"><a href="'.$site_url.'admin/survey/index.php?a=narocila">'.$lang['srv_access_package_all'].'</a></div>';
}
}
else{
@ -10154,7 +10152,7 @@ class SurveyAdminSettings {
echo '<div>'.$lang['google_2fa_admin_enabled'].'<b>'.$googleSecret.'</b></div>';
echo '<div style="padding-top: 10px;">'.$lang['google_2fa_admin_enabled_2'].'</div>';
echo '<input type="hidden" name="google-2fa-secret" value="'.$googleSecret.'">';
echo '<div><img style="border: 0; padding:10px" src="'.$googleLink.'"/></div>';
echo '<div><img class="twoFAQRcode" src="'.$googleLink.'"/></div>';
echo '<div>Ko boste shranili nastavitve, bo nastavitev obveljala.</div>';
echo '</div>';
} elseif (! empty($user_option) && $user_option_validate == 'NOT') {
@ -10224,9 +10222,10 @@ class SurveyAdminSettings {
}
echo '</table>';
if(mysqli_num_rows($result) > 25){
//Gumb za izpis vseh prijav v tabeli - update v 2. fazi @TG
/**if(mysqli_num_rows($result) > 25){
echo '<span class="login_tracking_more bold" onClick="$(\'table.login_tracking tr\').removeClass(\'displayNone\'); $(\'.login_tracking_more\').addClass(\'displayNone\');">'.$lang['srv_invitation_nonActivated_more'].'</span>';
}
}**/
echo '</fieldset>';

4
admin/survey/classes/tracking/UserTrackingClass.php
View File

@ -67,8 +67,8 @@ class UserTrackingClass
echo ' <td>' . datetime($row['datetime']) . '</td>';
echo ' <td class="center">' . $row['ip'] . '</td>';
echo ' <td>' . $row['get'] . '</td>';
echo ' <td>' . $row['post'] . '</td>';
echo ' <td><div class="myprofile_postget_wrap">' . $row['get'] . '</div></td>';
echo ' <td><div class="myprofile_postget_wrap">' . $row['post'] . '</div></td>';
echo '</tr>';
}

5
lang/1.php
View File

@ -7673,8 +7673,9 @@ $lang = array (
// DOSTOP GLEDE NA PAKET
'srv_access_no_access_not_author' => "Avtor ankete nima zakupljenega ustreznega paketa, ki vključuje to funkcionalnost.",
'srv_access_no_access' => "Funkcionalnost je na voljo samo v plačljivi verziji orodja 1KA v paketu",
'paket_opis_2ka' => "Napredni (2KA)",
'paket_opis_3ka' => "Profesionalni (3KA)",
'paket_opis_1ka' => "Osnovni 1KA",
'paket_opis_2ka' => "Napredni 2KA",
'paket_opis_3ka' => "Profesionalni 3KA",
'srv_access_package' => "Aktivni paket",
'srv_access_package_free' => "brezplačno",
'srv_access_package_valid' => "velja do",

5
lang/2.php
View File

@ -7559,8 +7559,9 @@ $lang = array (
// DOSTOP GLEDE NA PAKET
'srv_access_no_access_not_author' => "Survey author does not have sufficient package for this functionality.",
'srv_access_no_access' => "Functionality is available only in the paid version of 1KA in the package",
'paket_opis_2ka' => "Advanced (2KA)",
'paket_opis_3ka' => "Professional (3KA)",
'paket_opis_1ka' => "Basic 1KA",
'paket_opis_2ka' => "Advanced 2KA",
'paket_opis_3ka' => "Professional 3KA",
'srv_access_package' => "Active package",
'srv_access_package_free' => "free",
'srv_access_package_valid' => "valid until",

2770
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

20
resources/sass/admin_new/pages/settings/moj_profil.scss
View File

@ -17,4 +17,24 @@ div#user_info_segment {
margin-right: 50px;
}
}
}
img.twoFAQRcode {
margin: 10px 0;
max-width: 115px;
}
div.myprofile_postget_wrap {
max-width: 320px;
min-width: 320px;
overflow-wrap: break-word;
white-space: normal;
padding: 8px 0px;
}
p#klik-dodaj-email{
span.faicon {
margin-right: 8px;
margin-left: 16px;
}
}