No OneTemporary
Actions

Size

36 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/skins/default/mail.css b/skins/default/mail.css
	index 0c10ff717..fc47d0047 100644
	--- a/skins/default/mail.css
	+++ b/skins/default/mail.css
	@@ -1,1067 +1,1067 @@
	/*** RoundCube\|Mail mail task styles ***/


	#messagetoolbar
	{
	position: absolute;
	top: 45px;
	left: 200px;
	right: 200px;
	height: 35px;
	white-space: nowrap;
	/* border: 1px solid #cccccc; */
	}

	#messagetoolbar a
	{
	padding-right: 10px;
	}

	#messagetoolbar select
	{
	font-family: "Lucida Grande", Verdana, Arial, Helvetica, sans-serif;
	font-size: 11px;
	color: #333333;
	}

	#messagetoolbar select.mboxlist
	{
	position: absolute;
	left: 375px;
	top: 10px;
	}

	#messagetoolbar select.mboxlist option
	{
	padding-left: 15px;
	}

	#messagetoolbar select.mboxlist option[value="0"]
	{
	padding-left: 2px;
	}

	#markmessagemenu
	{
	position: absolute;
	top: 32px;
	left: 90px;
	width: auto;
	visibility: hidden;
	background-color: #F9F9F9;
	border: 1px solid #CCC;
	padding: 1px;
	opacity: 0.9;
	filter:alpha(opacity=90);
	z-index: 240;
	}

	ul.toolbarmenu
	{
	margin: 0;
	padding: 0;
	list-style: none;
	}

	ul.toolbarmenu li
	{
	font-size: 11px;
	white-space: nowrap;
	min-width: 130px;
	width: auto !important;
	width: 130px;
	}

	ul.toolbarmenu li a
	{
	display: block;
	color: #a0a0a0;
	padding: 2px 8px 3px 12px;
	text-decoration: none;
	}

	ul.toolbarmenu li a.active:hover
	{
	background-color: #ddd;
	}

	#listcontrols
	{
	position: absolute;
	left: 200px;
	bottom: 20px;
	height: 16px;
	width: 500px;
	font-size: 11px;
	}

	#listcontrols a,
	#listcontrols a:active,
	#listcontrols a:visited,
	#mailboxcontrols a,
	#mailboxcontrols a:active,
	#mailboxcontrols a:visited,
	td.formlinks a,
	td.formlinks a:visited
	{
	color: #999999;
	font-size: 11px;
	text-decoration: none;
	}

	#listcontrols a.active,
	#listcontrols a.active:active,
	#listcontrols a.active:visited,
	#mailboxcontrols a.active,
	#mailboxcontrols a.active:active,
	#mailboxcontrols a.active:visited,
	ul.toolbarmenu li a.active,
	ul.toolbarmenu li a.active:active,
	ul.toolbarmenu li a.active:visited,
	td.formlinks a,
	td.formlinks a:visited
	{
	color: #CC0000;
	}

	#listcontrols a.active:hover,
	#mailboxcontrols a.active:hover
	{
	text-decoration: underline;
	}

	#messagecountbar
	{
	position: absolute;
	bottom: 16px;
	right: 20px;
	width: 300px;
	height: 20px;
	text-align: right;
	white-space: nowrap;
	}

	#messagecountbar span
	{
	font-size: 11px;
	color: #333333;
	}

	#mainscreen
	{
	position: absolute;
	top: 85px;
	right: 20px;
	bottom: 40px;
	left: 20px;
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth)-40)+'px');
	height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
	}

	#mailrightcontainer
	{
	position: absolute;
	top: 0px;
	left: 170px;
	bottom: 0px;
	right: 0px;
	/* css hack for IE */
	width: expression((parseInt(this.parentNode.offsetWidth)-170)+'px');
	height: expression(parseInt(this.parentNode.offsetHeight)+'px');
	}

	#messagepartcontainer
	{
	position: absolute;
	top: 80px;
	left: 20px;
	right: 20px;
	bottom: 20px;
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth)-40)+'px');
	height: expression((parseInt(document.documentElement.clientHeight)-100)+'px');
	}

	#mailcontframe
	{
	position: absolute;
	width: 100%;
	top: 0px;
	bottom: 0px;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	overflow: auto;
	/* css hack for IE */
	height: expression(parseInt(this.parentNode.offsetHeight)+'px');
	}

	#mailpreviewframe
	{
	position: absolute;
	width: 100%;
	top: 205px;
	bottom: 0px;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	/* css hack for IE */
	height: expression((parseInt(this.parentNode.offsetHeight)-205)+'px');
	}

	#messagecontframe
	{
	position: relative;
	top: 0px;
	left: 0px;
	right: 0px;
	bottom: 0px;
	width: 100%;
	height: 100%;
	}

	#messagepartframe
	{
	width: 100%;
	height: 100%;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	}


	#partheader
	{
	position: absolute;
	top: 10px;
	left: 220px;
	right: 20px;
	height: 40px;
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth)-240)+'px');
	}

	#partheader table td
	{
	padding-left: 2px;
	padding-right: 4px;
	vertical-align: middle;
	font-size: 11px;
	}

	#partheader table td.title
	{
	color: #666666;
	font-weight: bold;
	}


	/** mailbox list styles */

	#mailboxlist-header
	{
	display: block;
	height: 12px;
	margin: 0;
	padding: 3px 10px 4px 10px;
	background-color: #EBEBEB;
	background-image: url(images/listheader_aqua.gif);
	border-bottom: 1px solid #999;
	color: #333333;
	font-size: 11px;
	font-weight: bold;
	}

	#mailboxlist-container
	{
	position: absolute;
	top: 0px;
	left: 0px;
	width: 160px;
	bottom: 0px;
	border: 1px solid #999;
	background-color: #F9F9F9;
	overflow: auto;
	/* css hack for IE */
	height: expression(parseInt(this.parentNode.offsetHeight)+'px');
	}

	#mailboxlist
	{
	position:relative;
	width: 100%;
	height: auto;
	margin: 0px;
	padding: 0px;
	list-style-image: none;
	list-style-type: none;
	overflow: hidden;
	white-space: nowrap;
	}

	#mailboxlist li
	{
	display: block;
	position: relative;
	font-size: 11px;
	background: url(images/icons/folder-closed.png) no-repeat;
	background-position: 5px 1px;
	border-bottom: 1px solid #EBEBEB;
	}

	#mailboxlist li div
	{
	position: absolute;
	left: 8px !important;
	left: -16px;
	top: 2px;
	width: 14px;
	height: 16px;
	}

	#mailboxlist li div.collapsed,
	#mailboxlist li div.expanded
	{
	cursor: pointer;
	}

	#mailboxlist li div.collapsed
	{
	background: url(images/icons/collapsed.png) bottom right no-repeat;
	}

	#mailboxlist li div.expanded
	{
	background: url(images/icons/expanded.png) bottom right no-repeat;
	}

	#mailboxlist li.inbox
	{
	background-image: url(images/icons/folder-inbox.png);
	}

	#mailboxlist li.drafts
	{
	background-image: url(images/icons/folder-drafts.png);
	}

	#mailboxlist li.sent
	{
	background-image: url(images/icons/folder-sent.png);
	}

	#mailboxlist li.junk
	{
	background-image: url(images/icons/folder-junk.png);
	}

	#mailboxlist li.trash
	{
	background-image: url(images/icons/folder-trash.png);
	}

	#mailboxlist li a
	{
	cursor: default;
	display: block;
	position: relative;
	padding-left: 25px;
	padding-top: 2px;
	padding-bottom: 2px;
	text-decoration: none;
	}

	#mailboxlist li.unread
	{
	font-weight: bold;
	}

	#mailboxlist li.virtual > a
	{
	color: #666;
	}

	#mailboxlist li.selected,
	#mailboxlist li.droptarget li.selected
	{
	background-color: #929292;
	}

	#mailboxlist li.selected > a,
	#mailboxlist li.droptarget li.selected a
	{
	color: #FFF;
	font-weight: bold;
	}

	#mailboxlist li.droptarget
	{
	background-color: #FFFFA6;
	}

	/* styles for nested folders */
	#mailboxlist ul {
	list-style: none;
	padding: 0;
	margin:0;
	border-top: 1px solid #EBEBEB;
	padding-left: 15px;
	background-position: 25px 1px;
	background-color: #F9F9F9;
	color: blue;
	font-weight: normal;
	}


	#mailboxcontrols
	{
	position: absolute;
	left: 20px;
	width: 185px;
	bottom: 20px;
	height: 16px;
	overflow: hidden;
	font-size: 11px;
	}


	/** message list styles */

	body.messagelist
	{
	margin: 0px;
	background-color: #F9F9F9;
	}

	#messagelist
	{
	width: 100%;
	display: table;
	table-layout: fixed;
	/* css hack for IE */
	width: expression(parseInt(document.getElementById('mailcontframe').clientWidth)+'px');
	}

	/* safari hack \*/
	html>body*#messagelist[id$="messagelist"]:not([class="none"]) { width: 99%; }
	html>body*input[type$="file"]:not([class="none"]) { background-color: transparent; border:0; }
	/**/

	#messagelist thead tr td
	{
	height: 20px;
	padding-top: 0px;
	padding-bottom: 0px;
	padding-left: 2px;
	padding-right: 4px;
	vertical-align: middle;
	border-bottom: 1px solid #999999;
	color: #333333;
	background-color: #EBEBEB;
	background-image: url(images/listheader_aqua.gif);
	font-size: 11px;
	font-weight: bold;
	}

	#messagelist thead tr td.sortedASC,
	#messagelist thead tr td.sortedDESC
	{
	background-image: url(images/listheader_dark.gif);
	}

	#messagelist thead tr td.sortedASC a
	{
	background: url(images/sort_asc.gif) top right no-repeat;
	}

	#messagelist thead tr td.sortedDESC a
	{
	background: url(images/sort_desc.gif) top right no-repeat;
	}

	#messagelist thead tr td a
	{
	display: block;
	width: auto !important;
	width: 100%;
	color: #333333;
	text-decoration: none;
	}

	#messagelist tbody tr td
	{
	height: 16px;
	padding: 2px;
	padding-right: 4px;
	font-size: 11px;
	overflow: hidden;
	white-space: nowrap;
	text-overflow: ellipsis;
	border-bottom: 1px solid #EBEBEB;
	cursor: default;
	}

	#messagelist tbody tr td a
	{
	color: #000;
	text-decoration: none;
	white-space: nowrap;
	cursor: inherit;
	}

	#messagelist tbody tr td.subject a
	{
	cursor: default;
	}

	#messagelist col
	{
	display: table-column;
	text-align: left;
	vertical-align: middle;
	}

	#messagelist tr td.icon,
	#messagelist tr td.flag
	{
	width: 16px;
	vertical-align: middle;
	cursor: pointer;
	}

	#messagelist tr td.subject
	{
	overflow: hidden;
	vertical-align: middle;
	}

	#messagelist tr td.size
	{
	width: 70px;
	text-align: right;
	vertical-align: middle;
	}

	#messagelist tr td.from,
	#messagelist tr td.to
	{
	width: 180px;
	vertical-align: middle;
	}

	#messagelist tr td.date
	{
	width: 118px;
	vertical-align: middle;
	}

	#messagelist tr.message
	{
	background-color: #FFFFFF;
	}

	/*
	#messagelist tr.odd
	{
	background-color: #F9F9F9;
	}
	*/

	#messagelist tr.unread
	{
	font-weight: bold;
	background-color: #FFFFFF;
	}

	#messagelist tr.selected td
	{
	color: #FFFFFF;
	background-color: #CC3333;
	}

	#messagelist tr.unfocused td
	{
	color: #FFFFFF;
	background-color: #929292;
	}

	#messagelist tr.selected td a
	{
	color: #FFFFFF;
	}

	#messagelist tr.unfocused td a
	{
	color: #FFFFFF;
	}

	#messagelist tr.deleted td a
	{
	color: #CCCCCC;
	}

	#messagelist tr.deleted td,
	#messagelist tr.deleted td a
	{
	color: #CCCCCC;
	}


	#quotadisplay
	{
	color: #666666;
	font-size: 11px;
	}

	#quotadisplay img
	{
	vertical-align: middle;
	margin-left: 4px;
	border: 1px solid #666666;
	}


	/** message view styles */


	#messageframe
	{
	position: absolute;
	top: 0px;
	left: 170px;
	right: 0px;
	bottom: 0px;
	border: 1px solid #999;
	background-color: #FFF;
	overflow: auto;
	/* css hack for IE */
	- width: expression((parseInt(document.documentElement.clientWidth)-220)+'px');
	- height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
	+ width: expression((parseInt(this.parentNode.offsetWidth)-170)+'px');
	+ height: expression((parseInt(this.parentNode.offsetHeight))+'px');
	}

	#printmessageframe
	{
	position: absolute;
	top: 0px;
	left: 0px;
	right: 0px;
	bottom: 0px;
	border: 1px solid #999;
	background-color: #FFF;
	overflow: auto;
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth)-220)+'px');
	height: expression((parseInt(document.documentElement.clientHeight)-125)+'px');
	}

	div.messageheaderbox
	{
	position: relative;
	margin: 6px 8px 0px 8px;
	border: 1px solid #ccc;
	}

	table.headers-table
	{
	width: 100%;
	background-color: #EBEBEB;
	table-layout: fixed;
	}

	#messagebody table.headers-table
	{
	width: auto;
	margin: 6px 8px;
	background-color: #F4F4F4;
	border: 1px solid #ccc;
	}

	#messageframe table.headers-table
	{
	border-bottom: 1px solid #ccc;
	}

	table.headers-table tr td
	{
	font-size: 11px;
	border-bottom:1px solid #FFFFFF;
	}

	table.headers-table td.header-title
	{
	width: 80px;
	color: #666666;
	font-weight: bold;
	text-align: right;
	white-space: nowrap;
	padding-right: 4px;
	}

	table.headers-table tr td.subject
	{
	width: 90%;
	font-weight: bold;
	}

	table.headers-table tr td.all
	{
	width: 100%;
	color: #666666;
	text-align: left;
	padding-right: 10px;
	vertical-align: center;
	text-align: center;
	}

	#attachment-list
	{
	margin: 0px;
	padding: 0px 0px 0px 72px;
	min-height: 16px;
	list-style-image: none;
	list-style-type: none;
	background: url(images/icons/attachment.png) 60px 2px no-repeat #DFDFDF;
	/* IE6 hack */
	_height: expression(Math.min(16, parseInt(document.documentElement.clientHeight))+'px');
	}

	#attachment-list:after
	{
	content: ".";
	display: block;
	height: 0;
	font-size: 0;
	clear: both;
	visibility: hidden;
	}

	#attachment-list li
	{
	float: left;
	height: 18px;
	font-size: 11px;
	padding: 2px 0px 0px 15px;
	white-space: nowrap;
	}

	#attachment-list li a
	{
	text-decoration: none;
	}

	#attachment-list li a:hover
	{
	text-decoration: underline;
	}

	#messagebody
	{
	position:relative;
	padding-bottom: 10px;
	background-color: #FFFFFF;
	}

	div.message-part
	{
	padding: 10px 8px;
	border-top: 1px solid #ccc;
	/* overflow: hidden; */
	}

	#messagebody div:first-child
	{
	border-top: 0;
	}

	div.message-part a,
	div.message-htmlpart a
	{
	color: #0000CC;
	}

	div.message-part div.pre
	{
	margin: 0px;
	padding: 0px;
	font-family: monospace;
	white-space: -moz-pre-wrap !important;
	white-space: -o-pre-wrap !important;
	white-space: pre-wrap !important;
	white-space: pre;
	word-wrap: break-word; /* IE (and Safari) */
	}

	div.message-part blockquote
	{
	color: blue;
	border-left: 2px solid blue;
	border-right: 2px solid blue;
	background-color: #F6F6F6;
	margin: 2px 0px 2px 0px;
	padding: 1px 8px 1px 10px;
	}

	div.message-part blockquote blockquote
	{
	color: green;
	border-left: 2px solid green;
	border-right: 2px solid green;
	}

	div.message-part blockquote blockquote blockquote
	{
	color: #990000;
	border-left: 2px solid #bb0000;
	border-right: 2px solid #bb0000;
	}

	body.iframe div.message-htmlpart
	{
	margin: 8px;
	}

	div.message-htmlpart div.rcmBody
	{
	margin: 8px;
	}

	#remote-objects-message
	{
	display: none;
	margin: 8px;
	min-height: 20px;
	padding: 10px 10px 6px 46px;
	}

	#remote-objects-message a
	{
	color: #666666;
	padding-left: 10px;
	}

	#remote-objects-message a:hover
	{
	color: #333333;
	}

	#messageviewlink
	{
	position: absolute;
	top: 1px;
	right: 1px;
	width: 15px;
	height: 15px;
	border: 0;
	}

	/** message compose styles */

	#compose-toolbar
	{
	white-space: nowrap;
	}

	#priority-selector,
	#receipt-selector
	{
	padding-left: 30px;
	white-space: nowrap;
	}

	#compose-container
	{
	position: absolute;
	top: 90px;
	left: 200px;
	right: 25px;
	bottom: 30px;
	padding: 0px;
	margin: 0px;
	/* css hack for IE */
	width: expression((parseInt(document.documentElement.clientWidth)-220)+'px');
	height: expression((parseInt(document.documentElement.clientHeight)-130)+'px');
	}

	/*
	#compose-headers
	{
	position: absolute;
	top: 70px;
	left: 200px;
	height: 84px;
	border-top: 1px solid #cccccc;
	overflow: auto;
	}

	#compose-headers td
	{
	padding-top: 1px;
	padding-bottom: 1px;
	border-right: 1px solid #cccccc;
	border-bottom: 1px solid #cccccc;
	}
	*/

	#compose-headers
	{
	width: 100%;
	}

	/*
	#compose-headers td
	{
	width: 100%;
	}
	*/

	#compose-headers td.top
	{
	vertical-align: top;
	}

	#compose-headers td.title,
	#compose-subject td.title
	{
	width: 80px !important;
	color: #666666;
	font-size: 11px;
	font-weight: bold;
	padding-right: 10px;
	white-space: nowrap;
	}

	#compose-body,
	#compose-headers td textarea,
	#compose-headers td input
	{
	width: 100%;
	width: expression('99%');
	}

	#compose-headers td textarea
	{
	height: 38px;
	}

	#compose-cc,
	#compose-bcc,
	#compose-replyto
	{
	display: none;
	}

	#compose-body
	{
	margin-top: 5px;
	margin-bottom: 10px;
	height: 90%;
	min-height: 280px;
	font-size: 9pt;
	font-family: "Courier New", Courier, monospace;
	}

	#compose-attachments
	{
	position: absolute;
	top: 100px;
	left: 20px;
	width: 160px;
	}

	#compose-attachments ul
	{
	margin: 0px;
	padding: 0px;
	border: 1px solid #CCCCCC;
	background-color: #F9F9F9;
	list-style-image: none;
	list-style-type: none;
	}

	#compose-attachments ul li
	{
	height: 18px;
	font-size: 11px;
	padding-left: 2px;
	padding-top: 2px;
	padding-right: 4px;
	border-bottom: 1px solid #EBEBEB;
	white-space: nowrap;
	overflow: hidden;
	}

	#attachment-title
	{
	background: url(images/icons/attachment.png) top left no-repeat;
	padding: 0px 0px 3px 22px;
	}

	#attachment-form
	{
	position: absolute;
	top: 150px;
	left: 20px;
	z-index: 200;
	padding: 6px;
	visibility: hidden;
	border: 1px solid #CCCCCC;
	background-color: #F9F9F9;
	}

	#attachment-form div
	{
	padding: 2px;
	}

	#attachment-form div.buttons
	{
	margin-top: 4px;
	}

	table.headers-table tr td.more-headers
	{
	cursor: pointer;
	width: 100%;
	height: 8px;
	border-bottom: 0;
	}

	table.headers-table tr td.all
	{
	padding: 2px 6px 4px 6px;
	border-bottom: 0;
	}

	td.show-headers
	{
	background: url(images/icons/down_small.gif) no-repeat center;
	}

	td.hide-headers
	{
	background: url(images/icons/up_small.gif) no-repeat center;
	}

	#all-headers
	{
	height: 150px;
	display: none;
	}

	#headers-source
	{
	margin: 0 5px;
	padding: 0.5em;
	height: 145px;
	background: white;
	overflow: auto;
	font-size: 11px;
	white-space: nowrap;
	border: 1px solid #999999;
	display: none;
	text-align: left;
	color: #333;
	}

	font.bold
	{
	font-weight: bold;
	}
	diff --git a/skins/default/templates/addressbook.html b/skins/default/templates/addressbook.html
	index 999947730..326ded296 100644
	--- a/skins/default/templates/addressbook.html
	+++ b/skins/default/templates/addressbook.html
	@@ -1,69 +1,80 @@
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	<link rel="stylesheet" type="text/css" href="/addresses.css" />
	<script type="text/javascript" src="/splitter.js"></script>

	-<roundcube:if condition="config:ldap_public == false" />
	<style type="text/css">
	+<roundcube:if condition="config:ldap_public == false" />
	#abookcountbar { left: 20px;}
	#mainscreen { left:20px; /* IE hack */ width:expression((parseInt(document.documentElement.clientWidth)-40)+'px') }
	-#addresslist { width:245px }
	-#contacts-box { left:255px; /* IE hack */ width:expression((parseInt(mainscreen.offsetWidth)-255)+'px') }
	-</style>
	+#addresslist { width: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter-5 : 245" />px; }
	+#contacts-box {
	+ left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px;
	+ /* IE hack */
	+ width:expression((parseInt(mainscreen.offsetWidth)-<roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />)+'px')
	+}
	+<roundcube:else />
	+#addresslist { width: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter-5 : 245" />px; }
	+#contacts-box {
	+ left: <roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />px;
	+ /* IE hack */
	+ width:expression((parseInt(mainscreen.offsetWidth)-<roundcube:exp expression="!empty(cookie:addressviewsplitter) ? cookie:addressviewsplitter+5 : 255" />)+'px')
	+}
	<roundcube:endif />
	+</style>

	</head>
	<body>

	<roundcube:include file="/includes/taskbar.html" />
	<roundcube:include file="/includes/header.html" />

	<div id="abooktoolbar">
	<roundcube:button command="add" imageSel="/images/buttons/add_contact_sel.png" imageAct="/images/buttons/add_contact_act.png" imagePas="/images/buttons/add_contact_pas.png" width="32" height="32" title="newcontact" />
	<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletecontact" />
	<roundcube:button command="compose" imageSel="/images/buttons/compose_sel.png" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="composeto" />
	<roundcube:button command="import" imageSel="/images/buttons/adr_import_sel.png" imageAct="/images/buttons/adr_import_act.png" imagePas="/images/buttons/adr_import_pas.png" width="32" height="32" title="importcontacts" />
	<roundcube:button command="export" imageSel="/images/buttons/download_sel.png" imageAct="/images/buttons/download_act.png" imagePas="/images/buttons/download_pas.png" width="32" height="32" title="exportvcards" />
	</div>

	<div id="quicksearchbar">
	<roundcube:object name="searchform" type="search" results="5" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
	</div>

	<roundcube:if condition="config:ldap_public" />
	<div id="directorylist">
	<div id="groups-title"><roundcube:label name="groups" /></div>
	<roundcube:object name="directorylist" id="directories-list" />
	</div>
	<roundcube:endif />

	<div id="mainscreen">

	<div id="addresslist">
	<roundcube:object name="addresslist" id="contacts-table" class="records-table" cellspacing="0" summary="Contacts list" />
	</div>

	<script type="text/javascript">
	var addrviewsplit = new rcube_splitter({id:'addressviewsplitter', p1: 'addresslist', p2: 'contacts-box', orientation: 'v', relative: true, start: 250});
	rcmail.add_onload('addrviewsplit.init()');
	</script>

	<div id="contacts-box">
	<roundcube:object name="addressframe" id="contact-frame" width="100%" height="100%" frameborder="0" src="/watermark.html" />
	</div>

	</div>

	<div id="abookcountbar">
	<roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstpage" />
	<roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previouspage" />
	<roundcube:object name="recordsCountDisplay" />
	<roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextpage" />
	<roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastpage" />
	</div>

	</body>
	</html>
	diff --git a/skins/default/templates/mail.html b/skins/default/templates/mail.html
	index f4070e95f..24f851a20 100644
	--- a/skins/default/templates/mail.html
	+++ b/skins/default/templates/mail.html
	@@ -1,159 +1,170 @@
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	<link rel="stylesheet" type="text/css" href="/mail.css" />
	<script type="text/javascript" src="/splitter.js"></script>
	<script type="text/javascript">

	function rcube_mail_ui()
	{
	this.markmenu = new rcube_layer('markmessagemenu');
	}

	rcube_mail_ui.prototype = {

	show_markmenu: function(show)
	{
	if (typeof show == 'undefined')
	show = this.markmenu.visible ? false : true;

	var ref = rcube_find_object('markreadbutton');
	if (show && ref)
	this.markmenu.move(ref.offsetLeft, ref.offsetTop + ref.offsetHeight);

	this.markmenu.show(show);
	},

	body_mouseup: function(evt, p)
	{
	if (this.markmenu && this.markmenu.visible && evt.target != rcube_find_object('markreadbutton'))
	this.show_markmenu(false);
	},

	body_keypress: function(evt, p)
	{
	if (rcube_event.get_keycode(evt) == 27 && this.markmenu && this.markmenu.visible)
	this.show_markmenu(false);
	}

	};

	</script>
	-<roundcube:if condition="config:preview_pane == true" />
	<style type="text/css">
	-#mailcontframe { height: 195px; }
	-</style>
	+<roundcube:if condition="config:preview_pane == true" />
	+#mailcontframe { height: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter-5 : 195" />px; }
	+#mailpreviewframe {
	+ top: <roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />px;
	+ /* css hack for IE */
	+ height: expression((parseInt(this.parentNode.offsetHeight)-<roundcube:exp expression="!empty(cookie:mailviewsplitter) ? cookie:mailviewsplitter+5 : 205" />)+'px');
	+}
	<roundcube:endif />
	+#mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 160" />px; }
	+#mailrightcontainer {
	+ left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px;
	+ /* css hack for IE */
	+ width: expression((parseInt(this.parentNode.offsetWidth)-<roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />)+'px');
	+}
	+</style>
	</head>
	<body>

	<roundcube:include file="/includes/taskbar.html" />
	<roundcube:include file="/includes/header.html" />

	<div id="mainscreen">

	<div id="mailboxlist-container">
	<h3 id="mailboxlist-header"><roundcube:label name="mailboxlist" /></h3>
	<roundcube:object name="mailboxlist" id="mailboxlist" maxlength="16" />
	</div>

	<script type="text/javascript">
	var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailboxlist-container', p2: 'mailrightcontainer', orientation: 'v', relative: true, start: 165});
	rcmail.add_onload('mailviewsplitv.init()');
	</script>

	<div id="mailrightcontainer">

	<div id="mailcontframe">
	<roundcube:object name="messages"
	id="messagelist"
	cellspacing="0"
	summary="Message list"
	messageIcon="/images/icons/dot.png"
	unreadIcon="/images/icons/unread.png"
	deletedIcon="/images/icons/deleted.png"
	repliedIcon="/images/icons/replied.png"
	forwardedIcon="/images/icons/forwarded.png"
	forwardedrepliedIcon="/images/icons/forwarded_replied.png"
	attachmentIcon="/images/icons/attachment.png"
	flaggedIcon="/images/icons/flagged.png"
	unflaggedIcon="/images/icons/unflagged.png" />
	</div>

	<roundcube:if condition="config:preview_pane == true" />

	<script type="text/javascript">
	var mailviewsplit = new rcube_splitter({id:'mailviewsplitter', p1: 'mailcontframe', p2: 'mailpreviewframe', orientation: 'h', relative: true, start: 200});
	rcmail.add_onload('mailviewsplit.init()');
	</script>

	<div id="mailpreviewframe">
	<roundcube:object name="messagecontentframe" id="messagecontframe" width="100%" height="100%" frameborder="0" src="/watermark.html" />
	</div>

	<roundcube:endif />

	</div>

	</div>

	<div id="mailboxcontrols">
	<roundcube:label name="folder" />:
	<roundcube:button command="expunge" label="compact" classAct="active" />
	<roundcube:button command="purge" label="empty" classAct="active" />
	</div>


	<div id="listcontrols">
	<roundcube:label name="select" />:
	<roundcube:button command="select-all" label="all" classAct="active" />
	<roundcube:button command="select-all" prop="unread" label="unread" classAct="active" />
	<roundcube:button command="select-none" label="none" classAct="active" />
	<roundcube:if condition="env:quota" />
	<roundcube:label name="quota" />: <roundcube:object name="quotaDisplay" display="image" width="100" id="quotadisplay" />
	<roundcube:endif />
	</div>

	<div id="messagecountbar">
	<roundcube:button command="firstpage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessages" />
	<roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />
	<roundcube:object name="messageCountDisplay" />
	<roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" />
	<roundcube:button command="lastpage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessages" />
	</div>

	<div id="messagetoolbar">
	<roundcube:button command="checkmail" imageSel="/images/buttons/inbox_sel.png" imageAct="/images/buttons/inbox_act.png" imagePas="/images/buttons/inbox_pas.png" width="32" height="32" title="checkmail" />
	<roundcube:button command="compose" imageSel="/images/buttons/compose_sel.png" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="writenewmessage" />
	<roundcube:button name="markreadbutton" id="markreadbutton" image="/images/buttons/markread_act.png" width="32" height="32" title="markmessages" onclick="rcmailUI.show_markmenu();return false" />
	<roundcube:button command="reply" imageSel="/images/buttons/reply_sel.png" imageAct="/images/buttons/reply_act.png" imagePas="/images/buttons/reply_pas.png" width="32" height="32" title="replytomessage" />
	<roundcube:button command="reply-all" imageSel="/images/buttons/replyall_sel.png" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
	<roundcube:button command="forward" imageSel="/images/buttons/forward_sel.png" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
	<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
	<roundcube:button command="print" imageSel="/images/buttons/print_sel.png" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />

	<div id="markmessagemenu">
	<ul class="toolbarmenu">
	<li><roundcube:button command="mark" prop="read" label="markread" classAct="active" /></li>
	<li><roundcube:button command="mark" prop="unread" label="markunread" classAct="active" /></li>
	<li><roundcube:button command="mark" prop="flagged" label="markflagged" classAct="active" /></li>
	<li><roundcube:button command="mark" prop="unflagged" label="markunflagged" classAct="active" /></li>
	</ul>
	</div>
	</div>

	<div id="quicksearchbar">
	<roundcube:object name="searchform" type="search" results="5" id="quicksearchbox" /><roundcube:button command="reset-search" id="searchreset" image="/images/icons/reset.gif" title="resetsearch" />
	</div>

	<script type="text/javascript">

	var rcmailUI = new rcube_mail_ui();
	rcube_event.add_listener({ object:rcmailUI, method:'body_mouseup', event:'mouseup' });
	rcube_event.add_listener({ object:rcmailUI, method:'body_keypress', event:'keypress' });

	</script>
	</body>
	</html>
	diff --git a/skins/default/templates/message.html b/skins/default/templates/message.html
	index 3ab6cf30f..0cbd05fe6 100644
	--- a/skins/default/templates/message.html
	+++ b/skins/default/templates/message.html
	@@ -1,59 +1,66 @@
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml">
	<head>
	<title><roundcube:object name="pagetitle" /></title>
	<roundcube:include file="/includes/links.html" />
	<link rel="stylesheet" type="text/css" href="/mail.css" />
	<script type="text/javascript" src="/splitter.js"></script>
	+<style type="text/css">
	+#mailboxlist-container { width: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv-5 : 160" />px; }
	+#messageframe {
	+ left: <roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />px;
	+ width: expression((parseInt(this.parentNode.offsetWidth)-<roundcube:exp expression="!empty(cookie:mailviewsplitterv) ? cookie:mailviewsplitterv+5 : 170" />)+'px');
	+}
	+</style>
	</head>
	<body>

	<roundcube:include file="/includes/taskbar.html" />
	<roundcube:include file="/includes/header.html" />

	<div id="messagecountbar">
	<roundcube:button command="firstmessage" imageSel="/images/buttons/first_sel.png" imageAct="/images/buttons/first_act.png" imagePas="/images/buttons/first_pas.png" width="11" height="11" title="firstmessage" />
	<roundcube:button command="previousmessage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessage" />
	<roundcube:object name="messageCountDisplay" />
	<roundcube:button command="nextmessage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessage" />
	<roundcube:button command="lastmessage" imageSel="/images/buttons/last_sel.png" imageAct="/images/buttons/last_act.png" imagePas="/images/buttons/last_pas.png" width="11" height="11" title="lastmessage" />
	</div>

	<div id="messagetoolbar">
	<roundcube:button command="list" image="/images/buttons/back_act.png" imageSel="/images/buttons/back_sel.png" imageAct="/images/buttons/back_act.png" width="32" height="32" title="backtolist" />
	<roundcube:button command="compose" imageSel="/images/buttons/compose_sel.png" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="writenewmessage" />
	<roundcube:button command="reply" imageSel="/images/buttons/reply_sel.png" imageAct="/images/buttons/reply_act.png" imagePas="/images/buttons/reply_pas.png" width="32" height="32" title="replytomessage" />
	<roundcube:button command="reply-all" imageSel="/images/buttons/replyall_sel.png" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
	<roundcube:button command="forward" imageSel="/images/buttons/forward_sel.png" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
	<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
	<roundcube:button command="print" imageSel="/images/buttons/print_sel.png" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
	<roundcube:button command="viewsource" imageSel="/images/buttons/source_sel.png" imageAct="/images/buttons/source_act.png" imagePas="/images/buttons/source_pas.png" width="32" height="32" title="viewsource" />
	<roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" />
	</div>

	<div id="mainscreen">

	<div id="mailboxlist-container">
	<div id="mailboxlist-header"><roundcube:label name="mailboxlist" /></div>
	<roundcube:object name="mailboxlist" id="mailboxlist" maxlength="25" />
	</div>

	<div id="messageframe">

	<roundcube:object name="messageHeaders" class="headers-table" cellspacing="0" cellpadding="2" addicon="/images/icons/plus.gif" summary="Message headers" />
	<roundcube:object name="messageAttachments" id="attachment-list" />

	<roundcube:object name="blockedObjects" id="remote-objects-message" />
	<roundcube:object name="messageBody" id="messagebody" />

	</div>

	</div>

	<script type="text/javascript">
	var mailviewsplitv = new rcube_splitter({id:'mailviewsplitterv', p1: 'mailboxlist-container', p2: 'messageframe', orientation: 'v', relative: true, start: 165});
	rcmail.add_onload('mailviewsplitv.init()');
	</script>

	</body>
	</html>

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 10:23 AM (11 h, 43 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 166646
Default Alt Text: (36 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions