Download as
Browse Code »

Commit ce21ef7f01624d4bf0812bbe26b9c0ae73a2e002

Authored by Erik Zambom
Committed by GitHub
2 parents f0701a3a 336aaa96
Exists in amadeus_univasf

Merge pull request #583 from amadeusproject/refactoring 

Daily Update - 10_10_2017
Showing 6 changed files with 57 additions and 17 deletions   Show diff stats
amadeus/templates/base.html
  Diff comments   View file @ce21ef7
... ... @@ -87,7 +87,7 @@
87 87  
88 88 if (array.length > 1) {
89 89 new_lang += '-';
90   - new_lang += array[1].toUpperCase();
  90 + new_lang += array[1].toUpperCase();
91 91 }
92 92  
93 93 </script>
... ... @@ -205,7 +205,7 @@
205 205 </ul>
206 206 </div>
207 207 </div>
208   -
  208 +
209 209 <!-- Mobile Menu -->
210 210 <div class="navbar navbar-default hidden-lg hidden-md">
211 211 <div class="navbar-header">
... ... @@ -366,23 +366,25 @@
366 366 <a href=""><i class="fa fa-bar-chart" aria-hid{% get_current_language as LANGUAGE_CODE %}den="true"></i></a>
367 367 </li>
368 368 </ul>
369   - {% endblock %}
  369 + {% endblock %}
370 370 </div>
371 371  
372 372 <div id="page_content" class="col-xs-12 col-sm-12 col-md-11 col-lg-11">
  373 + <div class="dropdown dropdown_crumb">
373 374 {% block breadcrumbs %}
374 375 {% breadcrumb 'Home' 'home' %}
375 376 {% endblock %}
  377 + <div class="drop_change" style="width:100%">
376 378 {% block render_breadcrumbs %}
377 379 {% render_breadcrumbs %}
378 380 {% endblock %}
379   -
  381 + </div>
  382 + </div>
380 383 {% block content %}
381 384 {% endblock %}
382 385 </div>
383 386 </div>
384 387 </div>
385   -
386 388 {% block footer %}
387 389 {% endblock %}
388 390  
... ...
api/views.py
  Diff comments   View file @ce21ef7
... ... @@ -312,7 +312,7 @@ class ChatViewset(viewsets.ModelViewSet, LogMixin):
312 312  
313 313 messages = TalkMessages.objects.filter((Q(talk__user_one__email = username) & Q(talk__user_two__email = user_two)) | (Q(talk__user_one__email = user_two) & Q(talk__user_two__email = username))).order_by('-create_date')
314 314  
315   - serializer = ChatSerializer(messages, many = True)
  315 + serializer = ChatSerializer(messages, many = True, context = {"request_user": user})
316 316  
317 317 json_r = json.dumps(serializer.data)
318 318 json_r = json.loads(json_r)
... ...
categories/templates/categories/_form.html
  Diff comments   View file @ce21ef7
... ... @@ -63,8 +63,14 @@
63 63 </div>
64 64 {% endif %}
65 65 {% endfor %}
66   - <div class="row text-center">
67   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised" />
  66 + <div class="row">
  67 + <div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
  68 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
  69 + </div>
  70 +
  71 + <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
  72 + <a href="{% url 'home' %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
  73 + </div>
68 74 </div>
69 75 </form>
70 76  
... ...
chat/serializers.py
  Diff comments   View file @ce21ef7
1 1 from rest_framework import serializers
2 2  
3   -from .models import TalkMessages
  3 +from django.db.models import Q
  4 +
  5 +from .models import TalkMessages, ChatFavorites
4 6  
5 7 from subjects.serializers import SubjectSerializer
6 8 from users.serializers import UserSerializer
... ... @@ -8,7 +10,16 @@ from users.serializers import UserSerializer
8 10 class ChatSerializer(serializers.ModelSerializer):
9 11 user = UserSerializer()
10 12 subject = SubjectSerializer()
  13 + favorite = serializers.SerializerMethodField()
  14 +
  15 + def get_favorite(self, message):
  16 + user = self.context.get("request_user", None)
  17 +
  18 + if not user is None:
  19 + return ChatFavorites.objects.filter(Q(user = user) & Q(message = message)).exists()
  20 +
  21 + return False
11 22  
12 23 class Meta:
13 24 model = TalkMessages
14   - fields = ('text', 'user', 'subject', 'image_url', 'create_date', )
  25 + fields = ('text', 'user', 'subject', 'image_url', 'create_date', 'favorite')
... ...
subjects/templates/subjects/_form.html
  Diff comments   View file @ce21ef7
... ... @@ -87,8 +87,14 @@
87 87 </div>
88 88 {% endif %}
89 89 {% endfor %}
90   - <div class="row text-center">
91   - <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised" />
  90 + <div class="row">
  91 + <div class="col-lg-2 col-md-offset-4 col-md-6 col-sm-12 col-xs-12 text-center">
  92 + <input type="submit" value="{% trans 'Save' %}" class="btn btn-success btn-raised btn-block" />
  93 + </div>
  94 +
  95 + <div class="col-lg-2 col-md-6 col-sm-12 col-xs-12 text-center">
  96 + <a href="{% url 'home' %}" class="btn btn-default btn-raised btn-block">{% trans 'Cancel' %}</a>
  97 + </div>
92 98 </div>
93 99 </form>
94 100  
... ...
subjects/templates/subjects/view.html 100644 → 100755
  Diff comments   View file @ce21ef7
... ... @@ -6,8 +6,23 @@
6 6 {% block javascript%}
7 7 {{ block.super }}
8 8 <script type="text/javascript" src="{% static 'subjects/js/modal_subject.js' %}"></script>
  9 + <script type="text/javascript">
  10 + $(document).ready( function () {
  11 + var ul = '';
  12 + var div_crumb = $(".dropdown_crumb");
  13 + var div_change = $(".drop_change");
  14 + if(window.innerWidth < 768) {
  15 + ul = document.querySelector("ul.breadcrumb");
  16 + if (ul) {
  17 + ul.classList.remove('breadcrumb');
  18 + ul.classList.add('screen_drop');
  19 + }
  20 + div_change.addClass("dropdown-menu");
  21 + div_crumb.prepend("<button class='btn btn-block dropdown-toggle' type='button' data-toggle='dropdown'>{% trans 'Navigate' %} <span class='caret'></span></button>")
  22 + }
  23 + });
  24 + </script>
9 25 {% endblock%}
10   -
11 26 {% block breadcrumbs %}
12 27 {{ block.super }}
13 28 {% breadcrumb subject.category 'subjects:cat_view' subject.category.slug %}
... ... @@ -83,7 +98,7 @@
83 98 {% endif %}
84 99  
85 100 {% include 'topics/list.html' with subject=subject %}
86   -
  101 +
87 102 <div id="participants" data-toggle="tooltip" data-title="{% trans 'Participants' %}">
88 103 <i class="fa fa-group"></i>
89 104 </div>
... ... @@ -163,7 +178,7 @@
163 178 var popover = $(".popover.fade.in"),
164 179 buttons = popover.parent().find('a'),
165 180 close = popover.parent().find('.close:visible');
166   -
  181 +
167 182 popover.animate({
168 183 'max-width': '330px',
169 184 }, 0);
... ... @@ -178,7 +193,7 @@
178 193  
179 194 close.on("click", function () {
180 195 popover.popover('hide');
181   - });
  196 + });
182 197  
183 198 buttons.on("click", function () {
184 199 popover.popover('hide');
... ... @@ -189,7 +204,7 @@
189 204 $('#participants').on('click', function(){
190 205 var $this = $(this),
191 206 list = $this.parent().find(".participants-list");
192   -
  207 +
193 208 if ($this.hasClass('open')) {
194 209 $this.animate({
195 210 right : '0px'
... ...