diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-05-23 15:10:18 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-05-23 15:10:18 -0700 |
| commit | 45259fed14062bd73b8b2ca78ad267b32cb54f7b (patch) | |
| tree | 34a36d001fdf87874490312810b13d5f502f72cf /include | |
| parent | ee146578637f28a1b65ee3538935d2f4352381b2 (diff) | |
| parent | f575ef551d5c22953080faab5890b675c6e0985e (diff) | |
| download | volse-hubzilla-45259fed14062bd73b8b2ca78ad267b32cb54f7b.tar.gz volse-hubzilla-45259fed14062bd73b8b2ca78ad267b32cb54f7b.tar.bz2 volse-hubzilla-45259fed14062bd73b8b2ca78ad267b32cb54f7b.zip | |
Merge https://github.com/redmatrix/redmatrix into pending_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/comanche.php | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/include/comanche.php b/include/comanche.php index 93cbd8b12..9fe7dc255 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -175,12 +175,12 @@ function comanche_block($s, $class = '') { } if($r[0]['title'] && trim($r[0]['title']) === '$content' && get_app()->data['webpage'][0]['title']) { - $o .= '<h3>' . get_app()->data['webpage'][0]['title'] . '</h3>'; + $o .= '<h3>' . get_app()->page['title'] . '</h3>'; } if(trim($r[0]['body']) === '$content') { - $o .= prepare_text(get_app()->data['webpage'][0]['body'], get_app()->data['webpage'][0]['mimetype']); + $o .= prepare_text(get_app()->page['content'], get_app()->data['webpage'][0]['mimetype']); } else { $o .= prepare_text($r[0]['body'], $r[0]['mimetype']); @@ -202,9 +202,17 @@ function comanche_js($s) { case 'bootstrap': $path = 'library/bootstrap/js/bootstrap.min.js'; break; + case 'foundation': + $path = 'library/foundation/js/foundation.min.js'; + $init = "\r\n" . '<script>$(document).ready(function() { $(document).foundation(); });</script>'; + break; } - return '<script src="' . z_root() . '/' . $path . '" ></script>'; + $ret = '<script src="' . z_root() . '/' . $path . '" ></script>'; + if($init) + $ret .= $init; + + return $ret; } @@ -214,9 +222,14 @@ function comanche_css($s) { case 'bootstrap': $path = 'library/bootstrap/css/bootstrap.min.css'; break; + case 'foundation': + $path = 'library/foundation/css/foundation.min.css'; + break; } - return '<link rel="stylesheet" href="' . z_root() . '/' . $path . '" type="text/css" media="screen">'; + $ret = '<link rel="stylesheet" href="' . z_root() . '/' . $path . '" type="text/css" media="screen">'; + + return $ret; } |