From b91cc72686c0b6220f95da386bd3932f5d03e43e Mon Sep 17 00:00:00 2001 From: Tamas Levai Date: Sun, 28 Feb 2021 22:02:58 +0100 Subject: Add program version footer --- src/renderer.rs | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) (limited to 'src/renderer.rs') diff --git a/src/renderer.rs b/src/renderer.rs index af08285..6253f69 100644 --- a/src/renderer.rs +++ b/src/renderer.rs @@ -26,6 +26,7 @@ pub fn page( breadcrumbs: Vec, tar_enabled: bool, zip_enabled: bool, + hide_version_footer: bool, ) -> Markup { let upload_action = build_upload_action(upload_route, encoded_dir, sort_method, sort_order); @@ -138,12 +139,35 @@ pub fn page( a.back href="#top" { (arrow_up()) } + @if !hide_version_footer { + (version_footer()) + } } } } } } +// Get version info +fn get_version_info() -> String { + const PROG_NAME: Option<&'static str> = option_env!("CARGO_PKG_NAME"); + const VERSION: Option<&'static str> = option_env!("CARGO_PKG_VERSION"); + format!( + "{}/{}", + PROG_NAME.unwrap_or("miniserve"), + VERSION.unwrap_or("unknown") + ) +} + +// Partial: version footer +fn version_footer() -> Markup { + html! { + p style="text-align:center;padding-top:1em" { + (get_version_info()) + } + } +} + /// Build the action of the upload form fn build_upload_action( upload_route: &str, @@ -465,6 +489,7 @@ pub fn render_error( css_route: &str, default_color_scheme: &str, default_color_scheme_dark: &str, + hide_version_footer: bool, ) -> Markup { let link = if has_referer { return_address.to_string() @@ -492,6 +517,9 @@ pub fn render_error( } } } + @if !hide_version_footer { + (version_footer()) + } } } } -- cgit v1.2.3 From 23570b35fe8cd0b610c72dc793f8a27d0d341d07 Mon Sep 17 00:00:00 2001 From: Tamas Levai Date: Sun, 28 Feb 2021 22:25:36 +0100 Subject: Fix indentation --- src/renderer.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/renderer.rs') diff --git a/src/renderer.rs b/src/renderer.rs index 6253f69..404dd5d 100644 --- a/src/renderer.rs +++ b/src/renderer.rs @@ -139,9 +139,9 @@ pub fn page( a.back href="#top" { (arrow_up()) } - @if !hide_version_footer { - (version_footer()) - } + @if !hide_version_footer { + (version_footer()) + } } } } @@ -517,9 +517,9 @@ pub fn render_error( } } } - @if !hide_version_footer { - (version_footer()) - } + @if !hide_version_footer { + (version_footer()) + } } } } -- cgit v1.2.3 From 4589d67334aeffcddf0b46974863291a5b59c9f6 Mon Sep 17 00:00:00 2001 From: Tamas Levai Date: Mon, 1 Mar 2021 07:55:34 +0100 Subject: Use structopt macros to ge crate info --- src/renderer.rs | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'src/renderer.rs') diff --git a/src/renderer.rs b/src/renderer.rs index 404dd5d..f36636b 100644 --- a/src/renderer.rs +++ b/src/renderer.rs @@ -4,7 +4,7 @@ use chrono_humanize::Humanize; use maud::{html, Markup, PreEscaped, DOCTYPE}; use std::time::SystemTime; use strum::IntoEnumIterator; - +use structopt::clap::{crate_name, crate_version}; use crate::archive::CompressionMethod; use crate::listing::{Breadcrumb, Entry, SortingMethod, SortingOrder}; @@ -148,22 +148,11 @@ pub fn page( } } -// Get version info -fn get_version_info() -> String { - const PROG_NAME: Option<&'static str> = option_env!("CARGO_PKG_NAME"); - const VERSION: Option<&'static str> = option_env!("CARGO_PKG_VERSION"); - format!( - "{}/{}", - PROG_NAME.unwrap_or("miniserve"), - VERSION.unwrap_or("unknown") - ) -} - // Partial: version footer fn version_footer() -> Markup { html! { p style="text-align:center;padding-top:1em" { - (get_version_info()) + (format!("{}/{}", crate_name!(), crate_version!())) } } } -- cgit v1.2.3 From 337e313d5cbec9ca57d4bc66cd77820c7ed3409f Mon Sep 17 00:00:00 2001 From: Tamas Levai Date: Mon, 1 Mar 2021 08:18:38 +0100 Subject: renderer: Follow alphabetical order in package uses --- src/renderer.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/renderer.rs') diff --git a/src/renderer.rs b/src/renderer.rs index f36636b..986a0b3 100644 --- a/src/renderer.rs +++ b/src/renderer.rs @@ -3,8 +3,9 @@ use chrono::{DateTime, Utc}; use chrono_humanize::Humanize; use maud::{html, Markup, PreEscaped, DOCTYPE}; use std::time::SystemTime; -use strum::IntoEnumIterator; use structopt::clap::{crate_name, crate_version}; +use strum::IntoEnumIterator; + use crate::archive::CompressionMethod; use crate::listing::{Breadcrumb, Entry, SortingMethod, SortingOrder}; -- cgit v1.2.3 From 4821160504f36e447f15d6df213d81f44dc044e5 Mon Sep 17 00:00:00 2001 From: Tamas Levai Date: Mon, 1 Mar 2021 08:20:19 +0100 Subject: Use CSS to configure version footer look --- src/renderer.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/renderer.rs') diff --git a/src/renderer.rs b/src/renderer.rs index 986a0b3..b3b60cd 100644 --- a/src/renderer.rs +++ b/src/renderer.rs @@ -152,7 +152,7 @@ pub fn page( // Partial: version footer fn version_footer() -> Markup { html! { - p style="text-align:center;padding-top:1em" { + p.footer { (format!("{}/{}", crate_name!(), crate_version!())) } } -- cgit v1.2.3