Merge pull request #2819 from Hypolite/Issue-#2814

[friendica.git] / view / theme / frio / templates / nav.tpl

diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl
index b8d5b2307ee33ea0699dcf048ae827911eeafe4c..497b8db979ccd917017d48457af27b675570823b 100644 (file)
--- a/view/theme/frio/templates/nav.tpl
+++ b/view/theme/frio/templates/nav.tpl
@@ -9,7 +9,7 @@
                {{if $nav.remote}}
                <a href="{{$baseurl}}"><div id="remote-logo-img"></div></a>
                {{else}}
-               {{* #logo-img is the the placeholder to insert a mask (friendica logo) into this div 
+               {{* #logo-img is the the placeholder to insert a mask (friendica logo) into this div
                For Firefox we have to call the paths of the mask (look at the bottom of this file).
                Because for FF we need relative paths we apply them with js after the page is loaded (look at theme.js *}}
                <a href="{{$baseurl}}"><div id="logo-img"></div></a>
@@ -27,7 +27,7 @@
                                        <span class="sr-only">Toggle navigation</span>
                                        <i class="fa fa-ellipsis-v"></i>
                                </button>
-                               <button type="button" class="navbar-toggle collapsed pull-right" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
+                               <button type="button" class="navbar-toggle collapsed pull-right" data-toggle="collapse" data-target="#search-mobile" aria-expanded="false" aria-controls="navbar">
                                        <span class="sr-only">Toggle Search</span>
                                        <i class="fa fa-search" style="color:#FFF;"></i>
                                </button>
@@ -231,26 +231,43 @@
 {{if $nav.userinfo == ''}}
 <nav class="navbar navbar-fixed-top">
        <div class="container">
-               <div class="navbar-header">
-                   <a class="navbar-brand" href="#"><div id="navbrand-container">
+               <div class="navbar-header pull-left">
+                       <a class="navbar-brand" href="#"><div id="navbrand-container">
                                <div id="logo-img"></div>
                                <div id="navbar-brand-text"> Friendica</div></div>
                        </a>
                </div>
-               <div class="hidden-sm hidden-xs">
+               <div class="pull-right">
                        <ul class="nav navbar-nav navbar-right">
                                <li><a href="register" data-toggle="tooltip" title="{{$register.title}}"><i class="fa fa-street-view fa-fw"></i> {{$register.desc}}</a></li>
-                               <li><a href="login?mode=none" data-toggle="tooltip" title="{{$login}}"><i class="fa fa-sign-in fa-fw"></i> {{$login}}</a></li>
+                               <li>
+                                       <a href="login?mode=none" id="nav-login"
+                                               data-toggle="tooltip" title="{{$nav.login.3}}">
+                                                       <i class="fa fa-sign-in fa-fw"></i>
+                                       </a>
+                               </li>
                        </ul>
                </div>
        </div>
 </nav>
+
 {{/if}}
 
+{{* provide a a search input for mobile view, which expands by pressing the search icon *}}
+<div id="search-mobile" class="hidden-lg hidden-md collapse">
+       <form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}">
+               <!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
+               <div class="form-group form-group-search">
+                       <input id="nav-search-input-field-mobile" class="form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$nav.search.1}}">
+                       <button class="btn btn-default btn-sm form-button-search" type="submit">{{$nav.search.1}}</button>
+               </div>
+       </form>
+</div>
+
 {{* The second navbar which contains nav points of the actual page - (nav points are actual handled by this theme throug js *}}
 <div id="topbar-second" class="topbar">
        <div class="container">
-               <div class="col-lg-3 col-md-3 hidden-sm hidden-xs"></div>
+               <div class="col-lg-3 col-md-3 hidden-sm hidden-xs" id="nav-short-info"></div>
                <div class="col-lg-7 col-md-7 col-sm-11 col-xs-10" id="tabmenu"></div>
                <div class="col-lg-2 col-md-2 col-sm-1 col-xs-2" id="navbar-button"></div>
        </div>
@@ -259,13 +276,13 @@
 {{*The second part of the notifications dropdown menu. It handles the notifications *}}
 {{if $nav.notifications}}
 <ul id="nav-notifications-template" class="media-list" style="display:none;" rel="template"> <!-- needs further investigation. I thought the notifications have their own templates -->
-       <li class="{4} notif-entry" onclick="location.href='{0}';">
+       <li class="{4} notif-entry">
                <div class="notif-entry-wrapper media">
                        <div class="notif-photo-wrapper media-object pull-left"><a href="{6}"><img data-src="{1}"></a></div>
-                       <div class="notif-desc-wrapper media-body">
-                               {8}{7}
+                       <a href="{0}" class="notif-desc-wrapper media-body">
+                               {2}
                                <div><time class="notif-when time" data-toggle="tooltip" title="{5}">{3}</time></div>
-                       </div>
+                       </a>
                </div>
        </li>
 </ul>