aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-04-21 23:03:09 +0200
committerMario Vavti <mario@mariovavti.com>2016-04-21 23:03:09 +0200
commitd7f4bfedd5164596504d17b1ef4b8597a1304d98 (patch)
treeac790232f1816b74d510c5da2483b8f196386e25 /view/tpl
parent391ed8655ebf25c2feb6cef59970778b99351df8 (diff)
downloadvolse-hubzilla-d7f4bfedd5164596504d17b1ef4b8597a1304d98.tar.gz
volse-hubzilla-d7f4bfedd5164596504d17b1ef4b8597a1304d98.tar.bz2
volse-hubzilla-d7f4bfedd5164596504d17b1ef4b8597a1304d98.zip
some fixes for contextual help and disable transition animation for now - it looked really wired because main moved with a different speed than help-content and help-content can not be displayed under the panel as it is implemented now.
Diffstat (limited to 'view/tpl')
-rwxr-xr-xview/tpl/nav.tpl22
-rw-r--r--view/tpl/nav_header.tpl10
2 files changed, 18 insertions, 14 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 0d70ac5be..8fc6279d3 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -1,4 +1,4 @@
-<div class="container-fluid">
+ <div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
<span class="icon-bar"></span>
@@ -11,6 +11,9 @@
<button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1">
<i class="icon-circle-arrow-right" id="expand-aside-icon"></i>
</button>
+ <a class="navbar-toggle" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="help-btn"{{if $nav.help.6}} onclick="return false;"{{/if}}>
+ <i class="icon-question"></i>
+ </a>
{{if $userinfo}}
<img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret" id="usermenu-caret"></span>
{{if $localuser}}
@@ -188,15 +191,16 @@
{{/if}}
{{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="{{if $nav.help.6}}return false;{{/if}}"><i class="icon-question"></i></a>
- </li>
-
- <div id="help-content" class="help-content">
- {{$nav.help.5}}
- <p class="pull-right"><a href="{{$nav.help.0}}">Click here for more documentation...</a></p>
- </div>
+ <li class="{{$sel.help}}" class="hidden-xs">
+ <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"{{if $nav.help.6}} onclick="return false;"{{/if}}><i class="icon-question"></i></a>
+ </li>
{{/if}}
</ul>
</div>
</div>
+ {{if $nav.help.6}}
+ <div id="help-content" class="help-content">
+ {{$nav.help.5}}
+ <p class="pull-right"><a href="{{$nav.help.0}}">Click here for more documentation...</a></p>
+ </div>
+ {{/if}}
diff --git a/view/tpl/nav_header.tpl b/view/tpl/nav_header.tpl
index 5fce26317..be990765c 100644
--- a/view/tpl/nav_header.tpl
+++ b/view/tpl/nav_header.tpl
@@ -18,18 +18,18 @@
)) {
container.removeClass('help-content-open');
$('main').removeClass('help-content-open');
- $('main').css('top', 'auto')
+ $('main').css('top', '')
}
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();
+ if ($('#navbar-collapse-1').outerHeight(true) < $('#help-content').height()) {
+ mainTop = $('#help-content').outerHeight(true);
}
- $('main').css('top', +mainTop + +50 + 'px');
+ $('main').css('top', mainTop + 'px');
}
});
@@ -46,4 +46,4 @@
$(target).fadeTo('slow', 0.1).fadeTo('slow', 1.0);
}
}
-</script> \ No newline at end of file
+</script>