harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/redmatrix/hubzilla into help-content

Browse Source
This commit is contained in:
Andrew Manning 2016-04-23 07:36:06 -04:00
commit f3eae7132f
4 changed files with 10243 additions and 9998 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
version.inc
View File

@ -1 +1 @@
2016-04-22.1374H 2016-04-23.1375H

17111
view/de/hmessages.po
View File

File diff suppressed because it is too large Load Diff

3122
view/de/hstrings.php
View File

File diff suppressed because it is too large Load Diff

6
view/tpl/nav.tpl
View File

@ -11,9 +11,11 @@
<button id="expand-aside" type="button" class="navbar-toggle" data-toggle="offcanvas" data-target="#region_1"> <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> <i class="icon-circle-arrow-right" id="expand-aside-icon"></i>
</button> </button>
{{if $nav.help.6}}
<a class="navbar-toggle" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}_collapsed"{{if $nav.help.6}} onclick="return false;"{{/if}}> <a class="navbar-toggle" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}_collapsed"{{if $nav.help.6}} onclick="return false;"{{/if}}>
{{if $nav.help.6}}<i class="icon-question-sign"></i>{{else}}<i class="icon-question"></i>{{/if}} <i class="icon-question-sign"></i>
</a> </a>
{{/if}}
{{if $userinfo}} {{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> <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}} {{if $localuser}}
@ -191,7 +193,7 @@
{{/if}} {{/if}}
{{if $nav.help}} {{if $nav.help}}
<li class="{{$sel.help}} hidden-xs"> <li class="{{$sel.help}}{{if $nav.help.6}} hidden-xs{{/if}}">
<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}}>{{if $nav.help.6}}<i class="icon-question-sign"></i>{{else}}<i class="icon-question"></i>{{/if}}</a> <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}}>{{if $nav.help.6}}<i class="icon-question-sign"></i>{{else}}<i class="icon-question"></i>{{/if}}</a>
</li> </li>
{{/if}} {{/if}}