Changeset 12728

Timestamp:

10/03/11 19:07:37 (2 years ago)

Author:

p_lindheimer

Message:

allows menu tabs with only a single module to be a direct link, removes User Panel link which will be replaced by a module

Files:

• freepbx/branches/2.10/amp_conf/htdocs/admin/views/menu.php (modified) (6 diffs)

freepbx/branches/2.10/amp_conf/htdocs/admin/views/menu.php

@@ -58 +58 @@
-      case 'reports':
-      case 'settings':
+      case 'user panel':
-        $menu[strtolower($deets['category'])][] = $deets;
-        break;
@@ -66 +67 @@
-  } else {
-    foreach ($fpbx_menu as $mod => $deets) {
-strtolower($deets['category'])
+$deets['category']
-    }
-  }
@@ -76 +77 @@
-    //      first checking in the module owner's i18n, then in the core i18n
-    //
+
+    if (count($cat) == 1) {
+      if (isset($cat[0]['hidden']) && $cat[0]['hidden'] == 'true') {
+        continue;
+      }
+      $href = isset($cat[0]['href']) ? $cat[0]['href'] : 'config.php?display=' . $cat[0]['display'];
+      $target = isset($cat[0]['target']) ? ' target="' . $cat[0]['target'] . '"'  : '';
+      $class = $cat[0]['display'] == $display ? 'class="ui-state-highlight"' : '';
+      $mods[$t] = '<a href="' . $href . '" ' . $target . $class . '>' . _(ucwords($t)) . '</a>';
+      continue;
+    }
-    $mods[$t] = '<a href="#">'
-        . _(ucwords($t))
@@ -90 +102 @@
-          : "config.php?display=" . $mod['display'];
-
+      $target = isset($mod['target']) 
+          ? ' target="' . $cat[0]['target'] . '" '  : '';
+
-      //highlight currently in-use module
-      if ($display == $mod['display']) {
@@ -103 +118 @@
-
-      $items[$mod['name']] = '<li><a href="' . $href . '"'
+          . $target
-          . 'class="' . implode(' ', $classes) . '">'
-          . _(ucwords($mod['name']))
@@ -117 +133 @@
-  $out .= implode($mods);
-}
-$out .= '<a href="/recordings" target="_blank">' . _('User Panel') . '</a>';
-$out .= '<a id="language-menu-button" class="button-right ui-widget-content ui-state-default">' . _('Language') . '</a>';
-$out .= '<ul id="fpbx_lang" style="display:none;">';