serv/surwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor rendering of pages to centralize header layout.

Browse source 
Convert all pages to new layout
This commit is contained in:
Magnus Hoff 2018-06-17 10:41:18 +02:00
parent 2b27e27a9b
commit e4629d8edb
16 changed files with 117 additions and 182 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/resources/about_resource.rs
View file

@ -5,7 +5,7 @@ use hyper::server::*;
use build_config;
use mimes::*;
use site::Layout;
use site::system_page;
use web::{Resource, ResponseFuture};
#[derive(Licenses)]
@ -81,14 +81,13 @@ impl Resource for AboutResource {
Box::new(head
.and_then(move |head| {
Ok(head
.with_body(Layout {
base: None, // Hmm, should perhaps accept `base` as argument
title: "About Sausagewiki",
body: &Template {
deps: &*LICENSE_INFOS
},
}.to_string()))
Ok(head.with_body(system_page(
None, // Hmm, should perhaps accept `base` as argument
"About Sausagewiki",
Template {
deps: &*LICENSE_INFOS
},
).to_string()))
}))
}
}

58
src/resources/article_revision_resource.rs
View file

@ -7,7 +7,7 @@ use hyper::server::*;
use mimes::*;
use models;
use rendering::render_markdown;
use site::Layout;
use site::system_page;
use web::{Resource, ResponseFuture};
use super::changes_resource::QueryParameters;
@ -81,8 +81,6 @@ impl Resource for ArticleRevisionResource {
link_current: &'a str,
timestamp_and_author: &'a str,
diff_link: Option<String>,
title: &'a str,
rendered: String,
}
@ -91,34 +89,32 @@ impl Resource for ArticleRevisionResource {
Box::new(head
.and_then(move |head|
Ok(head
.with_body(Layout {
base: Some("../../"), // Hmm, should perhaps accept `base` as argument
title: &data.title,
body: &Template {
link_current: &format!("_by_id/{}", data.article_id),
timestamp_and_author: &timestamp_and_author(
data.sequence_number,
data.article_id,
&Local.from_utc_datetime(&data.created),
data.author.as_ref().map(|x| &**x)
),
diff_link:
if data.revision > 1 {
Some(format!("_diff/{}?{}",
data.article_id,
diff_resource::QueryParameters::new(
data.revision as u32 - 1,
data.revision as u32,
)
))
} else {
None
},
title: &data.title,
rendered: render_markdown(&data.body),
},
}.to_string()))
Ok(head.with_body(system_page(
Some("../../"), // Hmm, should perhaps accept `base` as argument
&data.title,
&Template {
link_current: &format!("_by_id/{}", data.article_id),
timestamp_and_author: &timestamp_and_author(
data.sequence_number,
data.article_id,
&Local.from_utc_datetime(&data.created),
data.author.as_ref().map(|x| &**x)
),
diff_link:
if data.revision > 1 {
Some(format!("_diff/{}?{}",
data.article_id,
diff_resource::QueryParameters::new(
data.revision as u32 - 1,
data.revision as u32,
)
))
} else {
None
},
rendered: render_markdown(&data.body),
},
).to_string()))
))
}
}

25
src/resources/changes_resource.rs
View file

@ -8,7 +8,7 @@ use serde_urlencoded;
use mimes::*;
use schema::article_revisions;
use site::Layout;
use site::system_page;
use state::State;
use web::{Resource, ResponseFuture};
@ -352,18 +352,17 @@ impl Resource for ChangesResource {
}
}).collect::<Vec<_>>();
Ok(head
.with_body(Layout {
base: None, // Hmm, should perhaps accept `base` as argument
title: "Changes",
body: &Template {
resource: &self,
show_authors: self.show_authors,
newer,
older,
changes
},
}.to_string()))
Ok(head.with_body(system_page(
None, // Hmm, should perhaps accept `base` as argument
"Changes",
Template {
resource: &self,
show_authors: self.show_authors,
newer,
older,
changes
}
).to_string()))
}))
}
}

23
src/resources/html_resource.rs
View file

@ -4,7 +4,7 @@ use hyper::header::ContentType;
use hyper::server::*;
use mimes::*;
use site::Layout;
use site::system_page;
use web::{Resource, ResponseFuture};
pub struct HtmlResource {
@ -19,13 +19,6 @@ impl HtmlResource {
}
}
#[derive(BartDisplay)]
#[template="templates/simple.html"]
struct Template<'a> {
title: &'a str,
html_body: &'a str,
}
impl Resource for HtmlResource {
fn allow(&self) -> Vec<hyper::Method> {
use hyper::Method::*;
@ -44,15 +37,11 @@ impl Resource for HtmlResource {
Box::new(head
.and_then(move |head| {
Ok(head
.with_body(Layout {
base: self.base,
title: self.title,
body: &Template {
title: self.title,
html_body: self.html_body,
},
}.to_string()))
Ok(head.with_body(system_page(
self.base,
self.title,
self.html_body
).to_string()))
}))
}
}

27
src/resources/search_resource.rs
View file

@ -7,7 +7,7 @@ use serde_urlencoded;
use mimes::*;
use models::SearchResult;
use site::Layout;
use site::system_page;
use state::State;
use web::{Resource, ResponseFuture};
@ -198,19 +198,18 @@ impl Resource for SearchResource {
next,
}).expect("Should never fail"))
),
&ResponseType::Html => Ok(head
.with_body(Layout {
base: None, // Hmm, should perhaps accept `base` as argument
title: "Search",
body: &Template {
query: self.query.as_ref().map(|x| &**x).unwrap_or(""),
hits: &data.iter()
.enumerate()
.collect::<Vec<_>>(),
prev,
next,
},
}.to_string())),
&ResponseType::Html => Ok(head.with_body(system_page(
None, // Hmm, should perhaps accept `base` as argument
"Search",
&Template {
query: self.query.as_ref().map(|x| &**x).unwrap_or(""),
hits: &data.iter()
.enumerate()
.collect::<Vec<_>>(),
prev,
next,
},
).to_string())),
}
}))
}

17
src/resources/sitemap_resource.rs
View file

@ -5,7 +5,7 @@ use hyper::server::*;
use mimes::*;
use models::ArticleRevisionStub;
use site::Layout;
use site::system_page;
use state::State;
use web::{Resource, ResponseFuture};
@ -44,14 +44,13 @@ impl Resource for SitemapResource {
Box::new(data.join(head)
.and_then(move |(articles, head)| {
Ok(head
.with_body(Layout {
base: None, // Hmm, should perhaps accept `base` as argument
title: "Sitemap",
body: &Template {
articles: &articles,
},
}.to_string()))
Ok(head.with_body(system_page(
None, // Hmm, should perhaps accept `base` as argument
"Sitemap",
Template {
articles: &articles,
},
).to_string()))
}))
}
}

42
src/site.rs
View file

@ -31,7 +31,7 @@ header! { (XIdentity, "X-Identity") => [String] }
pub struct Layout<'a, T: 'a + fmt::Display> {
pub base: Option<&'a str>,
pub title: &'a str,
pub body: &'a T,
pub body: T,
}
impl<'a, T: 'a + fmt::Display> Layout<'a, T> {
@ -47,6 +47,28 @@ impl<'a, T: 'a + fmt::Display> Layout<'a, T> {
pub fn version(&self) -> &str { build_config::VERSION.as_str() }
}
#[derive(BartDisplay)]
#[template="templates/system_page_layout.html"]
pub struct SystemPageLayout<'a, T: 'a + fmt::Display> {
title: &'a str,
html_body: T,
}
pub fn system_page<'a, T>(base: Option<&'a str>, title: &'a str, body: T)
-> Layout<'a, SystemPageLayout<'a, T>>
where
T: 'a + fmt::Display
{
Layout {
base,
title,
body: SystemPageLayout {
title,
html_body: body,
},
}
}
#[derive(BartDisplay)]
#[template = "templates/error/404.html"]
struct NotFound;
@ -68,11 +90,11 @@ impl Site {
fn not_found(base: Option<&str>) -> Response {
Response::new()
.with_header(ContentType(TEXT_HTML.clone()))
.with_body(Layout {
base: base,
title: "Not found",
body: &NotFound,
}.to_string())
.with_body(system_page(
base,
"Not found",
NotFound,
).to_string())
.with_status(hyper::StatusCode::NotFound)
}
@ -81,11 +103,11 @@ impl Site {
Response::new()
.with_header(ContentType(TEXT_HTML.clone()))
.with_body(Layout {
.with_body(system_page(
base,
title: "Internal server error",
body: &InternalServerError,
}.to_string())
"Internal server error",
InternalServerError,
).to_string())
.with_status(hyper::StatusCode::InternalServerError)
}
}

12
templates/about.html
View file

@ -1,11 +1,3 @@
<div class="container">
<div class="hero">
<header>
<h1>About Sausagewiki</h1>
</header>
</div>
<article>
<p>This site is running Sausagewiki, a simple, self-contained wiki engine,
version {{version()}}.</p>
<p>Copyright &copy; 2017 Magnus Hovland Hoff.</p>
@ -41,7 +33,3 @@ copyright holders and distributed under various licenses:
{{/deps}}
</tbody>
</table>
</article>
</div>
{{>footer/default.html}}

11
templates/article_revision.html
View file

@ -1,5 +1,3 @@
<div class="container">
<div class="notice">
<p>
You are viewing an historical version of <a href="{{link_current}}">this article</a>,
@ -11,11 +9,4 @@
</p>
</div>
<div class="rendered">
{{>article_contents.html}}
</div>
</div>
<footer>
{{>footer/items.html}}
</footer>
{{{rendered}}}

10
templates/changes.html
View file

@ -1,9 +1,3 @@
<div class="container">
<header>
<h1>Changes</h1>
</header>
<article>
<p>
These are the {{^newer}}most recent{{/newer}} changes
made to{{{subject_clause()}}}{{#author()}} by {{.}}{{/author()}}.
@ -44,7 +38,3 @@
><li><a rel="last" href="{{.end}}">First changes</a></li
></ul></nav>{{/older}}
{{#changes?}}{{^older}}<p>There are no older changes.</p>{{/older}}{{/changes}}
</article>
</div>
{{>footer/default.html}}

10
templates/diff.html
View file

@ -1,5 +1,11 @@
<div class="container">
<div class="hero">
<header>
<h1>{{#title}}{{#.removed}}<span class="removed">{{.}}</span>{{/.removed}}{{#.same}}{{.}}{{/.same}}{{#.added}}<span class="added">{{.}}</span>{{/.added}}{{/title}}</h1>
</header>
</div>
<div class="notice">
<p>
You are viewing the difference between two {{#consecutive?}}consecutive{{/consecutive}}
@ -12,10 +18,6 @@
</p>
</div>
<header>
<h1>{{#title}}{{#.removed}}<span class="removed">{{.}}</span>{{/.removed}}{{#.same}}{{.}}{{/.same}}{{#.added}}<span class="added">{{.}}</span>{{/.added}}{{/title}}</h1>
</header>
<article>
<pre class="diff">{{#lines}}{{#.removed}}<span class="removed">{{.}}
</span>{{/.removed}}{{#.same}}<span class="same">{{.}}

12
templates/error/404.html
View file

@ -1,11 +1 @@
<div class="container">
<header>
<h1>Not found</h1>
</header>
<article>
<p>This page was not found.</p>
</article>
</div>
{{>../footer/default.html}}
<p>This page was not found.</p>

12
templates/error/500.html
View file

@ -1,11 +1 @@
<div class="container">
<header>
<h1>Internal server error</h1>
</header>
<article>
<p>An error has occurred.</p>
</article>
</div>
{{>../footer/default.html}}
<p>An error has occurred.</p>

11
templates/search.html
View file

@ -1,9 +1,3 @@
<div class="container">
<header>
<h1>Search</h1>
</header>
<article>
{{#hits?}}
<p>Search results for the query <b>{{query}}</b>:</p>
@ -25,8 +19,3 @@
{{^hits?}}
<p>Your search for <b>{{query}}</b> gave no results.</p>
{{/hits}}
</article>
</div>
{{>footer/default.html}}

10
templates/sitemap.html
View file

@ -1,15 +1,5 @@
<div class="container">
<header>
<h1>Sitemap</h1>
</header>
<article>
<ul class="dense"
{{#articles}}
><li><a href="{{.link()}}">{{.title}}</a></li
{{/articles}}
></ul>
</article>
</div>
{{>footer/default.html}}

2
templates/simple.html → templates/system_page_layout.html
View file

@ -1,7 +1,9 @@
<div class="container">
<div class="hero">
<header>
<h1>{{title}}</h1>
</header>
</div>
<article>
{{{html_body}}}