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:
urospodkriznik 2022-09-14 13:16:45 +02:00
commit e19259e990
7 changed files with 1304 additions and 1241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/1.php
View File

@ -6119,6 +6119,10 @@ $lang = array (
"srv_continue_later_subject" => 'Shranjena anketa',
"srv_continue_later_content" => 'Pozdravljeni, <br><br>Na spletni strani 1ka.si ste si shranili spodnjo anketo za kasnejše izpolnjevanje.<br><br> Z izpolnjevanjem lahko nadaljujete s klikom na povezavo',
"srv_continue_later_content_rs-rs" => 'Pozdravljeni, <br><br>Na spletni strani vprasalniki.rs-rs.si ste si shranili spodnjo anketo za kasnejše izpolnjevanje.<br><br> Z izpolnjevanjem lahko nadaljujete s klikom na povezavo',
"srv_return_edit_subject" => 'Shranjena anketa',
"srv_return_edit_content" => 'Pozdravljeni, <br><br>Na spletni strani 1ka.si ste si shranili spodnjo anketo za naknadno urejanje odgovorov.<br><br> Do naknadnega urejanja lahko dostopate s klikom na povezavo',
"srv_continue_later_success" => 'Povezava je bila uspešno posredovana na vnešen email naslov.',
"srv_continue_later_fail" => 'Pri pošiljanju je prišlo do napake.',
"srv_upload_pic" => 'Naložite svoj logotip',
"srv_upload_pic2" => 'Naložite svojo sliko',
"srv_upload_logo" => 'Naložite svoj logotip',

6
lang/2.php
View File

@ -6014,7 +6014,11 @@ $lang = array (
"srv_continue_later_subject" => 'Saved survey',
"srv_continue_later_content" => 'You saved a survey on 1ka.si.<br><br>You can continue with the survey by clicking on this link',
"srv_continue_later_content_rs-rs" => 'You saved a survey on vprasalniki.rs-rs.si.<br><br>You can continue with the survey by clicking on this link',
"srv_upload_pic" => 'Upload your logo',
"srv_return_edit_subject" => 'Saved survey',
"srv_return_edit_content" => 'You saved a survey on 1ka.si.<br><br>You can edit your answers by clicking on this link',
"srv_continue_later_success" => 'Survey url has been successfully sent to your email.',
"srv_continue_later_fail" => 'When sending an email an error occurred.',
"srv_upload_pic" => 'Upload your logo',
"srv_upload_pic2" => 'Upload picture',
"srv_upload_logo" => 'Upload logo',
"srv_upload_pic_disclaimer" => 'Copy picture URL from the list (below) and use it when editing CSS (above)',

32
main/survey/app/Controllers/AjaxController.php
View File

@ -628,6 +628,38 @@ class AjaxController extends Controller
catch (Exception $e) {
}
}
public function ajax_return_edit_send(){
global $mysql_database_name;
ob_clean();
$s = self::$lang['srv_return_edit_subject'];
$t = self::$lang['srv_return_edit_content'] . ': <a href="' . $_POST['url'] . '">' . $_POST['url'] . '</a>';
// Podpis
$signature = Common::getEmailSignature();
$t .= $signature;
$mail = $_POST['email'];
if ($mail == ''){
echo self::$lang['srv_continue_later_fail'];
return;
}
try {
$MA = new MailAdapter(get('anketa'), $type='alert');
$MA->addRecipients($mail);
$result = $MA->sendMail(stripslashes($t), $s);
}
catch (Exception $e) {
echo self::$lang['srv_continue_later_fail'];
return;
}
echo self::$lang['srv_continue_later_success'];
}
public function ajax_get_tip_opozorila() {
$spr_id = $_POST['spr_id'];

19
main/survey/app/Controllers/DisplayController.php
View File

@ -218,10 +218,21 @@ class DisplayController extends Controller
$return_url = $_POST['url'] . '&return=1';
$return_url = SurveyInfo::getSurveyLink() . get('cookie_url') . '&return=1';
echo '<br class="clr"/><div class="return_edit_url"><p>';
echo self::$lang['srv_concl_return_edit_URL'].':<br />';
echo '<a href="'.$return_url.'" title="'.self::$lang['srv_concl_return_edit_URL'].'"><span>'.$return_url.'</span></a>';
echo '</p></div>';
echo '<br class="clr"/>';
echo '<div id="return_edit" class="return_edit_url">';
echo ' <p>';
echo self::$lang['srv_concl_return_edit_URL'].':<br />';
echo ' <a href="'.$return_url.'" title="'.self::$lang['srv_concl_return_edit_URL'].'"><span>'.$return_url.'</span></a>';
echo ' </p>';
echo '<br class="clr"/>';
echo ' <input type="hidden" name="url" id="url" value="' . $return_url . '">';
echo ' <p id="return_edit_email">' . self::$lang['srv_continue_later_email'] . ': <input type="email" name="email" id="email" value="" placeholder="' . self::$lang['srv_email_example2'] . '"> <button type="submit" onclick="return_edit_send(\'' . self::$site_url . '\', \'' . get('lang_id') . '\'); return false;">' . self::$lang['srv_forma_send'] . '</button></p>';
echo '</div>';
}
}

11
main/survey/js/script.js
View File

@ -1231,11 +1231,18 @@ function continue_later_send (site_url, lang_id) {
email = $('#email').val();
$.post(site_url+'main/survey/ajax.php?a=continue_later_send&language='+lang_id, {anketa: srv_meta_anketa_id, url:url, email:email}, function (data) {
$('#continue_later').remove();
});
}
function return_edit_send (site_url, lang_id) {
url = $('#url').val();
email = $('#email').val();
$.post(site_url+'main/survey/ajax.php?a=return_edit_send&language='+lang_id, {anketa: srv_meta_anketa_id, url:url, email:email}, function (data) {
$('#return_edit_email').text(data);
});
}
function preview_popup_close () {

2470
public/css/main.css
View File

File diff suppressed because it is too large Load Diff

3
resources/sass/main/main/content.scss
View File

@ -1360,7 +1360,8 @@ div.tabs a.active {
content: "\f061";
}
#continue_later{
#continue_later,
#return_edit{
margin: 10px 10px;
padding: 10px 10px 0 10px !important;