remove hidden country/state vars

diff --git a/include/country.js b/include/country.js
index 4482a3f8cb29e157cf4d3918a742c8db8c8a51cd..701ec19e2750c94285059b8d59e0302e071f9720 100644 (file)
--- a/include/country.js
+++ b/include/country.js
@@ -428,39 +428,9 @@ function Fill_Country(current) {
        return;\r
 }\r
 \r
-function updSelectState(lngState) {\r
-       if (gLngSelectedCountry>0) {\r
-\r
-               document.form1.txtSelectedState.value = lngState+1;\r
-\r
-       }\r
-}\r
-\r
-/*\r
- * gArCountryInfo matrix holds the following information:\r
- * (0) Country name\r
- * (1) Name length\r
- * (2) Number of states\r
- * (3) Max state length\r
- */\r
 function Update_Globals() {\r
        gLngSelectedCountry=parseInt(document.form1.country_name.selectedIndex);\r
        gLngSelectedState=parseInt(document.form1.region.selectedIndex);\r
-       document.form1.txtSelectedCountry.value=gLngSelectedCountry;\r
-       document.form1.txtSelectedState.value=gLngSelectedState+1;\r
-       \r
-       // working\r
-//     document.form1.txtCountry.value=\r
-//             document.form1.country_name.options[gLngSelectedCountry].text;\r
-//     if (document.form1.txtSelectedState.value<=0) {\r
-//             document.form1.txtState.value="";\r
-//     }\r
-//     else {\r
-//             document.form1.txtState.value=\r
-//                     document.form1.region.options[gLngSelectedState].text;\r
-//     }\r
-       \r
-\r
        return;\r
 }\r
 \r

diff --git a/view/profile.php b/view/profile.php
index 808e2dbaabde74c661721f8ebfd6314116686209..d1e53ad56d3f5acd63a4ca13319c6fd9177e8066 100644 (file)
--- a/view/profile.php
+++ b/view/profile.php
@@ -29,11 +29,11 @@
                || (strlen($profile['region'])) \r
                || (strlen($profile['postal-code'])) \r
                || (strlen($profile['country-name']))) { ?>\r
-               <div class="location">Location:\r
+               <span class="location">Location:\r
                        <div class="adr">\r
                                <div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>\r
-                               <div class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['region'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></div>\r
-                               <div class="country-name"><?php echo $profile['country-name']; ?></div>\r
+                               <span class="city-state-zip"><span class="locality"><?php echo $profile['locality']; ?></span><?php if(strlen($profile['locality'])) echo ', '; ?><span class="region"><?php echo $profile['region'] ?></span><?php if(strlen($profile['postal-code'])) { ?> <span class="postal-code"><?php echo $profile['postal-code']; ?></span><?php } ?></span>\r
+                               <span class="country-name"><?php echo $profile['country-name']; ?></span>\r
                        </div>\r
                </div>\r
 \r

diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
index a19347cf940d180a023a406bf0e58701c1ce877c..789da873c24b5904f6f644fe95c4a3d7aefce8a9 100644 (file)
--- a/view/profile_edit.tpl
+++ b/view/profile_edit.tpl
@@ -58,8 +58,6 @@ $dob $age
 <div id="profile-edit-postal-code-end"></div>
 
 <div id="profile-edit-country-name-wrapper" >
-<input type="hidden" name="txtSelectedCountry" value="" >
-
 <label id="profile-edit-country-name-label" for="profile-edit-country-name" >Country: </label>
 <select name="country_name" id="profile-edit-country-name" onChange="Fill_States('$region');">
 <option selected="selected" >$country_name</option>
@@ -69,7 +67,6 @@ $dob $age
 <div id="profile-edit-country-name-end"></div>
 
 <div id="profile-edit-region-wrapper" >
-<input type="hidden" name="txtSelectedState" value="" >
 <label id="profile-edit-region-label" for="profile-edit-region" >Region/State: </label>
 <select name="region" id="profile-edit-region" onChange="Update_Globals();" >
 <option selected="selected" >$region</option>

diff --git a/wip/todo b/wip/todo
index 0cbc4a3b17eef4bdbb11297ffc71738c46d7b421..69a981d7fbb6ee9628e3874f10e9710d85c03206 100644 (file)
--- a/wip/todo
+++ b/wip/todo
@@ -6,7 +6,6 @@ profile photo to self contact page? - resolve profile photo inconsistency
        ensure correct photo is pushed with notify/poll and used in wall/wall comments/posts
        use photo hash to notify of changes?
 
-remove hidden vars country/state selector
 
 contact editor