From 0292d46e5de06529012ebb14ce934fb476d595d0 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Thu, 9 Aug 2012 16:26:44 -0700
Subject: merge comment threading, provide plugin/theme functions to handle
 css/js includes

---
 view/theme/darkzero/css/style.css            |  3 +-
 view/theme/duepuntozero/css/style.css        |  8 ++++--
 view/theme/duepuntozero/tpl/comment_item.tpl |  3 +-
 view/theme/quattro/dark/style.css            |  3 ++
 view/theme/quattro/green/style.css           |  3 ++
 view/theme/quattro/quattro.less              |  2 ++
 view/theme/quattro/wall_item_tag.tpl         |  4 ++-
 view/tpl/admin_site.tpl                      |  1 +
 view/tpl/comment_item.tpl                    |  3 +-
 view/tpl/head.tpl                            | 41 +++++++++++++++++++---------
 10 files changed, 51 insertions(+), 20 deletions(-)

(limited to 'view')

diff --git a/view/theme/darkzero/css/style.css b/view/theme/darkzero/css/style.css
index e01e14252..292c3dc4a 100644
--- a/view/theme/darkzero/css/style.css
+++ b/view/theme/darkzero/css/style.css
@@ -28,7 +28,8 @@ background: #444;
 
 }
 .wall-item-tools {	background-color: #444444;   background-image: none;}
-.comment-wwedit-wrapper{ background-color: #333333; }
+.comment-wwedit-wrapper{ background-color: #444444; }
+.toplevel_item > .wall-item-comment-wrapper > .comment-wwedit-wrapper{ background-color: #333333; }
 .comment-edit-preview{ color: #000000; }
 .wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
 .photo-top-album-name{ background-color: #333333; }
diff --git a/view/theme/duepuntozero/css/style.css b/view/theme/duepuntozero/css/style.css
index 544820b68..beeaccb41 100644
--- a/view/theme/duepuntozero/css/style.css
+++ b/view/theme/duepuntozero/css/style.css
@@ -934,8 +934,12 @@ input#dfrn-url {
 
 }
 
-.wall-item-content-wrapper.comment {
+.tread-wrapper .tread-wrapper {
 	margin-left: 50px;
+}
+
+.wall-item-content-wrapper.comment {
+#	margin-left: 50px;
 	background: #EEEEEE;
 }
 
@@ -1175,9 +1179,7 @@ input#dfrn-url {
 }
 
 .comment-wwedit-wrapper {
-	margin-top: 15px;
 	background: #f3f3f3;
-	margin-left: 50px;
 }
 
 .comment-edit-photo {
diff --git a/view/theme/duepuntozero/tpl/comment_item.tpl b/view/theme/duepuntozero/tpl/comment_item.tpl
index ea24d95cc..63c05f335 100755
--- a/view/theme/duepuntozero/tpl/comment_item.tpl
+++ b/view/theme/duepuntozero/tpl/comment_item.tpl
@@ -1,5 +1,6 @@
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
+			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
 				<input type="hidden" name="parent" value="$parent" />
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 38dd3dcea..d397a9305 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -1065,6 +1065,9 @@ section {
   color: #2d2d2d;
   border: 1px solid #2d2d2d;
 }
+.threaded .wall-item-comment-wrapper {
+  margin-left: 0px;
+}
 .comment-edit-preview {
   width: 710px;
   border: 1px solid #2d2d2d;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index a7d1f10b8..fdab77eb7 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -1065,6 +1065,9 @@ section {
   color: #2d2d2d;
   border: 1px solid #2d2d2d;
 }
+.threaded .wall-item-comment-wrapper {
+  margin-left: 0px;
+}
 .comment-edit-preview {
   width: 710px;
   border: 1px solid #2d2d2d;
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 1bd0fae0a..a3ab8107b 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -534,6 +534,8 @@ section {
 	}
 }
 
+.threaded .wall-item-comment-wrapper { margin-left: 0px; }
+
 .comment-edit-preview {
 	width: 710px;
 	border: 1px solid @Grey5;
diff --git a/view/theme/quattro/wall_item_tag.tpl b/view/theme/quattro/wall_item_tag.tpl
index 926fc929d..205fcfebc 100644
--- a/view/theme/quattro/wall_item_tag.tpl
+++ b/view/theme/quattro/wall_item_tag.tpl
@@ -13,11 +13,13 @@
 			<div class="wall-item-location">$item.location</div>	
 		</div>
 		<div class="wall-item-content">
-			$item.body
+			$item.ago $item.body 
 		</div>
 	</div>
 </div>
 
+{{ if $item.flatten }}
 <div class="wall-item-comment-wrapper" >
 	$item.comment
 </div>
+{{ endif }}
diff --git a/view/tpl/admin_site.tpl b/view/tpl/admin_site.tpl
index 3ca03262d..e918ff787 100644
--- a/view/tpl/admin_site.tpl
+++ b/view/tpl/admin_site.tpl
@@ -71,6 +71,7 @@
 	{{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
 	{{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
 	{{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+	{{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
 	
 	<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 	
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl
index a1d4e1043..b2be6f94e 100644
--- a/view/tpl/comment_item.tpl
+++ b/view/tpl/comment_item.tpl
@@ -1,5 +1,6 @@
 		<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-			<form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+			<span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
+			<form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
 				<input type="hidden" name="type" value="$type" />
 				<input type="hidden" name="profile_uid" value="$profile_uid" />
 				<input type="hidden" name="parent" value="$parent" />
diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl
index 34efa1bd8..7853361d9 100644
--- a/view/tpl/head.tpl
+++ b/view/tpl/head.tpl
@@ -20,22 +20,28 @@
          title="Search in Friendica" />
 
 <!--[if IE]>
-<script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+<script src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
 <![endif]-->
-<script type="text/javascript" src="$baseurl/js/jquery.js" ></script>
-<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script>
-<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script>
-<script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
-<script type="text/javascript" src="$baseurl/library/jquery.timeago.js"></script>
-<script type="text/javascript" src="$baseurl/library/jquery.divgrow/jquery.divgrow-1.3.1.js"></script>
-<script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
-<script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
-<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
-<script type="text/javascript" src="$baseurl/js/acl.js" ></script>
-<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script>
-<script type="text/javascript" src="$baseurl/js/main.js" ></script>
+<script src="$baseurl/js/jquery.js" ></script>
+<script src="$baseurl/js/jquery.textinputs.js" ></script>
+<script src="$baseurl/js/fk.autocomplete.js" ></script>
+<script src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script>
+<script src="$baseurl/library/jquery.timeago.js"></script>
+<script src="$baseurl/library/jquery.divgrow/jquery.divgrow-1.3.1.js"></script>
+<script src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script>
+<script src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script>
+<script src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script>
+<script src="$baseurl/js/acl.js" ></script>
+<script src="$baseurl/js/webtoolkit.base64.js" ></script>
+<script src="$baseurl/js/main.js" ></script>
+
+{{ if $module_js }}
+<script src="$module_js" ></script>
+{{ endif }}
 
 <script src="$baseurl/library/jslider/bin/jquery.slider.min.js"></script>
+
+
 <script>
 
 	var updateInterval = $update_interval;
@@ -61,6 +67,15 @@
 		}
 	}
 
+	function showHideCommentBox(id) {
+		if( $('#comment-edit-form-' + id).is(':visible')) {
+			$('#comment-edit-form-' + id).hide();
+		}
+		else {
+			$('#comment-edit-form-' + id).show();
+		}
+	}
+
 
 	function commentInsert(obj,id) {
 		var tmpStr = $("#comment-edit-text-" + id).val();
-- 
cgit v1.2.3