Merge https://github.com/friendica/friendica into pull

index.php

@@ -38,11 +38,10 @@ load_translation_table($lang);
  */
 
 require_once("dba.php");
-$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
-        unset($db_host, $db_user, $db_pass, $db_data);
-
 
 if(! $install) {
+$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
+        unset($db_host, $db_user, $db_pass, $db_data);
 
 	/**
 	 * Load configs from db. Overwrite configs from .htconfig.php

view/de/messages.po

@@ -4161,7 +4161,7 @@ msgstr "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zug
 
 #: ../../addon/facebook/facebook.php:665
 msgid "The given API Key seems to work correctly."
-msgstr "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren."
+msgstr "Der angegebene API Schlüssel scheint korrekt zu funktionieren."
 
 #: ../../addon/facebook/facebook.php:667
 msgid ""

view/de/strings.php

@@ -924,7 +924,7 @@ $a->strings["Facebook Connector Settings"] = "Facebook-Verbindungseinstellungen"
 $a->strings["Facebook API Key"] = "Facebook API Schlüssel";
 $a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Fehler: du scheinst die App-ID und das App-Geheimnis in deiner .htconfig.php Datei angegeben zu haben. Solange sie dort festgelegt werden kannst du dieses Formular hier nicht verwenden.<br><br>";
 $a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Fehler: der angegebene API Schlüssel scheint nicht korrekt zu sein (Zugriffstoken konnte nicht empfangen werden).";
-$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint nicht korrekt zu funktionieren.";
+$a->strings["The given API Key seems to work correctly."] = "Der angegebene API Schlüssel scheint korrekt zu funktionieren.";
 $a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange.";
 $a->strings["App-ID / API-Key"] = "App-ID / API-Key";
 $a->strings["Application secret"] = "Anwendungs-Geheimnis";

view/theme/diabook-aerith/comment_item.tpl

@@ -13,7 +13,9 @@
 				<div class="comment-edit-photo-end"></div>
 				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
 				<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>													
-				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>										
+				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>	
+				<a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a>	
+				<a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a>										
 				<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
 				<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
 				<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>

view/theme/diabook-aerith/style.css

@@ -82,6 +82,15 @@
 #adminpage table tr:hover { background-color: #eeeeee; }
 #adminpage .selectall { text-align: right; }
 /* icons */
+
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook-aerith/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook-aerith/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
 .icon.bold{
   background-image: url("../../../view/theme/diabook-aerith/icons/bold.png");
   float: right;

view/theme/diabook-aerith/theme.php

@@ -526,10 +526,16 @@ function insertFormatting(BBcode,id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
+		if (BBcode == "url"){
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+			} else			
 		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
+		if (BBcode == "url"){
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+			} else
 		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 	return true;

view/theme/diabook-blue/comment_item.tpl

@@ -13,7 +13,9 @@
 				<div class="comment-edit-photo-end"></div>
 				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
 				<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>													
-				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>										
+				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>	
+				<a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a>	
+				<a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a>										
 				<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
 				<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
 				<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>

view/theme/diabook-blue/style.css

@@ -82,6 +82,14 @@
 #adminpage table tr:hover { background-color: #eeeeee; }
 #adminpage .selectall { text-align: right; }
 /* icons */
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook-blue/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook-blue/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
 .icon.bold{
   background-image: url("../../../view/theme/diabook-blue/icons/bold.png");
   float: right;

view/theme/diabook-blue/theme.php

@@ -527,10 +527,16 @@ function insertFormatting(BBcode,id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
+		if (BBcode == "url"){
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+			} else			
 		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
+		if (BBcode == "url"){
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+			} else
 		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 	return true;

view/theme/diabook-red/comment_item.tpl

@@ -13,7 +13,9 @@
 				<div class="comment-edit-photo-end"></div>
 				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
 				<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>													
-				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>										
+				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>
+				<a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a>	
+				<a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a>											
 				<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
 				<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
 				<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>

view/theme/diabook-red/style.css

@@ -82,6 +82,14 @@
 #adminpage table tr:hover { background-color: #eeeeee; }
 #adminpage .selectall { text-align: right; }
 /* icons */
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook-red/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook-red/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
 .icon.bold{
   background-image: url("../../../view/theme/diabook-red/icons/bold.png");
   float: right;

view/theme/diabook-red/theme.php

@@ -523,15 +523,21 @@ function insertFormatting(BBcode,id) {
 			$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
 			openMenu("comment-edit-submit-wrapper-" + id);
 											}
-				
+
 	textarea = document.getElementById("comment-edit-text-" +id);
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
+		if (BBcode == "url"){
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+			} else			
 		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
+		if (BBcode == "url"){
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+			} else
 		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 	return true;

view/theme/diabook/comment_item.tpl

@@ -13,7 +13,9 @@
 				<div class="comment-edit-photo-end"></div>
 				<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
 				<a class="icon bb-video" onclick="insertFormatting('video',$id);">video</a>													
-				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>										
+				<a class="icon bb-image" onclick="insertFormatting('img',$id);">img</a>	
+				<a class="icon bb-url" onclick="insertFormatting('url',$id);">url</a>	
+				<a class="icon quote" onclick="insertFormatting('quote',$id);">quote</a>																			
 				<a class="icon italic" onclick="insertFormatting('i',$id);">i</a>
 				<a class="icon underline" onclick="insertFormatting('u',$id);">u</a>
 				<a class="icon bold" onclick="insertFormatting('b',$id);">b</a>

view/theme/diabook/style.css

@@ -83,6 +83,14 @@
 #adminpage .selectall { text-align: right; }
 /* icons */
 
+.icon.bb-url{
+  background-image: url("../../../view/theme/diabook/icons/bb-url.png");
+  float: right;
+  margin-top: 2px;}
+.icon.quote{
+  background-image: url("../../../view/theme/diabook/icons/quote.png");
+  float: right;
+  margin-top: 2px;}
 .icon.bold{
   background-image: url("../../../view/theme/diabook/icons/bold.png");
   float: right;

view/theme/diabook/theme.php

@@ -538,10 +538,16 @@ function insertFormatting(BBcode,id) {
 	if (document.selection) {
 		textarea.focus();
 		selected = document.selection.createRange();
+		if (BBcode == "url"){
+			selected.text = "["+BBcode+"]" + "http://" +  selected.text + "[/"+BBcode+"]";
+			} else			
 		selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
 	} else if (textarea.selectionStart || textarea.selectionStart == "0") {
 		var start = textarea.selectionStart;
 		var end = textarea.selectionEnd;
+		if (BBcode == "url"){
+			textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+			} else
 		textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
 	}
 	return true;

view/theme/dispy-dark/communityhome.tpl

@@ -37,10 +37,8 @@
 </div>
 {{ endif }}
 
-{{ if $lastusers_title }}
+<h3 id="postit-header">'PostIt' to Friendica</h3>
-<h3 id="postit-header">PostIt to Friendica</h3>
 <div id="postit">
 <a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
 </div>
-{{ endif }}
 

view/theme/dispy-dark/default.php

@@ -7,13 +7,18 @@
 </head>
 <body>
 	<?php if(x($page,'nav')) echo $page['nav']; ?>
-	<aside>
+	<aside id="asideleft">
 		<?php if(x($page,'aside')) echo $page['aside']; ?>
 		<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
 	</aside>
-	<section><?php if(x($page,'content')) echo $page['content']; ?>
+	<section>
+		<?php if(x($page,'content')) echo $page['content']; ?>
 		<div id="page-footer"></div>
 	</section>
+	<aside id="asideright">
+		<?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
+		<?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
+	</aside>
 	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
 </body>
 </html>

view/theme/dispy-dark/style.css

@@ -2603,8 +2603,8 @@ div[id$="wrapper"] br {
 }
 .icon.drop,
 .icon.drophide, .icon.delete {
-    float: right;
+    float: left;
-	margin: 5px;
+	/*margin: 5px;*/
 }
 .icon.s22.delete {
 	display: block;

view/theme/dispy-dark/theme.php

@@ -3,126 +3,135 @@
 /*
  * Name: Dispy Dark
  * Description: Dispy Dark, Friendica theme
- * Version: 1.0
+ * Version: 1.1
  * Author: Simon <http://simon.kisikew.org/>
  * Maintainer: Simon <http://simon.kisikew.org/>
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
+$a = get_app();
 $a->theme_info = array(
-	'extends' => 'dispy-dark',
+	'name' => 'dispy-dark',
+	'version' => '1.1'
 );
 
-$a->page['htmlhead'] .= <<< EOT
+function dispy_dark_init(&$a) {
-<script>
-$(document).ready(function() {
-    $('.group-edit-icon').hover(
-        function() {
-            $(this).addClass('icon');
-            $(this).removeClass('iconspacer'); },
 
-        function() {
+	// aside on profile page
-            $(this).removeClass('icon');
+	if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
-            $(this).addClass('iconspacer'); }
+		dispy_dark_community_info();
-    );
+	}
 
-    $('.sidebar-group-element').hover(
+	$a->page['htmlhead'] .= <<<EOT
-        function() {
+	<script type="text/javascript">
-            id = $(this).attr('id');
+	$(document).ready(function() {
-            $('#edit-' + id).addClass('icon');
+		$('.group-edit-icon').hover(
-            $('#edit-' + id).removeClass('iconspacer'); },
+			function() {
+				$(this).addClass('icon');
+				$(this).removeClass('iconspacer'); },
 
-        function() {
+			function() {
-            id = $(this).attr('id');
+				$(this).removeClass('icon');
-            $('#edit-' + id).removeClass('icon');
+				$(this).addClass('iconspacer'); }
-            $('#edit-' + id).addClass('iconspacer'); }
+		);
-    );
 
-    $('.savedsearchdrop').hover(
+		$('.sidebar-group-element').hover(
-        function() {
+			function() {
-            $(this).addClass('drop');
+				id = $(this).attr('id');
-            $(this).addClass('icon');
+				$('#edit-' + id).addClass('icon');
-            $(this).removeClass('iconspacer'); },
+				$('#edit-' + id).removeClass('iconspacer'); },
 
-        function() {
+			function() {
-            $(this).removeClass('drop');
+				id = $(this).attr('id');
-            $(this).removeClass('icon');
+				$('#edit-' + id).removeClass('icon');
-            $(this).addClass('iconspacer'); }
+				$('#edit-' + id).addClass('iconspacer'); }
-    );
+		);
 
-    $('.savedsearchterm').hover(
+		$('.savedsearchdrop').hover(
-        function() {
+			function() {
-            id = $(this).attr('id');
+				$(this).addClass('drop');
-            $('#drop-' + id).addClass('icon');
+				$(this).addClass('icon');
-            $('#drop-' + id).addClass('drophide');
+				$(this).removeClass('iconspacer'); },
-            $('#drop-' + id).removeClass('iconspacer'); },
 
-        function() {
+			function() {
-            id = $(this).attr('id');
+				$(this).removeClass('drop');
-            $('#drop-' + id).removeClass('icon');
+				$(this).removeClass('icon');
-            $('#drop-' + id).removeClass('drophide');
+				$(this).addClass('iconspacer'); }
-            $('#drop-' + id).addClass('iconspacer'); }
+		);
-        );
+
+		$('.savedsearchterm').hover(
+			function() {
+				id = $(this).attr('id');
+				$('#drop-' + id).addClass('icon');
+				$('#drop-' + id).addClass('drophide');
+				$('#drop-' + id).removeClass('iconspacer'); },
+
+			function() {
+				id = $(this).attr('id');
+				$('#drop-' + id).removeClass('icon');
+				$('#drop-' + id).removeClass('drophide');
+				$('#drop-' + id).addClass('iconspacer'); }
+			);
+
+		// click outside notifications menu closes it
+		$('html').click(function() {
+			$('#nav-notifications-linkmenu').removeClass('selected');
+			document.getElementById("nav-notifications-menu").style.display = "none";
+		});
+
+		$('#nav-notifications-linkmenu').click(function(event) {
+			event.stopPropagation();
+		});
+		// click outside profiles menu closes it
+		$('html').click(function() {
+			$('#profiles-menu-trigger').removeClass('selected');
+			document.getElementById("profiles-menu").style.display = "none";
+		});
+
+		$('#profiles-menu').click(function(event) {
+			event.stopPropagation();
+		});
+
+		// main function in toolbar functioning
+		function toggleToolbar() {
+			if ( $('#nav-floater').is(':visible') ) {
+				$('#nav-floater').slideUp('fast');
+				$('.floaterflip').css({
+					backgroundPosition: '-210px -60px' 
+				});
+				$('.search-box').slideUp('fast');
+			} else {
+				$('#nav-floater').slideDown('fast');
+				$('.floaterflip').css({
+					backgroundPosition: '-190px -60px'
+				});
+				$('.search-box').slideDown('fast');
+			}
+		};
+		// our trigger for the toolbar button
+		$('.floaterflip').click(function() {
+			toggleToolbar();
+			return false;
+		});
+
+		// (attempt) to change the text colour in a top post
+		$('#profile-jot-text').focusin(function() {
+			$(this).css({color: '#eec'});
+		});
 
-	// click outside notifications menu closes it
-	$('html').click(function() {
-		$('#nav-notifications-linkmenu').removeClass('selected');
-		document.getElementById("nav-notifications-menu").style.display = "none";
 	});
-
+	</script>
-	$('#nav-notifications-linkmenu').click(function(event) {
-		event.stopPropagation();
-	});
-	// click outside profiles menu closes it
-	$('html').click(function() {
-		$('#profiles-menu-trigger').removeClass('selected');
-		document.getElementById("profiles-menu").style.display = "none";
-	});
-
-	$('#profiles-menu').click(function(event) {
-		event.stopPropagation();
-	});
-
-	// main function in toolbar functioning
-    function toggleToolbar() {
-        if ( $('#nav-floater').is(':visible') ) {
-            $('#nav-floater').slideUp('fast');
-            $('.floaterflip').css({
-                backgroundPosition: '-210px -60px' 
-            });
-			$('.search-box').slideUp('fast');
-        } else {
-            $('#nav-floater').slideDown('fast');
-            $('.floaterflip').css({
-                backgroundPosition: '-190px -60px'
-            });
-			$('.search-box').slideDown('fast');
-        }
-    };
-	// our trigger for the toolbar button
-    $('.floaterflip').click(function() {
-        toggleToolbar();
-        return false;
-    });
-
-	// (attempt) to change the text colour in a top post
-	$('#profile-jot-text').focusin(function() {
-		$(this).css({color: '#eec'});
-	});
-
-});
-</script>
 EOT;
+}
 
-function dispydark_community_info() {
+function dispy_dark_community_info() {
 	$a = get_app();
+	$url = $a->get_baseurl($ssl_state);
+	$aside['$url'] = $url;
 
-	$aside['$lastusers_title'] = t('Last users');
+	$fpostitJS = <<<FPI
-    $aside['$lastusers_items'] = array();
+		javascript: (function() {
-	$publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " );
+		the_url = ' . $url . '/view/theme/' . $a->theme_info['name'] . '/fpostit/fpostit.php?url=' +
-
-	$fostitJS = "javascript: (function() {
-		the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' +
 		encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
 		encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
 		document.getSelection() : document.selection.createRange().text));
@@ -135,18 +144,11 @@ function dispydark_community_info() {
 			} else {
 				a_funct();
 			}
-		})();";
+		})();
+FPI;
 
-	$aside['$fostitJS'] = $fostitJS;
+	$aside['$fpostitJS'] = $fpostitJS;
-	$url = $a->get_baseurl($ssl_state);
+	$tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
-	$aside['$url'] = $url;
+	return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
-
-    $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
-// aside on profile page
-//if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
-	dispydark_community_info();
-//}
-

view/theme/dispy/communityhome.tpl

@@ -37,10 +37,8 @@
 </div>
 {{ endif }}
 
-{{ if $lastusers_title }}
+<h3 id="postit-header">'PostIt' to Friendica</h3>
-<h3 id="postit-header">PostIt to Friendica</h3>
 <div id="postit">
 <a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
 </div>
-{{ endif }}
 

view/theme/dispy/default.php

@@ -7,13 +7,18 @@
 </head>
 <body>
 	<?php if(x($page,'nav')) echo $page['nav']; ?>
-	<aside>
+	<aside id="asideleft">
 		<?php if(x($page,'aside')) echo $page['aside']; ?>
 		<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
 	</aside>
-	<section><?php if(x($page,'content')) echo $page['content']; ?>
+	<section>
+		<?php if(x($page,'content')) echo $page['content']; ?>
 		<div id="page-footer"></div>
 	</section>
+	<aside id="asideright">
+		<?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
+		<?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
+	</aside>
 	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
 </body>
 </html>

view/theme/dispy/nav.tpl

@@ -56,7 +56,6 @@ works -->
         <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
         </li>
         {{ endif }}
-
         {{ if $nav.contacts }}
         <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
         {{ endif }}
@@ -75,11 +74,9 @@ works -->
         {{ if $nav.admin }}
         <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
         {{ endif }}
-
         {{ if $nav.login }}
         <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
         {{ endif }}
-
         {{ if $nav.logout }}
         <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
         {{ endif }}

view/theme/dispy/style.css

@@ -2603,8 +2603,8 @@ div[id$="wrapper"] br {
 }
 .icon.drop,
 .icon.drophide, .icon.delete {
-    float: right;
+    float: left;
-	margin: 5px;
+	/*margin: 5px;*/
 }
 .icon.s22.delete {
 	display: block;

view/theme/dispy/theme.php

@@ -3,122 +3,135 @@
 /*
  * Name: Dispy
  * Description: Dispy, Friendica theme
- * Version: 1.0
+ * Version: 1.1
  * Author: unknown
  * Maintainer: Simon <http://simon.kisikew.org/>
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
+$a = get_app();
 $a->theme_info = array(
-	'extends' => 'dispy',
+	'name' => 'dispy',
+	'version' => '1.1'
 );
 
-$a->page['htmlhead'] .= <<< EOT
+function dispy_init(&$a) {
-<script>
-$(document).ready(function() {
-    $('.group-edit-icon').hover(
-        function() {
-            $(this).addClass('icon');
-            $(this).removeClass('iconspacer'); },
 
-        function() {
+	// aside on profile page
-            $(this).removeClass('icon');
+	if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
-            $(this).addClass('iconspacer'); }
+		dispy_community_info();
-    );
+	}
 
-    $('.sidebar-group-element').hover(
+	$a->page['htmlhead'] .= <<<EOT
-        function() {
+	<script type="text/javascript">
-            id = $(this).attr('id');
+	$(document).ready(function() {
-            $('#edit-' + id).addClass('icon');
+		$('.group-edit-icon').hover(
-            $('#edit-' + id).removeClass('iconspacer'); },
+			function() {
+				$(this).addClass('icon');
+				$(this).removeClass('iconspacer'); },
 
-        function() {
+			function() {
-            id = $(this).attr('id');
+				$(this).removeClass('icon');
-            $('#edit-' + id).removeClass('icon');
+				$(this).addClass('iconspacer'); }
-            $('#edit-' + id).addClass('iconspacer'); }
+		);
-    );
 
-    $('.savedsearchdrop').hover(
+		$('.sidebar-group-element').hover(
-        function() {
+			function() {
-            $(this).addClass('drop');
+				id = $(this).attr('id');
-            $(this).addClass('icon');
+				$('#edit-' + id).addClass('icon');
-            $(this).removeClass('iconspacer'); },
+				$('#edit-' + id).removeClass('iconspacer'); },
 
-        function() {
+			function() {
-            $(this).removeClass('drop');
+				id = $(this).attr('id');
-            $(this).removeClass('icon');
+				$('#edit-' + id).removeClass('icon');
-            $(this).addClass('iconspacer'); }
+				$('#edit-' + id).addClass('iconspacer'); }
-    );
+		);
 
-    $('.savedsearchterm').hover(
+		$('.savedsearchdrop').hover(
-        function() {
+			function() {
-            id = $(this).attr('id');
+				$(this).addClass('drop');
-            $('#drop-' + id).addClass('icon');
+				$(this).addClass('icon');
-            $('#drop-' + id).addClass('drophide');
+				$(this).removeClass('iconspacer'); },
-            $('#drop-' + id).removeClass('iconspacer'); },
 
-        function() {
+			function() {
-            id = $(this).attr('id');
+				$(this).removeClass('drop');
-            $('#drop-' + id).removeClass('icon');
+				$(this).removeClass('icon');
-            $('#drop-' + id).removeClass('drophide');
+				$(this).addClass('iconspacer'); }
-            $('#drop-' + id).addClass('iconspacer'); }
+		);
-        );
+
+		$('.savedsearchterm').hover(
+			function() {
+				id = $(this).attr('id');
+				$('#drop-' + id).addClass('icon');
+				$('#drop-' + id).addClass('drophide');
+				$('#drop-' + id).removeClass('iconspacer'); },
+
+			function() {
+				id = $(this).attr('id');
+				$('#drop-' + id).removeClass('icon');
+				$('#drop-' + id).removeClass('drophide');
+				$('#drop-' + id).addClass('iconspacer'); }
+			);
+
+		// click outside notifications menu closes it
+		$('html').click(function() {
+			$('#nav-notifications-linkmenu').removeClass('selected');
+			document.getElementById("nav-notifications-menu").style.display = "none";
+		});
+
+		$('#nav-notifications-linkmenu').click(function(event) {
+			event.stopPropagation();
+		});
+		// click outside profiles menu closes it
+		$('html').click(function() {
+			$('#profiles-menu-trigger').removeClass('selected');
+			document.getElementById("profiles-menu").style.display = "none";
+		});
+
+		$('#profiles-menu').click(function(event) {
+			event.stopPropagation();
+		});
+
+		// main function in toolbar functioning
+		function toggleToolbar() {
+			if ( $('#nav-floater').is(':visible') ) {
+				$('#nav-floater').slideUp('fast');
+				$('.floaterflip').css({
+					backgroundPosition: '-210px -60px' 
+				});
+				$('.search-box').slideUp('fast');
+			} else {
+				$('#nav-floater').slideDown('fast');
+				$('.floaterflip').css({
+					backgroundPosition: '-190px -60px'
+				});
+				$('.search-box').slideDown('fast');
+			}
+		};
+		// our trigger for the toolbar button
+		$('.floaterflip').click(function() {
+			toggleToolbar();
+			return false;
+		});
+
+		// (attempt) to change the text colour in a top post
+		$('#profile-jot-text').focusin(function() {
+			$(this).css({color: '#eec'});
+		});
 
-	// click outside notifications menu closes it
-	$('html').click(function() {
-		$('#nav-notifications-linkmenu').removeClass('selected');
-		document.getElementById("nav-notifications-menu").style.display = "none";
 	});
-
+	</script>
-	$('#nav-notifications-linkmenu').click(function(event) {
-		event.stopPropagation();
-	});
-	// click outside profiles menu closes it
-	$('html').click(function() {
-		$('#profiles-menu-trigger').removeClass('selected');
-		document.getElementById("profiles-menu").style.display = "none";
-	});
-
-	$('#profiles-menu').click(function(event) {
-		event.stopPropagation();
-	});
-
-	// main function in toolbar functioning
-    function toggleToolbar() {
-        if ( $('#nav-floater').is(':visible') ) {
-            $('#nav-floater').slideUp('fast');
-            $('.floaterflip').css({
-                backgroundPosition: '-210px -60px' 
-            });
-			$('.search-box').slideUp('fast');
-        } else {
-            $('#nav-floater').slideDown('fast');
-            $('.floaterflip').css({
-                backgroundPosition: '-190px -60px'
-            });
-			$('.search-box').slideDown('fast');
-        }
-    };
-	// our trigger for the toolbar button
-    $('.floaterflip').click(function() {
-        toggleToolbar();
-        return false;
-    });
-
-	// (attempt) to change the text colour in a top post
-	$('#profile-jot-text').focusin(function() {
-		$(this).css({color: '#eec'});
-	});
-
-});
-</script>
 EOT;
+}
 
 function dispy_community_info() {
 	$a = get_app();
+	$url = $a->get_baseurl($ssl_state);
+	$aside['$url'] = $url;
 
-	$fostitJS = "javascript: (function() {
+	$fpostitJS = <<<FPI
-		the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' +
+		javascript: (function() {
+		the_url = ' . $url . '/view/theme/' . $a->theme_info['name'] . '/fpostit/fpostit.php?url=' +
 		encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
 		encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
 		document.getSelection() : document.selection.createRange().text));
@@ -131,17 +144,11 @@ function dispy_community_info() {
 			} else {
 				a_funct();
 			}
-		})();";
+		})();
+FPI;
 
-	$aside['$fostitJS'] = $fostitJS;
+	$aside['$fpostitJS'] = $fpostitJS;
-	$url = $a->get_baseurl($ssl_state);
+	$tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
-	$aside['$url'] = $url;
+	return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
-
-    $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
-// aside on profile page
-if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
-	dispy_community_info();
-}

view/theme/dispy/wall_item.tpl

@@ -4,9 +4,7 @@
 			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
 				 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
 				 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-					<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
-				</a>
 				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
 				<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
 					<ul>
@@ -57,15 +55,16 @@
 			</ul>
 			<div class="wall-item-delete-end"></div>
 		</div>
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
+		<div class="wall-item-content" id="wall-item-content-$item.id">
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
 			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
+			<div class="wall-item-body" id="wall-item-body-$item.id">
-					<div class="body-tag">
+				$item.body
-						{{ for $item.tags as $tag }}
+				<div class="body-tag">
-							<span class='tag'>$tag</span>
+					{{ for $item.tags as $tag }}
-						{{ endfor }}
+						<span class='tag'>$tag</span>
-					</div>
+					{{ endfor }}
+				</div>
 			</div>
 		</div>
 		<div class="wall-item-author">

view/theme/dispy/wallwall_item.tpl

@@ -2,15 +2,13 @@
 	<div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
 		<div class="wall-item-info wallwall" id="wall-item-info-$item.id">
 			<div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-				<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+				<a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"><img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
-				<img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
 			</div>
 			<div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
 			<div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
 				onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
                 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+				<a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
-				<img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
 				<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                     <ul>
@@ -63,15 +61,16 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
 			</ul>
 			<div class="wall-item-delete-end"></div>
 		</div>
-		<div class="wall-item-content" id="wall-item-content-$item.id" >
+		<div class="wall-item-content" id="wall-item-content-$item.id">
 			<div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
 			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
+			<div class="wall-item-body" id="wall-item-body-$item.id">
-					<div class="body-tag">
+				$item.body
-						{{ for $item.tags as $tag }}
+				<div class="body-tag">
-							<span class="tag">$tag</span>
+					{{ for $item.tags as $tag }}
-						{{ endfor }}
+						<span class="tag">$tag</span>
-					</div>			
+					{{ endfor }}
+				</div>			
 			</div>
 		</div>
 		<div class="wall-item-author">