Merged messages interface changes.

git-svn-id: http://code.elgg.org/elgg/trunk@5270 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 63 insertions, 214 deletions

diff --git a/mod/messages/views/default/messages/css.php b/mod/messages/views/default/messages/css.php
index 6a8a6ed30..b73f8ff11 100644
--- a/mod/messages/views/default/messages/css.php
+++ b/mod/messages/views/default/messages/css.php
@@ -1,234 +1,83 @@
 <?php
-
-	/**
-	 * Elgg Messages CSS extender
-	 * 
-	 * @package ElggMessages
-	 * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
-	 * @author Curverider Ltd <info@elgg.com>
-	 * @copyright Curverider Ltd 2008-2010
-	 * @link http://elgg.com/
-	 */
-
+/**
+ * Elgg Messages CSS
+ * 
+ * @package ElggMessages
+ * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
+ * @author Curverider Ltd <info@elgg.com>
+ * @copyright Curverider Ltd 2008-2010
+ * @link http://elgg.com/
+ */
 ?>
 
-/*-------------------------------
-MESSAGING PLUGIN
--------------------------------*/
-#messages {
-	margin:0 10px 0 10px;
-}
-.actiontitle {
-	font-weight: bold;
-	font-size: 110%;
-	margin: 0 0 10px 0;
-}
-#messages .pagination {
-	margin:5px 0 5px 0;
-}
-#messages input[type="checkbox"] {
-	margin:0;
-	padding:0;
-	border:none;
-}
-.messages_buttonbank {
-	-webkit-border-radius: 8px; 
-	-moz-border-radius: 8px;
-	background:white;
-	margin:5px 10px;
-	padding:5px;
-	text-align: right;
-}
-.messages_buttonbank input {
-	margin:0 0 0 10px;
-}
-.messages_buttonbank input[type="button"] {
-	font: 12px/100% Arial, Helvetica, sans-serif;
-	font-weight: bold;
-	color: #4690D6;
-	background:#dddddd;
-	border: 1px solid #999999;
-	-webkit-border-radius: 4px; 
-	-moz-border-radius: 4px;
-	width: auto;
-	height: 25px;
-	padding: 2px 6px 2px 6px;
-	margin:0 0 0 10px;
-	cursor: pointer;
-}
-.messages_buttonbank input[type="button"]:hover {
-	background: #0054a7;
-	border: 1px solid #0054a7;
+/* messages/new messages icon & counter in elgg_topbar */
+a.privatemessages {
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left 2px;
+	padding-left:16px;
+	margin:4px 15px 0 5px;
+	cursor:pointer;
+}
+a.privatemessages:hover {
+	text-decoration: none;
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left -36px;
+}
+a.privatemessages.new {
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left 2px;
+	padding-left:18px;
+	margin:4px 15px 0 5px;
 	color:white;
 }
-
-#messages td {
-	text-align: left;
-	vertical-align:middle;
-	padding: 5px;
-}
-#messages .message_sent {
-	-webkit-border-radius: 5px; 
-	-moz-border-radius: 5px;
-	margin-bottom: 5px;
-	background: white;
-	border:1px solid #cccccc; 	
+a.privatemessages.new:hover {
+	text-decoration: none;
+	background:transparent url(<?php echo $vars['url']; ?>_graphics/toolbar_messages_icon.gif) no-repeat left -36px;
 }
-#messages .message_notread {
-	-webkit-border-radius: 5px; 
-	-moz-border-radius: 5px;
-	margin-bottom: 5px;
-	background: #F7DAD8;
-	border:1px solid #ff6c7c; 
-}
-#messages .message_read {
-	-webkit-border-radius: 5px; 
-	-moz-border-radius: 5px;
-	margin-bottom: 5px;
-	background: white;
-	border:1px solid #cccccc; 
-}
-#messages .message_notread td {
-
-}
-#messages .message_read td {
-
-}
-
-#messages .delete_msg a {
+a.privatemessages.new span {
+	background-color: red;
+	-webkit-border-radius: 10px; 
+	-moz-border-radius: 10px;
+	-webkit-box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.50); /* safari v3+ */
+	-moz-box-shadow: -2px 2px 4px rgba(0, 0, 0, 0.50); /* FF v3.5+ */
+	color:white;
 	display:block;
-	cursor: pointer;
-	width:14px;
-	height:14px;
-	margin:0;
-	background: url("<?php echo $vars['url']; ?>_graphics/icon_customise_remove.png") no-repeat right 0;
-	text-indent: -9000px;
 	float:right;
-}
-#messages .delete_msg a:hover {
-	background-position: right -16px;
-}
-/* IE6 */
-* html #messages .delete_msg a { background-position: right 4px; }
-* html #messages .delete_msg a:hover { background-position: right 4px; } 
-
-#messages .usericon,
-#messages .groupicon {
-	float: left;
-	margin: 0 15px 0 0;
-}
-
-#messages .msgsender {
-	color:#666666;
-	line-height: 1em;
-	margin:0;
 	padding:0;
-	float:left;
-}
-#messages .msgsender small {
-	color:#AAAAAA;
-}
-
-
-#messages .msgsubject {
-	font-size: 120%;
-	line-height: 100%;
-}
-
-.msgsubject {
+	position:relative;
+	text-align:center;
+	top:-3px;
+	right:5px;
+	min-width: 15px;
+	font-size:9px;
 	font-weight:bold;
 }
 
-.messages_single_icon  {
-	float: left;
-	width:110px;
-}
-
-.messages_single_icon .usericon,
-.messages_single_icon .groupicon {
-	float: left;
-	margin: 0 10px 10px 0;
-}
-
-/* view and reply to message view */
-.message_body {
-	margin-left: 120px;
-}
-.message_body .messagebody {
-	padding:0;
-	margin:10px 0 10px 0;
-	font-size: 120%;
-	border-bottom:1px solid #cccccc;
-}
-
-/* drop down message reply form */
-#message_reply_form { display:none; }
-
-.new_messages_count {
-	color:#666666;
-}
-/* tinyMCE container */
-#message_reply_editor #message_tbl {
-	width:680px !important;
-}
-/* IE6 */
-* html #message_reply_editor #message_tbl { width:676px !important;}
-
-#messages_return {
-	margin:4px 0 4px 10px;
-}
-#messages_return p {
-	margin:0;
-}
-.messages_single {
-	background: white;
-	-webkit-border-radius: 8px; 
-	-moz-border-radius: 8px;
-	margin:0 10px 10px 10px;
-	padding:10px;	
+/* page content */
+.message {
+	border-bottom:1px dotted #cccccc;
+	padding:5px 0 7px 0;
 }
-/* when displaying original msg in reply view */
-.previous_message {
-    background:#dedede;
-	-webkit-border-radius: 5px; 
-	-moz-border-radius: 5px;
-    padding:10px;
-    margin:0 0 20px 0;
+.message.notread .entity_listing_info p.entity_title a {
+	color:#d40005;
 }
-.previous_message p {
-    padding:0;
-    margin:0 0 5px 0;
-    font-size: 100%;
+.message_sender {
+	float:left;
+	width:180px;
+	overflow: hidden;
 }
-
-
-
-
-#notificationstable td.sitetogglefield {
-	width:50px;
-	text-align: center;
-	vertical-align: middle;
+.message_subject {
+	float:left;
+	width:513px;
+	padding-top:6px;
 }
-#notificationstable td.sitetogglefield input {
-	margin-right:36px;
-	margin-top:5px;
+.message .delete_button {
+	margin-top:3px;
 }
-#notificationstable td.sitetogglefield a {
-	width:46px;
-	height:24px;
-	cursor: pointer;
-	display: block;
-	outline: none;
+.entity_listing.messages:hover {
+	background-color:white;
 }
-#notificationstable td.sitetogglefield a.sitetoggleOff {
-	background: url(<?php echo $vars['url']; ?>mod/messages/graphics/icon_notifications_site.gif) no-repeat right 2px;
+.messages_buttonbank {
+	margin:5px 0;
+	text-align: right;
 }
-#notificationstable td.sitetogglefield a.sitetoggleOn {
-	background: url(<?php echo $vars['url']; ?>mod/messages/graphics/icon_notifications_site.gif) no-repeat right -36px;
+.messages_buttonbank input {
+	margin:0 0 0 10px;
 }
-
-
-
-
-
-