Merge branch 'master' of https://github.com/redmatrix/redmatrix

3 files changed, 59 insertions, 5 deletions

diff --git a/include/comanche.php b/include/comanche.php
index 7115b5635..f385f3c5a 100644
--- a/include/comanche.php
+++ b/include/comanche.php
@@ -101,11 +101,22 @@ function comanche_parser(&$a, $s, $pass = 0) {
 }
 
 
-function comanche_menu($name, $class = '') {
+function comanche_menu($s, $class = '') {
+
 	$channel_id = comanche_get_channel_id();
+	$name = $s;
+
+	$cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER);
+	if($cnt) {
+		foreach($matches as $mtch) {
+			$var[$mtch[1]] = $mtch[2];
+			$name = str_replace($mtch[0], '', $name);
+		}
+	}
+
 	if($channel_id) {
 		$m = menu_fetch($name,$channel_id, get_observer_hash());
-		return menu_render($m, $class);
+		return menu_render($m, $class, $edit = false, $var);
 	}
 }
 
@@ -168,6 +179,33 @@ function comanche_block($s, $class = '') {
 	return $o;
 }
 
+function comanche_js($s) {
+
+	switch($s) {
+		case 'jquery':
+			$path = 'view/js/jquery.js';
+			break;
+		case 'bootstrap':
+			$path = 'library/bootstrap/js/bootstrap.min.js';
+			break;
+	}
+
+	return '<script src="' . z_root() . '/' . $path . '" ></script>';
+
+}
+
+function comanche_css($s) {
+
+	switch($s) {
+		case 'bootstrap':
+			$path = 'library/bootstrap/css/bootstrap.min.css';
+			break;
+	}
+
+	return '<link rel="stylesheet" href="' . z_root() . '/' . $path . '" type="text/css" media="screen">';
+
+}
+
 // This doesn't really belong in Comanche, but it could also be argued that it is the perfect place.
 // We need to be able to select what kind of template and decoration to use for the webpage at the heart of our content.
 // For now we'll allow an '[authored]' element which defaults to name and date, or 'none' to remove these, and perhaps
@@ -246,6 +284,19 @@ function comanche_region(&$a, $s) {
 		}
 	}
 
+	$cnt = preg_match_all("/\[js\](.*?)\[\/js\]/ism", $s, $matches, PREG_SET_ORDER);
+	if($cnt) {
+		foreach($matches as $mtch) {
+			$s = str_replace($mtch[0],comanche_js(trim($mtch[1])),$s);
+		}
+	}
+
+	$cnt = preg_match_all("/\[css\](.*?)\[\/css\]/ism", $s, $matches, PREG_SET_ORDER);
+	if($cnt) {
+		foreach($matches as $mtch) {
+			$s = str_replace($mtch[0],comanche_css(trim($mtch[1])),$s);
+		}
+	}
 	// need to modify this to accept parameters
 
 	$cnt = preg_match_all("/\[widget=(.*?)\](.*?)\[\/widget\]/ism", $s, $matches, PREG_SET_ORDER);
diff --git a/include/menu.php b/include/menu.php
index b4f4555a5..a2e91f7ed 100644
--- a/include/menu.php
+++ b/include/menu.php
@@ -24,7 +24,7 @@ function menu_fetch($name,$uid,$observer_xchan) {
 	return null;
 }
 	
-function menu_render($menu, $class='', $edit = false) {
+function menu_render($menu, $class='', $edit = false, $var = '') {
 
 	if(! $menu)
 		return '';
@@ -37,12 +37,15 @@ function menu_render($menu, $class='', $edit = false) {
 		$menu['items'][$x]['mitem_desc'] = bbcode($menu['items'][$x]['mitem_desc']);
 	}
 
+	$wrap = (($var['wrap'] === 'none') ? false : true);
+
 	return replace_macros(get_markup_template('usermenu.tpl'),array(
 		'$menu' => $menu['menu'],
 		'$class' => $class,
 		'$edit' => (($edit) ? t("Edit") : ''),
 		'$id' => $menu['menu']['menu_id'],
-		'$items' => $menu['items']
+		'$items' => $menu['items'],
+		'$wrap' => $wrap
 	));
 }
 
diff --git a/include/nav.php b/include/nav.php
index 1134d1b48..77287c021 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -124,7 +124,7 @@ EOT;
 
 	if($observer) {
 			$userinfo = array(
-			'icon' => $observer['xchan_photo_s'],
+			'icon' => $observer['xchan_photo_m'],
 			'name' => $observer['xchan_addr'],
 		);
 	}