Merge pull request #351 from anaqreon/toggle-context-help

Toggle context help

4 files changed, 51 insertions, 48 deletions

diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index ccc24d2b3..877bcd840 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -67,50 +67,3 @@ function makeFullScreen(full) {
 		$('main').css({'transition': ''});
 	}
 }
-
-/* contextual help */
-$('.help-content').css('top', '-' + $('#help-content').height() + 'px')
-$(document).mouseup(function (e)
-{
-  e.preventDefault;
-
-  var container = $("#help-content");
-
-  if ((!container.is(e.target) // if the target of the click isn't the container...
-          && container.has(e.target).length === 0 // ... nor a descendant of the container
-          && container.hasClass('help-content-open'))
-          ||
-          (
-                  ($('#help_nav_btn').is(e.target) || $('#help_nav_btn').has(e.target).length !== 0)
-                  && container.hasClass('help-content-open')
-                  )) {
-    container.removeClass('help-content-open');
-    $('main').removeClass('help-content-open');
-    $('main').css('top', 'auto')
-  }
-  else if (($('#help_nav_btn').is(e.target) || $('#help_nav_btn').has(e.target).length !== 0)
-          && !container.hasClass('help-content-open')) {
-    $('#help-content').addClass('help-content-open');
-    $('main').removeClass('help-content-open');
-    var mainTop = $('#navbar-collapse-1').height();
-    if ($('#navbar-collapse-1').height() < $('#help-content').height()) {
-      mainTop = $('#help-content').height();
-    }
-
-    $('main').css('top', +mainTop + +50 + 'px');
-  }
-
-});
-
-var contextualHelpFocus = function (target, openSidePanel) {
-  if (openSidePanel) {
-    $("main").addClass('region_1-on');  // Open the side panel to highlight element 
-  } else {
-    $("main").removeClass('region_1-on');
-  }
-  // Animate the page scroll to the element and then pulse the element to direct attention
-  $('html,body').animate({scrollTop: $(target).offset().top - $('#navbar-collapse-1').height() - $('#help-content').height() - 50}, 'slow');
-  for (i = 0; i < 3; i++) {
-    $(target).fadeTo('slow', 0.1).fadeTo('slow', 1.0);
-  }
-}
\ No newline at end of file
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 54f625e0b..6b8729ee6 100755
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -49,6 +49,7 @@
     {{include file="field_input.tpl" field=$frontpage}}
     {{include file="field_checkbox.tpl" field=$mirror_frontpage}}
     {{include file="field_checkbox.tpl" field=$login_on_homepage}}
+    {{include file="field_checkbox.tpl" field=$enable_context_help}}
 	{{if $directory_server}}
 		{{include file="field_select.tpl" field=$directory_server}}
 	{{/if}}
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 90d741e96..0d70ac5be 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -189,7 +189,7 @@
 
 			{{if $nav.help}}
 				<li class="{{$sel.help}}">
-                                  <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="return false;"><i class="icon-question"></i></a>
+                                  <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="{{if $nav.help.6}}return false;{{/if}}"><i class="icon-question"></i></a>
 				</li>
                                 
 			<div id="help-content" class="help-content">
diff --git a/view/tpl/nav_header.tpl b/view/tpl/nav_header.tpl
new file mode 100644
index 000000000..5fce26317
--- /dev/null
+++ b/view/tpl/nav_header.tpl
@@ -0,0 +1,49 @@
+<script>
+  /* contextual help */
+  {{if $enable_context_help}}
+  $('.help-content').css('top', '-' + $('#help-content').height() + 'px')
+  $(document).mouseup(function (e)
+  {
+    e.preventDefault;
+
+    var container = $("#help-content");
+
+    if ((!container.is(e.target) // if the target of the click isn't the container...
+            && container.has(e.target).length === 0 // ... nor a descendant of the container
+            && container.hasClass('help-content-open'))
+            ||
+            (
+                    ($('#help_nav_btn').is(e.target) || $('#help_nav_btn').has(e.target).length !== 0)
+                    && container.hasClass('help-content-open')
+                    )) {
+      container.removeClass('help-content-open');
+      $('main').removeClass('help-content-open');
+      $('main').css('top', 'auto')
+    }
+    else if (($('#help_nav_btn').is(e.target) || $('#help_nav_btn').has(e.target).length !== 0)
+            && !container.hasClass('help-content-open')) {
+      $('#help-content').addClass('help-content-open');
+      $('main').removeClass('help-content-open');
+      var mainTop = $('#navbar-collapse-1').height();
+      if ($('#navbar-collapse-1').height() < $('#help-content').height()) {
+        mainTop = $('#help-content').height();
+      }
+
+      $('main').css('top', +mainTop + +50 + 'px');
+    }
+
+  });
+  {{/if}}
+  var contextualHelpFocus = function (target, openSidePanel) {
+    if (openSidePanel) {
+      $("main").addClass('region_1-on');  // Open the side panel to highlight element 
+    } else {
+      $("main").removeClass('region_1-on');
+    }
+    // Animate the page scroll to the element and then pulse the element to direct attention
+    $('html,body').animate({scrollTop: $(target).offset().top - $('#navbar-collapse-1').height() - $('#help-content').height() - 50}, 'slow');
+    for (i = 0; i < 3; i++) {
+      $(target).fadeTo('slow', 0.1).fadeTo('slow', 1.0);
+    }
+  }
+</script>
\ No newline at end of file