From: ivan <ivan>
Date: Mon, 22 Jan 2007 11:36:40 +0000 (+0000)
Subject: interpolation helps alot
X-Git-Tag: TRIXBOX_2_6~737
X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=7871134261d6ee6304ea7164966f6058cb3b6400

interpolation helps alot
---

diff --git a/httemplate/elements/phonenumber.html b/httemplate/elements/phonenumber.html
index 8aa3a12e6..ffbd8c100 100644
--- a/httemplate/elements/phonenumber.html
+++ b/httemplate/elements/phonenumber.html
@@ -4,10 +4,10 @@
 %  ( my $snumber = $number ) =~ s/\D//g;
 %
 
-<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/overlibmws.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/overlibmws_iframe.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/overlibmws_draggable.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/iframecontentmws.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws_iframe.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws_draggable.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/iframecontentmws.js"></SCRIPT>
 % if ( length($number) ) { 
 
   <% $number %>
diff --git a/httemplate/elements/progress-init.html b/httemplate/elements/progress-init.html
index 01bf85935..1c96a54ac 100644
--- a/httemplate/elements/progress-init.html
+++ b/httemplate/elements/progress-init.html
@@ -19,8 +19,8 @@
               'key'    => $key,
            )
 %>
-<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/overlibmws.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/overlibmws_iframe.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/overlibmws_iframe.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript">
 function OLiframeContent(src, width, height, name) {
   return ('<iframe src="'+src+'" width="'+width+'" height="'+height+'"'
diff --git a/httemplate/elements/progress-popup.html b/httemplate/elements/progress-popup.html
index 106fa5f05..cda704a12 100644
--- a/httemplate/elements/progress-popup.html
+++ b/httemplate/elements/progress-popup.html
@@ -16,9 +16,9 @@
               'subs' => [ 'job_status' ],
            )
 %>
-<SCRIPT TYPE="text/javascript" src="$fsurl/elements/qlib/control.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" src="$fsurl/elements/qlib/imagelist.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" src="$fsurl/elements/qlib/progress.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" src="<%$fsurl%>elements/qlib/control.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" src="<%$fsurl%>elements/qlib/imagelist.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" src="<%$fsurl%>elements/qlib/progress.js"></SCRIPT>
 <SCRIPT TYPE="text/javascript">
 function refreshStatus () {
   //jsrsExecute( '<%$p%>elements/jsrsServer.html', updateStatus, 'job_status', '<% $jobnum %>' );
@@ -82,7 +82,7 @@ function updateStatus( status_statustext ) {
         <TD ALIGN="center" ID="progress_bar">
           <SCRIPT TYPE="text/javascript">
             // Create imagelist
-            SEGS = new QImageList(4, 23, "$fsurl/images/progressbar-empty.png", "$fsurl/images/progressbar-full.png");
+            SEGS = new QImageList(4, 23, "<%$fsurl%>images/progressbar-empty.png", "<%$fsurl%>images/progressbar-full.png");
             // Create bars
             bar1 = new QProgress(null, "bar1", SEGS, 100);
             // bar1.set(0);
diff --git a/httemplate/elements/tr-input-beginning_ending.html b/httemplate/elements/tr-input-beginning_ending.html
index 0060e7891..6bef6b4ef 100644
--- a/httemplate/elements/tr-input-beginning_ending.html
+++ b/httemplate/elements/tr-input-beginning_ending.html
@@ -1,12 +1,12 @@
-<LINK REL="stylesheet" TYPE="text/css" HREF="$fsurl/elements/calendar-win2k-2.css" TITLE="win2k-2">
-<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/calendar_stripped.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/calendar-en.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/calendar-setup.js"></SCRIPT>
+<LINK REL="stylesheet" TYPE="text/css" HREF="<%$fsurl%>elements/calendar-win2k-2.css" TITLE="win2k-2">
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar_stripped.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar-en.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar-setup.js"></SCRIPT>
 
 
 <TR>
   <TD ALIGN="right">From date: </TD>
-  <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=<%$size%> MAXLENGTH=<%$maxlength%>> <IMG SRC="$fsurl/images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y<% $time_hint %></i></TD>
+  <TD><INPUT TYPE="text" NAME="beginning" ID="beginning_text" VALUE="" SIZE=<%$size%> MAXLENGTH=<%$maxlength%>> <IMG SRC="<%$fsurl%>images/calendar.png" ID="beginning_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y<% $time_hint %></i></TD>
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "beginning_text",
@@ -20,7 +20,7 @@
 
 <TR>
   <TD ALIGN="right">To date: </TD>
-  <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=<%$size%> MAXLENGTH=<%$maxlength%>> <IMG SRC="$fsurl/images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y<% $time_hint %></i></TD>
+  <TD><INPUT TYPE="text" NAME="ending" ID="ending_text" VALUE="" SIZE=<%$size%> MAXLENGTH=<%$maxlength%>> <IMG SRC="<%$fsurl%>images/calendar.png" ID="ending_button" STYLE="cursor: pointer" TITLE="Select date"><BR><i>m/d/y<% $time_hint %></i></TD>
 <SCRIPT TYPE="text/javascript">
   Calendar.setup({
     inputField: "ending_text",
diff --git a/httemplate/elements/tr-input-date-field.html b/httemplate/elements/tr-input-date-field.html
index 2975c4c4d..11581d5bc 100644
--- a/httemplate/elements/tr-input-date-field.html
+++ b/httemplate/elements/tr-input-date-field.html
@@ -1,14 +1,14 @@
 
-<LINK REL="stylesheet" TYPE="text/css" HREF="$fsurl/elements/calendar-win2k-2.css" TITLE="win2k-2">
-<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/calendar_stripped.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/calendar-en.js"></SCRIPT>
-<SCRIPT TYPE="text/javascript" SRC="$fsurl/elements/calendar-setup.js"></SCRIPT>
+<LINK REL="stylesheet" TYPE="text/css" HREF="<%$fsurl%>elements/calendar-win2k-2.css" TITLE="win2k-2">
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar_stripped.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar-en.js"></SCRIPT>
+<SCRIPT TYPE="text/javascript" SRC="<%$fsurl%>elements/calendar-setup.js"></SCRIPT>
 
 <TR>
   <TD ALIGN="right"><% $label %></TD>
   <TD>
     <INPUT TYPE="text" NAME="<% $name %>" ID="<% $name %>_text" VALUE="<% $value %>">
-    <IMG SRC="$fsurl/images/calendar.png" ID="<% $name  %>_button" STYLE="cursor: pointer" TITLE="Select date">
+    <IMG SRC="<%$fsurl%>images/calendar.png" ID="<% $name  %>_button" STYLE="cursor: pointer" TITLE="Select date">
   </TD>
 </TR>