Commit b98e303f4658ab04804c3bfc5f85a27cf60729b1
1 parent
af269427
Exists in
master
and in
5 other branches
modified notifications items on home
Showing
3 changed files
with
34 additions
and
31 deletions
Show diff stats
app/templates/home.html
| @@ -119,11 +119,11 @@ | @@ -119,11 +119,11 @@ | ||
| 119 | </div> | 119 | </div> |
| 120 | 120 | ||
| 121 | {% else %} | 121 | {% else %} |
| 122 | - <ul class="timeline" style="-webkit-padding-start: 0px"> | 122 | + |
| 123 | <div id="timeline"> | 123 | <div id="timeline"> |
| 124 | {% include page_template %} | 124 | {% include page_template %} |
| 125 | </div> | 125 | </div> |
| 126 | - </ul> | 126 | + |
| 127 | {% endif %} | 127 | {% endif %} |
| 128 | 128 | ||
| 129 | <div id="loading" class="alert alert-primary" role="alert" style="display: none"> | 129 | <div id="loading" class="alert alert-primary" role="alert" style="display: none"> |
app/templates/home_teacher_student_content.html
| 1 | {% load static i18n %} | 1 | {% load static i18n %} |
| 2 | 2 | ||
| 3 | {% for notification in objects %} | 3 | {% for notification in objects %} |
| 4 | - <li {% if not notification.read %}class="not_read"{% endif %}> | ||
| 5 | - <div class="avatar"> | ||
| 6 | - <img src="{{ notification.user.image_url }}"> | 4 | + |
| 5 | + | ||
| 6 | + <div class="well timeLine"> | ||
| 7 | + <div class="row"> | ||
| 8 | + <div class="col-md-12"> | ||
| 9 | + <p><a href="#"></a></p><h6><a href="#"><i>Default Path to Notification</i></a></h6><p></p> | ||
| 10 | + </div> | ||
| 11 | + </div> | ||
| 12 | + <div class="row"> | ||
| 13 | + <div class="col-xs-2 col-md-1"> | ||
| 14 | + <img class="imgTimeLine" src="{{ notification.user.image_url }}"> | ||
| 7 | </div> | 15 | </div> |
| 8 | - <div class="bubble-container"> | ||
| 9 | - <div class="bubble"> | ||
| 10 | - <div class="retweet" style="color: white"> | ||
| 11 | - {{ notification.datetime }} | ||
| 12 | - </div> | ||
| 13 | - <h3>{{ notification.user }}</h3> - <h3>{{ notification.action_resource }}</h3><br/> | ||
| 14 | - <a href="{% url 'core:notification_read' notification.id %}">{{ notification }}</a> | ||
| 15 | - </div> | ||
| 16 | - <div class="arrow"></div> | 16 | + <div class="col-xs-10 col-md-11"> |
| 17 | + <i class="fa fa-pencil-square-o" aria-hidden="true"></i> | ||
| 18 | + <a href=""><h4 class="resource_inline"><b>{{ notification.user }}</b></h4></a> | ||
| 19 | + <p class="resource_inline">{{notification.message}} em : <a href="{% url 'core:notification_read' notification.id %}">Recurso</a></p> | ||
| 20 | + <p class="timePost"><i>{{ notification.datetime }}</i></p> | ||
| 17 | </div> | 21 | </div> |
| 18 | - </li> | 22 | + </div> |
| 23 | +</div> | ||
| 19 | {% endfor %} | 24 | {% endfor %} |
| 20 | 25 |
core/static/css/base/amadeus.css
| @@ -296,27 +296,25 @@ body .container .jumbotron-inverse, body .container .well-inverse, body .contain | @@ -296,27 +296,25 @@ body .container .jumbotron-inverse, body .container .well-inverse, body .contain | ||
| 296 | color: #000; | 296 | color: #000; |
| 297 | } | 297 | } |
| 298 | 298 | ||
| 299 | -.timeline.post { | ||
| 300 | - border-top-left-radius: 8px; | ||
| 301 | - border-top-right-radius: 8px; | ||
| 302 | - padding-bottom: 0px; | ||
| 303 | - -webkit-padding-start: 0px !important; | ||
| 304 | - width: 100%; | ||
| 305 | -} | ||
| 306 | -.timeline.post a { | ||
| 307 | - color: #000; | 299 | +/*TIMELINE CLASSES BEGIN */ |
| 300 | +.resource_inline{ | ||
| 301 | + display: inline-block; | ||
| 308 | } | 302 | } |
| 309 | -.timeline.post li { | ||
| 310 | - padding: 10px; | ||
| 311 | - border-bottom: 1px solid #fff; | 303 | + |
| 304 | +.imgTimeLine{ | ||
| 305 | + width: 100%; | ||
| 306 | + height: auto; | ||
| 307 | + padding-top: 10px; | ||
| 312 | } | 308 | } |
| 313 | -.timeline.post li:last-child { | ||
| 314 | - border: none; | 309 | +.timeLine div .col-md-11{ |
| 310 | + padding-left: 0px; | ||
| 315 | } | 311 | } |
| 316 | -.timeline.post h3 { | ||
| 317 | - margin-top: 5px; | 312 | +.timeLine div .col-md-11 i{ |
| 313 | + padding-right: 5px; | ||
| 318 | } | 314 | } |
| 319 | 315 | ||
| 316 | +/*TIMELINE CLASSES END*/ | ||
| 317 | + | ||
| 320 | .notification-count { | 318 | .notification-count { |
| 321 | background-color: #FF0000; | 319 | background-color: #FF0000; |
| 322 | } | 320 | } |