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

Redesign - popravek sass strukture, vabila - navigacija in layout

Browse Source
This commit is contained in:
pero1203 2022-04-04 17:39:48 +02:00
parent 6fb2cab766
commit 8b73d02c68
14 changed files with 2773 additions and 2495 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

206
admin/survey/classes/surveyEmails/class.SurveyInvitationsNew.php
View File

@ -1916,21 +1916,19 @@ class SurveyInvitationsNew {
echo $settings_text;
//echo '<span style="padding-left:15px; padding-right:15px;"><input type="radio" name="inv_messages_noEmailing" id="inv_messages_noEmailing_1" '.($noEmailing == 0 ? ' checked="checked"' : '').' style="margin-bottom:4px;" onClick="noEmailingToggle(\'0\');" /> <label for="inv_messages_noEmailing_1">'.$lang['srv_inv_message_noemailing_0'].'</label></span>';
//echo '<span><input type="radio" name="inv_messages_noEmailing" id="inv_messages_noEmailing_2" '.($noEmailing == 1 ? ' checked="checked"' : '').' style="margin-bottom:4px;" onClick="noEmailingToggle(\'1\');" /> <label for="inv_messages_noEmailing_2">'.$lang['srv_inv_message_noemailing_1'].'</label></span>';
echo '</h2>';
// Ce posiljamo preko emaila
if($noEmailing != 1){
echo '<div id="inv_messages_holder">';
echo '<div id="inv_messages_holder" class="invitations_holder three-part">';
if ($this->checkDefaultMessage() == false) {
echo '<span class="inv_error_note">';
echo $lang['srv_invitation_note6'];
echo '</span>';
} else {
}
else {
$sql_string = "SELECT id, naslov, subject_text, body_text, reply_to, isdefault, comment, url FROM srv_invitations_messages WHERE ank_id = '$this->sid'";
$sql_query = sisplet_query($sql_string);
$array_messages = array();
@ -1945,7 +1943,8 @@ class SurveyInvitationsNew {
}
$preview_message = $array_messages[$mid];
echo '<div id="inv_messages_profiles_holder" class="floatLeft">';
echo '<div id="inv_messages_profiles_holder" class="left">';
echo '<span>'.$lang['srv_invitation_message_choose'].':</span><br/>';
echo '<div id="invitation_messages" >';
echo '<ol>';
@ -2003,10 +2002,12 @@ class SurveyInvitationsNew {
echo '</div>'; #inv_messages_profiles_holder
$MA = new MailAdapter($this->sid, $type='invitation');
# zlistamo seznam vseh sporočil
# izpišemo primer besedila
echo '<div id="inv_msg_preview_hld" class="floatLeft">';
echo '<div id="inv_msg_preview_hld" class="middle">';
echo '<span class="h2 spaceRight floatLeft">'.$lang['srv_inv_message_draft_content_heading'].'</span> '.Help::display('srv_inv_message_title');
//echo '<span class="spaceRight floatRight"><a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&a=invitations&m=inv_server&show_back=true">'.$lang['srv_inv_message_draft_settings'].'</a></span>';
@ -2072,7 +2073,8 @@ class SurveyInvitationsNew {
echo '</div>';
echo '<div id="invitation_profile_notes"><p>';
echo '<div id="invitation_profile_notes" class="right"><p>';
$_indicators = $this->getAvailableIndicators();
@ -2116,13 +2118,14 @@ class SurveyInvitationsNew {
echo $lang['srv_inv_message_noemailing_text'];
echo '</div>';
echo '<div id="inv_messages_holder">';
echo '<div id="inv_messages_holder" class="invitations_holder left-menu">';
if ($this->checkDefaultMessage() == false) {
echo '<span class="inv_error_note">';
echo $lang['srv_invitation_note6'];
echo '</span>';
} else {
}
else {
$sql_string = "SELECT id, naslov, subject_text, body_text, reply_to, isdefault, comment, url FROM srv_invitations_messages WHERE ank_id = '$this->sid'";
$sql_query = sisplet_query($sql_string);
$array_messages = array();
@ -2137,7 +2140,7 @@ class SurveyInvitationsNew {
}
$preview_message = $array_messages[$mid];
echo '<div id="inv_messages_profiles_holder" class="floatLeft">';
echo '<div id="inv_messages_profiles_holder" class="left">';
echo '<span>'.$lang['srv_invitation_message_choose'].':</span><br/>';
echo '<div id="invitation_messages" >';
echo '<ol>';
@ -2150,7 +2153,9 @@ class SurveyInvitationsNew {
}
echo '</ol>';
echo '</div>'; #invitation_messages
echo '<br class="clr" />';
if (count($array_messages) > 1) {
echo '<span class="as_link" id="inv_del_msg_profile" onclick="invMessageDelete();" title="'.$lang['srv_inv_message_delete_profile'].'">'.$lang['srv_inv_message_delete_profile'].'</span><br/>';
}
@ -2195,10 +2200,12 @@ class SurveyInvitationsNew {
echo '</div>'; #inv_messages_profiles_holder
$MA = new MailAdapter($this->sid, $type='invitation');
# zlistamo seznam vseh sporočil
# izpišemo primer besedila
echo '<div id="inv_msg_preview_hld" class="floatLeft">';
echo '<div id="inv_msg_preview_hld" class="right">';
echo '<span class="h2 spaceRight floatLeft">'.$lang['srv_inv_message_draft_content_heading'].'</span> '.Help::display('srv_inv_message_title_noEmail');
//echo '<span class="spaceRight floatRight"><a href="'.$site_url . 'admin/survey/index.php?anketa='.$this->sid.'&a=invitations&m=inv_server&show_back=true">'.$lang['srv_inv_message_draft_settings'].'</a></span>';
@ -2253,8 +2260,6 @@ class SurveyInvitationsNew {
echo '</div>';
}
echo '<br class="clr"/>';
}
function checkDefaultMessage() {
@ -2851,111 +2856,109 @@ class SurveyInvitationsNew {
$active_step['1'] = ' active';
break;
}
if (SurveyInfo::getInstance()->checkSurveyModule('email') || SurveyInfo::getInstance()->checkSurveyModule('phone')) {
$disabled = false;
$css_disabled = '';
} else {
}
else {
$disabled = true;
$css_disabled = '_disabled';
$css_disabled = 'disabled';
}
if($isEmail) {
#$spaceChar = '&#187;';
$spaceChar = '&nbsp;';
echo '<div id="inv_step_nav">';
// Step 1 - nastavitve
echo '<div class="inv_step '.$active_step[1].'">';
echo '<a href="'.$this->addUrl('inv_settings').'">';
//echo '<span class="circle">1</span>';
echo '<span class="label">'.$lang['srv_inv_nav_email_settings'].'</span>';
echo ' <a href="'.$this->addUrl('inv_settings').'" class="noline">';
echo ' <span class="number">1</span>'.$lang['srv_inv_nav_email_settings'];
echo ' </a>';
echo '</div>';
echo '</div>';
#space
echo '<div class="inv_space">&nbsp;</div>';
echo '<div id="inv_step_nav" class="yellow">';
$class_yellow = ' yellow';
// Space
echo '<div class="inv_space"></div>';
#navigacija
echo '<div class="inv_step'.$class_yellow.$css_disabled.$active_step[2].'">';
// Step 2 - dodaj
echo '<div class="inv_step '.$css_disabled.' '.$active_step[2].'">';
if ($disabled == false) {
echo '<a href="'.$this->addUrl('add_recipients_view').'">';
echo ' <a href="'.$this->addUrl('add_recipients_view').'" class="noline">';
}
echo '<span class="circle">1</span>';
echo '<span class="label">'.$lang['srv_inv_nav_add_recipients'].'</span>';
echo ' <span class="number">2</span>'.$lang['srv_inv_nav_add_recipients'];
if ($disabled == false) {
echo ' </a>';
}
echo '</div>';
echo '<div class="inv_step_space'.$class_yellow.$css_disabled.'">'.$spaceChar.'</div>';
echo '<div class="inv_step'.$class_yellow.$css_disabled.$active_step[3].'">';
// Space
echo '<div class="inv_space"></div>';
// Step 3 - preglej
echo '<div class="inv_step '.$css_disabled.' '.$active_step[3].'">';
if ($disabled == false) {
echo '<a href="'.$this->addUrl('view_recipients').'">';
echo ' <a href="'.$this->addUrl('view_recipients').'" class="noline">';
}
echo '<span class="circle">2</span>';
echo '<span class="label">'.$lang['srv_inv_nav_edit_recipiens'].'</span>';
if ($disabled == false) {
echo '</a>';
}
echo '</div>';
echo '<div class="inv_step_space'.$class_yellow.$css_disabled.'">'.$spaceChar.'</div>';
if ($disabled == false) {
echo '<a href="'.$this->addUrl('view_message').'">';
}
echo '<div class="inv_step'.$class_yellow.$css_disabled.$active_step[4].'">';
echo '<span class="circle">3</span>';
echo '<span class="label" >'.$lang['srv_inv_nav_edit_message'].'</span>';
if ($disabled == false) {
echo '</a>';
}
echo '</div>';
echo '<div class="inv_step_space'.$class_yellow.$css_disabled.'">'.$spaceChar.'</div>';
echo '<div class="inv_step'.$class_yellow.$css_disabled.$active_step[5].'">';
if ($disabled == false) {
echo '<a href="'.$this->addUrl('send_message').'">';
}
echo '<span class="circle">4</span>';
echo '<span class="label" >'.$lang['srv_inv_nav_send_message'].'</span>';
echo ' <span class="number">3</span>'.$lang['srv_inv_nav_edit_recipiens'];
if ($disabled == false) {
echo ' </a>';
}
echo '</div>';
// Space
echo '<div class="inv_space"></div>';
// Step 4 - sporocilo
echo '<div class="inv_step '.$css_disabled.' '.$active_step[4].'">';
if ($disabled == false) {
echo ' <a href="'.$this->addUrl('view_message').'" class="noline">';
}
echo ' <span class="number">4</span>'.$lang['srv_inv_nav_edit_message'];
if ($disabled == false) {
echo ' </a>';
}
echo '</div>';
// Space
echo '<div class="inv_space"></div>';
// Step 5 - poslji
echo '<div class="inv_step '.$css_disabled.' '.$active_step[5].'">';
if ($disabled == false) {
echo ' <a href="'.$this->addUrl('send_message').'" class="noline">';
}
echo ' <span class="number">5</span>'.$lang['srv_inv_nav_send_message'];
if ($disabled == false) {
echo ' </a>';
}
echo '</div>';
// Nastavitve zgoraj desno
echo '<div class="inv_nav_settings">';
// Pregled
#space
echo '<div class="inv_space">&nbsp;</div>';
echo '<div id="inv_step_nav">';
echo '<div class="inv_step '.$active_step[9].'">';
echo '<a href="'.$this->addUrl('inv_status').'">';
//echo '<span class="circle">1</span>';
echo '<span class="label">'.$lang['srv_inv_nav_email_review'].'</span>';
echo ' <a href="'.$this->addUrl('inv_status').'" class="noline">';
echo ' <span class="faicon chart"></span>'.$lang['srv_inv_nav_email_review'];
echo ' </a>';
echo '</div>';
echo '</div>';
// Seznami
#space
echo '<div class="inv_space">&nbsp;</div>';
echo '<div id="inv_step_nav">';
echo '<div class="inv_step '.$active_step[7].'">';
echo '<a href="'.$this->addUrl('inv_lists').'">';
//echo '<span class="circle">1</span>';
echo '<span class="label">'.$lang['srv_inv_nav_email_lists'].'</span>';
echo ' <a href="'.$this->addUrl('inv_lists').'" class="noline">';
echo ' <span class="faicon phonebook"></span>'.$lang['srv_inv_nav_email_lists'];
echo ' </a>';
echo '</div>';
echo '</div>';
echo '<br class="clr" />';
echo '<br class="clr" />';
}
}
@ -7613,7 +7616,9 @@ class SurveyInvitationsNew {
// Vklop vabil
if ($_email == 0) {
echo '<fieldset class="inv_fieldset" style="max-width:800px; padding-bottom:15px;"><legend>'.$lang['srv_invitation_nonActivated_title'].'</legend>';
echo '<div class="invitations_holder fullwidth">';
echo '<fieldset class="inv_fieldset"><legend>'.$lang['srv_invitation_nonActivated_title'].'</legend>';
echo '<div class="inv_filedset_inline_div">';
echo '<p>';
@ -7641,24 +7646,23 @@ class SurveyInvitationsNew {
echo '</div>';
echo '</fieldset>';
echo '</div>';
}
// Vabila so vklopljena - NASTAVITVE
else{
if($noEmailing == 1){
echo '<table class="invitations_settings" style="width:50%;">';
echo '<div class="invitations_holder fullwidth invitations_settings">';
}
else{
echo '<table class="invitations_settings" style="width:100%;">';
echo '<colgroup style="width:48%;"></colgroup>';
echo '<colgroup style="width:48%;"></colgroup>';
echo '<div class="invitations_holder half-half invitations_settings">';
}
echo '<tr>';
// Leva stran - navadne nastavitve
echo '<td style="padding-right:20px;vertical-align: top;">';
echo '<div class="left">';
echo '<fieldset class="inv_fieldset"><legend>'.$lang['srv_inv_nav_invitations_settings_general'].' '.Help::display('srv_inv_general_settings').'</legend>';
echo '<div class="inv_filedset_inline_div">';
@ -7755,6 +7759,7 @@ class SurveyInvitationsNew {
echo $lang['srv_user_base_access_check'].' '.Help::display('srv_inv_no_code');
echo '<input type="checkbox" name="usercode_skip_checkbox" value="0" id="usercode_skip_0"'.($row['usercode_skip'] != 0 ? ' checked="checked"' : '').' '.$voting_disabled.' onChange="surveyBaseSettingRadio(\'usercode_skip\',true);" />';
echo '</label></p>';
if($row['usercode_skip'] > 0){
echo '<div style="float: left; margin: -10px 0 0 15px;">';
echo '<label class="lbl_email_setting">'.$lang['srv_user_base_access'].Help::display('usercode_skip').' </label>';
@ -7762,14 +7767,6 @@ class SurveyInvitationsNew {
echo '<label><input type="radio" name="usercode_skip" value="2" id="usercode_skip_2"'.($row['usercode_skip'] == 2 ? ' checked="checked"' : '').' onChange="surveyBaseSettingRadio(\'usercode_skip\',true);"/>'.$lang['srv_setting_onlyAuthor'].'</label>';
echo '</div>';
}
/*echo '<p>';
echo '<label class="lbl_email_setting">'.$lang['srv_user_base_access'].Help::display('usercode_skip').' </label>';
echo '<label><input type="radio" name="usercode_skip" value="0" id="usercode_skip_0"'.($row['usercode_skip'] == 0 ? ' checked="checked"' : '').' onChange="surveyBaseSettingRadio(\'usercode_skip\',true);"/>'.$lang['no1'].'</label>';
echo '<label><input type="radio" name="usercode_skip" value="1" id="usercode_skip_1"'.($row['usercode_skip'] == 1 ? ' checked="checked"' : '').' onChange="surveyBaseSettingRadio(\'usercode_skip\',true);"/>'.$lang['yes'].'</label>';
echo '<label><input type="radio" name="usercode_skip" value="2" id="usercode_skip_2"'.($row['usercode_skip'] == 2 ? ' checked="checked"' : '').' onChange="surveyBaseSettingRadio(\'usercode_skip\',true);"/>'.$lang['srv_setting_onlyAuthor'].'</label>';
echo '<br/><i class="small">* '.$lang['srv_user_base_access_alert_'.$row['usercode_skip'].''].'</i>';
echo '</p>';*/
}
echo '<br />';
@ -7782,8 +7779,10 @@ class SurveyInvitationsNew {
echo '</div>';
echo '</div>';
echo '</fieldset>';
echo '</td>';
echo '</div>';
// desna stran - nastavitve streznika - samo ce imamo posiljanje preko emaila
@ -7792,7 +7791,8 @@ class SurveyInvitationsNew {
// Gorenje tega nima
if (!Common::checkModule('gorenje')){
echo '<td style="padding-right:10px;vertical-align: top;">';
echo '<div class="right">';
echo '<fieldset class="inv_fieldset"><legend>'.$lang['srv_email_setting_title'].'</legend>';
echo '<div class="inv_filedset_inline_div">';
@ -7802,17 +7802,21 @@ class SurveyInvitationsNew {
echo '</div>';
echo '</fieldset>';
echo '</td>';
echo '</div>';
}
}
echo '</tr></table>';
echo '</div>';
}
}
# navadni uporabniki, ki nimajo dostopa - text kako lahko pridobijo dostop
else {
echo '<fieldset class="inv_fieldset" style="max-width:800px; padding-bottom: 15px;"><legend>'.$lang['srv_invitation_nonActivated_title'].'</legend>';
echo '<div class="invitations_holder fullwidth">';
echo '<fieldset class="inv_fieldset"><legend>'.$lang['srv_invitation_nonActivated_title'].'</legend>';
echo '<div class="inv_filedset_inline_div">';
echo '<p>';
@ -7838,6 +7842,8 @@ class SurveyInvitationsNew {
echo '</div>';
echo '</fieldset>';
echo '</div>';
}
}

4809
public/css/admin_new.css
View File

File diff suppressed because it is too large Load Diff

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

@ -8,8 +8,6 @@
@import "missing_values";
@import "standardne_besede";
@import "podatki";
@import "testiranje/testiranje";
@import "oblika_teme";
@import "objava";
@import "nastavitve_komentarji";

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

@ -6,19 +6,22 @@
// My surveys
@import "my_surveys/my_surveys";
// Survey pages
@import "survey_status/survey_status";
@import "survey_edit/survey_edit";
@import "survey_data/survey_data";
@import "survey_analysis/survey_analysis";
@import "gdpr_pages/gdpr";
@import "settings/settings";
@import "narocila";
@import "aktivnost/aktivnost";
@import "sporocila/sporocila";
@import "library/library";
//New survey
@import "new_survey_page/new_survey_page";
@import "narocila";
// Survey pages
@import "survey_status/survey_status";
@import "survey_edit/survey_edit";
@import "survey_testiranje/survey_testiranje";
@import "survey_objava/survey_objava";
@import "survey_data/survey_data";
@import "survey_analysis/survey_analysis";
@import "aktivnost/aktivnost";
@import "sporocila/sporocila";
@import "library/library";

0
resources/sass/admin_new/pages/survey_objava/povezave.scss Normal file
View File

0
resources/sass/admin_new/pages/my_surveys/objava.scss → resources/sass/admin_new/pages/survey_objava/pregled.scss
View File

3
resources/sass/admin_new/pages/survey_objava/survey_objava.scss Normal file
View File

@ -0,0 +1,3 @@
@import "pregled";
@import "povezave";
@import "vabila";

68
resources/sass/admin_new/pages/survey_objava/vabila.scss Normal file
View File

@ -0,0 +1,68 @@
// Email vabila
@import "vabila_navigation";
// Layouti
.page_invitations{
.invitations_holder{
&.half-half{
display: flex;
.left{
width: 50%;
margin-right: 32px;
}
.right{
width: 50%;
}
}
&.left-menu{
display: flex;
.left{
width: 300px;
min-width: 300px;
margin-right: 32px;
}
.right{
flex-grow: 1;
}
}
&.three-part{
display: flex;
.left{
width: 300px;
min-width: 300px;
margin-right: 32px;
}
.middle{
flex-grow: 1;
}
.right{
width: 400px;
min-width: 400px;
margin-left: 32px;
}
}
&.fullwidth{
width: 100%;
}
}
}

99
resources/sass/admin_new/pages/survey_objava/vabila_navigation.scss Normal file
View File

@ -0,0 +1,99 @@
// Email vabila
.page_invitations{
// Zgornja navigacija
#inv_top_navi{
display: flex;
align-items: center;
position: relative;
margin-bottom: 32px;
color: $gray;
// Item navigacije
.inv_step{
a{
color: #A0A0A0;
}
span{
color: #A0A0A0;
font-size: 14px;
transition: 0.2s;
&.number{
line-height: 20px;
padding: 0 6px;
margin-right: 8px;
border: 1px #A0A0A0 solid;
border-radius: 2px;
}
&.faicon:before{
margin-right: 8px;
font-size: 14px;
transition: 0.2s;
}
}
&:hover{
a,
.faicon:before{
color: $blue;
}
.number{
color: $blue;
border-color: $blue;
}
}
&.active{
a,
.faicon:before{
color: $blue;
}
.number{
color: $white;
background-color: $blue;
border-color: $blue;
}
}
}
.inv_space{
width: 50px;
height: 1px;
margin: 0 8px;
border-top: 1px $dark-gray2 dashed;
}
// Nastavivtve desno zgoraj
.inv_nav_settings{
display: flex;
position: absolute;
top: 0;
right: 0;
.faicon{
margin-left: 64px;
}
}
}
}

0
resources/sass/admin_new/pages/my_surveys/testiranje/diagnostika.scss → resources/sass/admin_new/pages/survey_testiranje/diagnostika.scss
View File

0
resources/sass/admin_new/pages/my_surveys/testiranje/komentarji.scss → resources/sass/admin_new/pages/survey_testiranje/komentarji.scss
View File

0
resources/sass/admin_new/pages/my_surveys/testiranje/testiranje.scss → resources/sass/admin_new/pages/survey_testiranje/survey_testiranje.scss
View File

0
resources/sass/admin_new/pages/my_surveys/testiranje/testni_vnosi.scss → resources/sass/admin_new/pages/survey_testiranje/testni_vnosi.scss
View File

0
resources/sass/admin_new/pages/my_surveys/testiranje/trajanje.scss → resources/sass/admin_new/pages/survey_testiranje/trajanje.scss
View File