From c759142ca24c0145af8df6c417014b0f1b000943 Mon Sep 17 00:00:00 2001 From: Terrtia Date: Mon, 24 Jun 2019 14:37:52 +0200 Subject: [PATCH] fix: [UI settings] fix toggle_sidebar --- installing_deps.sh | 12 ++++++------ .../modules/settings/templates/create_user.html | 16 +++++++++++++++- .../modules/settings/templates/edit_profile.html | 16 +++++++++++++++- .../settings/templates/settings_index.html | 1 + .../modules/settings/templates/users_list.html | 16 +++++++++++++++- var/www/templates/settings/menu_sidebar.html | 15 ++++++--------- 6 files changed, 58 insertions(+), 18 deletions(-) diff --git a/installing_deps.sh b/installing_deps.sh index a996ff7b..db7cfa18 100755 --- a/installing_deps.sh +++ b/installing_deps.sh @@ -99,17 +99,17 @@ if [ -z "$VIRTUAL_ENV" ]; then fi -pushd ${AIL_BIN}/helper/gen_cert +pushd ${AIL_BIN}helper/gen_cert ./gen_root.sh wait ./gen_cert.sh wait popd -cp ${AIL_BIN}/helper/gen_cert/server.crt ${AIL_FLASK}/server.crt -cp ${AIL_BIN}/helper/gen_cert/server.key ${AIL_FLASK}/server.key +cp ${AIL_BIN}helper/gen_cert/server.crt ${AIL_FLASK}server.crt +cp ${AIL_BIN}helper/gen_cert/server.key ${AIL_FLASK}server.key -pushd var/www/ +pushd ${AIL_FLASK} ./update_thirdparty.sh popd @@ -141,7 +141,7 @@ $AIL_HOME/doc/generate_modules_data_flow_graph.sh #### DB SETUP #### # LAUNCH ARDB -bash ${AIL_BIN}/LAUNCH.sh -lav & +bash ${AIL_BIN}LAUNCH.sh -lav & wait echo "" @@ -150,6 +150,6 @@ pushd ${AIL_FLASK} python3 create_default_user.py popd -bash ${AIL_BIN}/LAUNCH.sh -k & +bash ${AIL_BIN}LAUNCH.sh -k & wait echo "" diff --git a/var/www/modules/settings/templates/create_user.html b/var/www/modules/settings/templates/create_user.html index 139a2a90..5ab809ed 100644 --- a/var/www/modules/settings/templates/create_user.html +++ b/var/www/modules/settings/templates/create_user.html @@ -27,7 +27,7 @@ {% include 'settings/menu_sidebar.html' %} -
+