Covert all templates to ructe.

src/main.rs

@@ -39,7 +39,8 @@ use diesel::prelude::*;
 use diesel::pg::PgConnection;
 use chrono::naive::date::NaiveDate;
 
-use rphotos::models::{Camera, Person, Photo, Place, Tag};
+use rphotos::models::{Person, Photo, Place, Tag};
+use std::io::{self, Write};
 
 mod env;
 use env::{dburl, env_or, jwt_key, photos_dir};
@@ -60,28 +61,6 @@ use templates::Html;
 pub static CSSLINK: Html<&'static str> =
     Html(include!(concat!(env!("OUT_DIR"), "/stylelink")));
 
-macro_rules! render {
-    ($res:expr, $template:expr, { $($param:ident : $ptype:ty = $value:expr),* })
-        =>
-    {
-        {
-        #[derive(Debug, Clone, RustcEncodable)]
-        struct ParamData {
-            csslink: String,
-            $(
-                $param: $ptype,
-                )*
-        }
-        $res.render($template, &ParamData {
-            csslink: include!(concat!(env!("OUT_DIR"), "/stylelink")).into(),
-            $(
-                $param: $value,
-                )*
-        })
-        }
-    }
-}
-
 #[derive(Debug, Clone, RustcEncodable)]
 pub struct Group {
     title: String,
@@ -91,7 +70,7 @@ pub struct Group {
 }
 
 #[derive(Debug, Clone, RustcEncodable)]
-struct Coord {
+pub struct Coord {
     x: f64,
     y: f64,
 }
@@ -157,7 +136,7 @@ fn login<'mw>(_req: &mut Request,
               mut res: Response<'mw>)
               -> MiddlewareResult<'mw> {
     res.clear_jwt();
-    render!(res, "templates/login.tpl", {})
+    render(res, |o| templates::login(o))
 }
 
 fn do_login<'mw>(req: &mut Request,
@@ -182,7 +161,7 @@ fn do_login<'mw>(req: &mut Request,
             debug!("No hash found for {}", user);
         }
     }
-    render!(res, "templates/login.tpl", {})
+    render(res, |o| templates::login(o))
 }
 
 fn logout<'mw>(_req: &mut Request,
@@ -263,13 +242,13 @@ fn tag_all<'mw>(req: &mut Request,
                                                .select(p::id)
                                                .filter(p::is_public)))))
     };
-    return render!(res, "templates/tags.tpl", {
+    render(res, |o| templates::tags(
-        user: Option<String> = req.authorized_user(),
+        o,
-        tags: Vec<Tag> = query
+        req.authorized_user(),
+        query
             .order(tag_name)
             .load(c)
-            .expect("List tags")
+            .expect("List tags")))
-    });
 }
 
 fn tag_one<'mw>(req: &mut Request,
@@ -281,17 +260,17 @@ fn tag_one<'mw>(req: &mut Request,
     if let Ok(tag) = tags.filter(slug.eq(tslug)).first::<Tag>(c) {
         use rphotos::schema::photos::dsl::id;
         use rphotos::schema::photo_tags::dsl::{photo_id, photo_tags, tag_id};
-        return render!(res, "templates/tag.tpl", {
+        return render(res, |o| templates::tag(
-            user: Option<String> = req.authorized_user(),
+            o,
-            photos: Vec<Photo> = Photo::query(req.authorized_user().is_some())
+            req.authorized_user(),
+            Photo::query(req.authorized_user().is_some())
                 .filter(id.eq_any(photo_tags.select(photo_id)
                                             .filter(tag_id.eq(tag.id))))
                 .load(c).unwrap(),
             // TODO
             // .desc_nulls_last("grade")
             // .desc_nulls_last("date")
-            tag: Tag = tag
+            tag));
-        });
     }
     res.error(StatusCode::NotFound, "Not a tag")
 }
@@ -314,11 +293,10 @@ fn place_all<'mw>(req: &mut Request,
                                                .filter(p::is_public)))))
     };
     let c: &PgConnection = &req.db_conn();
-    return render!(res, "templates/places.tpl", {
+    render(res, |o| templates::places(
-        user: Option<String> = req.authorized_user(),
+        o,
-        places: Vec<Place> = query
+        req.authorized_user(),
-            .order(place_name).load(c).expect("List places")
+        query.order(place_name).load(c).expect("List places")))
-    });
 }
 
 fn place_one<'mw>(req: &mut Request,
@@ -331,17 +309,17 @@ fn place_one<'mw>(req: &mut Request,
         use rphotos::schema::photos::dsl::id;
         use rphotos::schema::photo_places::dsl::{photo_id, photo_places,
                                                  place_id};
-        return render!(res, "templates/place.tpl", {
+        return render(res, |o| templates::place(
-            user: Option<String> = req.authorized_user(),
+            o,
-            photos: Vec<Photo> = Photo::query(req.authorized_user().is_some())
+            req.authorized_user(),
+            Photo::query(req.authorized_user().is_some())
                 .filter(id.eq_any(photo_places.select(photo_id)
                                               .filter(place_id.eq(place.id))))
                 .load(c).unwrap(),
             // TODO
             // .desc_nulls_last("grade")
             // .desc_nulls_last("date")
-            place: Place = place
+            place));
-        });
     }
     res.error(StatusCode::NotFound, "Not a place")
 }
@@ -364,11 +342,10 @@ fn person_all<'mw>(req: &mut Request,
                                                .filter(p::is_public)))))
     };
     let c: &PgConnection = &req.db_conn();
-    return render!(res, "templates/people.tpl", {
+    render(res, |o| templates::people(
-        user: Option<String> = req.authorized_user(),
+        o,
-        people: Vec<Person> = query
+        req.authorized_user(),
-            .order(person_name).load(c).expect("list people")
+        query.order(person_name).load(c).expect("list people")))
-    });
 }
 
 fn person_one<'mw>(req: &mut Request,
@@ -381,17 +358,17 @@ fn person_one<'mw>(req: &mut Request,
         use rphotos::schema::photos::dsl::id;
         use rphotos::schema::photo_people::dsl::{person_id, photo_id,
                                                  photo_people};
-        return render!(res, "templates/person.tpl", {
+        return render(res, |o| templates::person(
-            user: Option<String> = req.authorized_user(),
+            o,
-            photos: Vec<Photo> = Photo::query(req.authorized_user().is_some())
+            req.authorized_user(),
+            Photo::query(req.authorized_user().is_some())
                 .filter(id.eq_any(photo_people.select(photo_id)
                                               .filter(person_id.eq(person.id))))
                 .load(c).unwrap(),
             // TODO
             // .desc_nulls_last("grade")
             // .desc_nulls_last("date")
-            person: Person = person
+            person));
-        });
     }
     res.error(StatusCode::NotFound, "Not a person")
 }
@@ -404,36 +381,36 @@ fn photo_details<'mw>(req: &mut Request,
     let c: &PgConnection = &req.db_conn();
     if let Ok(tphoto) = photos.find(id).first::<Photo>(c) {
         if req.authorized_user().is_some() || tphoto.is_public() {
-            return render!(res, "templates/details.tpl", {
+            return render(res, |o| templates::details(
-                user: Option<String> = req.authorized_user(),
+                o,
-                lpath: Vec<Link> =
+                tphoto.date
-                    tphoto.date
                     .map(|d| vec![Link::year(d.year()),
                                   Link::month(d.year(), d.month()),
                                   Link::day(d.year(), d.month(), d.day())])
                     .unwrap_or_else(|| vec![]),
-                people: Vec<Person> = {
+                req.authorized_user(),
+                {
                     use rphotos::schema::people::dsl::{people, id};
                     use rphotos::schema::photo_people::dsl::{photo_people, photo_id, person_id};
                     people.filter(id.eq_any(photo_people.select(person_id)
                                             .filter(photo_id.eq(tphoto.id))))
                         .load(c).unwrap()
                 },
-                places: Vec<Place> = {
+                {
                     use rphotos::schema::places::dsl::{places, id};
                     use rphotos::schema::photo_places::dsl::{photo_places, photo_id, place_id};
                     places.filter(id.eq_any(photo_places.select(place_id)
                                             .filter(photo_id.eq(tphoto.id))))
                         .load(c).unwrap()
                 },
-                tags: Vec<Tag> = {
+                {
                     use rphotos::schema::tags::dsl::{tags, id};
                     use rphotos::schema::photo_tags::dsl::{photo_tags, photo_id, tag_id};
                     tags.filter(id.eq_any(photo_tags.select(tag_id)
                                           .filter(photo_id.eq(tphoto.id))))
                         .load(c).unwrap()
                 },
-                position: Option<Coord> = {
+                {
                     use rphotos::schema::positions::dsl::*;
                     match positions.filter(photo_id.eq(tphoto.id))
                         .select((latitude, longitude))
@@ -449,21 +426,17 @@ fn photo_details<'mw>(req: &mut Request,
                             }
                         }
                 },
-                camera: Option<Camera> = {
+                {
                     use rphotos::schema::cameras::dsl::*;
                     tphoto.camera_id.map(|i| {
                         cameras.find(i).first(c).unwrap()
                     })
                 },
-                time: String = match tphoto.date {
+                match tphoto.date {
                     Some(d) => d.format("%T").to_string(),
                     None => "".to_string()
                 },
-                year: Option<i32> = tphoto.date.map(|d| d.year()),
+                tphoto));
-                month: Option<u32> = tphoto.date.map(|d| d.month()),
-                day: Option<u32> = tphoto.date.map(|d| d.day()),
-                photo: Photo = tphoto
-            });
         }
     }
     res.error(StatusCode::NotFound, "Photo not found")
@@ -511,11 +484,8 @@ fn all_years<'mw>(req: &mut Request,
                 }
             }).collect();
 
-    let mut stream = try!(res.start());
+    render(res,
-    match templates::groups(&mut stream, "All photos", Vec::new(), user, groups) {
+           |o| templates::groups(o, "All photos", Vec::new(), user, groups))
-        Ok(()) => Ok(Halt(stream)),
-        Err(e) => stream.bail(format!("Problem rendering template: {:?}", e))
-    }
 }
 
 fn months_in_year<'mw>(req: &mut Request,
@@ -561,11 +531,7 @@ fn months_in_year<'mw>(req: &mut Request,
                 }
             }).collect();
 
-    let mut stream = try!(res.start());
+    render(res, |o| templates::groups(o, &title, Vec::new(), user, groups))
-    match templates::groups(&mut stream, &title, Vec::new(), user, groups) {
-        Ok(()) => Ok(Halt(stream)),
-        Err(e) => stream.bail(format!("Problem rendering template: {:?}", e))
-    }
 }
 
 fn days_in_month<'mw>(req: &mut Request,
@@ -610,11 +576,7 @@ fn days_in_month<'mw>(req: &mut Request,
                 }
             }).collect();
 
-    let mut stream = try!(res.start());
+    render(res, |o| templates::groups(o, &title, lpath, user, groups))
-    match templates::groups(&mut stream, &title, lpath, user, groups) {
-        Ok(()) => Ok(Halt(stream)),
-        Err(e) => stream.bail(format!("Problem rendering template: {:?}", e))
-    }
 }
 
 fn all_null_date<'mw>(req: &mut Request,
@@ -623,19 +585,16 @@ fn all_null_date<'mw>(req: &mut Request,
     use rphotos::schema::photos::dsl::{date, path};
 
     let c: &PgConnection = &req.db_conn();
-    let mut stream = try!(res.start());
+    render(res, |o| templates::index(
-    match templates::index(&mut stream,
+        o,
-                           &"Photos without a date",
+        &"Photos without a date",
-                           vec![],
+        vec![],
-                           req.authorized_user(),
+        req.authorized_user(),
-                           Photo::query(req.authorized_user().is_some())
+        Photo::query(req.authorized_user().is_some())
-                               .filter(date.is_null())
+            .filter(date.is_null())
-                               .order(path.asc())
+            .order(path.asc())
-                               .limit(500)
+            .limit(500)
-                               .load(c).unwrap()) {
+            .load(c).unwrap()))
-        Ok(()) => Ok(Halt(stream)),
-        Err(e) => stream.bail(format!("Problem rendering template: {:?}", e))
-    }
 }
 
 fn all_for_day<'mw>(req: &mut Request,
@@ -661,11 +620,7 @@ fn all_for_day<'mw>(req: &mut Request,
             .limit(500)
             .load(c).unwrap();
 
-    let mut stream = try!(res.start());
+    render(res, |o| templates::index(o, &title, lpath, user, photos))
-    match templates::index(&mut stream, &title, lpath, user, photos) {
-        Ok(()) => Ok(Halt(stream)),
-        Err(e) => stream.bail(format!("Problem rendering template: {:?}", e))
-    }
 }
 
 fn on_this_day<'mw>(req: &mut Request,
@@ -678,12 +633,12 @@ fn on_this_day<'mw>(req: &mut Request,
         let now = time::now();
         (now.tm_mon as u32 + 1, now.tm_mday as u32)
     };
-    let mut stream = try!(res.start());
+    render(res, |o| templates::groups(
-    match templates::groups(&mut stream,
+        o,
-                            &format!("Photos from {} {}", day, monthname(month)),
+        &format!("Photos from {} {}", day, monthname(month)),
-                            vec![],
+        vec![],
-                            req.authorized_user(),
+        req.authorized_user(),
-                            SqlLiteral::new(format!(
+        SqlLiteral::new(format!(
                 "select extract(year from date) y, count(*) c \
                  from photos where extract(month from date)={} \
                  and extract(day from date)={}{} group by y order by y desc",
@@ -711,11 +666,7 @@ fn on_this_day<'mw>(req: &mut Request,
                     count: count,
                     photo: photo
                 }
-            }).collect()
+            }).collect()))
-                            ) {
-        Ok(()) => Ok(Halt(stream)),
-        Err(e) => stream.bail(format!("Problem rendering template: {:?}", e))
-    }
 }
 
 #[derive(Debug, Clone, RustcEncodable)]
@@ -745,4 +696,15 @@ impl Link {
     }
 }
 
+fn render<'mw, F>(res: Response<'mw>, do_render: F)
+                     ->MiddlewareResult<'mw>
+    where F: FnOnce(&mut Write) -> io::Result<()>
+{
+    let mut stream = try!(res.start());
+    match do_render(&mut stream) {
+        Ok(()) => Ok(Halt(stream)),
+        Err(e) => stream.bail(format!("Problem rendering template: {:?}", e))
+    }
+}
+
 include!(concat!(env!("OUT_DIR"), "/templates.rs"));

templates/details.rs.html

@@ -0,0 +1,46 @@
+@use ::{CSSLINK, Coord, Link};
+@use rphotos::models::{Photo, Person, Place, Tag, Camera};
+@use templates::head;
+
+@(lpath: Vec<Link>, user: Option<String>, people: Vec<Person>, places: Vec<Place>, tags: Vec<Tag>, position: Option<Coord>, camera: Option<Camera>, time: String, photo: Photo)
+
+<!doctype html>
+<html>
+  <head>
+    <title>Photo details</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    @CSSLINK
+  </head>
+  <body>
+    @:head(lpath, user)
+    <h1>Photo details</h1>
+
+    <p><a href="/img/@photo.id/l">@photo.path</a></p>
+    <p><img src="/img/@photo.id/m"></p>
+
+    @if let Some(pos) = position {
+    <div id="map"></div>
+    <link href="https://rasmus.krats.se/static/leaflet077c/leaflet.css" rel="stylesheet"/>
+    <script language="javascript" src="https://rasmus.krats.se/static/leaflet077c/leaflet.js" type="text/javascript">
+    </script>
+    <script language="javascript" type="text/javascript">
+    var pos = [@pos.x, @pos.y];
+    var map = document.getElementById('map');
+    map.style.height = 3 * map.clientWidth / 4 + "px";
+    var map = L.map('map').setView(pos, 16);
+    L.tileLayer('//@{s@}.tile.openstreetmap.org/@{z@}/@{x@}/@{y@}.png', @{
+    attribution: '© <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
+    @}).addTo(map);
+    L.marker(pos).addTo(map);
+    </script>
+    }
+
+    @if let Some(g) = photo.grade {<p>Betyg: @g</p>}
+    <p>Tid: @time</p>
+    <p>People: @for p in people{<a href="/person/@p.slug">@p.person_name</a>, }</p>
+    <p>Places: @for p in places{<a href="/place/@p.slug">@p.place_name</a>, }</p>
+    <p>Tags: @for t in tags{<a href="/tag/@t.slug">@t.tag_name</a>, }</p>
+    @* if let Some(pos) = position {<p>Position: @pos.x @pos.y</p>} *@
+    @if let Some(c) = camera{<p>Camera: @c.model (@c.manufacturer)</p>}
+  </body>
+</html>

templates/details.tpl

@@ -1,40 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Photo details</title>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    {{{csslink}}}
-  </head>
-  <body>
-    {{> head}}
-    <h1>Photo details</h1>
-
-    <p><a href="/img/{{photo.id}}/l">{{photo.path}}</a></p>
-    <p><img src="/img/{{photo.id}}/m"></p>
-
-    {{#position}}
-    <div id="map"></div>
-    <link href="https://rasmus.krats.se/static/leaflet077c/leaflet.css" rel="stylesheet"/>
-    <script language="javascript" src="https://rasmus.krats.se/static/leaflet077c/leaflet.js" type="text/javascript">
-    </script>
-    <script language="javascript" type="text/javascript">
-    var pos = [{{x}}, {{y}}];
-    var map = document.getElementById('map');
-    map.style.height = 3 * map.clientWidth / 4 + "px";
-    var map = L.map('map').setView(pos, 16);
-    L.tileLayer('//{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
-    attribution: '© <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
-    }).addTo(map);
-    L.marker(pos).addTo(map);
-    </script>
-    {{/position}}
-
-    {{#photo.grade}}<p>Betyg: {{.}}</p>{{/photo.grade}}
-    {{#photo}}<p>Tid: {{date}}</p>{{/photo}}
-    <p>People: {{#people}}<a href="/person/{{slug}}">{{person_name}}</a>, {{/people}}</p>
-    <p>Places: {{#places}}<a href="/place/{{slug}}">{{place_name}}</a>, {{/places}}</p>
-    <p>Tags: {{#tags}}<a href="/tag/{{slug}}">{{tag_name}}</a>, {{/tags}}</p>
-    {{#position}}<p>Position: {{x}} {{y}}</p>{{/position}}
-    {{#camera}}<p>Camera: {{model}} ({{manufacturer}})</p>{{/camera}}
-  </body>
-</html>

templates/head.rs.html

@@ -4,7 +4,7 @@
 
 <header>
 <span><a href="/">Bilder</a>
-@for p in lpath { - <a href="@p.url">@p.name</a>}
+@for p in lpath { - <a href="@p.url">@p.name</a> }
 </span>
 <span>· <a href="/tag/">Taggar</a></span>
 <span>· <a href="/person/">Personer</a></span>

templates/head.tpl

@@ -1,13 +0,0 @@
-<header>
-<span><a href="/">Bilder</a>
-{{#lpath}} - <a href="{{url}}">{{name}}</a>{{/lpath}}
-</span>
-<span>· <a href="/tag/">Taggar</a></span>
-<span>· <a href="/person/">Personer</a></span>
-<span>· <a href="/place/">Platser</a></span>
-<span>· <a href="/thisday">Denna dag</a></span>
-{{#user}}<span class="user">{{.}}
-(<a href="/logout">log out</a>)
-</span>{{/user}}
-{{^user}}<span class="user">(<a href="/login">log in</a>)</span>{{/user}}
-</header>

templates/login.rs.html

@@ -1,12 +1,15 @@
+@use ::CSSLINK;
+@use templates::head;
+@()
 <!doctype html>
 <html>
   <head>
     <title>login</title>
     <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    {{{csslink}}}
+    @CSSLINK
   </head>
   <body>
-    {{> head}}
+    @:head(vec![], None)
     <h1>login</h1>
 
     <form action="/login" method="post">

templates/people.rs.html

@@ -0,0 +1,24 @@
+@use ::CSSLINK;
+@use rphotos::models::Person;
+@use templates::head;
+
+@(user: Option<String>, people: Vec<Person>)
+
+<!doctype html>
+<html>
+  <head>
+    <title>Photo people</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    @CSSLINK
+  </head>
+  <body>
+    @:head(vec![], user)
+    <h1>Photo people</h1>
+
+    <ul class="allpeople">
+    @for p in people {
+      <li><a href="/person/@p.slug">@p.person_name</a>
+    }</ul>
+    </div>
+  </body>
+</html>

templates/people.tpl

@@ -1,17 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Photo people</title>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    {{{csslink}}}
-  </head>
-  <body>
-    {{> head}}
-    <h1>Photo people</h1>
-
-    <ul class="allpeople">{{#people}}
-      <li><a href="/person/{{slug}}">{{person_name}}</a>
-    {{/people}}</ul>
-    </div>
-  </body>
-</html>

templates/person.rs.html

@@ -0,0 +1,23 @@
+@use ::CSSLINK;
+@use rphotos::models::{Photo, Person};
+@use templates::head;
+
+@(user: Option<String>, photos: Vec<Photo>, person: Person)
+<!doctype html>
+<html>
+  <head>
+    <title>Photos with @person.person_name</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    @CSSLINK
+  </head>
+  <body>
+    @:head(vec![], user)
+    <h1>@person.person_name</h1>
+
+    <div class="group">
+    @for p in photos {
+    <p class="item"><a href="/details/@p.id"><img src="/img/@p.id/s"></a></p>
+    }
+    </div>
+  </body>
+</html>

templates/person.tpl

@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Photos with {{person.name}}</title>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    {{{csslink}}}
-  </head>
-  <body>
-    {{> head}}
-    <h1>{{person.person_name}}</h1>
-
-    <div class="group">
-    {{#photos}}
-    <p class="item"><a href="/details/{{id}}"><img src="/img/{{id}}/s"></a></p>
-    {{/photos}}
-    </div>
-  </body>
-</html>

templates/place.rs.html

@@ -0,0 +1,24 @@
+@use ::CSSLINK;
+@use rphotos::models::{Photo, Place};
+@use templates::head;
+
+@(user: Option<String>, photos: Vec<Photo>, place: Place)
+
+<!doctype html>
+<html>
+  <head>
+    <title>Photos with @place.place_name</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    @CSSLINK
+  </head>
+  <body>
+    @:head(vec![], user)
+    <h1>@place.place_name</h1>
+
+    <div class="group">
+    @for p in photos {
+    <p class="item"><a href="/details/@p.id"><img src="/img/@p.id/s"></a></p>
+    }
+    </div>
+  </body>
+</html>

templates/place.tpl

@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Photos with {{place.place}}</title>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    {{{csslink}}}
-  </head>
-  <body>
-    {{> head}}
-    <h1>{{place.place_name}}</h1>
-
-    <div class="group">
-    {{#photos}}
-    <p class="item"><a href="/details/{{id}}"><img src="/img/{{id}}/s"></a></p>
-    {{/photos}}
-    </div>
-  </body>
-</html>

templates/places.rs.html

@@ -0,0 +1,24 @@
+@use ::CSSLINK;
+@use rphotos::models::Place;
+@use templates::head;
+
+@(user: Option<String>, places: Vec<Place>)
+
+<!doctype html>
+<html>
+  <head>
+    <title>Photo places</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    @CSSLINK
+  </head>
+  <body>
+    @:head(vec![], user)
+    <h1>Photo places</h1>
+
+    <ul class="allplaces">
+      @for p in places {
+      <li><a href="/place/@p.slug">@p.place_name</a>
+    }</ul>
+    </div>
+  </body>
+</html>

templates/places.tpl

@@ -1,17 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Photo places</title>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    {{{csslink}}}
-  </head>
-  <body>
-    {{> head}}
-    <h1>Photo places</h1>
-
-    <ul class="allplaces">{{#places}}
-      <li><a href="/place/{{slug}}">{{place_name}}</a>
-    {{/places}}</ul>
-    </div>
-  </body>
-</html>

templates/tag.rs.html

@@ -0,0 +1,24 @@
+@use ::CSSLINK;
+@use rphotos::models::{Photo, Tag};
+@use templates::head;
+
+@(user: Option<String>, photos: Vec<Photo>, tag: Tag)
+
+<!doctype html>
+<html>
+  <head>
+    <title>Photos tagged @tag.tag_name</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    @CSSLINK
+  </head>
+  <body>
+    @:head(vec![], user)
+    <h1>@tag.tag_name</h1>
+
+    <div class="group">
+    @for p in photos {
+    <p class="item"><a href="/details/@p.id"><img src="/img/@p.id/s"></a></p>
+    }
+    </div>
+  </body>
+</html>

templates/tag.tpl

@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Photos tagged {{tag.tag_name}}</title>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    {{{csslink}}}
-  </head>
-  <body>
-    {{> head}}
-    <h1>{{tag.tag_name}}</h1>
-
-    <div class="group">
-    {{#photos}}
-    <p class="item"><a href="/details/{{id}}"><img src="/img/{{id}}/s"></a></p>
-    {{/photos}}
-    </div>
-  </body>
-</html>

templates/tags.rs.html

@@ -0,0 +1,24 @@
+@use ::CSSLINK;
+@use rphotos::models::Tag;
+@use templates::head;
+
+@(user: Option<String>, tags: Vec<Tag>)
+
+<!doctype html>
+<html>
+  <head>
+    <title>Photo tags</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+    @CSSLINK
+  </head>
+  <body>
+    @:head(vec![], user)
+    <h1>Photo tags</h1>
+
+    <ul class="alltags">
+    @for tag in tags {
+      <li><a href="/tag/@tag.slug">@tag.tag_name</a>
+    }</ul>
+    </div>
+  </body>
+</html>

templates/tags.tpl

@@ -1,17 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Photo tags</title>
-    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
-    {{{csslink}}}
-  </head>
-  <body>
-    {{> head}}
-    <h1>Photo tags</h1>
-
-    <ul class="alltags">{{#tags}}
-      <li><a href="/tag/{{slug}}">{{tag_name}}</a>
-    {{/tags}}</ul>
-    </div>
-  </body>
-</html>