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

[Redizajn 1KA] Popupi: Analize > Multitabele - Edit - v3

Browse Source
This commit is contained in:
tejagerjovic 2022-06-17 04:22:27 +02:00
parent 79ddf509c1
commit 1592fd4c23
4 changed files with 189 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/survey/SurveyAdminAjax.php
View File

@ -4305,8 +4305,8 @@ class SurveyAdminAjax {
echo ' </div>'; echo ' </div>';
echo '<div class="button_holder">'; echo '<div class="button_holder">';
echo '<button class="medium white-blue" onClick="preview_spremenljivka_cancel(); return false;">'.$lang['srv_zapri'].'</button>'; echo '<button class="medium white-blue" onclick="window.open(\''.$site_url.'admin/survey/ajax.php?t=branching&a=spremenljivka_preview_print&anketa='.$this->anketa.'&spremenljivka='.$_POST['spremenljivka'].'\', \'print\', \'scrollbars=1\'); return false;">'.$lang['hour_print2'].'</button>';
echo '<button class="medium blue" onclick="window.open(\''.$site_url.'admin/survey/ajax.php?t=branching&a=spremenljivka_preview_print&anketa='.$this->anketa.'&spremenljivka='.$_POST['spremenljivka'].'\', \'print\', \'scrollbars=1\'); return false;">'.$lang['hour_print2'].'</button>'; echo '<button class="medium blue" onClick="preview_spremenljivka_cancel(); return false;">'.$lang['srv_zapri'].'</button>';
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';

15
admin/survey/classes/surveyAnalysis/class.SurveyMultiCrosstabs.php
View File

@ -2166,7 +2166,8 @@ class SurveyMultiCrosstabs {
$sql = sisplet_query("SELECT * FROM srv_mc_table WHERE id='$this->table_id' AND ank_id='$this->ank_id' AND usr_id='$global_user_id'"); $sql = sisplet_query("SELECT * FROM srv_mc_table WHERE id='$this->table_id' AND ank_id='$this->ank_id' AND usr_id='$global_user_id'");
$current_table = mysqli_fetch_array($sql); $current_table = mysqli_fetch_array($sql);
echo '<h2>'.$lang['srv_multicrosstabs_tables'].'</h2>'; echo '<h2>'.$lang['srv_multicrosstabs_tables'].'</h2>';
echo '<div class="popup_close"><a href="#" onclick="close_mc_tables(); return false;">✕</a></div>';
echo '<div id="mc_tables_left">'; echo '<div id="mc_tables_left">';
@ -2181,18 +2182,16 @@ class SurveyMultiCrosstabs {
echo '</span>'; echo '</span>';
// Cas kreiranja tabele /*/ Cas kreiranja tabele
echo '<div id="table_create_time">'; echo '<div id="table_create_time">';
$time_created = strtotime($current_table['time_created']); $time_created = strtotime($current_table['time_created']);
echo $lang['srv_multicrosstabs_tables_time'].': <span class="bold">'.date("d.m.Y H:i", $time_created).'</span>'; echo $lang['srv_multicrosstabs_tables_time'].': <span class="bold">'.date("d.m.Y H:i", $time_created).'</span>';
echo '</div>'; echo '</div>';*/
// Na dnu imamo gumba brisi in preimenuj // Na dnu imamo linka brisi in preimenuj
echo '<div class="button_holder">'; echo '<p class="blue pointer bottom8 top16" onClick="mc_table_action(\'show_rename\'); return false;">'.$lang['srv_multicrosstabs_tables_rename'].'</p>';
echo '<button class="medium white-blue" onClick="mc_table_action(\'show_rename\'); return false;">'.$lang['srv_multicrosstabs_tables_rename'].'</button>'; echo '<p class="blue pointer" onclick="mc_table_action(\'show_delete\'); return false;">'.$lang['srv_multicrosstabs_tables_delete'].'</p>';
echo '<button class="medium blue" onclick="mc_table_action(\'show_delete\'); return false;">'.$lang['srv_multicrosstabs_tables_delete'].'</button>';
echo '</div>';
echo '</div>'; echo '</div>';

78
public/css/admin_new.css
View File

@ -8066,6 +8066,53 @@ div.setting_holder .setting_item input[type=checkbox][disabled] + label:before {
pointer-events: none; pointer-events: none;
} }
div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.naslov {
margin-bottom: 16px;
padding-bottom: 0;
}
div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.naslov p {
font-size: 18px !important;
font-weight: 600;
}
div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.naslov p.spremenljivka_info {
color: #777777;
font-size: 14px !important;
font-weight: 400;
margin-top: 16px;
}
div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder {
margin-top: 0;
}
div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder div.variabla {
padding: 0;
}
div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table td {
border: none;
}
div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table td.category label {
margin-right: 0;
}
div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table td.category textarea {
height: 30px !important;
width: 100% !important;
outline: 1px solid #C4C4C4;
}
div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table.grid_table tr:nth-child(2n+1) {
background-color: #F8F8F8;
}
div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table.ranking_table td div.dropzone {
border-top: 1px solid #E5E5E5;
}
div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table.text_vrednost td div.fotoresults_delete {
margin-left: 27px;
font-size: 14px !important;
color: #777777;
margin-top: 16px;
}
div#fullscreen div#preview_spremenljivka div#spremenljivka_preview div.spremenljivka div.variable_holder table.text_vrednost td div input.sig_clear_button {
margin-bottom: 16px;
}
div.qtip_comment { div.qtip_comment {
padding: 2px 16px 16px 16px; padding: 2px 16px 16px 16px;
} }
@ -8153,26 +8200,37 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
width: 50%; width: 50%;
} }
#div_creport_settings_profiles #creport_profiles { #div_creport_settings_profiles #creport_profiles,
#div_creport_settings_profiles #mc_tables,
#mc_tables_left #creport_profiles,
#mc_tables_left #mc_tables {
cursor: pointer; cursor: pointer;
width: 99%; width: 99%;
height: 140px; height: 140px;
display: inline-block; display: inline-block;
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
} }
#div_creport_settings_profiles #creport_profiles .option { #div_creport_settings_profiles #creport_profiles .option,
#div_creport_settings_profiles #mc_tables .option,
#mc_tables_left #creport_profiles .option,
#mc_tables_left #mc_tables .option {
padding: 8px; padding: 8px;
border: 1px solid #E5E5E5; border-bottom: 1px solid #E5E5E5;
} }
#div_creport_settings_profiles #creport_profiles .active { #div_creport_settings_profiles #creport_profiles .active,
#div_creport_settings_profiles #mc_tables .active,
#mc_tables_left #creport_profiles .active,
#mc_tables_left #mc_tables .active {
background-color: #EAF9FE; background-color: #EAF9FE;
color: #1E88E5; color: #1E88E5;
} }
#div_creport_settings_profiles #creport_settings_profiles_comment textarea { #div_creport_settings_profiles #creport_settings_profiles_comment textarea,
#mc_tables_left #creport_settings_profiles_comment textarea {
width: 100%; width: 100%;
height: 80px; height: 80px;
} }
#div_creport_settings_profiles .button_holder { #div_creport_settings_profiles .button_holder,
#mc_tables_left .button_holder {
display: flex; display: flex;
border-top: 1px solid #E5E5E5; border-top: 1px solid #E5E5E5;
padding-top: 16px !important; padding-top: 16px !important;
@ -8180,6 +8238,14 @@ div#div_analiza_archive_name .alaysis_archive_wrap .alaysis_archive_left {
justify-content: space-between !important; justify-content: space-between !important;
} }
#div_mc_tables {
margin-bottom: 0;
}
#div_mc_tables .button_holder {
border-top: 1px solid #E5E5E5;
padding-top: 16px;
}
#newCReportProfile .text, #newCReportProfile .text,
#renameCReportProfile .text { #renameCReportProfile .text {
width: 100%; width: 100%;

112
resources/sass/admin_new/components/popup/page_specific.scss
View File

@ -129,6 +129,100 @@ div.setting_holder {
} }
} }
//Preview spremenljivka
div#fullscreen {
div#preview_spremenljivka {
div#spremenljivka_preview {
div.spremenljivka {
div.naslov {
p {
font-size: 18px !important;
font-weight: $semi-bold;
//Opomba na vprašanje
&.spremenljivka_info {
color: $very-dark-gray;
font-size: 14px !important;
font-weight: $regular;
margin-top: 16px;
}
}
margin-bottom: 16px;
padding-bottom: 0;
}
div.variable_holder {
margin-top: 0;
div.variabla {
padding: 0;
}
table {
td {
border: none;
&.category {
label {
margin-right: 0; //za centriranje radio buttonov v tabelah
}
textarea {
height: 30px !important;
width: 100% !important;
outline: 1px solid $dark-gray;
}
}
}
//Tabele
&.grid_table {
tr:nth-child(2n+1) {
background-color: $light-gray;
}
}
//Razvršanje
&.ranking_table {
td {
div.dropzone {
border-top: 1px solid $gray;
}
}
}
//Fotografiraj
&.text_vrednost {
td {
div.fotoresults_delete {
margin-left: 27px;
font-size: 14px!important;
color: $very-dark-gray;
margin-top: 16px;
}
div {
input.sig_clear_button {
margin-bottom: 16px;
}
}
}
}
}
}
}
}
}
}
//Komentarji //Komentarji
div.qtip_comment { div.qtip_comment {
@ -254,9 +348,11 @@ div#div_analiza_archive_name {
} }
} }
//Poročila //Poročila in tabele
#div_creport_settings_profiles { #div_creport_settings_profiles,
#creport_profiles { #mc_tables_left {
#creport_profiles,
#mc_tables {
cursor: pointer; cursor: pointer;
width: 99%; width: 99%;
height: 140px; height: 140px;
@ -264,7 +360,7 @@ div#div_analiza_archive_name {
border: 1px solid $gray; border: 1px solid $gray;
.option { .option {
padding: 8px; padding: 8px;
border: 1px solid $gray; border-bottom: 1px solid $gray;
} }
.active { .active {
background-color: $light-blue; background-color: $light-blue;
@ -289,6 +385,14 @@ div#div_analiza_archive_name {
} }
#div_mc_tables {
.button_holder {
border-top: 1px solid $gray;
padding-top: 16px;
}
margin-bottom: 0;
}
#newCReportProfile, #newCReportProfile,
#renameCReportProfile { #renameCReportProfile {
.text { .text {