';
@@ -9817,7 +9925,7 @@ class SurveyInvitationsNew {
}
- function viewServerSettings(){
+ private function viewServerSettings(){
global $lang;
global $site_url;
global $site_url;
@@ -9849,15 +9957,17 @@ class SurveyInvitationsNew {
if($squalo->getSqualoEnabled()){
// Vklop squalo
- echo '
';
// Squalo nastavitve...
@@ -9873,55 +9983,78 @@ class SurveyInvitationsNew {
echo '
';
// Opozorilo, ce imamo vklopljena vabila, da gre za iste nastavitve
- echo '
'.$lang['srv_email_server_settings_warning'].'
';
+
+ echo '
'.$lang['srv_email_server_settings_warning'].'
';
+
// Izbira SMTP streznika
- echo '
'.$lang['srv_email_setting_select_server'].' ';
+ echo '
';
#1KA
$enkaSettings = $MA->get1KASettings($raziskave=true);
+
echo '
is1KA() || $squalo->getSqualoActive() ? ' class="displayNone"' : '').'>';
- echo '
'.$lang['srv_email_setting_settings'].' ';
- echo '
';
+
+ echo '
'.$lang['srv_email_setting_settings'].'
';
+
+
+ echo '
';
+
# from
- echo '
'.$lang['srv_email_setting_from'].''.$enkaSettings['SMTPFrom'].' ';
- echo '
';
+ echo '
';
+ echo ' '.$lang['srv_email_setting_from'].' ';
+ echo '
';
+
# replyTo
- echo '
'.$lang['srv_email_setting_reply'].' ';
- echo '
';
+ echo '
';
+ echo ' '.$lang['srv_email_setting_reply'].' ';
+ echo '
';
+
+ echo '
';
+
+
+ echo '
';
+
#delay
- echo '
'.$lang['srv_email_setting_smtp_delay'].' '.Help::display('srv_inv_delay').': '
- /*. '0 '
- . '0.01 sec (max 100 / sec) '
- . '0.02 sec (max 50 / sec) '
- . '0.05 sec (max 20 / sec) '
- . '0.1 sec (max 10 / sec) '
- . '0.2 sec (max 5 / sec) '*/
+ echo ' ';
+
+ echo ' '.$lang['srv_email_setting_smtp_delay'].' '.Help::display('srv_inv_delay').': ';
+ echo ' '
. '0.5 sec (max 2 / sec) '
. '1 sec (max 1 / sec) '
. '2 sec (max 30 / min) '
@@ -9930,80 +10063,165 @@ class SurveyInvitationsNew {
. '10 sec (max 6 / min) '
. '20 sec (max 3 / min) '
. '30 sec (max 2 / min) '
- . ' ';
- echo '';
+ . '';
+ echo '
';
+
+ echo '
';
+
+
echo '
';
+
#GMAIL - Google
$enkaSettings = $MA->getGoogleSettings();
+
echo '
isGoogle() || $squalo->getSqualoActive() ? ' class="displayNone"' : '').'>';
- echo '
'.$lang['srv_email_setting_adapter1_note'].' ';
- echo '
'.$lang['srv_email_setting_settings'].' ';
- # from
- echo '
'.$lang['srv_email_setting_from'].' ';
- echo '
';
- # replyTo
- echo '
'.$lang['srv_email_setting_reply'].' ';
- echo '
';
- #Password
- echo '
'.$lang['srv_email_setting_password'].' ';
- echo '
';
+
+ echo '
';
+ echo '
'.$lang['srv_email_setting_adapter1_note'].'
';
+ echo '
'.$lang['srv_email_setting_settings'].'
';
echo '
';
+
+ echo '
';
+
+
+ echo '
';
+
+ #Password
+ echo '
';
+ echo ' '.$lang['srv_email_setting_password'].' ';
+ echo '
';
+
+ echo '
';
+
+
+ echo '
';
+
+
#SMTP
$enkaSettings = $MA->getSMTPSettings();
+
echo '
isSMTP() || $squalo->getSqualoActive() ? ' class="displayNone"' : '').'>';
- echo '
'.$lang['srv_email_setting_adapter2_note'].' ';
- echo '
'.$lang['srv_email_setting_settings'].' ';
- # from - NICE
- echo '
'.$lang['srv_email_setting_from_nice'].' ';
- echo '
';
- # from
- echo '
'.$lang['srv_email_setting_from'].' ';
- echo '
';
- # replyTo
- echo '
'.$lang['srv_email_setting_reply'].' ';
- echo '
';
- #Username
- echo '
'.$lang['srv_email_setting_username'].' ';
- echo '
';
- #Password
- echo '
'.$lang['srv_email_setting_password'].' ';
- echo '
';
- #autentikacija
- echo '
';
- echo $lang['srv_email_setting_autentication'];
- echo '
';
- #Varnost SMTPSecure
- echo '
';
- echo $lang['srv_email_setting_encryption'];
- echo '
';
- #port
- echo '
'.$lang['srv_email_setting_port'].' ';
- echo ' '.$lang['srv_email_setting_port_note'];
- echo '
';
- #host
- echo '
'.$lang['srv_email_setting_host'].' ';
- echo '
';
+
+ echo '
';
+ echo '
'.$lang['srv_email_setting_adapter2_note'].'
';
+ echo '
'.$lang['srv_email_setting_settings'].'
';
+ echo '
';
+
+ echo '
';
+
+
+ echo '
';
+
+ # replyTo
+ echo '
';
+ echo ' '.$lang['srv_email_setting_reply'].' ';
+ echo '
';
+
+ echo '
';
+
+
+ echo '
';
+
+
+ echo '
';
+
+ #autentikacija
+ echo '
';
+
+ echo ' '.$lang['srv_email_setting_autentication'].': ';
+ echo ' '
+ . ''.$lang['srv_email_setting_no'].' '
+ . ''.$lang['srv_email_setting_yes'].' '
+ . ' ';
+
+ echo '
';
+
+ #Varnost SMTPSecure
+ echo '
';
+
+ echo ' '.$lang['srv_email_setting_encryption'].': ';
+ echo ' '
+ . ''.$lang['srv_email_setting_encryption_none'].' '
+ . ''.$lang['srv_email_setting_encryption_ssl'].' '
+ . ''.$lang['srv_email_setting_encryption_tls'].' '
+ . ' ';
+
+ echo '
';
+
+ echo '
';
+
+
+ echo '
';
+
+
+ echo '
';
+
#delay
- echo '
'.$lang['srv_email_setting_smtp_delay'].' '.Help::display('srv_inv_delay').': '
- /*. '0 '
- . '0.01 sec (max 100 / sec) '
- . '0.02 sec (max 50 / sec) '
- . '0.05 sec (max 20 / sec) '
- . '0.1 sec (max 10 / sec) '
- . '0.2 sec (max 5 / sec) '*/
+ echo ' ';
+
+ echo ' '.$lang['srv_email_setting_smtp_delay'].' '.Help::display('srv_inv_delay').': ';
+ echo ' '
. '0.5 sec (max 2 / sec) '
. '1 sec (max 1 / sec) '
. '2 sec (max 30 / min) '
@@ -10012,22 +10230,27 @@ class SurveyInvitationsNew {
. '10 sec (max 6 / min) '
. '20 sec (max 3 / min) '
. '30 sec (max 2 / min) '
- . ' ';
- echo '';
+ . '';
+
+ echo '
';
echo '
';
-
+
+
+ echo '
';
+
echo '';
-
- echo '
';
+
+
+ echo '
';
if ($_GET['s'] == '1') {
diff --git a/lang/1.php b/lang/1.php
index db16f9be8..000b5f2f9 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -2315,7 +2315,7 @@ $lang = array (
"srv_user_base_individual_invitaition" => "Individualizirana vabila:",
"srv_user_base_individual_invitaition_note" => "Individualizirana vabila omogočajo sledenje respondentom.",
"srv_user_base_individual_invitaition_note2" => "Z izbiro \"Ne\" je modul individualiziranih vabil izklopljen. Anketira se lahko vsak, ki vidi ali pozna URL naslov. Respondentov v takem primeru ne moremo slediti; ne vemo kdo je odgovoril in kdo ne. Sistem 1KA lahko kljub temu pošlje (email) oziroma dokumentira (pošta, SMS, drugo) pošiljanje splošnega ne-individualiziranega vabila, kjer vsi respondenti prejmejo enotni URL. To pomeni, da se zabeležilo, komu, kdaj in kako je bilo vabilo poslano, ne bo pa označeno, kdo je odgovoril in kdo ne.",
- "srv_user_base_access_check" => "Omogoči dostop do ankete tudi brez individualiziranega vabila (kode):",
+ "srv_user_base_access_check" => "Omogoči dostop do ankete tudi brez individualiziranega vabila (kode)",
"srv_user_base_access" => "Dostop brez kode:",
"srv_user_base_access_alert_0" => "Pri privzeti nastavitvi »NE«, respondenti brez kode oziroma vabila ne bodo mogli dostopati do ankete!",
"srv_user_base_access_alert_1" => "Pri nastavitvi »DA« bodo v anekto lahko vstopali vsi respondenti!",
diff --git a/lang/2.php b/lang/2.php
index d496befee..9aebd2dd0 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -2300,7 +2300,7 @@ $lang = array (
"srv_user_base_individual_invitaition" => "Personalized invitations:",
"srv_user_base_individual_invitaition_note" => "Personalized invitations allow for respondent tracing.",
"srv_user_base_individual_invitaition_note2" => "Z izbiro \"Ne\" je modul individualiziranih vabil izklopljen. Anketira se lahko vsak, ki vidi ali pozna URL naslov. Respondentov v takem primeru ne moremo slediti; ne vemo kdo je odgovoril in kdo ne.
Sistem 1KA lahko kljub temu pošlje (email) oziroma dokumentira (pošta, SMS, drugo) pošiljanje splošnega ne-individualiziranega vabila, kjer vsi respondenti prejmejo enotni URL. To pomeni, da se zabeležilo, komu, kdaj in kako je bilo vabilo poslano, ne bo pa označeno, kdo je odgovoril in kdo ne.",
- "srv_user_base_access_check" => "Enable the access to the survey without individualized invitation (code):",
+ "srv_user_base_access_check" => "Enable the access to the survey without individualized invitation (code)",
"srv_user_base_access" => "Access without password:",
"srv_user_base_access_alert_0" => "With default setting »NO«, respondents will not be able to access survey without a code!",
"srv_user_base_access_alert_1" => "With setting »YES«, all respondents will be able to access survey!",
diff --git a/public/css/admin_new.css b/public/css/admin_new.css
index 3459e7b59..420b93303 100644
--- a/public/css/admin_new.css
+++ b/public/css/admin_new.css
@@ -9171,6 +9171,13 @@ div.button_holder.below {
div.button_holder.intext {
margin: 16px 0;
}
+div.button_holder.float-right {
+ justify-content: end;
+}
+div.button_holder.float-right button {
+ margin-left: 16px;
+ margin-right: 0;
+}
label {
cursor: pointer;
@@ -9186,7 +9193,7 @@ label.empty {
font-size: 0;
}
-input[type=text], input[type=password] {
+input[type=text], input[type=password], input[type=number] {
border: 1px solid #C4C4C4;
box-sizing: border-box;
border-radius: 2px;
@@ -9194,40 +9201,40 @@ input[type=text], input[type=password] {
margin-top: 4px;
font-family: Source Sans Pro, sans-serif;
}
-input[type=text].w200, input[type=password].w200 {
+input[type=text].w200, input[type=password].w200, input[type=number].w200 {
width: 200px;
}
-input[type=text].w300, input[type=password].w300 {
+input[type=text].w300, input[type=password].w300, input[type=number].w300 {
width: 300px;
}
-input[type=text].w400, input[type=password].w400 {
+input[type=text].w400, input[type=password].w400, input[type=number].w400 {
width: 400px;
}
-input[type=text].wauto, input[type=password].wauto {
+input[type=text].wauto, input[type=password].wauto, input[type=number].wauto {
width: auto;
}
-input[type=text].large, input[type=password].large {
+input[type=text].large, input[type=password].large, input[type=number].large {
height: 40px;
font-size: 16px;
padding: 9px 7px;
}
-input[type=text].medium, input[type=password].medium {
+input[type=text].medium, input[type=password].medium, input[type=number].medium {
height: 32px;
font-size: 14px;
padding: 6px 7px;
}
-input[type=text].small, input[type=password].small {
+input[type=text].small, input[type=password].small, input[type=number].small {
height: 26px;
font-size: 14px;
padding: 3px 7px;
}
-input[type=text]:focus, input[type=password]:focus {
+input[type=text]:focus, input[type=password]:focus, input[type=number]:focus {
outline-style: none;
box-shadow: none;
border-color: transparent;
border-color: #1E88E5;
}
-input[type=text][readonly=true], input[type=password][readonly=true] {
+input[type=text][readonly=true], input[type=password][readonly=true], input[type=number][readonly=true] {
cursor: pointer;
}
input[type=radio], input[type=checkbox] {
@@ -9337,6 +9344,24 @@ fieldset .setting_holder span.charalimit {
fieldset .setting_holder.indent {
margin-left: 27px;
}
+fieldset .setting_holder.half-half {
+ flex-direction: row;
+}
+fieldset .setting_holder.half-half .setting_item {
+ display: flex;
+ flex-direction: column;
+ width: 48%;
+ margin: 0;
+}
+fieldset .setting_holder.half-half .setting_item:first-child {
+ margin-right: 16px;
+}
+fieldset .setting_holder.half-half .setting_item input,
+fieldset .setting_holder.half-half .setting_item select,
+fieldset .setting_holder.half-half .setting_item textarea {
+ box-sizing: border-box;
+ width: 100%;
+}
fieldset ul {
margin-block-start: 0;
margin-block-end: 0;
@@ -19997,36 +20022,36 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
.page_invitations .invitations_holder.half-half {
display: flex;
}
-.page_invitations .invitations_holder.half-half .left {
+.page_invitations .invitations_holder.half-half .left_holder {
width: 50%;
margin-right: 32px;
}
-.page_invitations .invitations_holder.half-half .right {
+.page_invitations .invitations_holder.half-half .right_holder {
width: 50%;
}
.page_invitations .invitations_holder.left-menu {
display: flex;
}
-.page_invitations .invitations_holder.left-menu .left {
+.page_invitations .invitations_holder.left-menu .left_holder {
width: 300px;
min-width: 300px;
margin-right: 32px;
}
-.page_invitations .invitations_holder.left-menu .right {
+.page_invitations .invitations_holder.left-menu .right_holder {
flex-grow: 1;
}
.page_invitations .invitations_holder.three-part {
display: flex;
}
-.page_invitations .invitations_holder.three-part .left {
+.page_invitations .invitations_holder.three-part .left_holder {
width: 300px;
min-width: 300px;
margin-right: 32px;
}
-.page_invitations .invitations_holder.three-part .middle {
+.page_invitations .invitations_holder.three-part .middle_holder {
flex-grow: 1;
}
-.page_invitations .invitations_holder.three-part .right {
+.page_invitations .invitations_holder.three-part .right_holder {
width: 400px;
min-width: 400px;
margin-left: 32px;
@@ -20039,7 +20064,7 @@ div#general_popup div.popup_content.publish.settings div#publish_settings_more {
display: flex;
align-items: center;
position: relative;
- margin-bottom: 32px;
+ margin-bottom: 48px;
color: #E5E5E5;
}
.page_invitations #inv_top_navi .inv_step a {
@@ -20104,6 +20129,105 @@ and open the template in the editor.
Created on : 08-Aug-2018, 12:25:26
Author : podkrizniku
*/
+body #main_holder #main .page_invitations .invitations_holder.fullwidth {
+ margin: 0 auto;
+ padding: 0 32px;
+ max-width: 1060px;
+}
+body #main_holder #main .page_invitations .invitations_holder.fullwidth fieldset p {
+ margin-bottom: 8px;
+}
+body #main_holder #main .page_invitations .invitations_top_settings {
+ margin-bottom: 16px;
+ font-weight: 600;
+}
+body #main_holder #main .page_invitations #inv_recipients_profiles_holder {
+ min-height: 355px;
+ padding: 16px;
+ background: #FFFFFF;
+ border: 1px solid #E5E5E5;
+}
+body #main_holder #main .page_invitations #inv_recipients_profiles_holder > span {
+ line-height: 28px;
+}
+body #main_holder #main .page_invitations #inv_recipients_profiles_holder #inv_import_list_profiles {
+ display: flex;
+ flex-direction: column;
+ overflow-y: auto;
+ width: 100%;
+ min-width: 200px;
+ max-height: 400px;
+ border: 1px solid #E5E5E5;
+ background-color: white;
+}
+body #main_holder #main .page_invitations #inv_recipients_profiles_holder #inv_import_list_profiles ol {
+ display: flex;
+ flex-direction: column;
+ margin: 0px;
+ padding: 0px;
+}
+body #main_holder #main .page_invitations #inv_recipients_profiles_holder #inv_import_list_profiles ol li {
+ cursor: pointer;
+ list-style-type: none;
+ display: flex;
+ align-items: center;
+ height: 35px;
+ padding: 0px 8px;
+ border-bottom: 1px solid #E5E5E5;
+}
+body #main_holder #main .page_invitations #inv_recipients_profiles_holder #inv_import_list_profiles ol li:last-child {
+ border-bottom: 0;
+}
+body #main_holder #main .page_invitations #inv_recipients_profiles_holder #inv_import_list_profiles ol li.active {
+ color: #1E88E5;
+ background-color: #F4F9FE;
+}
+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_import_list_container {
+ min-height: 355px;
+ margin-bottom: 0;
+}
+body #main_holder #main .page_invitations #inv_import_list_container span label {
+ vertical-align: bottom;
+}
+body #main_holder #main .page_invitations #invitation_messages {
+ display: flex;
+ flex-direction: column;
+ overflow-y: auto;
+ width: 100%;
+ min-width: 200px;
+ max-height: 400px;
+ border: 1px solid #E5E5E5;
+ background-color: white;
+}
+body #main_holder #main .page_invitations #invitation_messages ol {
+ display: flex;
+ flex-direction: column;
+ margin: 0px;
+ padding: 0px;
+}
+body #main_holder #main .page_invitations #invitation_messages ol li {
+ cursor: pointer;
+ list-style-type: none;
+ display: flex;
+ align-items: center;
+ height: 35px;
+ padding: 0px 8px;
+ border-bottom: 1px solid #E5E5E5;
+}
+body #main_holder #main .page_invitations #invitation_messages ol li:last-child {
+ border-bottom: 0;
+}
+body #main_holder #main .page_invitations #invitation_messages ol li.active {
+ color: #1E88E5;
+ background-color: #F4F9FE;
+}
+body #main_holder #main .page_invitations #invitation_messages ol li:hover {
+ background-color: #F4F9FE;
+}
+
.lbl_email_setting {
vertical-align: top;
line-height: 16px;
@@ -20935,39 +21059,6 @@ input#inv_message_comment:focus {
color: #1E88E5;
}
-#inv_import_list_container {
- margin-right: 5px;
- padding: 8px;
- min-height: 355px;
- width: 670px;
- background: #EAF9FE;
- border: 1px solid #1E88E5;
- float: left;
- display: inline-block;
- width: auto;
-}
-#inv_import_list_container span label {
- vertical-align: bottom;
-}
-
-#inv_recipients_profiles_holder {
- margin-right: 5px;
- padding: 8px;
- min-height: 355px;
- width: 670px;
- background: #EAF9FE;
- border: 1px solid #1E88E5;
- float: left;
- margin-left: 10px;
- display: inline-block;
- width: auto;
- overflow: hidden;
-}
-#inv_recipients_profiles_holder span {
- line-height: 24px;
- font-size: 13px;
-}
-
#inv_messages_profiles_holder {
margin-right: 5px;
padding: 8px;
@@ -21346,76 +21437,6 @@ div.inv_step.active a span.circle {
max-width: 200px;
}
-#inv_import_list_profiles {
- margin: 0px;
- padding: 0px;
- min-width: 100px;
- max-width: 400px;
- min-height: 100px;
- max-height: 600px;
- overflow: auto !important;
- display: inline-block;
- border: 1px solid #E5E5E5;
- background-color: white;
- width: 200px !important;
- height: 237px !important;
-}
-#inv_import_list_profiles ol {
- margin: 0px;
- padding: 0px;
- display: block;
- border-bottom: 1px solid #E5E5E5;
-}
-#inv_import_list_profiles ol li {
- display: block;
- list-style-image: none;
- list-style-position: outside;
- list-style-type: none;
- line-height: 20px;
- border-top: 1px solid #E5E5E5;
- padding: 0px 5px;
- cursor: pointer;
-}
-#inv_import_list_profiles ol li.active {
- background-color: #1E88E5;
- color: white;
-}
-
-#invitation_messages {
- margin: 0px;
- padding: 0px;
- min-width: 100px;
- max-width: 400px;
- min-height: 100px;
- max-height: 600px;
- overflow: auto !important;
- display: inline-block;
- border: 1px solid #E5E5E5;
- background-color: white;
- width: 200px !important;
- height: 237px !important;
-}
-#invitation_messages ol {
- margin: 0px;
- padding: 0px;
- display: block;
- border-bottom: 1px solid #E5E5E5;
-}
-#invitation_messages ol li {
- display: block;
- list-style-image: none;
- list-style-position: outside;
- list-style-type: none;
- line-height: 20px;
- border-top: 1px solid #E5E5E5;
- padding: 0px 5px;
- cursor: pointer;
-}
-#invitation_messages ol li.active {
- background-color: #1E88E5;
- color: white;
-}
-
#inv_recipients_profile_name {
/*max-height: 90vh;
overflow-y: scroll;*/
diff --git a/resources/sass/admin_new/components/form/button.scss b/resources/sass/admin_new/components/form/button.scss
index 7953c08f8..5a1b6d485 100644
--- a/resources/sass/admin_new/components/form/button.scss
+++ b/resources/sass/admin_new/components/form/button.scss
@@ -221,4 +221,13 @@ div.button_holder {
&.intext{
margin: 16px 0;
}
+
+ &.float-right{
+ justify-content: end;
+
+ button{
+ margin-left: 16px;
+ margin-right: 0;
+ }
+ }
}
diff --git a/resources/sass/admin_new/components/form/fieldset.scss b/resources/sass/admin_new/components/form/fieldset.scss
index 921403fa3..06f84eef3 100644
--- a/resources/sass/admin_new/components/form/fieldset.scss
+++ b/resources/sass/admin_new/components/form/fieldset.scss
@@ -30,9 +30,9 @@ fieldset{
//Nepovezane nastavitve -16px razmaka
.setting_holder {
margin-bottom: 16px;
- &.bottom8 {
- margin-bottom: 8px !important;
- }
+ &.bottom8 {
+ margin-bottom: 8px !important;
+ }
display: flex;
flex-direction: column;
@@ -70,6 +70,30 @@ fieldset{
&.indent {
margin-left: 27px;
}
+
+ // Holder z 2 nastavitvami vzporedno (50 - 50)
+ &.half-half{
+ flex-direction: row;
+
+ .setting_item{
+ display: flex;
+ flex-direction: column;
+
+ width: 48%;
+ margin: 0;
+
+ &:first-child{
+ margin-right: 16px;
+ }
+
+ input,
+ select,
+ textarea{
+ box-sizing: border-box;
+ width: 100%;
+ }
+ }
+ }
}
ul {
diff --git a/resources/sass/admin_new/components/form/input.scss b/resources/sass/admin_new/components/form/input.scss
index 3880bdafa..88dfa3300 100644
--- a/resources/sass/admin_new/components/form/input.scss
+++ b/resources/sass/admin_new/components/form/input.scss
@@ -18,7 +18,8 @@ label{
input {
&[type="text"],
- &[type="password"] {
+ &[type="password"],
+ &[type="number"] {
border: 1px solid $dark-gray;
box-sizing: border-box;
border-radius: 2px;
diff --git a/resources/sass/admin_new/pages/survey_objava/vabila.scss b/resources/sass/admin_new/pages/survey_objava/vabila.scss
index 20c64b040..b3c6e9d62 100644
--- a/resources/sass/admin_new/pages/survey_objava/vabila.scss
+++ b/resources/sass/admin_new/pages/survey_objava/vabila.scss
@@ -8,13 +8,13 @@
&.half-half{
display: flex;
- .left{
+ .left_holder{
width: 50%;
margin-right: 32px;
}
- .right{
+ .right_holder{
width: 50%;
}
}
@@ -23,14 +23,14 @@
&.left-menu{
display: flex;
- .left{
+ .left_holder{
width: 300px;
min-width: 300px;
margin-right: 32px;
}
- .right{
+ .right_holder{
flex-grow: 1;
}
}
@@ -38,18 +38,18 @@
&.three-part{
display: flex;
- .left{
+ .left_holder{
width: 300px;
min-width: 300px;
margin-right: 32px;
}
- .middle{
+ .middle_holder{
flex-grow: 1;
}
- .right{
+ .right_holder{
width: 400px;
min-width: 400px;
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 a492ccca9..105f19af5 100644
--- a/resources/sass/admin_new/pages/survey_objava/vabila_main.scss
+++ b/resources/sass/admin_new/pages/survey_objava/vabila_main.scss
@@ -8,6 +8,129 @@ and open the template in the editor.
Author : podkrizniku
*/
+
+body #main_holder #main .page_invitations{
+
+ .invitations_holder.fullwidth{
+ margin: 0 auto;
+ padding: 0 32px;
+ max-width: 1060px;
+
+ fieldset{
+
+ p{
+ margin-bottom: 8px;
+ }
+ }
+ }
+
+
+ // Zgornja vrstica z nastavitvami
+ .invitations_top_settings{
+ margin-bottom: 16px;
+
+ font-weight: 600;
+ }
+
+
+ // Leva stran s profili
+ @mixin inv_left_list(){
+ display: flex;
+ flex-direction: column;
+
+ overflow-y: auto;
+ width: 100%;
+ min-width: 200px;
+ max-height: 400px;
+
+ border: 1px solid $gray;
+ background-color: white;
+
+ ol {
+ display: flex;
+ flex-direction: column;
+
+ margin: 0px;
+ padding: 0px;
+
+ li {
+ cursor: pointer;
+ list-style-type: none;
+
+ display: flex;
+ align-items: center;
+
+ height: 35px;
+ padding: 0px 8px;
+
+ border-bottom: 1px solid $gray;
+
+ &:last-child{
+ border-bottom: 0;
+ }
+
+ &.active {
+ color: $blue;
+ background-color: $medium-blue2;
+ }
+
+ &:hover {
+ background-color: $medium-blue2;
+ }
+ }
+ }
+ }
+
+
+
+ // 2 - Dodaj - leva stran
+ #inv_recipients_profiles_holder {
+ min-height: 355px;
+ padding: 16px;
+
+ background: $white;
+ border: 1px solid $gray;
+
+ > span {
+ line-height: 28px;
+ }
+
+ #inv_import_list_profiles {
+ @include inv_left_list();
+ }
+
+ }
+
+ // 2 - Dodaj - desna stran
+ #inv_import_list_container {
+ min-height: 355px;
+ margin-bottom: 0;
+
+ span {
+ label {
+ vertical-align: bottom;
+ }
+ }
+ }
+
+
+
+ // 3-
+ #invitation_messages {
+ @include inv_left_list();
+ }
+
+}
+
+
+
+
+
+
+
+
+
+
.lbl_email_setting {
vertical-align: top;
line-height: 16px;
@@ -516,39 +639,7 @@ input#inv_message_comment {
@include inv_error_note();
color: $blue;
}
-#inv_import_list_container {
- margin-right: 5px;
- padding: 8px;
- min-height: 355px;
- width: 670px;
- background: $light-blue;
- border: 1px solid $blue;
- float: left;
- display: inline-block;
- width: auto;
- span {
- label {
- vertical-align: bottom;
- }
- }
-}
-#inv_recipients_profiles_holder {
- margin-right: 5px;
- padding: 8px;
- min-height: 355px;
- width: 670px;
- background: $light-blue;
- border: 1px solid $blue;
- float: left;
- margin-left: 10px;
- display: inline-block;
- width: auto;
- overflow: hidden;
- span {
- line-height: 24px;
- font-size: 13px;
- }
-}
+
#inv_messages_profiles_holder {
margin-right: 5px;
padding: 8px;
@@ -751,46 +842,7 @@ div.inv_step.active {
.inv_arch_subject {
max-width: 200px;
}
-@mixin inv_left_list(){
- margin: 0px;
- padding: 0px;
- min-width: 100px;
- max-width: 400px;
- min-height: 100px;
- max-height: 600px;
- overflow: auto !important;
- display: inline-block;
- border: 1px solid $gray;
- background-color: white;
- width: 200px !important;
- height: 237px !important;
- ol {
- margin: 0px;
- padding: 0px;
- display: block;
- border-bottom: 1px solid $gray;
- li {
- display: block;
- list-style-image: none;
- list-style-position: outside;
- list-style-type: none;
- line-height: 20px;
- border-top: 1px solid $gray;
- padding: 0px 5px;
- cursor: pointer;
- }
- li.active {
- background-color: $blue;
- color: white;
- }
- }
-}
-#inv_import_list_profiles {
- @include inv_left_list();
-}
-#invitation_messages {
- @include inv_left_list();
-}
+
#inv_recipients_profile_name {
@include popup_general();
diff --git a/resources/sass/admin_new/pages/survey_objava/vabila_navigation.scss b/resources/sass/admin_new/pages/survey_objava/vabila_navigation.scss
index b630bb0b8..0c98bd31e 100644
--- a/resources/sass/admin_new/pages/survey_objava/vabila_navigation.scss
+++ b/resources/sass/admin_new/pages/survey_objava/vabila_navigation.scss
@@ -9,7 +9,7 @@
align-items: center;
position: relative;
- margin-bottom: 32px;
+ margin-bottom: 48px;
color: $gray;