Download as
Browse Code »

Commit 0ee93abf5a8b4130b4f02fed244772934c90440b

Authored by Zambom
1 parent 8339923d
Exists in master and in 2 other branches amadeus_univasf, refactoring

Adjusting chat responsivity

Showing 8 changed files with 28 additions and 26 deletions   Show diff stats
chat/templates/chat/_profile.html
  Diff comments   View file @0ee93ab
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 </div> 9 </div>
10 <div class="modal-body"> 10 <div class="modal-body">
11 <div class="row"> 11 <div class="row">
12 - <div class="col-md-4 modal_profile_sidebar"> 12 + <div class="col-md-4 col-sm-4 modal_profile_sidebar">
13 <span class="thumbnail"> 13 <span class="thumbnail">
14 <img src="{{ participant.image_url }}" /> 14 <img src="{{ participant.image_url }}" />
15 </span> 15 </span>
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 </h4> 19 </h4>
20 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:talk" participant.email %}' class="btn btn-raised btn-success btn-block" style="padding: 8px 15px">{% trans 'Send Message' %}</a> 20 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:talk" participant.email %}' class="btn btn-raised btn-success btn-block" style="padding: 8px 15px">{% trans 'Send Message' %}</a>
21 </div> 21 </div>
22 - <div class="col-md-8"> 22 + <div class="col-md-8 col-sm-8">
23 <div class="form-group"> 23 <div class="form-group">
24 <label class="control-form">{% trans 'System Admin' %}:</label> 24 <label class="control-form">{% trans 'System Admin' %}:</label>
25 <p class="profile_function modal_profile">{{ participant.is_admin }}</p> 25 <p class="profile_function modal_profile">{{ participant.is_admin }}</p>
chat/templates/chat/_view.html
  Diff comments   View file @0ee93ab
@@ -4,15 +4,15 @@ @@ -4,15 +4,15 @@
4 4
5 {% is_online talking_to as status %} 5 {% is_online talking_to as status %}
6 6
7 -<div id="talk-chat-{{ talking_to.id }}" class="col-md-12 participant panel">  
8 - <div class="col-md-1 user-img"> 7 +<div id="talk-chat-{{ talking_to.id }}" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 participant panel">
  8 + <div class="col-md-1 col-sm-1 col-xs-2 user-img">
9 <img src="{{ talking_to.image_url }}" class="img-responsive" /> 9 <img src="{{ talking_to.image_url }}" class="img-responsive" />
10 </div> 10 </div>
11 - <div class="col-md-6 user-info"> 11 + <div class="col-md-6 col-sm-6 col-xs-10 user-info">
12 <h4 class='talking-header'><a class="user_{{ talking_to.id }}_status status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ talking_to }} (<span class="chat_notify_list">{{ chat|notifies:request.user }}</span>)</h4> 12 <h4 class='talking-header'><a class="user_{{ talking_to.id }}_status status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ talking_to }} (<span class="chat_notify_list">{{ chat|notifies:request.user }}</span>)</h4>
13 <p class="talk-last_msg">{% trans 'Last message in' %} {{ chat|last_message }}</p> 13 <p class="talk-last_msg">{% trans 'Last message in' %} {{ chat|last_message }}</p>
14 </div> 14 </div>
15 - <div class="col-md-4 buttons pull-right text-center"> 15 + <div class="col-md-4 col-sm-4 col-xs-12 buttons pull-right text-center">
16 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:talk" talking_to.email %}' class="btn btn-raised btn-success pull-right">{% trans 'Access Talk' %}</a> 16 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:talk" talking_to.email %}' class="btn btn-raised btn-success pull-right">{% trans 'Access Talk' %}</a>
17 </div> 17 </div>
18 </div> 18 </div>
chat/templates/chat/_view_participant.html
  Diff comments   View file @0ee93ab
@@ -2,14 +2,14 @@ @@ -2,14 +2,14 @@
2 2
3 {% is_online participant as status %} 3 {% is_online participant as status %}
4 4
5 -<div class="col-md-12 participant panel">  
6 - <div class="col-md-1 user-img"> 5 +<div class="col-md-12 col-sm-12 participant panel">
  6 + <div class="col-md-1 col-sm-1 user-img">
7 <img src="{{ participant.image_url }}" class="img-responsive" /> 7 <img src="{{ participant.image_url }}" class="img-responsive" />
8 </div> 8 </div>
9 - <div class="col-md-6 user-info"> 9 + <div class="col-md-4 col-sm-4 user-info">
10 <h4><a class="user_{{ participant.id }}_status status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ participant }}</h4> 10 <h4><a class="user_{{ participant.id }}_status status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ participant }}</h4>
11 </div> 11 </div>
12 - <div class="col-md-4 buttons pull-right text-center"> 12 + <div class="col-md-6 col-sm-6 buttons pull-right text-center">
13 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:profile" participant.email %}' class="btn btn-raised btn-default">{% trans 'See Profile' %}</a> 13 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:profile" participant.email %}' class="btn btn-raised btn-default">{% trans 'See Profile' %}</a>
14 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:talk" participant.email %}' class="btn btn-raised btn-success">{% trans 'Send Message' %}</a> 14 <a href="#" onclick="getModalInfo($(this), '{{ space }}', '{{ space_type }}'); return false;" data-url='{% url "chat:talk" participant.email %}' class="btn btn-raised btn-success">{% trans 'Send Message' %}</a>
15 </div> 15 </div>
chat/templates/chat/list.html
  Diff comments   View file @0ee93ab
@@ -17,10 +17,10 @@ @@ -17,10 +17,10 @@
17 <div class="col-md-12 col-sm-12 col-xs-12"> 17 <div class="col-md-12 col-sm-12 col-xs-12">
18 <div class="panel panel-default"> 18 <div class="panel panel-default">
19 <div class="panel-body"> 19 <div class="panel-body">
20 - <div class="col-md-8"> 20 + <div class="col-lg-8 col-md-8 col-sm-7 col-xs-12">
21 <form action="{% url 'chat:participants_general' %}" method="GET" class="form-horizontal"> 21 <form action="{% url 'chat:participants_general' %}" method="GET" class="form-horizontal">
22 <div class="form-group"> 22 <div class="form-group">
23 - <div class="col-md-11 col-sm-11 col-xs-11"> 23 + <div class="col-md-10 col-sm-9 col-xs-10">
24 <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" /> 24 <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" />
25 </div> 25 </div>
26 <div class="col-md-1 col-sm-1 col-xs-1"> 26 <div class="col-md-1 col-sm-1 col-xs-1">
@@ -31,7 +31,7 @@ @@ -31,7 +31,7 @@
31 </div> 31 </div>
32 </form> 32 </form>
33 </div> 33 </div>
34 - <div class="col-md-4"> 34 + <div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">
35 <a href="{% url 'chat:participants_general' %}" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a> 35 <a href="{% url 'chat:participants_general' %}" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a>
36 </div> 36 </div>
37 </div> 37 </div>
chat/templates/chat/list_participants.html
  Diff comments   View file @0ee93ab
@@ -19,10 +19,10 @@ @@ -19,10 +19,10 @@
19 <div class="col-md-12 col-sm-12 col-xs-12"> 19 <div class="col-md-12 col-sm-12 col-xs-12">
20 <div class="panel panel-default"> 20 <div class="panel panel-default">
21 <div class="panel-body"> 21 <div class="panel-body">
22 - <div class="col-md-8"> 22 + <div class="col-lg-8 col-md-8 col-sm-7 col-xs-12">
23 <form action="{% url 'chat:participants_general' %}" method="GET" class="form-horizontal"> 23 <form action="{% url 'chat:participants_general' %}" method="GET" class="form-horizontal">
24 <div class="form-group"> 24 <div class="form-group">
25 - <div class="col-md-11 col-sm-11 col-xs-11"> 25 + <div class="col-md-10 col-sm-9 col-xs-10">
26 <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" /> 26 <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" />
27 </div> 27 </div>
28 <div class="col-md-1 col-sm-1 col-xs-1"> 28 <div class="col-md-1 col-sm-1 col-xs-1">
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 </div> 33 </div>
34 </form> 34 </form>
35 </div> 35 </div>
36 - <div class="col-md-4"> 36 + <div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">
37 <a href="{% url 'chat:participants_general' %}" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a> 37 <a href="{% url 'chat:participants_general' %}" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a>
38 </div> 38 </div>
39 </div> 39 </div>
chat/templates/chat/subject_view.html
  Diff comments   View file @0ee93ab
@@ -49,10 +49,10 @@ @@ -49,10 +49,10 @@
49 <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse chat-collapse"> 49 <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse chat-collapse">
50 <div class="panel panel-default"> 50 <div class="panel panel-default">
51 <div class="panel-body"> 51 <div class="panel-body">
52 - <div class="col-md-8"> 52 + <div class="col-lg-8 col-md-8 col-sm-7 col-xs-12">
53 <form action="{% url 'chat:participants_subject' subject.id %}" method="GET" class="form-horizontal"> 53 <form action="{% url 'chat:participants_subject' subject.id %}" method="GET" class="form-horizontal">
54 <div class="form-group"> 54 <div class="form-group">
55 - <div class="col-md-11 col-sm-11 col-xs-11"> 55 + <div class="col-md-10 col-sm-9 col-xs-10">
56 <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" /> 56 <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" />
57 </div> 57 </div>
58 <div class="col-md-1 col-sm-1 col-xs-1"> 58 <div class="col-md-1 col-sm-1 col-xs-1">
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 </div> 63 </div>
64 </form> 64 </form>
65 </div> 65 </div>
66 - <div class="col-md-4"> 66 + <div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">
67 <a href="{% url 'chat:participants_subject' subject.id %}" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a> 67 <a href="{% url 'chat:participants_subject' subject.id %}" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a>
68 </div> 68 </div>
69 </div> 69 </div>
@@ -88,6 +88,7 @@ @@ -88,6 +88,7 @@
88 </div> 88 </div>
89 {% endif %} 89 {% endif %}
90 </div> 90 </div>
  91 + </div>
91 92
92 <div class="modal fade" id="chat-modal-info" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"></div> 93 <div class="modal fade" id="chat-modal-info" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"></div>
93 94
chat/templates/chat/subject_view_participants.html
  Diff comments   View file @0ee93ab
@@ -53,10 +53,10 @@ @@ -53,10 +53,10 @@
53 <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse chat-collapse"> 53 <div id="{{subject.slug}}" class="panel-collapse panel-body in collapse chat-collapse">
54 <div class="panel panel-default"> 54 <div class="panel panel-default">
55 <div class="panel-body"> 55 <div class="panel-body">
56 - <div class="col-md-8">  
57 - <form action="" method="GET" class="form-horizontal"> 56 + <div class="col-lg-8 col-md-8 col-sm-7 col-xs-12">
  57 + <form action="{% url 'chat:participants_subject' subject.id %}" method="GET" class="form-horizontal">
58 <div class="form-group"> 58 <div class="form-group">
59 - <div class="col-md-11 col-sm-11 col-xs-11"> 59 + <div class="col-md-10 col-sm-9 col-xs-10">
60 <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" /> 60 <input type="text" class="form-control" name="search" value="{{ search }}" placeholder="{% trans 'Search...' %}" />
61 </div> 61 </div>
62 <div class="col-md-1 col-sm-1 col-xs-1"> 62 <div class="col-md-1 col-sm-1 col-xs-1">
@@ -67,8 +67,8 @@ @@ -67,8 +67,8 @@
67 </div> 67 </div>
68 </form> 68 </form>
69 </div> 69 </div>
70 - <div class="col-md-4">  
71 - <a href="" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a> 70 + <div class="col-lg-4 col-md-4 col-sm-5 col-xs-12">
  71 + <a href="{% url 'chat:participants_subject' subject.id %}" class="pull-right btn btn-default btn-raised btn-md">{% trans 'List all participants' %}</a>
72 </div> 72 </div>
73 </div> 73 </div>
74 </div> 74 </div>
@@ -92,6 +92,7 @@ @@ -92,6 +92,7 @@
92 </div> 92 </div>
93 {% endif %} 93 {% endif %}
94 </div> 94 </div>
  95 + </div>
95 96
96 <div class="modal fade" id="chat-modal-info" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"></div> 97 <div class="modal fade" id="chat-modal-info" tabindex="-1" role="dialog" aria-labelledby="myModalLabel"></div>
97 98
subjects/templates/subjects/view.html
  Diff comments   View file @0ee93ab
@@ -102,10 +102,10 @@ @@ -102,10 +102,10 @@
102 102
103 <br clear="all" /> 103 <br clear="all" />
104 104
105 - <div class="col-md-3 user-img"> 105 + <div class="col-md-3 col-sm-3 user-img">
106 <img src="{{ participant.image_url }}" class="img-responsive" /> 106 <img src="{{ participant.image_url }}" class="img-responsive" />
107 </div> 107 </div>
108 - <div class="col-md-9 user-info"> 108 + <div class="col-md-9 col-sm-9 user-info">
109 <h4><a class="status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ participant }}</h4> 109 <h4><a class="status {{ status }}" data-toggle="tooltip" title="{{ status|status_text }}"></a> {{ participant }}</h4>
110 </div> 110 </div>
111 </div> 111 </div>