From e80d69d25b816cda36e2c772db2805f2dc744bbe Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 11 Aug 2012 18:54:23 -0700 Subject: merge upstream --- view/theme/comix-plain/search_item.tpl | 6 +-- view/theme/comix-plain/wall_item.tpl | 8 ++-- view/theme/comix-plain/wallwall_item.tpl | 8 ++-- view/theme/comix/search_item.tpl | 6 +-- view/theme/comix/wall_item.tpl | 8 ++-- view/theme/comix/wallwall_item.tpl | 8 ++-- view/theme/dispy/search_item.tpl | 6 +-- view/theme/dispy/wall_item.tpl | 6 +-- view/theme/dispy/wallwall_item.tpl | 6 +-- view/theme/quattro/dark/style.css | 13 +++---- view/theme/quattro/green/style.css | 13 +++---- view/theme/quattro/quattro.less | 15 ++++---- view/theme/quattro/theme.php | 16 ++++++-- view/theme/quattro/tpl/comment_item.tpl | 13 ++++--- view/theme/quattro/tpl/threaded_conversation.tpl | 2 + view/theme/quattro/tpl/wall_item_tag.tpl | 8 ++-- view/theme/quattro/tpl/wall_thread.tpl | 47 ++++++++++++++++-------- view/theme/quattro/tpl/wallwall_thread.tpl | 45 ++++++++++++++++------- view/tpl/head.tpl | 4 ++ view/tpl/search_item.tpl | 6 +-- view/tpl/wall_item.tpl | 6 +-- view/tpl/wall_thread.tpl | 15 +++++--- view/tpl/wallwall_item.tpl | 6 +-- view/tpl/wallwall_thread.tpl | 20 +++++----- 24 files changed, 174 insertions(+), 117 deletions(-) (limited to 'view') diff --git a/view/theme/comix-plain/search_item.tpl b/view/theme/comix-plain/search_item.tpl index dba289031..828e1065b 100644 --- a/view/theme/comix-plain/search_item.tpl +++ b/view/theme/comix-plain/search_item.tpl @@ -1,5 +1,5 @@ -
-
+
+
-
+
diff --git a/view/theme/comix-plain/wall_item.tpl b/view/theme/comix-plain/wall_item.tpl index dfcd8ca96..0ef70cf8b 100644 --- a/view/theme/comix-plain/wall_item.tpl +++ b/view/theme/comix-plain/wall_item.tpl @@ -1,11 +1,11 @@ -
-
+
+
- $item.name + $item.name menu
@@ -74,5 +74,5 @@ $item.comment
-
+
diff --git a/view/theme/comix-plain/wallwall_item.tpl b/view/theme/comix-plain/wallwall_item.tpl index abd5967b2..4c5b12087 100644 --- a/view/theme/comix-plain/wallwall_item.tpl +++ b/view/theme/comix-plain/wallwall_item.tpl @@ -1,5 +1,5 @@ -
-
+
+
diff --git a/view/theme/comix/search_item.tpl b/view/theme/comix/search_item.tpl index dba289031..828e1065b 100644 --- a/view/theme/comix/search_item.tpl +++ b/view/theme/comix/search_item.tpl @@ -1,5 +1,5 @@ -
-
+
+
-
+
diff --git a/view/theme/comix/wall_item.tpl b/view/theme/comix/wall_item.tpl index dfcd8ca96..0ef70cf8b 100644 --- a/view/theme/comix/wall_item.tpl +++ b/view/theme/comix/wall_item.tpl @@ -1,11 +1,11 @@ -
-
+
+
- $item.name + $item.name menu
@@ -74,5 +74,5 @@ $item.comment
-
+
diff --git a/view/theme/comix/wallwall_item.tpl b/view/theme/comix/wallwall_item.tpl index abd5967b2..4c5b12087 100644 --- a/view/theme/comix/wallwall_item.tpl +++ b/view/theme/comix/wallwall_item.tpl @@ -1,5 +1,5 @@ -
-
+
+
diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl index bfad1b7b7..35572caa0 100644 --- a/view/theme/dispy/search_item.tpl +++ b/view/theme/dispy/search_item.tpl @@ -1,5 +1,5 @@ -
-
+
+
-
+
diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index 8d6f258e6..d5cc7f16c 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -1,6 +1,6 @@ -
-
+
+
-
+
diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index f5187b710..63c8a2e96 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -1,6 +1,6 @@ -
-
+
+
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index d397a9305..17ee6576d 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -1072,6 +1072,7 @@ section { width: 710px; border: 1px solid #2d2d2d; margin-top: 10px; + background-color: #fce94f; } .comment-edit-preview .contact-photo { width: 32px; @@ -1965,25 +1966,23 @@ footer { opacity: 0.3; filter: alpha(opacity=30); } -[class^="comment-edit-bb"] { +.comment-edit-bb { list-style: none; display: none; - margin: 0px 0 0px 60px; + margin: 0px; + padding: 0px; width: 75%; } -[class^="comment-edit-bb"] > li { +.comment-edit-bb > li { display: inline-block; margin: 10px 10px 0 0; visibility: none; } -[class^="comment-edit-bb-end"] { - clear: both; -} .editicon { display: inline-block; width: 16px; height: 16px; - background-image: url(bbedit.png); + background-image: url(icons/bbedit.png); text-decoration: none; } .editicon :hover { diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index fdab77eb7..10cff53fd 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -1072,6 +1072,7 @@ section { width: 710px; border: 1px solid #2d2d2d; margin-top: 10px; + background-color: #ddffdd; } .comment-edit-preview .contact-photo { width: 32px; @@ -1965,25 +1966,23 @@ footer { opacity: 0.3; filter: alpha(opacity=30); } -[class^="comment-edit-bb"] { +.comment-edit-bb { list-style: none; display: none; - margin: 0px 0 0px 60px; + margin: 0px; + padding: 0px; width: 75%; } -[class^="comment-edit-bb"] > li { +.comment-edit-bb > li { display: inline-block; margin: 10px 10px 0 0; visibility: none; } -[class^="comment-edit-bb-end"] { - clear: both; -} .editicon { display: inline-block; width: 16px; height: 16px; - background-image: url(bbedit.png); + background-image: url(icons/bbedit.png); text-decoration: none; } .editicon :hover { diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index a3ab8107b..ad1262d48 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -532,6 +532,7 @@ section { color: @CommentBoxFullColor; border: 1px solid @CommentBoxFullBorderColor; } + } .threaded .wall-item-comment-wrapper { margin-left: 0px; } @@ -540,6 +541,7 @@ section { width: 710px; border: 1px solid @Grey5; margin-top: 10px; + background-color: @JotPreviewBackgroundColor; .contact-photo { width: 32px; height: 32px; margin-left: 16px; /*background: url(../../../images/icons/22/user.png) no-repeat center center;*/ @@ -1328,25 +1330,24 @@ footer { height: 100px; display: table-row; } /* edit buttons for comments */ .icon.dim { opacity: 0.3;filter:alpha(opacity=30); } -[class^="comment-edit-bb"] { +.comment-edit-bb { list-style: none; display: none; - margin: 0px 0 0px 60px; + margin: 0px; + padding: 0px; width: 75%; } -[class^="comment-edit-bb"] > li { +.comment-edit-bb > li { display: inline-block; margin: 10px 10px 0 0; visibility: none; } -[class^="comment-edit-bb-end"] { - clear: both; -} + .editicon { display: inline-block; width: 16px; height: 16px; - background-image: url(bbedit.png); + background-image: url(icons/bbedit.png); text-decoration: none; :hover {background-color: #ccc;} } diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php index 5cb373eef..1c986e4c8 100644 --- a/view/theme/quattro/theme.php +++ b/view/theme/quattro/theme.php @@ -42,11 +42,21 @@ function insertFormatting(comment,BBcode,id) { return true; } +function showThread(id) { + $("#collapsed-comments-" + id).show() + $("#collapsed-comments-" + id + " .collapsed-comments").show() +} +function hideThread(id) { + $("#collapsed-comments-" + id).hide() + $("#collapsed-comments-" + id + " .collapsed-comments").hide() +} + + function cmtBbOpen(id) { - $(".comment-edit-bb-" + id).show(); + $("#comment-edit-bb-" + id).show(); } -function cmtBbClose(comment, id) { - $(".comment-edit-bb-" + id).hide(); +function cmtBbClose(id) { + $("#comment-edit-bb-" + id).hide(); } $(document).ready(function() { diff --git a/view/theme/quattro/tpl/comment_item.tpl b/view/theme/quattro/tpl/comment_item.tpl index ea24d95cc..7d1d7550b 100644 --- a/view/theme/quattro/tpl/comment_item.tpl +++ b/view/theme/quattro/tpl/comment_item.tpl @@ -10,8 +10,8 @@ -
-
    +
      • @@ -37,8 +37,11 @@ style="cursor: pointer;" title="$edvideo" onclick="insertFormatting('$comment','video', $id);">
    -
    - + {{ if $qcomment }} {{ endif }} -
    -
diff --git a/view/theme/quattro/tpl/threaded_conversation.tpl b/view/theme/quattro/tpl/threaded_conversation.tpl index 491c47302..13c38acb2 100644 --- a/view/theme/quattro/tpl/threaded_conversation.tpl +++ b/view/theme/quattro/tpl/threaded_conversation.tpl @@ -1,6 +1,8 @@ {{ for $threads as $item }} +
+ {{ if $item.type == tag }} {{ inc wall_item_tag.tpl }}{{ endinc }} {{ else }} diff --git a/view/theme/quattro/tpl/wall_item_tag.tpl b/view/theme/quattro/tpl/wall_item_tag.tpl index 205fcfebc..e1ef93213 100644 --- a/view/theme/quattro/tpl/wall_item_tag.tpl +++ b/view/theme/quattro/tpl/wall_item_tag.tpl @@ -1,3 +1,5 @@ +{{ if $item.thread_level!=1 }}
{{ endif }} +
@@ -18,8 +20,8 @@
+{{ if $item.thread_level!=1 }}
{{ endif }} + {{ if $item.flatten }} -
- $item.comment -
+
$item.comment
{{ endif }} diff --git a/view/theme/quattro/tpl/wall_thread.tpl b/view/theme/quattro/tpl/wall_thread.tpl index 4d454f00d..01738b666 100644 --- a/view/theme/quattro/tpl/wall_thread.tpl +++ b/view/theme/quattro/tpl/wall_thread.tpl @@ -2,12 +2,24 @@ {{ else }} {{if $item.comment_firstcollapsed}}
- $item.num_comments $item.hide_text + $item.num_comments + $item.hide_text + {{ if $item.thread_level==3 }} - + expand / + collapse thread{{ endif }}
{{ endif }} + + {{if $mode == display}} {{ else }} {{if $item.comment_lastcollapsed}}
{{endif}} {{ endif }} +{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} +
$item.comment
+{{ endif }}{{ endif }}{{ endif }} + + {{ if $item.flatten }} -
- $item.comment -
+
$item.comment
{{ endif }} diff --git a/view/theme/quattro/tpl/wallwall_thread.tpl b/view/theme/quattro/tpl/wallwall_thread.tpl index cc2f8e362..93a8838eb 100644 --- a/view/theme/quattro/tpl/wallwall_thread.tpl +++ b/view/theme/quattro/tpl/wallwall_thread.tpl @@ -2,12 +2,25 @@ {{ else }} {{if $item.comment_firstcollapsed}}
- $item.num_comments $item.hide_text + $item.num_comments + $item.hide_text + {{ if $item.thread_level==3 }} - + expand / + collapse thread{{ endif }}
{{ endif }} + + {{if $mode == display}} {{ else }} {{if $item.comment_lastcollapsed}}
{{endif}} {{ endif }} +{{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} +
$item.comment
+{{ endif }}{{ endif }}{{ endif }} + + {{ if $item.flatten }} -
- $item.comment -
+
$item.comment
{{ endif }} diff --git a/view/tpl/head.tpl b/view/tpl/head.tpl index 08fe8303a..ba2850c0e 100644 --- a/view/tpl/head.tpl +++ b/view/tpl/head.tpl @@ -29,7 +29,9 @@ $head_js $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); $("#mod-cmnt-wrap-" + id).show(); openMenu("comment-edit-submit-wrapper-" + id); + return true; } + return false; } function commentClose(obj,id) { if(obj.value == '') { @@ -38,7 +40,9 @@ $head_js $("#comment-edit-text-" + id).addClass("comment-edit-text-empty"); $("#mod-cmnt-wrap-" + id).hide(); closeMenu("comment-edit-submit-wrapper-" + id); + return true; } + return false; } function showHideCommentBox(id) { diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl index dc4a43c6a..b0c7f3c28 100644 --- a/view/tpl/search_item.tpl +++ b/view/tpl/search_item.tpl @@ -1,6 +1,6 @@ -
-
+
+
-
+
diff --git a/view/tpl/wall_item.tpl b/view/tpl/wall_item.tpl index 458677433..9b4d584c0 100644 --- a/view/tpl/wall_item.tpl +++ b/view/tpl/wall_item.tpl @@ -1,6 +1,6 @@ -
-
+
+
-
+
diff --git a/view/tpl/wall_thread.tpl b/view/tpl/wall_thread.tpl index 600f755b1..6f7ced7fe 100644 --- a/view/tpl/wall_thread.tpl +++ b/view/tpl/wall_thread.tpl @@ -73,18 +73,20 @@
{{ if $item.drop.dropping }}{{ endif }}
+
+
+
+ +
$item.dislike
+ {{ if $item.threaded }} {{ if $item.comment }} -
+
$item.comment
{{ endif }} {{ endif }} -
-
-
- -
$item.dislike
+
{{ for $item.children as $item }} @@ -98,3 +100,4 @@ {{ endif }}
{{if $item.comment_lastcollapsed}}
{{endif}} + diff --git a/view/tpl/wallwall_item.tpl b/view/tpl/wallwall_item.tpl index 983c03287..e614d936e 100644 --- a/view/tpl/wallwall_item.tpl +++ b/view/tpl/wallwall_item.tpl @@ -1,6 +1,6 @@ -