remove experimental_app_bin config conditional
This commit is contained in:
Mario Vavti
parent
cde7a3f66c
commit
bf820beb79
@ -244,28 +244,26 @@ EOT;
|
||||
|
||||
|
||||
//app bin
|
||||
$navapps = '';
|
||||
if(get_config('system','experimental_app_bin')) {
|
||||
if(local_channel()) {
|
||||
//Zlib\Apps::import_system_apps();
|
||||
$syslist = array();
|
||||
$list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app');
|
||||
if($list) {
|
||||
foreach($list as $li) {
|
||||
$syslist[] = Zlib\Apps::app_encode($li);
|
||||
}
|
||||
if(local_channel()) {
|
||||
//Zlib\Apps::import_system_apps();
|
||||
$syslist = array();
|
||||
$list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app');
|
||||
if($list) {
|
||||
foreach($list as $li) {
|
||||
$syslist[] = Zlib\Apps::app_encode($li);
|
||||
}
|
||||
Zlib\Apps::translate_system_apps($syslist);
|
||||
}
|
||||
else {
|
||||
$syslist = Zlib\Apps::get_system_apps(true);
|
||||
}
|
||||
|
||||
$navapps = replace_macros(get_markup_template('navapps.tpl'), array(
|
||||
'$apps' => $syslist,
|
||||
'$localuser' => local_channel(),
|
||||
));
|
||||
Zlib\Apps::translate_system_apps($syslist);
|
||||
}
|
||||
else {
|
||||
$syslist = Zlib\Apps::get_system_apps(true);
|
||||
}
|
||||
|
||||
$navapps = replace_macros(get_markup_template('navapps.tpl'), array(
|
||||
'$apps' => $syslist,
|
||||
'$localuser' => local_channel(),
|
||||
));
|
||||
|
||||
|
||||
$tpl = get_markup_template('nav.tpl');
|
||||
|
||||
|
||||
134
view/tpl/nav.tpl
134
view/tpl/nav.tpl
@ -58,7 +58,6 @@
|
||||
</div>
|
||||
<div class="collapse navbar-collapse" id="navbar-collapse-1">
|
||||
<ul class="nav navbar-nav navbar-left">
|
||||
{{if $navapps}}
|
||||
{{if $nav.network}}
|
||||
<li class="{{$sel.network}} net-button" style="display: none;">
|
||||
<a href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" onclick="return false;" data-toggle="dropdown" rel="#nav-network-menu"><i class="fa fa-th"></i></a>
|
||||
@ -130,105 +129,6 @@
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{else}}
|
||||
{{if $nav.network}}
|
||||
<li class="{{$sel.network}} hidden-xs">
|
||||
<a href="{{$nav.network.0}}" title="{{$nav.network.3}}" id="{{$nav.network.4}}"><i class="fa fa-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="fa fa-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}}" id="{{$nav.home.4}}"><i class="fa fa-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="fa fa-home"></i></a>
|
||||
<span class="home-update badge" rel="#nav-home-menu"></span>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
|
||||
{{if $nav.messages}}
|
||||
<li class="{{$sel.messages}} hidden-xs">
|
||||
<a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}"><i class="fa fa-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="fa fa-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}}" id="{{$nav.all_events.4}}"><i class="fa fa-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="fa fa-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}}" id="{{$nav.intros.4}}"><i class="fa fa-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="fa fa-user"></i></a>
|
||||
<span class="intro-update badge" rel="#nav-intros-menu"></span>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.notifications}}
|
||||
<li class="{{$sel.notifications}} hidden-xs">
|
||||
<a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}"><i class="fa fa-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="fa fa-exclamation"></i></a>
|
||||
<span class="notify-update badge" rel="#nav-notify-menu"></span>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.login && !$userinfo}}
|
||||
<li class="nav-login hidden-xs">
|
||||
<a onclick="openClose('nav-login'); return false;" href="#" title="{{$nav.loginmenu.0.3}}" id="{{$nav.loginmenu.0.4}}">{{$nav.loginmenu.0.1}} <span class="caret" id="loginmenu-caret"></span></a>
|
||||
@ -262,46 +162,16 @@
|
||||
<div id="nav-search-spinner"></div><input class="fa-search" id="nav-search-text" type="text" value="" placeholder=" {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/>
|
||||
</form>
|
||||
</li>
|
||||
{{if ! $navapps}}
|
||||
<li class="visible-xs">
|
||||
<a href="/search" title="{{$nav.search.3}}"><i class="fa fa-search"></i></a>
|
||||
</li>
|
||||
|
||||
{{if $powered_by}}
|
||||
<div id="powered-by">{{$powered_by}}</div>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.directory}}
|
||||
<li class="{{$sel.directory}}">
|
||||
<a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" id="{{$nav.directory.4}}"><i class="fa fa-sitemap"></i></a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.apps}}
|
||||
<li class="{{$sel.apps}}">
|
||||
<a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" id="{{$nav.apps.4}}"><i class="fa fa-cogs"></i></a>
|
||||
</li>
|
||||
{{/if}}
|
||||
|
||||
{{if $nav.help}}
|
||||
<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="contextualHelp(); return false;"{{/if}}>{{if $nav.help.6}}<i class="fa fa-question-circle"></i>{{else}}<i class="fa fa-question"></i>{{/if}}</a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
|
||||
{{if $navapps}}
|
||||
{{if $nav.help.6}}
|
||||
{{if $nav.help.6}}
|
||||
<li class="{{$sel.help}} hidden-xs">
|
||||
<a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-question-circle"></i></a>
|
||||
</li>
|
||||
{{/if}}
|
||||
{{/if}}
|
||||
<li class="dropdown-toggle" data-toggle="dropdown">
|
||||
<a href="#"><i class="fa fa-bars"></i></a>
|
||||
</li>
|
||||
{{$navapps}}
|
||||
{{/if}}
|
||||
|
||||
</ul>
|
||||
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user