diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/jot-header.tpl | 12 | ||||
| -rw-r--r-- | view/jot.tpl | 4 | ||||
| -rw-r--r-- | view/profile-hide-wall.tpl | 16 | ||||
| -rw-r--r-- | view/profile_edit.tpl | 2 | ||||
| -rw-r--r-- | view/theme/dispy/style.css | 14 | ||||
| -rw-r--r-- | view/theme/duepuntozero/style.css | 32 | ||||
| -rw-r--r-- | view/theme/loozah/style.css | 24 |
7 files changed, 103 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..15fc460e1 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 attach" 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/profile-hide-wall.tpl b/view/profile-hide-wall.tpl new file mode 100644 index 000000000..10185e243 --- /dev/null +++ b/view/profile-hide-wall.tpl @@ -0,0 +1,16 @@ +<p id="hide-wall-text"> +$desc +</p> + + <div id="hide-wall-yes-wrapper"> + <label id="hide-wall-yes-label" for="hide-wall-yes">$yes_str</label> + <input type="radio" name="hidewall" id="hide-wall-yes" $yes_selected value="1" /> + + <div id="hide-wall-break" ></div> + </div> + <div id="hide-wall-no-wrapper"> + <label id="hide-wall-no-label" for="hide-wall-no">$no_str</label> + <input type="radio" name="hidewall" id="hide-wall-no" $no_selected value="0" /> + + <div id="hide-wall-end"></div> + </div> diff --git a/view/profile_edit.tpl b/view/profile_edit.tpl index 053e19594..564746e6a 100644 --- a/view/profile_edit.tpl +++ b/view/profile_edit.tpl @@ -52,6 +52,8 @@ $dob $age $hide_friends +$hide_wall + <div class="profile-edit-submit-wrapper" > <input type="submit" name="submit" class="profile-edit-submit-button" value="$submit" /> </div> diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 3f22e28f4..ea036f26a 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -811,6 +811,20 @@ section { margin: 10px 11% 0px 11%; font-size: 0.8em; padding-right: 230px;} .video { background-position: -110px -40px;} .youtube { background-position: -130px -40px;} + +.attachtype { + display: block; width: 20px; height: 23px; + background-image: url('../../../images/content-types.gif'); +} + +.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; } + + + /** * footer */ diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index 61da54231..f44931a5f 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; } @@ -701,6 +703,8 @@ input#dfrn-url { #profile-in-dir-no, #profile-in-netdir-yes, #profile-in-netdir-no, +#hide-wall-yes, +#hide-wall-no, #hide-friends-yes, #hide-friends-no { float: left; @@ -718,6 +722,8 @@ input#dfrn-url { #profile-in-dir-no-label, #profile-in-netdir-yes-label, #profile-in-netdir-no-label, +#hide-wall-yes-label, +#hide-wall-no-label, #hide-friends-yes-label, #hide-friends-no-label { margin-left: 125px; @@ -801,6 +807,8 @@ input#dfrn-url { #profile-in-dir-end, #profile-in-netdir-break, #profile-in-netdir-end, +#hide-wall-break, +#hide-wall-end, #hide-friends-break, #hide-friends-end, #settings-normal-break, @@ -1130,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; @@ -2417,3 +2428,22 @@ a.mail-list-link { .unlock { background-position: -32px -32px;} .video { background-position: -48px -32px;} .youtube { background-position: -64px -32px;} +.attach { background-position: -80px -32px; } + + +.attachtype { + display: block; width: 20px; height: 23px; + float: left; + background-image: url('../../../images/content-types.gif'); +} + +.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/loozah/style.css b/view/theme/loozah/style.css index 92c2c20a7..370e5c61a 100644 --- a/view/theme/loozah/style.css +++ b/view/theme/loozah/style.css @@ -825,6 +825,8 @@ input#dfrn-url { #profile-in-dir-no, #profile-in-netdir-yes, #profile-in-netdir-no, +#hide-wall-yes, +#hide-wall-no, #hide-friends-yes, #hide-friends-no, #settings-normal, @@ -839,6 +841,8 @@ input#dfrn-url { #profile-in-dir-no-label, #profile-in-netdir-yes-label, #profile-in-netdir-no-label, +#hide-wall-yes-label, +#hide-wall-no-label, #hide-friends-yes-label, #hide-friends-no-label { margin-left: 125px; @@ -917,6 +921,8 @@ input#dfrn-url { #profile-in-dir-end, #profile-in-netdir-break, #profile-in-netdir-end, +#hide-wall-break, +#hide-wall-end, #hide-friends-break, #hide-friends-end, #settings-normal-break, @@ -2434,3 +2440,21 @@ a.mail-list-link { .unlock { background-position: -32px -32px;} .video { background-position: -48px -32px;} .youtube { background-position: -64px -32px;} +.attach { background-position: -80px -32px; } + +.attachtype { + display: block; width: 20px; height: 23px; + float: left; + background-image: url('../../../images/content-types.gif'); +} + +.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; } + |