media groups are now sorted by name descending

diff --git a/src/handlers.py b/src/handlers.py
index 94adaff9a804cdaa7dfe89e6256e11aa4b1670d5..ee5a68c598e919d7b2ff9b6989dd8a74c00a2808 100644 (file)
--- a/src/handlers.py
+++ b/src/handlers.py
@@ -16,7 +16,6 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>. 
 
 import base64
-import functools
 import json
 import logging
 import os

diff --git a/src/utils.py b/src/utils.py
index 30645966741bcc719bb55787ef71184dd6211924..32dca3053ed1aa0191efcfc8d1abfcc935c5a92f 100644 (file)
--- a/src/utils.py
+++ b/src/utils.py
@@ -216,4 +216,4 @@ def make_camera_url(config):
     port = config.get('port', config.get('@port', ''))
     device_uri = config.get('device_uri', config.get('videodevice', remote.make_camera_uri(config.get('@remote_camera_id'))))
     
-    return proto + '://' + host + (str(port) + ':' if port else '') + device_uri
+    return proto + '://' + host + (':' + str(port) if port else '') + device_uri

diff --git a/static/js/main.js b/static/js/main.js
index 5ffbf594be352ce8d47a92bd14ced3f694f536e0..0a63be298f1d7a5df3c2f529d771e5c1c6d97578 100644 (file)
--- a/static/js/main.js
+++ b/static/js/main.js
@@ -1485,6 +1485,7 @@ function runMediaDialog(cameraId, mediaType) {
         
         var keys = Object.keys(groups);
         keys.sort();
+        keys.reverse();
         
         /* add a temporary div to compute 3em in px */
         var tempDiv = $('<div style="width: 3em; height: 3em;"></div>');