diff options
| -rw-r--r-- | include/country.js | 30 | ||||
| -rw-r--r-- | view/profile.php | 6 | ||||
| -rw-r--r-- | view/profile_edit.tpl | 3 | ||||
| -rw-r--r-- | wip/todo | 1 |
4 files changed, 3 insertions, 37 deletions
diff --git a/include/country.js b/include/country.js index 4482a3f8c..701ec19e2 100644 --- a/include/country.js +++ b/include/country.js @@ -428,39 +428,9 @@ function Fill_Country(current) { return;
}
-function updSelectState(lngState) {
- if (gLngSelectedCountry>0) {
-
- document.form1.txtSelectedState.value = lngState+1;
-
- }
-}
-
-/*
- * gArCountryInfo matrix holds the following information:
- * (0) Country name
- * (1) Name length
- * (2) Number of states
- * (3) Max state length
- */
function Update_Globals() {
gLngSelectedCountry=parseInt(document.form1.country_name.selectedIndex);
gLngSelectedState=parseInt(document.form1.region.selectedIndex);
- document.form1.txtSelectedCountry.value=gLngSelectedCountry;
- document.form1.txtSelectedState.value=gLngSelectedState+1;
-
- // working
-// document.form1.txtCountry.value=
-// document.form1.country_name.options[gLngSelectedCountry].text;
-// if (document.form1.txtSelectedState.value<=0) {
-// document.form1.txtState.value="";
-// }
-// else {
-// document.form1.txtState.value=
-// document.form1.region.options[gLngSelectedState].text;
-// }
-
-
return;
}
diff --git a/view/profile.php b/view/profile.php index 808e2dbaa..d1e53ad56 100644 --- a/view/profile.php +++ b/view/profile.php @@ -29,11 +29,11 @@ || (strlen($profile['region']))
|| (strlen($profile['postal-code']))
|| (strlen($profile['country-name']))) { ?>
- <div class="location">Location:
+ <span class="location">Location:
<div class="adr">
<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></div>
- <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>
- <div class="country-name"><?php echo $profile['country-name']; ?></div>
+ <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>
+ <span class="country-name"><?php echo $profile['country-name']; ?></span>
</div>
</div>
diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl index a19347cf9..789da873c 100644 --- 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> @@ -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 |