diff options
| author | Silvio <silvio@socioambiental.org> | 2013-06-25 15:51:16 -0300 |
|---|---|---|
| committer | Silvio <silvio@socioambiental.org> | 2013-06-25 15:51:16 -0300 |
| commit | dce6099e6d78b79ff3413a6d9a61d9c526510e52 (patch) | |
| tree | 99d161b2ffe1866de3f379e47a4b1655e2fa9edb | |
| parent | 4076881c589a77002133e59777e97d7a62d8f7af (diff) | |
| parent | a30692d0e8b4c2fb551b3742f468d5ad0a94e9e9 (diff) | |
| download | timelinejs-dce6099e6d78b79ff3413a6d9a61d9c526510e52.tar.gz timelinejs-dce6099e6d78b79ff3413a6d9a61d9c526510e52.tar.bz2 | |
Merge branch 'master' into tags
| -rw-r--r-- | timelinejs.module | 11 | ||||
| -rw-r--r-- | timelinejs.tpl.php | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/timelinejs.module b/timelinejs.module index 9fd4791..fbb2caf 100644 --- a/timelinejs.module +++ b/timelinejs.module @@ -197,11 +197,12 @@ function timelinejs($nid, $width = '960px', $height = '500px') { $css = (file_exists($theme_path .'/timeline.css')) ? '/'. $theme_path .'/timeline.css' : '/'. $library_path .'/compiled/css/timeline.css'; return theme('timelinejs', array( - 'width' => $width, - 'height' => $height, - 'source' => $base_url .'/timelinejs/json/'. (int) $nid, - 'css' => $css, - 'lang' => $library_path .'/compiled/js/locale/'. $language->language .'.js', + 'width' => $width, + 'height' => $height, + 'source' => $base_url .'/timelinejs/json/'. (int) $nid, + 'css' => $css, + 'lang' => '/'. $library_path .'/compiled/js/locale/'. $language->language .'.js', + 'library_path' => $library_path, )); } diff --git a/timelinejs.tpl.php b/timelinejs.tpl.php index 1dc3aed..cd8a846 100644 --- a/timelinejs.tpl.php +++ b/timelinejs.tpl.php @@ -12,5 +12,5 @@ lang: '<?php print $lang; ?>' } </script> -<script type="text/javascript" src="/sites/all/libraries/timelinejs/compiled/js/timeline-embed.js"></script> +<script type="text/javascript" src="/<?php print $library_path; ?>/compiled/js/timeline-embed.js"></script> <!-- END Timeline Embed --> |