Merge branch 'devel' of https://github.com/nerosketch/djing into messages

abonapp/locale/ru/LC_MESSAGES/django.po

@@ -339,7 +339,7 @@ msgstr "куда"
 
 #: abonapp/templates/abonapp/dial_log.html:12
 msgid "duration"
-msgstr "продолжительность"
+msgstr "прод."
 
 #: abonapp/templates/abonapp/dial_log.html:13
 msgid "start"

agent/mod_mikrotik.py

@@ -249,7 +249,7 @@ class QueueManager(TransmitterManager, metaclass=ABCMeta):
 
     def remove_range(self, q_ids):
         try:
-            q_ids = [q.queue_id for q in q_ids]
+            #q_ids = [q.queue_id for q in q_ids]
             return self._exec_cmd(['/queue/simple/remove', '=numbers=' + ','.join(q_ids)])
         except TypeError as e:
             print(e)

clientsideapp/templates/clientsideapp/ext.html

@@ -95,7 +95,6 @@
     <div class="container">
         <p class="text-muted">
             Напишите разработчику <i>djing-developer@yandex.ru</i>.
-            П.С. Разработчик и ваш провайдер не одно и то же.
         </p>
     </div>
 </div>

dialing_app/templates/index.html

@@ -21,22 +21,22 @@
             <tbody>
             {% for log in logs %}
                 <tr>
-                    <td class="btn-group btn-group-sm btn-group-justify">
+                    <td class="btn-group btn-group-xs btn-group-justify">
                         <button class="btn btn-default player-btn disabled">
                             <span class="glyphicon glyphicon-play"></span>
-                            <audio preload="metadata" src="{{ log.path_to_media }}/{{ log.calldate|date:"YmdHi" }}-{{ log.src }}-{{ log.dst }}.wav"></audio>
+                            <audio preload="metadata" src="{{ log.path_to_media }}/{{ log.calldate|date:"Y/m/d/H_i" }}-{{ log.src }}-{{ log.dst }}.wav"></audio>
                         </button>
-                        <a href="{{ log.path_to_media }}/{{ log.calldate|date:"YmdHi" }}-{{ log.src }}-{{ log.dst }}.wav" class="btn btn-default disabled" target="_blank">
+			<a href="{{ log.path_to_media }}/{{ log.calldate|date:"Y/m/d/H_i" }}-{{ log.src }}-{{ log.dst }}.wav" class="btn btn-default disabled" target="_blank" title="{% trans 'Download' %}">
                             <span class="glyphicon glyphicon-download-alt"></span>
                         </a>
                     </td>
-                    <td>{{ log.calldate|date:'d E Y, H:i:s' }}</td>
+                    <td>{{ log.calldate|date:'d M, H:i:s' }}</td>
                     <td>{{ log.src|abon_if_telephone|safe }}</td>
                     <td>{{ log.dst|abon_if_telephone|safe }}</td>
                     <td>{{ log.duration }}</td>
-                    <td>{{ log.start|date:'d E Y, H:i:s' }}</td>
-                    <td>{{ log.answer|date:'d E Y, H:i:s' }}</td>
-                    <td>{{ log.end|date:'d E Y, H:i:s' }}</td>
+                    <td>{{ log.start|date:'d M, H:i:s' }}</td>
+                    <td>{{ log.answer|date:'d M, H:i:s' }}</td>
+                    <td>{{ log.end|date:'d M, H:i:s' }}</td>
                     <td>{{ log.locate_disposition }}</td>
                 </tr>
             {% empty %}

templates/404.html

@@ -37,7 +37,7 @@
             <div class="col-md-6 col-md-offset-3">
                 <div align="center"><h1>404 - Страница не найдена</h1></div>
                 <div align="center">
-		    <p>Такого пути '{{ request.path }}' нет нет на сервере</p>
+		    <p>Такого пути '{{ request.path }}' нет на сервере</p>
 		    <a href="/accounts/">На главную</a>
 		</div>
             </div>