navigation links active fixed

app/app/templates/logged_layout.html

@@ -91,8 +91,8 @@
               <i class="ni ni-briefcase-24 text-pink"></i> Administration
             </a>
           </li>
-	  <li class="nav-item" {{ users }}>
-	    <a class="nav-link {{ users }} " href="/administration/users">
+	  <li class="nav-item" {{ users_link }}>
+	    <a class="nav-link {{ users_link }} " href="/administration/users">
               <i class="ni ni-single-02 text-info"></i> Users
             </a>
           </li>

app/app/views.py

@@ -503,7 +503,7 @@ def application_device_geo(appkey, devid):
 def application_alerts(appkey):
     ap = ad.get(appkey)
     alerts = nfs.get_alerts_list(appkey)
-    return render_template('views/public/alerts.html', alert_list=alerts[1], app=ap[1])
+    return render_template('views/public/alerts.html', alert_list=alerts[1], app=ap[1], applications="active")
 
 
 @app.route('/application/<appkey>/new-alert', methods=['GET', 'POST'])
@@ -514,7 +514,7 @@ def application_new_alert(appkey):
         ap = ad.get(appkey)
         devs = dd.get_list(appkey)
         
-        return render_template('views/public/new-alert.html', devs=devs[1], app=ap[1])
+        return render_template('views/public/new-alert.html', devs=devs[1], app=ap[1], applications="active")
     elif request.method == 'POST':
         # create new notification
         nid = misc.rand_str(app.config['NID_LENGTH']).decode('utf-8')
@@ -565,7 +565,7 @@ def application_automation(appkey):
     ap = ad.get(appkey)
     ats = nfs.get_automation_list(appkey)
     
-    return render_template('views/public/automation.html', automations=ats[1], app=ap[1])
+    return render_template('views/public/automation.html', automations=ats[1], app=ap[1], applications="active")
 
 
 @app.route('/application/<appkey>/new-automation', methods=['GET', 'POST'])
@@ -576,7 +576,7 @@ def application_new_automation(appkey):
         ap = ad.get(appkey)
         devs = dd.get_list(appkey)
         
-        return render_template('views/public/new-automation.html', devs=devs[1], app=ap[1])
+        return render_template('views/public/new-automation.html', devs=devs[1], app=ap[1], applications="active")
     elif request.method == 'POST':
         # create new notification
         nid = misc.rand_str(app.config['NID_LENGTH']).decode('utf-8')
@@ -612,7 +612,7 @@ def application_settings(appkey):
     if request.method == 'GET':
         ap = ad.get(appkey)
 
-        return render_template('views/public/application-settings.html', app=ap[1])
+        return render_template('views/public/application-settings.html', app=ap[1], applications="active")
     elif request.method == 'POST':
         if request.form.getlist('secure') and request.form.getlist('secure')[0] == 'on':
             secure = True
@@ -637,7 +637,7 @@ def application_device_settings(appkey, devid):
         ap = ad.get(appkey)
         dev = dd.get(appkey, devid)
 
-        return render_template('views/public/device-settings.html', app=ap[1], dev=dev[1], models=ddm.MODELS)
+        return render_template('views/public/device-settings.html', app=ap[1], dev=dev[1], models=ddm.MODELS, applications="active")
     elif request.method == 'POST':
         ddmin = ddm.extract(request)
         res = dd.update(appkey, devid, request.form['devname'], request.form['devdesc'], ddmin)
@@ -661,4 +661,4 @@ def map():
     
     devslocs = md.get_devices_locations(session['name'])
     import json 
-    return render_template('views/public/map.html', info=info, devslocs=json.dumps(devslocs))
+    return render_template('views/public/map.html', info=info, devslocs=json.dumps(devslocs), map="active")

app/app/views_admin.py

@@ -35,7 +35,7 @@ def administration():
         devs_cnt = dd.get_count_all()[1][0]
         info = [user_cnt, apps_cnt, devs_cnt]
 
-        return render_template('views/admin/administration.html', info=info)
+        return render_template('views/admin/administration.html', info=info, administration="active")
     elif request.method == 'POST':
         if request.form.getlist('signup') and request.form.getlist('signup')[0] == 'on':
             app.config['USERS_SIGNUP'] = True
@@ -58,7 +58,7 @@ def administration_users():
     cur_pg = 1
     users = ud.get_range([MAX_PG_ENTRIES_USERS, (cur_pg-1)*MAX_PG_ENTRIES_USERS])[1]
 
-    return render_template('views/admin/users.html', users=users, info=info)
+    return render_template('views/admin/users.html', users=users, info=info, users_link="active")
 
 
 @app.route('/administration/<name>')
@@ -70,20 +70,20 @@ def administration_user(name):
     last_activity = md.get_user_data_count_per_day(name)[1][0]
     info = [created_apps, active_devices, total_activity, last_activity]
 
-    return render_template('views/admin/user-dashboard.html', info=info, user=name)
+    return render_template('views/admin/user-dashboard.html', info=info, user=name, administration="active")
 
 @app.route('/administration/<name>/applications')
 @restricted('admin', True)
 def administration_user_applications(name):
     apps = ad.get_list(name)[1]
-    return render_template('views/admin/user-applications.html', apps=apps, user=name)
+    return render_template('views/admin/user-applications.html', apps=apps, user=name, administration="active")
 
 
 @app.route('/administration/<name>/new-application', methods=['GET', 'POST'])
 @restricted('admin', True)
 def administration_user_new_application(name):
     if request.method == 'GET':
-        return render_template('views/admin/user-new-application.html', user=name)
+        return render_template('views/admin/user-new-application.html', user=name, administration="active")
     elif request.method == 'POST':
         if request.form['appname'] == '':
             flash('Application name cannot be empty.', 'danger')
@@ -123,7 +123,7 @@ def administration_user_application(name, appkey):
     ap[5] = misc.skey_b64_to_hex(ap[5])
     devs = dd.get_list(ap[1])[1]
 
-    return render_template('views/admin/user-application.html', app=ap, devs=devs, user=name)
+    return render_template('views/admin/user-application.html', app=ap, devs=devs, user=name, administration="active")
 
 
 @app.route('/administration/<name>/application/<appkey>/add-device', methods=['GET', 'POST'])
@@ -132,7 +132,7 @@ def administration_user_application_add_device(name, appkey):
     if request.method == 'GET':
         ap = ad.get(appkey)
         dev_list = dd.get_list(appkey)
-        return render_template('views/admin/user-application-add-device.html', app=ap[1], free_ids=misc.prep_id_range(dev_list[1]), models=ddm.MODELS, user=name)
+        return render_template('views/admin/user-application-add-device.html', app=ap[1], free_ids=misc.prep_id_range(dev_list[1]), models=ddm.MODELS, user=name, administration="active")
     elif request.method == 'POST':
         if dd.check_devid(appkey, request.form['devid']):
             ddmin = ddm.extract(request)
@@ -174,7 +174,7 @@ def administration_user_application_device(name, appkey, devid):
     if ld[0] and ld[1][0] != []:
         ltup = ld[1][0][1]
 
-    return render_template('views/admin/user-application-device.html', dev=dev[1], app=ap[1], ltup=ltup, total=cnt[1][0], user=name, table_max=MAX_PG_ENTRIES_DATA)
+    return render_template('views/admin/user-application-device.html', dev=dev[1], app=ap[1], ltup=ltup, total=cnt[1][0], user=name, table_max=MAX_PG_ENTRIES_DATA, administration="active")
 
 
 @app.route('/administration/<name>/application/<appkey>/device/<devid>/settings', methods=['GET', 'POST'])
@@ -184,7 +184,7 @@ def administration_user_application_device_settings(name, appkey, devid):
         ap = ad.get(appkey)
         dev = dd.get(appkey, devid)
 
-        return render_template('views/admin/user-application-device-settings.html', app=ap[1], dev=dev[1], models=ddm.MODELS, user=name)
+        return render_template('views/admin/user-application-device-settings.html', app=ap[1], dev=dev[1], models=ddm.MODELS, user=name, administration="active")
     elif request.method == 'POST':
         ddmin = ddm.extract(request)
         res = dd.update(appkey, devid, request.form['devname'], request.form['devdesc'], ddmin)
@@ -222,7 +222,7 @@ def administration_user_application_device_delete(name, appkey, devid):
 def administration_user_application_alerts(name, appkey):
     ap = ad.get(appkey)
     alerts = nfs.get_alerts_list(appkey)
-    return render_template('views/admin/user-application-alerts.html', alert_list=alerts[1], app=ap[1], user=name)
+    return render_template('views/admin/user-application-alerts.html', alert_list=alerts[1], app=ap[1], user=name, administration="active")
 
 
 @app.route('/administration/<name>/application/<appkey>/new-alert', methods=['GET', 'POST'])
@@ -232,7 +232,7 @@ def administration_user_application_new_alert(name, appkey):
             ap = ad.get(appkey)
             devs = dd.get_list(appkey)
             
-            return render_template('views/admin/user-application-new-alert.html', devs=devs[1], app=ap[1], user=name)
+            return render_template('views/admin/user-application-new-alert.html', devs=devs[1], app=ap[1], user=name, administration="active")
         elif request.method == 'POST':
             # create new notification
             nid = misc.rand_str(app.config['NID_LENGTH']).decode('utf-8')
@@ -264,7 +264,7 @@ def administration_user_application_automation(name, appkey):
     ap = ad.get(appkey)
     ats = nfs.get_automation_list(appkey)
     
-    return render_template('views/admin/user-application-automation.html', automations=ats[1], app=ap[1], user=name)
+    return render_template('views/admin/user-application-automation.html', automations=ats[1], app=ap[1], user=name, administration="active")
 
 
 @app.route('/administration/<name>/application/<appkey>/new-automation', methods=['GET', 'POST'])
@@ -274,7 +274,7 @@ def administration_user_application_new_automation(name, appkey):
         ap = ad.get(appkey)
         devs = dd.get_list(appkey)
         
-        return render_template('views/admin/user-application-new-automation.html', devs=devs[1], app=ap[1], user=name)
+        return render_template('views/admin/user-application-new-automation.html', devs=devs[1], app=ap[1], user=name, administration="active")
     elif request.method == 'POST':
         # create new notification
         nid = misc.rand_str(app.config['NID_LENGTH']).decode('utf-8')
@@ -337,7 +337,7 @@ def administration_user_application_settings(name, appkey):
     if request.method == 'GET':
         ap = ad.get(appkey)
 
-        return render_template('views/admin/user-application-settings.html', app=ap[1], user=name)
+        return render_template('views/admin/user-application-settings.html', app=ap[1], user=name, administration="active")
     elif request.method == 'POST':
         if request.form.getlist('secure') and request.form.getlist('secure')[0] == 'on':
             secure = True
@@ -439,7 +439,7 @@ def administration_user_application_device_configuration(name, appkey, devid):
                 ack = pm[3]
                 config_list.append((config_id, config_args, ack, pm[2]))
         
-        return render_template('views/admin/user-application-device-configuration.html', dev=dev, app=ap, config_list=config_list, user=name)
+        return render_template('views/admin/user-application-device-configuration.html', dev=dev, app=ap, config_list=config_list, user=name, administration="active")
     elif request.method == 'POST':
         base64_args = misc.pend_base64_encode(request.form['arg'], request.form['confid'])
         pend.create(appkey, devid, base64_args)
@@ -548,7 +548,7 @@ def administration_users_table(page):
 @restricted('admin')
 def administration_new_user():
     if request.method == 'GET':
-        return render_template('views/admin/new-user.html')
+        return render_template('views/admin/new-user.html', administration="active")
     elif request.method == 'POST':
         username = request.form['username']
         password = request.form['password'].encode('utf-8')
@@ -578,7 +578,7 @@ def administration_user_settings(name):
     user = ud.get(name)
     if user[0] and misc.grant_view(user[1][2], session['role']):
         if request.method == 'GET':
-            return render_template('views/admin/user-settings.html', user=name, user_role=user[1][2])
+            return render_template('views/admin/user-settings.html', user=name, user_role=user[1][2], administration="active")
         else:
             if request.form['name'] != name:
                 res = ud.update_name(name, request.form['name'])
@@ -637,7 +637,7 @@ def administration_user_delete_account(name):
         if not res[0]:
             flash('Error: {}'.format(res[1]), 'danger')
             app.logger.error('Administrator %s failed to delete user %s - %s', session['name'], name, res[1])
-            return render_template('views/admin/user-settings.html', user=name)
+            return render_template('views/admin/user-settings.html', user=name, administration="active")
         else:
             app.logger.warning('Administrator %s deleted user %s', session['name'], name)
             flash('User {} was deleted'.format(name), 'success')