aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/jot-header.tpl12
-rw-r--r--view/jot.tpl4
-rw-r--r--view/theme/duepuntozero/style.css7
3 files changed, 22 insertions, 1 deletions
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 3057618b2..77e5bc4bc 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -79,6 +79,18 @@ tinyMCE.init({
}
}
);
+ var file_uploader = new window.AjaxUpload(
+ 'wall-file-upload',
+ { action: 'wall_attach/$nickname',
+ name: 'userfile',
+ onSubmit: function(file,ext) { $('#profile-rotator').show(); },
+ onComplete: function(file,response) {
+ tinyMCE.execCommand('mceInsertRawHTML',false,response);
+ $('#profile-rotator').hide();
+ }
+ }
+ );
+
$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
diff --git a/view/jot.tpl b/view/jot.tpl
index 0c9883b11..e2dd6d960 100644
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -23,6 +23,10 @@
<div id="profile-upload-wrapper" style="display: $visitor;" >
<div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
</div>
+ <div id="profile-attach-wrapper" style="display: $visitor;" >
+ <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon camera" title="$attach"></a></div>
+ </div>
+
<div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
<a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
</div>
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index 79a298d43..f202e9ff5 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -226,8 +226,10 @@ div.wall-item-content-wrapper.shiny {
#profile-link,
#profile-title,
#wall-image-upload,
+#wall-file-upload,
#profile-upload-wrapper,
#wall-image-upload-div,
+#wall-file-upload-div,
.hover, .focus {
cursor: pointer;
}
@@ -1136,7 +1138,10 @@ input#dfrn-url {
float: left;
margin-left: 30px;
}
-
+#profile-attach-wrapper {
+ float: left;
+ margin-left: 30px;
+}
#profile-rotator {
float: left;
margin-left: 30px;