diff --git a/admin/survey/SurveyAdmin.php b/admin/survey/SurveyAdmin.php index 9f054498c..eb92b7889 100644 --- a/admin/survey/SurveyAdmin.php +++ b/admin/survey/SurveyAdmin.php @@ -1843,13 +1843,15 @@ class SurveyAdmin echo ''; echo '
  • '; - # parapodatki (browser, os, js...) - echo '
  • '; - echo ''; - echo $lang['srv_metapodatki'] . ''; - echo '
    • '; - echo '
  • '; + # parapodatki (browser, os, js...) - volitve imajo to ugasnjeno + if(!SurveyInfo::getInstance()->checkSurveyModule('voting')) { + echo '
  • '; + echo ''; + echo $lang['srv_metapodatki'] . ''; + echo '
    • '; + echo '
  • '; + } # neodgovori in uporabnost enot //if ($admin_type === '0') { @@ -1890,8 +1892,8 @@ class SurveyAdmin echo '
  • '; } - # IP analiza lokacij - gorenje ima to ugasnjeno - if (!Common::checkModule('gorenje')) { + # IP analiza lokacij - gorenje ima to ugasnjeno, volitve imajo tudi ugasnjeno + if (!Common::checkModule('gorenje') && !SurveyInfo::getInstance()->checkSurveyModule('voting')) { echo '
  • '; echo ''; @@ -1944,17 +1946,21 @@ class SurveyAdmin } # langStatistic - #langStatistic naj bo viden samo če imamo različne jezike - $qry_string = "SELECT language FROM srv_user WHERE ank_id = '" . $this->anketa . "' AND preview = '0' AND deleted='0' group by language"; - $qry = (sisplet_query($qry_string)); - $cntLang = mysqli_num_rows($qry); - if ($cntLang > 1) { - echo '
  • '; - echo ''; - echo $lang['srv_languages_statistics'] . ''; - echo '
    • '; - echo '
  • '; + #langStatistic naj bo viden samo če imamo različne jezike in nimamo volitev + if (!Common::checkModule('gorenje') && !SurveyInfo::getInstance()->checkSurveyModule('voting')) { + + $qry_string = "SELECT language FROM srv_user WHERE ank_id = '" . $this->anketa . "' AND preview = '0' AND deleted='0' group by language"; + $qry = (sisplet_query($qry_string)); + $cntLang = mysqli_num_rows($qry); + + if ($cntLang > 1) { + echo '
  • '; + echo ''; + echo $lang['srv_languages_statistics'] . ''; + echo '
    • '; + echo '
  • '; + } } echo ''; diff --git a/admin/survey/SurveyAdminSettings.php b/admin/survey/SurveyAdminSettings.php index 912eadb4e..5d4e29d75 100644 --- a/admin/survey/SurveyAdminSettings.php +++ b/admin/survey/SurveyAdminSettings.php @@ -8705,7 +8705,7 @@ class SurveyAdminSettings { elseif ($_GET['a'] == 'voting'){ // Ce so vabila ze vklopljena ne pustimo vklopa - if(!isset($modules['voting']) && SurveyInfo::getInstance()->checkSurveyModule('email')){ + if(isset($modules['voting']) || (!isset($modules['voting']) && SurveyInfo::getInstance()->checkSurveyModule('email'))){ $disabled = ' disabled="disabled"'; $css_disabled = ' gray'; } @@ -8713,6 +8713,7 @@ class SurveyAdminSettings { echo '
    '.$lang['srv_voting'].''; echo ''; + echo '
    '.$lang['srv_voting_info'].''; echo '
    '; echo '
    '; diff --git a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php index 7996a5b9b..1801af606 100644 --- a/admin/survey/classes/surveyData/class.SurveyDataDisplay.php +++ b/admin/survey/classes/surveyData/class.SurveyDataDisplay.php @@ -1104,15 +1104,15 @@ class SurveyDataDisplay{ echo '
  • '; echo ' '; echo '
    • '; - - // meta - echo '
  • '; - echo ' '; - echo '
    • '; - + // Preverimo ce je vklopljen modul za volitve - potem nimamo identifikatorjev if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){ + // Parapodatki + echo '
  • '; + echo ' '; + echo '
    • '; + // če imamo sistemske podatke katere moramo prikazovati ločeno - IDENTIFIKATORJI if(!isset(self::$_HEADERS['_settings']['count_system_data_variables']) || (isset(self::$_HEADERS['_settings']['count_system_data_variables']) && (int)self::$_HEADERS['_settings']['count_system_data_variables'] > 0)) { echo '
  • '; @@ -1125,12 +1125,12 @@ class SurveyDataDisplay{ echo ' '; echo '
    • '; } + + // datum + echo '
  • '; + echo ''; + echo '
    • '; } - - // datum - echo '
  • '; - echo ''; - echo '
    • '; // zaporedna številka echo '
  • '; @@ -2752,7 +2752,7 @@ class SurveyDataDisplay{ echo ''; - //div na desni z metapodatki + // Div na desni z metapodatki echo '
    '; self::displayQuickEditMeta(); echo '
    '; @@ -2993,21 +2993,25 @@ class SurveyDataDisplay{ echo ''.$lang['srv_recnum'].':'; echo ''.($rowu['recnum'] ? $rowu['recnum'] : ' ').''; - // browser - echo ''.$lang['browser'].':'; - echo ''.($rowu['useragent'] ? $rowu['useragent'] : ' ').''; - - // javascript - echo ''.$lang['javascript'].':'; - echo ''.(($rowu['javascript'] == 1) ? $lang['yes'] : $lang['no1']).''; - - // jezik - // Dobimo vse jezike za katere obstaja jezikovna datoteka - include_once($site_path.'lang/jeziki.php'); - $jeziki = $lang_all_global['ime']; - $jeziki['0'] = $lang['language']; - echo ''.$lang['lang'].':'; - echo ''.$jeziki[$rowu['language']].''; + // Pri volitvah nimamo parapodatkov + if (!SurveyInfo::getInstance()->checkSurveyModule('voting')){ + + // browser + echo ''.$lang['browser'].':'; + echo ''.($rowu['useragent'] ? $rowu['useragent'] : ' ').''; + + // javascript + echo ''.$lang['javascript'].':'; + echo ''.(($rowu['javascript'] == 1) ? $lang['yes'] : $lang['no1']).''; + + // jezik + // Dobimo vse jezike za katere obstaja jezikovna datoteka + include_once($site_path.'lang/jeziki.php'); + $jeziki = $lang_all_global['ime']; + $jeziki['0'] = $lang['language']; + echo ''.$lang['lang'].':'; + echo ''.$jeziki[$rowu['language']].''; + } // status echo ''.$lang['status'].':'; @@ -3017,77 +3021,78 @@ class SurveyDataDisplay{ echo ''.$lang['srv_data_lurker'].':'; echo ''.(($rowu['lurker'] == 1) ? $lang['yes'] : $lang['no1']).''; - //referer - echo ''.$lang['referer'].':'; - echo ''.($rowu['referer'] ? $rowu['referer'] : ' ').''; + // Pri volitvah nimamo parapodatkov + if (!SurveyInfo::getInstance()->checkSurveyModule('voting')){ - //email - samo forma - if($rowa['survey_type'] == 1){ - echo ''.$lang['email'].':'; - echo ''.($rowu['email'] ? $rowu['email'] : ' ').''; - } + // referer + echo ''.$lang['referer'].':'; + echo ''.($rowu['referer'] ? $rowu['referer'] : ' ').''; - // spreminjal - $datetime = strtotime($rowu['time_insert']); - $text = date("d.m.Y, H:i:s", $datetime); - echo ''.$lang['timeinsert'].':'; - echo ''.$text.''; + // email - samo forma + if($rowa['survey_type'] == 1){ + echo ''.$lang['email'].':'; + echo ''.($rowu['email'] ? $rowu['email'] : ' ').''; + } - $datetime = strtotime($rowu['time_edit']); - $text = date("d.m.Y, H:i:s", $datetime); - echo ''.$lang['timeedit'].':'; - echo ''.$text.''; + // spreminjal + $datetime = strtotime($rowu['time_insert']); + $text = date("d.m.Y, H:i:s", $datetime); + echo ''.$lang['timeinsert'].':'; + echo ''.$text.''; - // preberemo popravljanje po straneh - $sqlG = sisplet_query("SELECT ug.time_edit, g.naslov FROM srv_user_grupa".self::$db_table." ug, srv_grupa g WHERE g.ank_id = '".self::$sid."' AND ug.usr_id = '".self::$usr_id."' AND g.id = ug.gru_id ORDER BY g.vrstni_red ASC"); - while($rowG = mysqli_fetch_array($sqlG)){ + $datetime = strtotime($rowu['time_edit']); + $text = date("d.m.Y, H:i:s", $datetime); + echo ''.$lang['timeedit'].':'; + echo ''.$text.''; - $datetime = strtotime($rowG['time_edit']); - $text = date("d.m.Y, H:i:s", $datetime); + // preberemo popravljanje po straneh + $sqlG = sisplet_query("SELECT ug.time_edit, g.naslov FROM srv_user_grupa".self::$db_table." ug, srv_grupa g WHERE g.ank_id = '".self::$sid."' AND ug.usr_id = '".self::$usr_id."' AND g.id = ug.gru_id ORDER BY g.vrstni_red ASC"); + while($rowG = mysqli_fetch_array($sqlG)){ - echo ''.$rowG['naslov'].':'; - echo ''.$text.''; - } + $datetime = strtotime($rowG['time_edit']); + $text = date("d.m.Y, H:i:s", $datetime); - if ( $admin_type <= 1 /* && what more??? */ ) { - - echo ''.$lang['srv_sc_txt1'].':'; - echo ''.$lang['srv_sc_txt2'].''; - - } + echo ''.$rowG['naslov'].':'; + echo ''.$text.''; + } + + if ( $admin_type <= 1) { + + echo ''.$lang['srv_sc_txt1'].':'; + echo ''.$lang['srv_sc_txt2'].''; + + } + } - # preberemo vklopljene module - //potrebuje se za modul MAZA, da aplikacija izpolni te hidden inpute - //rabi pa se to za povezavo respondenta med tebelama maza_app_users in srv_user - if(SurveyInfo::checkSurveyModule('maza')){ - $maza_query = "SELECT mau.identifier, mau.deviceInfo, mau.tracking_log FROM maza_app_users as mau - JOIN maza_srv_users AS msu ON mau.id = msu.maza_user_id - JOIN srv_user AS su ON msu.srv_user_id = su.id - WHERE su.id = '".self::$usr_id."';"; - - $sql = sisplet_query($maza_query, 'array'); - - //it is already there - if(count($sql) > 0){ - //NextPin link - echo ''.$lang['srv_maza_nextpin_link'].':'; - echo '' - . 'http://traffic.ijs.si/NextPin/?user=1KAPanel_'.$sql[0]['identifier'].''; - //Device info - echo ''.$lang['srv_maza_device_info'].':'; - echo ''.$sql[0]['deviceInfo'].''; - //Tracking logs - echo ''.$lang['srv_maza_user_app_logs'].':'; - echo ''.$sql[0]['tracking_log'].''; - } - } + # preberemo vklopljene module + //potrebuje se za modul MAZA, da aplikacija izpolni te hidden inpute + //rabi pa se to za povezavo respondenta med tebelama maza_app_users in srv_user + if(SurveyInfo::checkSurveyModule('maza')){ + $maza_query = "SELECT mau.identifier, mau.deviceInfo, mau.tracking_log FROM maza_app_users as mau + JOIN maza_srv_users AS msu ON mau.id = msu.maza_user_id + JOIN srv_user AS su ON msu.srv_user_id = su.id + WHERE su.id = '".self::$usr_id."';"; + + $sql = sisplet_query($maza_query, 'array'); + + //it is already there + if(count($sql) > 0){ + //NextPin link + echo ''.$lang['srv_maza_nextpin_link'].':'; + echo '' + . 'http://traffic.ijs.si/NextPin/?user=1KAPanel_'.$sql[0]['identifier'].''; + //Device info + echo ''.$lang['srv_maza_device_info'].':'; + echo ''.$sql[0]['deviceInfo'].''; + //Tracking logs + echo ''.$lang['srv_maza_user_app_logs'].':'; + echo ''.$sql[0]['tracking_log'].''; + } + } echo ''; - echo ''; - //echo ''; - } diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php index 7f87c368f..1812fa136 100644 --- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php +++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php @@ -1417,16 +1417,20 @@ class SurveyInvitationsNew { # Katera polja prikazujemo v seznamu prejemnikov $default_fields = array( 'sent' => 1, - 'responded' => 1, - 'unsubscribed' => 1, 'email' => 1, - 'password' => 1, 'firstname' => 0, 'lastname' => 0, 'salutation' => 0, 'phone' => 0, 'custom' => 0, ); + + // Volitve nimajo nekaterih polj + if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){ + $default_fields['responded'] = 1; + $default_fields['unsubscribed'] = 1; + $default_fields['password'] = 1; + } // Ce imamo modul 360 imamo tudi odnos if(SurveyInfo::getInstance()->checkSurveyModule('360_stopinj')){ @@ -1445,13 +1449,16 @@ class SurveyInvitationsNew { } } - # dodamo še ostala polja - if(!SurveyInfo::getInstance()->checkSurveyModule('voting')) + // Dodamo še ostala polja + // Volitve nimajo nekaterih polj + if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){ $fields['last_status'] = 1; + $fields['date(date_expired)'] = 1; + } $sql_select_fields[] = 'i.last_status'; $fields['date_inserted'] = 1; - $fields['date(date_expired)'] = 1; + $fields['inserted_uid'] = 1; $sql_select_fields[] = 'i.inserted_uid'; $sql_select_fields[] = 'i.date_inserted'; @@ -4563,30 +4570,53 @@ class SurveyInvitationsNew { echo ''; echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - if(!SurveyInfo::getInstance()->checkSurveyModule('voting')) - echo ''; - echo ''; + + // Pri volitvah ne prikazemo nekaterih stolpcev + if(SurveyInfo::getInstance()->checkSurveyModule('voting')){ + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + else{ + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + echo ''; while ($sql_row = mysqli_fetch_assoc($sql_query)) { echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - if(!SurveyInfo::getInstance()->checkSurveyModule('voting')) - echo ''; - echo ''; + + // Pri volitvah ne prikazemo nekaterih stolpcev + if(SurveyInfo::getInstance()->checkSurveyModule('voting')){ + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + else{ + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + + echo ''; } @@ -6571,12 +6601,20 @@ class SurveyInvitationsNew { echo ')'; echo ''; + echo '
    '; + echo '
    '.$lang['srv_inv_recipients_sent'].''.$lang['srv_inv_recipients_responded'].''.$lang['srv_inv_recipients_unsubscribed'].''.$lang['srv_inv_recipients_email'].''.$lang['srv_inv_recipients_password'].''.$lang['srv_inv_recipients_firstname'].''.$lang['srv_inv_recipients_lastname'].''.$lang['srv_inv_recipients_last_status'].''.$lang['srv_inv_recipients_list_id'].''.$lang['srv_inv_recipients_sent'].''.$lang['srv_inv_recipients_email'].''.$lang['srv_inv_recipients_firstname'].''.$lang['srv_inv_recipients_lastname'].''.$lang['srv_inv_recipients_list_id'].''.$lang['srv_inv_recipients_sent'].''.$lang['srv_inv_recipients_responded'].''.$lang['srv_inv_recipients_unsubscribed'].''.$lang['srv_inv_recipients_email'].''.$lang['srv_inv_recipients_password'].''.$lang['srv_inv_recipients_firstname'].''.$lang['srv_inv_recipients_lastname'].''.$lang['srv_inv_recipients_last_status'].''.$lang['srv_inv_recipients_list_id'].'
    '.$sql_row['email'].''.$sql_row['password'].''.$sql_row['firstname'].''.$sql_row['lastname'].''.$lang['srv_userstatus_'.$sql_row['last_status']].' ('.$sql_row['last_status'].')'.''.$lists[$sql_row['list_id']].''.$sql_row['email'].''.$sql_row['firstname'].''.$sql_row['lastname'].''.$lists[$sql_row['list_id']].''.$sql_row['email'].''.$sql_row['password'].''.$sql_row['firstname'].''.$sql_row['lastname'].''.$lang['srv_userstatus_'.$sql_row['last_status']].' ('.$sql_row['last_status'].')'.''.$lists[$sql_row['list_id']].'
    '; - echo ''; - echo ''; + + echo ''; + + echo ''; + // Volitve nimajo nekaterih polj + if(!SurveyInfo::getInstance()->checkSurveyModule('voting')) + echo ''; echo ''; - echo ''; + + echo ''; $sql_string1 = "SELECT status, DATE_FORMAT(time_insert,'%d.%m.%Y, %T') AS status_time FROM srv_invitations_tracking WHERE res_id = '$_rec_id' AND inv_arch_id='".$sql_row['id']."' ORDER BY uniq ASC"; $sql_query1 = sisplet_query($sql_string1); @@ -6585,8 +6623,10 @@ class SurveyInvitationsNew { echo ''; - echo ''; - + // Volitve nimajo nekaterih polj + if(!SurveyInfo::getInstance()->checkSurveyModule('voting')) + echo ''; + echo '
    '.$lang['srv_invitation_user_chronology_date'].''.$lang['srv_invitation_user_chronology_status'].'
    '.$lang['srv_invitation_user_chronology_date'].''.$lang['srv_invitation_user_chronology_status'].''.$lang['srv_inv_message_type'].'
    '.$sql_row1['status_time'].'('.$sql_row1['status'].') - '.$lang['srv_userstatus_'.$sql_row1['status']].'('.$sql_row1['status'].') - '.$lang['srv_userstatus_'.$sql_row1['status']].''; if ($sql_row['tip'] == '0') echo $lang['srv_inv_message_noemailing_type1']; @@ -6603,12 +6643,13 @@ class SurveyInvitationsNew { echo '
    '; echo ''; } - echo '
    '; - echo ''.$lang['srv_inv_recipients_final_status'].' ('.$lastStatus.') - '.$lang['srv_userstatus_'.$lastStatus]; - echo '
    '; - - - + + // Volitve nimajo nekaterih polj + if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){ + echo '
    '; + echo ''.$lang['srv_inv_recipients_final_status'].' ('.$lastStatus.') - '.$lang['srv_userstatus_'.$lastStatus]; + echo '
    '; + } echo ''; // inv_select_mail_preview @@ -6731,33 +6772,55 @@ class SurveyInvitationsNew { echo ''; echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - if(!SurveyInfo::getInstance()->checkSurveyModule('voting')) - echo ''; - echo ''; + + // Pri volitvah ne prikazemo nekaterih stolpcev + if(SurveyInfo::getInstance()->checkSurveyModule('voting')){ + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + else{ + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + echo ''; while ($sql_row = mysqli_fetch_assoc($sql_query)) { echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - echo ''; - $status = $arch_user_max_status[$sql_row['res_id']]; - echo ''; - if(!SurveyInfo::getInstance()->checkSurveyModule('voting')) - echo ''; - echo ''; + + // Pri volitvah ne prikazemo nekaterih stolpcev + if(SurveyInfo::getInstance()->checkSurveyModule('voting')){ + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + } + else{ + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + echo ''; + $status = $arch_user_max_status[$sql_row['res_id']]; + echo ''; + echo ''; + echo ''; + } + echo ''; } @@ -7911,6 +7974,9 @@ class SurveyInvitationsNew { $voting_disabled = ''; if(SurveyInfo::getInstance()->checkSurveyModule('voting')){ $voting_disabled = ' disabled'; + + // Warning za volitve + echo '

    '.$lang['srv_voting_warning'].'

    '; } $individual = (int)$this->surveySettings['individual_invitation']; diff --git a/admin/survey/modules/mod_voting/class.SurveyVoting.php b/admin/survey/modules/mod_voting/class.SurveyVoting.php index fdd6dd2f9..74dd8ee7b 100644 --- a/admin/survey/modules/mod_voting/class.SurveyVoting.php +++ b/admin/survey/modules/mod_voting/class.SurveyVoting.php @@ -45,7 +45,13 @@ class SurveyVoting{ echo '
    '.$lang['settings'].''; echo '
    '; - echo '
    '.$lang['srv_inv_nav_email'].'
    '; + + echo $lang['srv_voting_edit1'].' '.$lang['srv_voting_edit2'].'.'; + + echo '

    '; + + echo $lang['srv_voting_invitations1'].' '.$lang['srv_voting_invitations2'].'.'; + echo '

    '; echo '
    '; diff --git a/lang/1.php b/lang/1.php index 6a2914594..5cdfa3820 100644 --- a/lang/1.php +++ b/lang/1.php @@ -3110,6 +3110,12 @@ $lang = array ( "srv_zakljucek_vprasalnika" => "Zaključek vprašalnika", "srv_kviz_konec_note" => "Če ni izbrana nobena opcija, vidi rezultate samo administrator", "srv_voting" => "Volitve", + "srv_voting_info" => "Modul volitve omogoča pošiljanje vabil z izklopom vseh parapodatkov in brez kakršnekoli možnosti povezovanja podatkov z elektronskimi naslovi in drugimi identifikatorji.
    Po vklopu, izklop modula ni več mogoč!", + "srv_voting_edit1" => "Vprašalnik urejate v zavihku", + "srv_voting_edit2" => "Urejanje", + "srv_voting_invitations1" => "Prejemnike vabil in sporočilo za vabilo k volitvam urejate v", + "srv_voting_invitations2" => "vmesniku za pošiljanje vabil", + "srv_voting_warning" => "Vabila so individualizirana zgolj za namen pošiljanja vabil.
    Ko so vabila poslana, povezovanje med elektronskim naslovom in odgovori respondenta niso mogoči.", "srv_advanced_paradata" => "Napredni parapodatki", "srv_advanced_paradata_collect_post_time" => "Beleži \"post time\"", "srv_json_survey_export" => "JSON izvoz ankete", diff --git a/lang/2.php b/lang/2.php index 64effc641..95aaf2ff1 100644 --- a/lang/2.php +++ b/lang/2.php @@ -3082,6 +3082,12 @@ $lang = array ( "srv_zakljucek_vprasalnika" => "Survey end", "srv_kviz_konec_note" => "If no option is selected, only administrator can view results", "srv_voting" => "Voting", + "srv_voting_info" => "The voting module allows you to send invitations by turning off all paraadata and without any possibility of associating data with e-mail addresses and other identifiers.
    After switching on, switching off the module is no longer possible!", + "srv_voting_edit1" => "You can edit the questionnaire in a tab", + "srv_voting_edit2" => "Edit", + "srv_voting_invitations1" => "Email invitations are edited in", + "srv_voting_invitations2" => "Email invitations interface", + "srv_voting_warning" => "Invitations are individualized for the purpose of sending invitations only.
    Once the invitations are sent, the link between the e-mail address and the respondent's answers is not possible.", "srv_advanced_paradata" => "Advanced paradata", "srv_advanced_paradata_collect_post_time" => "Collect \"post time\"", "srv_json_survey_export" => "JSON survey export", diff --git a/public/css/admin.css b/public/css/admin.css index 4ac90ac05..813fe20d7 100644 --- a/public/css/admin.css +++ b/public/css/admin.css @@ -19617,7 +19617,7 @@ and open the template in the editor. max-width: 700px; margin: 15px 10px 10px 5px; display: inline-block; - padding: 10px 10px 10px 10px; + padding: 0 10px 10px 10px; border: 1px solid #c8e3f8; background-color: #f5fafe; } diff --git a/resources/sass/admin/publish/settings.scss b/resources/sass/admin/publish/settings.scss index 4982a7837..789ca3989 100644 --- a/resources/sass/admin/publish/settings.scss +++ b/resources/sass/admin/publish/settings.scss @@ -136,7 +136,7 @@ and open the template in the editor. max-width:700px; margin: 15px 10px 10px 5px; display:inline-block; - padding:10px 10px 10px 10px; + padding: 0 10px 10px 10px; border: 1px solid $soft_blue; background-color: $soft_blue_very_lighten;
    '.$lang['srv_inv_recipients_sent'].''.$lang['srv_inv_recipients_responded'].''.$lang['srv_inv_recipients_unsubscribed'].''.$lang['srv_inv_recipients_email'].''.$lang['srv_inv_recipients_password'].''.$lang['srv_inv_recipients_firstname'].''.$lang['srv_inv_recipients_lastname'].''.$lang['srv_inv_recipients_max_archive_status'].''.$lang['srv_inv_recipients_last_status'].''.$lang['srv_inv_recipients_list_id'].''.$lang['srv_inv_recipients_sent'].''.$lang['srv_inv_recipients_email'].''.$lang['srv_inv_recipients_firstname'].''.$lang['srv_inv_recipients_lastname'].''.$lang['srv_inv_recipients_list_id'].''.$lang['srv_inv_recipients_sent'].''.$lang['srv_inv_recipients_responded'].''.$lang['srv_inv_recipients_unsubscribed'].''.$lang['srv_inv_recipients_email'].''.$lang['srv_inv_recipients_password'].''.$lang['srv_inv_recipients_firstname'].''.$lang['srv_inv_recipients_lastname'].''.$lang['srv_inv_recipients_max_archive_status'].''.$lang['srv_inv_recipients_last_status'].''.$lang['srv_inv_recipients_list_id'].'
    '.$sql_row['email'].''.$sql_row['password'].''.$sql_row['firstname'].''.$sql_row['lastname'].''.$lang['srv_userstatus_'.$status].' ('.$status.')'.''.$lang['srv_userstatus_'.$sql_row['last_status']].' ('.$sql_row['last_status'].')'.''.$lists[$sql_row['list_id']].''.$sql_row['email'].''.$sql_row['firstname'].''.$sql_row['lastname'].''.$lists[$sql_row['list_id']].''.$sql_row['email'].''.$sql_row['password'].''.$sql_row['firstname'].''.$sql_row['lastname'].''.$lang['srv_userstatus_'.$status].' ('.$status.')'.''.$lang['srv_userstatus_'.$sql_row['last_status']].' ('.$sql_row['last_status'].')'.''.$lists[$sql_row['list_id']].'