chiark / gitweb /
~ianmdlvl / otter.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4610427)
infopane: Plumbing for player list, shows up in client
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 14 Jan 2021 00:25:59 +0000 (00:25 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 14 Jan 2021 00:25:59 +0000 (00:25 +0000)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
nwtemplates/player-info-pane.tera [new file with mode: 0644] patch | blob
src/global.rs patch | blob | history
templates/landscape.tera patch | blob | history
templates/macros.tera patch | blob | history
templates/session.tera patch | blob | history

diff --git a/nwtemplates/player-info-pane.tera b/nwtemplates/player-info-pane.tera
new file mode 100644 (file)
index 0000000..735511f
--- /dev/null
+++ b/nwtemplates/player-info-pane.tera
@@ -0,0 +1,4 @@
+<!-- Copyright 2020-2021 Ian Jackson and contributors to Otter
+     SPDX-License-Identifier: AGPL-3.0-or-later
+     There is NO WARRANTY. -->
+{{ players }}
diff --git a/src/global.rs b/src/global.rs
index bd900d5cb4dc1bbd55f80fc817160ab1048f1b7f..a2d334cdba17fb9a404cee24b05bdcf3dd3281dd 100644 (file)
--- a/src/global.rs
+++ b/src/global.rs
@@ -409,9 +409,16 @@ impl Instance {
 
   #[throws(InternalError)]
   pub fn player_info_pane(&self) -> Html {
-    let html = Html(format!(
-      "Players list from server, but NYI {}", &self.gs.gen,
-    ));// xxx
+    #[derive(Serialize,Debug)]
+    struct RenderContext<'r> {
+      players: &'r DenseSlotMap<PlayerId, GPlayerState>,
+    }
+    let render = RenderContext {
+      players: &self.gs.players,
+    };
+    let txt = nwtemplates::render("player-info-pane.tera", &render)
+      .context("render player info template")?;
+    let html = Html::from_txt(&txt);
     html
   }
 }
diff --git a/templates/landscape.tera b/templates/landscape.tera
index 902679064a6e367c78a4ec2664cb59a8b6e1343c..49748076935b80081646ee4f28a7d5ac43a0635b 100644 (file)
--- a/templates/landscape.tera
+++ b/templates/landscape.tera
@@ -1,3 +1,7 @@
+{# -*- HTML -*- -#}
+<!-- Copyright 2020u Ian Jackson
+     SPDX-License-Identifier: AGPL-3.0-or-later
+     There is NO WARRANTY. -->
 {% import "macros" as m %}{# -*- HTML -*- -#}
 {{ m::header() }}
 <style>
diff --git a/templates/macros.tera b/templates/macros.tera
index 1ddc193818146be6e636e61027270fe910f8f768..03fcaf2ab1248b5dbbb38724213247773534a5da 100644 (file)
--- a/templates/macros.tera
+++ b/templates/macros.tera
@@ -1,4 +1,7 @@
 {# -*- HTML -*- -#}
+<!-- Copyright 2020u Ian Jackson
+     SPDX-License-Identifier: AGPL-3.0-or-later
+     There is NO WARRANTY. -->
 
 {% macro header() %}
 <body id="main-body"
diff --git a/templates/session.tera b/templates/session.tera
index 689bb047b6e9fad03e576705a14a35d43742f53f..65a2b8d7d89a977e1a9a7d01b8fcd54d1eaa929c 100644 (file)
--- a/templates/session.tera
+++ b/templates/session.tera
@@ -1,3 +1,7 @@
+{# -*- HTML -*- -#}
+<!-- Copyright 2020u Ian Jackson
+     SPDX-License-Identifier: AGPL-3.0-or-later
+     There is NO WARRANTY. -->
 {% import "macros" as m %}{# -*- HTML -*- -#}
 {{ m::header() }}
 <style>
Unnamed repository; edit this file 'description' to name the repository.