Changeset 10003

Timestamp:

06/30/10 11:47:03 (3 years ago)

Author:

p_lindheimer

Message:

include module js files after all the standard js files as they will typically require things like standard jquery libraries, etc.

Files:

• freepbx/branches/2.8/amp_conf/htdocs/admin/views/freepbx.php (modified) (2 diffs)

freepbx/branches/2.8/amp_conf/htdocs/admin/views/freepbx.php

@@ -88 +88 @@
-      echo "\t".'<link href="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_page.'.css" rel="stylesheet" type="text/css" />'."\n";
-    }
-    if (is_file('modules/'.$module_name.'/'.$module_name.'.js')) {
-      echo "\t".'<script type="text/javascript" src="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_name.'.js"></script>'."\n";
-    }
-    if (isset($module_page) && ($module_page != $module_name) && is_file('modules/'.$module_name.'/'.$module_page.'.js')) {
-      echo "\t".'<script type="text/javascript" src="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_page.'.js"></script>'."\n";
-    }
-  }
-?>
@@ -117 +111 @@
-  <script type="text/javascript" src="common/tabber-minimized.js"></script> <!-- used for module admin (hiding content) -->
-<?php
+  if (isset($module_name)) {
+    if (is_file('modules/'.$module_name.'/'.$module_name.'.js')) {
+      echo "\t".'<script type="text/javascript" src="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_name.'.js"></script>'."\n";
+    }
+    if (isset($module_page) && ($module_page != $module_name) && is_file('modules/'.$module_name.'/'.$module_page.'.js')) {
+      echo "\t".'<script type="text/javascript" src="'.$_SERVER['PHP_SELF'].'?handler=file&amp;module='.$module_name.'&amp;file='.$module_page.'.js"></script>'."\n";
+    }
+  }
-  }
-?>