Implement category color column purely with css

This commit is contained in:
Hadi Nategh 2016-02-10 09:45:33 +00:00
parent 37be48c772
commit 63b3009bb5
4 changed files with 6 additions and 37 deletions

View File

@ -19,7 +19,6 @@
<template id="addressbook.index.rows" template="" lang="" group="0" version="1.9.005"> <template id="addressbook.index.rows" template="" lang="" group="0" version="1.9.005">
<grid width="100%"> <grid width="100%">
<columns> <columns>
<column width="10"/>
<column width="20"/> <column width="20"/>
<column width="40%"/> <column width="40%"/>
<column width="70"/> <column width="70"/>
@ -41,7 +40,6 @@
</columns> </columns>
<rows> <rows>
<row class="th"> <row class="th">
<nextmatch-cat-header/>
<nextmatch-header label="Type" id="type"/> <nextmatch-header label="Type" id="type"/>
<grid spacing="0" padding="0"> <grid spacing="0" padding="0">
<columns> <columns>
@ -112,8 +110,7 @@
<nextmatch-sortheader label="Last modified" id="contact_modified" sortmode="DESC"/> <nextmatch-sortheader label="Last modified" id="contact_modified" sortmode="DESC"/>
</vbox> </vbox>
</row> </row>
<row class="$row_cont[class]" valign="top"> <row class="$row_cont[class] $row_cont[cat_id]" valign="top">
<description class=" cat_$row_cont[cat_id] nm_cat_col"/>
<image align="center" label="$row_cont[type_label]" src="${row}[type]" no_lang="1"/> <image align="center" label="$row_cont[type_label]" src="${row}[type]" no_lang="1"/>
<vbox id="${row}[id]"> <vbox id="${row}[id]">
<description id="${row}[line1]" no_lang="1"/> <description id="${row}[line1]" no_lang="1"/>

View File

@ -3458,22 +3458,3 @@ var et2_nextmatch_customfilter = et2_nextmatch_filterheader.extend(
} }
}); });
et2_register_widget(et2_nextmatch_customfilter, ['nextmatch-customfilter']); et2_register_widget(et2_nextmatch_customfilter, ['nextmatch-customfilter']);
/**
* Define a nextmatch header for category colors
* @type type
*/
var et2_nextmatch_cat_header = et2_baseWidget.extend(et2_INextmatchHeader,
{
/**
* Unbind resize handler for category color header
* add class to th
*/
setNextmatch: function() {
jQuery(this.parentNode.parentNode)
.addClass('cat-header')
.unbind('.resize');
}
});
et2_register_widget(et2_nextmatch_cat_header, ['nextmatch-cat-header']);

View File

@ -507,20 +507,11 @@ which caused click on free space infront of a tag stops nm row selection*/
display: table-row; display: table-row;
} }
.et2_nextmatch .egwGridView_grid tr td { /*Default cat color*/
position: relative; tr.row_category {
} border-left: 6px solid transparent;
.et2_nextmatch .egwGridView_grid tr td .nm_cat_col {
position: absolute;
min-height: 100%;
bottom:0;
top:0;
width:10px;
display: block;
}
span.cat_.nm_cat_col {
background: #F5F5F5;
} }
/* /*
These are set via javascript before printing to help tame nextmatch's layout These are set via javascript before printing to help tame nextmatch's layout
for printing for printing

View File

@ -38,7 +38,7 @@ foreach($categories as $cat)
{ {
// Use slightly more specific selector that just class, to allow defaults // Use slightly more specific selector that just class, to allow defaults
// if the category has no color // if the category has no color
$content .= "tr.cat_{$cat['id']}, div.cat_{$cat['id']}, span.cat_{$cat['id']} { background-color: {$cat['data']['color']};} /*{$cat['name']}*/\n"; $content .= "tr.cat_{$cat['id']} {border-left:6px solid {$cat['data']['color']};} div.cat_{$cat['id']}, span.cat_{$cat['id']} { background-color: {$cat['data']['color']};} /*{$cat['name']}*/\n";
} }
if($cat['data']['icon']) if($cat['data']['icon'])
{ {