Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  update tinymce to 3.5.0.1
  rev update
  DE strings
  slackr drop shadows extended
  Allow plugins to modify the contact photo menu
  rev update

* master:

boot.php

@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1341' );
+define ( 'FRIENDICA_VERSION',      '3.0.1343' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1143      );
 

include/Contact.php

@@ -209,7 +209,7 @@ function contact_photo_menu($contact) {
 	);
 	
 	
-	$args = array('contact' => $contact, 'menu' => $menu);
+	$args = array('contact' => $contact, 'menu' => &$menu);
 	
 	call_hooks('contact_photo_menu', $args);
 	

library/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js

@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;if(tinyMCE.isIE){return}a.onKeyDown.add(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng().cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|[A-Z0-9._%+-]+@)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}else{if(/@$/.test(h[1])){h[1]="mailto:"+h[1]}}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();
+(function(){tinymce.create("tinymce.plugins.AutolinkPlugin",{init:function(a,b){var c=this;a.onKeyDown.addToTop(function(d,f){if(f.keyCode==13){return c.handleEnter(d)}});if(tinyMCE.isIE){return}a.onKeyPress.add(function(d,f){if(f.which==41){return c.handleEclipse(d)}});a.onKeyUp.add(function(d,f){if(f.keyCode==32){return c.handleSpacebar(d)}})},handleEclipse:function(a){this.parseCurrentLine(a,-1,"(",true)},handleSpacebar:function(a){this.parseCurrentLine(a,0,"",true)},handleEnter:function(a){this.parseCurrentLine(a,-1,"",false)},parseCurrentLine:function(i,d,b,g){var a,f,c,n,k,m,h,e,j;a=i.selection.getRng(true).cloneRange();if(a.startOffset<5){e=a.endContainer.previousSibling;if(e==null){if(a.endContainer.firstChild==null||a.endContainer.firstChild.nextSibling==null){return}e=a.endContainer.firstChild.nextSibling}j=e.length;a.setStart(e,j);a.setEnd(e,j);if(a.endOffset<5){return}f=a.endOffset;n=e}else{n=a.endContainer;if(n.nodeType!=3&&n.firstChild){while(n.nodeType!=3&&n.firstChild){n=n.firstChild}a.setStart(n,0);a.setEnd(n,n.nodeValue.length)}if(a.endOffset==1){f=2}else{f=a.endOffset-1-d}}c=f;do{a.setStart(n,f-2);a.setEnd(n,f-1);f-=1}while(a.toString()!=" "&&a.toString()!=""&&a.toString().charCodeAt(0)!=160&&(f-2)>=0&&a.toString()!=b);if(a.toString()==b||a.toString().charCodeAt(0)==160){a.setStart(n,f);a.setEnd(n,c);f+=1}else{if(a.startOffset==0){a.setStart(n,0);a.setEnd(n,c)}else{a.setStart(n,f);a.setEnd(n,c)}}var m=a.toString();if(m.charAt(m.length-1)=="."){a.setEnd(n,c-1)}m=a.toString();h=m.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|[A-Z0-9._%+-]+@)(.+)$/i);if(h){if(h[1]=="www."){h[1]="http://www."}else{if(/@$/.test(h[1])){h[1]="mailto:"+h[1]}}k=i.selection.getBookmark();i.selection.setRng(a);tinyMCE.execCommand("createlink",false,h[1]+h[2]);i.selection.moveToBookmark(k);if(tinyMCE.isWebKit){i.selection.collapse(false);var l=Math.min(n.length,c+1);a.setStart(n,l);a.setEnd(n,l);i.selection.setRng(a)}}},getInfo:function(){return{longname:"Autolink",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autolink",tinymce.plugins.AutolinkPlugin)})();

library/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js

@@ -1,174 +1,180 @@
-/**
+/**
- * editor_plugin_src.js
+ * editor_plugin_src.js
- *
+ *
- * Copyright 2011, Moxiecode Systems AB
+ * Copyright 2011, Moxiecode Systems AB
- * Released under LGPL License.
+ * Released under LGPL License.
- *
+ *
- * License: http://tinymce.moxiecode.com/license
+ * License: http://tinymce.moxiecode.com/license
- * Contributing: http://tinymce.moxiecode.com/contributing
+ * Contributing: http://tinymce.moxiecode.com/contributing
- */
+ */
-
+
-(function() {
+(function() {
-	tinymce.create('tinymce.plugins.AutolinkPlugin', {
+	tinymce.create('tinymce.plugins.AutolinkPlugin', {
-	/**
+	/**
-	* Initializes the plugin, this will be executed after the plugin has been created.
+	* Initializes the plugin, this will be executed after the plugin has been created.
-	* This call is done before the editor instance has finished it's initialization so use the onInit event
+	* This call is done before the editor instance has finished it's initialization so use the onInit event
-	* of the editor instance to intercept that event.
+	* of the editor instance to intercept that event.
-	*
+	*
-	* @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+	* @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
-	* @param {string} url Absolute URL to where the plugin is located.
+	* @param {string} url Absolute URL to where the plugin is located.
-	*/
+	*/
-
+
-	init : function(ed, url) {
+	init : function(ed, url) {
-		var t = this;
+		var t = this;
-
+
-		// Internet Explorer has built-in automatic linking
+		// Add a key down handler
-		if (tinyMCE.isIE)
+		ed.onKeyDown.addToTop(function(ed, e) {
-			return;
+			if (e.keyCode == 13)
-
+				return t.handleEnter(ed);
-		// Add a key down handler
+		});
-		ed.onKeyDown.add(function(ed, e) {
+
-			if (e.keyCode == 13)
+		// Internet Explorer has built-in automatic linking for most cases
-				return t.handleEnter(ed);
+		if (tinyMCE.isIE)
-			});
+			return;
-
+
-		ed.onKeyPress.add(function(ed, e) {
+		ed.onKeyPress.add(function(ed, e) {
-			if (e.which == 41)
+			if (e.which == 41)
-				return t.handleEclipse(ed);
+				return t.handleEclipse(ed);
-		});
+		});
-
+
-		// Add a key up handler
+		// Add a key up handler
-		ed.onKeyUp.add(function(ed, e) {
+		ed.onKeyUp.add(function(ed, e) {
-			if (e.keyCode == 32)
+			if (e.keyCode == 32)
-				return t.handleSpacebar(ed);
+				return t.handleSpacebar(ed);
-			});
+			});
-	       },
+	       },
-
+
-		handleEclipse : function(ed) {
+		handleEclipse : function(ed) {
-			this.parseCurrentLine(ed, -1, '(', true);
+			this.parseCurrentLine(ed, -1, '(', true);
-		},
+		},
-
+
-		handleSpacebar : function(ed) {
+		handleSpacebar : function(ed) {
-			 this.parseCurrentLine(ed, 0, '', true);
+			 this.parseCurrentLine(ed, 0, '', true);
-		 },
+		 },
-
+
-		handleEnter : function(ed) {
+		handleEnter : function(ed) {
-			this.parseCurrentLine(ed, -1, '', false);
+			this.parseCurrentLine(ed, -1, '', false);
-		},
+		},
-
+
-		parseCurrentLine : function(ed, end_offset, delimiter, goback) {
+		parseCurrentLine : function(ed, end_offset, delimiter, goback) {
-			var r, end, start, endContainer, bookmark, text, matches, prev, len;
+			var r, end, start, endContainer, bookmark, text, matches, prev, len;
-
+
-			// We need at least five characters to form a URL,
+			// We need at least five characters to form a URL,
-			// hence, at minimum, five characters from the beginning of the line.
+			// hence, at minimum, five characters from the beginning of the line.
-			r = ed.selection.getRng().cloneRange();
+			r = ed.selection.getRng(true).cloneRange();
-			if (r.startOffset < 5) {
+			if (r.startOffset < 5) {
-				// During testing, the caret is placed inbetween two text nodes. 
+				// During testing, the caret is placed inbetween two text nodes. 
-				// The previous text node contains the URL.
+				// The previous text node contains the URL.
-				prev = r.endContainer.previousSibling;
+				prev = r.endContainer.previousSibling;
-				if (prev == null) {
+				if (prev == null) {
-					if (r.endContainer.firstChild == null || r.endContainer.firstChild.nextSibling == null)
+					if (r.endContainer.firstChild == null || r.endContainer.firstChild.nextSibling == null)
-						return;
+						return;
-
+
-					prev = r.endContainer.firstChild.nextSibling;
+					prev = r.endContainer.firstChild.nextSibling;
-				}
+				}
-				len = prev.length;
+				len = prev.length;
-				r.setStart(prev, len);
+				r.setStart(prev, len);
-				r.setEnd(prev, len);
+				r.setEnd(prev, len);
-
+
-				if (r.endOffset < 5)
+				if (r.endOffset < 5)
-					return;
+					return;
-
+
-				end = r.endOffset;
+				end = r.endOffset;
-				endContainer = prev;
+				endContainer = prev;
-			} else {
+			} else {
-				endContainer = r.endContainer;
+				endContainer = r.endContainer;
-
+
-				// Get a text node
+				// Get a text node
-				if (endContainer.nodeType != 3 && endContainer.firstChild) {
+				if (endContainer.nodeType != 3 && endContainer.firstChild) {
-					while (endContainer.nodeType != 3 && endContainer.firstChild)
+					while (endContainer.nodeType != 3 && endContainer.firstChild)
-						endContainer = endContainer.firstChild;
+						endContainer = endContainer.firstChild;
-
+
-					r.setStart(endContainer, 0);
+					r.setStart(endContainer, 0);
-					r.setEnd(endContainer, endContainer.nodeValue.length);
+					r.setEnd(endContainer, endContainer.nodeValue.length);
-				}
+				}
-
+
-				if (r.endOffset == 1)
+				if (r.endOffset == 1)
-					end = 2;
+					end = 2;
-				else
+				else
-					end = r.endOffset - 1 - end_offset;
+					end = r.endOffset - 1 - end_offset;
-			}
+			}
-
+
-			start = end;
+			start = end;
-
+
-			do
+			do
-			{
+			{
-				// Move the selection one character backwards.
+				// Move the selection one character backwards.
-				r.setStart(endContainer, end - 2);
+				r.setStart(endContainer, end - 2);
-				r.setEnd(endContainer, end - 1);
+				r.setEnd(endContainer, end - 1);
-				end -= 1;
+				end -= 1;
-
+
-				// Loop until one of the following is found: a blank space, &nbsp;, delimeter, (end-2) >= 0
+				// Loop until one of the following is found: a blank space, &nbsp;, delimeter, (end-2) >= 0
-			} while (r.toString() != ' ' && r.toString() != '' && r.toString().charCodeAt(0) != 160 && (end -2) >= 0 && r.toString() != delimiter);
+			} while (r.toString() != ' ' && r.toString() != '' && r.toString().charCodeAt(0) != 160 && (end -2) >= 0 && r.toString() != delimiter);
-
+
-			if (r.toString() == delimiter || r.toString().charCodeAt(0) == 160) {
+			if (r.toString() == delimiter || r.toString().charCodeAt(0) == 160) {
-				r.setStart(endContainer, end);
+				r.setStart(endContainer, end);
-				r.setEnd(endContainer, start);
+				r.setEnd(endContainer, start);
-				end += 1;
+				end += 1;
-			} else if (r.startOffset == 0) {
+			} else if (r.startOffset == 0) {
-				r.setStart(endContainer, 0);
+				r.setStart(endContainer, 0);
-				r.setEnd(endContainer, start);
+				r.setEnd(endContainer, start);
-			}
+			}
-			else {
+			else {
-				r.setStart(endContainer, end);
+				r.setStart(endContainer, end);
-				r.setEnd(endContainer, start);
+				r.setEnd(endContainer, start);
-			}
+			}
-
+
-			text = r.toString();
+			// Exclude last . from word like "www.site.com."
-			matches = text.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|[A-Z0-9._%+-]+@)(.+)$/i);
+			var text = r.toString();
-
+			if (text.charAt(text.length - 1) == '.') {
-			if (matches) {
+				r.setEnd(endContainer, start - 1);
-				if (matches[1] == 'www.') {
+			}
-					matches[1] = 'http://www.';
+
-				} else if (/@$/.test(matches[1])) {
+			text = r.toString();
-					matches[1] = 'mailto:' + matches[1];
+			matches = text.match(/^(https?:\/\/|ssh:\/\/|ftp:\/\/|file:\/|www\.|[A-Z0-9._%+-]+@)(.+)$/i);
-				}
+
-
+			if (matches) {
-				bookmark = ed.selection.getBookmark();
+				if (matches[1] == 'www.') {
-
+					matches[1] = 'http://www.';
-				ed.selection.setRng(r);
+				} else if (/@$/.test(matches[1])) {
-				tinyMCE.execCommand('createlink',false, matches[1] + matches[2]);
+					matches[1] = 'mailto:' + matches[1];
-				ed.selection.moveToBookmark(bookmark);
+				}
-
+
-				// TODO: Determine if this is still needed.
+				bookmark = ed.selection.getBookmark();
-				if (tinyMCE.isWebKit) {
+
-					// move the caret to its original position
+				ed.selection.setRng(r);
-					ed.selection.collapse(false);
+				tinyMCE.execCommand('createlink',false, matches[1] + matches[2]);
-					var max = Math.min(endContainer.length, start + 1);
+				ed.selection.moveToBookmark(bookmark);
-					r.setStart(endContainer, max);
+
-					r.setEnd(endContainer, max);
+				// TODO: Determine if this is still needed.
-					ed.selection.setRng(r);
+				if (tinyMCE.isWebKit) {
-				}
+					// move the caret to its original position
-			}
+					ed.selection.collapse(false);
-		},
+					var max = Math.min(endContainer.length, start + 1);
-
+					r.setStart(endContainer, max);
-		/**
+					r.setEnd(endContainer, max);
-		* Returns information about the plugin as a name/value array.
+					ed.selection.setRng(r);
-		* The current keys are longname, author, authorurl, infourl and version.
+				}
-		*
+			}
-		* @return {Object} Name/value array containing information about the plugin.
+		},
-		*/
+
-		getInfo : function() {
+		/**
-			return {
+		* Returns information about the plugin as a name/value array.
-				longname : 'Autolink',
+		* The current keys are longname, author, authorurl, infourl and version.
-				author : 'Moxiecode Systems AB',
+		*
-				authorurl : 'http://tinymce.moxiecode.com',
+		* @return {Object} Name/value array containing information about the plugin.
-				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink',
+		*/
-				version : tinymce.majorVersion + "." + tinymce.minorVersion
+		getInfo : function() {
-			};
+			return {
-		}
+				longname : 'Autolink',
-	});
+				author : 'Moxiecode Systems AB',
-
+				authorurl : 'http://tinymce.moxiecode.com',
-	// Register plugin
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autolink',
-	tinymce.PluginManager.add('autolink', tinymce.plugins.AutolinkPlugin);
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
-})();
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('autolink', tinymce.plugins.AutolinkPlugin);
+})();

library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js

@@ -1 +1 @@
-(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent());tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent());d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().firstChild);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
+(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(d,e){var f=this,g={},c,b;f.editor=d;d.addCommand("mceFullScreen",function(){var i,j=a.doc.documentElement;if(d.getParam("fullscreen_is_enabled")){if(d.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",f.resizeFunc);tinyMCE.get(d.getParam("fullscreen_editor_id")).setContent(d.getContent());tinyMCE.remove(d);a.remove("mce_fullscreen_container");j.style.overflow=d.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",d.getParam("fullscreen_overflow"));a.win.scrollTo(d.getParam("fullscreen_scrollx"),d.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(d.getParam("fullscreen_new_window")){i=a.win.open(e+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{i.resizeTo(screen.availWidth,screen.availHeight)}catch(h){}}else{tinyMCE.oldSettings=tinyMCE.settings;g.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";g.fullscreen_html_overflow=a.getStyle(j,"overflow",1);c=a.getViewPort();g.fullscreen_scrollx=c.x;g.fullscreen_scrolly=c.y;if(tinymce.isOpera&&g.fullscreen_overflow=="visible"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&g.fullscreen_overflow=="scroll"){g.fullscreen_overflow="auto"}if(tinymce.isIE&&(g.fullscreen_html_overflow=="visible"||g.fullscreen_html_overflow=="scroll")){g.fullscreen_html_overflow="auto"}if(g.fullscreen_overflow=="0px"){g.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");j.style.overflow="hidden";c=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){c.h-=1}if(tinymce.isIE6||document.compatMode=="BackCompat"){b="absolute;top:"+c.y}else{b="fixed;top:0"}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+b+";left:0;width:"+c.w+"px;height:"+c.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(d.settings,function(k,l){g[l]=k});g.id="mce_fullscreen";g.width=n.clientWidth;g.height=n.clientHeight-15;g.fullscreen_is_enabled=true;g.fullscreen_editor_id=d.id;g.theme_advanced_resizing=false;g.save_onsavecallback=function(){d.setContent(tinyMCE.get(g.id).getContent());d.execCommand("mceSave")};tinymce.each(d.getParam("fullscreen_settings"),function(m,l){g[l]=m});if(g.theme_advanced_toolbar_location==="external"){g.theme_advanced_toolbar_location="top"}f.fullscreenEditor=new tinymce.Editor("mce_fullscreen",g);f.fullscreenEditor.onInit.add(function(){f.fullscreenEditor.setContent(d.getContent());f.fullscreenEditor.focus()});f.fullscreenEditor.render();f.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");f.fullscreenElement.update();f.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var o=tinymce.DOM.getViewPort(),l=f.fullscreenEditor,k,m;k=l.dom.getSize(l.getContainer().firstChild);m=l.dom.getSize(l.getContainer().getElementsByTagName("iframe")[0]);l.theme.resizeTo(o.w-k.w+m.w,o.h-k.h+m.h)})}});d.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});d.onNodeChange.add(function(i,h){h.setActive("fullscreen",i.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();

library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js

@@ -79,7 +79,7 @@
 						vp.h -= 1;
 
 					// Use fixed position if it exists
-					if (tinymce.isIE6)
+					if (tinymce.isIE6 || document.compatMode == 'BackCompat')
 						posCss = 'absolute;top:' + vp.y;
 					else
 						posCss = 'fixed;top:0';

library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js

@@ -261,12 +261,96 @@
 				selection.collapse(start);
 			}
 
+			function canDelete(backspace) {
+				var rng, container, offset, nonEditableParent;
+
+				function removeNodeIfNotParent(node) {
+					var parent = container;
+
+					while (parent) {
+						if (parent === node) {
+							return;
+						}
+
+						parent = parent.parentNode;
+					}
+
+					dom.remove(node);
+					moveSelection();
+				}
+
+				function isNextPrevTreeNodeNonEditable() {
+					var node, walker, nonEmptyElements = ed.schema.getNonEmptyElements();
+
+					walker = new tinymce.dom.TreeWalker(container, ed.getBody());
+					while (node = (backspace ? walker.prev() : walker.next())) {
+						// Found IMG/INPUT etc
+						if (nonEmptyElements[node.nodeName.toLowerCase()]) {
+							break;
+						}
+
+						// Found text node with contents
+						if (node.nodeType === 3 && tinymce.trim(node.nodeValue).length > 0) {
+							break;
+						}
+
+						// Found non editable node
+						if (getContentEditable(node) === "false") {
+							removeNodeIfNotParent(node);
+							return true;
+						}
+					}
+
+					// Check if the content node is within a non editable parent
+					if (getNonEditableParent(node)) {
+						return true;
+					}
+
+					return false;
+				}
+
+				if (selection.isCollapsed()) {
+					rng = selection.getRng(true);
+					container = rng.startContainer;
+					offset = rng.startOffset;
+					container = getParentCaretContainer(container) || container;
+
+					// Is in noneditable parent
+					if (nonEditableParent = getNonEditableParent(container)) {
+						removeNodeIfNotParent(nonEditableParent);
+						return false;
+					}
+
+					// Check if the caret is in the middle of a text node
+					if (container.nodeType == 3 && (backspace ? offset > 0 : offset < container.nodeValue.length)) {
+						return true;
+					}
+
+					// Resolve container index
+					if (container.nodeType == 1) {
+						container = container.childNodes[offset] || container;
+					}
+
+					// Check if previous or next tree node is non editable then block the event
+					if (isNextPrevTreeNodeNonEditable()) {
+						return false;
+					}
+				}
+
+				return true;
+			}
+
 			startElement = selection.getStart()
 			endElement = selection.getEnd();
 
 			// Disable all key presses in contentEditable=false except delete or backspace
 			nonEditableParent = getNonEditableParent(startElement) || getNonEditableParent(endElement);
 			if (nonEditableParent && (keyCode < 112 || keyCode > 124) && keyCode != VK.DELETE && keyCode != VK.BACKSPACE) {
+				// Is Ctrl+c, Ctrl+v or Ctrl+x then use default browser behavior
+				if ((tinymce.isMac ? e.metaKey : e.ctrlKey) && (keyCode == 67 || keyCode == 88 || keyCode == 86)) {
+					return;
+				}
+
 				e.preventDefault();
 
 				// Arrow left/right select the element and collapse left/right
@@ -298,6 +382,7 @@
 									positionCaretOnElement(nonEditableParent, true);
 								} else {
 									dom.remove(nonEditableParent);
+									return;
 								}
 							} else {
 								removeCaretContainer(caretContainer);
@@ -315,23 +400,31 @@
 									positionCaretOnElement(nonEditableParent, false);
 								} else {
 									dom.remove(nonEditableParent);
+									return;
 								}
 							} else {
 								removeCaretContainer(caretContainer);
 							}
 						}
 					}
+
+					if ((keyCode == VK.BACKSPACE || keyCode == VK.DELETE) && !canDelete(keyCode == VK.BACKSPACE)) {
+						e.preventDefault();
+						return false;
+					}
 				}
 			}
 		};
 
-		ed.onMouseDown.addToTop(function(ed, e){
+		ed.onMouseDown.addToTop(function(ed, e) {
-			// prevent collapsing selection to caret when clicking in a non-editable section
 			var node = ed.selection.getNode();
+
 			if (getContentEditable(node) === "false" && node == e.target) {
-				e.preventDefault();
+				// Expand selection on mouse down we can't block the default event since it's used for drag/drop
+				moveSelection();
 			}
 		});
+
 		ed.onMouseUp.addToTop(moveSelection);
 		ed.onKeyDown.addToTop(handleKey);
 		ed.onKeyUp.addToTop(moveSelection);
@@ -341,6 +434,31 @@
 		init : function(ed, url) {
 			var editClass, nonEditClass, nonEditableRegExps;
 
+			// Converts configured regexps to noneditable span items
+			function convertRegExpsToNonEditable(ed, args) {
+				var i = nonEditableRegExps.length, content = args.content, cls = tinymce.trim(nonEditClass);
+
+				// Don't replace the variables when raw is used for example on undo/redo
+				if (args.format == "raw") {
+					return;
+				}
+
+				while (i--) {
+					content = content.replace(nonEditableRegExps[i], function(match) {
+						var args = arguments, index = args[args.length - 2];
+
+						// Is value inside an attribute then don't replace
+						if (index > 0 && content.charAt(index - 1) == '"') {
+							return match;
+						}
+
+						return '<span class="' + cls + '" data-mce-content="' + ed.dom.encode(args[0]) + '">' + ed.dom.encode(typeof(args[1]) === "string" ? args[1] : args[0]) + '</span>';
+					});
+				}
+
+				args.content = content;
+			};
+			
 			editClass = " " + tinymce.trim(ed.getParam("noneditable_editable_class", "mceEditable")) + " ";
 			nonEditClass = " " + tinymce.trim(ed.getParam("noneditable_noneditable_class", "mceNonEditable")) + " ";
 
@@ -354,26 +472,10 @@
 				handleContentEditableSelection(ed);
 
 				if (nonEditableRegExps) {
-					ed.onBeforeSetContent.add(function(ed, args) {
+					ed.selection.onBeforeSetContent.add(convertRegExpsToNonEditable);
-						var i = nonEditableRegExps.length, content = args.content, cls = tinymce.trim(nonEditClass);
+					ed.onBeforeSetContent.add(convertRegExpsToNonEditable);
-
-						// Don't replace the variables when raw is used for example on undo/redo
-						if (args.format == "raw") {
-							return;
-						}
-
-						while (i--) {
-							content = content.replace(nonEditableRegExps[i], function() {
-								var args = arguments;
-
-								return '<span class="' + cls + '" data-mce-content="' + ed.dom.encode(args[0]) + '">' + ed.dom.encode(typeof(args[1]) === "string" ? args[1] : args[0]) + '</span>';
-							});
-						}
-
-						args.content = content;
-					});
 				}
-				
+
 				// Apply contentEditable true/false on elements with the noneditable/editable classes
 				ed.parser.addAttributeFilter('class', function(nodes) {
 					var i = nodes.length, className, node;

library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js

@@ -359,7 +359,7 @@
 			}
 
 			// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
-			if (tinymce.isIE && document.documentMode >= 9) {
+			if (tinymce.isIE && document.documentMode >= 9 && /<(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)/.test(o.content)) {
 				// IE9 adds BRs before/after block elements when contents is pasted from word or for example another browser
 				process([[/(?:<br>&nbsp;[\s\r\n]+|<br>)*(<\/?(h[1-6r]|p|div|address|pre|form|table|tbody|thead|tfoot|th|tr|td|li|ol|ul|caption|blockquote|center|dl|dt|dd|dir|fieldset)[^>]*>)(?:<br>&nbsp;[\s\r\n]+|<br>)*/g, '$1']]);
 

library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js

@@ -1 +1 @@
-(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(t){n=c.select(":input:enabled,*[tabindex]");function s(v){return v.nodeName==="BODY"||(v.type!="hidden"&&!(v.style.display=="none")&&!(v.style.visibility=="hidden")&&s(v.parentNode))}function i(v){return v.attributes.tabIndex.specified||v.nodeName=="INPUT"||v.nodeName=="TEXTAREA"}function u(){return tinymce.isIE6||tinymce.isIE7}function r(v){return((!u()||i(v)))&&v.getAttribute("tabindex")!="-1"&&s(v)}d(n,function(w,v){if(w.id==l.id){j=v;return false}});if(t>0){for(m=j+1;m<n.length;m++){if(r(n[m])){return n[m]}}}else{for(m=j-1;m>=0;m--){if(r(n[m])){return n[m]}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(n.id&&(l=tinymce.get(n.id||n.name))){l.focus()}else{window.setTimeout(function(){if(!tinymce.isWebKit){window.focus()}n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
+(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(t){n=c.select(":input:enabled,*[tabindex]:not(iframe)");function s(v){return v.nodeName==="BODY"||(v.type!="hidden"&&!(v.style.display=="none")&&!(v.style.visibility=="hidden")&&s(v.parentNode))}function i(v){return v.attributes.tabIndex.specified||v.nodeName=="INPUT"||v.nodeName=="TEXTAREA"}function u(){return tinymce.isIE6||tinymce.isIE7}function r(v){return((!u()||i(v)))&&v.getAttribute("tabindex")!="-1"&&s(v)}d(n,function(w,v){if(w.id==l.id){j=v;return false}});if(t>0){for(m=j+1;m<n.length;m++){if(r(n[m])){return n[m]}}}else{for(m=j-1;m>=0;m--){if(r(n[m])){return n[m]}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(n.id&&(l=tinymce.get(n.id||n.name))){l.focus()}else{window.setTimeout(function(){if(!tinymce.isWebKit){window.focus()}n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();

library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js

@@ -22,7 +22,7 @@
 				var x, i, f, el, v;
 
 				function find(d) {
-					el = DOM.select(':input:enabled,*[tabindex]');
+					el = DOM.select(':input:enabled,*[tabindex]:not(iframe)');
 
 					function canSelectRecursive(e) {
 						return e.nodeName==="BODY" || (e.type != 'hidden' &&

library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js

@@ -137,7 +137,7 @@ function updateAction() {
 			do {
 				if (cell == tdElm)
 					break;
-				col += cell.getAttribute("colspan");
+				col += cell.getAttribute("colspan")?cell.getAttribute("colspan"):1;
 			} while ((cell = nextCell(cell)) != null);
 
 			for (var i=0; i<rows.length; i++) {
@@ -152,7 +152,7 @@ function updateAction() {
 						cell = updateCell(cell, true);
 						break;
 					}
-					curr += cell.getAttribute("colspan");
+					curr += cell.getAttribute("colspan")?cell.getAttribute("colspan"):1;
 				} while ((cell = nextCell(cell)) != null);
 			}
 

library/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/visualblocks.css

@@ -1,6 +1,6 @@
-p, h1, h2, h3, h4, h5, h6, hgroup, aside, div, section, article, blockquote, address, pre {display: block; padding-top: 10px; border: 1px dashed #BBB; background: transparent no-repeat}
+p, h1, h2, h3, h4, h5, h6, hgroup, aside, div, section, article, blockquote, address, pre, figure {display: block; padding-top: 10px; border: 1px dashed #BBB; background: transparent no-repeat}
-p, h1, h2, h3, h4, h5, h6, hgroup, aside, div, section, article, address, pre {margin-left: 3px}
+p, h1, h2, h3, h4, h5, h6, hgroup, aside, div, section, article, address, pre, figure {margin-left: 3px}
-section, article, address, hgroup, aside {margin: 1em 0 0 3px}
+section, article, address, hgroup, aside, figure {margin: 0 0 1em 3px}
 
 p {background-image: url(data:image/gif;base64,R0lGODlhCQAJAJEAAAAAAP///7u7u////yH5BAEAAAMALAAAAAAJAAkAAAIQnG+CqCN/mlyvsRUpThG6AgA7)}
 h1 {background-image: url(data:image/gif;base64,R0lGODlhDQAKAIABALu7u////yH5BAEAAAEALAAAAAANAAoAAAIXjI8GybGu1JuxHoAfRNRW3TWXyF2YiRUAOw==)}
@@ -17,3 +17,5 @@ address {background-image: url(data:image/gif;base64,R0lGODlhLQAKAIABALu7u////yH
 pre {background-image: url(data:image/gif;base64,R0lGODlhFQAKAIABALu7uwAAACH5BAEAAAEALAAAAAAVAAoAAAIjjI+ZoN0cgDwSmnpz1NCueYERhnibZVKLNnbOq8IvKpJtVQAAOw==)}
 hgroup {background-image: url(data:image/gif;base64,R0lGODlhJwAKAIABALu7uwAAACH5BAEAAAEALAAAAAAnAAoAAAI3jI+pywYNI3uB0gpsRtt5fFnfNZaVSYJil4Wo03Hv6Z62uOCgiXH1kZIIJ8NiIxRrAZNMZAtQAAA7)}
 aside {background-image: url(data:image/gif;base64,R0lGODlhHgAKAIABAKqqqv///yH5BAEAAAEALAAAAAAeAAoAAAItjI+pG8APjZOTzgtqy7I3f1yehmQcFY4WKZbqByutmW4aHUd6vfcVbgudgpYCADs=)}
+figure {background-image: url(data:image/gif;base64,R0lGODlhJAAKAIAAALu7u////yH5BAEAAAEALAAAAAAkAAoAAAI0jI+py+2fwAHUSFvD3RlvG4HIp4nX5JFSpnZUJ6LlrM52OE7uSWosBHScgkSZj7dDKnWAAgA7)}
+figcaption {border: 1px dashed #BBB}

library/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin.js

@@ -1 +1 @@
-(function(){tinymce.create("tinymce.plugins.VisualBlocks",{init:function(a,b){var c;if(!window.NodeList){return}a.addCommand("mceVisualBlocks",function(){var e=a.dom,d;if(!c){c=e.uniqueId();d=e.create("link",{id:c,rel:"stylesheet",href:b+"/css/visualblocks.css"});a.getDoc().getElementsByTagName("head")[0].appendChild(d)}else{d=e.get(c);d.disabled=!d.disabled}a.controlManager.setActive("visualblocks",!d.disabled)});a.addButton("visualblocks",{title:"visualblocks.desc",cmd:"mceVisualBlocks"});a.onInit.add(function(){if(a.settings.visualblocks_default_state){a.execCommand("mceVisualBlocks")}})},getInfo:function(){return{longname:"Visual blocks",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualblocks",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("visualblocks",tinymce.plugins.VisualBlocks)})();
+(function(){tinymce.create("tinymce.plugins.VisualBlocks",{init:function(a,b){var c;if(!window.NodeList){return}a.addCommand("mceVisualBlocks",function(){var e=a.dom,d;if(!c){c=e.uniqueId();d=e.create("link",{id:c,rel:"stylesheet",href:b+"/css/visualblocks.css"});a.getDoc().getElementsByTagName("head")[0].appendChild(d)}else{d=e.get(c);d.disabled=!d.disabled}a.controlManager.setActive("visualblocks",!d.disabled)});a.addButton("visualblocks",{title:"visualblocks.desc",cmd:"mceVisualBlocks"});a.onInit.add(function(){if(a.settings.visualblocks_default_state){a.execCommand("mceVisualBlocks",false,null,{skip_focus:true})}})},getInfo:function(){return{longname:"Visual blocks",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualblocks",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("visualblocks",tinymce.plugins.VisualBlocks)})();

library/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin_src.js

@@ -42,7 +42,7 @@
 
 			ed.onInit.add(function() {
 				if (ed.settings.visualblocks_default_state) {
-					ed.execCommand('mceVisualBlocks');
+					ed.execCommand('mceVisualBlocks', false, null, {skip_focus : true});
 				}
 			});
 		},

library/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm

@@ -62,12 +62,8 @@
 
 	<div class="mceActionPanel">
 		<input type="submit" id="insert" name="insert" value="{#apply}" />
-
+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();"/>
-		<div id="preview"></div>
+		<div id="preview_wrapper"><div id="previewblock"><label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" class="text mceFocus" aria-required="true" /></div><span id="preview"></span></div>
-
-		<div id="previewblock">
-			<label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" class="text mceFocus" aria-required="true" />
-		</div>
 	</div>
 </form>
 </body>

library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js

@@ -69,6 +69,16 @@
 		each(previewStyles.split(' '), function(name) {
 			var value = dom.getStyle(previewElm, name, true);
 
+			// If background is transparent then check if the body has a background color we can use
+			if (name == 'background-color' && /transparent|rgba\s*\([^)]+,\s*0\)/.test(value)) {
+				value = dom.getStyle(ed.getBody(), name, true);
+
+				// Ignore white since it's the default color, not the nicest fix
+				if (dom.toHex(value).toLowerCase() == '#ffffff') {
+					return;
+				}
+			}
+
 			// Old IE won't calculate the font size so we need to do that manually
 			if (name == 'font-size') {
 				if (/em|%$/.test(value)) {
@@ -608,7 +618,7 @@
 
 			// TODO: ACC Should have an aria-describedby attribute which is user-configurable to describe what this field is actually for.
 			// Maybe actually inherit it from the original textara?
-			n = p = DOM.create('span', {role : 'application', 'aria-labelledby' : ed.id + '_voice', id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '')});
+			n = p = DOM.create('span', {role : 'application', 'aria-labelledby' : ed.id + '_voice', id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '') + (ed.settings.directionality == "rtl" ? ' mceRtl' : '')});
 			DOM.add(n, 'span', {'class': 'mceVoiceLabel', 'style': 'display:none;', id: ed.id + '_voice'}, s.aria_label);
 
 			if (!DOM.boxModel)
@@ -925,7 +935,7 @@
 		},
 
 		_addToolbars : function(c, o) {
-			var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a, toolbarGroup;
+			var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a, toolbarGroup, toolbarsExist = false;
 
 			toolbarGroup = cf.createToolbarGroup('toolbargroup', {
 				'name': ed.getLang('advanced.toolbar'),
@@ -941,6 +951,7 @@
 
 			// Create toolbar and add the controls
 			for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {
+				toolbarsExist = true;
 				tb = cf.createToolbar("toolbar" + i, {'class' : 'mceToolbarRow' + i});
 
 				if (s['theme_advanced_buttons' + i + '_add'])
@@ -954,6 +965,9 @@
 
 				o.deltaHeight -= s.theme_advanced_row_height;
 			}
+			// Handle case when there are no toolbar buttons and ensure editor height is adjusted accordingly
+			if (!toolbarsExist)
+				o.deltaHeight -= s.theme_advanced_row_height;
 			h.push(toolbarGroup.renderHTML());
 			h.push(DOM.createHTML('a', {href : '#', accesskey : 'z', title : ed.getLang("advanced.toolbar_focus"), onfocus : 'tinyMCE.getInstanceById(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));
 			DOM.setHTML(n, h.join(''));
@@ -1112,7 +1126,7 @@
 			}
 
 			if (c = cm.get('formatselect')) {
-				p = getParent(DOM.isBlock);
+				p = getParent(ed.dom.isBlock);
 
 				if (p)
 					c.select(p.nodeName.toLowerCase());
@@ -1210,7 +1224,7 @@
 						return;
 
 					// Handle prefix
-					if (tinymce.isIE && n.scopeName !== 'HTML')
+					if (tinymce.isIE && n.scopeName !== 'HTML' && n.scopeName)
 						na = n.scopeName + ':' + na;
 
 					// Remove internal prefix
@@ -1271,7 +1285,7 @@
 						if (v) {
 							ti += 'class: ' + v + ' ';
 
-							if (DOM.isBlock(n) || na == 'img' || na == 'span')
+							if (ed.dom.isBlock(n) || na == 'img' || na == 'span')
 								na += '.' + v;
 						}
 					}

library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js

@@ -104,10 +104,12 @@ var ImageDialog = {
 	},
 
 	updateStyle : function() {
-		var dom = tinyMCEPopup.dom, st, v, f = document.forms[0];
+		var dom = tinyMCEPopup.dom, st = {}, v, f = document.forms[0];
 
 		if (tinyMCEPopup.editor.settings.inline_styles) {
-			st = tinyMCEPopup.dom.parseStyle(this.styleVal);
+			tinymce.each(tinyMCEPopup.dom.parseStyle(this.styleVal), function(value, key) {
+				st[key] = value;
+			});
 
 			// Handle align
 			v = getSelectValue(f, 'align');

library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css

@@ -1,7 +1,7 @@
 /* Generic */
 body {
 font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;
-background:#F0F0EE;
+background:#F0F0EE;
 color: black;
 padding:0;
 margin:8px 8px 0 8px;
@@ -94,11 +94,12 @@ h3 {font-size:14px;}
 #plugintable, #about #plugintable td {border:1px solid #919B9C;}
 #plugintable {width:96%; margin-top:10px;}
 #pluginscontainer {height:290px; overflow:auto;}
-#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
+#colorpicker #preview {display:inline-block; padding-left:40px; height:14px; border:1px solid black; margin-left:5px; margin-right: 5px}
+#colorpicker #previewblock {position: relative; top: -3px; padding-left:5px; padding-top: 0px; display:inline}
+#colorpicker #preview_wrapper { text-align:center; padding-top:4px; white-space: nowrap}
 #colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
 #colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
 #colorpicker #light div {overflow:hidden;}
-#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
 #colorpicker .panel_wrapper div.current {height:175px;}
 #colorpicker #namedcolors {width:150px;}
 #colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}

library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css

@@ -58,7 +58,7 @@
 
 /* Menu */
 .highcontrastSkin .mceNoIcons span.mceIcon {width:0;}
-.highcontrastSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid; }
+.highcontrastSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid; direction:ltr}
 .highcontrastSkin .mceMenu table {background:white; color: black}
 .highcontrastSkin .mceNoIcons a .mceText {padding-left:10px}
 .highcontrastSkin .mceMenu a, .highcontrastSkin .mceMenu span, .highcontrastSkin .mceMenu {display:block;background:white; color: black}
@@ -90,6 +90,10 @@
 .highcontrastSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}
 .highcontrastSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
 
+/* Rtl */
+.mceRtl .mceListBox .mceText {text-align: right; padding: 0 4px 0 0}
+.mceRtl .mceMenuItem .mceText {text-align: right}
+
 /* Formats */
 .highcontrastSkin .mce_p span.mceText {}
 .highcontrastSkin .mce_address span.mceText {font-style:italic}

library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css

@@ -105,11 +105,12 @@ h3 {font-size:14px;}
 #plugintable, #about #plugintable td {border:1px solid #919B9C;}
 #plugintable {width:96%; margin-top:10px;}
 #pluginscontainer {height:290px; overflow:auto;}
-#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}
+#colorpicker #preview {display:inline-block; padding-left:40px; height:14px; border:1px solid black; margin-left:5px; margin-right: 5px}
+#colorpicker #previewblock {position: relative; top: -3px; padding-left:5px; padding-top: 0px; display:inline}
+#colorpicker #preview_wrapper { text-align:center; padding-top:4px; white-space: nowrap}
 #colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}
 #colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}
 #colorpicker #light div {overflow:hidden;}
-#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}
 #colorpicker .panel_wrapper div.current {height:175px;}
 #colorpicker #namedcolors {width:150px;}
 #colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}

library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css

@@ -86,7 +86,7 @@
 .o2k7Skin .mce_forecolor span.mceAction, .o2k7Skin .mce_backcolor span.mceAction {height:15px;overflow:hidden}
 
 /* Menu */
-.o2k7Skin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #ABC6DD}
+.o2k7Skin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #ABC6DD; direction:ltr}
 .o2k7Skin .mceNoIcons span.mceIcon {width:0;}
 .o2k7Skin .mceNoIcons a .mceText {padding-left:10px}
 .o2k7Skin .mceMenu table {background:#FFF}
@@ -112,6 +112,10 @@
 .o2k7Skin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}
 .o2k7Skin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}
 
+/* Rtl */
+.mceRtl .mceListBox .mceText {text-align: right; padding: 0 4px 0 0}
+.mceRtl .mceMenuItem .mceText {text-align: right}
+
 /* Formats */
 .o2k7Skin .mce_formatPreview a {font-size:10px}
 .o2k7Skin .mce_p span.mceText {}

util/messages.po

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 3.0.1341\n"
+"Project-Id-Version: 3.0.1343\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-13 10:00-0700\n"
+"POT-Creation-Date: 2012-05-15 10:00-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -150,15 +150,15 @@ msgstr ""
 #: ../../addon/statusnet/statusnet.php:318
 #: ../../addon/statusnet/statusnet.php:325
 #: ../../addon/statusnet/statusnet.php:353
-#: ../../addon/statusnet/statusnet.php:553 ../../addon/tumblr/tumblr.php:90
+#: ../../addon/statusnet/statusnet.php:561 ../../addon/tumblr/tumblr.php:90
 #: ../../addon/numfriends/numfriends.php:85 ../../addon/gnot/gnot.php:88
-#: ../../addon/wppost/wppost.php:102 ../../addon/showmore/showmore.php:48
+#: ../../addon/wppost/wppost.php:109 ../../addon/showmore/showmore.php:48
 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
-#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
+#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:381
 #: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
 #: ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
-#: ../../view/theme/diabook/theme.php:753
+#: ../../view/theme/diabook/theme.php:752
 #: ../../view/theme/diabook/config.php:190
 #: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
 #: ../../include/conversation.php:558
@@ -352,7 +352,7 @@ msgstr ""
 #: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
 #: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
 #: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:594
+#: ../../view/theme/diabook/theme.php:593
 msgid "Contact Photos"
 msgstr ""
 
@@ -375,7 +375,7 @@ msgstr ""
 #: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
 #: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
 #: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:595
+#: ../../view/theme/diabook/theme.php:594
 msgid "Profile Photos"
 msgstr ""
 
@@ -397,7 +397,7 @@ msgstr ""
 
 #: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:566 ../../include/text.php:1305
+#: ../../view/theme/diabook/theme.php:565 ../../include/text.php:1305
 #: ../../include/diaspora.php:1654 ../../include/conversation.php:53
 #: ../../include/conversation.php:126
 msgid "photo"
@@ -1775,8 +1775,8 @@ msgid "Remove account"
 msgstr ""
 
 #: ../../mod/settings.php:88 ../../mod/admin.php:735 ../../mod/admin.php:940
-#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:639
+#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:638
-#: ../../view/theme/diabook/theme.php:769 ../../include/nav.php:137
+#: ../../view/theme/diabook/theme.php:768 ../../include/nav.php:137
 msgid "Settings"
 msgstr ""
 
@@ -1832,7 +1832,7 @@ msgstr ""
 #: ../../addon/impressum/impressum.php:77
 #: ../../addon/openstreetmap/openstreetmap.php:80
 #: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
-#: ../../addon/twitter/twitter.php:370
+#: ../../addon/twitter/twitter.php:376
 msgid "Settings updated."
 msgstr ""
 
@@ -1842,12 +1842,12 @@ msgid "Add application"
 msgstr ""
 
 #: ../../mod/settings.php:542 ../../mod/settings.php:568
-#: ../../addon/statusnet/statusnet.php:547
+#: ../../addon/statusnet/statusnet.php:555
 msgid "Consumer Key"
 msgstr ""
 
 #: ../../mod/settings.php:543 ../../mod/settings.php:569
-#: ../../addon/statusnet/statusnet.php:546
+#: ../../addon/statusnet/statusnet.php:554
 msgid "Consumer Secret"
 msgstr ""
 
@@ -2787,8 +2787,8 @@ msgstr ""
 #: ../../addon/facebook/facebook.php:1564
 #: ../../addon/communityhome/communityhome.php:158
 #: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:561
+#: ../../view/theme/diabook/theme.php:560
-#: ../../view/theme/diabook/theme.php:570 ../../include/diaspora.php:1654
+#: ../../view/theme/diabook/theme.php:569 ../../include/diaspora.php:1654
 #: ../../include/conversation.php:48 ../../include/conversation.php:57
 #: ../../include/conversation.php:121 ../../include/conversation.php:130
 msgid "status"
@@ -2796,7 +2796,7 @@ msgstr ""
 
 #: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1568
 #: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:575 ../../include/diaspora.php:1670
+#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1670
 #: ../../include/conversation.php:65
 #, php-format
 msgid "%1$s likes %2$s's %3$s"
@@ -3137,7 +3137,7 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: ../../mod/admin.php:412 ../../addon/statusnet/statusnet.php:544
+#: ../../mod/admin.php:412 ../../addon/statusnet/statusnet.php:552
 msgid "Site name"
 msgstr ""
 
@@ -4073,7 +4073,7 @@ msgstr ""
 msgid "No entries."
 msgstr ""
 
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:622
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:621
 #: ../../include/contact_widgets.php:34
 msgid "Friend Suggestions"
 msgstr ""
@@ -4088,7 +4088,7 @@ msgstr ""
 msgid "Ignore/Hide"
 msgstr ""
 
-#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:620
+#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:619
 msgid "Global Directory"
 msgstr ""
 
@@ -4673,7 +4673,7 @@ msgid "Latest likes"
 msgstr ""
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:558 ../../include/text.php:1303
+#: ../../view/theme/diabook/theme.php:557 ../../include/text.php:1303
 #: ../../include/conversation.php:45 ../../include/conversation.php:118
 msgid "event"
 msgstr ""
@@ -4824,7 +4824,7 @@ msgstr ""
 msgid "Post to Drupal by default"
 msgstr ""
 
-#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:190
+#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:198
 #: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:192
 msgid "Post from Friendica"
 msgstr ""
@@ -5272,14 +5272,14 @@ msgid "Send public postings to StatusNet by default"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:345
-msgid "Send #tag links to StatusNet"
+msgid "Send linked #-tags and @-names to StatusNet"
 msgstr ""
 
 #: ../../addon/statusnet/statusnet.php:350 ../../addon/twitter/twitter.php:206
 msgid "Clear OAuth configuration"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:545
+#: ../../addon/statusnet/statusnet.php:553
 msgid "API URL"
 msgstr ""
 
@@ -5346,30 +5346,38 @@ msgstr ""
 msgid "Post to Wordpress"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:74
+#: ../../addon/wppost/wppost.php:76
 msgid "WordPress Post Settings"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:76
+#: ../../addon/wppost/wppost.php:78
 msgid "Enable WordPress Post Plugin"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:81
+#: ../../addon/wppost/wppost.php:83
 msgid "WordPress username"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:86
+#: ../../addon/wppost/wppost.php:88
 msgid "WordPress password"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:91
+#: ../../addon/wppost/wppost.php:93
 msgid "WordPress API URL"
 msgstr ""
 
-#: ../../addon/wppost/wppost.php:96
+#: ../../addon/wppost/wppost.php:98
 msgid "Post to WordPress by default"
 msgstr ""
 
+#: ../../addon/wppost/wppost.php:102
+msgid "Provide a backlink to the Friendica post"
+msgstr ""
+
+#: ../../addon/wppost/wppost.php:204
+msgid "Read the original post and comment stream on Friendica"
+msgstr ""
+
 #: ../../addon/showmore/showmore.php:38
 msgid "\"Show more\" Settings"
 msgstr ""
@@ -5481,14 +5489,14 @@ msgid "Send public postings to Twitter by default"
 msgstr ""
 
 #: ../../addon/twitter/twitter.php:201
-msgid "Send #tag links to Twitter"
+msgid "Send linked #-tags and @-names to Twitter"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:377
+#: ../../addon/twitter/twitter.php:383
 msgid "Consumer key"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:378
+#: ../../addon/twitter/twitter.php:384
 msgid "Consumer secret"
 msgstr ""
 
@@ -5631,96 +5639,97 @@ msgid "Your personal photos"
 msgstr ""
 
 #: ../../view/theme/diabook/theme.php:129
-#: ../../view/theme/diabook/theme.php:639
+#: ../../view/theme/diabook/theme.php:638
-#: ../../view/theme/diabook/theme.php:743
+#: ../../view/theme/diabook/theme.php:742
 #: ../../view/theme/diabook/config.php:201
 msgid "Community Pages"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:486
+#: ../../view/theme/diabook/theme.php:485
-#: ../../view/theme/diabook/theme.php:745
+#: ../../view/theme/diabook/theme.php:744
 #: ../../view/theme/diabook/config.php:203
 msgid "Community Profiles"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:507
+#: ../../view/theme/diabook/theme.php:506
-#: ../../view/theme/diabook/theme.php:750
+#: ../../view/theme/diabook/theme.php:749
 #: ../../view/theme/diabook/config.php:208
 msgid "Last users"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:536
+#: ../../view/theme/diabook/theme.php:535
-#: ../../view/theme/diabook/theme.php:752
+#: ../../view/theme/diabook/theme.php:751
 #: ../../view/theme/diabook/config.php:210
 msgid "Last likes"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:581
+#: ../../view/theme/diabook/theme.php:580
-#: ../../view/theme/diabook/theme.php:751
+#: ../../view/theme/diabook/theme.php:750
 #: ../../view/theme/diabook/config.php:209
 msgid "Last photos"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:618
+#: ../../view/theme/diabook/theme.php:617
-#: ../../view/theme/diabook/theme.php:748
+#: ../../view/theme/diabook/theme.php:747
 #: ../../view/theme/diabook/config.php:206
 msgid "Find Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:619
+#: ../../view/theme/diabook/theme.php:618
 msgid "Local Directory"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:621 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:620 ../../include/contact_widgets.php:35
 msgid "Similar Interests"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:623 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:622 ../../include/contact_widgets.php:37
 msgid "Invite Friends"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:674
+#: ../../view/theme/diabook/theme.php:673
-#: ../../view/theme/diabook/theme.php:744
+#: ../../view/theme/diabook/theme.php:743
 #: ../../view/theme/diabook/config.php:202
 msgid "Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:679
+#: ../../view/theme/diabook/theme.php:678
 msgid "Set zoomfactor for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:680
+#: ../../view/theme/diabook/theme.php:679
 #: ../../view/theme/diabook/config.php:199
 msgid "Set longitude (X) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:681
+#: ../../view/theme/diabook/theme.php:680
 #: ../../view/theme/diabook/config.php:200
 msgid "Set latitude (Y) for Earth Layers"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:694
+#: ../../view/theme/diabook/theme.php:693
-#: ../../view/theme/diabook/theme.php:746
+#: ../../view/theme/diabook/theme.php:745
 #: ../../view/theme/diabook/config.php:204
 msgid "Help or @NewHere ?"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:701
+#: ../../view/theme/diabook/theme.php:700
-#: ../../view/theme/diabook/theme.php:747
+#: ../../view/theme/diabook/theme.php:746
 #: ../../view/theme/diabook/config.php:205
 msgid "Connect Services"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:708
+#: ../../view/theme/diabook/theme.php:707
-#: ../../view/theme/diabook/theme.php:749
+#: ../../view/theme/diabook/theme.php:748
 msgid "Last Tweets"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:711
+#: ../../view/theme/diabook/theme.php:710
 #: ../../view/theme/diabook/config.php:197
 msgid "Set twitter search term"
 msgstr ""
 
+#: ../../view/theme/diabook/theme.php:730
 #: ../../view/theme/diabook/theme.php:731
 #: ../../view/theme/diabook/theme.php:732
 #: ../../view/theme/diabook/theme.php:733
@@ -5729,11 +5738,11 @@ msgstr ""
 #: ../../view/theme/diabook/theme.php:736
 #: ../../view/theme/diabook/theme.php:737
 #: ../../view/theme/diabook/theme.php:738
-#: ../../view/theme/diabook/theme.php:739
+#: ../../view/theme/diabook/theme.php:739 ../../include/acl_selectors.php:288
-#: ../../view/theme/diabook/theme.php:740 ../../include/acl_selectors.php:288
 msgid "don't show"
 msgstr ""
 
+#: ../../view/theme/diabook/theme.php:730
 #: ../../view/theme/diabook/theme.php:731
 #: ../../view/theme/diabook/theme.php:732
 #: ../../view/theme/diabook/theme.php:733
@@ -5742,12 +5751,11 @@ msgstr ""
 #: ../../view/theme/diabook/theme.php:736
 #: ../../view/theme/diabook/theme.php:737
 #: ../../view/theme/diabook/theme.php:738
-#: ../../view/theme/diabook/theme.php:739
+#: ../../view/theme/diabook/theme.php:739 ../../include/acl_selectors.php:287
-#: ../../view/theme/diabook/theme.php:740 ../../include/acl_selectors.php:287
 msgid "show"
 msgstr ""
 
-#: ../../view/theme/diabook/theme.php:741
+#: ../../view/theme/diabook/theme.php:740
 msgid "Show/hide boxes at right-hand column:"
 msgstr ""
 

view/de/strings.php

@@ -751,8 +751,10 @@ $a->strings["Network timeout"] = "Netzwerk Wartezeit";
 $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen).";
 $a->strings["Delivery interval"] = "Zustellungsintervall";
 $a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server.";
+$a->strings["Poll interval"] = "Abfrage Intervall";
+$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Verzögere Hintergrundprozesse um diese Anzahl an Sekunden um die Systemlast zu reduzieren. Bei 0 Sekunden wird das Auslieferungsintervall verwendet.";
 $a->strings["Maximum Load Average"] = "Maximum Load Average";
-$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "";
+$a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Maximale Systemlast bevor Verteil- und Empfangsprozesse verschoben werden - Standard 50";
 $a->strings["Update has been marked successful"] = "Update wurde als erfolgreich markiert";
 $a->strings["Executing %s failed. Check system logs."] = "Ausführung von %s schlug fehl. Systemprotokolle prüfen.";
 $a->strings["Update %s was successfully applied."] = "Update %s war erfolgreich.";
@@ -831,6 +833,8 @@ $a->strings["No compatible communication protocols or feeds were discovered."] =
 $a->strings["The profile address specified does not provide adequate information."] = "Die angegebene Profiladresse liefert unzureichende Informationen.";
 $a->strings["An author or name was not found."] = "Es wurde kein Autor oder Name gefunden.";
 $a->strings["No browser URL could be matched to this address."] = "Zu dieser Adresse konnte keine passende Browser URL gefunden werden.";
+$a->strings["Unable to match @-style Identity Address with a known protocol or email contact."] = "Konnte die @-Adresse mit keinem der bekannten Protokolle oder Email-Kontakte abgleichen.";
+$a->strings["Use mailto: in front of address to force email check."] = "Verwende mailto: vor der Email Adresse um eine Überprüfung der Email Adresse zu erzwingen.";
 $a->strings["The profile address specified belongs to a network which has been disabled on this site."] = "Die Adresse dieses Profils gehört zu einem Netzwerk, mit dem die Kommunikation auf dieser Seite ausgeschaltet wurde.";
 $a->strings["Limited profile. This person will be unable to receive direct/personal notifications from you."] = "Eingeschränktes Profil. Diese Person wird keine direkten/privaten Nachrichten von dir erhalten können.";
 $a->strings["Unable to retrieve contact information."] = "Konnte die Kontaktinformationen nicht empfangen.";
@@ -972,8 +976,8 @@ $a->strings["Install Facebook connector for this account."] = "Facebook-Connecto
 $a->strings["Remove Facebook connector"] = "Facebook-Connector entfernen";
 $a->strings["Re-authenticate [This is necessary whenever your Facebook password is changed.]"] = "Neu authentifizieren [Das ist immer dann nötig, wenn Du Dein Facebook-Passwort geändert hast.]";
 $a->strings["Post to Facebook by default"] = "Veröffentliche standardmäßig bei Facebook";
-$a->strings["Facebook friend linking has been disabled on this site. The following settings will have no effect."] = "";
+$a->strings["Facebook friend linking has been disabled on this site. The following settings will have no effect."] = "Das verlinken von Facebook-Kontakten wurde auf dieser Seite deaktiviert. Die folgenden Einstellungen haben keinen Effekt.";
-$a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = "";
+$a->strings["Facebook friend linking has been disabled on this site. If you disable it, you will be unable to re-enable it."] = "Das verlinken von Facebook-Kontakten wurde auf dieser Seite deaktiviert. Wenn du es ausgeschaltet hast, kannst du es nicht wieder aktivieren.";
 $a->strings["Link all your Facebook friends and conversations on this website"] = "All meine Facebook-Kontakte und -Konversationen hier auf diese Website importieren";
 $a->strings["Facebook conversations consist of your <em>profile wall</em> and your friend <em>stream</em>."] = "Facebook-Konversationen bestehen aus deinen Beiträgen auf deiner<em>Pinnwand</em>, sowie den Beiträgen deiner Freunde <em>Stream</em>.";
 $a->strings["On this website, your Facebook friend stream is only visible to you."] = "Hier auf dieser Webseite kannst nur du die Beiträge Deiner Facebook-Freunde (Stream) sehen.";
@@ -1255,6 +1259,8 @@ $a->strings["Posterous Post Settings"] = "Posterous Beitrags-Einstellungen";
 $a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren";
 $a->strings["Posterous login"] = "Posterous-Anmeldename";
 $a->strings["Posterous password"] = "Posterous-Passwort";
+$a->strings["Posterous site ID"] = "Posterous site ID";
+$a->strings["Posterous API token"] = "Posterous API token";
 $a->strings["Post to Posterous by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous";
 $a->strings["Theme settings"] = "Themen Einstellungen";
 $a->strings["Set resize level for images in posts and comments (width and height)"] = "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)";
@@ -1277,14 +1283,22 @@ $a->strings["Find Friends"] = "Freunde finden";
 $a->strings["Local Directory"] = "Lokales Verzeichnis";
 $a->strings["Similar Interests"] = "Ähnliche Interessen";
 $a->strings["Invite Friends"] = "Freunde einladen";
-$a->strings["Earth View"] = "Earth View";
+$a->strings["Earth Layers"] = "Earth Layers";
+$a->strings["Set zoomfactor for Earth Layers"] = "Zoomfaktor der Earth Layer";
+$a->strings["Set longitude (X) for Earth Layers"] = "Longitude (X) der Earth Layer";
+$a->strings["Set latitude (Y) for Earth Layers"] = "Latitude (Y) der Earth Layer";
 $a->strings["Help or @NewHere ?"] = "Hilfe oder @NewHere";
 $a->strings["Connect Services"] = "Verbinde Dienste";
 $a->strings["Last Tweets"] = "Neueste Tweets";
-$a->strings["Set twitter search term"] = "";
+$a->strings["Set twitter search term"] = "Twitter Suchbegriff";
+$a->strings["don't show"] = "nicht zeigen";
+$a->strings["show"] = "zeigen";
+$a->strings["Show/hide boxes at right-hand column:"] = "Rahmen auf der rechten Seite anzeigen/verbergen";
 $a->strings["Set line-height for posts and comments"] = "Liniengröße für Beiträge und Kommantare festlegen";
 $a->strings["Set resolution for middle column"] = "Auflösung für die Mittelspalte setzen";
 $a->strings["Set color scheme"] = "Wähle Farbschema";
+$a->strings["Set zoomfactor for Earth Layer"] = "Zoomfaktor der Earth Layer";
+$a->strings["Last tweets"] = "Neueste Tweets";
 $a->strings["Alignment"] = "Ausrichtung";
 $a->strings["Left"] = "Links";
 $a->strings["Center"] = "Mitte";
@@ -1514,8 +1528,6 @@ $a->strings["Image/photo"] = "Bild/Foto";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Kann die DNS Informationen für den Datenbanken Server '%s' nicht ermitteln.";
 $a->strings["[no subject]"] = "[kein Betreff]";
 $a->strings["Visible to everybody"] = "Für jeden sichtbar";
-$a->strings["show"] = "zeigen";
-$a->strings["don't show"] = "nicht zeigen";
 $a->strings["Friendica Notification"] = "Friendica-Benachrichtigung";
 $a->strings["Thank You,"] = "Danke,";
 $a->strings["%s Administrator"] = "der Administrator von %s";

view/theme/slackr/style.css

@@ -44,4 +44,18 @@ nav #site-location {
 	border-radius: 3px;
 	-moz-border-radius: 3px;
 	box-shadow: 3px 3px 10px 0 #000000;
-}
+}
+
+#sidebar-page-list img {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	box-shadow: 3px 3px 10px -2px #000000;
+}
+
+.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img {
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	box-shadow: 3px 3px 10px 0 #000000;
+}
+
+