diff options
| -rw-r--r-- | mod/profiles.php | 11 | ||||
| -rw-r--r-- | updates.sql | 6 | ||||
| -rw-r--r-- | view/profile_edit.tpl | 174 | ||||
| -rw-r--r-- | view/style.css | 18 |
4 files changed, 191 insertions, 18 deletions
diff --git a/mod/profiles.php b/mod/profiles.php index 34678a237..c74586b07 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -225,6 +225,17 @@ function profiles_content(&$a) { '$sexual' => sexpref_selector($r[0]['sexual']), '$about' => $r[0]['about'], '$homepage' => $r[0]['homepage'], + '$politic' => $r[0]['politic'], + '$religion' => $r[0]['religion'], + '$music' => $r[0]['music'], + '$book' => $r[0]['book'], + '$tv' => $r[0]['tv'], + '$film' => $r[0]['film'], + '$interest' => $r[0]['interest'], + '$romance' => $r[0]['romance'], + '$work' => $r[0]['work'], + '$education' => $r[0]['education'], + '$contact' => $r[0]['contact'], '$profile_in_dir' => (($is_default) ? $profile_in_dir : '') )); diff --git a/updates.sql b/updates.sql index 07c4c760c..de7bfa1e4 100644 --- a/updates.sql +++ b/updates.sql @@ -21,4 +21,8 @@ ALTER TABLE `profile` ADD `summary` CHAR( 255 ) NOT NULL AFTER `about` ; ALTER TABLE `profile` ADD `dob_hide` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `dob` ; ALTER TABLE `profile` DROP `age`; - ALTER TABLE `profile` DROP `dob_hide` ;
\ No newline at end of file + ALTER TABLE `profile` DROP `dob_hide` ; + ALTER TABLE `profile` CHANGE `school` `education` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL ; + ALTER TABLE `profile` DROP `employer` ; + +ALTER TABLE `profile` ADD `contact` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL AFTER `education` ;
\ No newline at end of file diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl index ff0e2f8e4..a56d4f78f 100644 --- a/view/profile_edit.tpl +++ b/view/profile_edit.tpl @@ -9,13 +9,13 @@ $default <div id="profile-edit-profile-name-wrapper" > <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >Profile Name: </label> -<input type="text size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div> +<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="$profile_name" /><div class="required">*</div> </div> <div id="profile-edit-profile-name-end"></div> <div id="profile-edit-name-wrapper" > <label id="profile-edit-name-label" for="profile-edit-name" >Your Full Name: </label> -<input type="text size="32" name="name" id="profile-edit-name" value="$name" /> +<input type="text" size="32" name="name" id="profile-edit-name" value="$name" /> </div> <div id="profile-edit-name-end"></div> @@ -26,29 +26,34 @@ $gender <div id="profile-edit-gender-end"></div> <div id="profile-edit-dob-wrapper" > -<p id="birthday-description">Leave year blank to suppress age.</p> <label id="profile-edit-dob-label" for="dob-select" >Birthday: </label> <div id="profile-edit-dob" > $dob </div> <div id="profile-edit-dob-end"></div> +<div class="profile-edit-submit-wrapper" > +<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" /> +</div> +<div class="profile-edit-submit-end"></div> + + <div id="profile-edit-address-wrapper" > <label id="profile-edit-address-label" for="profile-edit-address" >Street Address: </label> -<input type="text size="32" name="address" id="profile-edit-address" value="$address" /> +<input type="text" size="32" name="address" id="profile-edit-address" value="$address" /> </div> <div id="profile-edit-address-end"></div> <div id="profile-edit-locality-wrapper" > <label id="profile-edit-locality-label" for="profile-edit-locality" >Locality/City: </label> -<input type="text size="32" name="locality" id="profile-edit-locality" value="$locality" /> +<input type="text" size="32" name="locality" id="profile-edit-locality" value="$locality" /> </div> <div id="profile-edit-locality-end"></div> <div id="profile-edit-postal-code-wrapper" > <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >Postal/Zip Code: </label> -<input type="text size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" /> +<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="$postal_code" /> </div> <div id="profile-edit-postal-code-end"></div> @@ -73,6 +78,10 @@ $dob </div> <div id="profile-edit-region-end"></div> +<div class="profile-edit-submit-wrapper" > +<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" /> +</div> +<div class="profile-edit-submit-end"></div> <div id="profile-edit-marital-wrapper" > <label id="profile-edit-marital-label" for="profile-edit-marital" >Marital Status: </label> @@ -90,28 +99,171 @@ $sexual <div id="profile-edit-homepage-wrapper" > <label id="profile-edit-homepage-label" for="profile-edit-homepage" >Homepage URL: </label> -<input type="text size="32" name="homepage" id="profile-edit-homepage" value="$homepage" /> +<input type="text" size="32" name="homepage" id="profile-edit-homepage" value="$homepage" /> </div> <div id="profile-edit-homepage-end"></div> +<div id="profile-edit-politic-wrapper" > +<label id="profile-edit-politic-label" for="profile-edit-politic" >Political Views: </label> +<input type="text" size="32" name="politic" id="profile-edit-politic" value="$politic" /> +</div> +<div id="profile-edit-politic-end"></div> + +<div id="profile-edit-religion-wrapper" > +<label id="profile-edit-religion-label" for="profile-edit-religion" >Religion: </label> +<input type="text" size="32" name="religion" id="profile-edit-religion" value="$religion" /> +</div> +<div id="profile-edit-religion-end"></div> + + $profile_in_dir + +<div class="profile-edit-submit-wrapper" > +<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" /> +</div> +<div class="profile-edit-submit-end"></div> + <div id="about-jot-wrapper" > <p id="about-jot-desc" > Tell us about yourself. </p> -<textarea rows="13" cols="72" id="profile-jot-text" name="about" >$about</textarea> +<textarea rows="10" cols="72" id="profile-jot-text" name="about" >$about</textarea> </div> <div id="about-jot-end"></div> </div> -<div id="profile-edit-submit-wrapper" > -<input type="submit" name="submit" id="profile-edit-submit-button" value="Submit" /> +<div id="interest-jot-wrapper" > +<p id="interest-jot-desc" > +Hobbies/Interests. +</p> + +<textarea rows="10" cols="72" id="interest-jot-text" name="interest" >$interest</textarea> + +</div> +<div id="interest-jot-end"></div> +</div> + + +<div id="contact-jot-wrapper" > +<p id="contact-jot-desc" > +Contact information. +</p> + +<textarea rows="10" cols="72" id="contact-jot-text" name="contact" >$contact</textarea> + +</div> +<div id="contact-jot-end"></div> +</div> + + +<div class="profile-edit-submit-wrapper" > +<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" /> +</div> +<div class="profile-edit-submit-end"></div> + + +<div id="music-jot-wrapper" > +<p id="music-jot-desc" > +Musical interests. +</p> + +<textarea rows="10" cols="72" id="music-jot-text" name="music" >$music</textarea> + +</div> +<div id="music-jot-end"></div> +</div> + +<div id="book-jot-wrapper" > +<p id="book-jot-desc" > +Books, literature. +</p> + +<textarea rows="10" cols="72" id="book-jot-text" name="book" >$book</textarea> + +</div> +<div id="book-jot-end"></div> +</div> + + + +<div id="tv-jot-wrapper" > +<p id="tv-jot-desc" > +Television. +</p> + +<textarea rows="10" cols="72" id="tv-jot-text" name="tv" >$tv</textarea> + +</div> +<div id="tv-jot-end"></div> +</div> + + + +<div id="film-jot-wrapper" > +<p id="film-jot-desc" > +Film/dance/culture/entertainment. +</p> + +<textarea rows="10" cols="72" id="film-jot-text" name="film" >$film</textarea> + +</div> +<div id="film-jot-end"></div> +</div> + + +<div class="profile-edit-submit-wrapper" > +<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" /> +</div> +<div class="profile-edit-submit-end"></div> + + +<div id="romance-jot-wrapper" > +<p id="romance-jot-desc" > +Love/romance. +</p> + +<textarea rows="10" cols="72" id="romance-jot-text" name="romance" >$romance</textarea> + +</div> +<div id="romance-jot-end"></div> +</div> + + + +<div id="work-jot-wrapper" > +<p id="work-jot-desc" > +Work/employment. +</p> + +<textarea rows="10" cols="72" id="work-jot-text" name="work" >$work</textarea> + +</div> +<div id="work-jot-end"></div> +</div> + + + +<div id="education-jot-wrapper" > +<p id="education-jot-desc" > +School/education. +</p> + +<textarea rows="10" cols="72" id="education-jot-text" name="education" >$education</textarea> + +</div> +<div id="education-jot-end"></div> +</div> + + + +<div class="profile-edit-submit-wrapper" > +<input type="submit" name="submit" class="profile-edit-submit-button" value="Submit" /> </div> -<div id="profile-edit-submit-end"></div> +<div class="profile-edit-submit-end"></div> </form> diff --git a/view/style.css b/view/style.css index 06dd6581c..35f66ccff 100644 --- a/view/style.css +++ b/view/style.css @@ -278,11 +278,11 @@ input#dfrn-url { margin-left: 50px; margin-bottom: 20px; } -#profile-edit-dob-hide-label { - margin-left: 20px; - width: 150px; -} +.profile-edit-submit-wrapper { + margin-top: 20px; + margin-bottom: 20px; +} #profile-edit-profile-name-label, #profile-edit-name-label, @@ -295,6 +295,8 @@ input#dfrn-url { #profile-edit-country-name-label, #profile-edit-marital-label, #profile-edit-sexual-label, +#profile-edit-politic-label, +#profile-edit-religion-label, #profile-edit-homepage-label { float: left; width: 175px; @@ -311,6 +313,8 @@ input#dfrn-url { #profile-edit-country-name, #marital-select, #sexual-select, +#profile-edit-politic, +#profile-edit-religion, #profile-in-dir-yes, #profile-in-dir-no { float: left; @@ -339,14 +343,16 @@ input#dfrn-url { #profile-edit-country-name-end, #profile-edit-marital-end, #profile-edit-sexual-end, +#profile-edit-politic-end, +#profile-edit-religion-end, #profile-edit-homepage-end, #profile-in-dir-break, #profile-in-dir-end { clear: both; } -#gender-select, #marital-select { - width: 145px; +#gender-select, #marital-select, #sexual-select { + width: 220px; } #profile-edit-profile-name-wrapper .required { |