apps broken in all themes, apps link misplaced in testbubble

diff --git a/index.php b/index.php
index 25fdb4f8c302c268a405c77658e0dc5e95b64f64..3d8648528cf7609f5e847fc5572d10c736ddaea1 100644 (file)
--- a/index.php
+++ b/index.php
@@ -140,7 +140,6 @@ call_hooks('app_menu', $arr);
 
 $a->apps = $arr['app_menu'];
 
-
 /**
  *
  * We have already parsed the server path into $a->argc and $a->argv

diff --git a/view/apps.tpl b/view/apps.tpl
index 61ea9ee5fcee0b8e126fd7bbd84190f5fc64156e..4c7f8c94cc1b5654bd1140001b48355702182d73 100644 (file)
--- a/view/apps.tpl
+++ b/view/apps.tpl
@@ -2,6 +2,6 @@
 
 <ul>
        {{ for $apps as $ap }}
-       <li><a href="$ap.url">$ap.name</a></li>
+       <li>$ap</li>
        {{ endfor }}
 </ul>

diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
index 359d01bc1f93c8d5b90e30eb2e0b722c3ecd8317..a2171d43115b8f8d17562a07a15043b1774cf5ea 100644 (file)
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
@@ -29,6 +29,7 @@
 
                        <li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
                        <li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
+                       {{ if $nav.apps }}<li><a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li>{{ endif }}
                        
                        {{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
                        {{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
@@ -49,7 +50,6 @@
        </div>
 
 
-       {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>{{ endif }}
 
 </nav>