diff --git a/examples/azure_auth/main.rs b/examples/azure_auth/main.rs index 1a2ba81..1c7bc2e 100644 --- a/examples/azure_auth/main.rs +++ b/examples/azure_auth/main.rs @@ -110,7 +110,8 @@ fn create_actix_admin_builder() -> ActixAdminBuilder { }), login_link: Some("/azure-auth/login".to_string()), logout_link: Some("/azure-auth/logout".to_string()), - file_upload_directory: "./file_uploads" + file_upload_directory: "./file_uploads", + navbar_title: "ActixAdmin Example" }; let mut admin_builder = ActixAdminBuilder::new(configuration); diff --git a/examples/basic/main.rs b/examples/basic/main.rs index 6599dca..b38179c 100644 --- a/examples/basic/main.rs +++ b/examples/basic/main.rs @@ -28,7 +28,8 @@ fn create_actix_admin_builder() -> ActixAdminBuilder { user_is_logged_in: None, login_link: None, logout_link: None, - file_upload_directory: "./file_uploads" + file_upload_directory: "./file_uploads", + navbar_title: "ActixAdmin Example" }; let mut admin_builder = ActixAdminBuilder::new(configuration); diff --git a/src/lib.rs b/src/lib.rs index 03304ca..a940e24 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -74,6 +74,7 @@ pub struct ActixAdminConfiguration { pub login_link: Option, pub logout_link: Option, pub file_upload_directory: &'static str, + pub navbar_title: &'static str } #[derive(Clone)] diff --git a/src/routes/helpers.rs b/src/routes/helpers.rs index 3ff5385..42b13cc 100644 --- a/src/routes/helpers.rs +++ b/src/routes/helpers.rs @@ -8,6 +8,7 @@ use actix_web::{error, Error, HttpResponse}; pub fn add_auth_context(session: &Session, actix_admin: &ActixAdmin, ctx: &mut Context) { let enable_auth = &actix_admin.configuration.enable_auth; ctx.insert("enable_auth", &enable_auth); + ctx.insert("navbar_title", &actix_admin.configuration.navbar_title); if *enable_auth { let func = &actix_admin.configuration.user_is_logged_in.unwrap(); ctx.insert("user_is_logged_in", &func(session)); diff --git a/src/templates/base.html b/src/templates/base.html index 3550682..e3ce7f0 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -24,9 +24,17 @@ {% endfor %} {% endif %} +
- {% block content %} - {% endblock content %} +
+ + + {% block content %} + {% endblock content %} +
diff --git a/src/templates/head.html b/src/templates/head.html index 538d487..9eee15a 100644 --- a/src/templates/head.html +++ b/src/templates/head.html @@ -1,6 +1,6 @@ -Actix Admin +{{ navbar_title }} @@ -51,6 +51,15 @@ document.getElementById('table_form').requestSubmit(); } + function toggle_aside() { + el = document.getElementById("nav_aside"); + if(el.classList.contains("is-hidden")) { + el.classList.remove("is-hidden"); + } else { + el.classList.add("is-hidden"); + } + } + document.addEventListener('DOMContentLoaded', () => { // Get all "navbar-burger" elements const $navbarBurgers = Array.prototype.slice.call(document.querySelectorAll('.navbar-burger'), 0); diff --git a/src/templates/list.html b/src/templates/list.html index c0c5a57..9a976da 100644 --- a/src/templates/list.html +++ b/src/templates/list.html @@ -1,204 +1,218 @@ {% extends "base.html" %} +{% block aside %} +

Filter

+ +{% endblock aside %} + {% block content %} {% if not render_partial or render_partial == false %} -
-
- +
+
+
+ -
-
- +
+
+ +
+ +
+ +
- -
-
- - -
-
- {% if view_model.show_search %} -

- - - - -

- {% endif %} -
-
- -

Entities per Page

-
-
-
-
-
-
-{% endif %} + {% endif %} -
-
- {% include "loader.html" %} -
- - - - - - - +
+
+ {% include "loader.html" %} + + + + + + +
+ + + + + {% for model_field in view_model.fields | filter(attribute="list_hide_column", + value=false) | + sort(attribute="list_sort_position") -%} + + {%- endfor %} + + + + + + {% for entity in entities -%} - - - {% for model_field in view_model.fields | filter(attribute="list_hide_column", value=false) | - sort(attribute="list_sort_position") -%} - - {%- endfor %} - - - - - - {% for entity in entities -%} - - - - {% for model_field in view_model.fields | filter(attribute="list_hide_column", value=false) | - sort(attribute="list_sort_position") -%} - {% if model_field.field_type == "Checkbox" %} - - {% elif model_field.field_type == "FileUpload" %} - - {% else %} - - {% endif %} - {%- endfor %} - - - {%- endfor %} - - - - - - -
+ + {{ + view_model.primary_key | title }} + {% if sort_by == view_model.primary_key %} + {% if sort_order == "Asc" %} + + {% elif sort_order == "Desc" %} + + {% endif %} + {% endif %} + {{ + model_field.field_name | split(pat="_") | join(sep=" ") | title }} + {% if sort_by == model_field.field_name %} + {% if sort_order == "Asc" %} + + {% elif sort_order == "Desc" %} + + {% endif %} + {% endif %} + + + +
- - {{ - view_model.primary_key | title }} - {% if sort_by == view_model.primary_key %} - {% if sort_order == "Asc" %} - - {% elif sort_order == "Desc" %} - - {% endif %} - {% endif %} - {{ - model_field.field_name | split(pat="_") | join(sep=" ") | title }} - {% if sort_by == model_field.field_name %} - {% if sort_order == "Asc" %} - - {% elif sort_order == "Desc" %} - - {% endif %} - {% endif %} - - - -
- - {{ entity.primary_key }} - - {{ entity.values | get(key=model_field.field_name) | get_icon | safe }}{{ - entity.values - | get(key=model_field.field_name) }}{{ entity.values | get(key=model_field.field_name) }} - - - - - - -
-
- -
-
diff --git a/src/templates/navbar.html b/src/templates/navbar.html index 4011023..979f392 100644 --- a/src/templates/navbar.html +++ b/src/templates/navbar.html @@ -1,7 +1,7 @@ -