aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2017-08-03 21:59:46 +0200
committergit-marijus <mario@mariovavti.com>2017-08-03 21:59:46 +0200
commita618f70f56efdcaaf9da6dcfcab9cce6a933303b (patch)
treed363935c303b53f4b82a15b523259c53bb3cd2a6 /view
parent9566eab934f0a13a892af7b70a79429949a01c3f (diff)
parentd06ce6294d8bbf6bed668e7f0f363fcad63f4e05 (diff)
downloadvolse-hubzilla-a618f70f56efdcaaf9da6dcfcab9cce6a933303b.tar.gz
volse-hubzilla-a618f70f56efdcaaf9da6dcfcab9cce6a933303b.tar.bz2
volse-hubzilla-a618f70f56efdcaaf9da6dcfcab9cce6a933303b.zip
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'view')
-rw-r--r--view/js/main.js1
-rw-r--r--view/theme/redbasic/css/style.css3
-rwxr-xr-xview/tpl/conv_item.tpl1
-rwxr-xr-xview/tpl/jot-header.tpl3
-rwxr-xr-xview/tpl/search_item.tpl1
5 files changed, 7 insertions, 2 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 54450858a..aaadff99b 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -149,6 +149,7 @@ function insertCommentURL(comment, id) {
textarea = document.getElementById("comment-edit-text-" +id);
textarea.value = textarea.value + data;
+ preview_comment(id);
$('body').css('cursor', 'auto');
});
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index fd2ceb2c9..37277b612 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -251,8 +251,7 @@ footer {
margin-top: 15px;
}
-.preview {
- background: url('../img/gray_and_white_diagonal_stripes_background_seamless.gif');
+.preview-indicator {
}
#theme-preview {
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 36cb4cc83..663b02890 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -39,6 +39,7 @@
</div>
{{/if}}
<div class="wall-item-author">
+ {{if $item.previewing}}<span class="preview-indicator"><i class="fa fa-eye" title="{{$item.preview_lbl}}"></i></span>&nbsp;{{/if}}
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
</div>
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">
diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl
index d8f296aa4..815d17c3c 100755
--- a/view/tpl/jot-header.tpl
+++ b/view/tpl/jot-header.tpl
@@ -126,6 +126,7 @@ function enableOnUser(){
$('#jot-media').val($('#jot-media').val() + data.result.message);
},
stop: function(e,data) {
+ preview_post();
$('#profile-rotator').spin(false);
},
});
@@ -175,6 +176,7 @@ function enableOnUser(){
$('#profile-rotator').spin('tiny');
$.get('{{$baseurl}}/linkinfo?f=&binurl=' + reply, function(data) {
addeditortext(data);
+ preview_post();
$('#profile-rotator').spin(false);
});
}
@@ -421,6 +423,7 @@ function enableOnUser(){
function(ddata) {
if (ddata['status']) {
addeditortext(ddata['photolink']);
+ preview_post();
} else {
window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
}
diff --git a/view/tpl/search_item.tpl b/view/tpl/search_item.tpl
index 4ca6378b8..28667eb58 100755
--- a/view/tpl/search_item.tpl
+++ b/view/tpl/search_item.tpl
@@ -32,6 +32,7 @@
</div>
{{/if}}
<div class="wall-item-author">
+ {{if $item.previewing}}<span class="preview-indicator"><i class="fa fa-eye" title="{{$item.preview_lbl}}"></i></span>&nbsp;{{/if}}
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}}&nbsp;{{$item.via}}&nbsp;<a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
</div>
<div class="wall-item-ago" id="wall-item-ago-{{$item.id}}">