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

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

Browse Source
This commit is contained in:
tejagerjovic 2021-12-29 01:23:24 +01:00
parent 1be6bbabfd
commit 4d5ed97066
12 changed files with 228 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

199
admin/survey/SurveyAdminSettings.php
View File

@ -9958,26 +9958,34 @@ class SurveyAdminSettings {
echo ' <input type="hidden" name="location" value="' . $_GET['a'] . '" />' . "\n\r"; echo ' <input type="hidden" name="location" value="' . $_GET['a'] . '" />' . "\n\r";
echo ' <input type="hidden" name="submited" value="1" />' . "\n\r"; echo ' <input type="hidden" name="submited" value="1" />' . "\n\r";
echo ' <fieldset><legend>'.$lang['edit_data'].'</legend>'; echo '<fieldset><legend>'.$lang['edit_data'].'</legend>';
echo '<div class="data"><span class="setting_title">'.$lang['logged_in_as'].': </span><span class="bold">'.$row['name'].' '.$row['surname'].'</span></div>'; //Prijavljeni kot, status, zadnja prijava, aktivni paket
echo '<div id="user_info_segment">';
if($row['type'] == '0') if($row['type'] == '0')
$type = $lang['admin_admin']; $type = $lang['admin_admin'];
elseif($row['type'] == '1') elseif($row['type'] == '1')
$type = $lang['admin_manager']; $type = $lang['admin_manager'];
else else
$type = $lang['admin_narocnik']; $type = $lang['admin_narocnik'];
echo '<div class="data"><span class="setting_title">'.$lang['your_status'].': </span><span class="bold">'.$type.'</span></div>';
echo '<div class="user_info text">';
// Zadnja prijava echo '<div class="setting_holder">'.$lang['logged_in_as']. ':</div>';
echo '<div class="data"><span class="setting_title">'.$lang['srv_last_login'].': </span><span class="bold">'.date('j.n.Y', strtotime($row['last_login'])).' '.$lang['ob'].' '.date('H:i', strtotime($row['last_login'])).'</span></div>'; echo '<div class="setting_holder">'.$lang['your_status']. ':</div>';
echo '<div class="setting_holder">'.$lang['srv_last_login'].':</div>';
if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true)
// Trenutni paket funkcionalnosti echo '<div class="setting_holder">'.$lang['srv_access_package'].':</div>';
echo '</div>';
echo '<div class="user_info data bold">';
echo '<div class="setting_holder">'.$row['name'].' '.$row['surname'].'</div>';
echo '<div class="setting_holder">'.$type.'</div>';
echo '<div class="setting_holder">'.date('j.n.Y', strtotime($row['last_login'])).' '.$lang['ob'].' '.date('H:i', strtotime($row['last_login'])).'</div>';
// Trenutni paket funkcionalnosti
if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){ if(AppSettings::getInstance()->getSetting('app_settings-commercial_packages') === true){
echo '<br>';
$sqlA = sisplet_query("SELECT ua.time_activate, ua.time_expire, uap.id AS package_id, uap.name AS package_name $sqlA = sisplet_query("SELECT ua.time_activate, ua.time_expire, uap.id AS package_id, uap.name AS package_name
FROM user_access ua, user_access_paket uap FROM user_access ua, user_access_paket uap
WHERE ua.usr_id='$global_user_id' AND uap.id=ua.package_id WHERE ua.usr_id='$global_user_id' AND uap.id=ua.package_id
@ -9986,67 +9994,83 @@ class SurveyAdminSettings {
$drupal_url = ($lang['id'] == '2') ? $site_url.'d/en/' : $site_url.'d/'; $drupal_url = ($lang['id'] == '2') ? $site_url.'d/en/' : $site_url.'d/';
// Ni nobenega paketa // Ni nobenega paketa
if(mysqli_num_rows($sqlA) == 0){ if(mysqli_num_rows($sqlA) == 0){
$package_string = '1ka ('.$lang['srv_access_package_free'].') - <a href="'.$drupal_url.''.$lang['srv_narocila_buyurl'].'">'.$lang['srv_narocila_buy'].'</a>'; $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>';
} }
else{ else{
$rowA = mysqli_fetch_array($sqlA); $rowA = mysqli_fetch_array($sqlA);
// Ce ima paket 2 ali 3 // Ce ima paket 2 ali 3
if($rowA['package_id'] == '2' || $rowA['package_id'] == '3'){ if($rowA['package_id'] == '2' || $rowA['package_id'] == '3'){
// Ce je paket ze potekel // Ce je paket ze potekel
if(strtotime($rowA['time_expire']) < time()){ if(strtotime($rowA['time_expire']) < time()){
$package_string = '<span class="red bold">'; $package_string = '<span class="red">';
$package_string .= $rowA['package_name']; $package_string .= $rowA['package_name'];
$package_string .= ' ('.$lang['srv_access_package_expire'].' '.date("d.m.Y", strtotime($rowA['time_expire'])).')'; $package_string .= ' ('.$lang['srv_access_package_expire'].' '.date("d.m.Y", strtotime($rowA['time_expire'])).')';
$package_string .= '</span>'; $package_string .= '</span>';
$package_string .= ' - <a href="'.$drupal_url.'izvedi-nakup/'.$rowA['package_id'].'/podatki/">'.$lang['srv_narocila_extend'].'</a>'; $package_string .= '</div><div class="setting_holder"><button class="medium red" type="button" onClick="window.location.href=\''.$drupal_url.'izvedi-nakup/'.$rowA['package_id'].'/podatki/\';">'.$lang['srv_narocila_extend'].'</button>';
} }
else{ else{
$package_string = $rowA['package_name']; $package_string = $rowA['package_name'];
$package_string .= ' ('.$lang['srv_access_package_valid'].' '.date("d.m.Y", strtotime($rowA['time_expire'])).')'; $package_string .= ' ('.$lang['srv_access_package_valid'].' '.date("d.m.Y", strtotime($rowA['time_expire'])).')';
$package_string .= ' - <a href="'.$drupal_url.'izvedi-nakup/'.$rowA['package_id'].'/podatki/">'.$lang['srv_narocila_extend'].'</a>'; $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 .= '<br /><a href="'.$site_url.'admin/survey/index.php?a=narocila" style="line-height:24px;">'.$lang['srv_access_package_all'].'</a>'; $package_string .= '<div class="setting_item"><a href="'.$site_url.'admin/survey/index.php?a=narocila">'.$lang['srv_access_package_all'].'</a></div>';
} }
} }
else{ else{
$package_string = $rowA['package_name']; $package_string = $rowA['package_name'];
$package_string .= ' ('.$lang['srv_access_package_free'].')'; $package_string .= ' ('.$lang['srv_access_package_free'].')';
$package_string .= ' - <a href="'.$drupal_url.''.$lang['srv_narocila_buyurl'].'">'.$lang['srv_narocila_buy'].'</a>'; $package_string .= '</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>';
} }
} }
echo '<div class="setting_holder">'.$package_string.'</div>';
echo '<div class="data"><span class="setting_title">'.$lang['srv_access_package'].': </span><span class="bold">'.$package_string.'</span></div>';
} }
echo '<br />'; echo '</div>';
echo '</div>';
// AAI nima moznosti spreminjanja imena, priimka, emaila, gesla... // AAI nima moznosti spreminjanja imena, priimka, emaila, gesla...
if(isAAI()){ if(isAAI()){
echo '<span class="italic">'.$lang['srv_profil_aai_warning'].'</span>'; echo '<span class="italic">'.$lang['srv_profil_aai_warning'].'</span>';
} }
else{ else{
echo ' <div class="setting"><span class="setting_title">'.$lang['name'].':</span>';
echo ' <input class="text " name="ime" placeholder="Ime" value="'.$row['name'].'" type="text"></div>';
echo ' <div class="setting"><span class="setting_title">'.$lang['surname'].' :</span>';
echo ' <input class="text " name="priimek" placeholder="Priimek" value="'.$row['surname'].'" type="text"></div>';
echo ' <div class="setting"><span class="setting_title">'.$lang['email'].' : <span class="faicon add icon-blue pointer" id="klik-dodaj-email" deluminate_imagetype="png"></span></span>'; echo '<p class="bottom16">'.$lang['srv_profil_settings_text'].'</p>';
echo ' <input class="text" disabled="disabled" value="'.$row['email'].'" type="text">';
echo ' <input name="email2" value="'.$row['email'].'" type="hidden">'; echo '<div class="setting_horizontal_wrapper">';
echo ' <span style="margin:0 6.5px">&nbsp;</span>';
echo '<div class="setting_holder">';
echo '<label for="ime">'.$lang['name'].':</label>';
echo '<input class="large" id="ime" name="ime" placeholder="Ime" value="'.$row['name'].'" type="text">';
echo '</div>';
echo '<div class="setting_holder">';
echo '<label for="priimek">'.$lang['surname'].':</label>';
echo '<input class="large" id="priimek" name="priimek" placeholder="Priimek" value="'.$row['surname'].'" type="text">';
echo '</div>';
echo '</div>';
echo '<div class="setting_holder">';
echo '<label>'.$lang['email'].':</label>';
echo '<div class="icon_holder">';
echo '<input class="large disabled" value="'.$row['email'].'" type="text">';
echo '<p class="blue pointer" id="klik-dodaj-email"><span class="faicon add link-right"></span>'.$lang['srv_profil_settings_addemail'].'</p>';
echo '</div>';
echo '</div>';
//Alternativni maili - še v delu
$alternativni_emaili = User::getInstance()->allEmails('brez primarnega'); $alternativni_emaili = User::getInstance()->allEmails('brez primarnega');
echo '<label for="active-master" '.(empty($alternativni_emaili) ? 'class="hidden"' : '').'><input class="text" name="active_email" value="master" id="active-master" type="radio" '.(User::getInstance()->primaryEmail() == $row['email'] ? 'checked="checked"' : '').'> '.$lang['login_email_subscription'].'</label>'; echo '<div class="setting_holder '.(empty($alternativni_emaili) ? 'displayNone' : '').'">';
echo '<input name="active_email" value="master" id="active-master" type="radio" '.(User::getInstance()->primaryEmail() == $row['email'] ? 'checked="checked"' : '').'><label for="active-master">'.$lang['login_email_subscription'].'</label>';
if(!empty($alternativni_emaili)){ if(!empty($alternativni_emaili)){
foreach($alternativni_emaili as $email) { foreach($alternativni_emaili as $email) {
echo '<br/><span style="width:130px; float:left;">&nbsp;</span>'; echo '<br/><span style="width:130px; float:left;">&nbsp;</span>';
@ -10055,18 +10079,22 @@ class SurveyAdminSettings {
echo '<input class="text" value="'.($email->id).'" name="active_email" type="radio" '.($email->active == 1 ? 'checked="checked"' : '').'> <label for="active-master">'.$lang['login_email_subscription'].'</label>'; echo '<input class="text" value="'.($email->id).'" name="active_email" type="radio" '.($email->active == 1 ? 'checked="checked"' : '').'> <label for="active-master">'.$lang['login_email_subscription'].'</label>';
} }
} }
echo '</div><br />'; echo '</div>';
echo '<div class="dodaj-alternativni-email" style="display: none;">'; echo '<div class="setting_holder dodaj-alternativni-email" style="display: none;">';
echo '<div class="vnos">'; echo '<div class="setting_item">';
echo '<span class="setting_title">'.$lang['login_alternative_emails'].' :</span>'; echo '<label for="alternativni-email">'.$lang['login_alternative_emails'].' :</label>';
echo '<input class="text" id="alternativni-email" value="" type="text">'; echo '<div class="vnos button_holder inline bottom0">';
echo '<span style="margin:0 8px">&nbsp;</span>'; echo '<input class="large" id="alternativni-email" value="" type="text">';
echo '<a href="#" onclick="dodajAlternativniEmail()">'.$lang['srv_inv_btn_add_recipients_add'].'</a>'; echo '<button type="button" class="medium blue" onclick="dodajAlternativniEmail()">'.$lang['srv_inv_btn_add_recipients_add'].'</button>';
echo '</div>'; echo '</div>';
echo '<br><div id="alternativno-obvestilo" style="font-style: italic;"></div>'; echo '</div>';
echo '<br />';
echo '</div>'; echo '<div class="setting_item">';
echo '<div id="alternativno-obvestilo" class="italic"></div>';
echo '</div>';
echo '</div>';
// Ce je vklopljen modul gorenje, preverimo ce ima se default geslo in izpisemo opozorilo // Ce je vklopljen modul gorenje, preverimo ce ima se default geslo in izpisemo opozorilo
if (Common::checkModule('gorenje')){ if (Common::checkModule('gorenje')){
@ -10074,25 +10102,46 @@ class SurveyAdminSettings {
echo '<p class="red bold">'.$lang['gorenje_password_warning'].'</p>'; echo '<p class="red bold">'.$lang['gorenje_password_warning'].'</p>';
} }
// Obveščanje // Geslo
echo ' <div class="setting"><span class="setting_title">'.$lang['password'].':</span>';
echo ' <input class="text" name="geslo" placeholder="'.$lang['password'].'" id="p1" value="PRIMERZELODOLGEGAGESLA" onclick="document.getElementById(\'p1\').value=\'\';" type="password"></div>'; echo '<div class="setting_horizontal_wrapper">';
echo ' <div class="setting"><span class="setting_title">'.$lang['again'].':</span>'; echo '<div class="setting_holder">';
echo ' <input class="text" name="geslo2" placeholder="'.$lang['password'].'" id="p2" value="PRIMERZELODOLGEGAGESLA" onclick="document.getElementById(\'p2\').value=\'\';" type="password"></div>'; echo '<label for="p1">'.$lang['password'].':</label>';
echo '<input class="large" name="geslo" placeholder="'.$lang['password'].'" id="p1" value="PRIMERZELODOLGEGAGESLA" onclick="document.getElementById(\'p1\').value=\'\';" type="password">';
echo '</div>';
echo '<div class="setting_holder">';
echo '<label for="p2">'.$lang['password_confirm'].':</label>';
echo '<input class="large" name="geslo2" placeholder="'.$lang['password'].'" id="p2" value="PRIMERZELODOLGEGAGESLA" onclick="document.getElementById(\'p2\').value=\'\';" type="password">';
echo '</div>';
echo '</div>';
// Prejemanje obvestil // Prejemanje obvestil
$red_border = (isset($_GET['unsubscribe']) && $_GET['unsubscribe'] == '1') ? ' border:2px red solid; padding: 5px 10px;' : ''; //$red_border = (isset($_GET['unsubscribe']) && $_GET['unsubscribe'] == '1') ? ' border:2px red solid; padding: 5px 10px;' : '';
echo ' <div class="setting" style="height:auto; float:left; clear:both; margin: 15px 0; '.$red_border.'"><span class="setting_title">'.$lang['srv_gdpr_user_options'].': '.Help::display('srv_gdpr_user_options').'</span>'; //echo ' <div class="setting" style="height:auto; float:left; clear:both; margin: 15px 0; '.$red_border.'"><span class="setting_title">'.$lang['srv_gdpr_user_options'].': '.Help::display('srv_gdpr_user_options').'</span>';
echo ' <label for="gdpr-agree-yes"><input type="radio" name="gdpr_agree" id="gdpr-agree-yes" value="1" '.($row['gdpr_agree'] == 1 ? 'checked="checked"' : null).'/>'.$lang['yes'].'</label>';
echo ' <label for="gdpr-agree-no"><input type="radio" name="gdpr_agree" id="gdpr-agree-no" value="0" '.($row['gdpr_agree'] == 0 ? 'checked="checked"' : null).'/>'.$lang['no1'].'</label></div>'; echo '<div class="setting_holder">';
echo '<span class="setting_title">'.$lang['srv_gdpr_user_options'].' '.Help::display('srv_gdpr_user_options').'</span>';
echo '<div class="setting_item">';
echo '<input type="radio" name="gdpr_agree" id="gdpr-agree-yes" value="1" '.($row['gdpr_agree'] == 1 ? 'checked="checked"' : null).'/>';
echo '<label for="gdpr-agree-yes">'.$lang['yes'].'</label>';
echo '</div>';
echo '<div class="setting_item">';
echo '<input type="radio" name="gdpr_agree" id="gdpr-agree-no" value="0" '.($row['gdpr_agree'] == 0 ? 'checked="checked"' : null).'/>';
echo '<label for="gdpr-agree-no">'.$lang['no1'].'</label>';
echo '</div>';
echo '</div>';
// Google 2 FA // Google 2 FA
$user_option = User::option($global_user_id, 'google-2fa-secret'); $user_option = User::option($global_user_id, 'google-2fa-secret');
$user_option_validate = User::option($global_user_id, 'google-2fa-validation'); $user_option_validate = User::option($global_user_id, 'google-2fa-validation');
echo ' <div class="setting" style="clear: both;"><span class="setting_title">'.$lang['google_2fa'].': '.Help::display('srv_google_2fa_options').'</span>'; echo '<div class="setting_holder">';
echo ' <label for="google-2fa"><input type="checkbox" name="google-2fa" id="google-2fa" value="1" '.(! empty($user_option) ? 'checked="checked"' : '').' onclick="prikaziGoogle2faKodo()"/>'.$lang['yes'].'</label>'; echo '<input type="checkbox" name="google-2fa" id="google-2fa" value="1" '.(! empty($user_option) ? 'checked="checked"' : '').' onclick="prikaziGoogle2faKodo()"/>';
echo ' </div>'; echo '<label for="google-2fa">'.$lang['google_2fa'].' '.Help::display('srv_google_2fa_options').'</label>';
echo '</div>';
if (empty($user_option)) { if (empty($user_option)) {
$google2fa = new \Sonata\GoogleAuthenticator\GoogleAuthenticator(); $google2fa = new \Sonata\GoogleAuthenticator\GoogleAuthenticator();
@ -10125,28 +10174,30 @@ class SurveyAdminSettings {
echo '<div id="google-2fa-bvestilo" style="font-style: italic;">'.$lang['google_2fa_user_error_code'].'</div>'; echo '<div id="google-2fa-bvestilo" style="font-style: italic;">'.$lang['google_2fa_user_error_code'].'</div>';
echo '</div>'; echo '</div>';
} }
echo '<div class="button_holder below">';
echo '<button class="medium red" onClick="izbrisi1kaRacun();">'.$lang['delete_account'].'</button>';
echo '</div>';
} }
echo ' </fieldset>'; echo '</fieldset>';
echo ' </form>'; echo '</form>';
// Save gumb - ce ni AAI // Save gumb - ce ni AAI
if(!isAAI()){ if(!isAAI()){
echo ' <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_gray" href="#" onclick="izbrisi1kaRacun();"><span>'.$lang['delete_account'] . '</span></a></div>'; echo '<div class="button_holder">';
echo ' <div class="buttonwrapper floatLeft spaceLeft"><a class="ovalbutton ovalbutton_orange btn_savesettings" href="#" onclick="save1kaRacunSettings();"><span>'.$lang['edit1337'] . '</span></a></div>'; echo '<button class="medium white-blue" onClick="window.location='.$preklici_url.';return false;">'.$lang['edit1338'].'</button>';
echo '<button class="medium blue" onclick="save1kaRacunSettings();">'.$lang['edit1337'].'</button>';
echo '<span class="clr"></span>'; echo '</div>';
// div za prikaz uspešnosti shranjevanja // div za prikaz uspešnosti shranjevanja
if ($_GET['s'] == '1') { if ($_GET['s'] == '1') {
echo '<div id="success_save"></div>'; echo '<div id="success_save"></div>';
echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>'; echo '<script type="text/javascript">$(document).ready(function() {show_success_save();});</script>';
} }
echo '<br /><br />';
} }
@ -10154,7 +10205,7 @@ class SurveyAdminSettings {
echo '<fieldset><legend>'.$lang['srv_login_tracking_title'].'</legend>'; echo '<fieldset><legend>'.$lang['srv_login_tracking_title'].'</legend>';
echo '<table class="login_tracking">'; echo '<table class="login_tracking">';
echo '<tr><th>IP</th><th>'.$lang['srv_login_tracking_date'].'</th><th>'.$lang['srv_login_tracking_time'].'</th></tr>'; echo '<tr><th>IP</th><th>'.$lang['srv_login_tracking_date'].'</th></tr>';
$result = sisplet_query ("SELECT IP, kdaj FROM user_login_tracker WHERE uid='".$global_user_id."' ORDER BY kdaj desc"); $result = sisplet_query ("SELECT IP, kdaj FROM user_login_tracker WHERE uid='".$global_user_id."' ORDER BY kdaj desc");
if (mysqli_num_rows($result) == 0) { if (mysqli_num_rows($result) == 0) {
@ -10163,10 +10214,9 @@ class SurveyAdminSettings {
else { else {
$count = 0; $count = 0;
while ($row = mysqli_fetch_array ($result)) { while ($row = mysqli_fetch_array ($result)) {
echo '<tr '.($count >= 5 ? ' class="hide"' : '').'>'; echo '<tr '.($count >= 5 ? ' class="displayNone"' : '').'>';
echo '<td>'.$row['IP'].'</td>'; echo '<td>'.$row['IP'].'</td>';
echo '<td>'.date('j.n.Y', strtotime($row['kdaj'])).'</td>'; echo '<td>'.date('j.n.Y', strtotime($row['kdaj'])).' '.date('H:i:s', strtotime($row['kdaj'])).'</td>';
echo '<td>'.date('H:i', strtotime($row['kdaj'])).'</td>';
echo '</tr>'; echo '</tr>';
$count++; $count++;
@ -10175,8 +10225,7 @@ class SurveyAdminSettings {
echo '</table>'; echo '</table>';
if(mysqli_num_rows($result) > 25){ if(mysqli_num_rows($result) > 25){
echo '<span class="login_tracking_more bold" onClick="$(\'table.login_tracking tr\').removeClass(\'hide\'); $(\'.login_tracking_more\').hide();">'.$lang['srv_invitation_nonActivated_more'].'</span>'; 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 '<br /><br />';
} }
echo '</fieldset>'; echo '</fieldset>';

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

@ -43,10 +43,10 @@ class UserTrackingClass
echo '<legend>' . $lang['srv_survey_archives_tracking'] . '</legend>'; echo '<legend>' . $lang['srv_survey_archives_tracking'] . '</legend>';
// Izvoz v Excel // Izvoz v Excel
echo '<p>'.$lang['srv_survey_archives_tracking_last_changes'].'</p>'; echo '<p class="bottom16">'.$lang['srv_survey_archives_tracking_last_changes'].'</p>';
echo '<div class="table-horizontal-scroll-wrapper1">'; //echo '<div id="table-horizontal-scroll-wrapper1-userchanges">';
echo '<div class="table-horizontal-scroll-wrapper2">'; //echo '<div id="table-horizontal-scroll-wrapper2-userchanges">'; - wrapperja za scroll na mobilnem
echo '<table id="tracking">'; echo '<table id="tracking">';
@ -75,13 +75,12 @@ class UserTrackingClass
echo '</table>'; echo '</table>';
echo '</div>'; //echo '</div>';
echo '</div>'; //echo '</div>'; - wrapperja za scroll na mobilnem
echo '</fieldset>'; echo '</fieldset>';
echo '<br class="clr" />'; echo '</div>';
echo '</div>';
} }
public function csvExport() public function csvExport()

9
lang/1.php
View File

@ -351,7 +351,7 @@ $lang = array (
"edit1337" => "Shrani spremembe", "edit1337" => "Shrani spremembe",
"edit1338" => "Prekliči", "edit1338" => "Prekliči",
"reset_translation" => "Ponastavi prevod", "reset_translation" => "Ponastavi prevod",
"delete_account" => "Izbriši račun 1KA", "delete_account" => "Izbriši 1KA račun",
"delete_account_conformation" => "Ste prepričani, da želite trajno izbrisati vaš račun? Po potrditvi se ne boste več mogli prijaviti s tem računom!", "delete_account_conformation" => "Ste prepričani, da želite trajno izbrisati vaš račun? Po potrditvi se ne boste več mogli prijaviti s tem računom!",
"change_account_pass_conformation" => "Po spremembi gesla vas bo odjavilo iz aplikacije! Za aktiviranje spremembe gesla se ponovno prijavite z novim geslom.", "change_account_pass_conformation" => "Po spremembi gesla vas bo odjavilo iz aplikacije! Za aktiviranje spremembe gesla se ponovno prijavite z novim geslom.",
"pass_text1" => "Z geslom boste tretji osebi prepre&#269;ili spreminjanje vaih nastavitev on-line novic in profila.", "pass_text1" => "Z geslom boste tretji osebi prepre&#269;ili spreminjanje vaih nastavitev on-line novic in profila.",
@ -677,6 +677,7 @@ $lang = array (
"login_alternative_emails_success" => "Na izbran elektronski naslov (#email#) je bilo poslano elektronsko sporočilo s povezavo za potrditev.", "login_alternative_emails_success" => "Na izbran elektronski naslov (#email#) je bilo poslano elektronsko sporočilo s povezavo za potrditev.",
"login_email_subscription" => "Privzeti email", "login_email_subscription" => "Privzeti email",
"login_password" => "Geslo", "login_password" => "Geslo",
"password_confirm" => "Potrditev gesla",
"login_again" => "Ponovno", "login_again" => "Ponovno",
"login_alert" => "Obve&#353;&#269;anje", "login_alert" => "Obve&#353;&#269;anje",
"login_frequency" => "Pogostost", "login_frequency" => "Pogostost",
@ -4083,14 +4084,14 @@ $lang = array (
"srv_survey_archives_ie_title" => "Izvoz vprašalnika", "srv_survey_archives_ie_title" => "Izvoz vprašalnika",
"srv_survey_archives_ie_data" => "Vprašalnik in podatki", "srv_survey_archives_ie_data" => "Vprašalnik in podatki",
"srv_survey_archives_ie_data_title" => "Izvoz vprašalnika in podatkov", "srv_survey_archives_ie_data_title" => "Izvoz vprašalnika in podatkov",
"srv_survey_archives_tracking" => "Spremembe", "srv_survey_archives_tracking" => "Zgodovina sprememb",
"srv_survey_archives_tracking_survey" => "Spremembe vprašalnika", "srv_survey_archives_tracking_survey" => "Spremembe vprašalnika",
"srv_survey_archives_tracking_data" => "Spremembe podatkov", "srv_survey_archives_tracking_data" => "Spremembe podatkov",
"srv_survey_archives_tracking_append" => "Append/Merge (uvozi)", "srv_survey_archives_tracking_append" => "Append/Merge (uvozi)",
"srv_survey_archives_tracking_hierarchy" => "Spremembe samoevalvacije v šolah", "srv_survey_archives_tracking_hierarchy" => "Spremembe samoevalvacije v šolah",
"srv_survey_archives_tracking_hierarchy_structure" => "Spremembe hierarhije", "srv_survey_archives_tracking_hierarchy_structure" => "Spremembe hierarhije",
"srv_survey_archives_tracking_hierarchy_users" => "Spremembe uporabnikov", "srv_survey_archives_tracking_hierarchy_users" => "Spremembe uporabnikov",
"srv_survey_archives_tracking_last_changes" => "Zadnjih 25 sprememb (za vpogled v vse spremembe prenesite <a href=\"ajax.php?a=user_tracking&d=download\" class=\"bold\">Excel datoteko</a>)", "srv_survey_archives_tracking_last_changes" => "Zadnjih 25 sprememb (za vpogled v vse spremembe prenesite <a href=\"ajax.php?a=user_tracking&d=download\">Excel datoteko</a>)",
"srv_survey_archives_note" => "Shrani arhivsko datoteko vprašalnika in podatkov na svoj računalnik.", "srv_survey_archives_note" => "Shrani arhivsko datoteko vprašalnika in podatkov na svoj računalnik.",
"srv_survey_archives_note_survey" => "Shranjevanje in prenos arhivske datoteke za vprašalnik.", "srv_survey_archives_note_survey" => "Shranjevanje in prenos arhivske datoteke za vprašalnik.",
"srv_survey_archives_note_survey_data" => "Shranjevanje in prenos arhivske datoteke za vprašalnik in podatke.", "srv_survey_archives_note_survey_data" => "Shranjevanje in prenos arhivske datoteke za vprašalnik in podatke.",
@ -7400,6 +7401,8 @@ $lang = array (
'srv_last_login' => "Zadnja prijava", 'srv_last_login' => "Zadnja prijava",
'ob' => "ob", 'ob' => "ob",
'srv_profil_aai_warning' => '1KA profil je vezan na vaš AAI račun. Vse spremembe urejate v vašem AAI profilu.', 'srv_profil_aai_warning' => '1KA profil je vezan na vaš AAI račun. Vse spremembe urejate v vašem AAI profilu.',
'srv_profil_settings_text' => 'Uporabniške podatke, ki ste jih nastavili ob prijavi, lahko spreminjate tukaj. Za vsako spremembo je obvezen vpis in potrditev gesla.',
'srv_profil_settings_addemail' => 'Dodaj e-mail',
'srv_drag_and_drop_new_look_option' => "Prikaži odgovore v obliki", 'srv_drag_and_drop_new_look_option' => "Prikaži odgovore v obliki",
'srv_drag_and_drop_new_look_option1' => "okvirjev", 'srv_drag_and_drop_new_look_option1' => "okvirjev",
'srv_drag_and_drop_new_look_option2' => "škatel", 'srv_drag_and_drop_new_look_option2' => "škatel",

7
lang/2.php
View File

@ -664,6 +664,7 @@ $lang = array (
"login_alternative_emails_success" => "An email has been sent to the selected e-mail (#email#) with a confirmation link.", "login_alternative_emails_success" => "An email has been sent to the selected e-mail (#email#) with a confirmation link.",
"login_email_subscription" => "Primary email", "login_email_subscription" => "Primary email",
"login_password" => "Password", "login_password" => "Password",
"password_confirm" => "Confirm password",
"login_again" => "Again", "login_again" => "Again",
"login_alert" => "Alert", "login_alert" => "Alert",
"login_frequency" => "Frequency", "login_frequency" => "Frequency",
@ -4064,14 +4065,14 @@ $lang = array (
"srv_survey_archives_ie_title" => "Survey import / export", "srv_survey_archives_ie_title" => "Survey import / export",
"srv_survey_archives_ie_data" => "Survey and data", "srv_survey_archives_ie_data" => "Survey and data",
"srv_survey_archives_ie_data_title" => "Survey and data import / export", "srv_survey_archives_ie_data_title" => "Survey and data import / export",
"srv_survey_archives_tracking" => "Changes", "srv_survey_archives_tracking" => "Change history",
"srv_survey_archives_tracking_survey" => "Survey changes", "srv_survey_archives_tracking_survey" => "Survey changes",
"srv_survey_archives_tracking_data" => "Data changes", "srv_survey_archives_tracking_data" => "Data changes",
"srv_survey_archives_tracking_append" => "Append/Merge (imports)", "srv_survey_archives_tracking_append" => "Append/Merge (imports)",
"srv_survey_archives_tracking_hierarchy" => "Changes in self-evaluation in schools", "srv_survey_archives_tracking_hierarchy" => "Changes in self-evaluation in schools",
"srv_survey_archives_tracking_hierarchy_structure" => "Hierarchy changes", "srv_survey_archives_tracking_hierarchy_structure" => "Hierarchy changes",
"srv_survey_archives_tracking_hierarchy_users" => "Users changes", "srv_survey_archives_tracking_hierarchy_users" => "Users changes",
"srv_survey_archives_tracking_last_changes" => "Last 25 changes (to view all changes <a href=\"ajax.php?a=user_tracking&d=download\" class=\"bold\">download Excel</a>)", "srv_survey_archives_tracking_last_changes" => "Last 25 changes (to view all changes <a href=\"ajax.php?a=user_tracking&d=download\">download Excel</a>)",
"srv_survey_archives_note" => "Save survey and data archive file to your computer.", "srv_survey_archives_note" => "Save survey and data archive file to your computer.",
"srv_survey_archives_note_survey" => "Save survey archive file to your computer.", "srv_survey_archives_note_survey" => "Save survey archive file to your computer.",
"srv_survey_archives_note_survey_data" => "Save survey and data archive file to your computer.", "srv_survey_archives_note_survey_data" => "Save survey and data archive file to your computer.",
@ -7284,6 +7285,8 @@ $lang = array (
'srv_last_login' => "Last login", 'srv_last_login' => "Last login",
'ob' => "at", 'ob' => "at",
'srv_profil_aai_warning' => '1KA profile is linked to your AAI account. You edit all changes in your AAI profile. ', 'srv_profil_aai_warning' => '1KA profile is linked to your AAI account. You edit all changes in your AAI profile. ',
'srv_profil_settings_text' => 'Here you can change the user details you set up when you registered. You must enter and confirm your password for each change.',
'srv_profil_settings_addemail' => 'Dodaj e-mail',
'srv_diferencial_trak' => "Show answers on stripe", 'srv_diferencial_trak' => "Show answers on stripe",
'srv_diferencial_trak_starting_num' => "Stripe starts with", 'srv_diferencial_trak_starting_num' => "Stripe starts with",
'srv_drag_and_drop_new_look_option' => "Show answers shaped as", 'srv_drag_and_drop_new_look_option' => "Show answers shaped as",

55
public/css/admin_new.css
View File

@ -5063,6 +5063,10 @@ p, span {
color: #FF0000; color: #FF0000;
} }
.blue {
color: #1E88E5;
}
.italic { .italic {
font-style: italic; font-style: italic;
} }
@ -5079,6 +5083,10 @@ p, span {
text-transform: uppercase; text-transform: uppercase;
} }
.pointer {
cursor: pointer;
}
/* /*
Only layout styles - position, display, max-width... Only layout styles - position, display, max-width...
*/ */
@ -7340,11 +7348,14 @@ div.button_holder {
box-sizing: border-box; box-sizing: border-box;
margin-bottom: 32px; margin-bottom: 32px;
} }
div.button_holder button {
margin-right: 16px;
}
div.button_holder.bottom16 { div.button_holder.bottom16 {
margin-bottom: 16px; margin-bottom: 16px;
} }
div.button_holder button { div.button_holder.bottom0 {
margin-right: 16px; margin-bottom: 0px;
} }
div.button_holder.inline { div.button_holder.inline {
align-items: flex-end; align-items: flex-end;
@ -7371,7 +7382,7 @@ label.empty {
font-size: 0; font-size: 0;
} }
input[type=text] { input[type=text], input[type=password] {
border: 1px solid #C4C4C4; border: 1px solid #C4C4C4;
box-sizing: border-box; box-sizing: border-box;
border-radius: 2px; border-radius: 2px;
@ -7379,34 +7390,34 @@ input[type=text] {
margin-top: 4px; margin-top: 4px;
font-family: Source Sans Pro, sans-serif; font-family: Source Sans Pro, sans-serif;
} }
input[type=text].w200 { input[type=text].w200, input[type=password].w200 {
width: 200px; width: 200px;
} }
input[type=text].wauto { input[type=text].wauto, input[type=password].wauto {
width: auto; width: auto;
} }
input[type=text].large { input[type=text].large, input[type=password].large {
height: 40px; height: 40px;
font-size: 16px; font-size: 16px;
padding: 9px 7px; padding: 9px 7px;
} }
input[type=text].medium { input[type=text].medium, input[type=password].medium {
height: 32px; height: 32px;
font-size: 14px; font-size: 14px;
padding: 6px 7px; padding: 6px 7px;
} }
input[type=text].small { input[type=text].small, input[type=password].small {
height: 26px; height: 26px;
font-size: 14px; font-size: 14px;
padding: 3px 7px; padding: 3px 7px;
} }
input[type=text]:focus { input[type=text]:focus, input[type=password]:focus {
outline-style: none; outline-style: none;
box-shadow: none; box-shadow: none;
border-color: transparent; border-color: transparent;
border-color: #1E88E5; border-color: #1E88E5;
} }
input[type=text][readonly=true] { input[type=text][readonly=true], input[type=password][readonly=true] {
cursor: pointer; cursor: pointer;
} }
input[type=radio], input[type=checkbox] { input[type=radio], input[type=checkbox] {
@ -13972,6 +13983,23 @@ textarea.gdpr_requests_comment {
height: 60px; height: 60px;
} }
div#user_info_segment {
background-color: #F8F8F8;
border: 1px solid #E5E5E5;
box-sizing: border-box;
padding: 32px 20px;
margin-bottom: 16px;
display: flex;
flex-direction: row;
}
div#user_info_segment .user_info {
display: flex;
flex-direction: column;
}
div#user_info_segment .user_info.text {
margin-right: 50px;
}
@media (max-width: 1100px) { @media (max-width: 1100px) {
#quick_comments_link.newCss { #quick_comments_link.newCss {
display: none; display: none;
@ -15196,19 +15224,18 @@ table.analysis_reports > tbody > tr > td {
margin: 10px 30px; margin: 10px 30px;
} }
#table-horizontal-scroll-wrapper1 { #table-horizontal-scroll-wrapper1-userchanges {
display: table; display: table;
table-layout: fixed; table-layout: fixed;
width: 100%; width: 100%;
} }
#table-horizontal-scroll-wrapper2 { #table-horizontal-scroll-wrapper2-userchanges {
display: table-cell; display: table-cell;
overflow-x: auto; overflow-x: auto;
width: 100%; width: 100%;
} }
#table-horizontal-scroll-wrapper2-userchanges table {
#table-horizontal-scroll-wrapper2 table {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
white-space: nowrap; white-space: nowrap;

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

@ -10,6 +10,10 @@ p,span {
color: $red; color: $red;
} }
.blue {
color: $blue;
}
.italic { .italic {
font-style: italic; font-style: italic;
} }
@ -24,4 +28,8 @@ p,span {
.caps { .caps {
text-transform: uppercase; text-transform: uppercase;
}
.pointer {
cursor: pointer;
} }

8
resources/sass/admin_new/components/form/button.scss
View File

@ -105,13 +105,17 @@ div.button_holder {
flex-direction: row; flex-direction: row;
box-sizing: border-box; box-sizing: border-box;
margin-bottom: 32px; margin-bottom: 32px;
button {
margin-right: 16px;
}
&.bottom16 { &.bottom16 {
margin-bottom: 16px; margin-bottom: 16px;
} }
button { &.bottom0 {
margin-right: 16px; margin-bottom: 0px;
} }
&.inline { &.inline {

3
resources/sass/admin_new/components/form/input.scss
View File

@ -17,7 +17,8 @@ label{
input { input {
&[type="text"] { &[type="text"],
&[type="password"] {
border: 1px solid $dark-gray; border: 1px solid $dark-gray;
box-sizing: border-box; box-sizing: border-box;
border-radius: 2px; border-radius: 2px;

14
resources/sass/admin_new/mobile/pages/settings_profile.scss
View File

@ -1,18 +1,18 @@
// Zadnjih 25 sprememb tabela - horizontal scroll // Zadnjih 25 sprememb tabela - horizontal scroll
#table-horizontal-scroll-wrapper1 { #table-horizontal-scroll-wrapper1-userchanges {
display: table; display: table;
table-layout: fixed; table-layout: fixed;
width: 100%; width: 100%;
} }
#table-horizontal-scroll-wrapper2 { #table-horizontal-scroll-wrapper2-userchanges {
display: table-cell; display: table-cell;
overflow-x: auto; overflow-x: auto;
width: 100%; width: 100%;
}
#table-horizontal-scroll-wrapper2 table { table {
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
white-space: nowrap; white-space: nowrap;
}
} }

2
resources/sass/admin_new/pages/pages.scss
View File

@ -11,3 +11,5 @@
@import "survey_data/survey_data"; @import "survey_data/survey_data";
@import "survey_analysis/survey_analysis"; @import "survey_analysis/survey_analysis";
@import "gdpr_pages/gdpr"; @import "gdpr_pages/gdpr";
@import "settings/settings";

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

@ -0,0 +1,20 @@
div#user_info_segment {
background-color: $light-gray;
border: 1px solid $gray;
box-sizing: border-box;
padding: 32px 20px;
margin-bottom: 16px;
display: flex;
flex-direction: row;
.user_info {
display: flex;
flex-direction: column;
&.text {
margin-right: 50px;
}
}
}

1
resources/sass/admin_new/pages/settings/settings.scss Normal file
View File

@ -0,0 +1 @@
@import "moj_profil.scss"