Skip to content

Commit

Permalink
# Fixes for gallery JS of image field, also fixed display of hovering
Browse files Browse the repository at this point in the history 
tooltip (title/desc) and inline text
  • Loading branch information
@ggppdk
ggppdk committed Apr 30, 2015
1 parent b68073b commit 3010f5f
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 24 deletions.
23 changes: 13 additions & 10 deletions plugins/flexicontent_fields/fieldgroup/fieldgroup.php
View file
Expand Up @@ -597,6 +597,19 @@ function getGroupFields(&$field)
$db->setQuery($query);
$grouped_fields[$field->id] = $db->loadObjectList('id');

$_grouped_fields = array();
foreach($grouped_fields[$field->id] as $field_id => $grouped_field) {
// Create field parameters, if not already created, NOTEL: for 'custom' fields loadFieldConfig() is optional
if (empty($grouped_field->parameters)) {
$grouped_field->parameters = new JRegistry($grouped_field->attribs);
}

// Check if field is not set to participate in a field group and skip it
if ( !$grouped_field->parameters->get('use_ingroup') ) continue;
$_grouped_fields[$field_id] = $grouped_field;
}
$grouped_fields[$field->id] = $_grouped_fields;

return $grouped_fields[$field->id];
}

Expand All @@ -609,7 +622,6 @@ function getGroupFieldsValues(&$grouped_fields, &$item, &$max_count)
$item->fieldvalues = $itemmodel->getCustomFieldsValues($item->id);
}

$_grouped_fields = array();
foreach($grouped_fields as $field_id => $grouped_field)
{
// Set field values
Expand All @@ -622,16 +634,7 @@ function getGroupFieldsValues(&$grouped_fields, &$item, &$max_count)
// Update max value count
$value_count = is_array($grouped_field->value) ? count($grouped_field->value) : 0;
$max_count = $value_count > $max_count ? $value_count : $max_count;

// Create field parameters, if not already created, NOTEL: for 'custom' fields loadFieldConfig() is optional
if (empty($grouped_field->parameters)) {
$grouped_field->parameters = new JRegistry($grouped_field->attribs);
}

// Check if field is set to participate in a field group and include it
if ( $grouped_field->parameters->get('use_ingroup') ) $_grouped_fields[] = $grouped_field;
}
$grouped_fields = $_grouped_fields;

// Add empty values the the fields not having enough values
foreach($grouped_fields as $field_id => $grouped_field)
Expand Down
19 changes: 10 additions & 9 deletions plugins/flexicontent_fields/image/image.php
View file
Expand Up @@ -1070,6 +1070,7 @@ function onDisplayFieldValue(&$field, $item, $values=null, $prop='display')
// Hovering ToolTip configuration
// ******************************
$uselegend = $field->parameters->get( 'uselegend', 1 ) ;
$tip_class = FLEXI_J30GE ? ' hasTooltip' : ' hasTip';

// Enable/disable according to current view
$legendinview = $field->parameters->get('legendinview', array(FLEXI_ITEMVIEW,'category'));
Expand Down Expand Up @@ -1404,7 +1405,7 @@ function onDisplayFieldValue(&$field, $item, $values=null, $prop='display')
// Create a popup tooltip (legend)
$class = 'fc_field_image';
if ($uselegend && (!empty($title) || !empty($desc) ) ) {
$class .= FLEXI_J30GE ? ' hasTooltip' : ' hasTip';
$class .= $tip_class;
$legend = ' title="'.flexicontent_html::getToolTip($title, $desc, 0, 1).'"';
} else {
$legend = '';
Expand Down Expand Up @@ -1526,7 +1527,7 @@ function onDisplayFieldValue(&$field, $item, $values=null, $prop='display')
{
// Add inline display of title/desc
if ( ($showtitle && $title ) || ($showdesc && $desc) )
$inline_info = '<div class="fc_img_tooltip_data" style="float:left; margin-right:8px;'.$style.'" >';
$inline_info = '<div class="fc_img_tooltip_data alert alert-info" style="'.$style.'" >';

if ( $showtitle && $title )
$inline_info .= '<div class="fc_img_tooltip_title" style="line-height:1em; font-weight:bold;">'.$title.'</div>';
Expand Down Expand Up @@ -1582,7 +1583,7 @@ function onDisplayFieldValue(&$field, $item, $values=null, $prop='display')
// CASE: Link to URL that opens inside a popup via fancybox
$field->{$prop}[] = $pretext.'
<span class="fc_image_thumb" style="'.$style.'; cursor: pointer;" '.
'onclick="jQuery.fancybox.open([{ type: \'iframe\', href: \''.$urllink.'\', topRatio: 0.9, leftRatio: 0.9, title: \''.($desc ? $desc : $title).'\' }], { padding : 0});"
'onclick="jQuery.fancybox.open([{ type: \'iframe\', href: \''.$urllink.'\', topRatio: 0.9, leftRatio: 0.9, title: \''.($desc ? $title.': '.$desc : $title).'\' }], { padding : 0});"
>
'.$img_legend.'
</span>
Expand Down Expand Up @@ -1653,20 +1654,20 @@ function onDisplayFieldValue(&$field, $item, $values=null, $prop='display')
'<a style="'.$style.'" href="'.$srcl.'" id="mb'.$uniqueid.'" class="fc_image_thumb mb" '.$group_str.' >
'.$img_legend.'
</a>
<div class="multiBoxDesc mb'.$uniqueid.'">'.($desc ? $desc : $title).'</div>'
<div class="multiBoxDesc mb'.$uniqueid.'">'.($desc ? '<span class="badge">'.$title.'</span> '.$desc : $title).'</div>'
.$inline_info.$posttext;
break;
case 2: // Rokbox image popup
$title_attr = $desc ? $desc : $title;
$group_str = ''; // no support for image grouping
$field->{$prop}[] = $pretext.
'<a style="'.$style.'" href="'.$srcl.'" rel="rokbox['.$wl.' '.$hl.']" '.$group_str.' title="'.$title_attr.'" class="fc_image_thumb" data-rokbox data-rokbox-caption="'.$title_attr.'">
'.$img_nolegend.'
'.$img_legend.'
</a>'
.$inline_info.$posttext;
break;
case 3: // JCE popup image popup
$title_attr = $desc ? $desc : $title;
$title_attr = $desc ? $title.': '.$desc : $title; // does not support HTML
$group_str = $group_name ? 'rel="group['.$group_name.']"' : '';
$field->{$prop}[] = $pretext.
'<a style="'.$style.'" href="'.$srcl.'" class="fc_image_thumb jcepopup" '.$group_str.' title="'.$title_attr.'">
Expand All @@ -1675,11 +1676,11 @@ function onDisplayFieldValue(&$field, $item, $values=null, $prop='display')
.$inline_info.$posttext;
break;
case 4: // Fancybox image popup
$title_attr = $desc ? $desc : $title;
$title_attr = $desc ? '<span class=\'badge\'>'.$title.'</span> '.$desc : $title;
$group_str = $group_name ? 'data-fancybox-group="'.$group_name.'"' : '';
$field->{$prop}[] = $pretext.
'<a style="'.$style.'" href="'.$srcl.'" class="fc_image_thumb fancybox" '.$group_str.' title="'.$title_attr.'">
'.$img_nolegend.'
'.$img_legend.'
</a>'
.$inline_info.$posttext;
break;
Expand All @@ -1688,7 +1689,7 @@ function onDisplayFieldValue(&$field, $item, $values=null, $prop='display')
$group_str = $group_name ? 'data-spotlight-group="'.$group_name.'"' : '';
$field->{$prop}[] = $pretext.
'<a style="'.$style.'" href="'.$srcl.'" class="fc_image_thumb" data-lightbox="on" data-spotlight="effect:bottom" '.$group_str.' title="'.$title_attr.'">
'.$img_nolegend.'
'.$img_legend.'
<div class="overlay">
'.'<b>'.$title.'</b>: '.$desc.'
</div>
Expand Down
8 changes: 5 additions & 3 deletions plugins/flexicontent_fields/image/image.xml
View file
Expand Up @@ -118,8 +118,8 @@

<field name="" type="separator" default="FLEXI_FIELD_LINKTO_URL" description="FLEXI_FIELD_LINKTO_URL_DESC" level="level3" />
<field name="linkto_url" type="multilist" subtype="radio" default="0" label="FLEXI_ENABLE_PROPERTY" description="FLEXI_ENABLE_PROPERTY_DESC" toggle_related="1" class="btn-group btn-group-yesno">
<option value="0" show_list="" hide_list="img-link-url-mode">FLEXI_NO</option>
<option value="1" show_list="img-link-url-mode" hide_list="">FLEXI_YES</option>
<option value="0" show_list="img-link-nourl-mode" hide_list="img-link-url-mode">FLEXI_NO</option>
<option value="1" show_list="img-link-url-mode" hide_list="img-link-nourl-mode">FLEXI_YES</option>
</field>
<field name="url_target" type="list" default="_self" label="FLEXI_FIELD_URL_TARGET" description="FLEXI_FIELD_URL_TARGET_DESC" depend_class="img-link-url-mode" >
<option value="_self">FLEXI_FIELD_SAME_FRM_WIN_TAB</option>
Expand Down Expand Up @@ -215,10 +215,12 @@
</field>

<field name="" type="separator" default="FLEXI_IMGFIELD_THUMBNAILS_LIST" level="level3" />
<field name="usepopup" type="radio" default="1" label="FLEXI_FIELD_IMAGE_THUBMNAILS_ADD_JS_GALLERY" description="FLEXI_FIELD_IMAGE_THUBMNAILS_ADD_JS_GALLERY_DESC" class="btn-group btn-group-yesno">
<field name="usepopup" type="radio" default="1" label="FLEXI_FIELD_IMAGE_THUBMNAILS_ADD_JS_GALLERY" description="FLEXI_FIELD_IMAGE_THUBMNAILS_ADD_JS_GALLERY_DESC" class="btn-group btn-group-yesno" depend_class="img-link-nourl-mode">
<option value="0">FLEXI_NO</option>
<option value="1">FLEXI_YES</option>
</field>
<field name="usepopup_disabled" type="separator" label="" default="Gallery navigation JS has been disabled, because parameter 'Link to URL' was enabled" description="..." class="alert fcpadded" depend_class="img-link-url-mode" />

<field name="popupinview" type="fccheckbox" default=""
checkoptions="FLEXI_ITEMS,FLEXI_CATEGORY,FLEXI_MODULE,FLEXI_BACKEND" checkvals="item,category,module,backend" defaultvals="item,category,module,backend"
label="FLEXI_FIELD_ENABLE_IN_VIEWS" description="FLEXI_FIELD_ENABLE_IN_VIEWS_DESC" />
Expand Down
4 changes: 2 additions & 2 deletions site/librairies/elastislide/css/elastislide.css
View file
@@ -1,7 +1,7 @@
/* Elastislide Style */
.es-carousel-wrapper{
background: #101010;
padding:10px 27px;
padding:0px 27px;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
border-radius: 10px;
Expand All @@ -10,7 +10,7 @@
-webkit-box-shadow:0px 1px 3px rgba(0, 0, 0, 0.9);
box-shadow:0px 1px 3px rgba(0, 0, 0, 0.9);
position:relative;
margin-bottom:20px;
margin-bottom: 4px;
}
.es-carousel{
overflow:hidden;
Expand Down

0 comments on commit 3010f5f

Please sign in to comment.