clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

One click comments on threaded items. 

comment-wwedit-wrapper and wall-item-outside-wrapper get the additional class "threaded" when applicable.
This commit is contained in:
Domovoy 2012-08-23 13:09:35 +02:00
parent c8ba00d798
commit 5dd3e8a990
7 changed files with 67 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
view/comment_item.tpl
View File

@ -1,10 +1,9 @@
{{ if $threaded }}
<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-$id" style="display: block;">
{{ else }}
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
{{ if $threaded }} {{ endif }}
<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;">
{{ else }}
<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> <form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
{{ endif }}
<input type="hidden" name="type" value="$type" /> <input type="hidden" name="type" value="$type" />
<input type="hidden" name="profile_uid" value="$profile_uid" /> <input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="parent" value="$parent" /> <input type="hidden" name="parent" value="$parent" />

20
view/theme/darkzero/style.css
View File

@ -23,13 +23,23 @@ div.wall-item-content-wrapper.shiny { background-image: url('shiny.png'); }
nav #banner #logo-text a { color: #ffffff; } nav #banner #logo-text a { color: #ffffff; }
.wall-item-content-wrapper { .wall-item-content-wrapper {
border: 1px solid #444444; border: 1px solid #444444;
background: #444; background: #444444;
}
.wall-item-outside-wrapper.threaded > .wall-item-content-wrapper {
-moz-border-radius: 3px 3px 0px;
border-radius: 3px 3px 0px;
} }
.wall-item-tools { background-color: #444444; background-image: none;} .wall-item-tools { background-color: #444444; background-image: none;}
.comment-wwedit-wrapper{ background-color: #444444; } .comment-wwedit-wrapper{
.toplevel_item > .wall-item-comment-wrapper > .comment-wwedit-wrapper{ background-color: #333333; } background-color: #333333;
}
.comment-wwedit-wrapper.threaded {
border: solid #444444;
border-width: 0px 3px 3px;
-moz-border-radius: 0px 0px 3px 3px;
border-radius: 0px 0px 3px 3px;
}
.comment-edit-preview{ color: #000000; } .comment-edit-preview{ color: #000000; }
.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;} .wall-item-content-wrapper.comment { background-color: #444444; border: 0px;}
.photo-top-album-name{ background-color: #333333; } .photo-top-album-name{ background-color: #333333; }

18
view/theme/darkzero/theme.php
View File

@ -45,11 +45,19 @@ function insertFormatting(comment,BBcode,id) {
return true; return true;
} }
function cmtBbOpen(id) { function cmtBbOpen(comment, id) {
$(".comment-edit-bb-" + id).show(); if($(comment).hasClass('comment-edit-text-full')) {
$(".comment-edit-bb-" + id).show();
return true;
}
return false;
} }
function cmtBbClose(id) { function cmtBbClose(comment, id) {
$(".comment-edit-bb-" + id).hide(); if($(comment).hasClass('comment-edit-text-empty')) {
$(".comment-edit-bb-" + id).hide();
return true;
}
return false;
} }
$(document).ready(function() { $(document).ready(function() {
@ -96,4 +104,4 @@ $('.savedsearchterm').hover(
</script> </script>
EOT; EOT;
} }

11
view/theme/duepuntozero/comment_item.tpl
View File

@ -1,10 +1,9 @@
{{ if $threaded }}
<div class="comment-wwedit-wrapper threaded" id="comment-edit-wrapper-$id" style="display: block;">
{{ else }}
<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;"> <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
{{ if $threaded }} {{ endif }}
<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;">
{{ else }}
<form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;"> <form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
{{ endif }}
<input type="hidden" name="type" value="$type" /> <input type="hidden" name="type" value="$type" />
<input type="hidden" name="profile_uid" value="$profile_uid" /> <input type="hidden" name="profile_uid" value="$profile_uid" />
<input type="hidden" name="parent" value="$parent" /> <input type="hidden" name="parent" value="$parent" />
@ -43,7 +42,7 @@
onclick="insertFormatting('$comment','video', $id);"></a></li> onclick="insertFormatting('$comment','video', $id);"></a></li>
</ul> </ul>
<div class="comment-edit-bb-end"></div> <div class="comment-edit-bb-end"></div>
<textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea> <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen(this, $id);" onBlur="commentClose(this,$id);cmtBbClose(this,$id);" >$comment</textarea>
{{ if $qcomment }} {{ if $qcomment }}
<select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" > <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
<option value=""></option> <option value=""></option>

18
view/theme/duepuntozero/style.css
View File

@ -932,7 +932,6 @@ input#dfrn-url {
position: relative; position: relative;
-moz-border-radius: 3px; -moz-border-radius: 3px;
border-radius: 3px; border-radius: 3px;
} }
.tread-wrapper .tread-wrapper { .tread-wrapper .tread-wrapper {
@ -1196,6 +1195,10 @@ input#dfrn-url {
width: 100px; width: 100px;
float: left; float: left;
} }
.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-photo {
width: 40px;
}
.comment-edit-photo img { .comment-edit-photo img {
width: 25px; width: 25px;
} }
@ -1215,6 +1218,10 @@ input#dfrn-url {
margin: 10px 0px 10px 110px; margin: 10px 0px 10px 110px;
} }
.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-submit-wrapper > .comment-edit-submit {
margin-left: 50px;
}
#profile-jot-plugin-wrapper, #profile-jot-plugin-wrapper,
#profile-jot-submit-wrapper { #profile-jot-submit-wrapper {
margin-top: 15px; margin-top: 15px;
@ -1758,12 +1765,16 @@ input#dfrn-url {
.comment-edit-text-empty { .comment-edit-text-empty {
color: gray; color: gray;
height: 30px; height: 5em;
width: 175px; width: 175px;
overflow: auto; overflow: auto;
margin-bottom: 10px; margin-bottom: 10px;
} }
.comment-wwedit-wrapper.threaded > .comment-edit-form > .comment-edit-text-empty {
height: 1.5em;
}
.comment-edit-text-full { .comment-edit-text-full {
color: black; color: black;
height: 150px; height: 150px;
@ -3046,7 +3057,8 @@ aside input[type='text'] {
[class^="comment-edit-bb"] { [class^="comment-edit-bb"] {
list-style: none; list-style: none;
display: none; display: none;
margin: 0px 0 -5px 60px; margin: 0px 0 -5px 0px;
padding: 0px;
width: 75%; width: 75%;
} }
[class^="comment-edit-bb"] > li { [class^="comment-edit-bb"] > li {

14
view/theme/duepuntozero/theme.php
View File

@ -34,11 +34,19 @@ function insertFormatting(comment,BBcode,id) {
return true; return true;
} }
function cmtBbOpen(id) { function cmtBbOpen(comment, id) {
$(".comment-edit-bb-" + id).show(); if($(comment).hasClass('comment-edit-text-full')) {
$(".comment-edit-bb-" + id).show();
return true;
}
return false;
} }
function cmtBbClose(comment, id) { function cmtBbClose(comment, id) {
$(".comment-edit-bb-" + id).hide(); if($(comment).hasClass('comment-edit-text-empty')) {
$(".comment-edit-bb-" + id).hide();
return true;
}
return false;
} }
$(document).ready(function() { $(document).ready(function() {

4
view/wall_thread.tpl
View File

@ -6,7 +6,11 @@
{{endif}} {{endif}}
<div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel"> <div id="tread-wrapper-$item.id" class="tread-wrapper $item.toplevel">
<a name="$item.id" ></a> <a name="$item.id" ></a>
{{ if $item.threaded }}
<div class="wall-item-outside-wrapper $item.indent$item.previewing threaded" id="wall-item-outside-wrapper-$item.id" >
{{ else }}
<div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" > <div class="wall-item-outside-wrapper $item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
{{ endif }}
<div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" > <div class="wall-item-content-wrapper $item.indent" id="wall-item-content-wrapper-$item.id" >
<div class="wall-item-info" id="wall-item-info-$item.id"> <div class="wall-item-info" id="wall-item-info-$item.id">
<div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id"