8 files changed, 73 insertions, 4 deletions
diff --git a/view/tpl/build_query.tpl b/view/tpl/build_query.tpl
index 06da526f1..e5bf3acce 100755
--- a/view/tpl/build_query.tpl
+++ b/view/tpl/build_query.tpl
@@ -39,6 +39,7 @@
 		if(bParam_new != 0) bCmd = bCmd + "&new=" + bParam_new;
 		if(bParam_wall != 0) bCmd = bCmd + "&wall=" + bParam_wall;
 		if(bParam_search != "") bCmd = bCmd + "&search=" + bParam_search;
+		if(bParam_order != "") bCmd = bCmd + "&order=" + bParam_order;
 		if(bParam_file != "") bCmd = bCmd + "&file=" + bParam_file;
 		if(bParam_cats != "") bCmd = bCmd + "&cats=" + bParam_cats;
 		if(bParam_dend != "") bCmd = bCmd + "&dend=" + bParam_dend;
diff --git a/view/tpl/channel_import.tpl b/view/tpl/channel_import.tpl
index 4804e34d6..f7635ea52 100755
--- a/view/tpl/channel_import.tpl
+++ b/view/tpl/channel_import.tpl
@@ -1,6 +1,6 @@
 <h2>{{$title}}</h2>
 
-<form action="import" method="post" id="import-channel-form">
+<form action="import" method="post" enctype="multipart/form-data" id="import-channel-form">
 
 	<div id="import-desc" class="descriptive-paragraph">{{$desc}}</div>
 
diff --git a/view/tpl/msg-header.tpl b/view/tpl/msg-header.tpl
index 0be288709..5e2597605 100755
--- a/view/tpl/msg-header.tpl
+++ b/view/tpl/msg-header.tpl
@@ -54,7 +54,19 @@ else
 				name: 'userfile',
 				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
 				onComplete: function(file,response) {
-					tinyMCE.execCommand('mceInsertRawHTML',false,response);
+					addeditortext(response);
+					$('#profile-rotator').spin(false);
+				}				 
+			}
+		);
+
+		var file_uploader = new window.AjaxUpload(
+			'prvmail-attach',
+			{ action: 'wall_attach/{{$nickname}}',
+				name: 'userfile',
+				onSubmit: function(file,ext) { $('#profile-rotator').spin('tiny'); },
+				onComplete: function(file,response) {
+					addeditortext(response);
 					$('#profile-rotator').spin(false);
 				}				 
 			}
@@ -67,7 +79,7 @@ else
 		if(reply && reply.length) {
 			$('#profile-rotator').spin('tiny');
 			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				addeditortext(response);
 				$('#profile-rotator').spin(false);
 			});
 		}
@@ -86,11 +98,22 @@ else
 		if(reply && reply.length) {
 			$('#profile-rotator').spin('tiny');
 			$.get('parse_url?url=' + reply, function(data) {
-				tinyMCE.execCommand('mceInsertRawHTML',false,data);
+				addeditortext(response);
 				$('#profile-rotator').spin(false);
 			});
 		}
 	}
 
+	function addeditortext(data) {
+		if(plaintext == 'none') {
+			var currentText = $("#prvmail-text").val();
+			$("#prvmail-text").val(currentText + data);
+		}
+		else
+			tinyMCE.execCommand('mceInsertRawHTML',false,data);
+	}	
+
+
+
 </script>
 
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 2ddf75544..164ba0c6d 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -26,6 +26,12 @@
 	<div id="prvmail-upload-wrapper" >
 		<div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
 	</div> 
+
+	<div id="prvmail-attach-wrapper" >
+		<div id="prvmail-attach" class="icon attach" title="{{$attach}}" ></div>
+	</div> 
+
+
 	<div id="prvmail-link-wrapper" >
 		<div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
 	</div> 
diff --git a/view/tpl/sellpage_edit.tpl b/view/tpl/sellpage_edit.tpl
new file mode 100644
index 000000000..0a4726fb2
--- /dev/null
+++ b/view/tpl/sellpage_edit.tpl
@@ -0,0 +1,23 @@
+<h1>{{$header}}</h1>
+<form id="sellpage-edit" action="connect/{{$address}}" method="post">
+
+{{include file="field_checkbox.tpl" field=$premium}}
+
+<div class="descriptive-text">{{$desc}}</div>
+
+<div class="sellpage-editbody">
+<p id="sellpage-bodydesc" >
+{{$lbl_about}}
+</p>
+
+<textarea rows="10" cols="72" id="sellpage-textinp" name="text" >{{$text}}</textarea>
+
+</div>
+<div id="sellpage-editbody-end"></div>
+
+
+<div class="descriptive-text">{{$lbl2}}</div>
+<div class="sellpage-final">{{$desc2}}</div>
+
+<input type="submit" name="submit" value="{{$submit}}" />
+</form>
diff --git a/view/tpl/sellpage_submit.tpl b/view/tpl/sellpage_submit.tpl
new file mode 100644
index 000000000..2bd735ea4
--- /dev/null
+++ b/view/tpl/sellpage_submit.tpl
@@ -0,0 +1,3 @@
+<form id="sellpage-submit" action="connect/{{$address}}" method="post">
+<input type="submit" name="submit" value="{{$continue}}" />
+</form>
+\ No newline at end of file
diff --git a/view/tpl/sellpage_view.tpl b/view/tpl/sellpage_view.tpl
new file mode 100644
index 000000000..414445039
--- /dev/null
+++ b/view/tpl/sellpage_view.tpl
@@ -0,0 +1,9 @@
+<h1>{{$header}}</h1>
+
+<div class="descriptive-text">{{$desc}}</div>
+
+<div class="sellpage-body">{{$text}}</div>
+
+<div class="sellpage-final">{{$desc2}}</div>
+
+{{$submit}}
diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl
index 9a3a1ce8b..194b90e80 100755
--- a/view/tpl/settings.tpl
+++ b/view/tpl/settings.tpl
@@ -50,6 +50,9 @@
 
 {{include file="field_input.tpl" field=$cntunkmail}}
 
+
+{{if $expireisfixed}}
+{{* Remove above line when expire is working *}}
 {{include file="field_input.tpl" field=$expire.days}}
 
 
@@ -65,6 +68,7 @@
 	</div>
 
 </div>
+{{/if}}
 
 <div id="settings-default-perms" class="settings-default-perms" >
 	<a href="#profile-jot-acl-wrapper" id="settings-default-perms-menu" class='popupbox'>{{$permissions}} {{$permdesc}}</a>