From: Calin Crisan <ccrisan@gmail.com>
Date: Mon, 31 Oct 2016 20:50:19 +0000 (+0200)
Subject: motion version is now displayed in the settings panel
X-Git-Url: http://www.vanbest.org/gitweb/?a=commitdiff_plain;h=c67cb6b3e6c5551a04c271946d066df560f99fbb;p=motioneye-debian

motion version is now displayed in the settings panel
---

diff --git a/motioneye/handlers.py b/motioneye/handlers.py
index 18739aa..33fd33a 100644
--- a/motioneye/handlers.py
+++ b/motioneye/handlers.py
@@ -193,10 +193,13 @@ class MainHandler(BaseHandler):
         # additional config
         main_sections = config.get_additional_structure(camera=False, separators=True)[0]
         camera_sections = config.get_additional_structure(camera=True, separators=True)[0]
+        
+        motion_info = motionctl.find_motion(); 
 
         self.render('main.html',
                 frame=False,
                 version=motioneye.VERSION,
+                motion_version=motion_info[1] if motion_info else '(none)',
                 enable_update=settings.ENABLE_UPDATE,
                 enable_reboot=settings.ENABLE_REBOOT,
                 add_remove_cameras=settings.ADD_REMOVE_CAMERAS,
diff --git a/motioneye/templates/main.html b/motioneye/templates/main.html
index 1f18022..76f6685 100644
--- a/motioneye/templates/main.html
+++ b/motioneye/templates/main.html
@@ -172,9 +172,13 @@
                         <td colspan="100"><div class="settings-item-separator"></div></td>
                     </tr>
                     <tr class="settings-item advanced-setting">
-                        <td class="settings-item-label"><span class="settings-item-label">Current Version</span></td>
+                        <td class="settings-item-label"><span class="settings-item-label">motionEye Version</span></td>
                         <td class="settings-item-value"><span class="settings-item-label">{{version}}</span></td>
                     </tr>
+                    <tr class="settings-item advanced-setting">
+                        <td class="settings-item-label"><span class="settings-item-label">Motion Version</span></td>
+                        <td class="settings-item-value"><span class="settings-item-label">{{motion_version}}</span></td>
+                    </tr>
                     {% if enable_update %}
                     <tr class="settings-item advanced-setting">
                         <td class="settings-item-label"><span class="settings-item-label">Software Update</span></td>