diff options
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/chanview.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/head.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 311 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 19 |
4 files changed, 193 insertions, 140 deletions
diff --git a/view/tpl/chanview.tpl b/view/tpl/chanview.tpl index 4df327bf9..a43ea1b5d 100755 --- a/view/tpl/chanview.tpl +++ b/view/tpl/chanview.tpl @@ -1,2 +1,2 @@ -<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" >☐</div> +<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" ><i class="icon-fullscreen"></i></div> <iframe id="remote-channel" width="100%" src="{{$url}}" onload="resize_iframe()"></iframe> diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index eb4c6c2ad..b96c46dd7 100755 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -1,5 +1,6 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> <base href="{{$baseurl}}/" /> +<meta name="viewport" content="width=device-width, initial-scale=0"> <meta name="generator" content="{{$generator}}" /> <!--[if IE]> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 048f53743..ba8d68b13 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -1,151 +1,184 @@ <header> - <div id="site-location">{{$sitelocation}}</div> - <div id="banner">{{$banner}}</div> +<!-- <div id="site-location">{{$sitelocation}}</div> --> + <div id="banner" class="hidden-sm hidden-xs">{{$banner}}</div> </header> -<nav> - <ul> - {{if $userinfo}} - <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="nav-dropdown-indicator">▼</span></a> - {{if $localuser}} - <ul id="nav-user-menu" class="menu-popup"> - {{foreach $nav.usermenu as $usermenu}} - <li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li> - {{/foreach}} - {{if $nav.profiles}}<li><a class="{{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}">{{$nav.profiles.1}}</a></li>{{/if}} - {{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}} - {{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}} - {{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}} - - {{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}} - - {{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}} - - </ul> - {{/if}} - </li> - {{/if}} - - - {{if $nav.lock}} - <li id="nav-rmagic-link" class="nav-menu-icon" > - <i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}} fakelink nav-icon" onclick="window.location.href='{{$nav.lock.0}}'; return false;" title="{{$nav.lock.3}}" ></i> - </li> - {{/if}} - - - {{if $nav.network}} - <li id="nav-network-link" class="nav-menu {{$sel.network}}"> - <a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th nav-icon"></i></a> - <span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span> - <ul id="nav-network-menu" class="menu-popup notify-menus" rel="network"> - {{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}} - <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - - {{if $nav.home}} - <li id="nav-home-link" class="nav-menu {{$sel.home}}"> - <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home nav-icon"></i></a> - <span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span> - <ul id="nav-home-menu" class="menu-popup notify-menus" rel="home"> - {{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}} - <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - - {{if $nav.register}}<li id="nav-register-link" class="nav-menu {{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} - - - {{if $nav.messages}} - <li id="nav-mail-link" class="nav-menu {{$sel.messages}}"> - <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope nav-icon"></i></a> - <span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span> - <ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages"> - <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li> - <li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - - {{if $nav.all_events}} - <li id="nav-all_events-link" class="nav-menu {{$sel.all_events}}"> - <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar nav-icon"></i></a> - <span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span> - <ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events"> - <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li> - <li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} - - {{if $nav.intros}} - <li id="nav-intros-link" class="nav-menu {{$sel.intros}}"> - <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user nav-icon"></i></a> - <span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span> - <ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros"> - <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> - </ul> - </li> - {{/if}} +<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> + <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> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + {{if $userinfo}} + <img class="dropdown-toggle fakelink" data-toggle="dropdown" id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span class="caret"></span> + {{if $localuser}} + <ul class="dropdown-menu" role="menu" aria-labelledby="avatar"> + {{foreach $nav.usermenu as $usermenu}} + <li role="presentation"><a href="{{$usermenu.0}}" title="{{$usermenu.3}}" role="menuitem">{{$usermenu.1}}</a></li> + {{/foreach}} + {{if $nav.profiles}}<li role="presentation"><a href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" role="menuitem">{{$nav.profiles.1}}</a></li>{{/if}} + {{if $nav.manage}}<li role="presentation"><a href="{{$nav.manage.0}}" title="{{$nav.manage.3}}" role="menuitem">{{$nav.manage.1}}</a></li>{{/if}} + {{if $nav.contacts}}<li role="presentation"><a href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" role="menuitem">{{$nav.contacts.1}}</a></li>{{/if}} + {{if $nav.settings}}<li role="presentation"><a href="{{$nav.settings.0}}" title="{{$nav.settings.3}}" role="menuitem">{{$nav.settings.1}}</a></li>{{/if}} + {{if $nav.admin}}<li role="presentation"><a href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" role="menuitem">{{$nav.admin.1}}</a></li>{{/if}} + {{if $nav.logout}} + <li role="presentation" class="divider"></li> + <li role="presentation"><a href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" role="menuitem">{{$nav.logout.1}}</a></li> + {{/if}} + </ul> + {{/if}} + {{/if}} + </div> + <div class="collapse navbar-collapse" id="navbar-collapse-1"> + <ul class="nav navbar-nav navbar-left"> + {{if $nav.lock}} + <li> + <a class="fakelink" title="{{$nav.lock.3}}" onclick="window.location.href='{{$nav.lock.0}}'; return false;"><i class="{{if $nav.locked}}icon-lock{{else}}icon-unlock{{/if}}"></i></a> + </li> + {{/if}} + + {{if $nav.network}} + <li class="{{$sel.network}} hidden-xs"> + <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a> + <span class="net-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-network-menu"></span> + <ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network"> + {{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}} + <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.network}} visible-xs"> + <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a> + <span class="net-update badge" rel="#nav-network-menu"></span> + </li> + {{/if}} + + {{if $nav.home}} + <li class="{{$sel.home}} hidden-xs"> + <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a> + <span class="home-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-home-menu"></span> + <ul id="nav-home-menu" class="dropdown-menu" rel="home"> + {{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}} + <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.home}} visible-xs"> + <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon-home"></i></a> + <span class="home-update badge"rel="#nav-home-menu"></span> + </li> + {{/if}} + + {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} + + {{if $nav.messages}} + <li class="{{$sel.messages}} hidden-xs"> + <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope"></i></a> + <span class="mail-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-messages-menu"></span> + <ul id="nav-messages-menu" class="dropdown-menu" rel="messages"> + <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li> + <li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.messages}} visible-xs"> + <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="icon-envelope"></i></a> + <span class="mail-update badge" rel="#nav-messages-menu"></span> + </li> + {{/if}} + + {{if $nav.all_events}} + <li class="{{$sel.all_events}} hidden-xs"> + <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar"></i></a> + <span class="all_events-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-all_events-menu"></span> + <ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events"> + <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li> + <li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.all_events}} visible-xs"> + <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="icon-calendar"></i></a> + <span class="all_events-update badge" rel="#nav-all_events-menu"></span> + </li> + {{/if}} + + {{if $nav.intros}} + <li class="{{$sel.intros}} hidden-xs"> + <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user"></i></a> + <span class="intro-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-intros-menu"></span> + <ul id="nav-intros-menu" class="dropdown-menu" rel="intros"> + <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.intros}} visible-xs"> + <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="icon-user"></i></a> + <span class="intro-update badge" rel="#nav-intros-menu"></span> + </li> + {{/if}} - {{if $nav.notifications}} - <li id="nav-notify-linkmenu" class="nav-menu fakelink {{$sel.notifications}}"> - <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation nav-icon"></i></a> - <span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span> - <ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify"> - <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> - <li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li> - <li class="empty">{{$emptynotifications}}</li> + {{if $nav.notifications}} + <li class="{{$sel.notifications}} hidden-xs"> + <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a> + <span class="notify-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-notify-menu"></span> + <ul id="nav-notify-menu" class="dropdown-menu" rel="notify"> + <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> + <li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li> + <li class="empty">{{$emptynotifications}}</li> + </ul> + </li> + <li class="{{$sel.notifications}} visible-xs"> + <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="icon-exclamation"></i></a> + <span class="notify-update badge" rel="#nav-notify-menu"></span> + </li> + {{/if}} </ul> - </li> - {{/if}} - - {{if $nav.login}}<li id="nav-login-link" class="nav-menu {{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}} - {{if $nav.alogout}}<li id=nav-alogout-link" class="nav-menu {{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}} - - {{if $nav.directory}} - <li id="nav-directory-link" class="nav-menu {{$sel.directory}}"> - <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap nav-icon"></i></a> - </li> - {{/if}} - - {{if $nav.help}} - <li id="nav-help-link" class="nav-menu {{$sel.help}}"> - <a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question nav-icon"></i></a> - </li> - {{/if}} - - {{if $nav.apps}} - <li id="nav-apps-link" class="nav-menu {{$sel.apps}}"> - <a class=" {{$nav.apps.2}}" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs nav-icon"></i></a> - <ul id="nav-apps-menu" class="menu-popup"> - {{foreach $apps as $ap}} - <li>{{$ap}}</li> - {{/foreach}} + <ul class="nav navbar-nav navbar-right"> + <li class="hidden-xs"> + <form method="get" action="search" role="search"> + <div id="nav-search-spinner"></div><input class="icon-search" id="nav-search-text" type="text" value="" placeholder="" name="search" title="{{$nav.search.3}}" onclick="this.submit();" /> + </form> + </li> + <li class="visible-xs"> + <a href="/search" title="Search"><i class="icon-search"></i></a> + </li> + + {{if $nav.login}}<li class="{{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}} + + {{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}} + + {{if $nav.directory}} + <li class="{{$sel.directory}}"> + <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap"></i></a> + </li> + {{/if}} + + {{if $nav.apps}} + <li class="{{$sel.apps}} hidden-xs"> + <a class="{{$nav.apps.2}} dropdown-toggle" data-toggle="dropdown" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a> + <ul id="nav-apps-menu" class="dropdown-menu"> + {{foreach $apps as $ap}} + <li>{{$ap}}</li> + {{/foreach}} + </ul> + </li> + {{/if}} + + {{if $nav.help}} + <li class="{{$sel.help}}"> + <a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="icon-question"></i></a> + </li> + {{/if}} </ul> - </li> - {{/if}} - - <li id="nav-searchbar"> - <form method="get" action="search"> - <input class="icon-search" id="nav-search-text" type="text" value="" placeholder="" name="search" title="{{$nav.search.3}}" onclick="this.submit();" /> - </form> - </li> - <div id="nav-search-spinner"></div> - - </ul> + </div> + </div> </nav> <ul id="nav-notifications-template" style="display:none;" rel="template"> - <li class="{4}"><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li> + <li class="{5}"><a href="{0}" title="{2} {3}"><img src="{1}"><span class='contactname'>{2}</span>{3}<br><span class="notif-when">{4}</span></a></li> </ul> {{if $langselector}}<div id="langselector" >{{$langselector}}</div>{{/if}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index f5f2206bc..49dff4822 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -127,4 +127,23 @@ <input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> </div> + +{{if $menus}} +<h3 class="settings-heading">{{$lbl_misc}}</h3> + +<div id="settings-menu-desc">{{$menu_desc}}</div> +<div class="settings-channel-menu-div"> +<select name="channel_menu" class="settings-channel-menu-sel"> +{{foreach $menus as $menu }} +<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option> +{{/foreach}} +</select> +</div> +<div class="settings-submit-wrapper" > +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> +</div> +<div id="settings-channel-menu-end"></div> +{{/if}} + + </div> |