X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Felements%2Fselect-region.html;h=46c37c9352a7d0d283afd61bd954d2cdc61873de;hp=9823290db249205c5ed1882015a3caacaaef6461;hb=f48ffc61601d08024aeff19ecd07d7420fc4e5b3;hpb=431c9ca4fab151862bd24322bf8a1f9252fb38fc

diff --git a/httemplate/elements/select-region.html b/httemplate/elements/select-region.html
index 9823290db..46c37c935 100644
--- a/httemplate/elements/select-region.html
+++ b/httemplate/elements/select-region.html
@@ -17,7 +17,7 @@
     what.form.<% $opt{'prefix'} %>region.disabled = 'disabled';
     what.form.<% $opt{'prefix'} %>region.style.display = 'none';
     var regionwait = document.getElementById('<% $opt{'prefix'} %>regionwait');
-    regionwait.style.display = '';
+    regionwait.style.display = 'inline';
     var regionerror = document.getElementById('<% $opt{'prefix'} %>regionerror');
     regionerror.style.display = 'none';
 
@@ -27,6 +27,7 @@
 
     function <% $opt{'prefix'} %>update_regions(regions) {
 
+      var reply = JSON.parse(regions);
       // blank the current region
       for ( var i = what.form.<% $opt{'prefix'} %>region.length; i >= 0; i-- )
           what.form.<% $opt{'prefix'} %>region.options[i] = null;
@@ -42,7 +43,7 @@
 %     }
 
       // add the new regions
-      var regionArray = eval('(' + regions + ')' );
+      var regionArray = reply.regions;
       for ( var s = 0; s < regionArray.length; s++ ) {
           var regionLabel = regionArray[s];
           if ( regionLabel == "" )
@@ -56,7 +57,12 @@
         what.form.<% $opt{'prefix'} %>region.style.display = '';
       } else {
         var regionerror = document.getElementById('<% $opt{'prefix'} %>regionerror');
-        regionerror.style.display = '';
+        regionerror.style.display = 'inline';
+        if ( reply.error ) {
+          regionerror.textContent = reply.error;
+        } else {
+          regionerror.textContent = 'Select a different state';
+        }
       }
 
       //run the callback
@@ -73,7 +79,7 @@
 
 <DIV ID="<% $opt{'prefix'} %>regionwait" STYLE="display:none"><IMG SRC="<%$fsurl%>images/wait-orange.gif"> <B>Finding regions</B></DIV>
 
-<DIV ID="<% $opt{'prefix'} %>regionerror" STYLE="display:none"><IMG SRC="<%$fsurl%>images/cross.png"> <B>Select a different state</B></DIV>
+<DIV ID="<% $opt{'prefix'} %>regionerror" STYLE="display:none; font-weight: bold"><IMG SRC="<%$fsurl%>images/cross.png"></DIV>
 
 <SELECT NAME="<% $opt{'prefix'} %>region" onChange="<% $opt{'prefix'} %>region_changed(this); <% $opt{'onchange'} %>" <% $opt{'disabled'} %>>
   <OPTION VALUE="">Select region</OPTION>