diff options
-rw-r--r-- | provisioning-editdevice-html.lsp | 6 | ||||
-rw-r--r-- | provisioning-editdeviceparams-html.lsp | 7 | ||||
-rw-r--r-- | provisioning-listclasses-html.lsp | 14 | ||||
-rw-r--r-- | provisioning-listclassgroups-html.lsp | 14 | ||||
-rw-r--r-- | provisioning-listdevices-html.lsp | 13 | ||||
-rw-r--r-- | provisioning-listgroups-html.lsp | 14 | ||||
-rw-r--r-- | provisioning-listparams-html.lsp | 14 | ||||
-rw-r--r-- | provisioning-listrequests-html.lsp | 14 | ||||
-rw-r--r-- | provisioning-listtemplates-html.lsp | 14 | ||||
-rw-r--r-- | provisioning-searchbyextension-html.lsp | 7 | ||||
-rw-r--r-- | provisioning-searchbymac-html.lsp | 7 | ||||
-rw-r--r-- | provisioning-searchdevices-html.lsp | 7 |
12 files changed, 112 insertions, 19 deletions
diff --git a/provisioning-editdevice-html.lsp b/provisioning-editdevice-html.lsp index 827ea9b..2f425e4 100644 --- a/provisioning-editdevice-html.lsp +++ b/provisioning-editdevice-html.lsp @@ -3,9 +3,13 @@ require("htmlviewfunctions") html = require("acf.html") %> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script> <script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> +<script type="text/javascript"> <% -- Since we want to redirect to edit a new device's parameters, we create an automatic redirect if page_info.action == "createdevice" and form.descr and not form.errtxt then -- Use JavaScript to redirect to the edit page diff --git a/provisioning-editdeviceparams-html.lsp b/provisioning-editdeviceparams-html.lsp index 565d30b..e2f9d3c 100644 --- a/provisioning-editdeviceparams-html.lsp +++ b/provisioning-editdeviceparams-html.lsp @@ -3,7 +3,12 @@ require("htmlviewfunctions") html = require("acf.html") %> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script> +<script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> + <script type="text/javascript"> <% -- Since we're including deletedevice as a component, we break the automatic redirect if session.deletedeviceresult and not session.deletedeviceresult.errtxt and viewlibrary.check_permission("listdevices") then diff --git a/provisioning-listclasses-html.lsp b/provisioning-listclasses-html.lsp index cad8c4e..f3f4db5 100644 --- a/provisioning-listclasses-html.lsp +++ b/provisioning-listclasses-html.lsp @@ -3,8 +3,18 @@ require("htmlviewfunctions") html = require("acf.html") %> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"></script> +<script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> + +<script type="text/javascript"> + if (typeof $.tablesorter == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"><\/script>'); + } +</script> + <script type="text/javascript"> <% -- Since we're including a submission of getclassvalues, we need to overcome the automatic redirect if session.getclassvaluesresult then diff --git a/provisioning-listclassgroups-html.lsp b/provisioning-listclassgroups-html.lsp index ade2c9d..ba34fb3 100644 --- a/provisioning-listclassgroups-html.lsp +++ b/provisioning-listclassgroups-html.lsp @@ -3,8 +3,18 @@ require("htmlviewfunctions") html = require("acf.html") %> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"></script> +<script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> + +<script type="text/javascript"> + if (typeof $.tablesorter == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"><\/script>'); + } +</script> + <script type="text/javascript"> $(document).ready(function() { $("#list").tablesorter({headers: {0:{sorter: false}}}); diff --git a/provisioning-listdevices-html.lsp b/provisioning-listdevices-html.lsp index dda3b7d..6e797d1 100644 --- a/provisioning-listdevices-html.lsp +++ b/provisioning-listdevices-html.lsp @@ -3,10 +3,19 @@ require("htmlviewfunctions") html = require("acf.html") %> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"></script> <script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> +<script type="text/javascript"> + if (typeof $.tablesorter == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"><\/script>'); + } +</script> + +<script type="text/javascript"> <% -- Since we're including createdevice as a component, we break the automatic redirect if session.createdeviceresult and not session.createdeviceresult.errtxt then local tmp = session.createdeviceresult diff --git a/provisioning-listgroups-html.lsp b/provisioning-listgroups-html.lsp index 6aaf2d0..a7afb6d 100644 --- a/provisioning-listgroups-html.lsp +++ b/provisioning-listgroups-html.lsp @@ -3,8 +3,18 @@ require("htmlviewfunctions") html = require("acf.html") %> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"></script> +<script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> + +<script type="text/javascript"> + if (typeof $.tablesorter == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"><\/script>'); + } +</script> + <script type="text/javascript"> $(document).ready(function() { $("#list").tablesorter({headers: {0:{sorter: false}}}); diff --git a/provisioning-listparams-html.lsp b/provisioning-listparams-html.lsp index cf1e57d..f88cad8 100644 --- a/provisioning-listparams-html.lsp +++ b/provisioning-listparams-html.lsp @@ -3,8 +3,18 @@ require("htmlviewfunctions") html = require("acf.html") %> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"></script> +<script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> + +<script type="text/javascript"> + if (typeof $.tablesorter == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"><\/script>'); + } +</script> + <script type="text/javascript"> $(document).ready(function() { $("#list").tablesorter({headers: {0:{sorter: false}}}); diff --git a/provisioning-listrequests-html.lsp b/provisioning-listrequests-html.lsp index 52bb518..ce5801e 100644 --- a/provisioning-listrequests-html.lsp +++ b/provisioning-listrequests-html.lsp @@ -3,8 +3,18 @@ require("htmlviewfunctions") html = require("acf.html") %> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"></script> +<script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> + +<script type="text/javascript"> + if (typeof $.tablesorter == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"><\/script>'); + } +</script> + <script type="text/javascript"> <% -- Since we're including a submission of searchdevices, we need to overcome the automatic redirect if session.searchdevicesresult then diff --git a/provisioning-listtemplates-html.lsp b/provisioning-listtemplates-html.lsp index e119e91..801b107 100644 --- a/provisioning-listtemplates-html.lsp +++ b/provisioning-listtemplates-html.lsp @@ -3,8 +3,18 @@ require("htmlviewfunctions") html = require("acf.html") %> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"></script> +<script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> + +<script type="text/javascript"> + if (typeof $.tablesorter == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery.tablesorter.js"><\/script>'); + } +</script> + <script type="text/javascript"> $(document).ready(function() { $("#list").tablesorter({headers: {0:{sorter: false}}}); diff --git a/provisioning-searchbyextension-html.lsp b/provisioning-searchbyextension-html.lsp index 6b3c975..8b24acc 100644 --- a/provisioning-searchbyextension-html.lsp +++ b/provisioning-searchbyextension-html.lsp @@ -3,7 +3,12 @@ require("htmlviewfunctions") html = require("acf.html") %> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script> +<script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> + <script type="text/javascript"> $(function(){ $("input[name='value']").focus(); diff --git a/provisioning-searchbymac-html.lsp b/provisioning-searchbymac-html.lsp index 0a3b61f..8034aa5 100644 --- a/provisioning-searchbymac-html.lsp +++ b/provisioning-searchbymac-html.lsp @@ -3,7 +3,12 @@ require("htmlviewfunctions") html = require("acf.html") %> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script> +<script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> + <script type="text/javascript"> $(function(){ $("input[name='value']").focus(); diff --git a/provisioning-searchdevices-html.lsp b/provisioning-searchdevices-html.lsp index 76dea64..e34b9a0 100644 --- a/provisioning-searchdevices-html.lsp +++ b/provisioning-searchdevices-html.lsp @@ -3,7 +3,12 @@ require("htmlviewfunctions") html = require("acf.html") %> -<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"></script> +<script type="text/javascript"> + if (typeof jQuery == 'undefined') { + document.write('<script type="text/javascript" src="<%= html.html_escape(page_info.wwwprefix) %>/js/jquery-latest.js"><\/script>'); + } +</script> + <script type="text/javascript"> $(function(){ $('input, select').first().focus(); |