From efd8ab6c720bb404fb62e7bf35716602c0a7cef2 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 16 Nov 2010 01:14:04 -0800
Subject: more i18n reorg

---
 view/en/group_edit.tpl           |  24 ++++
 view/en/group_new.tpl            |  23 ++++
 view/en/jot-header.tpl           | 129 ++++++++++++++++++
 view/en/jot.tpl                  |  45 +++++++
 view/en/netfriend.tpl            |  14 ++
 view/en/pagetypes.tpl            |  25 ++++
 view/en/profile-hide-friends.tpl |  16 +++
 view/en/profile-in-directory.tpl |  16 +++
 view/en/profile-in-netdir.tpl    |  16 +++
 view/en/profile_edit.tpl         | 276 +++++++++++++++++++++++++++++++++++++++
 view/en/profile_tabs.tpl         |   7 +
 view/group_edit.tpl              |  24 ----
 view/group_new.tpl               |  23 ----
 view/jot-header.tpl              | 129 ------------------
 view/jot-plain.tpl               |  15 ---
 view/jot-save.tpl                |  31 -----
 view/jot.tpl                     |  45 -------
 view/netfriend.tpl               |  14 --
 view/pagetypes.tpl               |  25 ----
 view/profile-hide-friends.tpl    |  16 ---
 view/profile-in-directory.tpl    |  16 ---
 view/profile-in-netdir.tpl       |  16 ---
 view/profile_edit.tpl            | 276 ---------------------------------------
 view/profile_tabs.tpl            |   7 -
 24 files changed, 591 insertions(+), 637 deletions(-)
 create mode 100644 view/en/group_edit.tpl
 create mode 100644 view/en/group_new.tpl
 create mode 100644 view/en/jot-header.tpl
 create mode 100644 view/en/jot.tpl
 create mode 100644 view/en/netfriend.tpl
 create mode 100644 view/en/pagetypes.tpl
 create mode 100644 view/en/profile-hide-friends.tpl
 create mode 100644 view/en/profile-in-directory.tpl
 create mode 100644 view/en/profile-in-netdir.tpl
 create mode 100644 view/en/profile_edit.tpl
 create mode 100644 view/en/profile_tabs.tpl
 delete mode 100644 view/group_edit.tpl
 delete mode 100644 view/group_new.tpl
 delete mode 100644 view/jot-header.tpl
 delete mode 100644 view/jot-plain.tpl
 delete mode 100644 view/jot-save.tpl
 delete mode 100644 view/jot.tpl
 delete mode 100644 view/netfriend.tpl
 delete mode 100644 view/pagetypes.tpl
 delete mode 100644 view/profile-hide-friends.tpl
 delete mode 100644 view/profile-in-directory.tpl
 delete mode 100644 view/profile-in-netdir.tpl
 delete mode 100644 view/profile_edit.tpl
 delete mode 100644 view/profile_tabs.tpl

(limited to 'view')

diff --git a/view/en/group_edit.tpl b/view/en/group_edit.tpl
new file mode 100644
index 000000000..e6c7afb49
--- /dev/null
+++ b/view/en/group_edit.tpl
@@ -0,0 +1,24 @@
+<h2>Group Editor</h2>
+
+
+<div id="group-edit-wrapper" >
+<form action="group/$gid" id="group-edit-form" method="post" >
+<div id="group-edit-name-wrapper" >
+<label id="group-edit-name-label" for="group-edit-name" >Group Name: </label>
+<input type="text" id="group-edit-name" name="groupname" value="$name" />
+</div>
+<div id="group-edit-name-end"></div>
+<div id="group-edit-select-wrapper" >
+<label id="group_members_select_label"  for="group_members_select" >Members:</label>
+$selector
+
+</div>
+$drop
+<div id="group_members_select_end"></div>
+<div id="group-edit-submit-wrapper" >
+<input type="submit" name="submit" value="Submit" >
+</div>
+
+<div id="group-edit-select-end" ></div>
+</form>
+</div>
diff --git a/view/en/group_new.tpl b/view/en/group_new.tpl
new file mode 100644
index 000000000..a1efa7717
--- /dev/null
+++ b/view/en/group_new.tpl
@@ -0,0 +1,23 @@
+
+
+
+<div id="group-new-wrapper" >
+<form action="group/new" method="post">
+
+<div id="group-new-text">
+<p>
+Create a group of contacts/friends.
+
+<div id="group-new-input-wrapper">
+<label id="group-new-label" for="group-new-name" >Group Name: </label>
+<input name="groupname" id="group-new-name" />
+</div>
+<div id="group-new-input-end" ></div>
+
+<div id="group-new-submit-wrapper" >
+<input type="submit" name="submit" value="Submit" />
+</form>
+</div>
+<div id="group-new-end"></div>
+
+ 
\ No newline at end of file
diff --git a/view/en/jot-header.tpl b/view/en/jot-header.tpl
new file mode 100644
index 000000000..81c513484
--- /dev/null
+++ b/view/en/jot-header.tpl
@@ -0,0 +1,129 @@
+
+<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+
+tinyMCE.init({
+	theme : "advanced",
+	mode : "specific_textareas",
+	editor_selector: /(profile-jot-text|prvmail-text)/,
+	plugins : "bbcode",
+	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "center",
+	theme_advanced_blockformats : "blockquote,code",
+	entity_encoding : "raw",
+	add_unload_trigger : false,
+	remove_linebreaks : false,
+	convert_urls: false,
+	content_css: "$baseurl/view/custom_tinymce.css",
+	     //Character count
+	theme_advanced_path : false,
+	setup : function(ed) {
+		ed.onKeyUp.add(function(ed, e) {
+			var txt = tinyMCE.activeEditor.getContent();
+			var text = txt.length;
+			if(txt.length <= 140) {
+				$('#character-counter').removeClass('red');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('grey');
+			}
+			if((txt.length > 140) && (txt .length <= 420)) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('red');
+				$('#character-counter').addClass('orange');
+			}
+			if(txt.length > 420) {
+				$('#character-counter').removeClass('grey');
+				$('#character-counter').removeClass('orange');
+				$('#character-counter').addClass('red');
+			}
+			$('#character-counter').text(text);
+    		});
+     	}
+});
+
+</script>
+<script type="text/javascript" src="include/ajaxupload.js" ></script>
+<script>
+	$(document).ready(function() {
+		var uploader = new window.AjaxUpload(
+			'wall-image-upload',
+			{ action: 'wall_upload',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+				onComplete: function(file,response) {
+					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					$('#profile-rotator').hide();
+				}				 
+			}
+		);
+		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
+			var selstr;
+			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
+				selstr = $(this).text();
+				$('#profile-jot-perms img').attr('src', 'images/lock_icon.gif');
+
+			});
+			if(selstr == null)
+				$('#profile-jot-perms img').attr('src', 'images/unlock_icon.gif');
+
+		}).trigger('change');
+
+	});
+
+	function jotGetLink() {
+		reply = prompt("Please enter a link URL:");
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotGetVideo() {
+		reply = prompt("Please enter a YouTube link:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
+		}
+	}
+
+	function jotGetLocation() {
+		reply = prompt("Where are you right now?", $('#jot-location').val());
+		if(reply && reply.length) {
+			$('#jot-location').val(reply);
+		}
+	}
+
+
+	function linkdropper(event) {
+		var linkFound = event.dataTransfer.types.contains("text/uri-list");
+		if(linkFound)
+			event.preventDefault();
+	}
+
+	function linkdrop(event) {
+		var reply = event.dataTransfer.getData("text/uri-list");
+		event.target.textContent = reply;
+		event.preventDefault();
+		if(reply && reply.length) {
+			$('#profile-rotator').show();
+			$.get('parse_url?url=' + reply, function(data) {
+				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				$('#profile-rotator').hide();
+			});
+		}
+	}
+
+	function jotClearLocation() {
+		$('#jot-coord').val('');
+		$('#profile-nolocation-wrapper').hide();
+	}
+
+	$geotag
+
+</script>
+
diff --git a/view/en/jot.tpl b/view/en/jot.tpl
new file mode 100644
index 000000000..6590cace8
--- /dev/null
+++ b/view/en/jot.tpl
@@ -0,0 +1,45 @@
+
+<div id="profile-jot-wrapper" >
+	<div id="profile-jot-banner-wrapper">
+		<div id="profile-jot-desc" >&nbsp;</div>
+		<div id="character-counter" class="grey"></div>
+	</div>
+	<div id="profile-jot-banner-end"></div>
+
+	<form id="profile-jot-form" action="item" method="post" >
+		<input type="hidden" name="type" value="wall" />
+		<input type="hidden" name="profile_uid" value="$profile_uid" />
+		<input type="hidden" name="return" value="$return_path" />
+		<input type="hidden" name="location" id="jot-location" value="$defloc" />
+		<input type="hidden" name="coord" id="jot-coord" value="" />
+
+		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
+
+<div id="profile-jot-submit-wrapper" >
+<input type="submit" id="profile-jot-submit" name="submit" value="Share" />
+	<div id="profile-upload-wrapper" style="display: $visitor;" >
+		<div id="wall-image-upload-div" ><img id="wall-image-upload" src="images/camera-icon.gif" alt="Upload Photo" title="Upload Photo"  /></div>
+	</div> 
+	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+		<img id="profile-link" src="images/link-icon.gif" alt="Insert web link" title="Insert web link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" />
+	</div> 
+	<div id="profile-youtube-wrapper" style="display: $visitor;" >
+		<img id="profile-video" src="images/youtube_icon.gif" alt="Insert YouTube video" title="Insert YouTube video" onclick="jotGetVideo();" />
+	</div> 
+	<div id="profile-location-wrapper" style="display: $visitor;" >
+		<img id="profile-location" src="images/globe.gif" alt="Set your location" title="Set your location" onclick="jotGetLocation();" />
+	</div> 
+	<div id="profile-nolocation-wrapper" style="display: none;" >
+		<img id="profile-nolocation" src="images/noglobe.gif" alt="Clear Browser Location" title="Clear Browser Location" onclick="jotClearLocation();" />
+	</div> 
+	<div id="profile-rotator-wrapper" style="display: $visitor;" >
+		<img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
+	</div> 
+	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper');" />$bang</div>
+	<div id="profile-jot-perms-end"></div>
+	<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
diff --git a/view/en/netfriend.tpl b/view/en/netfriend.tpl
new file mode 100644
index 000000000..b041ec49f
--- /dev/null
+++ b/view/en/netfriend.tpl
@@ -0,0 +1,14 @@
+<div class="intro-approve-as-friend-desc">Approve as: </div>
+
+<div class="intro-approve-as-friend-wrapper">
+	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Friend</label>
+	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
+	<div class="intro-approve-friend-break" ></div>	
+</div>
+<div class="intro-approve-as-friend-end"></div>
+<div class="intro-approve-as-fan-wrapper">
+	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">Fan/Admirer</label>
+	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
+	<div class="intro-approve-fan-break"></div>
+</div>
+<div class="intro-approve-as-end"></div>
diff --git a/view/en/pagetypes.tpl b/view/en/pagetypes.tpl
new file mode 100644
index 000000000..2036614ab
--- /dev/null
+++ b/view/en/pagetypes.tpl
@@ -0,0 +1,25 @@
+
+		<div id="settings-normal-wrapper">
+			<label id="settings-normal-label" for="settings-normal">Normal Profile</label>
+			<input type="radio" name="page-flags" id="settings-normal" $normal_selected value="$page_normal" />
+			<span id="settings-normal-desc">This account is a normal personal profile</span>
+		</div>
+		<div id="settings-normal-break" ></div>	
+		<div id="settings-soapbox-wrapper">
+			<label id="settings-soapbox-label" for="settings-soapbox">Soapbox Profile</label>
+			<input type="radio" name="page-flags" id="settings-soapbox" $soapbox_selected value="$page_soapbox" />
+			<span id="settings-soapbox-desc">Automatically approve all connection/friend requests as read-only fans</span>
+		</div>
+		<div id="settings-soapbox-break" ></div>	
+		<div id="settings-community-wrapper">
+			<label id="settings-community-label" for="settings-community">Community/Celebrity Profile</label>
+			<input type="radio" name="page-flags" id="settings-community" $community_selected value="$page_community" />
+			<span id="settings-community-desc">Automatically approve all connection/friend requests as read-write fans</span>
+		</div>
+		<div id="settings-community-break" ></div>	
+		<div id="settings-freelove-wrapper">
+			<label id="settings-freelove-label" for="settings-freelove">Automatic Friend Profile</label>
+			<input type="radio" name="page-flags" id="settings-freelove" $freelove_selected value="$page_freelove" />
+			<span id="settings-freelove-desc">Automatically approve all connection/friend requests as friends</span>
+		</div>
+			<div id="settings-freelove-break" ></div>	
diff --git a/view/en/profile-hide-friends.tpl b/view/en/profile-hide-friends.tpl
new file mode 100644
index 000000000..54ade00fe
--- /dev/null
+++ b/view/en/profile-hide-friends.tpl
@@ -0,0 +1,16 @@
+<p id="hide-friends-text">
+Hide my contact/friend list from viewers of this profile?
+</p>
+
+		<div id="hide-friends-yes-wrapper">
+		<label id="hide-friends-yes-label" for="hide-friends-yes">Yes</label>
+		<input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" />
+
+		<div id="hide-friends-break" ></div>	
+		</div>
+		<div id="hide-friends-no-wrapper">
+		<label id="hide-friends-no-label" for="hide-friends-no">No</label>
+		<input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0"  />
+
+		<div id="hide-friends-end"></div>
+		</div>
diff --git a/view/en/profile-in-directory.tpl b/view/en/profile-in-directory.tpl
new file mode 100644
index 000000000..98af3e59a
--- /dev/null
+++ b/view/en/profile-in-directory.tpl
@@ -0,0 +1,16 @@
+<p id="profile-in-directory">
+Publish your default profile in site directory? 
+</p>
+
+		<div id="profile-in-dir-yes-wrapper">
+		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Yes</label>
+		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" />
+
+		<div id="profile-in-dir-break" ></div>	
+		</div>
+		<div id="profile-in-dir-no-wrapper">
+		<label id="profile-in-dir-no-label" for="profile-in-dir-no">No</label>
+		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0"  />
+
+		<div id="profile-in-dir-end"></div>
+		</div>
diff --git a/view/en/profile-in-netdir.tpl b/view/en/profile-in-netdir.tpl
new file mode 100644
index 000000000..be111aa67
--- /dev/null
+++ b/view/en/profile-in-netdir.tpl
@@ -0,0 +1,16 @@
+<p id="profile-in-directory">
+Publish your default profile in global social directory? 
+</p>
+
+		<div id="profile-in-netdir-yes-wrapper">
+		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Yes</label>
+		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />
+
+		<div id="profile-in-netdir-break" ></div>	
+		</div>
+		<div id="profile-in-netdir-no-wrapper">
+		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">No</label>
+		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0"  />
+
+		<div id="profile-in-netdir-end"></div>
+		</div>
diff --git a/view/en/profile_edit.tpl b/view/en/profile_edit.tpl
new file mode 100644
index 000000000..8d32226bc
--- /dev/null
+++ b/view/en/profile_edit.tpl
@@ -0,0 +1,276 @@
+<h1>Edit Profile Details</h1>
+
+<div id="profile-edit-links">
+<ul>
+<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">View this profile</a></li>
+<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clone this profile</a></li>
+<li></li>
+<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></li>
+
+</ul>
+</div>
+
+<div id="profile-edit-links-end"></div>
+
+$default
+
+<div id="profile-edit-wrapper" >
+<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
+
+<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>
+</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" />
+</div>
+<div id="profile-edit-name-end"></div>
+
+<div id="profile-edit-gender-wrapper" >
+<label id="profile-edit-gender-label" for="gender-select" >Your Gender: </label>
+$gender
+</div>
+<div id="profile-edit-gender-end"></div>
+
+<div id="profile-edit-dob-wrapper" >
+<label id="profile-edit-dob-label" for="dob-select" >Birthday (y/m/d): </label>
+<div id="profile-edit-dob" >
+$dob $age
+</div>
+<div id="profile-edit-dob-end"></div>
+
+$hide_friends
+
+<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" />
+</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" />
+</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" />
+</div>
+<div id="profile-edit-postal-code-end"></div>
+
+<div id="profile-edit-country-name-wrapper" >
+<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>
+<option>temp</option>
+</select>
+</div>
+<div id="profile-edit-country-name-end"></div>
+
+<div id="profile-edit-region-wrapper" >
+<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>
+<option>temp</option>
+</select>
+</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>
+$marital
+</div>
+<div id="profile-edit-marital-end"></div>
+
+<div id="profile-edit-sexual-wrapper" >
+<label id="profile-edit-sexual-label" for="sexual-select" >Sexual Preference: </label>
+$sexual
+</div>
+<div id="profile-edit-sexual-end"></div>
+
+
+
+<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" />
+</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>
+
+<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="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
+
+</div>
+<div id="about-jot-end"></div>
+</div>
+
+
+<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 and Social Networks 
+</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 class="profile-edit-submit-end"></div>
+
+
+</form>
+</div>
+<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
\ No newline at end of file
diff --git a/view/en/profile_tabs.tpl b/view/en/profile_tabs.tpl
new file mode 100644
index 000000000..9c6c54a1c
--- /dev/null
+++ b/view/en/profile_tabs.tpl
@@ -0,0 +1,7 @@
+
+<div id="profile-tabs-wrapper" >
+	<a href="$url" id="profile-tab-status-link" class="profile-tabs" >Status</a>
+	<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profile</a>
+	<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Photos</a>
+<div id="profile-tabs-end"></div>
+</div>
\ No newline at end of file
diff --git a/view/group_edit.tpl b/view/group_edit.tpl
deleted file mode 100644
index e6c7afb49..000000000
--- a/view/group_edit.tpl
+++ /dev/null
@@ -1,24 +0,0 @@
-<h2>Group Editor</h2>
-
-
-<div id="group-edit-wrapper" >
-<form action="group/$gid" id="group-edit-form" method="post" >
-<div id="group-edit-name-wrapper" >
-<label id="group-edit-name-label" for="group-edit-name" >Group Name: </label>
-<input type="text" id="group-edit-name" name="groupname" value="$name" />
-</div>
-<div id="group-edit-name-end"></div>
-<div id="group-edit-select-wrapper" >
-<label id="group_members_select_label"  for="group_members_select" >Members:</label>
-$selector
-
-</div>
-$drop
-<div id="group_members_select_end"></div>
-<div id="group-edit-submit-wrapper" >
-<input type="submit" name="submit" value="Submit" >
-</div>
-
-<div id="group-edit-select-end" ></div>
-</form>
-</div>
diff --git a/view/group_new.tpl b/view/group_new.tpl
deleted file mode 100644
index a1efa7717..000000000
--- a/view/group_new.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-
-
-
-<div id="group-new-wrapper" >
-<form action="group/new" method="post">
-
-<div id="group-new-text">
-<p>
-Create a group of contacts/friends.
-
-<div id="group-new-input-wrapper">
-<label id="group-new-label" for="group-new-name" >Group Name: </label>
-<input name="groupname" id="group-new-name" />
-</div>
-<div id="group-new-input-end" ></div>
-
-<div id="group-new-submit-wrapper" >
-<input type="submit" name="submit" value="Submit" />
-</form>
-</div>
-<div id="group-new-end"></div>
-
- 
\ No newline at end of file
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
deleted file mode 100644
index 81c513484..000000000
--- a/view/jot-header.tpl
+++ /dev/null
@@ -1,129 +0,0 @@
-
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "specific_textareas",
-	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "center",
-	theme_advanced_blockformats : "blockquote,code",
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	convert_urls: false,
-	content_css: "$baseurl/view/custom_tinymce.css",
-	     //Character count
-	theme_advanced_path : false,
-	setup : function(ed) {
-		ed.onKeyUp.add(function(ed, e) {
-			var txt = tinyMCE.activeEditor.getContent();
-			var text = txt.length;
-			if(txt.length <= 140) {
-				$('#character-counter').removeClass('red');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('grey');
-			}
-			if((txt.length > 140) && (txt .length <= 420)) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('red');
-				$('#character-counter').addClass('orange');
-			}
-			if(txt.length > 420) {
-				$('#character-counter').removeClass('grey');
-				$('#character-counter').removeClass('orange');
-				$('#character-counter').addClass('red');
-			}
-			$('#character-counter').text(text);
-    		});
-     	}
-});
-
-</script>
-<script type="text/javascript" src="include/ajaxupload.js" ></script>
-<script>
-	$(document).ready(function() {
-		var uploader = new window.AjaxUpload(
-			'wall-image-upload',
-			{ action: 'wall_upload',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
-			var selstr;
-			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
-				selstr = $(this).text();
-				$('#profile-jot-perms img').attr('src', 'images/lock_icon.gif');
-
-			});
-			if(selstr == null)
-				$('#profile-jot-perms img').attr('src', 'images/unlock_icon.gif');
-
-		}).trigger('change');
-
-	});
-
-	function jotGetLink() {
-		reply = prompt("Please enter a link URL:");
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotGetVideo() {
-		reply = prompt("Please enter a YouTube link:");
-		if(reply && reply.length) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,'[youtube]' + reply + '[/youtube]');
-		}
-	}
-
-	function jotGetLocation() {
-		reply = prompt("Where are you right now?", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-
-	function linkdropper(event) {
-		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-		if(linkFound)
-			event.preventDefault();
-	}
-
-	function linkdrop(event) {
-		var reply = event.dataTransfer.getData("text/uri-list");
-		event.target.textContent = reply;
-		event.preventDefault();
-		if(reply && reply.length) {
-			$('#profile-rotator').show();
-			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
-				$('#profile-rotator').hide();
-			});
-		}
-	}
-
-	function jotClearLocation() {
-		$('#jot-coord').val('');
-		$('#profile-nolocation-wrapper').hide();
-	}
-
-	$geotag
-
-</script>
-
diff --git a/view/jot-plain.tpl b/view/jot-plain.tpl
deleted file mode 100644
index e3d2fa687..000000000
--- a/view/jot-plain.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-<p id="profile-jot-desc" >
-What's on your mind?
-</p>
-<form id="profile-jot-form" action="item" method="post" >
-<input type="hidden" name="type" value="jot" />
-<textarea rows="5" cols="64" id="profile-jot-text" name="body" ></textarea>
-
-</div>
-<div id="profile-jot-submit-wrapper" >
-<input type="submit" id="profile-jot-submit" name="submit" value="Submit" onclick="doCheck();" />
-</div>
-</div>
-<div id="profile-jot-end"></div>
diff --git a/view/jot-save.tpl b/view/jot-save.tpl
deleted file mode 100644
index 6de692e07..000000000
--- a/view/jot-save.tpl
+++ /dev/null
@@ -1,31 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-<p id="profile-jot-desc" >
-What's on your mind?
-</p>
-<form id="profile-jot-form" action="item" method="post" onclick="doCheck();" >
-<input type="hidden" name="type" value="jot" />
-        <div class="richeditor">
-                <div class="editbar">
-                        <button title="bold" onclick="doClick('bold');" type="button"><b>B</b></button>
-                        <button title="italic" onclick="doClick('italic');" type="button"><i>I</i></button>
-                        <button title="underline" onclick="doClick('underline');" type="button"><u>U</u></button>
-                        <button title="hyperlink" onclick="doLink();" type="button" style="background-image:url('editor/images/url.gif');"></button>
-                        <button title="image" onclick="doImage();" type="button" style="background-image:url('editor/images/img.gif');"></button>
-                        <button title="list" onclick="doClick('InsertUnorderedList');" type="button" style="background-image:url('editor/images/icon_list.gif');"></button>
-                        <button title="color" onclick="showColorGrid2('none')" type="button" style="background-image:url('$baseurl/editor/images/colors.gif');"></button><span id="colorpicker201" class="colorpicker201"></span>
-                        <button title="quote" onclick="doQuote();" type="button" style="background-image:url('editor/images/icon_quote.png');"></button>
-                        <button title="youtube" onclick="InsertYoutube();" type="button" style="background-image:url('editor/images/icon_youtube.gif');"></button>
-                        <button title="switch to source" type="button" onclick="javascript:SwitchEditor()" style="background-image:url('editor/images/icon_html.gif');"></button>
-		</div>
-
-<textarea rows="5" cols="64" id="profile-jot-text" name="body" ></textarea>
-<script type="text/javascript">initEditor("profile-jot-text", true);</script>
-
-</div>
-<div id="profile-jot-submit-wrapper" >
-<input type="submit" id="profile-jot-submit" name="submit" value="Submit" onclick="doCheck();" />
-
-</div>
-<div id="profile-jot-end"></div>
-</div>
\ No newline at end of file
diff --git a/view/jot.tpl b/view/jot.tpl
deleted file mode 100644
index 6590cace8..000000000
--- a/view/jot.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-	<div id="profile-jot-banner-wrapper">
-		<div id="profile-jot-desc" >&nbsp;</div>
-		<div id="character-counter" class="grey"></div>
-	</div>
-	<div id="profile-jot-banner-end"></div>
-
-	<form id="profile-jot-form" action="item" method="post" >
-		<input type="hidden" name="type" value="wall" />
-		<input type="hidden" name="profile_uid" value="$profile_uid" />
-		<input type="hidden" name="return" value="$return_path" />
-		<input type="hidden" name="location" id="jot-location" value="$defloc" />
-		<input type="hidden" name="coord" id="jot-coord" value="" />
-
-		<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" ></textarea>
-
-<div id="profile-jot-submit-wrapper" >
-<input type="submit" id="profile-jot-submit" name="submit" value="Share" />
-	<div id="profile-upload-wrapper" style="display: $visitor;" >
-		<div id="wall-image-upload-div" ><img id="wall-image-upload" src="images/camera-icon.gif" alt="Upload Photo" title="Upload Photo"  /></div>
-	</div> 
-	<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-		<img id="profile-link" src="images/link-icon.gif" alt="Insert web link" title="Insert web link" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" />
-	</div> 
-	<div id="profile-youtube-wrapper" style="display: $visitor;" >
-		<img id="profile-video" src="images/youtube_icon.gif" alt="Insert YouTube video" title="Insert YouTube video" onclick="jotGetVideo();" />
-	</div> 
-	<div id="profile-location-wrapper" style="display: $visitor;" >
-		<img id="profile-location" src="images/globe.gif" alt="Set your location" title="Set your location" onclick="jotGetLocation();" />
-	</div> 
-	<div id="profile-nolocation-wrapper" style="display: none;" >
-		<img id="profile-nolocation" src="images/noglobe.gif" alt="Clear Browser Location" title="Clear Browser Location" onclick="jotClearLocation();" />
-	</div> 
-	<div id="profile-rotator-wrapper" style="display: $visitor;" >
-		<img id="profile-rotator" src="images/rotator.gif" alt="Please wait" title="Please wait" style="display: none;" />
-	</div> 
-	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img id="jot-perms-icon" src="images/$lockstate_icon.gif"  alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper');" />$bang</div>
-	<div id="profile-jot-perms-end"></div>
-	<div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div>
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
diff --git a/view/netfriend.tpl b/view/netfriend.tpl
deleted file mode 100644
index b041ec49f..000000000
--- a/view/netfriend.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="intro-approve-as-friend-desc">Approve as: </div>
-
-<div class="intro-approve-as-friend-wrapper">
-	<label class="intro-approve-as-friend-label" for="intro-approve-as-friend-$intro_id">Friend</label>
-	<input type="radio" name="duplex" id="intro-approve-as-friend-$intro_id" class="intro-approve-as-friend" $friend_selected value="1" />
-	<div class="intro-approve-friend-break" ></div>	
-</div>
-<div class="intro-approve-as-friend-end"></div>
-<div class="intro-approve-as-fan-wrapper">
-	<label class="intro-approve-as-fan-label" for="intro-approve-as-fan-$intro_id">Fan/Admirer</label>
-	<input type="radio" name="duplex" id="intro-approve-as-fan-$intro_id" class="intro-approve-as-fan" $fan_selected value="0"  />
-	<div class="intro-approve-fan-break"></div>
-</div>
-<div class="intro-approve-as-end"></div>
diff --git a/view/pagetypes.tpl b/view/pagetypes.tpl
deleted file mode 100644
index 2036614ab..000000000
--- a/view/pagetypes.tpl
+++ /dev/null
@@ -1,25 +0,0 @@
-
-		<div id="settings-normal-wrapper">
-			<label id="settings-normal-label" for="settings-normal">Normal Profile</label>
-			<input type="radio" name="page-flags" id="settings-normal" $normal_selected value="$page_normal" />
-			<span id="settings-normal-desc">This account is a normal personal profile</span>
-		</div>
-		<div id="settings-normal-break" ></div>	
-		<div id="settings-soapbox-wrapper">
-			<label id="settings-soapbox-label" for="settings-soapbox">Soapbox Profile</label>
-			<input type="radio" name="page-flags" id="settings-soapbox" $soapbox_selected value="$page_soapbox" />
-			<span id="settings-soapbox-desc">Automatically approve all connection/friend requests as read-only fans</span>
-		</div>
-		<div id="settings-soapbox-break" ></div>	
-		<div id="settings-community-wrapper">
-			<label id="settings-community-label" for="settings-community">Community/Celebrity Profile</label>
-			<input type="radio" name="page-flags" id="settings-community" $community_selected value="$page_community" />
-			<span id="settings-community-desc">Automatically approve all connection/friend requests as read-write fans</span>
-		</div>
-		<div id="settings-community-break" ></div>	
-		<div id="settings-freelove-wrapper">
-			<label id="settings-freelove-label" for="settings-freelove">Automatic Friend Profile</label>
-			<input type="radio" name="page-flags" id="settings-freelove" $freelove_selected value="$page_freelove" />
-			<span id="settings-freelove-desc">Automatically approve all connection/friend requests as friends</span>
-		</div>
-			<div id="settings-freelove-break" ></div>	
diff --git a/view/profile-hide-friends.tpl b/view/profile-hide-friends.tpl
deleted file mode 100644
index 54ade00fe..000000000
--- a/view/profile-hide-friends.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="hide-friends-text">
-Hide my contact/friend list from viewers of this profile?
-</p>
-
-		<div id="hide-friends-yes-wrapper">
-		<label id="hide-friends-yes-label" for="hide-friends-yes">Yes</label>
-		<input type="radio" name="hide-friends" id="hide-friends-yes" $yes_selected value="1" />
-
-		<div id="hide-friends-break" ></div>	
-		</div>
-		<div id="hide-friends-no-wrapper">
-		<label id="hide-friends-no-label" for="hide-friends-no">No</label>
-		<input type="radio" name="hide-friends" id="hide-friends-no" $no_selected value="0"  />
-
-		<div id="hide-friends-end"></div>
-		</div>
diff --git a/view/profile-in-directory.tpl b/view/profile-in-directory.tpl
deleted file mode 100644
index 98af3e59a..000000000
--- a/view/profile-in-directory.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-Publish your default profile in site directory? 
-</p>
-
-		<div id="profile-in-dir-yes-wrapper">
-		<label id="profile-in-dir-yes-label" for="profile-in-dir-yes">Yes</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-dir-break" ></div>	
-		</div>
-		<div id="profile-in-dir-no-wrapper">
-		<label id="profile-in-dir-no-label" for="profile-in-dir-no">No</label>
-		<input type="radio" name="profile_in_directory" id="profile-in-dir-no" $no_selected value="0"  />
-
-		<div id="profile-in-dir-end"></div>
-		</div>
diff --git a/view/profile-in-netdir.tpl b/view/profile-in-netdir.tpl
deleted file mode 100644
index be111aa67..000000000
--- a/view/profile-in-netdir.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<p id="profile-in-directory">
-Publish your default profile in global social directory? 
-</p>
-
-		<div id="profile-in-netdir-yes-wrapper">
-		<label id="profile-in-netdir-yes-label" for="profile-in-netdir-yes">Yes</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-yes" $yes_selected value="1" />
-
-		<div id="profile-in-netdir-break" ></div>	
-		</div>
-		<div id="profile-in-netdir-no-wrapper">
-		<label id="profile-in-netdir-no-label" for="profile-in-netdir-no">No</label>
-		<input type="radio" name="profile_in_netdirectory" id="profile-in-netdir-no" $no_selected value="0"  />
-
-		<div id="profile-in-netdir-end"></div>
-		</div>
diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl
deleted file mode 100644
index 8d32226bc..000000000
--- a/view/profile_edit.tpl
+++ /dev/null
@@ -1,276 +0,0 @@
-<h1>Edit Profile Details</h1>
-
-<div id="profile-edit-links">
-<ul>
-<li><a href="profile/$profile_id/view?tab=profile" id="profile-edit-view-link" title="View this profile">View this profile</a></li>
-<li><a href="profiles/clone/$profile_id" id="profile-edit-clone-link" title="Create a new profile using these settings">Clone this profile</a></li>
-<li></li>
-<li><a href="profiles/drop/$profile_id" id="profile-edit-drop-link" title="Delete this profile" $disabled >Delete this profile</a></li>
-
-</ul>
-</div>
-
-<div id="profile-edit-links-end"></div>
-
-$default
-
-<div id="profile-edit-wrapper" >
-<form id="profile-edit-form" name="form1" action="profiles/$profile_id" method="post" >
-
-<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>
-</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" />
-</div>
-<div id="profile-edit-name-end"></div>
-
-<div id="profile-edit-gender-wrapper" >
-<label id="profile-edit-gender-label" for="gender-select" >Your Gender: </label>
-$gender
-</div>
-<div id="profile-edit-gender-end"></div>
-
-<div id="profile-edit-dob-wrapper" >
-<label id="profile-edit-dob-label" for="dob-select" >Birthday (y/m/d): </label>
-<div id="profile-edit-dob" >
-$dob $age
-</div>
-<div id="profile-edit-dob-end"></div>
-
-$hide_friends
-
-<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" />
-</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" />
-</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" />
-</div>
-<div id="profile-edit-postal-code-end"></div>
-
-<div id="profile-edit-country-name-wrapper" >
-<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>
-<option>temp</option>
-</select>
-</div>
-<div id="profile-edit-country-name-end"></div>
-
-<div id="profile-edit-region-wrapper" >
-<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>
-<option>temp</option>
-</select>
-</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>
-$marital
-</div>
-<div id="profile-edit-marital-end"></div>
-
-<div id="profile-edit-sexual-wrapper" >
-<label id="profile-edit-sexual-label" for="sexual-select" >Sexual Preference: </label>
-$sexual
-</div>
-<div id="profile-edit-sexual-end"></div>
-
-
-
-<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" />
-</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>
-
-<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="10" cols="72" id="profile-jot-text" name="about" >$about</textarea>
-
-</div>
-<div id="about-jot-end"></div>
-</div>
-
-
-<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 and Social Networks 
-</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 class="profile-edit-submit-end"></div>
-
-
-</form>
-</div>
-<script type="text/javascript">Fill_Country('$country_name');Fill_States('$region');</script>
\ No newline at end of file
diff --git a/view/profile_tabs.tpl b/view/profile_tabs.tpl
deleted file mode 100644
index 9c6c54a1c..000000000
--- a/view/profile_tabs.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-
-<div id="profile-tabs-wrapper" >
-	<a href="$url" id="profile-tab-status-link" class="profile-tabs" >Status</a>
-	<a href="$url?tab=profile" id="profile-tab-profile-link" class="profile-tabs" >Profile</a>
-	<a href="$phototab" id="profile-tab-photos-link" class="profile-tabs" >Photos</a>
-<div id="profile-tabs-end"></div>
-</div>
\ No newline at end of file
-- 
cgit v1.2.3