Merge pull request #185 from fabrixxm/master

Updated private message pages

9 files changed, 417 insertions, 64 deletions

diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
index 9183b2e77..b6d487f92 100755
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/colors.less
@@ -96,3 +96,12 @@
 @JotPermissionLockBackgroundColor: @Grey4;
 @JotLoadingBackgroundColor: @Grey1;
 @JotPreviewBackgroundColor: @Yellow1;
+
+@MessageNewBackgroundColor: @Blue1;
+@MessageNewBorderColor: @Blue3;
+@MessageNewColor: @Grey1;
+
+@MailListBackgroundColor: #f6f7f8;
+
+@MailDisplaySubjectColor: @Grey5;
+@MailDisplaySubjectBackgroundColor: #f6f7f8;
diff --git a/view/theme/quattro/fileas_widget.tpl b/view/theme/quattro/fileas_widget.tpl
new file mode 100644
index 000000000..1e5a76044
--- /dev/null
+++ b/view/theme/quattro/fileas_widget.tpl
@@ -0,0 +1,12 @@
+<div id="fileas-sidebar" class="widget">
+	<h3>$title</h3>
+	<div id="nets-desc">$desc</div>
+	
+	<ul class="fileas-ul">
+		<li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="fileas-link fileas-all">$all</a></li>
+		{{ for $terms as $term }}
+			<li class="tool {{ if $term.selected }}selected{{ endif }}"><a href="$base?f=&file=$term.name" class="fileas-link">$term.name</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/theme/quattro/mail_conv.tpl b/view/theme/quattro/mail_conv.tpl
new file mode 100755
index 000000000..989f17878
--- /dev/null
+++ b/view/theme/quattro/mail_conv.tpl
@@ -0,0 +1,60 @@
+<div class="wall-item-container $item.indent">
+	<div class="wall-item-item">
+		<div class="wall-item-info">
+			<div class="contact-photo-wrapper"
+				<a href="$mail.profile_url" target="redir" title="$mail.from_name" class="contact-photo-link" id="wall-item-photo-link-$mail.id">
+					<img src="$mail.from_photo" class="contact-photo$mail.sparkle" id="wall-item-photo-$mail.id" alt="$mail.from_name" />
+				</a>
+			</div>
+		</div>
+		<div class="wall-item-content">
+			$mail.body
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="wall-item-links">
+		</div>
+		<div class="wall-item-tags">
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+		<div class="">
+		</div>
+		<div class="wall-item-actions">
+			<div class="wall-item-actions-author">
+				<a href="$mail.from_url" target="redir" class="wall-item-name-link"><span class="wall-item-name$mail.sparkle">$mail.from_name</span></a> <span class="wall-item-ago">$mail.date</span>
+			</div>
+			
+			<div class="wall-item-actions-social">
+			</div>
+			
+			<div class="wall-item-actions-tools">
+				<a href="message/drop/$mail.id" onclick="return confirmDelete();" class="icon delete s16" title="$mail.delete">$mail.delete</a>
+			</div>
+			
+		</div>
+	</div>
+	<div class="wall-item-bottom">
+	</div>
+</div>
+
+
+{#
+
+
+<div class="mail-conv-outside-wrapper">
+	<div class="mail-conv-sender" >
+		<a href="$mail.from_url" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo$mail.sparkle" src="$mail.from_photo" heigth="80" width="80" alt="$mail.from_name" /></a>
+	</div>
+	<div class="mail-conv-detail" >
+		<div class="mail-conv-sender-name" >$mail.from_name</div>
+		<div class="mail-conv-date">$mail.date</div>
+		<div class="mail-conv-subject">$mail.subject</div>
+		<div class="mail-conv-body">$mail.body</div>
+	<div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-$mail.id" ><a href="message/drop/$mail.id" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="$mail.delete" id="mail-conv-delete-icon-$mail.id" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+	<div class="mail-conv-outside-wrapper-end"></div>
+</div>
+</div>
+<hr class="mail-conv-break" />
+
+#}
diff --git a/view/theme/quattro/mail_display.tpl b/view/theme/quattro/mail_display.tpl
new file mode 100644
index 000000000..8b82e95c6
--- /dev/null
+++ b/view/theme/quattro/mail_display.tpl
@@ -0,0 +1,12 @@
+<div id="mail-display-subject">
+	<span class="{{if $thread_seen}}seen{{else}}unseen{{endif}}">$thread_subject</span>
+	<a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
+</div>
+
+{{ for $mails as $mail }}
+	<div id="tread-wrapper-$mail.id" class="tread-wrapper">
+		{{ inc mail_conv.tpl }}{{endinc}}
+	</div>
+{{ endfor }}
+
+{{ inc prv_message.tpl }}{{ endinc }}
diff --git a/view/theme/quattro/mail_list.tpl b/view/theme/quattro/mail_list.tpl
new file mode 100644
index 000000000..6bc6c84f6
--- /dev/null
+++ b/view/theme/quattro/mail_list.tpl
@@ -0,0 +1,8 @@
+<div class="mail-list-wrapper">
+	<span class="mail-subject {{if $seen}}seen{{else}}unseen{{endif}}"><a href="message/$id" class="mail-link">$subject</a></span>
+	<span class="mail-from">$from_name</span>
+	<span class="mail-date">$date</span>
+	<span class="mail-count">$count</span>
+	
+	<a href="message/dropconv/$id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
+</div>
diff --git a/view/theme/quattro/message_side.tpl b/view/theme/quattro/message_side.tpl
new file mode 100644
index 000000000..9f1587096
--- /dev/null
+++ b/view/theme/quattro/message_side.tpl
@@ -0,0 +1,10 @@
+<div id="message-sidebar" class="widget">
+	<div id="message-new" class="{{ if $new.sel }}selected{{ endif }}"><a href="$new.url">$new.label</a> </div>
+	
+	<ul class="message-ul">
+		{{ for $tabs as $t }}
+			<li class="tool {{ if $t.sel }}selected{{ endif }}"><a href="$t.url" class="message-link">$t.label</a></li>
+		{{ endfor }}
+	</ul>
+	
+</div>
diff --git a/view/theme/quattro/msg-header.tpl b/view/theme/quattro/msg-header.tpl
new file mode 100755
index 000000000..2d1ea7a61
--- /dev/null
+++ b/view/theme/quattro/msg-header.tpl
@@ -0,0 +1,97 @@
+
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript">
+
+var plaintext = '$editselect';
+
+if(plaintext != 'none') {
+	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",
+		gecko_spellcheck : true,
+		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.onInit.add(function(ed) {
+				ed.pasteAsPlainText = true;
+				var editorId = ed.editorId;
+				var textarea = $('#'+editorId);
+				if (typeof(textarea.attr('tabindex')) != "undefined") {
+					$('#'+editorId+'_ifr').attr('tabindex', textarea.attr('tabindex'));
+					textarea.attr('tabindex', null);
+				}
+			});
+		}
+	});
+}
+else
+	$("#prvmail-text").contact_autocomplete(baseurl+"/acl");
+
+
+</script>
+<script type="text/javascript" src="js/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("$linkurl");
+		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>
+
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index fca65c907..c6352cfe9 100755
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -319,41 +319,6 @@ aside {
 		img { width: 48px; height: 48px; }
 	}
 }
-/* mail view */
-.mail-conv-sender,
-.mail-conv-detail {
-	float: left;
-}
-.mail-conv-detail {
-	margin-left: 20px;
-	width: 500px;
-}
-
-.mail-conv-subject {
-    font-size: 1.4em;
-    margin: 10px 0;
-}
-
-.mail-conv-outside-wrapper-end {
-	clear: both;
-}
-
-.mail-conv-outside-wrapper {
-	margin-top: 30px;
-}
-
-.mail-conv-delete-wrapper {
-	float: right;
-	margin-right: 30px;
-	margin-top: 15px;
-}
-.mail-conv-break {
-	clear: both;
-}
-
-.mail-conv-delete-icon {
-	border: none;
-}
 
 /* group member */
 #contact-edit-drop-link,
@@ -938,6 +903,10 @@ ul.tabs {
 	textarea {
 		width: 400px;
 	}
+	input[type="checkbox"], input[type="radio"]{
+		width: auto;
+	}
+	
 	textarea { height: 100px; }
 	.field_help {
 		display: block;
@@ -981,6 +950,7 @@ ul.tabs {
 	&.radio .field_help { margin-left: 0px; }
 }
 
+
 #profile-edit-links li {
 	list-style: none;
         margin-top: 10px;
@@ -1085,6 +1055,90 @@ ul.tabs {
 	}	
 }
 
+/* messages */
+#message-new {
+	background: @MessageNewBackgroundColor;
+	border: 1px solid @MessageNewBorderColor;
+	width: 150px;
+	a {
+		color: @MessageNewColor;
+		text-align: center;
+		display: block;
+		font-weight: bold;
+		padding: 1em 0px;
+	}
+}
+
+.mail-list-wrapper {
+	background-color: @MailListBackgroundColor;
+	margin-bottom: 5px;
+	width: 100%; height: auto; overflow: hidden;
+	
+	span { display: block; float: left; width: 20%; overflow: hidden;}
+	
+	.mail-subject { 
+		width: 30%;
+		padding:4px 0px 0px 4px;
+		a { display: block; }
+		&.unseen a { font-weight: bold; }
+	}
+	.mail-date { padding: 4px 4px 0px 4px; }
+	.mail-from { padding: 4px 4px 0px 4px; }
+	.mail-count { padding: 4px 4px 0px 4px; text-align: right;}
+	
+	.mail-delete { float: right; }
+}
+
+#mail-display-subject {
+	background-color: @MailDisplaySubjectBackgroundColor;
+	color: @MailDisplaySubjectColor;
+	margin-bottom: 10px;
+	width: 100%; height: auto; overflow: hidden;
+	span { float: left; overflow: hidden; padding: 4px 0px 0px 10px;}
+	.mail-delete { float: right;  .opaque(0.5);}
+	&:hover .mail-delete { .opaque(1); }
+	
+}
+
+/* mail view */
+/*
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+*/
+
 
 /* page footer */
 footer { height: 100px; display: table-row; }
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 8f0abe86d..7d7444e48 100755
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -626,35 +626,6 @@ aside #profiles-menu {
   width: 48px;
   height: 48px;
 }
-/* mail view */
-.mail-conv-sender, .mail-conv-detail {
-  float: left;
-}
-.mail-conv-detail {
-  margin-left: 20px;
-  width: 500px;
-}
-.mail-conv-subject {
-  font-size: 1.4em;
-  margin: 10px 0;
-}
-.mail-conv-outside-wrapper-end {
-  clear: both;
-}
-.mail-conv-outside-wrapper {
-  margin-top: 30px;
-}
-.mail-conv-delete-wrapper {
-  float: right;
-  margin-right: 30px;
-  margin-top: 15px;
-}
-.mail-conv-break {
-  clear: both;
-}
-.mail-conv-delete-icon {
-  border: none;
-}
 /* group member */
 #contact-edit-drop-link, .mail-list-delete-wrapper, .group-delete-wrapper {
   float: right;
@@ -1355,6 +1326,9 @@ ul.tabs li .active {
 .field input, .field textarea {
   width: 400px;
 }
+.field input[type="checkbox"], .field input[type="radio"] {
+  width: auto;
+}
 .field textarea {
   height: 100px;
 }
@@ -1503,6 +1477,123 @@ ul.tabs li .active {
   left: 0px;
   top: 63px;
 }
+/* messages */
+#message-new {
+  background: #19aeff;
+  border: 1px solid #005c94;
+  width: 150px;
+}
+#message-new a {
+  color: #ffffff;
+  text-align: center;
+  display: block;
+  font-weight: bold;
+  padding: 1em 0px;
+}
+.mail-list-wrapper {
+  background-color: #f6f7f8;
+  margin-bottom: 5px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+.mail-list-wrapper span {
+  display: block;
+  float: left;
+  width: 20%;
+  overflow: hidden;
+}
+.mail-list-wrapper .mail-subject {
+  width: 30%;
+  padding: 4px 0px 0px 4px;
+}
+.mail-list-wrapper .mail-subject a {
+  display: block;
+}
+.mail-list-wrapper .mail-subject.unseen a {
+  font-weight: bold;
+}
+.mail-list-wrapper .mail-date {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-from {
+  padding: 4px 4px 0px 4px;
+}
+.mail-list-wrapper .mail-count {
+  padding: 4px 4px 0px 4px;
+  text-align: right;
+}
+.mail-list-wrapper .mail-delete {
+  float: right;
+}
+#mail-display-subject {
+  background-color: #f6f7f8;
+  color: #2d2d2d;
+  margin-bottom: 10px;
+  width: 100%;
+  height: auto;
+  overflow: hidden;
+}
+#mail-display-subject span {
+  float: left;
+  overflow: hidden;
+  padding: 4px 0px 0px 10px;
+}
+#mail-display-subject .mail-delete {
+  float: right;
+  opacity: 0.5;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+#mail-display-subject:hover .mail-delete {
+  opacity: 1;
+  -webkit-transition: all 0.2s ease-in-out;
+  -moz-transition: all 0.2s ease-in-out;
+  -o-transition: all 0.2s ease-in-out;
+  -ms-transition: all 0.2s ease-in-out;
+  transition: all 0.2s ease-in-out;
+}
+/* mail view */
+/*
+.mail-conv-sender,
+.mail-conv-detail {
+	float: left;
+}
+.mail-conv-detail {
+	margin-left: 20px;
+	width: 500px;
+}
+
+.mail-conv-subject {
+    font-size: 1.4em;
+    margin: 10px 0;
+}
+
+.mail-conv-outside-wrapper-end {
+	clear: both;
+}
+
+.mail-conv-outside-wrapper {
+	margin-top: 30px;
+}
+
+.mail-conv-delete-wrapper {
+	float: right;
+	margin-right: 30px;
+	margin-top: 15px;
+}
+.mail-conv-break {
+	clear: both;
+}
+
+.mail-conv-delete-icon {
+	border: none;
+}
+
+*/
 /* page footer */
 footer {
   height: 100px;