post preview to loozah

6 files changed, 28 insertions, 3 deletions

diff --git a/boot.php b/boot.php
index 1ad3249c1..82bd7c364 100644
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1221' );
+define ( 'FRIENDICA_VERSION',      '2.3.1222' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1115      );
 
diff --git a/include/conversation.php b/include/conversation.php
index 293c5a84a..6f235f701 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -170,6 +170,10 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 	load_contact_links(local_user());
 
+	$cb = array('items' => $items, 'mode' => $mode, 'update' => $update, 'preview' => $preview);
+	call_hooks('conversation_start',$cb);
+
+	$items = $cb['items'];
 
 	$cmnt_tpl    = get_markup_template('comment_item.tpl');
 	$tpl         = get_markup_template('wall_item.tpl');
diff --git a/include/plugin.php b/include/plugin.php
index 9f2832981..fe325ac3b 100644
--- a/include/plugin.php
+++ b/include/plugin.php
@@ -19,7 +19,7 @@ function uninstall_plugin($plugin){
 if (! function_exists('install_plugin')){
 function install_plugin($plugin){
 	logger("Addons: installing " . $plugin);
-	$t = filemtime('addon/' . $plugin . '/' . $plugin . '.php');
+	$t = @filemtime('addon/' . $plugin . '/' . $plugin . '.php');
 	@include_once('addon/' . $plugin . '/' . $plugin . '.php');
 	if(function_exists($plugin . '_install')) {
 		$func = $plugin . '_install';
@@ -33,6 +33,10 @@ function install_plugin($plugin){
 			$plugin_admin
 		);
 	}
+	else {
+		logger("Addons: FAILED installing " . $plugin);
+	}
+
 }}
 
 // reload all updated plugins
diff --git a/view/theme/loozah/jot.tpl b/view/theme/loozah/jot.tpl
index 78cbecea8..9bda1868e 100644
--- a/view/theme/loozah/jot.tpl
+++ b/view/theme/loozah/jot.tpl
@@ -13,6 +13,7 @@
 		<input type="hidden" name="location" id="jot-location" value="$defloc" />
 		<input type="hidden" name="coord" id="jot-coord" value="" />
 		<input type="hidden" name="title" id="jot-title" value="" />
+		<input type="hidden" name="preview" id="jot-preview" value="0" />
 		<input type="hidden" name="post_id" value="$post_id" />
 
 		<img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
@@ -58,7 +59,13 @@
 	<div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
 		<a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
 	</div>
+
+	<span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
+
+
 	<div id="profile-jot-perms-end"></div>
+
+	<div id="jot-preview-content" style="display:none;"></div>
 	
 	<div style="display: none;">
 		<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
diff --git a/view/theme/loozah/search_item.tpl b/view/theme/loozah/search_item.tpl
index 17dc6233c..5db19b4f8 100644
--- a/view/theme/loozah/search_item.tpl
+++ b/view/theme/loozah/search_item.tpl
@@ -1,4 +1,4 @@
-<div class="wall-item-outside-wrapper$indent" id="wall-item-outside-wrapper-$id" >
+<div class="wall-item-outside-wrapper$indent$previewing" id="wall-item-outside-wrapper-$id" >
 	<div class="wall-item-content-wrapper$indent" id="wall-item-content-wrapper-$id" >
 		<div class="wall-item-info" id="wall-item-info-$id">
 			<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$id" 
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 54f4f24f2..73c8639b1 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -1216,6 +1216,16 @@ padding: 5px 10px 0px;
 	font-size: 1.2em;
 }
 
+#jot-preview-link {
+	margin-left: 45px;
+}
+
+.preview {
+	background: #FFFFC8;
+}
+
+
+
 #profile-jot-perms-end {
 	clear: both;
 }