From 0463df62f0d7146b557ba881ac60b0a6916fefa6 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 23 Apr 2016 13:21:25 +0200 Subject: only display help button in collapsed panel if context help is enabled --- view/tpl/nav.tpl | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ff71c224d..2a6af3f6a 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -11,9 +11,11 @@ + {{if $nav.help.6}} - {{if $nav.help.6}}{{else}}{{/if}} + + {{/if}} {{if $userinfo}} {{$userinfo.name}} {{if $localuser}} @@ -191,7 +193,7 @@ {{/if}} {{if $nav.help}} -
  • {{if $nav.help.6}}{{else}}{{/if}}
    • {{/if}} -- cgit v1.2.3 From b0a2e5d3f70cb4c87f32cbee2f9ca6f30ebb22eb Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 23 Apr 2016 16:39:56 +0200 Subject: simplify context help js and move it to main.js where all the nav related js resides, do not close the context help if we click outside of it - members might want to work on something while help is open, move the link to /help to dropdown-menu. --- view/js/main.js | 26 +++++++++++++++++++++ view/theme/redbasic/css/style.css | 28 ++++++++++------------ view/tpl/nav.tpl | 14 +++++++---- view/tpl/nav_header.tpl | 49 --------------------------------------- 4 files changed, 47 insertions(+), 70 deletions(-) delete mode 100644 view/tpl/nav_header.tpl (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index 2813b3b19..748853939 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -443,6 +443,32 @@ function NavUpdate() { timer = setTimeout(NavUpdate, updateInterval); } +function contextualHelp() { + var container = $("#contextual-help-content"); + + if(container.hasClass('contextual-help-content-open')) { + container.removeClass('contextual-help-content-open'); + $('main').css('top', '') + } + else { + container.addClass('contextual-help-content-open'); + var mainTop = container.outerHeight(true); + $('main').css('top', mainTop + 'px'); + } +} + +function contextualHelpFocus(target, openSidePanel) { + if (openSidePanel) { + $("main").addClass('region_1-on'); // Open the side panel to highlight element + } + else { + $("main").removeClass('region_1-on'); + } + $('html,body').animate({ scrollTop: $(target).offset().top - $('nav').outerHeight(true) - $('#contextual-help-content').outerHeight(true)}, 'slow'); + for (i = 0; i < 3; i++) { + $(target).fadeTo('slow', 0.1).fadeTo('slow', 1.0); + } +} function updatePageItems(mode, data) { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5b8729111..bd5df5e63 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -201,29 +201,26 @@ header #banner #logo-text { } /* contextual help */ -.help-content { - background: $comment_item_colour; - color: $font_colour; +.contextual-help-content { + display: none; + +} + +.contextual-help-content-open { + display: block; position: fixed; - top: -50%; - left: 0px; - width: 100%; + top: 51px; max-height: 50%; + background: $comment_item_colour; padding: 20px; - /*transition: top 300ms cubic-bezier(0.17, 0.04, 0.03, 0.94);*/ - border-bottom: #CCC 1px solid; + border-bottom: #ccc 1px solid; overflow: auto; -} - -.help-content-open { - top: 51px; -moz-box-shadow: 0px 3px 3px rgba(0,0,0,0.2); -webkit-box-shadow: 0px 3px 3px rgba(0,0,0,0.2); box-shadow: 0px 3px 3px rgba(0,0,0,0.2); - /*transition: top 300ms cubic-bezier(0.17, 0.04, 0.03, 0.94);*/ } -.help-content dd { +.contextual-help-content dd { margin-bottom: 1em; } /* contextual help end */ @@ -1703,10 +1700,9 @@ nav .badge.mail-update:hover { #expand-aside, #expand-tabs, -#help_nav_btn_collapsed { +#context-help-btn { color: $nav_active_icon_colour; padding: 7px 10px; - text-decoration: none; } .nav-tabs.nav-justified { diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 2a6af3f6a..ca52fe066 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -12,9 +12,9 @@ {{if $nav.help.6}} - + {{/if}} {{if $userinfo}} {{$userinfo.name}} @@ -36,6 +36,10 @@
  • {{$nav.admin.1}}
    • {{/if}} + {{if $nav.help}} + +
  • {{$nav.help.1}}
    • + {{/if}} {{if $nav.logout}}
  • {{$nav.logout.1}}
    • @@ -194,15 +198,15 @@ {{if $nav.help}}
  • - {{if $nav.help.6}}{{else}}{{/if}} + {{if $nav.help.6}}{{else}}{{/if}}
    • {{/if}} {{if $nav.help.6}} -
    +
    {{$nav.help.5}} -

    Click here for more documentation...

    +
    {{/if}} diff --git a/view/tpl/nav_header.tpl b/view/tpl/nav_header.tpl deleted file mode 100644 index 27713b55b..000000000 --- a/view/tpl/nav_header.tpl +++ /dev/null @@ -1,49 +0,0 @@ - -- cgit v1.2.3 From 57110cbe76f7af4d0b3d2f83f9c59a1ba23a1697 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 23 Apr 2016 16:52:02 +0200 Subject: pull-right is not needed here --- view/tpl/nav.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ca52fe066..8cc4c2005 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -207,6 +207,6 @@ {{if $nav.help.6}}
    {{$nav.help.5}} - +
    {{/if}} -- cgit v1.2.3 From 78bf4564f20df20ec8d9025c974e25546e95bf69 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 23 Apr 2016 17:22:39 +0200 Subject: make the link to /help in dropdown conditional to the use of context help --- view/tpl/nav.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 8cc4c2005..03b48fd00 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -36,7 +36,7 @@
  • {{$nav.admin.1}}
    • {{/if}} - {{if $nav.help}} + {{if $nav.help.6}}
  • {{$nav.help.1}}
    • {{/if}} -- cgit v1.2.3 From 1e27038b737d47f90286d60a22e7a21bac0f3d04 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 23 Apr 2016 21:42:10 +0200 Subject: update jquery.textcomplete to version 1.3.4 and add minified version --- view/php/theme_init.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/php/theme_init.php b/view/php/theme_init.php index 648b144b3..7c020a51f 100644 --- a/view/php/theme_init.php +++ b/view/php/theme_init.php @@ -21,7 +21,7 @@ head_add_js('spin.js'); head_add_js('jquery.spin.js'); head_add_js('jquery.textinputs.js'); head_add_js('autocomplete.js'); -head_add_js('library/jquery-textcomplete/jquery.textcomplete.js'); +head_add_js('library/jquery-textcomplete/jquery.textcomplete.min.js'); //head_add_js('library/colorbox/jquery.colorbox.js'); head_add_js('library/jquery.timeago.js'); head_add_js('library/readmore.js/readmore.js'); -- cgit v1.2.3 From 9d698c08876169228b09e144f80c5311fcb0fa49 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 23 Apr 2016 23:52:39 +0200 Subject: fix context help position with narrow navbar --- view/theme/redbasic/css/narrow_navbar.css | 4 ++++ view/theme/redbasic/css/style.css | 1 + 2 files changed, 5 insertions(+) (limited to 'view') diff --git a/view/theme/redbasic/css/narrow_navbar.css b/view/theme/redbasic/css/narrow_navbar.css index 9d14beb33..2c0c7e133 100644 --- a/view/theme/redbasic/css/narrow_navbar.css +++ b/view/theme/redbasic/css/narrow_navbar.css @@ -56,4 +56,8 @@ top: 30px; right: 15px; } + + .contextual-help-content-open { + top: 32px; + } } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index bd5df5e63..31455cbdd 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1605,6 +1605,7 @@ nav ul li .notify-unseen } blockquote { + display: inline-block; font-size: $font_size; font-style: italic; border-left: 3px solid #ccc; -- cgit v1.2.3