aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme')
-rw-r--r--view/theme/dispy/dark/style.css2
-rw-r--r--view/theme/dispy/dark/style.less4
-rw-r--r--view/theme/dispy/light/style.css2
-rw-r--r--view/theme/dispy/light/style.less4
-rw-r--r--view/theme/quattro/comment_item.tpl37
-rw-r--r--view/theme/quattro/dark/style.css112
-rw-r--r--view/theme/quattro/green/style.css112
-rw-r--r--view/theme/quattro/quattro.less122
-rw-r--r--view/theme/quattro/theme.php87
9 files changed, 434 insertions, 48 deletions
diff --git a/view/theme/dispy/dark/style.css b/view/theme/dispy/dark/style.css
index 82118275a..b94e5ec34 100644
--- a/view/theme/dispy/dark/style.css
+++ b/view/theme/dispy/dark/style.css
@@ -230,7 +230,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-info{width:5em;}
.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;}
.wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;}
-.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:4,5em;top:4em;background-position:35px center;}
+.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:3.35em;top:3.2em;background-position:35px center;}
.wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;}
.wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:4.5em;top:5.5em;}
.comment-wwedit-wrapper{border:1px solid #eeeecc;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:5px;}
diff --git a/view/theme/dispy/dark/style.less b/view/theme/dispy/dark/style.less
index 0617aaced..c15706c36 100644
--- a/view/theme/dispy/dark/style.less
+++ b/view/theme/dispy/dark/style.less
@@ -1537,8 +1537,8 @@ nav #nav-notifications-linkmenu {
.box(40px, 40px);
}
.wall-item-photo-menu-button {
- width: 4,5em;
- top: 4em;
+ width: 3.35em;
+ top: 3.2em;
background-position: 35px center;
}
.wall-item-author {
diff --git a/view/theme/dispy/light/style.css b/view/theme/dispy/light/style.css
index e56696eab..0e7fc1f8d 100644
--- a/view/theme/dispy/light/style.css
+++ b/view/theme/dispy/light/style.css
@@ -230,7 +230,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify,nav #nav-notifications-linkm
.wall-item-outside-wrapper.comment{margin-left:5em;}.wall-item-outside-wrapper.comment .wall-item-info{width:5em;}
.wall-item-outside-wrapper.comment .wall-item-photo{width:40px !important;height:40px !important;}
.wall-item-outside-wrapper.comment .wall-item-photo-wrapper{width:40px;height:40px;}
-.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:4,5em;top:4em;background-position:35px center;}
+.wall-item-outside-wrapper.comment .wall-item-photo-menu-button{width:3.35em;top:3.2em;background-position:35px center;}
.wall-item-outside-wrapper.comment .wall-item-author{margin-left:0.2em;}
.wall-item-outside-wrapper.comment .wall-item-photo-menu{min-width:4.5em;top:5.5em;}
.comment-wwedit-wrapper{border:1px solid #111111;-o-border-radius:5px;-webkit-border-radius:5px;-moz-border-radius:5px;-ms-border-radius:5px;border-radius:5px;margin:5px;}
diff --git a/view/theme/dispy/light/style.less b/view/theme/dispy/light/style.less
index 72b3069a6..ba8e0093b 100644
--- a/view/theme/dispy/light/style.less
+++ b/view/theme/dispy/light/style.less
@@ -1538,8 +1538,8 @@ nav #nav-notifications-linkmenu {
.box(40px, 40px);
}
.wall-item-photo-menu-button {
- width: 4,5em;
- top: 4em;
+ width: 3.35em;
+ top: 3.2em;
background-position: 35px center;
}
.wall-item-author {
diff --git a/view/theme/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl
index cde4ca3ca..ea24d95cc 100644
--- a/view/theme/quattro/comment_item.tpl
+++ b/view/theme/quattro/comment_item.tpl
@@ -11,13 +11,42 @@
<a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a>
</div>
<div class="comment-edit-photo-end"></div>
+ <ul class="comment-edit-bb-$id">
+ <li><a class="editicon boldbb shadow"
+ style="cursor: pointer;" title="$edbold"
+ onclick="insertFormatting('$comment','b', $id);"></a></li>
+ <li><a class="editicon italicbb shadow"
+ style="cursor: pointer;" title="$editalic"
+ onclick="insertFormatting('$comment','i', $id);"></a></li>
+ <li><a class="editicon underlinebb shadow"
+ style="cursor: pointer;" title="$eduline"
+ onclick="insertFormatting('$comment','u', $id);"></a></li>
+ <li><a class="editicon quotebb shadow"
+ style="cursor: pointer;" title="$edquote"
+ onclick="insertFormatting('$comment','quote', $id);"></a></li>
+ <li><a class="editicon codebb shadow"
+ style="cursor: pointer;" title="$edcode"
+ onclick="insertFormatting('$comment','code', $id);"></a></li>
+ <li><a class="editicon imagebb shadow"
+ style="cursor: pointer;" title="$edimg"
+ onclick="insertFormatting('$comment','img', $id);"></a></li>
+ <li><a class="editicon urlbb shadow"
+ style="cursor: pointer;" title="$edurl"
+ onclick="insertFormatting('$comment','url', $id);"></a></li>
+ <li><a class="editicon videobb shadow"
+ style="cursor: pointer;" title="$edvideo"
+ onclick="insertFormatting('$comment','video', $id);"></a></li>
+ </ul>
+ <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>
{{ if $qcomment }}
- {{ for $qcomment as $qc }}
- <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
- &nbsp;
+ <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+ <option value=""></option>
+ {{ for $qcomment as $qc }}
+ <option value="$qc">$qc</option>
{{ endfor }}
+ </select>
{{ endif }}
- <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea>
<div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index d59ace8e3..803a2c2f7 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -1706,7 +1706,7 @@ footer {
margin-bottom: 5px;
clear: left;
}
-#adminpage .plugin .desc {
+#adminpage .plugin desc {
margin-left: 2.5em;
}
#adminpage .toggleplugin {
@@ -1721,16 +1721,118 @@ footer {
#adminpage table th {
text-align: left;
}
-#adminpage td .icon {
+#adminpage table td .icon {
float: left;
}
+#adminpage table tr:hover {
+ background-color: #bbc7d7;
+}
#adminpage table#users img {
width: 16px;
height: 16px;
}
-#adminpage table tr:hover {
- background-color: #bbc7d7;
-}
#adminpage .selectall {
text-align: right;
}
+/* edit buttons for comments */
+.icon.dim {
+ opacity: 0.3;
+ filter: alpha(opacity=30);
+}
+[class^="comment-edit-bb"] {
+ list-style: none;
+ display: none;
+ margin: 0px 0 0px 60px;
+ width: 75%;
+}
+[class^="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);
+ text-decoration: none;
+}
+.editicon :hover {
+ background-color: #ccc;
+}
+.boldbb {
+ background-position: 0px 0px;
+}
+.boldbb:hover {
+ background-position: 0px -16px;
+}
+.italicbb {
+ background-position: -16px 0px;
+}
+.italicbb:hover {
+ background-position: -16px -16px;
+}
+.underlinebb {
+ background-position: -32px 0px;
+}
+.underlinebb:hover {
+ background-position: -32px -16px;
+}
+.quotebb {
+ background-position: -48px 0px;
+}
+.quotebb:hover {
+ background-position: -48px -16px;
+}
+.codebb {
+ background-position: -64px 0px;
+}
+.codebb:hover {
+ background-position: -64px -16px;
+}
+.imagebb {
+ background-position: -80px 0px;
+}
+.imagebb:hover {
+ background-position: -80px -16px;
+}
+.urlbb {
+ background-position: -96px 0px;
+}
+.urlbb:hover {
+ background-position: -96px -16px;
+}
+.videobb {
+ background-position: -112px 0px;
+}
+.videobb:hover {
+ background-position: -112px -16px;
+}
+.attachtype {
+ display: block;
+ width: 20px;
+ height: 23px;
+ float: left;
+ background-image: url('../../../images/content-types.png');
+}
+.body-attach {
+ margin-top: 10px;
+}
+.type-video {
+ background-position: 0px 0px;
+}
+.type-image {
+ background-position: -20px 0px;
+}
+.type-audio {
+ background-position: -40px 0px;
+}
+.type-text {
+ background-position: -60px 0px;
+}
+.type-unkn {
+ background-position: -80px 0px;
+}
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index d764886c1..ecf4ff986 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -1706,7 +1706,7 @@ footer {
margin-bottom: 5px;
clear: left;
}
-#adminpage .plugin .desc {
+#adminpage .plugin desc {
margin-left: 2.5em;
}
#adminpage .toggleplugin {
@@ -1721,16 +1721,118 @@ footer {
#adminpage table th {
text-align: left;
}
-#adminpage td .icon {
+#adminpage table td .icon {
float: left;
}
+#adminpage table tr:hover {
+ background-color: #bbc7d7;
+}
#adminpage table#users img {
width: 16px;
height: 16px;
}
-#adminpage table tr:hover {
- background-color: #bbc7d7;
-}
#adminpage .selectall {
text-align: right;
}
+/* edit buttons for comments */
+.icon.dim {
+ opacity: 0.3;
+ filter: alpha(opacity=30);
+}
+[class^="comment-edit-bb"] {
+ list-style: none;
+ display: none;
+ margin: 0px 0 0px 60px;
+ width: 75%;
+}
+[class^="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);
+ text-decoration: none;
+}
+.editicon :hover {
+ background-color: #ccc;
+}
+.boldbb {
+ background-position: 0px 0px;
+}
+.boldbb:hover {
+ background-position: 0px -16px;
+}
+.italicbb {
+ background-position: -16px 0px;
+}
+.italicbb:hover {
+ background-position: -16px -16px;
+}
+.underlinebb {
+ background-position: -32px 0px;
+}
+.underlinebb:hover {
+ background-position: -32px -16px;
+}
+.quotebb {
+ background-position: -48px 0px;
+}
+.quotebb:hover {
+ background-position: -48px -16px;
+}
+.codebb {
+ background-position: -64px 0px;
+}
+.codebb:hover {
+ background-position: -64px -16px;
+}
+.imagebb {
+ background-position: -80px 0px;
+}
+.imagebb:hover {
+ background-position: -80px -16px;
+}
+.urlbb {
+ background-position: -96px 0px;
+}
+.urlbb:hover {
+ background-position: -96px -16px;
+}
+.videobb {
+ background-position: -112px 0px;
+}
+.videobb:hover {
+ background-position: -112px -16px;
+}
+.attachtype {
+ display: block;
+ width: 20px;
+ height: 23px;
+ float: left;
+ background-image: url('../../../images/content-types.png');
+}
+.body-attach {
+ margin-top: 10px;
+}
+.type-video {
+ background-position: 0px 0px;
+}
+.type-image {
+ background-position: -20px 0px;
+}
+.type-audio {
+ background-position: -40px 0px;
+}
+.type-text {
+ background-position: -60px 0px;
+}
+.type-unkn {
+ background-position: -80px 0px;
+}
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index ce03dd6da..9099f0be1 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -1163,53 +1163,123 @@ footer { height: 100px; display: table-row; }
padding: 0em 0.3em;
}
-#adminpage dl {
+#adminpage {
+ dl {
clear: left;
margin-bottom: 2px;
padding-bottom: 2px;
border-bottom: 1px solid black;
-}
-#adminpage dt {
+ }
+ dt {
width: 200px;
float: left;
font-weight: bold;
-}
-#adminpage dd {
+ }
+ dd {
margin-left: 200px;
-}
-
-#adminpage h3 {
+ }
+ h3 {
border-bottom: 1px solid #cccccc;
-}
-#adminpage .field label {
+ }
+ .field label {
font-weight: bold;
-}
-#adminpage .submit {
+ }
+ .submit {
clear:left;
text-align: right;
-}
-
-#adminpage #pluginslist {
+ }
+ #pluginslist {
margin: 0px; padding: 0px;
-}
-#adminpage .plugin {
+ }
+ .plugin {
list-style: none;
display: block;
border: 1px solid #888888;
padding: 1em;
margin-bottom: 5px;
clear: left;
-}
-#adminpage .plugin .desc { margin-left: 2.5em;}
-#adminpage .toggleplugin {
+ desc {
+ margin-left: 2.5em;
+ }
+ }
+ .toggleplugin {
float:left;
margin-right: 1em;
+ }
+ table {
+ width:100%;
+ border-bottom: 1px solid #000000;
+ margin: 5px 0px;
+ th {
+ text-align: left;
+ }
+ td .icon {
+ float: left;
+ }
+ tr:hover {
+ background-color: #bbc7d7;
+ }
+ }
+ table#users img {
+ width: 16px; height: 16px;
+ }
+ .selectall { text-align: right; }
+}
+
+/* edit buttons for comments */
+
+.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
+[class^="comment-edit-bb"] {
+ list-style: none;
+ display: none;
+ margin: 0px 0 0px 60px;
+ width: 75%;
+}
+[class^="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);
+ text-decoration: none;
+ :hover {background-color: #ccc;}
+}
+.boldbb { background-position: 0px 0px; }
+.boldbb:hover { background-position: 0px -16px; }
+.italicbb { background-position: -16px 0px; }
+.italicbb:hover { background-position: -16px -16px; }
+.underlinebb { background-position: -32px 0px; }
+.underlinebb:hover { background-position: -32px -16px; }
+.quotebb { background-position: -48px 0px; }
+.quotebb:hover { background-position: -48px -16px; }
+.codebb { background-position: -64px 0px; }
+.codebb:hover { background-position: -64px -16px; }
+.imagebb { background-position: -80px 0px; }
+.imagebb:hover { background-position: -80px -16px; }
+.urlbb { background-position: -96px 0px; }
+.urlbb:hover { background-position: -96px -16px; }
+.videobb { background-position: -112px 0px; }
+.videobb:hover { background-position: -112px -16px; }
+
+.attachtype {
+ display: block; width: 20px; height: 23px;
+ float: left;
+ background-image: url('../../../images/content-types.png');
}
-#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;}
-#adminpage table th { text-align: left;}
-#adminpage td .icon { float: left;}
-#adminpage table#users img { width: 16px; height: 16px; }
-#adminpage table tr:hover { background-color: #bbc7d7; }
-#adminpage .selectall { text-align: right; }
+.body-attach {
+ margin-top: 10px;
+}
+.type-video { background-position: 0px 0px; }
+.type-image { background-position: -20px 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text { background-position: -60px 0px; }
+.type-unkn { background-position: -80px 0px; }
diff --git a/view/theme/quattro/theme.php b/view/theme/quattro/theme.php
index 0a13c2035..5cb373eef 100644
--- a/view/theme/quattro/theme.php
+++ b/view/theme/quattro/theme.php
@@ -7,6 +7,89 @@
* Maintainer: Tobias <https://diekershoff.homeunix.net/friendika/profile/tobias>
*/
- $a->theme_info = array();
-
+$a->theme_info = array();
+
+function quattro_init(&$a) {
+$a->page['htmlhead'] .= <<< EOT
+<script>
+function insertFormatting(comment,BBcode,id) {
+
+ var tmpStr = $("#comment-edit-text-" + id).val();
+ if(tmpStr == comment) {
+ 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);
+ $("#comment-edit-text-" + id).val(tmpStr);
+ }
+
+ textarea = document.getElementById("comment-edit-text-" +id);
+ if (document.selection) {
+ textarea.focus();
+ selected = document.selection.createRange();
+ if (BBcode == "url"){
+ selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]";
+ } else
+ selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]";
+ } else if (textarea.selectionStart || textarea.selectionStart == "0") {
+ var start = textarea.selectionStart;
+ var end = textarea.selectionEnd;
+ if (BBcode == "url"){
+ textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + "http://" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+ } else
+ textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length);
+ }
+ return true;
+}
+
+function cmtBbOpen(id) {
+ $(".comment-edit-bb-" + id).show();
+}
+function cmtBbClose(comment, id) {
+ $(".comment-edit-bb-" + id).hide();
+}
+$(document).ready(function() {
+
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
+$('.group-edit-icon').hover(
+ function() {
+ $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+ function() {
+ $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+ );
+
+$('.sidebar-group-element').hover(
+ function() {
+ id = $(this).attr('id');
+ $('#edit-' + id).addClass('icon'); $('#edit-' + id).removeClass('iconspacer');},
+
+ function() {
+ id = $(this).attr('id');
+ $('#edit-' + id).removeClass('icon');$('#edit-' + id).addClass('iconspacer');}
+ );
+
+
+$('.savedsearchdrop').hover(
+ function() {
+ $(this).addClass('drop'); $(this).addClass('icon'); $(this).removeClass('iconspacer');},
+ function() {
+ $(this).removeClass('drop'); $(this).removeClass('icon'); $(this).addClass('iconspacer');}
+ );
+
+$('.savedsearchterm').hover(
+ function() {
+ id = $(this).attr('id');
+ $('#drop-' + id).addClass('icon'); $('#drop-' + id).addClass('drophide'); $('#drop-' + id).removeClass('iconspacer');},
+
+ function() {
+ id = $(this).attr('id');
+ $('#drop-' + id).removeClass('icon');$('#drop-' + id).removeClass('drophide'); $('#drop-' + id).addClass('iconspacer');}
+ );
+
+});
+
+</script>
+EOT;
+}