extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:EGroupware/egroupware

Browse Source
This commit is contained in:
Ralf Becker 2016-05-14 13:00:18 +02:00
commit 2d69c1b28b
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/js/etemplate/et2_widget_link.js
View File

@ -663,7 +663,7 @@ var et2_link_entry = (function(){ "use strict"; return et2_inputWidget.extend(
item.label = extra.label ? extra.label : extra; item.label = extra.label ? extra.label : extra;
if(extra['style.backgroundColor'] || extra.color) if(extra['style.backgroundColor'] || extra.color)
{ {
li.css('backgroundColor', extra.color ? extra.color : extra['style.backgroundColor']); li.css({'border-left': '5px solid ' + (extra.color ? extra.color : extra['style.backgroundColor'])});
} }
// Careful with this, some browsers may have trouble loading all at once, which can slow display // Careful with this, some browsers may have trouble loading all at once, which can slow display
if(extra.icon) if(extra.icon)
@ -682,7 +682,7 @@ var et2_link_entry = (function(){ "use strict"; return et2_inputWidget.extend(
// Normal stuff // Normal stuff
li.append(jQuery( "<a></a>" ).text( item.label )) li.append(jQuery( "<a></a>" ).text( item.label ))
.appendTo(ul); .appendTo(ul);
window.setTimeout(function(){ul.toggleClass('ui-menu-rtl',(ul.offset().left + ul.width() > window.outerWidth))}, 300);
return li; return li;
}; };

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

@ -704,8 +704,11 @@ div.et2_link_entry select {
width: 40%; width: 40%;
margin-right: 10px; margin-right: 10px;
} }
div.et2_link_entry .ui-autocomplete.ui-menu.ui-menu-rtl {left:auto !important;right:0px;}
div.et2_link_entry .ui-autocomplete.ui-menu .ui-menu-item {border-left:5px solid transparent;}
div.et2_link_entry input.ui-autocomplete-input { div.et2_link_entry input.ui-autocomplete-input {
padding-bottom: 1px; padding-bottom: 1px;
width: calc(60% - 10px);
} }
.et2_link_entry.no_app input.ui-autocomplete-input { .et2_link_entry.no_app input.ui-autocomplete-input {
width: 100%; width: 100%;