summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSilvio <silvio@socioambiental.org>2013-06-26 17:55:23 -0300
committerSilvio <silvio@socioambiental.org>2013-06-26 17:55:23 -0300
commit8ea5c71c9aa386d858b602fd20717d1b15e8dc59 (patch)
treea4371b111e6fc14c021c3793cc535378433fa868
parented96b9b69718246532196f03c0f3bf17545ef299 (diff)
downloadtimelinejs-8ea5c71c9aa386d858b602fd20717d1b15e8dc59.tar.gz
timelinejs-8ea5c71c9aa386d858b602fd20717d1b15e8dc59.tar.bz2
Adding font parameter
-rw-r--r--timelinejs.module2
-rw-r--r--timelinejs.tpl.php3
2 files changed, 4 insertions, 1 deletions
diff --git a/timelinejs.module b/timelinejs.module
index 30c6e92..0fef214 100644
--- a/timelinejs.module
+++ b/timelinejs.module
@@ -55,6 +55,7 @@ function timelinejs_theme($existing, $type, $theme, $path) {
'hash_bookmark' => 'true',
'css' => NULL,
'js' => '/'. timelinejs_library_path() .'/compiled/js/timeline.js',
+ 'font' => NULL,
'lang' => NULL,
),
),
@@ -240,6 +241,7 @@ function timelinejs($nid = NULL, $width = '960px', $height = '500px') {
'css' => $css,
'js' => '/'. $library_path .'/compiled/js/timeline-min.js',
'lang' => '/'. $library_path .'/compiled/js/locale/'. $language->language .'.js',
+ 'font' => variable_get('timelinejs_font', 'Bevan-PotanoSans'),
'library_path' => $library_path,
));
}
diff --git a/timelinejs.tpl.php b/timelinejs.tpl.php
index f5219d8..eeb2f97 100644
--- a/timelinejs.tpl.php
+++ b/timelinejs.tpl.php
@@ -9,8 +9,9 @@
hash_bookmark: <?php print $hash_bookmark; ?>,
css: "<?php print $css; ?>",
js: "<?php print $js; ?>",
+ font: "<?php print $font; ?>",
lang: "<?php print $lang; ?>"
}
</script>
- <script type="text/javascript" src="/<?php print $library_path; ?>/compiled/js/storyjs-embed.js"></script>
+<script type="text/javascript" src="/<?php print $library_path; ?>/compiled/js/storyjs-embed.js"></script>
<!-- END Timeline Embed -->