From 479541b5f804b3d7f4b955ff00715cbc7232d86c Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 6 Jan 2013 22:00:31 -0800
Subject: more work on notification popup

---
 view/theme/redbasic/php/theme.php | 5 ++++-
 view/tpl/nav.tpl                  | 5 +++--
 view/tpl/smarty3/main_slider.tpl  | 4 ++--
 view/tpl/smarty3/nav.tpl          | 5 +++--
 4 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'view')

diff --git a/view/theme/redbasic/php/theme.php b/view/theme/redbasic/php/theme.php
index 52e571f0a..3d69a7e22 100644
--- a/view/theme/redbasic/php/theme.php
+++ b/view/theme/redbasic/php/theme.php
@@ -1,6 +1,9 @@
 <?php
 
 function redbasic_init(&$a) {
-	$a->set_template_engine('smarty3');
+	if($a->config['system']['theme_engine'])
+		$a->set_template_engine($a->config['system']['theme_engine']);
+	else
+		$a->set_template_engine('smarty3');
 //	head_add_js('redbasic.js');
 }
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index f8f9e1c06..57af0fa36 100644
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -49,9 +49,10 @@
 
 	{{ if $nav.notifications }}
 
-		<li id="nav-notifications-linkmenu" class="nav-menu fakelink" onclick="notify_popup('notify'); return false;" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
+		<li id="nav-notifications-linkmenu" class="nav-menu fakelink">
+			<a  rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
 			<span id="notify-update" class="nav-notify"></span>
-			<ul id="nav-notifications-menu" class="menu-popup">
+			<ul id="nav-notifications-menu" class="menu-popup" rel="notify">
 				<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
 				<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
 				<li class="empty">$emptynotifications</li>
diff --git a/view/tpl/smarty3/main_slider.tpl b/view/tpl/smarty3/main_slider.tpl
index 04ce72733..7fa812ada 100644
--- a/view/tpl/smarty3/main_slider.tpl
+++ b/view/tpl/smarty3/main_slider.tpl
@@ -2,8 +2,8 @@
 <script>
 	$("#main-range").slider({ from: 0, to: 99, step: 1, scale: ['{{$me}}', '|', '{{$intimate}}', '|', '{{$friends}}', '|', '{{$oldfriends}}', '|', '{{$acquaintances}}', '|', '{{$world}}' ], onstatechange: function(v) { 
 	var carr = v.split(";"); 
-	network_cmin = carr[0]; 
-	network_cmax = carr[1];
+	bParam_cmin = carr[0]; 
+	bParam_cmax = carr[1];
 	networkRefresh();
  } });
 
diff --git a/view/tpl/smarty3/nav.tpl b/view/tpl/smarty3/nav.tpl
index 6fb0343bc..8fa24d614 100644
--- a/view/tpl/smarty3/nav.tpl
+++ b/view/tpl/smarty3/nav.tpl
@@ -49,9 +49,10 @@
 
 	{{if $nav.notifications}}
 
-		<li id="nav-notifications-linkmenu" class="nav-menu fakelink" onclick="notify_popup('notify'); return false;" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a>
+		<li id="nav-notifications-linkmenu" class="nav-menu fakelink">
+			<a  rel="#nav-notifications-menu" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a>
 			<span id="notify-update" class="nav-notify"></span>
-			<ul id="nav-notifications-menu" class="menu-popup">
+			<ul id="nav-notifications-menu" class="menu-popup" rel="notify">
 				<li id="nav-notifications-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li>
 				<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
 				<li class="empty">{{$emptynotifications}}</li>
-- 
cgit v1.2.3