diff options
| author | Mike Macgirvin <mike@macgirvin.com> | 2010-07-22 20:22:03 -0700 |
|---|---|---|
| committer | Mike Macgirvin <mike@macgirvin.com> | 2010-07-22 20:22:03 -0700 |
| commit | 88bfe21bead769c3ba81e181b79f9d6426ace351 (patch) | |
| tree | 172c2d52cd001ddf6c2478e43d5eaa8bcacc93f8 /view | |
| parent | 11f2eaa16dc3e41b758235e7bc1a281e19aca96e (diff) | |
| download | volse-hubzilla-88bfe21bead769c3ba81e181b79f9d6426ace351.tar.gz volse-hubzilla-88bfe21bead769c3ba81e181b79f9d6426ace351.tar.bz2 volse-hubzilla-88bfe21bead769c3ba81e181b79f9d6426ace351.zip | |
first cut at ajax photo upload
Diffstat (limited to 'view')
| -rw-r--r-- | view/jot-header.tpl | 19 | ||||
| -rw-r--r-- | view/jot.tpl | 7 | ||||
| -rw-r--r-- | view/style.css | 11 |
3 files changed, 33 insertions, 4 deletions
diff --git a/view/jot-header.tpl b/view/jot-header.tpl index 7c17196ce..97e30cdae 100644 --- a/view/jot-header.tpl +++ b/view/jot-header.tpl @@ -2,7 +2,6 @@ src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> - tinyMCE.init({ theme : "advanced", mode : "specific_textareas", @@ -19,10 +18,24 @@ tinyMCE.init({ add_unload_trigger : false, remove_linebreaks : false, content_css: "$baseurl/view/custom_tinymce.css" - - }); +</script> +<script type="text/javascript" src="include/ajaxupload.js" ></script> +<script> + $(document).ready(function() { + var uploader = new window.AjaxUpload( + 'wall-image-upload', + { action: 'wall_upload', + name: 'userfile', + onComplete: function(file,response) { + tinyMCE.execCommand('mceInsertRawHTML',false,response); + } + } + ); + + }); + </script> diff --git a/view/jot.tpl b/view/jot.tpl index dca307c39..695ac19e0 100644 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -13,6 +13,13 @@ What's on your mind? </div> <div id="profile-jot-submit-wrapper" > <input type="submit" id="profile-jot-submit" name="submit" value="Submit" /> + <div id="profile-upload-wrapper" style="display: $visitor;" > + <div id="wall-image-upload-div" ><img id="wall-image-upload" src="images/camera-icon.gif" alt="Upload Photo" title="Upload Photo" /></div> + </div> + <div id="profile-link-wrapper" style="display: $visitor;" > + <img id="profile-link" src="images/link-icon.gif" alt="Insert web link" title="Insert web link" /> + </div> + <div id="profile-jot-perms" class="profile-jot-perms" style="display: $visitor;" ><img src="images/$lockstate_icon.gif" alt="Permission Settings" title="Permission Settings" onClick="openClose('profile-jot-acl-wrapper');" /></div> <div id="profile-jot-perms-end"></div> <div id="profile-jot-acl-wrapper" style="display: none;" >$acl</div> diff --git a/view/style.css b/view/style.css index bde06ec5c..faf1a091c 100644 --- a/view/style.css +++ b/view/style.css @@ -512,10 +512,19 @@ input#dfrn-url { #profile-jot-submit { float: left; } +#profile-upload-wrapper { + float: left; + margin-left: 50px; +} + +#profile-link-wrapper { + float: left; + margin-left: 20px; +} #profile-jot-perms { float: left; - margin-left: 350px; + margin-left: 280px; } #profile-jot-perms-end { |