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

Redesign - tabela s podatki

Browse Source
This commit is contained in:
pero1203 2022-03-03 12:23:04 +01:00
parent 1d83518858
commit b421d1271f
3 changed files with 175 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
admin/survey/classes/surveyData/class.SurveyDataDisplay.php
View File

@ -1429,7 +1429,7 @@ class SurveyDataDisplay{
echo '<table id="dataTable" class="scrollTable no_wrap_td'.$cssEdit.'" '.(self::$_VARS[VAR_EDIT]?' title="'.$lang['srv_edit_data_title'].'"':'').'>'; echo '<table id="dataTable" class="scrollTable no_wrap_td'.$cssEdit.'" '.(self::$_VARS[VAR_EDIT]?' title="'.$lang['srv_edit_data_title'].'"':'').'>';
// Nastavimo colgroup, da na njega vezemo vse sirine v tabeli, zaradi resizinga stolpcev // Nastavimo colgroup, da na njega vezemo vse sirine v tabeli, zaradi resizinga stolpcev
echo '<colgroup>'; /*echo '<colgroup>';
# colspan za ikonce # colspan za ikonce
if ($stolpci > 0) { if ($stolpci > 0) {
echo '<col class="data_edit"'.($stolpci > 1 ? (' span="'.$stolpci.'"') : '').'>'; echo '<col class="data_edit"'.($stolpci > 1 ? (' span="'.$stolpci.'"') : '').'>';
@ -1464,7 +1464,7 @@ class SurveyDataDisplay{
} }
} }
echo '</colgroup>'; echo '</colgroup>';*/
echo '<thead class="fixedHeader">'; echo '<thead class="fixedHeader">';
echo '<tr>'; echo '<tr>';

26
public/css/admin_new.css
View File

@ -15507,13 +15507,25 @@ dl.arch_email dd {
margin-top: 8px; margin-top: 8px;
} }
#div_vnosi_data table#dataTable { #div_vnosi_data #tableContainer {
overflow-x: auto;
}
#div_vnosi_data #tableContainer table#dataTable {
table-layout: fixed; table-layout: fixed;
width: 0px;
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
border-collapse: collapse; border-collapse: collapse;
border-spacing: 0px; border-spacing: 0px;
/*colgroup{
col {
width: 100px;
&.data_edit {
width: 23px;
}
}
}*/
/*.dataCell { /*.dataCell {
position: relative; position: relative;
white-space: nowrap; white-space: nowrap;
@ -15624,13 +15636,7 @@ dl.arch_email dd {
} }
}*/ }*/
} }
#div_vnosi_data table#dataTable colgroup col { #div_vnosi_data #tableContainer table#dataTable thead tr th {
width: 100px;
}
#div_vnosi_data table#dataTable colgroup col.data_edit {
width: 23px;
}
#div_vnosi_data table#dataTable thead tr th {
padding: 16px; padding: 16px;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
@ -15639,7 +15645,7 @@ dl.arch_email dd {
background: #F8F8F8; background: #F8F8F8;
border: 1px solid #E5E5E5; border: 1px solid #E5E5E5;
} }
#div_vnosi_data table#dataTable tbody tr td { #div_vnosi_data #tableContainer table#dataTable tbody tr td {
box-sizing: border-box; box-sizing: border-box;
height: 40px; height: 40px;
padding: 0 16px; padding: 0 16px;

306
resources/sass/admin_new/pages/survey_data/data_table.scss
View File

@ -2,173 +2,175 @@
//width: 100%; //width: 100%;
//overflow-y: auto; //overflow-y: auto;
table#dataTable { #tableContainer{
table-layout: fixed; overflow-x: auto;
width: 0px;
padding: 0px; table#dataTable {
margin: 0px; table-layout: fixed;
border-collapse: collapse; padding: 0px;
border-spacing: 0px; margin: 0px;
border-collapse: collapse;
border-spacing: 0px;
/*colgroup{
col {
width: 100px;
&.data_edit {
width: 23px;
}
}
}*/
thead{
tr{
th{
padding: 16px;
overflow: hidden;
white-space: nowrap;
font-size: 16px;
font-weight: 600;
background: $light-gray;
border: 1px solid $gray;
}
}
}
tbody{
tr{
td{
box-sizing: border-box;
height: 40px;
padding: 0 16px;
font-size: 14px;
border: 1px solid $gray;
}
}
}
colgroup{
/*.dataCell {
position: relative;
white-space: nowrap;
overflow: hidden;
width: 100%;
min-width: 20px;
max-height: 1.1em;
padding: 3px 0;
text-indent: 3px;
&:hover {
.tableResize {
background-color: $blue;
}
}
}
.headerCell {
white-space: nowrap;
padding: 3px;
}
th {
font-weight: normal;
text-align: left;
cursor: pointer;
}
col { col {
width: 100px; width: 100px;
&.data_edit {
width: 23px;
}
} }
} col.data_edit {
width: 23px;
thead{
tr{
th{
padding: 16px;
overflow: hidden;
white-space: nowrap;
font-size: 16px;
font-weight: 600;
background: $light-gray;
border: 1px solid $gray;
}
} }
}
tbody{
tr{
td{
box-sizing: border-box;
height: 40px;
padding: 0 16px;
font-size: 14px;
border: 1px solid $gray;
}
}
}
/*.dataCell {
position: relative;
white-space: nowrap;
overflow: hidden;
width: 100%;
min-width: 20px;
max-height: 1.1em;
padding: 3px 0;
text-indent: 3px;
&:hover {
.tableResize {
background-color: $blue;
}
}
}
.headerCell {
white-space: nowrap;
padding: 3px;
}
th {
font-weight: normal;
text-align: left;
cursor: pointer;
}
col {
width: 100px;
}
col.data_edit {
width: 23px;
}
td {
padding: 3px;
font-weight: normal;
text-align: left;
max-width: 200px;
overflow: hidden;
line-height: 18px;
.highlighted {
font-weight: bold;
color: red;
background-color: yellow;
}
}
td.data_edit {
.pdf {
cursor: pointer;
}
.rtf {
cursor: pointer;
}
.evoli {
cursor: pointer;
}
.evoli2 {
cursor: pointer;
}
.evoli3 {
cursor: pointer;
}
.mfdps {
cursor: pointer;
}
}
select {
font-size: 11px !important;
width: 100%;
}
th.hover {
background-color: $gray;
}
tbody {
.active {
background-color: $gray !important;
}
tr {
&:nth-child(odd) {
}
&:nth-child(even) {
background-color: $gray;
}
}
}
.delete_data_row {
margin: 0;
}
.scrollContent.coding {
td { td {
&:hover { padding: 3px;
background-color: $gray; font-weight: normal;
text-align: left;
max-width: 200px;
overflow: hidden;
line-height: 18px;
.highlighted {
font-weight: bold;
color: red;
background-color: yellow;
}
}
td.data_edit {
.pdf {
cursor: pointer;
}
.rtf {
cursor: pointer;
}
.evoli {
cursor: pointer;
}
.evoli2 {
cursor: pointer;
}
.evoli3 {
cursor: pointer;
}
.mfdps {
cursor: pointer; cursor: pointer;
} }
} }
td.enkaIcon { select {
&:hover { font-size: 11px !important;
background-color: white; width: 100%;
}
th.hover {
background-color: $gray;
}
tbody {
.active {
background-color: $gray !important;
}
tr {
&:nth-child(odd) {
}
&:nth-child(even) {
background-color: $gray;
}
} }
} }
td.cellGreen { .delete_data_row {
&:hover { margin: 0;
background-color: #E6FFCC;
cursor: auto;
}
} }
}*/ .scrollContent.coding {
td {
&:hover {
background-color: $gray;
cursor: pointer;
}
}
td.enkaIcon {
&:hover {
background-color: white;
}
}
td.cellGreen {
&:hover {
background-color: #E6FFCC;
cursor: auto;
}
}
}*/
}
} }
} }