aboutsummaryrefslogtreecommitdiffstats
path: root/view/tpl
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-08-09 16:26:44 -0700
committerfriendica <info@friendica.com>2012-08-09 16:26:44 -0700
commit0292d46e5de06529012ebb14ce934fb476d595d0 (patch)
tree16208e490a8e2d6d90996c936c6f467533aaf612 /view/tpl
parent432595314affa179bdce439d6e90955cee99cd9e (diff)
downloadvolse-hubzilla-0292d46e5de06529012ebb14ce934fb476d595d0.tar.gz
volse-hubzilla-0292d46e5de06529012ebb14ce934fb476d595d0.tar.bz2
volse-hubzilla-0292d46e5de06529012ebb14ce934fb476d595d0.zip
merge comment threading, provide plugin/theme functions to handle css/js includes
Diffstat (limited to 'view/tpl')
-rw-r--r--view/tpl/admin_site.tpl1
-rw-r--r--view/tpl/comment_item.tpl3
-rw-r--r--view/tpl/head.tpl41
3 files changed, 31 insertions, 14 deletions
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();