Merge branch 'dispy' of github.com:fabrixxm/friendika into dispy

This commit is contained in:
fabrixxm
2011-07-05 07:11:57 +02:00
469 changed files with 1670 additions and 637 deletions

View File

@@ -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) {

View File

@@ -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
*/