IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2024-12-25 08:21:05 -06:00
Code Issues Packages Projects Releases Wiki Activity

Improved calculation of max pkey length in facet header

Browse Source 
Very long pkeys in facet header were limited to 60 characters. This magic number was good enough but with new action lists it isn't.

This patch is adding calculation of maximum characters for pkey in facet header. It fixes regression introduced by Action Lists and also it uses effectively available space.

Also this patch is changing limiting of breadcrumbs element to use as much space as possible. It works in three steps. First a threshold is set which is equal to length average. Then a total length of keys with length less than threshold is calculated. From this we can get remaining space for long keys and calculate new threshold. At last keys are limited to new threshold.

https://fedorahosted.org/freeipa/ticket/2247

f
This commit is contained in:
Petr Vobornik 2012-05-03 14:42:01 +02:00
parent 69877296dc
commit 77f2f87fe5
1 changed files with 55 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
install/ui/facet.js
View File

@ -369,17 +369,21 @@ IPA.facet_header = function(spec) {
if (!value) return;
var limited_value = IPA.limit_text(value, 60);
var key, i;
var pkey_max = that.get_max_pkey_length();
var limited_value = IPA.limit_text(value, pkey_max);
if (!that.facet.disable_breadcrumb) {
var breadcrumb = [];
var keys = [];
var entity = that.facet.entity.get_containing_entity();
while (entity) {
key = IPA.nav.get_state(entity.name+'-pkey');
breadcrumb.unshift($('<a/>', {
'class': 'breadcrumb-element',
text: IPA.nav.get_state(entity.name+'-pkey'),
text: key,
title: entity.metadata.label_singular,
click: function(entity) {
return function() {
@ -390,17 +394,34 @@ IPA.facet_header = function(spec) {
}));
entity = entity.get_containing_entity();
keys.unshift(key);
}
//calculation of breadcrumb keys length
keys.push(value);
var max_bc_l = 140; //max chars which can fit on one line
var max_key_l = (max_bc_l / keys.length) - 4; //4 chars as divider
var bc_l = 0;
var to_limit = keys.length;
//count how many won't be limited and how much space they take
for (i=0; i<keys.length; i++) {
var key_l = keys[i].length;
if (key_l <= max_key_l) {
to_limit--;
bc_l += key_l + 4;
}
}
max_key_l = ((max_bc_l - bc_l) / to_limit) - 4;
that.path.empty();
var key_max_lenght = 60 / breadcrumb.length;
for (var i=0; i<breadcrumb.length; i++) {
for (i=0; i<breadcrumb.length; i++) {
var item = breadcrumb[i];
var entity_key = item.text();
var limited_entity_key = IPA.limit_text(entity_key, key_max_lenght);
item.text(limited_entity_key);
key = IPA.limit_text(keys[i], max_key_l);
item.text(key);
that.path.append(' &raquo; ');
that.path.append(item);
@ -408,10 +429,12 @@ IPA.facet_header = function(spec) {
that.path.append(' &raquo; ');
key = IPA.limit_text(keys[i], max_key_l);
$('<span>', {
'class': 'breadcrumb-element',
title: value,
text: limited_value
text: key
}).appendTo(that.path);
}
@ -580,6 +603,29 @@ IPA.facet_header = function(spec) {
that.adjust_elements();
};
that.get_max_pkey_length = function() {
var label_w, max_pkey_w, max_pkey_l, al, al_w, icon_w, char_w, container_w;
container_w = that.container.width();
icon_w = that.title_widget.icon.width();
label_w = that.title_widget.title.width();
char_w = label_w / that.title_widget.title.text().length;
max_pkey_w = container_w - icon_w - label_w;
max_pkey_w -= 10; //some space correction to be safe
if (that.action_list) {
al = that.action_list.container;
al_w = al.width();
max_pkey_w -= al_w;
}
max_pkey_l = Math.ceil(max_pkey_w / char_w);
return max_pkey_l;
};
that.adjust_elements = function() {
if (that.action_list) {