a bit of page cleanup for edit profiles

2 files changed, 77 insertions, 69 deletions

diff --git a/view/css/mod_profiles.css b/view/css/mod_profiles.css
index 35ef73cec..ea063c64e 100644
--- a/view/css/mod_profiles.css
+++ b/view/css/mod_profiles.css
@@ -19,7 +19,7 @@
 
 #profile-edit-links-end {
 	clear: both;
-	margin-bottom: 15px;
+/*	margin-bottom: 15px; */
 }
 
 .profile-listing-photo {
@@ -43,9 +43,11 @@
 
 	width: 175px;
 	margin-left: 50px;
-	margin-bottom: 20px;
+/*	margin-bottom: 20px; */
 }
 
+/*
+
 #profile-edit-profile-name-label,
 #profile-edit-name-label,
 #profile-edit-pdesc-label,
@@ -138,11 +140,13 @@
 #hide-friends-end {
 	clear: both;
 }
+*/
 
-
+/*
 #gender-select, #marital-select, #sexual-select {
 	width: 220px;
 }
+*/
 
 #profile-edit-profile-name-wrapper .required {
 	color: #FF0000;
diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl
index 229a84ae6..1eb1ae271 100755
--- a/view/tpl/profile_edit.tpl
+++ b/view/tpl/profile_edit.tpl
@@ -1,8 +1,6 @@
-<div class="generic-content-wrapper-styled">{{if $is_default}}
-<p id="profile-edit-default-desc">{{$default}}</p>
-{{/if}}
+<div class="generic-content-wrapper-styled">
 
-<h1>{{$banner}}</h1>
+<div class="section-title-wrapper"><h2>{{$banner}}</h2></div>
 
 <form id="profile-edit-form" name="form1" action="profiles/{{$profile_id}}" enctype="multipart/form-data" method="post" >
 
@@ -21,33 +19,37 @@
 
 <div id="profile-edit-links-end"></div>
 
+{{if $is_default}}
+<p class="section-content-info-wrapper">{{$default}}</p>
+{{/if}}
+
 
 <div id="profile-edit-wrapper" >
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
-<div id="profile-edit-profile-name-wrapper" >
-<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$lbl_profname}} </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" /><div class="required">*</div>
+<div id="profile-edit-profile-name-wrapper" class="form-group field">
+<label id="profile-edit-profile-name-label" for="profile-edit-profile-name" ><span class="required">*</span>&nbsp;{{$lbl_profname}} </label>
+<input type="text" class="form-control" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name}}" />
 </div>
 <div id="profile-edit-profile-name-end"></div>
 
-<div id="profile-edit-name-wrapper" >
+<div id="profile-edit-name-wrapper" class="form-group field" >
 <label id="profile-edit-name-label" for="profile-edit-name" >{{$lbl_fullname}} </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name}}" />
+<input type="text" class="form-control" size="32" name="name" id="profile-edit-name" value="{{$name}}" />
 </div>
 <div id="profile-edit-name-end"></div>
 
 
 {{if $fields.pdesc}}
-<div id="profile-edit-pdesc-wrapper" >
+<div id="profile-edit-pdesc-wrapper" class="form-group field" >
 <label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$lbl_title}} </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
+<input type="text" class="form-control" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc}}" />
 </div>
 <div id="profile-edit-pdesc-end"></div>
 {{/if}}
 
 {{if $fields.gender}}
-<div id="profile-edit-gender-wrapper" >
+<div id="profile-edit-gender-wrapper" class="form-group field select" >
 <label id="profile-edit-gender-label" for="gender-select" >{{$lbl_gender}} </label>
 {{if $advanced}}
 {{$gender}}
@@ -59,7 +61,7 @@
 {{/if}}
 
 {{if $fields.dob}}
-<div id="profile-edit-dob-wrapper" >
+<div id="profile-edit-dob-wrapper" class="form-group field" >
 <label id="profile-edit-dob-label" for="dob-select" >{{$lbl_bd}} </label>
 <div id="profile-edit-dob" >
 {{$dob}} {{$age}}
@@ -76,60 +78,60 @@
 <div class="profile-edit-submit-end"></div>
 
 {{if $fields.address}}
-<div id="profile-edit-address-wrapper" >
+<div id="profile-edit-address-wrapper" class="form-group field" >
 <label id="profile-edit-address-label" for="profile-edit-address" >{{$lbl_address}} </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address}}" />
+<input type="text" class="form-control" size="32" name="address" id="profile-edit-address" value="{{$address}}" />
 </div>
 <div id="profile-edit-address-end"></div>
 {{/if}}
 
 {{if $fields.locality}}
-<div id="profile-edit-locality-wrapper" >
+<div id="profile-edit-locality-wrapper" class="form-group field" >
 <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$lbl_city}} </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality}}" />
+<input type="text" class="form-control" size="32" name="locality" id="profile-edit-locality" value="{{$locality}}" />
 </div>
 <div id="profile-edit-locality-end"></div>
 {{/if}}
 
 {{if $fields.postal_code}}
-<div id="profile-edit-postal-code-wrapper" >
+<div id="profile-edit-postal-code-wrapper" class="form-group field" >
 <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$lbl_zip}} </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
+<input type="text" class="form-control" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code}}" />
 </div>
 <div id="profile-edit-postal-code-end"></div>
 {{/if}}
 
 {{if $fields.region}}
-<div id="profile-edit-region-wrapper" >
+<div id="profile-edit-region-wrapper" class="form-group field" >
 <label id="profile-edit-region-label" for="profile-edit-region" >{{$lbl_region}} </label>
-<input type="text" size="32" name="region" id="profile-edit-region" value="{{$region}}" />
+<input type="text" class="form-control" size="32" name="region" id="profile-edit-region" value="{{$region}}" />
 </div>
 <div id="profile-edit-region-end"></div>
 {{/if}}
 
 {{if $fields.country_name}}
-<div id="profile-edit-country-name-wrapper" >
+<div id="profile-edit-country-name-wrapper" class="form-group field" >
 <label id="profile-edit-country-name-label" for="profile-edit-country-name" >{{$lbl_country}} </label>
-<input type="text" size="32" name="country_name" id="profile-edit-country-name" value="{{$country_name}}" />
+<input type="text" class="form-control" size="32" name="country_name" id="profile-edit-country-name" value="{{$country_name}}" />
 </div>
 <div id="profile-edit-country-name-end"></div>
 {{/if}}
 
 {{if $fields.hometown}}
-<div id="profile-edit-hometown-wrapper" >
+<div id="profile-edit-hometown-wrapper" class="form-group field" >
 <label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$lbl_hometown}} </label>
-<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
+<input type="text" class="form-control" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown}}" />
 </div>
 <div id="profile-edit-hometown-end"></div>
 {{/if}}
 
-<div class="profile-edit-submit-wrapper" >
+<div class="profile-edit-submit-wrapper" class="form-group field" >
 <input type="submit" name="submit" class="profile-edit-submit-button" value="{{$submit}}" />
 </div>
 <div class="profile-edit-submit-end"></div>
 
 {{if $fields.marital }}
-<div id="profile-edit-marital-wrapper" >
+<div id="profile-edit-marital-wrapper" class="form-group field" >
 <label id="profile-edit-marital-label" for="profile-edit-marital" >{{$lbl_marital}} </label>
 {{if $advanced}}
 {{$marital}}
@@ -140,27 +142,27 @@
 <div class="clear"></div>
 {{if $fields.with}}
 <label id="profile-edit-with-label" for="profile-edit-with" > {{$lbl_with}} </label>
-<input type="text" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
+<input type="text" class="form-control" size="32" name="with" id="profile-edit-with" title="{{$lbl_ex1}}" value="{{$with}}" />
 <div class="clear"></div>
 {{/if}}
 {{if $fields.howlong}}
 <label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$lbl_howlong}} </label>
-<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
+<input type="text" class="form-control" size="32" name="howlong" id="profile-edit-howlong" title="{{$lbl_howlong}}" value="{{$howlong}}" />
 <div class="clear"></div>
 {{/if}}
 <div id="profile-edit-marital-end"></div>
 {{/if}}
-
+<br /><br />
 {{if $fields.homepage}}
-<div id="profile-edit-homepage-wrapper" >
+<div id="profile-edit-homepage-wrapper" class="form-group field" >
 <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$lbl_homepage}} </label>
-<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
+<input type="text" class="form-control" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage}}" />
 </div>
 <div id="profile-edit-homepage-end"></div>
 {{/if}}
 
 {{if $fields.sexual}}
-<div id="profile-edit-sexual-wrapper" >
+<div id="profile-edit-sexual-wrapper" class="form-group field" >
 <label id="profile-edit-sexual-label" for="sexual-select" >{{$lbl_sexual}} </label>
 {{$sexual}}
 </div>
@@ -168,49 +170,51 @@
 {{/if}}
 
 {{if $fields.politic}}
-<div id="profile-edit-politic-wrapper" >
+<div id="profile-edit-politic-wrapper" class="form-group field" >
 <label id="profile-edit-politic-label" for="profile-edit-politic" >{{$lbl_politic}} </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic}}" />
+<input class="form-control" type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic}}" />
 </div>
 <div id="profile-edit-politic-end"></div>
 {{/if}}
 
 {{if $fields.religion}}
-<div id="profile-edit-religion-wrapper" >
+<div id="profile-edit-religion-wrapper" class="form-group field" >
 <label id="profile-edit-religion-label" for="profile-edit-religion" >{{$lbl_religion}} </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion}}" />
+<input type="text" class="form-control" size="32" name="religion" id="profile-edit-religion" value="{{$religion}}" />
 </div>
 <div id="profile-edit-religion-end"></div>
 {{/if}}
 
 {{if $fields.keywords}}
-<div id="profile-edit-pubkeywords-wrapper" >
+<div id="profile-edit-pubkeywords-wrapper" class="form-group field" >
 <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$lbl_pubkey}} </label>
-<input type="text" size="32" name="keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$keywords}}" />
-</div><div id="profile-edit-pubkeywords-desc">{{$lbl_pubdsc}}</div>
+<input type="text" class="form-control" size="32" name="keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$keywords}}" />
+</div>
+<span class="help-block">{{$lbl_pubdsc}}</span>
 <div id="profile-edit-pubkeywords-end"></div>
 {{/if}}
 
+<br /><br />
 
 {{if $fields.about}}
-<div id="about-jot-wrapper" >
+<div id="about-jot-wrapper" class="form-group field" >
 <p id="about-jot-desc" >
 {{$lbl_about}}
 </p>
 
-<textarea rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea>
+<textarea class="form-control" rows="10" cols="72" id="profile-about-text" name="about" >{{$about}}</textarea>
 
 </div>
 <div id="about-jot-end"></div>
 {{/if}}
 
 {{if $fields.contact}}
-<div id="contact-jot-wrapper" >
+<div id="contact-jot-wrapper" class="form-group field" >
 <p id="contact-jot-desc" >
 {{$lbl_social}}
 </p>
 
-<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea>
+<textarea class="form-control" rows="10" cols="72" id="contact-jot-text" name="contact" >{{$contact}}</textarea>
 
 </div>
 <div id="contact-jot-end"></div>
@@ -218,96 +222,96 @@
 
 
 {{if $fields.interest}}
-<div id="interest-jot-wrapper" >
+<div id="interest-jot-wrapper" class="form-group field" >
 <p id="interest-jot-desc" >
 {{$lbl_hobbies}}
 </p>
 
-<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest}}</textarea>
+<textarea class="form-control" rows="10" cols="72" id="interest-jot-text" name="interest" >{{$interest}}</textarea>
 
 </div>
 <div id="interest-jot-end"></div>
 {{/if}}
 
 {{if $fields.likes}}
-<div id="likes-jot-wrapper" >
+<div id="likes-jot-wrapper" class="form-group field" >
 <p id="likes-jot-desc" >
 {{$lbl_likes}}
 </p>
 
-<textarea rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes}}</textarea>
+<textarea class="form-control" rows="10" cols="72" id="likes-jot-text" name="likes" >{{$likes}}</textarea>
 
 </div>
 <div id="likes-jot-end"></div>
 {{/if}}
 
 {{if $fields.dislikes}}
-<div id="dislikes-jot-wrapper" >
+<div id="dislikes-jot-wrapper" class="form-group field" >
 <p id="dislikes-jot-desc" >
 {{$lbl_dislikes}}
 </p>
 
-<textarea rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes}}</textarea>
+<textarea class="form-control" rows="10" cols="72" id="dislikes-jot-text" name="dislikes" >{{$dislikes}}</textarea>
 
 </div>
 <div id="dislikes-jot-end"></div>
 {{/if}}
 
 {{if $fields.channels}}
-<div id="channels-jot-wrapper" >
+<div id="channels-jot-wrapper" class="form-group field" >
 <p id="channels-jot-desc" >
 {{$lbl_channels}}
 </p>
 
-<textarea rows="10" cols="72" id="channels-jot-text" name="channels" >{{$channels}}</textarea>
+<textarea class="form-control" rows="10" cols="72" id="channels-jot-text" name="channels" >{{$channels}}</textarea>
 
 </div>
 <div id="channels-jot-end"></div>
 {{/if}}
 
 {{if $fields.music}}
-<div id="music-jot-wrapper" >
+<div id="music-jot-wrapper" class="form-group field" >
 <p id="music-jot-desc" >
 {{$lbl_music}}
 </p>
 
-<textarea rows="10" cols="72" id="music-jot-text" name="music" >{{$music}}</textarea>
+<textarea class="form-control" rows="10" cols="72" id="music-jot-text" name="music" >{{$music}}</textarea>
 
 </div>
 <div id="music-jot-end"></div>
 {{/if}}
 
 {{if $fields.book}}
-<div id="book-jot-wrapper" >
+<div id="book-jot-wrapper" class="form-group field" >
 <p id="book-jot-desc" >
 {{$lbl_book}}
 </p>
 
-<textarea rows="10" cols="72" id="book-jot-text" name="book" >{{$book}}</textarea>
+<textarea class="form-control" rows="10" cols="72" id="book-jot-text" name="book" >{{$book}}</textarea>
 
 </div>
 <div id="book-jot-end"></div>
 {{/if}}
 
 {{if $fields.tv}}
-<div id="tv-jot-wrapper" >
+<div id="tv-jot-wrapper" class="form-group field" >
 <p id="tv-jot-desc" >
 {{$lbl_tv}} 
 </p>
 
-<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv}}</textarea>
+<textarea class="form-control" rows="10" cols="72" id="tv-jot-text" name="tv" >{{$tv}}</textarea>
 
 </div>
 <div id="tv-jot-end"></div>
 {{/if}}
 
 {{if $fields.film}}
-<div id="film-jot-wrapper" >
+<div id="film-jot-wrapper" class="form-group field" >
 <p id="film-jot-desc" >
 {{$lbl_film}}
 </p>
 
-<textarea rows="10" cols="72" id="film-jot-text" name="film" >{{$film}}</textarea>
+<textarea class="form-control" rows="10" cols="72" id="film-jot-text" name="film" >{{$film}}</textarea>
 
 </div>
 <div id="film-jot-end"></div>
@@ -315,36 +319,36 @@
 
 
 {{if $fields.romance}}
-<div id="romance-jot-wrapper" >
+<div id="romance-jot-wrapper" class="form-group field" >
 <p id="romance-jot-desc" >
 {{$lbl_love}}
 </p>
 
-<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance}}</textarea>
+<textarea class="form-control" rows="10" cols="72" id="romance-jot-text" name="romance" >{{$romance}}</textarea>
 
 </div>
 <div id="romance-jot-end"></div>
 {{/if}}
 
 {{if $fields.work}}
-<div id="work-jot-wrapper" >
+<div id="work-jot-wrapper" class="form-group field" >
 <p id="work-jot-desc" >
 {{$lbl_work}}
 </p>
 
-<textarea rows="10" cols="72" id="work-jot-text" name="work" >{{$work}}</textarea>
+<textarea class="form-control" rows="10" cols="72" id="work-jot-text" name="work" >{{$work}}</textarea>
 
 </div>
 <div id="work-jot-end"></div>
 {{/if}}
 
 {{if $fields.education}}
-<div id="education-jot-wrapper" >
+<div id="education-jot-wrapper" class="form-group field" >
 <p id="education-jot-desc" >
 {{$lbl_school}} 
 </p>
 
-<textarea rows="10" cols="72" id="education-jot-text" name="education" >{{$education}}</textarea>
+<textarea class="form-control" rows="10" cols="72" id="education-jot-text" name="education" >{{$education}}</textarea>
 
 </div>
 <div id="education-jot-end"></div>