diff options
| author | fabrixxm <fabrix.xm@gmail.com> | 2011-07-05 07:11:57 +0200 |
|---|---|---|
| committer | fabrixxm <fabrix.xm@gmail.com> | 2011-07-05 07:11:57 +0200 |
| commit | 4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8 (patch) | |
| tree | 84184bd3aa80c896b8dceaf5a017297c7267f2cb /view/theme/dispy | |
| parent | cfd59f6ac8848c19a0c451c378d2b770cafcbef0 (diff) | |
| parent | 2359783b9f6c0ec754c641453026712cf22e7cb6 (diff) | |
| download | volse-hubzilla-4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8.tar.gz volse-hubzilla-4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8.tar.bz2 volse-hubzilla-4e7a5dc56ebb8d99ed06b0b303c4ee24460ae6a8.zip | |
Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy
Diffstat (limited to 'view/theme/dispy')
| -rw-r--r-- | view/theme/dispy/jot-header.tpl | 20 | ||||
| -rw-r--r-- | view/theme/dispy/style.css | 9 |
2 files changed, 28 insertions, 1 deletions
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index aa9e0bfaf..eb88f00c1 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -1,5 +1,5 @@ -<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> +<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> <script language="javascript" type="text/javascript"> var editor; @@ -110,6 +110,24 @@ tinyMCE.init({ }); + function deleteCheckedItems() { + var checkedstr = ''; + + $('.item-select').each( function() { + if($(this).is(':checked')) { + if(checkedstr.length != 0) { + checkedstr = checkedstr + ',' + $(this).val(); + } + else { + checkedstr = $(this).val(); + } + } + }); + $.post('item', { dropitems: checkedstr }, function(data) { + window.location.reload(); + }); + } + function jotGetLink() { reply = prompt("$linkurl"); if(reply && reply.length) { diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 555b0af4f..49586e307 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -692,6 +692,15 @@ div[id$="wrapper"] br { clear: left; } .mail-list-delete-wrapper { float: right; } .mail-list-outside-wrapper-end { clear: both;} +.mail-conv-sender {float: left; margin: 0px 5px 5px 0px } +.mail-conv-sender-photo { width: 32px; height: 32px } +.mail-conv-sender-name { float: left } +.mail-conv-date { float: right } +.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em } +.mail-conv-body { clear: both; } +.mail-conv-delete-wrapper { margin-top: 5px; } + + /** * contacts */ |