R54970 - in /trunk: addressbook/templates/default/ etemplate/js/ etemplate/templates/default/ phpgwapi/

hnategh-2 2016-02-10 09:45:33 UTC #1

Author: hnategh
New Revision: 54970

URL: http://svn.stylite.de/viewvc/egroupware?rev=54970&view=rev
Log:
Implement category color column purely with css

Modified:
trunk/addressbook/templates/default/index.xet
trunk/etemplate/js/et2_extension_nextmatch.js
trunk/etemplate/templates/default/etemplate2.css
trunk/phpgwapi/categories.php

Modified: trunk/addressbook/templates/default/index.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/addressbook/templates/default/index.xet?rev=54970&r1=54969&r2=54970&view=diff

— trunk/addressbook/templates/default/index.xet (original)
+++ trunk/addressbook/templates/default/index.xet Wed Feb 10 10:45:33 2016
@@ -19,7 +19,6 @@

  		<column width="10"/>
  		<column width="20"/>
  		<column width="40%"/>
  		<column width="70"/>

@@ -41,7 +40,6 @@

  			<nextmatch-cat-header/>
  			<nextmatch-header label="Type" id="type"/>
  			<grid spacing="0" padding="0">
  				<columns>

@@ -112,8 +110,7 @@

  		<row class="$row_cont[class]" valign="top">

  			<description class=" cat_$row_cont[cat_id] nm_cat_col"/>

  		<row class="$row_cont[class] $row_cont[cat_id]" valign="top">
  			<image align="center" label="$row_cont[type_label]" src="${row}[type]" no_lang="1"/>
  			<vbox id="${row}[id]">
  				<description id="${row}[line1]" no_lang="1"/>

Modified: trunk/etemplate/js/et2_extension_nextmatch.js
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/js/et2_extension_nextmatch.js?rev=54970&r1=54969&r2=54970&view=diff

— trunk/etemplate/js/et2_extension_nextmatch.js (original)
+++ trunk/etemplate/js/et2_extension_nextmatch.js Wed Feb 10 10:45:33 2016
@@ -3458,22 +3458,3 @@
}
});
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’]);

Modified: trunk/etemplate/templates/default/etemplate2.css
URL: http://svn.stylite.de/viewvc/egroupware/trunk/etemplate/templates/default/etemplate2.css?rev=54970&r1=54969&r2=54970&view=diff

— trunk/etemplate/templates/default/etemplate2.css (original)
+++ trunk/etemplate/templates/default/etemplate2.css Wed Feb 10 10:45:33 2016
@@ -507,20 +507,11 @@
display: table-row;
}

-.et2_nextmatch .egwGridView_grid tr td {

position: relative;
-}
-.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;
-}
+/Default cat color/
+tr.row_category {

border-left: 6px solid transparent;
+}

/*
These are set via javascript before printing to help tame nextmatch’s layout
for printing

Modified: trunk/phpgwapi/categories.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/phpgwapi/categories.php?rev=54970&r1=54969&r2=54970&view=diff

— trunk/phpgwapi/categories.php (original)
+++ trunk/phpgwapi/categories.php Wed Feb 10 10:45:33 2016
@@ -38,7 +38,7 @@
{
// Use slightly more specific selector that just class, to allow defaults
// 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’])
{

Site24x7 APM Insight: Get Deep Visibility into Application Performance
APM + Mobile APM + RUM: Monitor 3 App instances at just $35/Month
Monitor end-to-end web transactions and take corrective actions now
Troubleshoot faster and improve end-user experience. Signup Now!
http://pubads.g.doubleclick.net/gampad/clk?id=272487151&iu=/4140

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs