tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #6660 from MrPetovan/task/6552-frio-improve-thread-display

Browse source 
[frio] Improve thread display
This commit is contained in:
rabuzarus 2019-02-17 13:33:49 +01:00 committed by GitHub
parent 35de5fb537 3cabddcdec
commit 9ebb2f42a1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 1775 additions and 1781 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/conversation.php
View file

@ -1082,10 +1082,9 @@ function format_like($cnt, array $arr, $type, $id) {
break;
}
$expanded .= "\t" . '<div class="wall-item-' . $type . '-expanded" id="' . $type . 'list-' . $id . '" style="display: none;" >' . $explikers . EOL . '</div>';
$expanded .= "\t" . '<p class="wall-item-' . $type . '-expanded" id="' . $type . 'list-' . $id . '" style="display: none;" >' . $explikers . EOL . '</p>';
}
$phrase .= EOL;
$o .= Renderer::replaceMacros(Renderer::getMarkupTemplate('voting_fakelink.tpl'), [
'$phrase' => $phrase,
'$type' => $type,

2
src/App.php
View file

@ -663,8 +663,6 @@ class App
'$local_user' => local_user(),
'$generator' => 'Friendica' . ' ' . FRIENDICA_VERSION,
'$delitem' => Core\L10n::t('Delete this item?'),
'$showmore' => Core\L10n::t('show more'),
'$showfewer' => Core\L10n::t('show fewer'),
'$update_interval' => $interval,
'$shortcut_icon' => $shortcut_icon,
'$touch_icon' => $touch_icon,

7
src/Object/Post.php
View file

@ -415,6 +415,7 @@ class Post extends BaseObject
'dislike' => $responses['dislike']['output'],
'responses' => $responses,
'switchcomment' => L10n::t('Comment'),
'reply_label' => L10n::t('Reply to %s', $name_e),
'comment' => $comment,
'previewing' => $conv->isPreview() ? ' preview ' : '',
'wait' => L10n::t('Please wait'),
@ -449,13 +450,13 @@ class Post extends BaseObject
foreach ($children as $child) {
$result['children'][] = $child->getTemplateData($conv_responses, $thread_level + 1);
}
// Collapse
if (($nb_children > 2) || ($thread_level > 1)) {
$result['children'][0]['comment_firstcollapsed'] = true;
$result['children'][0]['num_comments'] = L10n::tt('%d comment', '%d comments', $total_children);
$result['children'][0]['hidden_comments_num'] = $total_children;
$result['children'][0]['hidden_comments_text'] = L10n::tt('comment', 'comments', $total_children);
$result['children'][0]['hide_text'] = L10n::t('show more');
$result['children'][0]['show_text'] = L10n::t('Show more');
$result['children'][0]['hide_text'] = L10n::t('Show fewer');
if ($thread_level > 1) {
$result['children'][$nb_children - 1]['comment_lastcollapsed'] = true;
} else {

9
view/global.css
View file

@ -90,6 +90,15 @@ span.connector {
margin-right: 0px;
}
.wall-item-like-expanded,
.wall-item-dislike-expanded,
.wall-item-attendyes-expanded,
.wall-item-attendno-expanded,
.wall-item-attendmaybe-expanded {
margin: 0;
}
.type-link blockquote, .type-video blockquote {
margin-left: 0px;
max-height: 160px;

31
view/js/main.js
View file

@ -17,25 +17,30 @@ function _resizeIframe(obj, desth) {
}
function openClose(theID) {
if (document.getElementById(theID).style.display == "block") {
document.getElementById(theID).style.display = "none"
var el = document.getElementById(theID);
if (el) {
if (window.getComputedStyle(el).display === "none") {
openMenu(theID);
} else {
document.getElementById(theID).style.display = "block"
closeMenu(theID);
}
}
}
function openMenu(theID) {
var el = document.getElementById(theID);
if (el) {
el.style.display = "block";
if (!el.dataset.display) {
el.dataset.display = 'block';
}
el.style.display = el.dataset.display;
}
}
function closeMenu(theID) {
var el = document.getElementById(theID)
var el = document.getElementById(theID);
if (el) {
el.dataset.display = window.getComputedStyle(el).display;
el.style.display = "none";
}
}
@ -656,12 +661,14 @@ function preview_comment(id) {
}
function showHideComments(id) {
if ($("#collapsed-comments-" + id).is(":visible")) {
$("#collapsed-comments-" + id).hide();
$("#hide-comments-" + id).html(window.showMore);
if ($('#collapsed-comments-' + id).is(':visible')) {
$('#collapsed-comments-' + id).slideUp();
$('#hide-comments-' + id).hide();
$('#hide-comments-total-' + id).show();
} else {
$("#collapsed-comments-" + id).show();
$("#hide-comments-" + id).html(window.showFewer);
$('#collapsed-comments-' + id).slideDown();
$('#hide-comments-' + id).show();
$('#hide-comments-total-' + id).hide();
}
}

3016
view/lang/C/messages.po
View file

File diff suppressed because it is too large Load diff

4
view/templates/head.tpl
View file

@ -88,7 +88,6 @@
$("#comment-edit-text-" + id).putCursorAtEnd();
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
$("#comment-edit-text-" + id).focus();
$("#mod-cmnt-wrap-" + id).show();
openMenu("comment-edit-submit-wrapper-" + id);
return true;
@ -146,9 +145,6 @@
$(obj).val("");
}
window.showMore = "{{$showmore}}";
window.showFewer = "{{$showfewer}}";
function showHideCommentBox(id) {
if ($("#comment-edit-form-" + id).is(":visible")) {
$("#comment-edit-form-" + id).hide();

2
view/templates/jot-header.tpl
View file

@ -42,7 +42,7 @@ function enableOnUser(){
</script>
<script type="text/javascript" src="{{$baseurl}}/view/js/ajaxupload.js" ></script>
<script>
var ispublic = '{{$ispublic}}';
var ispublic = '{{$ispublic nofilter}}';
$(document).ready(function() {

2
view/templates/photos_head.tpl
View file

@ -2,7 +2,7 @@
<script>
var ispublic = "{{$ispublic}}";
var ispublic = "{{$ispublic nofilter}}";
$(document).ready(function() {

2
view/templates/settings/head.tpl
View file

@ -1,7 +1,7 @@
<script>
var ispublic = "{{$ispublic}}";
var ispublic = "{{$ispublic nofilter}}";
$(document).ready(function() {

9
view/templates/wall_thread.tpl
View file

@ -1,7 +1,12 @@
{{if $item.comment_firstcollapsed}}
<div class="hide-comments-outer">
<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span> <span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
{{$item.num_comments}} - {{$item.show_text}}
</span>
<span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
{{$item.num_comments}} - {{$item.hide_text}}
</span>
</div>
<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
{{/if}}

62
view/theme/frio/css/style.css
View file

@ -1669,7 +1669,13 @@ aside .panel-body {
/* wall items */
.wall-item-container {
position: relative;
background-color: rgba(0, 0, 0, 0.03);
padding: 0.5em;
border-top: 1px solid rgba(255, 255, 255, 0.8);
}
.wall-item-container .media {
margin-top: 0;
}
/* wall items contact photo */
@ -1914,12 +1920,13 @@ code > .hl-main {
/* item social action buttons */
.wall-item-actions {
margin-top: 15px;
display: flex;
margin: .5em 0;
justify-content: space-between;
}
.wall-item-actions, .wall-item-actions a, .wall-item-actions button {
.wall-item-actions a, .wall-item-actions button {
font-size: 13px;
color: #555;
margin-bottom: 0;
}
.wall-item-actions .active {
font-weight: bold;
@ -2013,9 +2020,10 @@ code > .hl-main {
position: relative!important;
margin-top: 0;
}
.hide-comments-outer-wrapper {
/* text-align: center;
margin-top: -18px;*/
.hide-comments-outer {
background-color: rgba(0, 0, 0, 0.03);
padding: 0.5em;
border-radius: 0.5em 0.5em 0 0;
}
.hide-comments-total {
cursor: pointer;
@ -2024,21 +2032,37 @@ code > .hl-main {
/*
* Comment Box
*/
.thread_level_2 .wall-item-comment-wrapper {
padding-right: 5px;
.comment-fake-form,
.wall-item-comment-wrapper {
padding: 10px;
border-top: 1px solid rgba(255, 255, 255, 0.8);
background-color: rgba(0, 0, 0, 0.03);
border-radius: 0 0 10px 10px;
}
.comment-fake-form {
border-color: #d9d9d9;
}
.comment-fake-form textarea {
resize: none;
}
.comment-container .wall-item-comment-wrapper {
margin-top: 0.5em;
}
.comment-edit-form textarea {
resize: vertical;
}
.comment-edit-submit-wrapper {
margin-bottom: 25px;
text-align: right;
}
.comment-edit-submit-wrapper a,
.comment-edit-submit-wrapper a:hover {
padding-top: 5px !important;
padding-bottom: 5px !important;
}
.comment-icon-list > li > .icon,
.comment-icon-list > li > .icon:hover {
color: #555;
background-color: transparent;
.comment-icon-list {
display: flex;
justify-content: space-between;
}
/* acpopup + textcompletion*/

117
view/theme/frio/js/textedit.js
View file

@ -82,7 +82,8 @@ function insertFormatting(BBcode, id) {
if (tmpStr == '') {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
closeMenu("comment-fake-form-" + id);
openMenu("item-comments-" + id);
}
textarea = document.getElementById("comment-edit-text-" + id);
@ -134,115 +135,99 @@ function cmtBbClose(id) {
$("#comment-edit-bb-" + id).hide();
}
function commentExpand(id) {
$("#comment-edit-text-" + id).putCursorAtEnd();
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
$("#comment-edit-text-" + id).focus();
function commentExpand(id)
{
$("#mod-cmnt-wrap-" + id).show();
openMenu("comment-edit-submit-wrapper-" + id);
closeMenu("comment-fake-form-" + id);
openMenu("item-comments-" + id);
$("#comment-edit-text-" + id)
.putCursorAtEnd()
.addClass("comment-edit-text-full")
.removeClass("comment-edit-text-empty");
return true;
}
function commentClose(obj, id) {
if (obj.value == '') {
$("#comment-edit-text-" + id).removeClass("comment-edit-text-full");
$("#comment-edit-text-" + id).addClass("comment-edit-text-empty");
function commentClose(obj, id)
{
if (obj.value === '' || obj.value === obj.dataset.default) {
$("#comment-edit-text-" + id)
.removeClass("comment-edit-text-full")
.addClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).hide();
closeMenu("comment-edit-submit-wrapper-" + id);
openMenu("comment-fake-form-" + id);
closeMenu("item-comments-" + id);
return true;
}
return false;
}
function showHideCommentBox(id) {
if ($('#comment-edit-form-' + id).is(':visible')) {
$('#comment-edit-form-' + id).hide();
var $el = $('#comment-edit-form-' + id);
if ($el.is(':visible')) {
$el.hide();
} else {
$('#comment-edit-form-' + id).show();
$el.show();
}
}
function commentOpenUI(obj, id) {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full").removeClass("comment-edit-text-empty");
// Choose an arbitrary tab index that's greater than what we're using in jot (3 of them)
// The submit button gets tabindex + 1
$("#comment-edit-text-" + id).attr('tabindex', '9');
$("#comment-edit-submit-" + id).attr('tabindex', '10');
$("#comment-edit-submit-wrapper-" + id).show();
closeMenu("comment-fake-form-" + id);
openMenu("item-comments-" + id);
$("#comment-edit-text-" + id)
.putCursorAtEnd()
.addClass("comment-edit-text-full").removeClass("comment-edit-text-empty")
.attr('tabindex', '9'); // Choose an arbitrary tab index that's greater than what we're using in jot (3 of them)
$("#comment-edit-submit-" + id).attr('tabindex', '10'); // The submit button gets tabindex + 1
// initialize autosize for this comment
autosize($("#comment-edit-text-" + id + ".text-autosize"));
}
function commentCloseUI(obj, id) {
if (obj.value === '') {
$("#comment-edit-text-" + id).removeClass("comment-edit-text-full").addClass("comment-edit-text-empty");
$("#comment-edit-text-" + id).removeAttr('tabindex');
if (obj.value === '' || obj.value === obj.dataset.default) {
$("#comment-edit-text-" + id)
.removeClass("comment-edit-text-full").addClass("comment-edit-text-empty")
.removeAttr('tabindex');
$("#comment-edit-submit-" + id).removeAttr('tabindex');
$("#comment-edit-submit-wrapper-" + id).hide();
openMenu("comment-fake-form-" + id);
closeMenu("item-comments-" + id);
// destroy the automatic textarea resizing
autosize.destroy($("#comment-edit-text-" + id + ".text-autosize"));
}
}
function jotTextOpenUI(obj) {
if (obj.value == '') {
$(".modal-body #profile-jot-text").addClass("profile-jot-text-full").removeClass("profile-jot-text-empty");
if (obj.value === '' || obj.value === obj.dataset.default) {
var $el = $(".modal-body #profile-jot-text");
$el.addClass("profile-jot-text-full").removeClass("profile-jot-text-empty");
// initiale autosize for the jot
autosize($(".modal-body #profile-jot-text"));
autosize($el);
}
}
function jotTextCloseUI(obj) {
if (obj.value === '') {
$(".modal-body #profile-jot-text").removeClass("profile-jot-text-full").addClass("profile-jot-text-empty");
if (obj.value === '' || obj.value === obj.dataset.default) {
var $el = $(".modal-body #profile-jot-text");
$el.removeClass("profile-jot-text-full").addClass("profile-jot-text-empty");
// destroy the automatic textarea resizing
autosize.destroy($(".modal-body #profile-jot-text"));
autosize.destroy($el);
}
}
function commentOpen(obj, id) {
if (obj.value == '') {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
if (obj.value === '' || obj.value === obj.dataset.default) {
$("#comment-edit-text-" + id)
.putCursorAtEnd()
.addClass("comment-edit-text-full")
.removeClass("comment-edit-text-empty");
$("#mod-cmnt-wrap-" + id).show();
openMenu("comment-edit-submit-wrapper-" + id);
closeMenu("comment-fake-form-" + id);
openMenu("item-comments-" + id);
return true;
}
return false;
}
function commentInsert(obj, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if (tmpStr == '') {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
var ins = $(obj).html();
ins = ins.replace('&lt;', '<');
ins = ins.replace('&gt;', '>');
ins = ins.replace('&amp;', '&');
ins = ins.replace('&quot;', '"');
$("#comment-edit-text-" + id).val(tmpStr + ins);
}
function qCommentInsert(obj, id) {
var tmpStr = $("#comment-edit-text-" + id).val();
if (tmpStr == '') {
$("#comment-edit-text-" + id).addClass("comment-edit-text-full");
$("#comment-edit-text-" + id).removeClass("comment-edit-text-empty");
openMenu("comment-edit-submit-wrapper-" + id);
}
var ins = $(obj).val();
ins = ins.replace('&lt;', '<');
ins = ins.replace('&gt;', '>');
ins = ins.replace('&amp;', '&');
ins = ins.replace('&quot;', '"');
$("#comment-edit-text-" + id).val(tmpStr + ins);
$(obj).val('');
}
function confirmDelete() {
return confirm(aStr.delitem);
}

13
view/theme/frio/js/theme.js
View file

@ -388,19 +388,6 @@ function showHide(theID) {
}
}
function showHideComments(id) {
if( $('#collapsed-comments-' + id).is(':visible')) {
$('#collapsed-comments-' + id).slideUp();
$('#hide-comments-' + id).html(window.showMore);
$('#hide-comments-total-' + id).show();
}
else {
$('#collapsed-comments-' + id).slideDown();
$('#hide-comments-' + id).html(window.showFewer);
$('#hide-comments-total-' + id).hide();
}
}
// Show & hide event map in the network stream by button click.
function showHideEventMap(elm) {
// Get the id of the map element - it should be provided through

86
view/theme/frio/templates/comment_item.tpl
View file

@ -1,10 +1,10 @@
{{if $threaded}}
<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}" style="display: block;">
<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-{{$id}}">
{{else}}
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}" style="display: block;">
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-{{$id}}">
{{/if}}
<form class="comment-edit-form" style="display: block;" data-item-id="{{$id}}" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">
<form class="comment-edit-form" data-item-id="{{$id}}" 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}}" />
@ -13,64 +13,56 @@
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
<input type="hidden" name="post_id_random" value="{{$rand_num}}" />
<div class="bb form-group">
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" onFocus="commentOpenUI(this,{{$id}});">{{$default}}</textarea>
</div>
<p class="comment-edit-bb-{{$id}} comment-icon-list">
<span>
<button type="button" class="btn btn-sm icon bb-img" style="cursor: pointer;" aria-label="{{$edimg}}" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
<i class="fa fa-picture-o"></i>
</button>
<button type="button" class="btn btn-sm icon bb-attach" style="cursor: pointer;" aria-label="{{$edattach}}" title="{{$edattach}}" ondragenter="return commentLinkDrop(event, {{$id}});" ondragover="return commentLinkDrop(event, {{$id}});" ondrop="commentLinkDropper(event);" onclick="commentGetLink({{$id}}, '{{$prompttext}}');">
<i class="fa fa-paperclip"></i>
</button>
</span>
<span>
<button type="button" class="btn btn-sm icon bb-url" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
<i class="fa fa-link"></i>
</button>
<button type="button" class="btn btn-sm icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
<i class="fa fa-underline"></i>
</button>
<button type="button" class="btn btn-sm icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
<i class="fa fa-italic"></i>
</button>
<button type="button" class="btn btn-sm icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
<i class="fa fa-bold"></i>
</button>
<button type="button" class="btn btn-sm icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
<i class="fa fa-quote-left"></i>
</button>
</span>
</p>
<p>
<textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty form-control text-autosize" name="body" placeholder="{{$comment}}" rows="3" data-default="{{$default}}">{{$default}}</textarea>
</p>
{{if $qcomment}}
<p>
<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});">
<option value=""></option>
{{foreach $qcomment as $qc}}
<option value="{{$qc}}">{{$qc}}</option>
{{/foreach}}
</select>
</p>
{{/if}}
<div class="comment-edit-text-end clear"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
<button type="submit" class="btn btn-primary btn-sm" id="comment-edit-submit-{{$id}}" name="submit"><i class="fa fa-envelope"></i> {{$submit}}</button>
<p class="comment-edit-submit-wrapper">
{{if $preview}}
<button type="button" class="btn btn-defaul btn-sm" onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}"><i class="fa fa-eye"></i> {{$preview}}</button>
{{/if}}
<ul class="comment-edit-bb-{{$id}} comment-icon-list nav nav-pills pull-right">
<li>
<button type="button" class="btn-link icon bb-img" style="cursor: pointer;" aria-label="{{$edimg}}" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
<i class="fa fa-picture-o"></i>
</button>
</li>
<li>
<button type="button" class="btn-link icon bb-url" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
<i class="fa fa-link"></i>
</button>
</li>
<li>
<button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edattach}}" title="{{$edattach}}" ondragenter="return commentLinkDrop(event, {{$id}});" ondragover="return commentLinkDrop(event, {{$id}});" ondrop="commentLinkDropper(event);" onclick="commentGetLink({{$id}}, '{{$prompttext}}');">
<i class="fa fa-paperclip"></i>
</button>
</li>
<li>
<button type="button" class="btn-link icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
<i class="fa fa-underline"></i>
</button>
</li>
<li>
<button type="button" class="btn-link icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
<i class="fa fa-italic"></i>
</button>
</li>
<li>
<button type="button" class="btn-link icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
<i class="fa fa-bold"></i>
</button>
</li>
<li>
<button type="button" class="btn-link icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
<i class="fa fa-quote-left"></i>
</button>
</li>
</ul>
</div>
<button type="submit" class="btn btn-primary btn-sm" id="comment-edit-submit-{{$id}}" name="submit"><i class="fa fa-envelope"></i> {{$submit}}</button>
</p>
<div class="comment-edit-end clear"></div>
</form>
<div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
</div>

5
view/theme/frio/templates/head.tpl
View file

@ -87,11 +87,6 @@
{{/if}}
<script type="text/javascript" src="view/theme/frio/js/textedit.js"></script>
<script type="text/javascript">
window.showMore = "{{$showmore}}";
window.showFewer = "{{$showfewer}}";
</script>
{{* Include the strings which are needed for some js functions (e.g. translation)
They are loaded into the html <head> so that js functions can use them *}}
{{include file="js_strings.tpl"}}

2
view/theme/frio/templates/jot-header.tpl
View file

@ -40,7 +40,7 @@
</script>
<script type="text/javascript">
var ispublic = '{{$ispublic}}';
var ispublic = '{{$ispublic nofilter}}';
aStr.linkurl = '{{$linkurl}}';

2
view/theme/frio/templates/photos_head.tpl
View file

@ -1,5 +1,5 @@
<script type="text/javascript" src="view/theme/frio/js/mod_photos.js"></script>
<script type="text/javascript">
var ispublic = "{{$ispublic}}";
var ispublic = "{{$ispublic nofilter}}";
</script>

21
view/theme/frio/templates/search_item.tpl
View file

@ -161,9 +161,9 @@
</div>
<!-- ./TODO -->
<div class="wall-item-actions">
<p class="wall-item-actions">
{{* Action buttons to interact with the item (like: like, dislike, share and so on *}}
<div class="wall-item-actions-left pull-left">
<span class="wall-item-actions-left">
<!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
<div id="button-reply" class="pull-left">
<button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
@ -204,28 +204,27 @@
{{/if}}
{{/if}}
<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
</div>
</span>
<div class="wall-item-actions-right pull-right">
<span class="wall-item-actions-right">
{{* Event attendance buttons *}}
{{if $item.isevent}}
<div class="vote-event">
<span class="vote-event">
<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doLikeAction({{$item.id}}, 'attendyes');"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doLikeAction({{$item.id}}, 'attendno');"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
<button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doLikeAction({{$item.id}}, 'attendmaybe');"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
</div>
</span>
{{/if}}
<div class="pull-right checkbox">
<span class="pull-right checkbox">
{{if $item.drop.pagedrop}}
<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
<label for="checkbox-{{$item.id}}"></label>
{{/if}}
</div>
</div>
<div class="clearfix"></div>
</div><!--./wall-item-actions-->
</span>
</span>
</p><!--./wall-item-actions-->
{{* Display likes, dislike and attendance stats *}}
{{if $item.responses}}

2
view/theme/frio/templates/voting_fakelink.tpl Normal file
View file

@ -0,0 +1,2 @@
<p>{{$phrase nofilter}}</p>

74
view/theme/frio/templates/wall_thread.tpl
View file

@ -20,7 +20,7 @@ as the value of $top_child_total (this is done at the end of this file)
{{/if}}
{{if $item.thread_level==2 && $top_child_nr==1}}
<div class="comment-container well well-sm"> <!--top-child-begin-->
<div class="comment-container"> <!--top-child-begin-->
{{/if}}
{{* end of hacky part to count childrens *}}
@ -41,12 +41,15 @@ as the value of $top_child_total (this is done at the end of this file)
{{if $item.thread_level<3}}
<div class="hide-comments-outer-wrapper">
<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
<span id="hide-comments-total-{{$item.id}}"
class="hide-comments-total">{{$item.num_comments}}</span>
<span id="hide-comments-{{$item.id}}"
class="hide-comments">{{$item.hide_text}}</span>
<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
<i class="fa fa-plus-square" aria-hidden="true"></i>
{{$item.num_comments}} - {{$item.show_text}}
</span>
<span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
<i class="fa fa-minus-square" aria-hidden="true"></i>
{{$item.num_comments}} - {{$item.hide_text}}
</span>
</div>
<hr />
</div>
<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
{{else}}
@ -305,9 +308,9 @@ as the value of $top_child_total (this is done at the end of this file)
<!-- ./TODO -->
<!-- <hr /> -->
<div class="wall-item-actions">
<p class="wall-item-actions">
{{* Action buttons to interact with the item (like: like, dislike, share and so on *}}
<div class="wall-item-actions-left pull-left">
<span class="wall-item-actions-left">
<!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
<div id="button-reply" class="pull-left">
<button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
@ -335,7 +338,7 @@ as the value of $top_child_total (this is done at the end of this file)
{{* Button to open the comment text field *}}
{{if $item.comment}}
<button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i>&nbsp;{{$item.switchcomment}}</button>
<button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i>&nbsp;{{$item.switchcomment}}</button>
{{/if}}
{{* Button for sharing the item *}}
@ -348,27 +351,26 @@ as the value of $top_child_total (this is done at the end of this file)
{{/if}}
{{/if}}
<img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
</div>
</span>
<div class="wall-item-actions-right pull-right">
<span class="wall-item-actions-right">
{{* Event attendance buttons *}}
{{if $item.isevent}}
<div class="vote-event">
<span class="vote-event">
<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doLikeAction({{$item.id}},'attendyes');"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doLikeAction({{$item.id}},'attendno');"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
<button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doLikeAction({{$item.id}},'attendmaybe');"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
</div>
</span>
{{/if}}
<div class="pull-right checkbox">
<span class="pull-right checkbox">
{{if $item.drop.pagedrop}}
<input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
<label for="checkbox-{{$item.id}}"></label>
{{/if}}
</div>
</div>
<div class="clearfix"></div>
</div><!--./wall-item-actions-->
</span>
</span>
</p><!--./wall-item-actions-->
<div class="wall-item-links"></div>
@ -381,19 +383,16 @@ as the value of $top_child_total (this is done at the end of this file)
</div>
{{/if}}
{{if $item.thread_level!=1}}
</div><!--./media-body from for comments-->
<hr />
{{/if}}
{{* Insert comment box of threaded children *}}
{{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}}
<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" style="display: none;">
{{if $item.threaded && $item.comment && $item.indent==comment}}
<div class="wall-item-comment-wrapper" id="item-comments-{{$item.id}}" data-display="block" style="display: none;">
{{$item.comment nofilter}}
</div>
{{/if}}{{/if}}{{/if}}
{{/if}}
{{if $item.thread_level!=1}}
</div><!--./media-body from for comments-->
{{/if}}
{{foreach $item.children as $child}}
{{*
@ -409,33 +408,22 @@ as the value of $top_child_total (this is done at the end of this file)
{{* Insert the comment box of the top level post at the bottom of the thread.
Display this comment box if there are any comments. If not hide it. In this
case it could be opend with the "comment" button *}}
{{if $item.comment && $item.thread_level==1}}
{{if $item.total_comments_num}}
{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div>
{{/if}}{{/if}}{{/if}}
{{if $item.flatten}}
<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}">{{$item.comment nofilter}}</div>
{{/if}}
{{else}}
{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}}
<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div>
{{/if}}{{/if}}{{/if}}
{{if $item.flatten}}
<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" style="display: none;">{{$item.comment nofilter}}</div>
<div class="comment-fake-form" id="comment-fake-form-{{$item.id}}">
<textarea id="comment-fake-text-{{$item.id}}" class="comment-fake-text-empty form-control" placeholder="{{$item.reply_label}}" onFocus="commentOpenUI(this, {{$item.id}});" rows="1"></textarea>
</div>
{{/if}}
<div class="wall-item-comment-wrapper well well-small" id="item-comments-{{$item.id}}" data-display="block" style="display: none">{{$item.comment nofilter}}</div>
{{/if}}
</div><!-- /media -->
</div><!-- ./panel-body or ./wall-item-container -->
{{if $mode == display}}
{{else}}
{{if $item.comment_lastcollapsed}}</div>{{/if}}
{{/if}}
{{* close the comment-container div if no more thread_level = 2 children are left *}}
{{if $item.thread_level==2 && $top_child_nr==$top_child_total}}
</div><!--./comment-container-->

20
view/theme/quattro/templates/wall_thread.tpl
View file

@ -1,19 +1,13 @@
{{if $mode == display}}
{{else}}
{{if $item.comment_firstcollapsed}}
<div class="hide-comments-outer">
<span id="hide-comments-total-{{$item.id}}"
class="hide-comments-total">{{$item.num_comments}}</span>
<span id="hide-comments-{{$item.id}}"
class="hide-comments fakelink"
onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
{{if $item.thread_level==3}} -
<span id="hide-thread-{{$item}}-id"
class="fakelink"
onclick="showThread({{$item.id}});">expand</span> /
<span id="hide-thread-{{$item}}-id"
class="fakelink"
onclick="hideThread({{$item.id}});">collapse</span> thread{{/if}}
<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
{{$item.num_comments}} - {{$item.show_text}}
</span>
<span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
{{$item.num_comments}} - {{$item.hide_text}}
</span>
</div>
<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
{{/if}}

2
view/theme/smoothly/templates/jot-header.tpl
View file

@ -52,7 +52,7 @@ function enableOnUser(){
</script>
<script>
var ispublic = '{{$ispublic}}';
var ispublic = '{{$ispublic nofilter}}';
$(document).ready(function() {

10
view/theme/smoothly/templates/wall_thread.tpl
View file

@ -1,8 +1,12 @@
{{if $item.comment_firstcollapsed}}
<div class="hide-comments-outer">
<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.num_comments}}</span>
<span id="hide-comments-{{$item.id}}" class="hide-comments fakelink" onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
{{$item.num_comments}} - {{$item.show_text}}
</span>
<span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
{{$item.num_comments}} - {{$item.hide_text}}
</span>
</div>
<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
{{/if}}

13
view/theme/vier/templates/wall_thread.tpl
View file

@ -2,12 +2,13 @@
{{else}}
{{if $item.comment_firstcollapsed}}
{{if $item.thread_level<3}}
<div class="hide-comments-outer">
<span id="hide-comments-total-{{$item.id}}"
class="hide-comments-total">{{$item.num_comments}}</span>
<span id="hide-comments-{{$item.id}}"
class="hide-comments fakelink"
onclick="showHideComments({{$item.id}});">{{$item.hide_text}}</span>
<div class="hide-comments-outer fakelink" onclick="showHideComments({{$item.id}});">
<span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">
{{$item.num_comments}} - {{$item.show_text}}
</span>
<span id="hide-comments-{{$item.id}}" class="hide-comments" style="display: none">
{{$item.num_comments}} - {{$item.hide_text}}
</span>
</div>
<div id="collapsed-comments-{{$item.id}}" class="collapsed-comments" style="display: none;">
{{else}}