fix chat room input style

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index ca708bdde5adc053c2749e26398dd050b0d362d0..a9bf708460211f57c624126372b65281cc04e099 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -1552,6 +1552,11 @@ input,textarea{
     font-size: 0.8125em;
 }
 
+.msg-black {
+    font-size: 0.9em;
+    background-image: url(/static/telemeta/images/tw_hd.png);
+    }
+
 #users {
     padding: 0.8em 0em 0em 0em;
     background-color: #FFF;

diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index cabe3890d52b5a1cf05e799c7e29f2a1b2b7952a..26e77c91af2c14b1da24b3d75d699f5cc7cbb4da 100644 (file)
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -46,19 +46,9 @@
 {% block chat %}
 {% if room %}
 <div id="module-set" style="width: 22%">
-<div class="module">
-<h3><img src="{% url telemeta-images "vox_wh.png" %}" alt="rss" style="vertical-align:middle" />{% trans "Local tweeter" %}</h3>
-
-<div style="background: white;">
-<div id="chatwindow"><span id="loading">Loading...</span></div>
-<form id="chatform">{% csrf_token %}
-<label for="msg"></label>
-<input type="text" id="msg" size="16" />
-<input type="submit" value="{% trans "Send" %}" />
-</form>
-<!-- <script type="text/javascript">document.getElementById("msg").focus();</script> -->
-</div>
-</div>
+{% with trans "Local tweeter" as title %}
+{% include "teleforma/inc/chat_room.html" %}
+{% endwith %}
 </div>
 {% endif %}
 {% endblock chat %}

diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html
index 3899ad62ea552512ea96e8e01691907cff850b94..659db372904e3d8026a298382d1512aa7caf0606 100644 (file)
--- a/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@ -58,19 +58,9 @@ $(document).ready(function(){
 {% block chat %}
 {% if room %}
 <div id="module-set" style="width: 24%">
-<div class="module">
-<h3><img src="{% url telemeta-images "vox_wh.png" %}" alt="rss" style="vertical-align:middle" />{% trans "Local tweeter" %}</h3>
-
-<div style="background: white;">
-<div id="chatwindow"><span id="loading">Loading...</span></div>
-<form id="chatform">{% csrf_token %}
-<label for="msg"></label>
-<input type="text" id="msg" size="16" />
-<input type="submit" value="{% trans "Send" %}" />
-</form>
-<!-- <script type="text/javascript">document.getElementById("msg").focus();</script> -->
-</div>
-</div>
+{% with "Local tweeter" as title %}
+{% include "teleforma/inc/chat_room.html" %}
+{% endwith %}
 </div>
 {% endif %}
 {% endblock chat %}

diff --git a/teleforma/templates/teleforma/course_document.html b/teleforma/templates/teleforma/course_document.html
index 8794dbc25bd1ab29569729f2c74150c3fa81441e..21c663ef23f00bf5bc331ff0ac6440b8e0eb0e84 100644 (file)
--- a/teleforma/templates/teleforma/course_document.html
+++ b/teleforma/templates/teleforma/course_document.html
@@ -76,19 +76,9 @@ PDFJS.getDocument('{% url teleforma-document-download document.id %}').then(func
 {% block chat %}
 {% if room %}
 <div id="module-set" style="width: 22%">
-<div class="module">
-<h3><img src="{% url telemeta-images "vox_wh.png" %}" alt="rss" style="vertical-align:middle" />{% trans "Local tweeter" %}</h3>
-
-<div style="background: white;">
-<div id="chatwindow"><span id="loading">Loading...</span></div>
-<form id="chatform">{% csrf_token %}
-<label for="msg"></label>
-<input type="text" id="msg" size="16" />
-<input type="submit" value="{% trans "Send" %}" />
-</form>
-<!-- <script type="text/javascript">document.getElementById("msg").focus();</script> -->
-</div>
-</div>
+{% with trans "Local tweeter" as title %}
+{% include "teleforma/inc/chat_room.html" %}
+{% endwith %}
 </div>
 {% endif %}
 {% endblock chat %}

diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index 4018442a3b3e28d4bc3f90cd53d7f8bced565330..1656e4abb49ac1ee1fff621dd9d64758fb422e51 100644 (file)
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -73,19 +73,9 @@ $(document).ready(function(){
 {% block chat %}
 {% if room %}
 <div id="module-set" style="width: 22%">
-<div class="module">
-<h3><img src="{% url telemeta-images "vox_wh.png" %}" alt="rss" style="vertical-align:middle" />{% trans "Local tweeter" %}</h3>
-
-<div style="background: white;">
-<div id="chatwindow"><span id="loading">Loading...</span></div>
-<form id="chatform">{% csrf_token %}
-<label for="msg"></label>
-<input type="text" id="msg" size="16" />
-<input type="submit" value="{% trans "Send" %}" />
-</form>
-<!-- <script type="text/javascript">document.getElementById("msg").focus();</script> -->
-</div>
-</div>
+{% with trans "Local tweeter" as title %}
+{% include "teleforma/inc/chat_room.html" %}
+{% endwith %}
 </div>
 {% endif %}
 {% endblock chat %}

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index 319a94a60e4e357fb0b90afd7bde9a2e271ed3ae..454aa4c0a629299e3af51e194e1559d36b4c7576 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -91,19 +91,9 @@ $(document).ready(function(){
 {% block chat %}
 {% if room %}
 <div id="module-set" style="width: 22%">
-<div class="module">
-<h3><img src="{% url telemeta-images "vox_wh.png" %}" alt="rss" style="vertical-align:middle" />{% trans "General tweeter" %}</h3>
-
-<div style="background: white;">
-<div id="chatwindow"><span id="loading">Loading...</span></div>
-<form id="chatform">{% csrf_token %}
-<label for="msg"></label>
-<input type="text" id="msg" size="16" />
-<input type="submit" value="{% trans "Send" %}" />
-</form>
-<!-- <script type="text/javascript">document.getElementById("msg").focus();</script> -->
-</div>
-</div>
+{% with "General tweeter" as title %}
+{% include "teleforma/inc/chat_room.html" %}
+{% endwith %}
 </div>
 {% endif %}
 {% endblock chat %}

diff --git a/teleforma/templates/teleforma/inc/chat_room.html b/teleforma/templates/teleforma/inc/chat_room.html
new file mode 100644 (file)
index 0000000..3d2502a
--- /dev/null
+++ b/teleforma/templates/teleforma/inc/chat_room.html
@@ -0,0 +1,18 @@
+{% load i18n %}
+{% load telemeta_utils %}
+{% load teleforma_tags %}
+
+<div class="module">
+        <h3><img src="{% url telemeta-images "vox_wh.png" %}" alt="rss" style="vertical-align:middle" />{% trans title %}</h3>
+        <div style="background: white;">
+        <div id="chatwindow"><span id="loading">Loading...</span></div>
+        <form id="chatform">{% csrf_token %}
+        <label for="msg"></label>
+        <div class="msg-black">
+        <input type="text" id="msg" size="25" />
+        <input type="submit" value="{% trans "Send" %}" />
+        </div>
+        </form>
+        <script type="text/javascript">document.getElementById("msg").focus();</script>
+        </div>
+</div>

diff --git a/teleforma/templates/telemeta/users.html b/teleforma/templates/telemeta/users.html
index 2f321389966f57a5b1932ee1fc82a18b012bace5..b0583b5c27dfa4640b6ece681204c9ca155bb0d2 100644 (file)
--- a/teleforma/templates/telemeta/users.html
+++ b/teleforma/templates/telemeta/users.html
@@ -11,6 +11,7 @@
 
 {% block content %}
 <div id="module-set-left" style="width: 20%">
+
 <div class="module">
 <h3><img src="{% url telemeta-images "module_playlist.png" %}" alt="playlists" style="vertical-align:middle" />{% trans "Trainings" %}</h3>
 <div style="background: white;">
@@ -24,6 +25,20 @@
 </div>
 </div>
 
+<div class="module">
+<h3><img src="{% url telemeta-images "module_playlist.png" %}" alt="playlists" style="vertical-align:middle" />{% trans "IEJ" %}</h3>
+<div style="background: white;">
+<ul>
+{% block iej %}
+{% for iej in iejs %}
+<li><a href="{% url teleforma-iej-users iej.id %}">{{ iej.name|lower|capfirst }}</a></li>
+{% endfor %}
+{% endblock iej %}
+</ul>
+</div>
+</div>
+
+
 {% if all_users %}
 <div class="module_action">
 <a href="{% url postman_write all_users|to_recipients %}" class="component_icon button" id="action_orange">{% trans "Grouped message" %}</a>
@@ -40,7 +55,7 @@
 </div>
 {% endif %}
 
-<div class="course_title">{% trans "Users" %}{% if training %} - {{ training }}{% else %} - {% trans "All trainings" %}{% endif %}</div>
+<div class="course_title">{% trans "Users" %}{% if training %} - {{ training }}{% elif iej %} - {{ iej }}{% endif %}</div>
 <br />
  {% if users %}
   {% include "telemeta/inc/user_list.html" %}

diff --git a/teleforma/urls.py b/teleforma/urls.py
index 2a61147904cb7f864bb95654cec7e2b674853ff9..c05fcbaef17b9ad85e1d65f9a7a74eb25713ffe4 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -62,6 +62,7 @@ urlpatterns = patterns('',
     # Users
     url(r'^users/$', UsersView.as_view(), name="teleforma-users"),
     url(r'^users/by_training/(\w+)/$', UsersTrainingView.as_view(), name="teleforma-training-users"),
+    url(r'^users/by_iej/(\w+)/$', UsersIejView.as_view(), name="teleforma-iej-users"),
     url(r'^users/all/export/$', user_export.all, name="teleforma-users-xls-export"),
     url(r'^users/by_training/(?P<id>.*)/export/$', user_export.by_training, name="teleforma-training-users-export"),
     url(r'^users/(?P<id>.*)/login/$', UserLoginView.as_view(), name="teleforma-user-login"),

diff --git a/teleforma/views.py b/teleforma/views.py
index 4a126fed10e0eb3b4fdee15cc43d796fba722532..dfa681d15967e3ff11dd27e9fd320527f30f6b5e 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -211,6 +211,7 @@ class UsersView(ListView):
         context = super(UsersView, self).get_context_data(**kwargs)
         context['trainings'] = Training.objects.all()
         context['all_users'] = User.objects.all()
+        context['iejs'] = IEJ.objects.all()
         paginator = NamePaginator(self.object_list, on="last_name", per_page=12)
         try:
             page = int(self.request.GET.get('page', '1'))
@@ -246,19 +247,35 @@ class UserLoginView(View):
 class UsersTrainingView(UsersView):
 
     def get_queryset(self):
-        self.trainings = Training.objects.filter(id=self.args[0])
-        return User.objects.filter(student__training__in=self.trainings).order_by('last_name')
+        self.training = Training.objects.filter(id=self.args[0])
+        return User.objects.filter(student__training__in=self.training).order_by('last_name')
 
     def get_context_data(self, **kwargs):
         context = super(UsersTrainingView, self).get_context_data(**kwargs)
         context['training'] = Training.objects.get(id=self.args[0])
-        context['all_users'] = User.objects.filter(student__training__in=self.trainings).all()
+        context['all_users'] = User.objects.filter(student__training__in=self.training).all()
         return context
 
     @method_decorator(login_required)
     def dispatch(self, *args, **kwargs):
         return super(UsersTrainingView, self).dispatch(*args, **kwargs)
 
+class UsersIejView(UsersView):
+
+    def get_queryset(self):
+        self.iej = IEJ.objects.filter(id=self.args[0])
+        return User.objects.filter(student__iej__in=self.iej).order_by('last_name')
+
+    def get_context_data(self, **kwargs):
+        context = super(UsersIejView, self).get_context_data(**kwargs)
+        context['iej'] = IEJ.objects.get(id=self.args[0])
+        context['all_users'] = User.objects.filter(student__iej__in=self.iej).all()
+        return context
+
+    @method_decorator(login_required)
+    def dispatch(self, *args, **kwargs):
+        return super(UsersIejView, self).dispatch(*args, **kwargs)
+
 
 class UsersXLSExport(object):