diff options
| -rw-r--r-- | doc/addons.bb | 2 | ||||
| -rw-r--r-- | mod/admin.php | 3 | ||||
| -rw-r--r-- | view/css/mod_mail.css | 8 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 6 | ||||
| -rwxr-xr-x | view/tpl/mail_conv.tpl | 4 | ||||
| -rwxr-xr-x | view/tpl/mail_list.tpl | 2 |
6 files changed, 10 insertions, 15 deletions
diff --git a/doc/addons.bb b/doc/addons.bb index 542d0075c..cb7075c40 100644 --- a/doc/addons.bb +++ b/doc/addons.bb @@ -20,6 +20,8 @@ [*] ijpost - crosspost to Insanejournal [*] irc - connect to IRC chatrooms [*] jappixmini - XMPP chat +[*] jsupload - (recommended) upload multiple photos to photo albums at once. +[*] ldapauth - login via account on LDAP or Windows Active Directory domain [*] libertree - crosspost to Libertree [*] likebanner - create a "like us on red#matrix" banner image [*] ljpost - crosspost to LiveJournal diff --git a/mod/admin.php b/mod/admin.php index f97c15786..35e43252c 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -590,9 +590,6 @@ function admin_page_dbsync(&$a) { function admin_page_queue($a) { $o = ''; - $r = q("select count(outq_posturl) as total, outq_posturl, max(hubloc_connected) as connected from outq - where outq_delivered = 0 group by outq_posturl order by total desc"); - if($_REQUEST['drophub']) { require_once('hubloc.php'); hubloc_mark_as_down($_REQUEST['drophub']); diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css index 011c3edd5..11affffbd 100644 --- a/view/css/mod_mail.css +++ b/view/css/mod_mail.css @@ -45,8 +45,6 @@ img.mail-list-sender-photo { #prvmail-rotator-wrapper { float: left; margin-top: 10px; -/* margin-right: 10px; - width: 24px; */ cursor: pointer; } @@ -79,16 +77,14 @@ img.mail-list-sender-photo { float: right; margin-right: 30px; margin-top: 15px; -} - -.mail-conv-delete-icon { - border: none; + margin-bottom: 5px; } .mail-conv-recall-wrapper { float: right; margin-right: 10px; margin-top: 15px; + margin-bottom: 5px; } .mail-conv-outside-wrapper-end { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e00fee521..4878cd23f 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2321,20 +2321,20 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { .onoffswitch-inner:before { content: attr(data-on); padding-right: 21px; - background-color: #EEEEEE; + background-color: $item_colour; text-align: right; } .onoffswitch-inner:after { content: attr(data-off); padding-left: 21px; - background-color: #EEEEEE; color: #999999; + background-color: $item_colour; color: #ccc; text-align: left; } .onoffswitch-switch { display: block; width: 15px; margin:4px; - background: #A1A1A1; + background: #ccc; border-radius: 10px; position: absolute; top: 0; bottom: 0; right: 36px; -moz-transition: all 0.3s ease-in 0s; -webkit-transition: all 0.3s ease-in 0s; diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index a75939617..ec8f8c1e3 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -8,9 +8,9 @@ <div class="mail-conv-date">{{$mail.date}}</div> <div class="mail-conv-subject">{{$mail.subject}}</div> <div class="mail-conv-body">{{$mail.body}}</div> - <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-trash mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div> + <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon btn btn-default" ><i class="icon-trash mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div> {{if $mail.can_recall}} - <div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div> + <div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon btn btn-default" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div> {{/if}} <div class="mail-conv-outside-wrapper-end"></div> </div> diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 8643f27b9..1d499e12f 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -3,6 +3,6 @@ <span class="mail-list">{{$from_name}}</span> <span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$id}}" class="mail-link">{{$subject}}</a></span> <span class="mail-list" title="{{$date}}">{{$date}}</span> - <span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-trash mail-icons drop-icons"></i></a></span> + <span class="mail-list mail-list-remove" class="btn btn-default btn-sm"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" class="btn btn-default btn-sm" ><i class="icon-trash mail-icons drop-icons"></i></a></span> <div class="clear"> </div> </div> |