summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--user_guide_src/source/_themes/sphinx_rtd_theme/static/js/theme.js29
-rw-r--r--user_guide_src/source/tutorial/static_pages.rst2
2 files changed, 17 insertions, 14 deletions
diff --git a/user_guide_src/source/_themes/sphinx_rtd_theme/static/js/theme.js b/user_guide_src/source/_themes/sphinx_rtd_theme/static/js/theme.js
index 081d77bdf..911dad29b 100644
--- a/user_guide_src/source/_themes/sphinx_rtd_theme/static/js/theme.js
+++ b/user_guide_src/source/_themes/sphinx_rtd_theme/static/js/theme.js
@@ -22,31 +22,34 @@ $(document).ready(function () {
$('#openToc').click(function () {
$('#nav').slideToggle();
});
- $('#closeMe').toggle(
- function ()
- {
+ $('#closeMe').click(function () {
+ if (getCookie('ciNav') != 'yes') {
setCookie('ciNav', 'yes', 365);
+ } else {
+ setCookie('ciNav', 'no', 365);
+ }
+ tocFlip();
+ });
+ var tocFlip = function(){
+ if (getCookie('ciNav') == 'yes') {
$('#nav2').show();
$('#topMenu').remove();
- $('body').css({background: 'none'});
- $('.wy-nav-content-wrap').css({background: 'none', 'margin-left': 0});
+ $('body').css({ background: 'none' });
+ $('.wy-nav-content-wrap').css({ background: 'none', 'margin-left': 0 });
$('.wy-breadcrumbs').append('<div style="float:right;"><div style="float:left;" id="topMenu">' + $('.wy-form').parent().html() + '</div></div>');
$('.wy-nav-side').toggle();
- },
- function ()
- {
- setCookie('ciNav', 'no', 365);
+ } else {
$('#topMenu').remove();
$('#nav').hide();
$('#nav2').hide();
- $('body').css({background: '#edf0f2;'});
- $('.wy-nav-content-wrap').css({background: 'none repeat scroll 0 0 #fcfcfc;', 'margin-left': '300px'});
+ $('body').css({ background: '#edf0f2;' });
+ $('.wy-nav-content-wrap').css({ background: 'none repeat scroll 0 0 #fcfcfc;', 'margin-left': '300px' });
$('.wy-nav-side').show();
}
- );
+ };
if (getCookie('ciNav') == 'yes')
{
- $('#closeMe').trigger('click');
+ tocFlip();
//$('#nav').slideToggle();
}
// END MODIFICATION ---
diff --git a/user_guide_src/source/tutorial/static_pages.rst b/user_guide_src/source/tutorial/static_pages.rst
index 5daaa958f..561082a48 100644
--- a/user_guide_src/source/tutorial/static_pages.rst
+++ b/user_guide_src/source/tutorial/static_pages.rst
@@ -162,7 +162,7 @@ arguments.
More information about routing can be found in the URI Routing
:doc:`documentation <../general/routing>`.
-Here, the second rule in the ``$routes`` array matches **any** request
+Here, the second rule in the ``$route`` array matches **any** request
using the wildcard string ``(:any)``. and passes the parameter to the
``view()`` method of the ``Pages`` class.