Skip to content

Commit

Permalink
Few little fixes to slideshow viz
Browse files Browse the repository at this point in the history
  • Loading branch information
cheesegrits committed Feb 9, 2015
1 parent 0d7eb21 commit a1303ca
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
6 changes: 6 additions & 0 deletions plugins/fabrik_visualization/slideshow/forms/fields.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
<form>
<fields name="params">
<fieldset name="thisoptions">

<field name="slideshow_viz_layout"
type="fabriktemplate"
directory="/plugins/fabrik_visualization/slideshow/views/slideshow/"
label="PLG_VISUALIZATION_SLIDESHOW_TEMPLATE_LABEL"
/>

<field default="1" description="PLG_VISUALIZATION_SLIDESHOW_TYPE_DESC" label="PLG_VISUALIZATION_SLIDESHOW_TYPE_LABEL" name="slideshow_viz_type" type="list">
<option value="1">PLG_VISUALIZATION_SLIDESHOW_NORMAL</option>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ PLG_VISUALIZATION_SLIDESHOW_PAN_LABEL="Pan"
PLG_VISUALIZATION_SLIDESHOW_PUSH="Push"
PLG_VISUALIZATION_SLIDESHOW_TABLE_DESC="The Table where the image names are stored. This will usually be a Fabrik table with an upload element on it, joined to this form's table with a join element."
PLG_VISUALIZATION_SLIDESHOW_TABLE_LABEL="Image Table"
PLG_VISUALIZATION_SLIDESHOW_TEMPLATE_LABEL="Template"
PLG_VISUALIZATION_SLIDESHOW_THUMBNAILS_DESC="Show scrollable thumbnail list under the main image. If yes, your thumbs must be stored in a subfolder called 'thumbs' (within the folder the main image is stored in), with the thumbnail file having the same name as the main image. This would usually be achieved by setting the Create Thumbnail options accordingly on a Fabrik file upload element."
PLG_VISUALIZATION_SLIDESHOW_THUMBNAILS_LABEL="Use Thumbnails"
PLG_VISUALIZATION_SLIDESHOW_TYPE_DESC="Type of slideshow to use, choices are currently normal and Ken Burns effect (pan/zoom). Other types may be added in the future."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,6 @@ public function display($tpl = 'default')
$this->filterFormURL = $this->get('FilterFormURL');
$this->params = $model->getParams();
$this->containerId = $this->get('ContainerId');
$tpl = $params->get('slideshow_viz_layout', $tpl);
$tmplpath = $model->pathBase . 'slideshow/views/slideshow/tmpl/' . $tpl;
$this->_setPath('template', $tmplpath);
$srcs[] = 'media/com_fabrik/js/listfilter.js';

if ($this->get('RequiredFiltersFound'))
Expand Down Expand Up @@ -95,7 +92,8 @@ public function display($tpl = 'default')
FabrikHelperHTML::script($srcs, $this->js);

$tpl = $j3 ? 'bootstrap' : 'default';
$tmplpath = JPATH_ROOT . '/plugins/fabrik_visualization/slideshow/views/slideshow/tmpl/' . $tpl;
$tpl = $params->get('slideshow_viz_layout', $tpl);
$tmplpath = $model->pathBase . 'slideshow/views/slideshow/tmpl/' . $tpl;
$this->_setPath('template', $tmplpath);
FabrikHelperHTML::stylesheetFromPath('plugins/fabrik_visualization/slideshow/views/slideshow/tmpl/' . $tpl . '/template.css');
echo parent::display();
Expand Down

0 comments on commit a1303ca

Please sign in to comment.