From 7b92b42603bca729bdef81349c578b65bf7ab256 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 14 Mar 2011 00:28:49 -0700
Subject: keywords split into public and private. Public will be used by the
 friend finder.

---
 view/en/profile_edit.tpl | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'view/en')

diff --git a/view/en/profile_edit.tpl b/view/en/profile_edit.tpl
index b0d4850d0..6c7d74daf 100644
--- a/view/en/profile_edit.tpl
+++ b/view/en/profile_edit.tpl
@@ -134,11 +134,17 @@ $sexual
 </div>
 <div id="profile-edit-religion-end"></div>
 
-<div id="profile-edit-keywords-wrapper" >
-<label id="profile-edit-keywords-label" for="profile-edit-keywords" >Keywords: </label>
-<input type="text" size="32" name="keywords" id="profile-edit-keywords" title="Example: fishing photography software" value="$keywords" />
-</div><div id="profile-edit-keywords-desc">(Used for searching public profiles, never shown to others)</div>
-<div id="profile-edit-keywords-end"></div>
+<div id="profile-edit-pubkeywords-wrapper" >
+<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
+</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
+<div id="profile-edit-pubkeywords-end"></div>
+
+<div id="profile-edit-prvkeywords-wrapper" >
+<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
+</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
+<div id="profile-edit-prvkeywords-end"></div>
 
 
 <div class="profile-edit-submit-wrapper" >
-- 
cgit v1.2.3


From f01538a54f68c172e09aabed90e2651ca2305675 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 15 Mar 2011 17:31:49 -0700
Subject: content expiration

---
 view/en/settings.tpl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'view/en')

diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index 97d67cbf6..39b18c126 100644
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -76,9 +76,8 @@ $profile_in_dir
 $profile_in_net_dir
 
 
-
 <div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >&#x21e9; $permissions</div>
+	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
 	<div id="settings-default-perms-menu-end"></div>
 
 	<div id="settings-default-perms-select" style="display: none;" >
@@ -89,6 +88,10 @@ $profile_in_net_dir
 </div>
 <div id="settings-default-perms-end"></div>
 
+<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
+<div id="settings-expire-end"></div>
+
+
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="Submit" />
 </div>
-- 
cgit v1.2.3


From 3f432a7b82480dd985dbc2a67ae23cfc1ed258c6 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 16 Mar 2011 19:36:59 -0700
Subject: share,retweet,relay,forward, whatever

---
 view/en/jot-header.tpl | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'view/en')

diff --git a/view/en/jot-header.tpl b/view/en/jot-header.tpl
index fe818410e..20f84b851 100644
--- a/view/en/jot-header.tpl
+++ b/view/en/jot-header.tpl
@@ -111,6 +111,14 @@ tinyMCE.init({
 		}
 	}
 
+	function jotShare(id) {
+		$('#like-rotator-' + id).show();
+		$.get('share/' + id, function(data) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+			$('#like-rotator-' + id).hide();
+			$(window).scrollTop(0);
+		});
+	}
 
 	function linkdropper(event) {
 		var linkFound = event.dataTransfer.types.contains("text/uri-list");
-- 
cgit v1.2.3


From 334353e502db5abd7ee248d183a915ff7468de3a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 16 Mar 2011 21:14:22 -0700
Subject: vorbis audio/video link buttons

---
 view/en/jot-header.tpl | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'view/en')

diff --git a/view/en/jot-header.tpl b/view/en/jot-header.tpl
index 20f84b851..d73fe7d62 100644
--- a/view/en/jot-header.tpl
+++ b/view/en/jot-header.tpl
@@ -104,6 +104,21 @@ tinyMCE.init({
 		}
 	}
 
+	function jotVideoURL() {
+		reply = prompt("Please enter a video(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+		}
+	}
+
+	function jotAudioURL() {
+		reply = prompt("Please enter an audio(.ogg) link/URL:");
+		if(reply && reply.length) {
+			tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+		}
+	}
+
+
 	function jotGetLocation() {
 		reply = prompt("Where are you right now?", $('#jot-location').val());
 		if(reply && reply.length) {
-- 
cgit v1.2.3


From b7292bc673bc7983b1fd933070bc9d6a0a155dbb Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 20 Mar 2011 17:54:50 -0700
Subject: user pref -> block remote wall posting

---
 view/en/settings.tpl | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'view/en')

diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index 39b18c126..45060e1c4 100644
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -88,6 +88,14 @@ $profile_in_net_dir
 </div>
 <div id="settings-default-perms-end"></div>
 
+<div id="settings-blockw-wrapper" >
+<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile: </label>
+<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
+</div>
+<div id="settings-blockw-end" ></div>
+
+
+
 <div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
 <div id="settings-expire-end"></div>
 
-- 
cgit v1.2.3


From 5f9f03daf781b95b5685a19d450800aad879c0de Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Sun, 20 Mar 2011 19:29:01 -0700
Subject: simplify insecure network warning

---
 view/en/insecure_net.tpl | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 view/en/insecure_net.tpl

(limited to 'view/en')

diff --git a/view/en/insecure_net.tpl b/view/en/insecure_net.tpl
deleted file mode 100644
index 5628639cc..000000000
--- a/view/en/insecure_net.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<div id="profile-edit-insecure">
-<p>
-The social network that $name belongs to is an open network with limited or non-existent privacy controls. 
-Please use appropriate discretion.
-</p>
-</div>
\ No newline at end of file
-- 
cgit v1.2.3


From 798c83b6aa3887622299ec4071c0d817953f3db9 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 21 Mar 2011 00:21:35 -0700
Subject: localise some more templates

---
 view/en/jot-header.tpl | 165 -------------------------------------------------
 view/en/msg-header.tpl | 104 -------------------------------
 2 files changed, 269 deletions(-)
 delete mode 100644 view/en/jot-header.tpl
 delete mode 100644 view/en/msg-header.tpl

(limited to 'view/en')

diff --git a/view/en/jot-header.tpl b/view/en/jot-header.tpl
deleted file mode 100644
index d73fe7d62..000000000
--- a/view/en/jot-header.tpl
+++ /dev/null
@@ -1,165 +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">
-
-var editor;
-
-tinyMCE.init({
-	theme : "advanced",
-	mode : "specific_textareas",
-	editor_selector: /(profile-jot-text|prvmail-text)/,
-	plugins : "bbcode,paste",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "center",
-	theme_advanced_blockformats : "blockquote,code",
-	paste_text_sticky : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	force_p_newlines : false,
-	force_br_newlines : true,
-	forced_root_block : '',
-	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);
-    	});
-
-		ed.onInit.add(function(ed) {
-			ed.pasteAsPlainText = true;
-		});
-
-	}
-});
-
-</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/$nickname',
-				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');
-				$('.profile-jot-net input').attr('disabled', 'disabled');
-			});
-			if(selstr == null) { 
-				$('#profile-jot-perms img').attr('src', 'images/unlock_icon.gif');
-				$('.profile-jot-net input').attr('disabled', false);
-			}
-
-		}).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 jotVideoURL() {
-		reply = prompt("Please enter a video(.ogg) link/URL:");
-		if(reply && reply.length) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
-		}
-	}
-
-	function jotAudioURL() {
-		reply = prompt("Please enter an audio(.ogg) link/URL:");
-		if(reply && reply.length) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
-		}
-	}
-
-
-	function jotGetLocation() {
-		reply = prompt("Where are you right now?", $('#jot-location').val());
-		if(reply && reply.length) {
-			$('#jot-location').val(reply);
-		}
-	}
-
-	function jotShare(id) {
-		$('#like-rotator-' + id).show();
-		$.get('share/' + id, function(data) {
-			tinyMCE.execCommand('mceInsertRawHTML',false,data);
-			$('#like-rotator-' + id).hide();
-			$(window).scrollTop(0);
-		});
-	}
-
-	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/msg-header.tpl b/view/en/msg-header.tpl
deleted file mode 100644
index 174e6c985..000000000
--- a/view/en/msg-header.tpl
+++ /dev/null
@@ -1,104 +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,paste",
-	theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor",
-	theme_advanced_buttons2 : "",
-	theme_advanced_buttons3 : "",
-	theme_advanced_toolbar_location : "top",
-	theme_advanced_toolbar_align : "center",
-	theme_advanced_blockformats : "blockquote,code",
-	paste_text_sticky : true,
-	entity_encoding : "raw",
-	add_unload_trigger : false,
-	remove_linebreaks : false,
-	force_p_newlines : false,
-	force_br_newlines : true,
-	forced_root_block : '',
-	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);
-    	});
-
-		ed.onInit.add(function(ed) {
-			ed.pasteAsPlainText = true;
-		});
-	}
-});
-
-</script>
-<script type="text/javascript" src="include/ajaxupload.js" ></script>
-<script>
-	$(document).ready(function() {
-		var uploader = new window.AjaxUpload(
-			'prvmail-upload',
-			{ action: 'wall_upload/$nickname',
-				name: 'userfile',
-				onSubmit: function(file,ext) { $('#profile-rotator').show(); },
-				onComplete: function(file,response) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,response);
-					$('#profile-rotator').hide();
-				}				 
-			}
-		);
-
-	});
-
-	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 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();
-			});
-		}
-	}
-
-</script>
-
-- 
cgit v1.2.3


From 94cbf3bb80371d5b4160db8bef1d70f28f8a0d97 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 21 Mar 2011 04:10:08 -0700
Subject: another template down

---
 view/en/profile_tabs.tpl | 7 -------
 1 file changed, 7 deletions(-)
 delete mode 100644 view/en/profile_tabs.tpl

(limited to 'view/en')

diff --git a/view/en/profile_tabs.tpl b/view/en/profile_tabs.tpl
deleted file mode 100644
index 9c6c54a1c..000000000
--- a/view/en/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


From c4b292a4f103eb049c13dbe3c62f0438c18de816 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 22 Mar 2011 03:07:46 -0700
Subject: account/profile/contacts export

---
 view/en/settings.tpl | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'view/en')

diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index 45060e1c4..134fffaf9 100644
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -2,6 +2,8 @@
 
 <div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>
 
+$uexport
+
 $nickname_block
 
 
-- 
cgit v1.2.3


From 6a280c321daedaa8444a2a64e1a824ae60a9229b Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Mon, 28 Mar 2011 18:06:36 -0700
Subject: small wording change

---
 view/en/settings.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/en')

diff --git a/view/en/settings.tpl b/view/en/settings.tpl
index 134fffaf9..9822291c1 100644
--- a/view/en/settings.tpl
+++ b/view/en/settings.tpl
@@ -91,7 +91,7 @@ $profile_in_net_dir
 <div id="settings-default-perms-end"></div>
 
 <div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile: </label>
+<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
 <input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
 </div>
 <div id="settings-blockw-end" ></div>
-- 
cgit v1.2.3


From e1fd2ecb16a212c56567ac5c5910d2a2d9754b47 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 29 Mar 2011 15:27:14 -0700
Subject: another template

---
 view/en/head.tpl | 32 --------------------------------
 1 file changed, 32 deletions(-)
 delete mode 100644 view/en/head.tpl

(limited to 'view/en')

diff --git a/view/en/head.tpl b/view/en/head.tpl
deleted file mode 100644
index 8f97a11e5..000000000
--- a/view/en/head.tpl
+++ /dev/null
@@ -1,32 +0,0 @@
-<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-<base href="$baseurl" />
-<meta name="generator" content="$generator" />
-<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
-<link rel="shortcut icon" href="$baseurl/images/friendika-32.png" />
-
-<!--[if IE]>
-<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
-<![endif]-->
-<script type="text/javascript" src="$baseurl/include/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/include/main.js" ></script>
-<script>
-
-	function confirmDelete() { return confirm("Delete this item?"); }
-	function commentOpen(obj,id) {
-		if(obj.value == 'Comment') {
-			obj.value = '';
-			obj.className = "comment-edit-text-full";
-			openMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-	function commentClose(obj,id) {
-		if(obj.value == '') {
-			obj.value = 'Comment';
-			obj.className="comment-edit-text-empty";
-			closeMenu("comment-edit-submit-wrapper-" + id);
-		}
-	}
-
-</script>
-
-
-- 
cgit v1.2.3


From f1db34eebcef28cb0748931153926374f6442be6 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 29 Mar 2011 17:19:12 -0700
Subject: more templates gone

---
 view/en/cropbody.tpl            | 57 -----------------------------------------
 view/en/intros-top.tpl          |  7 -----
 view/en/registrations-top.tpl   |  3 ---
 view/en/settings_nick_unset.tpl | 14 ----------
 4 files changed, 81 deletions(-)
 delete mode 100644 view/en/cropbody.tpl
 delete mode 100644 view/en/intros-top.tpl
 delete mode 100644 view/en/registrations-top.tpl
 delete mode 100644 view/en/settings_nick_unset.tpl

(limited to 'view/en')

diff --git a/view/en/cropbody.tpl b/view/en/cropbody.tpl
deleted file mode 100644
index 39395af8e..000000000
--- a/view/en/cropbody.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h1>Crop Image</h1>
-<p id="cropimage-desc">
-Please adjust the image cropping for optimum viewing.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-	function onEndCrop( coords, dimensions ) {
-		$( 'x1' ).value = coords.x1;
-		$( 'y1' ).value = coords.y1;
-		$( 'x2' ).value = coords.x2;
-		$( 'y2' ).value = coords.y2;
-		$( 'width' ).value = dimensions.width;
-		$( 'height' ).value = dimensions.height;
-	}
-
-	Event.observe( window, 'load', function() {
-		new Cropper.ImgWithPreview(
-		'croppa',
-		{
-			previewWrap: 'previewWrap',
-			minWidth: 175,
-			minHeight: 175,
-			maxWidth: 640,
-			maxHeight: 640,
-			ratioDim: { x: 100, y:100 },
-			displayOnInit: true,
-			onEndCrop: onEndCrop
-		}
-		);
-	}
-	);
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Done Editing" />
-</div>
-
-</form>
diff --git a/view/en/intros-top.tpl b/view/en/intros-top.tpl
deleted file mode 100644
index d8b7394a4..000000000
--- a/view/en/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Pending Friend/Connect Notifications</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-
diff --git a/view/en/registrations-top.tpl b/view/en/registrations-top.tpl
deleted file mode 100644
index d8faf3439..000000000
--- a/view/en/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>User registrations waiting for confirm</h1>
-
-
diff --git a/view/en/settings_nick_unset.tpl b/view/en/settings_nick_unset.tpl
deleted file mode 100644
index 903768b59..000000000
--- a/view/en/settings_nick_unset.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Your profile URL is currently <strong>'$baseurl/profile/$uid'</strong>.
-Setting a nickname will allow a friendly profile URL such as
-<strong>'nickname@$basepath'</strong>.
-<br />
-Once set, it can never be changed. The nickname <strong>must</strong> start with a letter; and only letters, numbers, dashes, and underscores are allowed.
-</p>
-<label id="settings-nick-label" for="settings-nick" >URL Nickname: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-
-- 
cgit v1.2.3


From 8357c064ae7eb21ab8ab8b1feec9aa81e5374a9a Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Tue, 29 Mar 2011 19:23:02 -0700
Subject: remove obsolete template

---
 view/en/profile.php | 72 -----------------------------------------------------
 1 file changed, 72 deletions(-)
 delete mode 100644 view/en/profile.php

(limited to 'view/en')

diff --git a/view/en/profile.php b/view/en/profile.php
deleted file mode 100644
index fa7372668..000000000
--- a/view/en/profile.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<!DOCTYPE html ><?php // This is a perfect example of why I prefer to use template files rather than mixed PHP/HTML ?>
-<html>
-<head>
-  <title><?php if(x($page,'title')) echo $page['title']; ?></title>
-  <?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
-</head>
-<body>
-<header><?php if(x($page,'header')) echo $page['header']; ?></header>
-<nav><div id="top-margin"></div><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
-<aside>
-<?php if((is_array($profile)) && count($profile)) { ?>
-<div class="vcard">
-	<?php if(strlen($profile['name'])) { ?>
-		<div class="fn"><?php echo $profile['name']; ?></div>
-	<?php } ?>
-
-	<?php if(strlen($profile['photo'])) { ?>
-		<div id="profile-photo-wrapper"><img class="photo" src="<?php echo $profile['photo']; ?>" alt="<?php echo $profile['name']; ?>" /></div>
-	<?php } ?>
-
-	<div id="profile-extra-links">
-	<ul>
-	<?php if($profile['uid'] != $_SESSION['uid']) { ?>
-	<li><a id="dfrn-request-link" href="dfrn_request/<?php echo $profile['nickname']; ?>">Connect</a></li>
-	<?php } ?>
-	</ul>
-
-	</div>
-
-	<?php if ( (strlen($profile['address'])) 
-		|| (strlen($profile['locality']))
-		|| (strlen($profile['region'])) 
-		|| (strlen($profile['postal-code'])) 
-		|| (strlen($profile['country-name']))) { ?>
-		<div class="location">Location:
-			<div class="adr">
-				<div class="street-address"><?php if(strlen($profile['address'])) echo $profile['address']; ?></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>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['gender'])) { ?>
-		<div class="mf">Gender: <span class="x-gender"><?php echo $profile['gender']; ?></span></div>
-
-	<?php } ?>
-
-	<?php if(strlen($profile['pubkey'])) { ?>
-		<div class="key" style="display: none;"><?php echo $profile['pubkey']; ?></div>
-	<?php } ?>
-</div>
-<?php } ?>
-<?php if(strlen($profile['marital'])) { ?>
-<div class="marital"><span class="marital-label"><span class="heart">&hearts;</span> Status: </span><span class="marital-text"><?php echo $profile['marital']; ?></span></div>
-<?php } ?>
-<?php if(strlen($profile['homepage'])) { ?>
-<div class="homepage"><span class="homepage-label">Homepage: </span><span class="homepage-url"><?php echo linkify($profile['homepage']); ?></span></div>
-<?php } ?>
-<?php if(x($page,'aside')) echo $page['aside'] ?>
-</aside>
-<section>
-<?php if(x($page,'content')) echo $page['content']; ?>
-<div id="page-footer"></div>
-</section>
-<footer>
-<?php if(x($page,'footer')) echo $page['footer']; ?>
-</footer>
-</body>
-</html>
-
-- 
cgit v1.2.3


From c32ed16303fed6e421917156d66a0605038430db Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 6 Apr 2011 22:42:08 -0700
Subject: more templates converted to string files

---
 view/en/directory_header.tpl | 14 --------------
 view/en/group_edit.tpl       | 24 ------------------------
 view/en/group_new.tpl        | 23 -----------------------
 view/en/pagetypes.tpl        | 25 -------------------------
 4 files changed, 86 deletions(-)
 delete mode 100644 view/en/directory_header.tpl
 delete mode 100644 view/en/group_edit.tpl
 delete mode 100644 view/en/group_new.tpl
 delete mode 100644 view/en/pagetypes.tpl

(limited to 'view/en')

diff --git a/view/en/directory_header.tpl b/view/en/directory_header.tpl
deleted file mode 100644
index 03eed62b3..000000000
--- a/view/en/directory_header.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-<h1>Site Directory</h1>
-
-$globaldir
-
-$finding
-
-<div id="directory-search-wrapper">
-<form id="directory-search-form" action="directory" method="get" >
-<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="directory-search-submit" value="Find" />
-</form>
-</div>
-<div id="directory-search-end"></div>
-
diff --git a/view/en/group_edit.tpl b/view/en/group_edit.tpl
deleted file mode 100644
index e6c7afb49..000000000
--- a/view/en/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/en/group_new.tpl b/view/en/group_new.tpl
deleted file mode 100644
index a1efa7717..000000000
--- a/view/en/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/en/pagetypes.tpl b/view/en/pagetypes.tpl
deleted file mode 100644
index 2036614ab..000000000
--- a/view/en/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>	
-- 
cgit v1.2.3


From 4043ede08052846fd02751519b1568d6b8987bfd Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 6 Apr 2011 23:03:54 -0700
Subject: more templates

---
 view/en/dfrn_req_confirm.tpl | 17 -----------------
 view/en/lostpass.tpl         | 18 ------------------
 2 files changed, 35 deletions(-)
 delete mode 100644 view/en/dfrn_req_confirm.tpl
 delete mode 100644 view/en/lostpass.tpl

(limited to 'view/en')

diff --git a/view/en/dfrn_req_confirm.tpl b/view/en/dfrn_req_confirm.tpl
deleted file mode 100644
index f053f22af..000000000
--- a/view/en/dfrn_req_confirm.tpl
+++ /dev/null
@@ -1,17 +0,0 @@
-
-<p id="dfrn-request-homecoming" >
-Welcome home $username. 
-<br />
-Please confirm your introduction to $dfrn_url.
-
-</p>
-<form id="dfrn-request-homecoming-form" action="dfrn_request/$nickname" method="post"> 
-<input type="hidden" name="dfrn_url" value="$dfrn_url" />
-<input type="hidden" name="confirm_key" value="$confirm_key" />
-<input type="hidden" name="localconfirm" value="1" />
-$aes_allow
-
-<div id="dfrn-request-homecoming-submit-wrapper" >
-<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="Confirm" />
-</div>
-</form>
\ No newline at end of file
diff --git a/view/en/lostpass.tpl b/view/en/lostpass.tpl
deleted file mode 100644
index a7040c149..000000000
--- a/view/en/lostpass.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<h3>Forgot your Password?</h3>
-
-<p id="lostpass-desc">
-Enter your email address and submit to have your password reset. Then check your email for further instructions.
-</p>
-
-<form action="lostpass" method="post" >
-<div id="login-name-wrapper">
-        <label for="login-name" id="label-login-name">Nickname or Email: </label>
-        <input type="text" maxlength="60" name="login-name" id="login-name" value="" />
-</div>
-<div id="login-extra-end"></div>
-<div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="Reset" />
-</div>
-<div id="login-submit-end"></div>
-</form>
-
-- 
cgit v1.2.3


From 000efa6df0ab2510e56d6ffb9a1c6e9f98ac2fc1 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 6 Apr 2011 23:38:40 -0700
Subject: Add some text suggesting that new folks add some basic profile
 information if they want to make any friends.

---
 view/en/register_open_eml.tpl | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'view/en')

diff --git a/view/en/register_open_eml.tpl b/view/en/register_open_eml.tpl
index 8a00f21e9..221e6ec74 100644
--- a/view/en/register_open_eml.tpl
+++ b/view/en/register_open_eml.tpl
@@ -11,7 +11,20 @@ Password:	$password
 You may change your password from your account "Settings" page after logging 
 in.
 
-Please take a few moments to review the other account settings on that page. 
+Please take a few moments to review the other account settings on that page.
+
+You may also wish to add some basic information to your default profile 
+(on the "Profiles" page) so that other people can easily find you.
+
+We recommend setting your full name, adding a profile photo,
+adding some profile "keywords" (very useful in making new friends) - and 
+perhaps what country you live in; if you do not wish to be more specific
+than that.
+
+We fully respect your right to privacy, and none of these items are necessary. 
+If you are new and do not know anybody here, they may help
+you to make some new and interesting friends.  
+
 
 Thank you and welcome to $sitename.
 
-- 
cgit v1.2.3


From 338ba485548f9ec1acbc9349f7db95e84c51e7eb Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 7 Apr 2011 18:00:35 -0700
Subject: more templates

---
 view/en/profile-hide-friends.tpl   | 16 ----------------
 view/en/profile-in-directory.tpl   | 16 ----------------
 view/en/profile-in-netdir.tpl      | 16 ----------------
 view/en/profile_listing_header.tpl |  8 --------
 view/en/registrations.tpl          |  1 -
 5 files changed, 57 deletions(-)
 delete mode 100644 view/en/profile-hide-friends.tpl
 delete mode 100644 view/en/profile-in-directory.tpl
 delete mode 100644 view/en/profile-in-netdir.tpl
 delete mode 100644 view/en/profile_listing_header.tpl
 delete mode 100644 view/en/registrations.tpl

(limited to 'view/en')

diff --git a/view/en/profile-hide-friends.tpl b/view/en/profile-hide-friends.tpl
deleted file mode 100644
index 54ade00fe..000000000
--- a/view/en/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/en/profile-in-directory.tpl b/view/en/profile-in-directory.tpl
deleted file mode 100644
index 98af3e59a..000000000
--- a/view/en/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/en/profile-in-netdir.tpl b/view/en/profile-in-netdir.tpl
deleted file mode 100644
index be111aa67..000000000
--- a/view/en/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/en/profile_listing_header.tpl b/view/en/profile_listing_header.tpl
deleted file mode 100644
index d4b139a69..000000000
--- a/view/en/profile_listing_header.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-<h1>Profiles</h1>
-<p id="profile-listing-desc" >
-<a href="profile_photo" >Change profile photo</a>
-</p>
-<div id="profile-listing-new-link-wrapper" >
-<a href="profiles/new" id="profile-listing-new-link" name="Create New Profile" >Create New Profile</a>
-</div>
-
diff --git a/view/en/registrations.tpl b/view/en/registrations.tpl
deleted file mode 100644
index c8646043e..000000000
--- a/view/en/registrations.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<li>$fullname ($email) : <a href="$approvelink">Approve</a> - <a href="$denylink">Deny</a></li>
-- 
cgit v1.2.3


From e35a5bac55e0e259c7c587adfaf546484b032c92 Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Thu, 7 Apr 2011 23:10:43 -0700
Subject: the rest of the english html templates except for htconfig

---
 view/en/contact_edit.tpl          |  81 -----------
 view/en/install_db.tpl            |  40 -----
 view/en/profile_advanced.php      | 225 ----------------------------
 view/en/profile_edit.tpl          | 299 --------------------------------------
 view/en/profile_entry_default.tpl |   9 --
 view/en/profile_photo.tpl         |  18 ---
 view/en/pwdreset.tpl              |  16 --
 view/en/settings.tpl              | 176 ----------------------
 view/en/settings_nick_set.tpl     |   9 --
 view/en/settings_nick_subdir.tpl  |   6 -
 10 files changed, 879 deletions(-)
 delete mode 100644 view/en/contact_edit.tpl
 delete mode 100644 view/en/install_db.tpl
 delete mode 100644 view/en/profile_advanced.php
 delete mode 100644 view/en/profile_edit.tpl
 delete mode 100644 view/en/profile_entry_default.tpl
 delete mode 100644 view/en/profile_photo.tpl
 delete mode 100644 view/en/pwdreset.tpl
 delete mode 100644 view/en/settings.tpl
 delete mode 100644 view/en/settings_nick_set.tpl
 delete mode 100644 view/en/settings_nick_subdir.tpl

(limited to 'view/en')

diff --git a/view/en/contact_edit.tpl b/view/en/contact_edit.tpl
deleted file mode 100644
index 9aca60188..000000000
--- a/view/en/contact_edit.tpl
+++ /dev/null
@@ -1,81 +0,0 @@
-
-<h2>$header</h2>
-
-<div id="contact-edit-banner-name">$name</div>
-
-<form action="contacts/$contact_id" method="post" >
-<input type="hidden" name="contact_id" value="$contact_id">
-
-<div id="contact-edit-wrapper" >
-
-	<div id="contact-edit-photo-wrapper" >
-		<img id="contact-edit-direction-icon" src="$dir_icon" alt="$alt_text" title="$alt_text" />
-		<div id="contact-edit-photo" >
-			<a href="$url" title="$visit" /><img src="$photo" $sparkle alt="$name" /></a>
-		</div>
-		<div id="contact-edit-photo-end" ></div>
-	</div>
-	<div id="contact-edit-nav-wrapper" >
-
-		<div id="contact-edit-links" >
-			<a href="contacts/$contact_id/block" id="contact-edit-block-link" ><img src="images/b_block.gif" alt="$blockunblock" title="$block_text"/></a>
-			<a href="contacts/$contact_id/ignore" id="contact-edit-ignore-link" ><img src="images/no.gif" alt="$ignorecont" title="$ignore_text"/></a>
-		</div>
-		<div id="contact-drop-links" >
-			<a href="contacts/$contact_id/drop" id="contact-edit-drop-link" onclick="return confirmDelete();" ><img src="images/b_drophide.gif" alt="$delete" title="$delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" /></a>
-		</div>
-		<div id="contact-edit-nav-end"></div>
-
-
-		<div id="contact-edit-poll-wrapper">
-			<div id="contact-edit-last-update-text">$lastupdtext<span id="contact-edit-last-updated">$last_update</span</div>
-			<div id="contact-edit-poll-text">$updpub</div>
-			$poll_interval
-			<div id="contact-edit-update-now"><a href="contacts/$contact_id/update">$udnow</a></div>
-		</div>
-	</div>
-	<div id="contact-edit-end" ></div>
-
-$insecure
-$blocked
-$ignored
-
-<div id="contact-edit-info-wrapper">
-<h4>Contact Information / Notes</h4>
-<textarea id="contact-edit-info" rows="10" cols="72" name="info" >$info</textarea>
-</div>
-<div id="contact-edit-info-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
-
-<div id="contact-edit-profile-select-text">
-<h4>Profile Visibility</h4>
-<p>Please choose the profile you would like to display to $name when viewing your profile securely.
-</p> 
-</div>
-$profile_select
-<div id="contact-edit-profile-select-end"></div>
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
-
-
-<div id="contact-edit-rating-wrapper">
-<h4>Online Reputation</h4>
-<p>
-Occasionally your friends may wish to inquire about this person's online legitimacy. You may help them choose whether or not to interact with this person by providing a 'reputation' to guide them.
-</p>
-<div id="contact-edit-rating-select-wrapper">
-$rating
-</div>
-<div id="contact-edit-rating-explain">
-<p>
-Please take a moment to elaborate on this selection if you feel it could be helpful to others.
-</p>
-<textarea id="contact-edit-rating-text" name="reason" rows="3" cols="64" >$reason</textarea>
-</div>
-</div>
-$groups
-
-<input class="contact-edit-submit" type="submit" name="submit" value="Submit" />
-</form>
-</div>
diff --git a/view/en/install_db.tpl b/view/en/install_db.tpl
deleted file mode 100644
index c413689c2..000000000
--- a/view/en/install_db.tpl
+++ /dev/null
@@ -1,40 +0,0 @@
-
-<h3>Friendika Social Network</h3>
-<h3>Installation</h3>
-
-<p>
-In order to install Friendika we need to know how to contact your database. Please contact your hosting provider or site administrator if you have questions about these settings. The database you specify below must already exist. If it does not, please create it before continuing. 
-</p>
-
-<form id="install-form" action="$baseurl/install" method="post">
-
-<input type="hidden" name="phpath" value="$phpath" />
-
-<label for="install-dbhost" id="install-dbhost-label">Database Server Name</label>
-<input type="text" name="dbhost" id="install-dbhost" value="$dbhost" />
-<div id="install-dbhost-end"></div>
-
-<label for="install-dbuser" id="install-dbuser-label">Database Login Name</label>
-<input type="text" name="dbuser" id="install-dbuser" value="$dbuser" />
-<div id="install-dbuser-end"></div>
-
-<label for="install-dbpass" id="install-dbpass-label">Database Login Password</label>
-<input type="password" name="dbpass" id="install-dbpass" value="$dbpass" />
-<div id="install-dbpass-end"></div>
-
-<label for="install-dbdata" id="install-dbdata-label">Database Name</label>
-<input type="text" name="dbdata" id="install-dbdata"  value="$dbdata" />
-<div id="install-dbdata-end"></div>
-
-<div id="install-tz-desc">
-Please select a default timezone for your website
-</div>
-
-$tzselect
-
-<div id="install-tz-end" ></div>
-<input id="install-submit" type="submit" name="submit" value="$submit" /> 
-
-</form>
-<div id="install-end" ></div>
-
diff --git a/view/en/profile_advanced.php b/view/en/profile_advanced.php
deleted file mode 100644
index 6d2ecba4d..000000000
--- a/view/en/profile_advanced.php
+++ /dev/null
@@ -1,225 +0,0 @@
-<?php
-
-$o .= '';
-
-$o .= <<< EOT
-
-<h2>Profile</h2>
-
-
-EOT;
-
-if($a->profile['name']) {
-$o .= <<< EOT
-<div id="advanced-profile-name-wrapper" >
-<div id="advanced-profile-name-text">Full Name:</div>
-<div id="advanced-profile-name">{$a->profile['name']}</div>
-</div>
-<div id="advanced-profile-name-end"></div>
-EOT;
-}
-
-if($a->profile['gender']) {
-$o .= <<< EOT
-<div id="advanced-profile-gender-wrapper" >
-<div id="advanced-profile-gender-text">Gender:</div>
-<div id="advanced-profile-gender">{$a->profile['gender']}</div>
-</div>
-<div id="advanced-profile-gender-end"></div>
-EOT;
-}
-
-if(($a->profile['dob']) && ($a->profile['dob'] != '0000-00-00')) {
-$o .= <<< EOT
-<div id="advanced-profile-dob-wrapper" >
-<div id="advanced-profile-dob-text">Birthday:</div>
-EOT;
-
-// If no year, add an arbitrary one so just we can parse the month and day.
-
-$o .= '<div id="advanced-profile-dob">' 
-	. ((intval($a->profile['dob'])) 
-		? day_translate(datetime_convert('UTC','UTC',$a->profile['dob'] . ' 00:00 +00:00','j F, Y'))
-		: day_translate(datetime_convert('UTC','UTC','2001-' . substr($a->profile['dob'],6) . ' 00:00 +00:00','j F'))) 
-	. "</div>\r\n</div>";
-
-$o .= '<div id="advanced-profile-dob-end"></div>';
-
-}
-
-if($age = age($a->profile['dob'],$a->profile['timezone'],'')) {
-$o .= <<< EOT
-<div id="advanced-profile-age-wrapper" >
-<div id="advanced-profile-age-text">Age:</div>
-<div id="advanced-profile-age">$age</div>
-</div>
-<div id="advanced-profile-age-end"></div>
-EOT;
-}
-
-if($a->profile['marital']) {
-$o .= <<< EOT
-<div id="advanced-profile-marital-wrapper" >
-<div id="advanced-profile-marital-text"><span class="heart">&hearts;</span> Status:</div>
-<div id="advanced-profile-marital">{$a->profile['marital']}</div>
-EOT;
-
-if($a->profile['with'])
-	$o .= "<div id=\"advanced-profile-with\">({$a->profile['with']})</div>";
-$o .= <<< EOT
-</div>
-<div id="advanced-profile-marital-end"></div>
-EOT;
-}
-
-if($a->profile['sexual']) {
-$o .= <<< EOT
-<div id="advanced-profile-sexual-wrapper" >
-<div id="advanced-profile-sexual-text">Sexual Preference:</div>
-<div id="advanced-profile-sexual">{$a->profile['sexual']}</div>
-</div>
-<div id="advanced-profile-sexual-end"></div>
-EOT;
-}
-
-if($a->profile['homepage']) {
-	$homepage = linkify($a->profile['homepage']);
-$o .= <<< EOT
-<div id="advanced-profile-homepage-wrapper" >
-<div id="advanced-profile-homepage-text">Homepage:</div>
-<div id="advanced-profile-homepage">$homepage</div>
-</div>
-<div id="advanced-profile-homepage-end"></div>
-EOT;
-}
-
-if($a->profile['politic']) {
-$o .= <<< EOT
-<div id="advanced-profile-politic-wrapper" >
-<div id="advanced-profile-politic-text">Political Views:</div>
-<div id="advanced-profile-politic">{$a->profile['politic']}</div>
-</div>
-<div id="advanced-profile-politic-end"></div>
-EOT;
-}
-
-if($a->profile['religion']) {
-$o .= <<< EOT
-<div id="advanced-profile-religion-wrapper" >
-<div id="advanced-profile-religion-text">Religion:</div>
-<div id="advanced-profile-religion">{$a->profile['religion']}</div>
-</div>
-<div id="advanced-profile-religion-end"></div>
-EOT;
-}
-if($txt = prepare_text($a->profile['about'])) {
-$o .= <<< EOT
-<div id="advanced-profile-about-wrapper" >
-<div id="advanced-profile-about-text">About:</div>
-<br />
-<div id="advanced-profile-about">$txt</div>
-</div>
-<div id="advanced-profile-about-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['interest'])) {
-$o .= <<< EOT
-<div id="advanced-profile-interest-wrapper" >
-<div id="advanced-profile-interest-text">Hobbies/Interests:</div>
-<br />
-<div id="advanced-profile-interest">$txt</div>
-</div>
-<div id="advanced-profile-interest-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['contact'])) {
-$o .= <<< EOT
-<div id="advanced-profile-contact-wrapper" >
-<div id="advanced-profile-contact-text">Contact information and Social Networks:</div>
-<br />
-<div id="advanced-profile-contact">$txt</div>
-</div>
-<div id="advanced-profile-contact-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['music'])) {
-$o .= <<< EOT
-<div id="advanced-profile-music-wrapper" >
-<div id="advanced-profile-music-text">Musical interests:</div>
-<br />
-<div id="advanced-profile-music">$txt</div>
-</div>
-<div id="advanced-profile-music-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['book'])) {
-$o .= <<< EOT
-<div id="advanced-profile-book-wrapper" >
-<div id="advanced-profile-book-text">Books, literature:</div>
-<br />
-<div id="advanced-profile-book">$txt</div>
-</div>
-<div id="advanced-profile-book-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['tv'])) {
-$o .= <<< EOT
-<div id="advanced-profile-tv-wrapper" >
-<div id="advanced-profile-tv-text">Television:</div>
-<br />
-<div id="advanced-profile-tv">$txt</div>
-</div>
-<div id="advanced-profile-tv-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['film'])) {
-$o .= <<< EOT
-<div id="advanced-profile-film-wrapper" >
-<div id="advanced-profile-film-text">Film/dance/culture/entertainment:</div>
-<br />
-<div id="advanced-profile-film">$txt</div>
-</div>
-<div id="advanced-profile-film-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['romance'])) {
-$o .= <<< EOT
-<div id="advanced-profile-romance-wrapper" >
-<div id="advanced-profile-romance-text">Love/romance:</div>
-<br />
-<div id="advanced-profile-romance">$txt</div>
-</div>
-<div id="advanced-profile-romance-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['work'])) {
-$o .= <<< EOT
-<div id="advanced-profile-work-wrapper" >
-<div id="advanced-profile-work-text">Work/employment:</div>
-<br />
-<div id="advanced-profile-work">$txt</div>
-</div>
-<div id="advanced-profile-work-end"></div>
-EOT;
-}
-
-if($txt = prepare_text($a->profile['education'])) {
-$o .= <<< EOT
-<div id="advanced-profile-education-wrapper" >
-<div id="advanced-profile-education-text">School/education:</div>
-<br />
-<div id="advanced-profile-education">$txt</div>
-</div>
-<div id="advanced-profile-education-end"></div>
-EOT;
-}
-
-
diff --git a/view/en/profile_edit.tpl b/view/en/profile_edit.tpl
deleted file mode 100644
index 6c7d74daf..000000000
--- a/view/en/profile_edit.tpl
+++ /dev/null
@@ -1,299 +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-pdesc-wrapper" >
-<label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >Title/Description: </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="$pdesc" />
-</div>
-<div id="profile-edit-pdesc-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>
-<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" ><span class="heart">&hearts;</span> (Marital) Status: </label>
-$marital
-</div>
-<label id="profile-edit-with-label" for="profile-edit-with" > Who: (if applicable) </label>
-<input type="text" size="32" name="with" id="profile-edit-with" title="Examples: cathy123, Cathy Williams, cathy@example.com" value="$with" />
-<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 id="profile-edit-pubkeywords-wrapper" >
-<label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >Public Keywords: </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="Example: fishing photography software" value="$pub_keywords" />
-</div><div id="profile-edit-pubkeywords-desc">(Used for suggesting potential friends, can be seen by others)</div>
-<div id="profile-edit-pubkeywords-end"></div>
-
-<div id="profile-edit-prvkeywords-wrapper" >
-<label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >Private Keywords: </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="Example: fishing photography software" value="$prv_keywords" />
-</div><div id="profile-edit-prvkeywords-desc">(Used for searching profiles, never shown to others)</div>
-<div id="profile-edit-prvkeywords-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_entry_default.tpl b/view/en/profile_entry_default.tpl
deleted file mode 100644
index 651199918..000000000
--- a/view/en/profile_entry_default.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div class="profile-listing" >
-<div class="profile-listing-photo-wrapper" >
-<a href="profiles/$id" class="profile-listing-edit-link" ><img class="profile-listing-photo" id="profile-listing-photo-$id" src="$photo" alt="Profile Image" /></a>
-</div>
-<div class="profile-listing-photo-end" ></div>
-<div class="profile-listing-name" id="profile-listing-name-$id"><a href="profiles/$id" class="profile-listing-edit-link" >$profile_name</a></div>
-</div>
-<div class="profile-listing-end"></div>
diff --git a/view/en/profile_photo.tpl b/view/en/profile_photo.tpl
deleted file mode 100644
index 30e51210a..000000000
--- a/view/en/profile_photo.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<h1>Upload Profile Photo</h1>
-
-<form enctype="multipart/form-data" action="profile_photo" method="post">
-
-<div id="profile-photo-upload-wrapper">
-<label id="profile-photo-upload-label" for="profile-photo-upload">Upload File: </label>
-<input name="userfile" type="file" id="profile-photo-upload" size="48" />
-</div>
-
-<div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="Upload">
-</div>
-
-</form>
-
-<div id="profile-photo-link-select-wrapper">
-or <a href='photos/$user'>select a photo from albums</a>
-</div>
\ No newline at end of file
diff --git a/view/en/pwdreset.tpl b/view/en/pwdreset.tpl
deleted file mode 100644
index dd609f061..000000000
--- a/view/en/pwdreset.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-<h3>Password Reset</h3>
-
-<p>
-Your password has been reset as requested.
-</p>
-<p>
-Your new password is
-</p>
-<p>
-$newpass
-</p>
-<p>
-Save or copy your new password - and then <a href="$baseurl" >click here to login</a>.
-</p>
-<p>
-Your password may be changed from the 'Settings' page after successful login.
\ No newline at end of file
diff --git a/view/en/settings.tpl b/view/en/settings.tpl
deleted file mode 100644
index 9822291c1..000000000
--- a/view/en/settings.tpl
+++ /dev/null
@@ -1,176 +0,0 @@
-<h1>Account Settings</h1>
-
-<div id="plugin-settings-link"><a href="settings/addon">Plugin Settings</a></div>
-
-$uexport
-
-$nickname_block
-
-
-<form action="settings" id="settings-form" method="post" autocomplete="off" >
-
-
-<h3 class="settings-heading">Basic Settings</h3>
-
-<div id="settings-username-wrapper" >
-<label id="settings-username-label" for="settings-username" >Full Name: </label>
-<input type="text" name="username" id="settings-username" value="$username" />
-</div>
-<div id="settings-username-end" ></div>
-
-<div id="settings-email-wrapper" >
-<label id="settings-email-label" for="settings-email" >Email Address: </label>
-<input type="text" name="email" id="settings-email" value="$email" />
-</div>
-<div id="settings-email-end" ></div>
-
-
-
-<div id="settings-timezone-wrapper" >
-<label id="settings-timezone-label" for="timezone_select" >Your Timezone: </label>
-$zoneselect
-</div>
-<div id="settings-timezone-end" ></div>
-
-<div id="settings-defloc-wrapper" >
-<label id="settings-defloc-label" for="settings-defloc" >Default Post Location: </label>
-<input type="text" name="defloc" id="settings-defloc" value="$defloc" />
-</div>
-<div id="settings-defloc-end" ></div>
-
-<div id="settings-allowloc-wrapper" >
-<label id="settings-allowloc-label" for="settings-allowloc" >Use Browser Location: </label>
-<input type="checkbox" name="allow_location" id="settings-allowloc" value="1" $loc_checked />
-</div>
-<div id="settings-allowloc-end" ></div>
-
-
-
-
-<div id="settings-theme-select">
-<label id="settings-theme-label" for="theme-select" >Display Theme: </label>
-$theme
-</div>
-<div id="settings-theme-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-<h3 class="settings-heading">Security and Privacy Settings</h3>
-
-
-<input type="hidden" name="visibility" value="$visibility" />
-
-<div id="settings-maxreq-wrapper">
-<label id="settings-maxreq-label" for="settings-maxreq" >Maximum Friend Requests/Day</label>
-<input id="settings-maxreq" name="maxreq" value="$maxreq" />
-<div id="settings-maxreq-desc">(to prevent spam abuse)</div>
-</div>
-<div id="settings-maxreq-end"></div>
-
-
-
-
-$profile_in_dir
-
-$profile_in_net_dir
-
-
-<div id="settings-default-perms" class="settings-default-perms" >
-	<div id="settings-default-perms-menu" class="fakelink" onClick="openClose('settings-default-perms-select');" >$permissions</div>
-	<div id="settings-default-perms-menu-end"></div>
-
-	<div id="settings-default-perms-select" style="display: none;" >
-	
-		$aclselect
-
-	</div>
-</div>
-<div id="settings-default-perms-end"></div>
-
-<div id="settings-blockw-wrapper" >
-<label id="settings-blockw-label" for="settings-blockw" >Allow friends to post to your profile page: </label>
-<input type="checkbox" name="blockwall" id="settings-blockw" value="1" $blockw_checked />
-</div>
-<div id="settings-blockw-end" ></div>
-
-
-
-<div id="settings-expire-desc">Automatically expire (delete) posts older than <input type="text" size="3" name="expire" value="$expire" /> days</div>
-<div id="settings-expire-end"></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-
-<h3 class="settings-heading">Notification Settings</h3>
-
-
-<div id="settings-notify-wrapper">
-<div id="settings-notify-desc">Send a notification email when: </div>
-<label for="notify1" id="settings-label-notify1">You receive an introduction</label>
-<input id="notify1" type="checkbox" $sel_notify1 name="notify1" value="1" />
-<div id="notify1-end"></div>
-<label for="notify2" id="settings-label-notify2">Your introductions are confirmed</label>
-<input id="notify2" type="checkbox" $sel_notify2 name="notify2" value="2" />
-<div id="notify2-end"></div>
-<label for="notify3" id="settings-label-notify3">Someone writes on your profile wall</label>
-<input id="notify3" type="checkbox" $sel_notify3 name="notify3" value="4" />
-<div id="notify3-end"></div>
-<label for="notify4" id="settings-label-notify4">Someone writes a followup comment</label>
-<input id="notify4" type="checkbox" $sel_notify4 name="notify4" value="8" />
-<div id="notify4-end"></div>
-<label for="notify5" id="settings-label-notify5">You receive a private message</label>
-<input id="notify5" type="checkbox" $sel_notify5 name="notify5" value="16" />
-<div id="notify5-end"></div>
-</div>
-<div id="settings=notify-end"></div>
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-<h3 class="settings-heading">Password Settings</h3>
-
-
-<div id="settings-password-wrapper" >
-<p id="settings-password-desc" >
-Leave password fields blank unless changing
-</p>
-<label id="settings-password-label" for="settings-password" >New Password: </label>
-<input type="password" id="settings-password" name="npassword" />
-</div>
-<div id="settings-password-end" ></div>
-
-<div id="settings-confirm-wrapper" >
-<label id="settings-confirm-label" for="settings-confirm" >Confirm: </label>
-<input type="password" id="settings-confirm" name="confirm" />
-</div>
-<div id="settings-confirm-end" ></div>
-
-<div id="settings-openid-wrapper" >
-	$oidhtml
-</div>
-<div id="settings-openid-end" ></div>
-
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
-<h3 class="settings-heading">Advanced Page Settings</h3>
-
-$pagetype
-
-<div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="Submit" />
-</div>
-
-
diff --git a/view/en/settings_nick_set.tpl b/view/en/settings_nick_set.tpl
deleted file mode 100644
index a36b3b9a2..000000000
--- a/view/en/settings_nick_set.tpl
+++ /dev/null
@@ -1,9 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-<span class="error-message">Your profile address is <strong>'$nickname@$basepath'</strong></span>
-</p>
-$subdir
-
-</div>
-<div id="settings-nick-end" ></div>
diff --git a/view/en/settings_nick_subdir.tpl b/view/en/settings_nick_subdir.tpl
deleted file mode 100644
index 303c24df7..000000000
--- a/view/en/settings_nick_subdir.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<p>
-It appears that your website is located in a subdirectory of the<br />
-$hostname website, so this setting may not work reliably.<br />
-</p>
-<p>If you have any issues, you may have better results using the profile<br /> address '<strong>$baseurl/profile/$nickname</strong>'.
-</p>
\ No newline at end of file
-- 
cgit v1.2.3


From 59fd70e568fbc93922769333c55d8c1fa72cea9d Mon Sep 17 00:00:00 2001
From: Friendika <info@friendika.com>
Date: Wed, 4 May 2011 02:20:44 -0700
Subject: issues with private photos - hitting internal size limits

---
 view/en/htconfig.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'view/en')

diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl
index d3bb6b411..0ce28b4a0 100644
--- a/view/en/htconfig.tpl
+++ b/view/en/htconfig.tpl
@@ -37,7 +37,7 @@ $a->config['admin_email'] = '';
 
 // Maximum size of an imported message, 0 is unlimited
 
-$a->config['max_import_size'] = 10000;
+$a->config['max_import_size'] = 200000;
 
 // maximum size of uploaded photos
 
-- 
cgit v1.2.3