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

[Redizajn 1KA] Popupi: Analize > Multitabele - Settings - v2

Browse Source
This commit is contained in:
tejagerjovic 2022-05-27 04:09:07 +02:00
parent 85e4f6494f
commit 3175a7dc78
3 changed files with 55 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1413,8 +1413,7 @@ class SurveyMultiCrosstabs {
echo '<input type="hidden" name="table_id" value="'.$this->table_id.'" />'; echo '<input type="hidden" name="table_id" value="'.$this->table_id.'" />';
echo '<fieldset>'; echo '<h3>'.$lang['srv_multicrosstabs_settings_val'].'</h3>';
echo '<legend>'.$lang['srv_multicrosstabs_settings_val'].'</legend>';
echo '<div class="setting_holder">'; echo '<div class="setting_holder">';
@ -1433,11 +1432,7 @@ class SurveyMultiCrosstabs {
echo '</div>'; echo '</div>';
echo '</fieldset>'; echo '<h3>'.$lang['srv_multicrosstabs_settings_avg'].'</h3>';
echo '<fieldset>';
echo '<legend>'.$lang['srv_multicrosstabs_settings_avg'].'</legend>';
// Variabla za racunanje povprecja - numeric in ordinal (radio, dropdown, mg) // Variabla za racunanje povprecja - numeric in ordinal (radio, dropdown, mg)
$checked = $this->table_settings[$this->table_id]['avgVar'] == '' ? false : true; $checked = $this->table_settings[$this->table_id]['avgVar'] == '' ? false : true;
@ -1459,11 +1454,9 @@ class SurveyMultiCrosstabs {
echo '</div>'; echo '</div>';
echo '</div>'; echo '</div>';
echo '</fieldset>';
echo '<fieldset>'; echo '<h3>'.$lang['srv_multicrosstabs_settings_del'].'</h3>';
echo '<legend>'.$lang['srv_multicrosstabs_settings_del'].'</legend>';
// Variabla za racunanje deleza - ordinal in nominal (radio, dropdown, mg, po novem tudi checkbox, multicheckbox) // Variabla za racunanje deleza - ordinal in nominal (radio, dropdown, mg, po novem tudi checkbox, multicheckbox)
$checked = $this->table_settings[$this->table_id]['delezVar'] == '' ? false : true; $checked = $this->table_settings[$this->table_id]['delezVar'] == '' ? false : true;
@ -1490,8 +1483,6 @@ class SurveyMultiCrosstabs {
$this->displayDelez($this->table_settings[$this->table_id]['delezVar']); $this->displayDelez($this->table_settings[$this->table_id]['delezVar']);
echo '</div>'; echo '</div>';
echo '</fieldset>';
echo '</form>'; echo '</form>';

22
public/css/admin_new.css
View File

@ -8501,6 +8501,28 @@ div#newMCTable .setting_holder input.text {
width: 100% !important; width: 100% !important;
} }
div#mc_table_settings h3 {
font-weight: 700;
color: #1E88E5;
text-transform: uppercase;
font-size: 14px;
overflow: hidden;
margin: 0 0 8px 0;
}
div#mc_table_settings h3:after {
content: "";
display: inline-block;
height: 0.5em;
vertical-align: bottom;
width: 100%;
margin-right: -100%;
margin-left: 12px;
border-top: 1px solid #E5E5E5;
}
div#mc_table_settings form {
padding: 0;
}
/* /*
Header scss - top line, menu... Header scss - top line, menu...
*/ */

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

@ -462,6 +462,9 @@ div.popupShadow {
box-shadow: 0 0 10px 0 rgb(0 0 0 / 34%); box-shadow: 0 0 10px 0 rgb(0 0 0 / 34%);
} }
//Grafi - barve
//Multitabele //Multitabele
div#newMCTable { div#newMCTable {
.setting_holder { .setting_holder {
@ -471,3 +474,30 @@ div#newMCTable {
} }
} }
} }
div#mc_table_settings {
h3 {
font-weight: 700;
color: $blue;
text-transform: uppercase;
font-size: 14px;
overflow: hidden;
margin: 0 0 8px 0;
&:after {
content: "";
display: inline-block;
height: 0.5em;
vertical-align: bottom;
width: 100%;
margin-right: -100%;
margin-left: 12px;
border-top: 1px solid $gray;
}
}
form {
padding: 0;
}
}