kallithea Changeset - 0d4dfe2122fe

Changeset - 0d4dfe2122fe

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Mads Kiilerich - 9 years ago 2016-11-08 23:29:12
madski@unity3d.com

style: use span for notifications

Based on Bootstrap work by Dominik Ruf.

2 files changed with 16 insertions and 17 deletions:

kallithea/templates/admin/notifications/notifications_data.html

kallithea/templates/admin/notifications/show_notification.html

0 comments (0 inline, 0 general)

kallithea/templates/admin/notifications/notifications_data.html

➞

Show inline comments

@@ @@ -6,26 +6,25 @@ unread = lambda n:{False:'unread'}.get(n @@
 <div class="notification-list notification-table">
 %for notification in c.notifications:
   <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>
 <ul class="pagination">
     ${c.notifications.pager(controller='admin/notifications', **request.GET.mixed())}

kallithea/templates/admin/notifications/show_notification.html

➞

Show inline comments

@@ @@ -22,24 +22,24 @@ @@
         ${self.breadcrumbs()}
     </div>
     <div class="table">
       <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>
 </div>
 <script type="text/javascript">
 var url = "${url('notification_delete', notification_id='__NOTIFICATION_ID__')}";

0 comments (0 inline, 0 general)