extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 06:30:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into changable_column_order

Browse Source
This commit is contained in:
nathangray 2019-02-08 09:55:07 -07:00
commit a3ac0bd638
6 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -10,6 +10,8 @@ matrix:
fast_finish: true fast_finish: true
allow_failures: allow_failures:
- php: master - php: master
# allow 7.3 to fail, as pear.php.net is down and it has no cache with missing PEAR packages yet :(
- php: 7.3
services: services:
- memcached - memcached

2
api/categories.php
View File

@ -41,7 +41,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 .= ".egwGridView_scrollarea tr.row_category.cat_{$cat['id']} > td:first-child, .select-cat li.cat_{$cat['id']}, .nextmatch_header_row .et2_selectbox.select-cat.cat_{$cat['id']} a.chzn-single {border-left-color: {$cat['data']['color']};} .cat_{$cat['id']}.fullline_cat_bg, div.cat_{$cat['id']}, span.cat_{$cat['id']} { background-color: {$cat['data']['color']};} /*{$cat['name']}*/\n"; $content .= ".egwGridView_scrollarea tr.row_category.cat_{$cat['id']} > td:first-child, .select-cat li.cat_{$cat['id']}, .et2_selectbox ul.chzn-results li.cat_{$cat['id']}, .et2_selectbox ul.chzn-choices li.cat_{$cat['id']}, .nextmatch_header_row .et2_selectbox.select-cat.cat_{$cat['id']} a.chzn-single {border-left-color: {$cat['data']['color']};} .cat_{$cat['id']}.fullline_cat_bg, div.cat_{$cat['id']}, span.cat_{$cat['id']} { background-color: {$cat['data']['color']};} /*{$cat['name']}*/\n";
} }
if (!empty($cat['data']['icon'])) if (!empty($cat['data']['icon']))
{ {

13
api/js/etemplate/et2_widget_selectbox.js
View File

@ -580,6 +580,14 @@ var et2_selectbox = (function(){ "use strict"; return et2_inputWidget.extend(
// Value must be a real Array, not an object // Value must be a real Array, not an object
this.input.val(typeof _value == 'object' && _value != null ? jQuery.map(_value,function(value,index){return [value];}) : _value); this.input.val(typeof _value == 'object' && _value != null ? jQuery.map(_value,function(value,index){return [value];}) : _value);
this.input.trigger("liszt:updated"); this.input.trigger("liszt:updated");
var self = this;
if (this._type == 'listbox' && this.value_class != '')
{
var chosen = this.input.next();
chosen.find('.search-choice-close').each((i,v)=>{
jQuery(v).parent().addClass(self.value_class + self.options.select_options[v.rel]['value']);
});
}
this.value = _value; this.value = _value;
return; return;
} }
@ -771,6 +779,11 @@ var et2_selectbox = (function(){ "use strict"; return et2_inputWidget.extend(
// Properly size chosen, even if on a hidden tab // Properly size chosen, even if on a hidden tab
var size = egw.getHiddenDimensions(this.input); var size = egw.getHiddenDimensions(this.input);
if (this._type == 'listbox' && this.value_class != '')
{
var self = this;
this.input.find('option').each((i,v) => {jQuery(v).addClass(self.value_class+v.value)});
}
this.input.chosen({ this.input.chosen({
inherit_select_classes: true, inherit_select_classes: true,
search_contains: true, search_contains: true,

2
api/templates/default/etemplate2.css
View File

@ -1583,7 +1583,7 @@ div.message.floating {
border-left: 6px solid transparent; border-left: 6px solid transparent;
} }
.egwGridView_scrollarea tr.row_category > td:first-child, .egwGridView_scrollarea tr.row_category > td:first-child,
.select-cat li{ .select-cat li,.et2_selectbox .chzn-results li, .et2_selectbox ul.chzn-choices li.search-choice{
border-left: 6px solid transparent; border-left: 6px solid transparent;
} }
.et2_nextmatch .egwGridView_outer .egwGridView_scrollarea tbody tr.row_category td:first-child > div { .et2_nextmatch .egwGridView_outer .egwGridView_scrollarea tbody tr.row_category td:first-child > div {

4
pixelegg/css/modern.css
View File

@ -6761,7 +6761,9 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
filter: none; filter: none;
} }
.egwGridView_scrollarea tr.row_category > td:first-child, .egwGridView_scrollarea tr.row_category > td:first-child,
.select-cat li { .select-cat li,
.et2_selectbox .chzn-results li,
.et2_selectbox ul.chzn-choices li.search-choice {
border-left: 4px solid transparent; border-left: 4px solid transparent;
} }
.et2_taglist_category span[class*="cat_"] { .et2_taglist_category span[class*="cat_"] {

3
pixelegg/css/modern.less
View File

@ -198,7 +198,8 @@ div.dhtmlxMenu_egw_SubLevelArea_Polygon table.dhtmlxMebu_SubLevelArea_Tbl tr.sub
filter: none; filter: none;
} }
.egwGridView_scrollarea tr.row_category > td:first-child, .select-cat li { .egwGridView_scrollarea tr.row_category > td:first-child, .select-cat li,
.et2_selectbox .chzn-results li, .et2_selectbox ul.chzn-choices li.search-choice{
border-left: 4px solid transparent; border-left: 4px solid transparent;
} }