aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/de/jot-header.tpl24
-rw-r--r--view/en/jot-header.tpl23
-rw-r--r--view/fr/jot-header.tpl23
-rw-r--r--view/it/jot-header.tpl23
-rw-r--r--view/jot.tpl8
-rw-r--r--view/like.tpl1
-rw-r--r--view/like_noshare.tpl5
-rw-r--r--view/theme/duepuntozero/style.css18
-rw-r--r--view/theme/loozah/style.css20
9 files changed, 139 insertions, 6 deletions
diff --git a/view/de/jot-header.tpl b/view/de/jot-header.tpl
index 58403f1ba..62fbe84e4 100644
--- a/view/de/jot-header.tpl
+++ b/view/de/jot-header.tpl
@@ -104,6 +104,20 @@ tinyMCE.init({
}
}
+ function jotVideoURL() {
+ reply = prompt("Please enter a video(.ogg) link/URL:");
+ if(reply && reply.length) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+ }
+ }
+
+ function jotAudioURL() {
+ reply = prompt("Please enter an audio(.ogg) link/URL:");
+ if(reply && reply.length) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+ }
+ }
+
function jotGetLocation() {
reply = prompt("Wo bist du im Moment?", $('#jot-location').val());
if(reply && reply.length) {
@@ -111,6 +125,16 @@ tinyMCE.init({
}
}
+ function jotShare(id) {
+ $('#like-rotator-' + id).show();
+ $.get('share/' + id, function(data) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,data);
+ $('#like-rotator-' + id).hide();
+ $(window).scrollTop(0);
+ });
+ }
+
+
function linkdropper(event) {
var linkFound = event.dataTransfer.types.contains("text/uri-list");
diff --git a/view/en/jot-header.tpl b/view/en/jot-header.tpl
index fe818410e..d73fe7d62 100644
--- a/view/en/jot-header.tpl
+++ b/view/en/jot-header.tpl
@@ -104,6 +104,21 @@ tinyMCE.init({
}
}
+ function jotVideoURL() {
+ reply = prompt("Please enter a video(.ogg) link/URL:");
+ if(reply && reply.length) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+ }
+ }
+
+ function jotAudioURL() {
+ reply = prompt("Please enter an audio(.ogg) link/URL:");
+ if(reply && reply.length) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+ }
+ }
+
+
function jotGetLocation() {
reply = prompt("Where are you right now?", $('#jot-location').val());
if(reply && reply.length) {
@@ -111,6 +126,14 @@ tinyMCE.init({
}
}
+ function jotShare(id) {
+ $('#like-rotator-' + id).show();
+ $.get('share/' + id, function(data) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,data);
+ $('#like-rotator-' + id).hide();
+ $(window).scrollTop(0);
+ });
+ }
function linkdropper(event) {
var linkFound = event.dataTransfer.types.contains("text/uri-list");
diff --git a/view/fr/jot-header.tpl b/view/fr/jot-header.tpl
index ff7e543a5..b1b6dacf0 100644
--- a/view/fr/jot-header.tpl
+++ b/view/fr/jot-header.tpl
@@ -103,6 +103,20 @@ tinyMCE.init({
}
}
+ function jotVideoURL() {
+ reply = prompt("Please enter a video(.ogg) link/URL:");
+ if(reply && reply.length) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+ }
+ }
+
+ function jotAudioURL() {
+ reply = prompt("Please enter an audio(.ogg) link/URL:");
+ if(reply && reply.length) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+ }
+ }
+
function jotGetLocation() {
reply = prompt("Where are you right now?", $('#jot-location').val());
if(reply && reply.length) {
@@ -110,6 +124,15 @@ tinyMCE.init({
}
}
+ function jotShare(id) {
+ $('#like-rotator-' + id).show();
+ $.get('share/' + id, function(data) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,data);
+ $('#like-rotator-' + id).hide();
+ $(window).scrollTop(0);
+ });
+ }
+
function linkdropper(event) {
var linkFound = event.dataTransfer.types.contains("text/uri-list");
diff --git a/view/it/jot-header.tpl b/view/it/jot-header.tpl
index 117cd1651..8ca5a0717 100644
--- a/view/it/jot-header.tpl
+++ b/view/it/jot-header.tpl
@@ -104,6 +104,20 @@ tinyMCE.init({
}
}
+ function jotVideoURL() {
+ reply = prompt("Please enter a video(.ogg) link/URL:");
+ if(reply && reply.length) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,'[video]' + reply + '[/video]');
+ }
+ }
+
+ function jotAudioURL() {
+ reply = prompt("Please enter an audio(.ogg) link/URL:");
+ if(reply && reply.length) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,'[audio]' + reply + '[/audio]');
+ }
+ }
+
function jotGetLocation() {
reply = prompt("Dove ti trovi ora?", $('#jot-location').val());
if(reply && reply.length) {
@@ -111,6 +125,15 @@ tinyMCE.init({
}
}
+ function jotShare(id) {
+ $('#like-rotator-' + id).show();
+ $.get('share/' + id, function(data) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,data);
+ $('#like-rotator-' + id).hide();
+ $(window).scrollTop(0);
+ });
+ }
+
function linkdropper(event) {
var linkFound = event.dataTransfer.types.contains("text/uri-list");
diff --git a/view/jot.tpl b/view/jot.tpl
index 68139ddc0..fd85b9267 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -26,7 +26,13 @@
<img id="profile-link" src="images/link-icon.gif" alt="$weblink" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink();" />
</div>
<div id="profile-youtube-wrapper" style="display: $visitor;" >
- <img id="profile-video" src="images/youtube_icon.gif" alt="$youtube" title="$youtube" onclick="jotGetVideo();" />
+ <img id="profile-youtube" src="images/youtube_icon.gif" alt="$youtube" title="$youtube" onclick="jotGetVideo();" />
+ </div>
+ <div id="profile-video-wrapper" style="display: $visitor;" >
+ <img id="profile-video" src="images/video.gif" alt="$video" title="$video" onclick="jotVideoURL();" />
+ </div>
+ <div id="profile-audio-wrapper" style="display: $visitor;" >
+ <img id="profile-audio" src="images/audio.gif" alt="$audio" title="$audio" onclick="jotAudioURL();" />
</div>
<div id="profile-location-wrapper" style="display: $visitor;" >
<img id="profile-location" src="images/globe.gif" alt="$setloc" title="$setloc" onclick="jotGetLocation();" />
diff --git a/view/like.tpl b/view/like.tpl
index e36a624a4..4f530407e 100644
--- a/view/like.tpl
+++ b/view/like.tpl
@@ -1,5 +1,6 @@
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
<img src="images/like.gif" alt="$likethis" title="$likethis" onclick="dolike($id,'like');" />
<img src="images/dislike.gif" alt="$nolike" title="$nolike" onclick="dolike($id,'dislike');" />
+ <img src="images/share.gif" alt="$share" title="$share" class="wall-item-share-buttons" onclick="jotShare($id);" />
<img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
</div>
diff --git a/view/like_noshare.tpl b/view/like_noshare.tpl
new file mode 100644
index 000000000..e36a624a4
--- /dev/null
+++ b/view/like_noshare.tpl
@@ -0,0 +1,5 @@
+<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
+ <img src="images/like.gif" alt="$likethis" title="$likethis" onclick="dolike($id,'like');" />
+ <img src="images/dislike.gif" alt="$nolike" title="$nolike" onclick="dolike($id,'dislike');" />
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+ </div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 54a522881..ce75655fb 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -206,8 +206,10 @@ div.wall-item-content-wrapper.shiny {
/* from default */
#jot-perms-icon,
#profile-location,
-#profile-nolocation,
+#profile-nolocation,
+#profile-youtube,
#profile-video,
+#profile-audio,
#profile-link,
#wall-image-upload,
#profile-upload-wrapper,
@@ -921,6 +923,10 @@ input#dfrn-url {
cursor: pointer;
}
+.wall-item-share-buttons {
+ margin-left: 10px;
+}
+
.wall-item-links-wrapper {
float: left;
}
@@ -1052,6 +1058,14 @@ input#dfrn-url {
float: left;
margin-left: 20px;
}
+#profile-video-wrapper {
+ float: left;
+ margin-left: 20px;
+}
+#profile-audio-wrapper {
+ float: left;
+ margin-left: 20px;
+}
#profile-location-wrapper {
float: left;
margin-left: 20px;
@@ -1063,7 +1077,7 @@ input#dfrn-url {
#profile-jot-perms {
float: left;
- margin-left: 200px;
+ margin-left: 150px;
font-weight: bold;
font-size: 1.2em;
}
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index f1de801cb..1c378793a 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -107,8 +107,10 @@ blockquote:before {
#jot-perms-icon,
#profile-location,
-#profile-nolocation,
-#profile-video,
+#profile-nolocation,
+#profile-youtube,
+#profile-video,
+#profile-audio,
#profile-link,
#wall-image-upload,
#profile-upload-wrapper,
@@ -993,6 +995,10 @@ input#dfrn-url {
border-right: 2px solid #fff;
}
+.wall-item-share-buttons {
+ margin-left: 5px;
+}
+
.wall-item-links-wrapper {
float: left;
}
@@ -1121,6 +1127,14 @@ padding: 5px 10px 0px;
float: left;
margin-left: 20px;
}
+#profile-video-wrapper {
+ float: left;
+ margin-left: 20px;
+}
+#profile-audio-wrapper {
+ float: left;
+ margin-left: 20px;
+}
#profile-location-wrapper {
float: left;
margin-left: 20px;
@@ -1132,7 +1146,7 @@ padding: 5px 10px 0px;
#profile-jot-perms {
float: left;
- margin-left: 200px;
+ margin-left: 150px;
font-weight: bold;
font-size: 1.2em;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 15:11:29 +0000