diff --git a/src/web/page/templates.rs b/src/web/page/templates.rs index 3145fb3ab..7d3cffbd0 100644 --- a/src/web/page/templates.rs +++ b/src/web/page/templates.rs @@ -221,10 +221,6 @@ pub mod filters { ))) } - pub fn slugify>(code: T) -> rinja::Result { - Ok(slug::slugify(code.as_ref())) - } - pub fn round(value: &f32, precision: u32) -> rinja::Result { let multiplier = if precision == 0 { 1.0 @@ -234,24 +230,14 @@ pub mod filters { Ok(((multiplier * *value).round() / multiplier).to_string()) } - pub fn date(value: &DateTime, format: &str) -> rinja::Result { - Ok(format!("{}", value.format(format))) - } - - pub fn opt_date(value: &Option>, format: &str) -> rinja::Result { - if let Some(value) = value { - date(value, format) - } else { - Ok(String::new()) - } - } - pub fn split_first<'a>(value: &'a str, pat: &str) -> rinja::Result> { Ok(value.split(pat).next()) } - pub fn json_encode(value: &T) -> rinja::Result { - Ok(serde_json::to_string(value).expect("`encode_json` failed")) + pub fn json_encode(value: &T) -> rinja::Result> { + Ok(Safe( + serde_json::to_string(value).expect("`encode_json` failed"), + )) } pub fn rest_menu_url(current_target: &str, inner_path: &str) -> rinja::Result { diff --git a/templates/base.html b/templates/base.html index 02a30faaf..79d67e594 100644 --- a/templates/base.html +++ b/templates/base.html @@ -7,9 +7,10 @@ {%- block meta -%}{%- endblock meta -%} - {# Docs.rs styles #} - - + {#- Docs.rs styles -#} + {%- set build_slug = slug::slugify(crate::BUILD_VERSION) -%} + + @@ -18,8 +19,8 @@ {%- block css -%}{%- endblock css -%} - - + + diff --git a/templates/core/home.html b/templates/core/home.html index 337a30f29..ac55e089f 100644 --- a/templates/core/home.html +++ b/templates/core/home.html @@ -62,7 +62,7 @@

{{ "cubes"|fas(false, false, "") }} Docs.rs

{%- if let Some(build_time) = release.build_time -%}
+ title="{{ build_time.format("%FT%TZ") }}"> {{ build_time|timeformat }}
{%- endif -%} @@ -76,5 +76,5 @@

{{ "cubes"|fas(false, false, "") }} Docs.rs

{%- endblock body -%} {%- block javascript -%} - + {%- endblock javascript -%} diff --git a/templates/crate/build_details.html b/templates/crate/build_details.html index 6d2e1d8b4..bdfc55179 100644 --- a/templates/crate/build_details.html +++ b/templates/crate/build_details.html @@ -22,7 +22,7 @@
- Build #{{ build_details.id }} {%- if let Some(build_time) = build_details.build_time %} {{ build_time|date("%+") }}{% endif %} + Build #{{ build_details.id }} {%- if let Some(build_time) = build_details.build_time %} {{ build_time.format("%+") }}{% endif %}
    diff --git a/templates/crate/source.html b/templates/crate/source.html index 8678c122e..14da8d1c3 100644 --- a/templates/crate/source.html +++ b/templates/crate/source.html @@ -137,6 +137,6 @@ {%- block javascript -%} {% if file_content.is_some() %} - + {% endif %} {%- endblock javascript -%} diff --git a/templates/releases/feed.xml b/templates/releases/feed.xml index 38281de83..59dd65f76 100644 --- a/templates/releases/feed.xml +++ b/templates/releases/feed.xml @@ -11,7 +11,9 @@ urn:docs-rs:{{ crate::BUILD_VERSION }} {%- if let Some(first_release) = recent_releases.get(0) -%} - {{ first_release.build_time|opt_date("%+") }} + {%- if let Some(build_time) = first_release.build_time -%} + {{ build_time.format("%+") }} + {%- endif -%} {%- endif -%} @@ -28,7 +30,11 @@ urn:docs-rs:{{ release.name }}:{{ release.version }} - {{ release.build_time|opt_date("%+") }} + + {% if let Some(build_time) = release.build_time -%} + {{ build_time.format("%+") }} + {%- endif -%} + {%- if let Some(description) = release.description -%} diff --git a/templates/releases/releases.html b/templates/releases/releases.html index 2cbebc0ab..7c4dd17f0 100644 --- a/templates/releases/releases.html +++ b/templates/releases/releases.html @@ -68,7 +68,7 @@
{%- elif let Some(build_time) = release.build_time -%}
+ title="{{ build_time.format("%FT%TZ") }}"> {{ build_time|timeformat }}
{%- else -%} @@ -102,5 +102,5 @@ {%- endblock body -%} {%- block javascript -%} - + {%- endblock javascript -%} diff --git a/templates/rustdoc/body.html b/templates/rustdoc/body.html index 8603b5bbd..365be5086 100644 --- a/templates/rustdoc/body.html +++ b/templates/rustdoc/body.html @@ -1,4 +1,5 @@ - - +{%- set build_slug = slug::slugify(crate::BUILD_VERSION) -%} + + {# see comment in ../storage-change-detection.html for details #} diff --git a/templates/rustdoc/head.html b/templates/rustdoc/head.html index a865b5bd7..100bae597 100644 --- a/templates/rustdoc/head.html +++ b/templates/rustdoc/head.html @@ -1,5 +1,5 @@ {%- import "macros.html" as macros -%} - + diff --git a/templates/rustdoc/topbar.html b/templates/rustdoc/topbar.html index 7eb80f079..b00e2fbe9 100644 --- a/templates/rustdoc/topbar.html +++ b/templates/rustdoc/topbar.html @@ -16,8 +16,8 @@ {# the only text that needs escaping in a {%- if krate is defined -%} diff --git a/templates/rustdoc/vendored.html b/templates/rustdoc/vendored.html index afadf80ea..4f6d400d3 100644 --- a/templates/rustdoc/vendored.html +++ b/templates/rustdoc/vendored.html @@ -1,2 +1 @@ - - +