diff --git a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php index 4d303c828..f72c6a744 100644 --- a/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php +++ b/admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php @@ -517,7 +517,7 @@ class SurveyInvitationsNew { echo '
'; // Text s podatki o nastavitvah posiljanja - $settings_text = ''.$lang['srv_inv_message_type'].':'; + $settings_text = ''.$lang['srv_inv_message_type'].': '; $individual = (int)$this->surveySettings['individual_invitation']; if($individual == 0){ @@ -553,7 +553,7 @@ class SurveyInvitationsNew { } } - $settings_text .= ' '.$lang['edit4'].''; + $settings_text .= ' '; echo $settings_text; @@ -758,12 +758,23 @@ class SurveyInvitationsNew { } echo ' '; echo '
'; - - - # podatki o profilu + + + // Checkbox dodaj seznam v anketo + echo '
'; + echo ' '; + echo '
'; + + + echo '
'; + $this->saveRecipientListName(); + echo '
'; + + + # podatki o profilu $ppid = isset($_POST['pid']) ? (int)$_POST['pid'] : -1; - echo ''; + echo '
'; if ((int)$ppid > 0) { # polovimo podatke profila $sql_string = "SELECT rp.*, u.name, u.surname FROM srv_invitations_recipients_profiles AS rp LEFT JOIN users AS u ON rp.uid = u.id WHERE rp.pid = '".(int)$ppid."'"; @@ -788,19 +799,8 @@ class SurveyInvitationsNew { } else { echo '
'.$lang['srv_inv_recipiens_temporary_list'].'
'; } - echo ''; - - echo '
'; - - echo '
'; - echo ''; - echo '
'; - - echo '
'; - $this->saveRecipientListName(); echo '
'; - echo '
'; # če že imamo prejemnike v bazi ponudimo gumb naprej echo '
'; @@ -1405,9 +1405,10 @@ class SurveyInvitationsNew { $row = $this->surveySettings; - echo '

'; + echo '
'; + // Text s podatki o nastavitvah posiljanja - $settings_text = ''.$lang['srv_inv_message_type'].':'; + $settings_text = ''.$lang['srv_inv_message_type'].': '; $individual = (int)$this->surveySettings['individual_invitation']; if($individual == 0){ @@ -1443,11 +1444,13 @@ class SurveyInvitationsNew { } } - $settings_text .= ' '.$lang['edit4'].''; + $settings_text .= ' '; echo $settings_text; - echo '

'; + + echo '
'; + #polovimo prejemnike ki ne želijo prejemati obvestil # nastavimo filter @@ -1528,7 +1531,7 @@ class SurveyInvitationsNew { // Volitve nimajo nekaterih polj if(!SurveyInfo::getInstance()->checkSurveyModule('voting')){ - $default_fields['responded'] = 1; + //$default_fields['responded'] = 1; $default_fields['unsubscribed'] = 1; $default_fields['password'] = 1; } @@ -1666,135 +1669,138 @@ class SurveyInvitationsNew { echo ''; } - if ($count_all > 0 ) { - # dodamo filtriranje + # dodamo filtriranje + if ($count_all > 0 ) { echo '
'; - echo ' '; - echo '   '; + echo '
'; + echo ' '; + echo '
'; + + echo '
'; + echo ' '; + echo ' '; + echo '
'; if (isset($_SESSION['inv_filter_on']) && $_SESSION['inv_filter_on'] == true ) { - echo ' '; - echo ' '; - echo '
'; echo '
'; + echo ''; echo ''; - echo '
'; if ($filter != '') { - echo ''; - printf($lang['srv_inv_list_no_recipients_filter'],$filter); - #Podatki so filtrirani: "'.$filter.'"
'; - echo ''; + echo '
'; + printf($lang['srv_inv_list_no_recipients_filter'], $filter); + echo '
'; } + + echo '
'; + if ($count_all > 0 && mysqli_num_rows($sql_query_filterd) != $count_all ) { - echo '
'; - echo $lang['srv_invitation_num_respondents_filtred'].(int)mysqli_num_rows($sql_query_filterd); - echo '
'; - } else { - echo '
'; - echo $lang['srv_invitation_num_respondents'].(int)$this->count_all; - echo '
'; + echo ''.$lang['srv_invitation_num_respondents_filtred'].(int)mysqli_num_rows($sql_query_filterd).''; + } + else { + echo ''.$lang['srv_invitation_num_respondents'].(int)$this->count_all.''; } + # duplicated + echo ''; + + echo '
'; - # duplicated - echo '
'; - if (mysqli_num_rows($sql_query_filterd) > 0 && $count_all > 0) { - - echo '
'; - + $this->displayPagination($filtred_all); - - echo '
'; - - - echo '
'; - - # če že imamo prejemnike v bazi več kot 20 ponudimo gumb naprej tudi zgoraj - if ($this->count_all > 20) { - echo ''.$lang['srv_invitation_forward'].''; - } - + + // Izvoz vseh v excel - echo ''; - echo ''; - echo ''; - echo ' '.$lang['srv_invitation_recipients_export_all']; - echo ''; - echo ''; + echo '
'; + echo ' '; + echo ' '.$lang['srv_invitation_recipients_export_all']; + echo ' '; + echo '
'; + echo '
'; + echo ''; echo ''; + # checkbox - echo ''; + echo ''; foreach ($fields AS $fkey =>$field) { if ($field == 1) { - if ($fkey == 'sent' || $fkey == 'responded' || $fkey == 'unsubscribed' ) { - #echo ''; + + if ($fkey == 'sent' || $fkey == 'responded' || $fkey == 'unsubscribed' ) { echo 'addSortField($fkey).' class="anl_ac pointer tbl_icon_'.$fkey.'" title="'.$lang['srv_inv_recipients_'.$fkey].'">'.$lang['srv_inv_recipients_'.$fkey].$this->addSortIcon($fkey).''; - } else if ($fkey == 'last_status' ) { + } + else if ($fkey == 'last_status' ) { echo 'addSortField($fkey).' class="anl_ac pointer" title="'.$lang['srv_inv_recipients_'.$fkey].'">'.$lang['srv_inv_recipients_'.$fkey].$this->addSortIcon($fkey).''; - } else { + } + else { echo 'addSortField($fkey).' class="pointer" title="'.$lang['srv_inv_recipients_'.$fkey].'">'.$lang['srv_inv_recipients_'.$fkey].$this->addSortIcon($fkey).''; } } } echo ''; + while ($sql_row = mysqli_fetch_assoc($sql_query_filterd)) { echo ''; - # checkbox - - echo ''; - #izbriši - #echo ''; + + # checkbox + echo ''; + + #izbriši echo ''; - #uredi - #echo ''; + + #uredi echo ''; // Skoci na urejanje odgovorov - ce imamo identifikatorje povezane s podatki @@ -1805,18 +1811,18 @@ class SurveyInvitationsNew { if ($field == 1) { switch ($fkey) { case 'sent': - echo ''; break; case 'responded': - echo ''; break; case 'unsubscribed': - echo ''; break; case 'last_status': @@ -1861,37 +1867,48 @@ class SurveyInvitationsNew { } } + echo ''; + @ob_flush(); } + echo '
 '; + echo ' '; + echo ' 
'.$lang['srv_inv_list_profiles_delete'].''.$lang['srv_inv_list_profiles_edit'].''; - echo ''; + echo ''; + echo ((int)$sql_row['sent'] == 1 ? $lang['sent'] : $lang['not_sent']); echo ''; + echo ''; echo ''; echo ''; - echo ''; + echo ''; + echo ((int)$sql_row['unsubscribed'] == 1 ? $lang['unsubscribed'] : $lang['not_unsubscribed']); echo '
'; + + echo '
'; + echo ''; + # če že imamo prejemnike v bazi ponudimo gumb naprej if ($count_all > 0) { - echo '
'.$lang['srv_invitation_forward'].'
'; - echo '

'; + echo '
'; + echo '
'; + echo '
'; } - echo '
'; - - } else { - echo $lang['srv_inv_list_no_recipients_filtred'].'
'; + } + else { + echo ''.$lang['srv_inv_list_no_recipients_filtred'].''; } + echo ''; - } else { - echo $lang['srv_inv_list_no_recipients'].'
'; + } + else { + echo ''.$lang['srv_inv_list_no_recipients'].''; } } @@ -4030,6 +4047,7 @@ class SurveyInvitationsNew { private function sendMailToUsers($sql_recipients_query, $sending_data){ global $global_user_id; global $site_url; + global $lang; // Preverimo ce je vklopljen modul za volitve @@ -4988,34 +5006,37 @@ class SurveyInvitationsNew { while ($sql_row = mysqli_fetch_assoc($sql_query)) { $array_profiles[$sql_row['pid']] = array('name' => $sql_row['name']); } + + echo '
'; echo '
    '; foreach ($array_profiles AS $_pid => $profile) { - echo '
  1. '; - echo $profile['name']; + echo '
  2. '; + + echo ''.$profile['name'].''; + + if ((int)$ppid > 0 && $ppid === $_pid) { + # polovimo še ostale porfile + $sql_query = sisplet_query("SELECT * FROM srv_invitations_recipients_profiles WHERE pid='".(int)$ppid."' AND from_survey ='".$this->sid."' "); + + if (mysqli_num_rows($sql_query) > 0) { + + echo '
    '; + + # če je iz iste ankete, potem lahko urejamo + echo ''; + echo ''; + + echo '
    '; + } + } + echo '
    3. '; } echo '
'; + echo '
'; - echo '
'; - if ((int)$ppid > 0) { - # polovimo še ostale porfile - $sql_string = "SELECT * FROM srv_invitations_recipients_profiles WHERE pid='".(int)$ppid."' AND from_survey ='".$this->sid."' "; - $sql_query = sisplet_query($sql_string); - - if (mysqli_num_rows($sql_query) > 0) { - # če je iz iste ankete, potem lahko urejamo - echo ''.$lang['srv_inv_recipients_delete_profile'].'
'; - echo ''.$lang['srv_inv_recipients_edit_profile'].'
'; - echo '
'; - } - } - - echo '
'; } function getRecipientsProfile($pid) { @@ -6369,68 +6390,58 @@ class SurveyInvitationsNew { # current nastavimo na zadnji element if ( $all > 1) { - echo ''; } function getSurveyInvitationLists($add_all = false) diff --git a/admin/survey/script/invitations.js b/admin/survey/script/invitations.js index ec11f8902..7f9f21d5e 100644 --- a/admin/survey/script/invitations.js +++ b/admin/survey/script/invitations.js @@ -470,9 +470,8 @@ function invitations_init() { // izbira obstoječega profila prejemnikov $("#inv_import_list_profiles ol li").live('click', function(event) { - - var target = $(event.target); - var pid = $(target).attr('pid'); + + var pid = $(this).attr('pid'); if (pid != 'undefined') { $("#anketa_edit").load('ajax.php?t=invitations&a=use_recipients_list', {anketa:srv_meta_anketa_id, pid:pid }); } @@ -972,7 +971,10 @@ function invTogleSend(what) { } } -function inv_selectAll(val){ +function inv_selectAll(checkbox){ + + val = $(checkbox).is(':checked'); + // oznacimo vse checkboxe $('#tbl_recipients_list tr td input[type="checkbox"]').each(function() { $(this).attr("checked", val); @@ -981,7 +983,8 @@ function inv_selectAll(val){ if(val == true){ $("#inv_switch_on").hide(); $("#inv_switch_off").show(); - } else{ + } + else{ $("#inv_switch_off").hide(); $("#inv_switch_on").show(); } @@ -1558,8 +1561,10 @@ function invRecipientsForward() { if (recipients_list.length > 0) { // shranimo seznam ali dodamo respondente ali oboje - $("#anketa_edit").load('ajax.php?t=invitations&a=recipientsAddForward', {anketa:srv_meta_anketa_id, doAdd:doAdd, doSave:doSave, recipients_list:recipients_list, fields:fields, profile_name:profile_name, profile_comment:profile_comment, profile_id:profile_id, recipientsDelimiter: recipientsDelimiter}); - } + $("#anketa_edit").load('ajax.php?t=invitations&a=recipientsAddForward', {anketa:srv_meta_anketa_id, doAdd:doAdd, doSave:doSave, recipients_list:recipients_list, fields:fields, profile_name:profile_name, profile_comment:profile_comment, profile_id:profile_id, recipientsDelimiter: recipientsDelimiter}); + /*$.post('ajax.php?t=invitations&a=recipientsAddForward', {anketa:srv_meta_anketa_id, doAdd:doAdd, doSave:doSave, recipients_list:recipients_list, fields:fields, profile_name:profile_name, profile_comment:profile_comment, profile_id:profile_id, recipientsDelimiter: recipientsDelimiter}); + window.location = 'index.php?anketa='+srv_meta_anketa_id+'&a=invitations&m=view_recipients';*/ + } else { genericAlertPopup('srv_invitation_note1'); diff --git a/lang/1.php b/lang/1.php index c5dad91e6..3c62e0a46 100644 --- a/lang/1.php +++ b/lang/1.php @@ -117,6 +117,8 @@ $lang = array ( "app_aai_installation_text" => "Z orodjem 1KA lahko na enostaven način izdelate spletni vprašalnik, izvedete spletno anketo, urejate in analizirate podatke, s kar najmanjšim številom klikov.

Za uporabo orodja 1KA se lahko registrirate oziroma prijavite z vašim Arnes AAI-računom.

Kliknite na spodnji gumb in sledite navodilom za prijavo v AAI.", "sent" => "Poslano", "not_sent" => "Ni poslano", + "unsubscribed" => "Odjavljen", + "not_unsubscribed" => "Ni odjavljen", "check_and" => "Preverite in", "submit" => "potrdite spremembe", "dontwant" => "Ne elim več prejemati on-line novic", diff --git a/lang/2.php b/lang/2.php index a34595df2..77b2ef542 100644 --- a/lang/2.php +++ b/lang/2.php @@ -105,6 +105,8 @@ $lang = array ( "app_aai_installation_text" => "With the 1KA tool, you can easily create an online questionnaire, conduct an online survey, edit and analyze data with as few clicks as possible.

You can register or login into 1KA application with your Arnes AAI-account.

Click bottom button and follow instructions for AAI login.", "sent" => "Sent", "not_sent" => "Not sent", + "unsubscribed" => "Unsubscribed", + "not_unsubscribed" => "Not unsubscribed", "check_and" => "Check and", "submit" => "submit", "dontwant" => "I don't want to receive any more e-mail", diff --git a/public/css/admin_new.css b/public/css/admin_new.css index 059fe6f97..a93112603 100644 --- a/public/css/admin_new.css +++ b/public/css/admin_new.css @@ -21417,6 +21417,13 @@ body #main_holder #main .page_invitations .invitations_top_settings { margin-bottom: 16px; font-weight: 600; } +body #main_holder #main .page_invitations .invitations_top_settings .faicon { + margin-left: 16px; +} +body #main_holder #main .page_invitations .invitations_top_settings #srv_invitation_note { + margin-top: 8px; + font-weight: 400; +} body #main_holder #main .page_invitations #inv_recipients_profiles_holder { min-height: 355px; padding: 16px; @@ -21447,6 +21454,7 @@ body #main_holder #main .page_invitations #inv_recipients_profiles_holder #inv_i list-style-type: none; display: flex; align-items: center; + justify-content: space-between; height: 35px; padding: 0px 8px; border-bottom: 1px solid #E5E5E5; @@ -21461,6 +21469,12 @@ body #main_holder #main .page_invitations #inv_recipients_profiles_holder #inv_i body #main_holder #main .page_invitations #inv_recipients_profiles_holder #inv_import_list_profiles ol li:hover { background-color: #F4F9FE; } +body #main_holder #main .page_invitations #inv_recipients_profiles_holder #inv_import_list_profiles ol li .faicon { + margin-left: 8px; +} +body #main_holder #main .page_invitations #inv_recipients_profiles_holder #inv_import_list_profiles ol li .faicon:before { + font-size: 16px; +} body #main_holder #main .page_invitations #inv_import_list_container { min-height: 355px; margin-bottom: 0; @@ -21474,6 +21488,161 @@ body #main_holder #main .page_invitations #inv_import_list_container .setting_li body #main_holder #main .page_invitations #inv_import_list_container .setting_line textarea { width: 100%; } +body #main_holder #main .page_invitations #inv_rec_filter { + display: flex; + align-items: center; + height: 40px; + box-sizing: border-box; + margin-bottom: 16px; + padding: 0 16px; + background: #F8F8F8; + border: 1px solid #E5E5E5; + border-radius: 2px; +} +body #main_holder #main .page_invitations #inv_rec_filter .setting { + margin-right: 16px; +} +body #main_holder #main .page_invitations #inv_rec_filter .setting#conditionProfileNote { + display: flex; + align-items: center; + padding: 4px 8px; + background-color: #E5E5E5; +} +body #main_holder #main .page_invitations #inv_rec_filter .setting#conditionProfileNote span { + margin-left: 8px; +} +body #main_holder #main .page_invitations #inv_rec_filter .setting#conditionProfileNote a { + margin-left: 4px; +} +body #main_holder #main .page_invitations #inv_rec_filter .setting label { + margin: 0; + font-size: 14px; +} +body #main_holder #main .page_invitations #inv_rec_filter .setting input[type=text] { + width: 160px; + margin: 0 0 0 8px; +} +body #main_holder #main .page_invitations #inv_rec_filter .setting select { + width: 90px; + margin: 0 0 0 8px; +} +body #main_holder #main .page_invitations .filter_note { + margin-bottom: 16px; + color: #FF0000; + font-size: 14px; + font-weight: 600; +} +body #main_holder #main .page_invitations #srv_invitation_note { + margin-bottom: 16px; +} +body #main_holder #main .page_invitations #srv_invitation_note span { + margin-right: 16px; + font-size: 14px; +} +body #main_holder #main .page_invitations #srv_invitation_note label { + font-size: 14px; +} +body #main_holder #main .page_invitations .excel_export { + font-size: 14px; +} +body #main_holder #main .page_invitations .excel_export .faicon { + margin-right: 8px; +} +body #main_holder #main .page_invitations .pagination_holder { + display: flex; + justify-content: center; + align-items: center; + margin-bottom: 16px; +} +body #main_holder #main .page_invitations .pagination_holder #pagination { + display: flex; + justify-content: center; + align-items: center; + width: auto; + padding: 4px; + background: #F8F8F8; + border-radius: 2px; +} +body #main_holder #main .page_invitations .pagination_holder #pagination a { + color: #333333; + text-decoration: none; +} +body #main_holder #main .page_invitations .pagination_holder #pagination .page_number { + display: flex; + justify-content: center; + align-items: center; + width: 24px; + height: 24px; + margin: 0 4px; + border-radius: 2px; + transition: 0.2s; +} +body #main_holder #main .page_invitations .pagination_holder #pagination .page_number:hover { + background-color: #E5E5E5; +} +body #main_holder #main .page_invitations .pagination_holder #pagination .page_number.currentPage { + color: #FFFFFF; + background-color: #1E88E5; +} +body #main_holder #main .page_invitations .pagination_holder #pagination .arrow { + margin: 0 4px; + transition: 0.2s; +} +body #main_holder #main .page_invitations .pagination_holder #pagination .arrow.disabledPage { + color: #777777; +} +body #main_holder #main .page_invitations .table_holder { + overflow-x: auto; + margin: 8px 0; +} +body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list { + margin: 0; +} +body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr th { + position: relative; + min-height: 40px; + padding: 10px 16px; + font-size: 14px; +} +body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr th .sort_descending, +body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr th .sort_ascending { + position: absolute; + right: 0; + top: 20px; +} +body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr th input[type=checkbox] + label::before { + font-weight: 400; +} +body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr th input[type=checkbox]:checked + label::before { + font-weight: 600; +} +body #main_holder #main .page_invitations .table_holder table#tbl_recipients_list tr td { + white-space: nowrap; + min-height: 40px; + padding: 10px 16px; + font-size: 14px; +} +body #main_holder #main .page_invitations #inv_bottom_edit .bottom_actions { + display: flex; + align-items: center; + margin-bottom: 16px; +} +body #main_holder #main .page_invitations #inv_bottom_edit .bottom_actions a { + margin-right: 16px; + font-size: 14px; +} +body #main_holder #main .page_invitations #inv_bottom_edit .bottom_actions a .faicon { + margin-right: 8px; +} +body #main_holder #main .page_invitations #inv_bottom_edit .bottom_actions a .faicon:before { + font-size: 16px; +} +body #main_holder #main .page_invitations #inv_bottom_edit .bottom_activate a { + font-size: 14px; +} +body #main_holder #main .page_invitations #inv_bottom_edit .bottom_activate a .faicon { + margin-right: 8px; +} body #main_holder #main .page_invitations #invitation_messages { display: flex; flex-direction: column; @@ -21495,6 +21664,7 @@ body #main_holder #main .page_invitations #invitation_messages ol li { list-style-type: none; display: flex; align-items: center; + justify-content: space-between; height: 35px; padding: 0px 8px; border-bottom: 1px solid #E5E5E5; @@ -21509,6 +21679,12 @@ body #main_holder #main .page_invitations #invitation_messages ol li.active { body #main_holder #main .page_invitations #invitation_messages ol li:hover { background-color: #F4F9FE; } +body #main_holder #main .page_invitations #invitation_messages ol li .faicon { + margin-left: 8px; +} +body #main_holder #main .page_invitations #invitation_messages ol li .faicon:before { + font-size: 16px; +} /* .lbl_email_setting { @@ -22250,14 +22426,7 @@ div.inv_step.active { .inv_input_error { border: 1px solid $red; } -#inv_rec_filter { - float: left; - width: auto; - margin-right: 5px; - margin-bottom: 10px; - padding: 8px; - border: 1px solid $gray; -} + #inv_rec_cehckboxes { float: left; width: auto !important; diff --git a/resources/sass/admin_new/pages/survey_objava/vabila_main.scss b/resources/sass/admin_new/pages/survey_objava/vabila_main.scss index 25335aed0..474891ffd 100644 --- a/resources/sass/admin_new/pages/survey_objava/vabila_main.scss +++ b/resources/sass/admin_new/pages/survey_objava/vabila_main.scss @@ -30,6 +30,15 @@ body #main_holder #main .page_invitations{ margin-bottom: 16px; font-weight: 600; + + .faicon{ + margin-left: 16px; + } + + #srv_invitation_note{ + margin-top: 8px; + font-weight: 400; + } } @@ -59,6 +68,7 @@ body #main_holder #main .page_invitations{ display: flex; align-items: center; + justify-content: space-between; height: 35px; padding: 0px 8px; @@ -77,11 +87,18 @@ body #main_holder #main .page_invitations{ &:hover { background-color: $medium-blue2; } + + .faicon{ + margin-left: 8px; + + &:before{ + font-size: 16px; + } + } } } } - // 2 - Dodaj - leva stran #inv_recipients_profiles_holder { @@ -122,8 +139,229 @@ body #main_holder #main .page_invitations{ } + // 3 - Preglej prejemnike + // Search + #inv_rec_filter { + display: flex; + align-items: center; - // 3- + height: 40px; + box-sizing: border-box; + margin-bottom: 16px; + padding: 0 16px; + + background: $light-gray; + border: 1px solid $gray; + border-radius: 2px; + + .setting{ + margin-right: 16px; + + &#conditionProfileNote{ + display: flex; + align-items: center; + + padding: 4px 8px; + + background-color: $gray; + + span{ + margin-left: 8px; + } + + a{ + margin-left: 4px; + } + } + + label{ + margin: 0; + font-size: 14px; + } + + input[type="text"]{ + width: 160px; + margin: 0 0 0 8px; + } + select{ + width: 90px; + margin: 0 0 0 8px; + } + } + } + + .filter_note{ + margin-bottom: 16px; + + color: $red; + font-size: 14px; + font-weight: 600; + } + + #srv_invitation_note{ + margin-bottom: 16px; + + span{ + margin-right: 16px; + font-size: 14px; + } + label{ + font-size: 14px; + } + } + + .excel_export{ + font-size: 14px; + + .faicon{ + margin-right: 8px; + } + } + + .pagination_holder{ + display: flex; + justify-content: center; + align-items: center; + + margin-bottom: 16px; + + #pagination{ + display: flex; + justify-content: center; + align-items: center; + + width: auto; + padding: 4px; + + background: $light-gray; + border-radius: 2px; + + a{ + color: $black; + text-decoration: none; + } + + .page_number{ + display: flex; + justify-content: center; + align-items: center; + + width: 24px; + height: 24px; + + margin: 0 4px; + + border-radius: 2px; + + transition: 0.2s; + + &:hover{ + background-color: $gray; + } + + &.currentPage{ + color: $white; + background-color: $blue; + } + } + + .arrow{ + margin: 0 4px; + + transition: 0.2s; + + &.disabledPage{ + color: $very-dark-gray; + } + } + } + } + + + // Tabela prejemnikov + .table_holder{ + overflow-x: auto; + margin: 8px 0; + + table#tbl_recipients_list{ + margin: 0; + + tr{ + + th{ + position: relative; + + min-height: 40px; + padding: 10px 16px; + + font-size: 14px; + + .sort_descending, + .sort_ascending{ + position: absolute; + right: 0; + top: 20px; + } + + input[type="checkbox"] + label::before{ + font-weight: 400; + } + input[type="checkbox"]:checked + label::before{ + font-weight: 600; + } + } + + td{ + white-space: nowrap; + + min-height: 40px; + padding: 10px 16px; + + font-size: 14px; + } + } + + } + } + + #inv_bottom_edit{ + + .bottom_actions{ + display: flex; + align-items: center; + + margin-bottom: 16px; + + a{ + margin-right: 16px; + font-size: 14px; + + .faicon{ + margin-right: 8px; + + &:before{ + font-size: 16px; + } + } + } + } + + .bottom_activate{ + + a{ + font-size: 14px; + + .faicon{ + margin-right: 8px; + } + } + } + } + + + + + // 4 - Sporocilo #invitation_messages { @include inv_left_list(); } @@ -878,14 +1116,7 @@ div.inv_step.active { .inv_input_error { border: 1px solid $red; } -#inv_rec_filter { - float: left; - width: auto; - margin-right: 5px; - margin-bottom: 10px; - padding: 8px; - border: 1px solid $gray; -} + #inv_rec_cehckboxes { float: left; width: auto !important;