AIL/ail-framework
7
0
Fork 0
mirror of https://github.com/ail-project/ail-framework.git synced 2024-11-10 00:28:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: [UI settings] fix toggle_sidebar

Browse source
This commit is contained in:
Terrtia 2019-06-24 14:37:52 +02:00
parent e090b664ff
commit c759142ca2
No known key found for this signature in database
GPG key ID: 1E1B1F50D84613D0
6 changed files with 58 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
installing_deps.sh
View file

@ -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 ""

16
var/www/modules/settings/templates/create_user.html
View file

@ -27,7 +27,7 @@
{% include 'settings/menu_sidebar.html' %}
<div class="col-12 col-xl-10" id="core_content">
<div class="col-12 col-lg-10" id="core_content">
<form class="form-signin" action="{{ url_for('settings.create_user_post')}}" autocomplete="off" method="post">
@ -120,6 +120,20 @@ $(document).ready(function(){
{% endif %}
} );
function toggle_sidebar(){
if($('#nav_menu').is(':visible')){
$('#nav_menu').hide();
$('#side_menu').removeClass('border-right')
$('#side_menu').removeClass('col-lg-2')
$('#core_content').removeClass('col-lg-10')
}else{
$('#nav_menu').show();
$('#side_menu').addClass('border-right')
$('#side_menu').addClass('col-lg-2')
$('#core_content').addClass('col-lg-10')
}
}
function toggle_password_fields() {
var password_div = $("#password-section");
if(password_div.is(":visible")){

16
var/www/modules/settings/templates/edit_profile.html
View file

@ -27,7 +27,7 @@
{% include 'settings/menu_sidebar.html' %}
<div class="col-12 col-xl-10" id="core_content">
<div class="col-12 col-lg-10" id="core_content">
<div class="card mb-3 mt-1">
<div class="card-header text-white bg-dark pb-1">
@ -77,6 +77,20 @@ $(document).ready(function(){
$("#nav_edit_profile").addClass("active");
$("#nav_my_profile").removeClass("text-muted");
} );
function toggle_sidebar(){
if($('#nav_menu').is(':visible')){
$('#nav_menu').hide();
$('#side_menu').removeClass('border-right')
$('#side_menu').removeClass('col-lg-2')
$('#core_content').removeClass('col-lg-10')
}else{
$('#nav_menu').show();
$('#side_menu').addClass('border-right')
$('#side_menu').addClass('col-lg-2')
$('#core_content').addClass('col-lg-10')
}
}
</script>
</html>

1
var/www/modules/settings/templates/settings_index.html
View file

@ -192,6 +192,7 @@ update_progress();
var progress_interval = setInterval(function(){
update_progress()
}, 4000);
</script>
</html>

16
var/www/modules/settings/templates/users_list.html
View file

@ -38,7 +38,7 @@
{% include 'settings/menu_sidebar.html' %}
<div class="col-12 col-xl-10" id="core_content">
<div class="col-12 col-lg-10" id="core_content">
{% if new_user %}
<div class="text-center my-3 ">
@ -103,6 +103,20 @@ $(document).ready(function(){
$("#nav_users_list").addClass("active");
$("#nav_user_management").removeClass("text-muted");
} );
function toggle_sidebar(){
if($('#nav_menu').is(':visible')){
$('#nav_menu').hide();
$('#side_menu').removeClass('border-right')
$('#side_menu').removeClass('col-lg-2')
$('#core_content').removeClass('col-lg-10')
}else{
$('#nav_menu').show();
$('#side_menu').addClass('border-right')
$('#side_menu').addClass('col-lg-2')
$('#core_content').addClass('col-lg-10')
}
}
</script>
</html>

15
var/www/templates/settings/menu_sidebar.html
View file

@ -1,11 +1,11 @@
<div class="col-12 col-lg-2 p-0 bg-light border-right" id="side_menu">
<button type="button" class="btn btn-outline-secondary mt-1 ml-3" onclick="toggle_sidebar()">
<button type="button" class="btn btn-outline-secondary mt-1 ml-3" onclick="toggle_sidebar();">
<i class="fas fa-align-left"></i>
<span>Toggle Sidebar</span>
</button>
<nav class="navbar navbar-expand navbar-light bg-light flex-md-column flex-row align-items-start py-2">
<nav class="navbar navbar-expand navbar-light bg-light flex-md-column flex-row align-items-start py-2" id="nav_menu">
<h5 class="d-flex text-muted w-100" id="nav_server">
<span>Diagnostic</span>
</h5>
@ -17,9 +17,7 @@
</a>
</li>
</ul>
</nav>
<nav class="navbar navbar-expand navbar-light bg-light flex-md-column flex-row align-items-start py-2" id="nav_profile">
<h5 class="d-flex text-muted w-100" id="nav_my_profile">
<h5 class="d-flex text-muted w-100 py-2" id="nav_my_profile">
<span>My Profile</span>
</h5>
<ul class="nav flex-md-column flex-row navbar-nav justify-content-between w-100"> <!--nav-pills-->
@ -36,10 +34,8 @@
</a>
</li>
</ul>
</nav>
{% if admin_level %}
<nav class="navbar navbar-expand navbar-light bg-light flex-md-column flex-row align-items-start py-2" id="nav_users">
<h5 class="d-flex text-muted w-100" id="nav_user_management">
<h5 class="d-flex text-muted w-100 py-2" id="nav_user_management">
<span>User Management</span>
</h5>
<ul class="nav flex-md-column flex-row navbar-nav justify-content-between w-100"> <!--nav-pills-->
@ -56,6 +52,7 @@
</a>
</li>
</ul>
</nav>
{% endif %}
</nav>
</div>