Mercurial > kallithea
changeset 6298:0d4dfe2122fe
style: use span for notifications
Based on Bootstrap work by Dominik Ruf.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Tue, 08 Nov 2016 23:29:12 +0100 |
parents | 0b51254050a2 |
children | 8a50208651c1 |
files | kallithea/templates/admin/notifications/notifications_data.html kallithea/templates/admin/notifications/show_notification.html |
diffstat | 2 files changed, 16 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/templates/admin/notifications/notifications_data.html Tue Nov 08 23:29:12 2016 +0100 +++ b/kallithea/templates/admin/notifications/notifications_data.html Tue Nov 08 23:29:12 2016 +0100 @@ -9,20 +9,19 @@ <div id="notification_${notification.notification.notification_id}" class="container ${unread(notification.read)}"> <div class="notification-header"> ${h.gravatar_div(notification.notification.created_by_user.email, size=24)} - <div class="desc ${unread(notification.read)}"> - <a href="${url('notification', notification_id=notification.notification.notification_id)}">${notification.notification.description}</a> - - </div> - <div class="delete-notifications"> + <span class="desc ${unread(notification.read)}"> + <a href="${url('notification', notification_id=notification.notification.notification_id)}">${notification.notification.description}</a> + </span> + <span class="delete-notifications"> <span id="${notification.notification.notification_id}" class="delete-notification"><i class="icon-minus-circled" style="color: #b94a48; padding: 2px;"></i></span> - </div> + </span> %if not notification.read: - <div class="read-notifications"> + <span class="read-notifications"> <span id="${notification.notification.notification_id}" class="read-notification"><i class="icon-ok" style="color: #4CBB17; padding: 2px;"></i></span> - </div> + </span> %endif </div> - <div class="notification-subject"></div> + <div class="notification-subject"></div> </div> %endfor </div>
--- a/kallithea/templates/admin/notifications/show_notification.html Tue Nov 08 23:29:12 2016 +0100 +++ b/kallithea/templates/admin/notifications/show_notification.html Tue Nov 08 23:29:12 2016 +0100 @@ -25,18 +25,18 @@ <div id="notification_${c.notification.notification_id}"> <div class="notification-header"> ${h.gravatar_div(c.notification.created_by_user.email, size=24)} - <div class="desc"> + <span class="desc"> ${c.notification.description} - </div> - <div class="delete-notifications"> + </span> + <span class="delete-notifications"> <span id="${c.notification.notification_id}" class="delete-notification action"><i class="icon-minus-circled"></i></span> - </div> + </span> </div> <div class="notification-body"> - <div class="notification-subject">${h.literal(c.notification.subject)}</div> - %if c.notification.body: - ${h.render_w_mentions(c.notification.body)} - %endif + <div class="notification-subject">${h.literal(c.notification.subject)}</div> + %if c.notification.body: + ${h.render_w_mentions(c.notification.body)} + %endif </div> </div> </div>