No OneTemporary
Actions

Size

15 KB

Referenced Files

None

Subscribers

None

View Options

This document is not UTF8. It was detected as ISO-8859-1 (Latin 1) and converted to UTF8 for display.

	diff --git a/program/js/editor.js b/program/js/editor.js
	index 3782de869..240ec882c 100644
	--- a/program/js/editor.js
	+++ b/program/js/editor.js
	@@ -1,163 +1,163 @@
	/*
	+-----------------------------------------------------------------------+
	\| Roundcube editor js library \|
	\| \|
	\| This file is part of the Roundcube web development suite \|
	\| Copyright (C) 2006-2012, The Roundcube Dev Team \|
	\| \|
	\| Licensed under the GNU General Public License version 3 or \|
	\| any later version with exceptions for skins & plugins. \|
	\| See the README file for a full license statement. \|
	\| \|
	+-----------------------------------------------------------------------+
	\| Author: Eric Stadtherr <estadtherr@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	// Initialize HTML editor
	function rcmail_editor_init(config)
	{
	var ret, conf = {
	mode: 'textareas',
	editor_selector: 'mce_editor',
	apply_source_formatting: true,
	theme: 'advanced',
	language: config.lang,
	content_css: config.skin_path + '/editor_content.css',
	theme_advanced_toolbar_location: 'top',
	theme_advanced_toolbar_align: 'left',
	theme_advanced_buttons3: '',
	theme_advanced_statusbar_location: 'none',
	extended_valid_elements: 'font[face\|size\|color\|style],span[id\|class\|align\|style]',
	relative_urls: false,
	remove_script_host: false,
	gecko_spellcheck: true,
	convert_urls: false, // #1486944
	external_image_list: window.rcmail_editor_images,
	rc_client: rcmail
	};

	if (config.mode == 'identity')
	$.extend(conf, {
	plugins: 'paste,tabfocus',
	theme_advanced_buttons1: 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr,link,unlink,code,forecolor',
	- theme_advanced_buttons2: ',fontselect,fontsizeselect'
	+ theme_advanced_buttons2: 'fontselect,fontsizeselect'
	});
	else { // mail compose
	$.extend(conf, {
	plugins: 'paste,emotions,media,nonbreaking,table,searchreplace,visualchars,directionality,inlinepopups,tabfocus' + (config.spellcheck ? ',spellchecker' : ''),
	theme_advanced_buttons1: 'bold,italic,underline,\|,justifyleft,justifycenter,justifyright,justifyfull,\|,bullist,numlist,outdent,indent,ltr,rtl,blockquote,\|,forecolor,backcolor,fontselect,fontsizeselect',
	theme_advanced_buttons2: 'link,unlink,table,\|,emotions,charmap,image,media,\|,code,search,undo,redo',
	spellchecker_languages: (rcmail.env.spellcheck_langs ? rcmail.env.spellcheck_langs : 'Dansk=da,Deutsch=de,+English=en,Espanol=es,Francais=fr,Italiano=it,Nederlands=nl,Polski=pl,Portugues=pt,Suomi=fi,Svenska=sv'),
	spellchecker_rpc_url: '?_task=utils&_action=spell_html&_remote=1',
	spellchecker_enable_learn_rpc: config.spelldict,
	accessibility_focus: false,
	oninit: 'rcmail_editor_callback'
	});

	// add handler for spellcheck button state update
	conf.setup = function(ed) {
	ed.onSetProgressState.add(function(ed, active) {
	if (!active)
	rcmail.spellcheck_state();
	});
	}
	}

	// support external configuration settings e.g. from skin
	if (window.rcmail_editor_settings)
	$.extend(conf, window.rcmail_editor_settings);

	tinyMCE.init(conf);
	}

	// react to real individual tinyMCE editor init
	function rcmail_editor_callback()
	{
	var elem = rcube_find_object('_from'),
	fe = rcmail.env.compose_focus_elem;

	if (rcmail.env.default_font)
	$(tinyMCE.get(rcmail.env.composebody).getBody()).css('font-family', rcmail.env.default_font);

	if (elem && elem.type == 'select-one' && !rcmail.env.opened_extwin) {
	rcmail.change_identity(elem);
	// Focus previously focused element
	if (fe && fe.id != rcmail.env.composebody) {
	// use setTimeout() for IE9 (#1488541)
	window.setTimeout(function() {
	window.focus(); // for WebKit (#1486674)
	fe.focus();
	}, 10);
	}
	}

	// set tabIndex and set focus to element that was focused before
	rcmail_editor_tabindex(fe && fe.id == rcmail.env.composebody);
	// Trigger resize (needed for proper editor resizing in some browsers using default skin)
	$(window).resize();
	}

	// set tabIndex on tinyMCE editor
	function rcmail_editor_tabindex(focus)
	{
	if (rcmail.env.task == 'mail') {
	var editor = tinyMCE.get(rcmail.env.composebody);
	if (editor) {
	var textarea = editor.getElement();
	var node = editor.getContentAreaContainer().childNodes[0];
	if (textarea && node)
	node.tabIndex = textarea.tabIndex;
	if (focus)
	editor.getBody().focus();
	}
	}
	}

	// switch html/plain mode
	function rcmail_toggle_editor(select, textAreaId, flagElement)
	{
	var flag, ishtml;

	if (select.tagName != 'SELECT')
	ishtml = select.checked;
	else
	ishtml = select.value == 'html';

	var res = rcmail.command('toggle-editor', {id:textAreaId, mode:ishtml?'html':'plain'});

	if (ishtml) {
	// #1486593
	setTimeout("rcmail_editor_tabindex(true);", 500);
	if (flagElement && (flag = rcube_find_object(flagElement)))
	flag.value = '1';
	}
	else if (res) {
	if (flagElement && (flag = rcube_find_object(flagElement)))
	flag.value = '0';

	if (rcmail.env.composebody)
	rcube_find_object(rcmail.env.composebody).focus();
	}
	else { // !res
	if (select.tagName == 'SELECT')
	select.value = 'html';
	else if (select.tagName == 'INPUT')
	select.checked = true;
	}
	}

	// editor callbeck for images listing
	function rcmail_editor_images()
	{
	var i, files = rcmail.env.attachments, list = [];

	for (i in files) {
	att = files[i];
	if (att.complete && att.mimetype.indexOf('image/') == 0) {
	list.push([att.name, rcmail.env.comm_path+'&_action=display-attachment&_file='+i+'&_id='+rcmail.env.compose_id]);
	}
	}

	return list;
	};
	diff --git a/skins/classic/settings.css b/skins/classic/settings.css
	index c918e3c18..2433f5040 100644
	--- a/skins/classic/settings.css
	+++ b/skins/classic/settings.css
	@@ -1,255 +1,269 @@
	/*** Roundcube\|Mail settings task styles ***/

	#rcmfd_timezone
	{
	width: 300px;
	}

	#folder-manager.droptarget
	{
	border: 1px solid #CC3333;
	background-color: #FFFFA6;
	}

	#identities-table,
	#subscription-table,
	#sections-table
	{
	width: 100%;
	table-layout: fixed;
	}

	#subscription-table input
	{
	font: inherit;
	}

	#subscription-table tbody td,
	#identities-table tbody td,
	#sections-table tbody td
	{
	cursor: default;
	text-overflow: ellipsis;
	-o-text-overflow: ellipsis;
	height: 18px;
	}

	#subscription-table tr.virtual td
	{
	color: #666;
	}

	#subscription-table tr.root td
	{
	font-size: 10%;
	height: 5px;
	}

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

	#subscription-table tr.droptarget td
	{
	background-color: #FFFFA6;
	}

	#subscription-table td.name
	{
	width: auto;
	}

	#subscription-table td.subscribed
	{
	text-align: right;
	padding-right: 12px;
	}

	#folder-box,
	#prefs-box,
	#identity-box
	{
	position: absolute;
	top: 0;
	right: 0;
	bottom: 0;
	border: 1px solid #999999;
	overflow: hidden;
	background-color: #F2F2F2;
	}

	#identity-details table td.title,
	#folder-details table td.title
	{
	font-weight: bold;
	text-align: right;
	+ width: 1%;
	+ white-space: nowrap;
	}

	#bottomboxes
	{
	position: absolute;
	width: 600px;
	height: 95px;
	left: 0;
	bottom: 0;
	}

	#identities-list,
	#folder-manager,
	#sectionslist
	{
	position: absolute;
	top: 0;
	left: 0;
	bottom: 0;
	border: 1px solid #999999;
	background-color: #F9F9F9;
	overflow: hidden;
	}

	body.iframe,
	#prefs-frame,
	#folder-frame,
	#identity-frame
	{
	background-color: #F2F2F2;
	border: none;
	min-height: 100%; /* Chrome 14 bug */
	}

	#prefs-title,
	#folder-title,
	#identity-title
	{
	/* fixes issue where tabs were overlapping box title when scrolling */
	z-index: 10;
	}

	#formfooter
	{
	width: 100%;
	}

	#formfooter .footerleft
	{
	padding: 0 2px 10px;
	white-space: nowrap;
	float: left;
	}

	#formfooter .footerright
	{
	padding: 0 2px 10px;
	white-space: nowrap;
	text-align: right;
	float: right;
	}

	#quota
	{
	position: absolute;
	top: 3px;
	right: 8px;
	width: 100px;
	}

	#quotaimg
	{
	position: absolute;
	top: 3px;
	right: 6px;
	z-index: 101;
	}

	#rcmfd_signature
	{
	font-family: monospace;
	}

	div.readtext
	{
	width: 42em;
	padding: 20px;
	}

	#license
	{
	min-height: 200px;
	padding-bottom: 2em;
	background: url(images/watermark.gif) no-repeat center;
	}

	#license .sysname
	{
	font-size: 18px;
	font-weight: bold;
	}

	#license .copyright
	{
	font-weight: bold;
	}

	#license .license,
	#license .links
	{
	margin-top: 1.5em;
	}

	.skinselection
	{
	display: block;
	white-space: nowrap;
	margin: 0.3em 0;
	}

	.skinselection span
	{
	display: inline-block;
	vertical-align: middle;
	padding-right: 1em;
	}

	.skinselection .skinname
	{
	font-weight: bold;
	}

	.skinselection .skinlicense,
	.skinselection .skinlicense a
	{
	color: #999;
	font-style: italic;
	text-decoration: none;
	}

	.skinselection .skinlicense a:hover
	{
	text-decoration: underline;
	}

	img.skinthumbnail
	{
	width: 64px;
	height: 64px;
	border: 1px solid #999;
	background: #fff;
	}

	#pluginlist
	{
	border: 1px solid #999;
	width: 100%;
	}

	#pluginlist td.version
	{
	text-align: center;
	}

	div.crop
	{
	overflow: auto;
	}
	+
	+#rcmfd_signature
	+{
	+ width: 99%;
	+ min-width: 390px;
	+}
	+
	+#rcmfd_signature_toolbar1 td,
	+#rcmfd_signature_toolbar2 td
	+{
	+ width: auto;
	+}
	diff --git a/skins/larry/settings.css b/skins/larry/settings.css
	index 1734b55e5..59037ac76 100644
	--- a/skins/larry/settings.css
	+++ b/skins/larry/settings.css
	@@ -1,269 +1,279 @@
	/**
	* Roundcube webmail styles for the Settings section
	*
	* Copyright (c) 2012, The Roundcube Dev Team
	* Screendesign by FLINT / Büro für Gestaltung, bueroflint.com
	*
	* The contents are subject to the Creative Commons Attribution-ShareAlike
	* License. It is allowed to copy, distribute, transmit and to adapt the work
	* by keeping credits to the original autors in the README file.
	* See http://creativecommons.org/licenses/by-sa/3.0/ for details.
	*/

	#settings-sections {
	position: absolute;
	top: 0;
	left: 0;
	width: 200px;
	bottom: 0;
	}

	#pluginbody,
	#settings-right {
	position: absolute;
	top: 0;
	left: 212px;
	right: 0;
	bottom: 0;
	}

	#sectionslist {
	position: absolute;
	top: 0;
	left: 0;
	width: 260px;
	bottom: 0;
	}

	#preferences-box {
	position: absolute;
	top: 0;
	left: 272px;
	right: 0;
	bottom: 0;
	}

	#preferences-frame {
	border: 0;
	border-radius: 4px 4px 0 0;
	}

	#sections-table tbody td.section,
	#settings-sections span.listitem a,
	#settings-sections span.tablink a {
	padding-left: 36px;
	background-image: url(images/listicons.png);
	background-position: -100px 0;
	background-repeat: no-repeat;
	}

	/* note: support span.tablink because this is used by plugins */
	#settings-sections span.listitem a,
	#settings-sections span.tablink a {
	background-position: 6px -862px;
	}

	#settings-sections span.selected a,
	#settings-sections span.tablink.selected a {
	background-position: 6px -887px;
	}

	#settings-sections span.preferences a {
	background-position: 6px -431px;
	}

	#settings-sections span.preferences.selected a {
	background-position: 6px -455px;
	}

	#settings-sections span.folders a,
	#sections-table #rcmrowfolders td.section {
	background-position: 6px 2px;
	}

	#settings-sections span.folders.selected a,
	#sections-table #rcmrowfolders.selected td.section {
	background-position: 6px -22px;
	}

	#settings-sections span.identities a {
	background-position: 6px -478px;
	}

	#settings-sections span.identities.selected a {
	background-position: 6px -502px;
	}

	#settings-sections span.filter a {
	background-position: 6px -1746px;
	}

	#settings-sections span.filter.selected a {
	background-position: 6px -1770px;
	}

	#settings-sections span.password a {
	background-position: 6px -1795px;
	}

	#settings-sections span.password.selected a {
	background-position: 6px -1819px;
	}

	#sections-table #rcmrowgeneral td.section {
	background-position: 6px -573px;
	}

	#sections-table #rcmrowgeneral.selected td.section {
	background-position: 6px -598px;
	}

	#sections-table #rcmrowmailbox td.section {
	background-position: 6px -621px;
	}

	#sections-table #rcmrowmailbox.selected td.section {
	background-position: 6px -646px;
	}

	#sections-table #rcmrowcompose td.section {
	background-position: 6px -670px;
	}

	#sections-table #rcmrowcompose.selected td.section {
	background-position: 6px -695px;
	}

	#sections-table #rcmrowmailview td.section {
	background-position: 6px -718px;
	}

	#sections-table #rcmrowmailview.selected td.section {
	background-position: 6px -742px;
	}

	#sections-table #rcmrowaddressbook td.section {
	background-position: 6px -766px;
	}

	#sections-table #rcmrowaddressbook.selected td.section {
	background-position: 6px -791px;
	}

	#sections-table #rcmrowserver td.section {
	background-position: 6px -814px;
	}

	#sections-table #rcmrowserver.selected td.section {
	background-position: 6px -838px;
	}

	#sections-table #rcmrowcalendar td.section {
	background-position: 6px -526px;
	}

	#sections-table #rcmrowcalendar.selected td.section {
	background-position: 6px -550px;
	}

	#folderslist,
	#identitieslist {
	position: absolute;
	top: 0;
	left: 0;
	width: 260px;
	bottom: 0;
	}

	#identities-table {
	width: 100%;
	table-layout: fixed;
	}

	#identities-table tbody td.mail {
	width: 100%;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	#folder-details,
	#identity-details {
	position: absolute;
	top: 0;
	left: 272px;
	right: 0;
	bottom: 0;
	}

	#subscription-table {
	table-layout: fixed;
	}

	#subscription-table tr.root td {
	font-size: 5%;
	height: 5px;
	padding: 2px;
	}

	#subscription-table td.name {
	width: 85%;
	overflow: hidden;
	text-overflow: ellipsis;
	}

	#subscription-table td.subscribed {
	min-width: 30px;
	padding: 3px 12px 3px 3px;
	text-align: right;
	}

	.skinselection {
	display: block;
	}

	.skinselection span {
	display: inline-block;
	vertical-align: middle;
	padding-right: 1em;
	}

	.skinselection .skinname {
	font-weight: bold;
	}

	.skinselection .skinlicense,
	.skinselection .skinlicense a {
	font-style: italic;
	color: #666;
	text-decoration: none;
	}

	.skinselection .skinlicense a:hover {
	text-decoration: underline;
	}

	img.skinthumbnail {
	width: 64px;
	height: 64px;
	border: 1px solid #ccc;
	background: #fff;
	border-radius: 4px;
	}

	#pluginlist td.version {
	width: 5em;
	}

	.webkit #pluginlist td.version {
	width: 6em;
	}

	#pluginlist td.license,
	#pluginlist td.source {
	width: 8em;
	}

	.webkit #pluginlist td.license,
	.webkit #pluginlist td.source {
	width: 9em;
	}
	+
	+#rcmfd_signature {
	+ width: 99%;
	+ min-width: 390px;
	+}
	+
	+#rcmfd_signature_toolbar1 td,
	+#rcmfd_signature_toolbar2 td {
	+ width: auto;
	+}

File Metadata

Mime Type: text/x-diff
Expires: Wed, Feb 4, 9:03 AM (9 h, 18 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 427599
Default Alt Text: (15 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions