From: Max Value <greenwoodw50@gmail.com>
Date: Tue, 1 Apr 2025 23:04:57 +0000 (+0100)
Subject: Navigation changes
X-Git-Url: https://git.ozva.co.uk/?a=commitdiff_plain;h=8c98c9cb2efd90bee46835bac14c177475928a92;p=shopping-channel
Navigation changes
Added navigation links to all pages
Made floorplan and camera layout clickable
---
diff --git a/info.json b/info.json
new file mode 100644
index 0000000..87d3729
--- /dev/null
+++ b/info.json
@@ -0,0 +1,186 @@
+{
+ "shoot": {
+ "date": "10th April 2025",
+ "location": "MediaCity UoS, Room 3.08"
+ },
+ "crew":[
+ {
+ "name": "William Greenwood (T)",
+ "role": "Producer",
+ "phone": "075 9476 8180",
+ "email": "W.Greenwood@edu.salford.ac.uk",
+ "absent": false
+ },
+ {
+ "name": "Finn Downton (T)",
+ "role": "Narrative enginneer",
+ "phone": "079 1003 1116",
+ "email": "E.Downton@edu.salford.ac.uk",
+ "absent": false
+ },
+ {
+ "name": "Jack Christian-Sims (T)",
+ "role": "Director",
+ "phone": "075 4297 4087",
+ "email": "J.Christian-Sims@edu.salford.ac.uk",
+ "absent": false
+ },
+ {
+ "name": "Eleanor Haughton",
+ "role": "Vision Mixer",
+ "phone": "074 9127 2723",
+ "email": "E.V.Haughton@edu.salford.ac.uk",
+ "absent": false
+ },
+ {
+ "name": "Heather Digwood (T)",
+ "role": "Floor manager",
+ "phone": "077 8817 3853",
+ "email": "H.Digwood@edu.salford.ac.uk",
+ "absent": false
+ },
+ {
+ "name": "Olivia Gillett (T)",
+ "role": "Floor manager",
+ "phone": "073 6852 4302",
+ "email": "O.Gillett@edu.salford.ac.uk",
+ "absent": false
+ },
+ {
+ "name": "Leo Garside-Holdich",
+ "role": "Camera opperator",
+ "phone": "078 7474 0891",
+ "email": "L.N.Garside-Holdich@edu.salford.ac.uk",
+ "absent": false
+ },
+ {
+ "name": "Rebecca Dixon",
+ "role": "Sound opperator",
+ "phone": "074 3400 7701",
+ "email": "R.Dixon2@edu.salford.ac.uk",
+ "absent": false
+ },
+ {
+ "name": "Alex Roberts",
+ "role": "Lighting opperator",
+ "phone": "074 9660 1832",
+ "email": "A.Roberts17@edu.salford.ac.uk",
+ "absent": true
+ },
+ {
+ "name": "Tegan Blake-Barnard (T)",
+ "role": "Set-design lead",
+ "phone": "075 4893 0872",
+ "email": "T.blake-barnard@edu.Salford.ac.uk",
+ "absent": false
+ },
+ {
+ "name": "Lydia Wilkinson",
+ "role": "Set-design / GFX opperator",
+ "phone": "078 0269 0037",
+ "email": "L.wilkinson14@edu.salford.ac.uk",
+ "absent": false
+ },
+ {
+ "name": "Leigha Blanchard",
+ "role": "Set-design / GFX opperator",
+ "phone": "074 7700 0501",
+ "email": "L.blanchard@salford.ac.uk",
+ "absent": false
+ },
+ {
+ "name": "Daisy Devoe",
+ "role": "Set-design / GFX opperator",
+ "phone": "079 7056 4500",
+ "email": "D.Devoe@edu.salford.ac.uk",
+ "absent": false
+ },
+ {
+ "name": "Brynn Yates",
+ "role": "GFX opperator",
+ "phone": "073 7766 9812",
+ "email": "M.Yates5@edu.salford.ac.uk",
+ "absent": false
+ },
+ {
+ "name": "Shan Hackwood",
+ "role": "Engineer",
+ "phone": "075 3068 9322",
+ "email": "S.Hackwood@edu.salford.ac.uk",
+ "absent": false
+ }
+ ],
+ "cast":[
+ {
+ "name": "David Smith",
+ "role": "Anchor",
+ "phone": "078 8839 8003",
+ "email": "D.Smith51@edu.salford.ac.uk",
+ "absent": false
+ }
+ ],
+ "schedule":[
+ {
+ "time": "1045",
+ "title": "Kit is picked up by producer and directors arrive for briefing",
+ "extra": ["Meet at kit store (1st floor)"]
+ },
+ {
+ "time": "1115",
+ "title": "Crew call time",
+ "extra": [
+ "Meet in room 3.08 MediacityUK campus",
+ "Setup to be completed for 1200",
+ "Set-design team to prepare stand-in products"
+ ]
+ },
+ {
+ "time": "1200",
+ "title": "Break until 1215",
+ "extra": ["Crew call time (Room 3.08) for meeting with directors"]
+ },
+ {
+ "time": "1215",
+ "title": "Crew arrives back to studio",
+ "extra": [
+ "Final full overview of responsibilities",
+ "Moving onto smaller run-throughs and trying new techniques"
+ ]
+ },
+ {
+ "time": "1315",
+ "title": "All-hands break till 1330",
+ "extra": []
+ },
+ {
+ "time": "1330",
+ "title": "Prep for, and record, 25 minute continuous run",
+ "extra": ["30 minutes contingency"]
+ },
+ {
+ "time": "1430",
+ "title": "De-brief and pass on notes to producer",
+ "extra": []
+ },
+ {
+ "time": "1500",
+ "title": "De-rig",
+ "extra": ["All crew (other than directors and Anchor) dismissed as soon as finished."]
+ },
+ {
+ "time": "1530",
+ "title": "Kit returned to store",
+ "extra": [
+ "Anchor dismissed.",
+ "Producer and Directors meeting till dismissed"
+ ]
+ }
+ ],
+ "notes": [
+ "Note that this is a practice session, nothing forbidden is practiced or revealed.",
+ "Small test runs of small GFX features (e.g. Multiple simultaneous timers)",
+ "Run through at least 25 minutes of continuous teleshopping (Recorded).",
+ "Particularly looking for feedback on: new sound system, new feature text, new sigil visuals, new GFX control layout",
+ "Additional notes on further features ahead of the next practice session."
+ ]
+}
diff --git a/static/info.json b/static/info.json
index 91fd56b..0af08fd 100644
--- a/static/info.json
+++ b/static/info.json
@@ -5,108 +5,108 @@
},
"crew":[
{
- "name": "William Greenwood",
+ "name": "William Greenwood (T)",
"role": "Producer",
"phone": "075 9476 8180",
"email": "W.Greenwood@edu.salford.ac.uk",
"absent": false
},
{
- "name": "Finn Downton",
+ "name": "Finn Downton (T)",
"role": "Narrative enginneer",
- "phone": "079 1003 1116",
- "email": "E.Downton@edu.salford.ac.uk",
+ "phone": "079 **** ****",
+ "email": "*****@edu.salford.ac.uk",
"absent": false
},
{
- "name": "Jack Christian-Sims",
+ "name": "Jack Christian-Sims (T)",
"role": "Director",
- "phone": "075 4297 4087",
- "email": "J.Christian-Sims@edu.salford.ac.uk",
+ "phone": "075 **** ****",
+ "email": "*****@edu.salford.ac.uk",
"absent": false
},
{
"name": "Eleanor Haughton",
"role": "Vision Mixer",
- "phone": "074 9127 2723",
- "email": "E.V.Haughton@edu.salford.ac.uk",
+ "phone": "074 **** ****",
+ "email": "*****@edu.salford.ac.uk",
"absent": false
},
{
- "name": "Heather Digwood",
+ "name": "Heather Digwood (T)",
"role": "Floor manager",
- "phone": "077 8817 3853",
- "email": "H.Digwood@edu.salford.ac.uk",
+ "phone": "077 **** ****",
+ "email": "*****@edu.salford.ac.uk",
"absent": false
},
{
- "name": "Olivia Gillett",
+ "name": "Olivia Gillett (T)",
"role": "Floor manager",
- "phone": "073 6852 4302",
- "email": "O.Gillett@edu.salford.ac.uk",
+ "phone": "073 **** ****",
+ "email": "*****@edu.salford.ac.uk",
"absent": false
},
{
"name": "Leo Garside-Holdich",
"role": "Camera opperator",
- "phone": "078 7474 0891",
- "email": "L.N.Garside-Holdich@edu.salford.ac.uk",
+ "phone": "078 **** ****",
+ "email": "*****@edu.salford.ac.uk",
"absent": false
},
{
"name": "Rebecca Dixon",
"role": "Sound opperator",
- "phone": "074 3400 7701",
- "email": "R.Dixon2@edu.salford.ac.uk",
+ "phone": "074 **** ****",
+ "email": "*****@edu.salford.ac.uk",
"absent": false
},
{
"name": "Alex Roberts",
"role": "Lighting opperator",
- "phone": "074 9660 1832",
- "email": "A.Roberts17@edu.salford.ac.uk",
+ "phone": "074 **** ****",
+ "email": "*****@edu.salford.ac.uk",
"absent": true
},
{
- "name": "Tegan Blake-Barnard",
+ "name": "Tegan Blake-Barnard (T)",
"role": "Set-design lead",
- "phone": "075 4893 0872",
- "email": "T.blake-barnard@edu.Salford.ac.uk",
+ "phone": "075 **** ****",
+ "email": "*****@edu.Salford.ac.uk",
"absent": false
},
{
"name": "Lydia Wilkinson",
"role": "Set-design / GFX opperator",
- "phone": "078 0269 0037",
- "email": "L.wilkinson14@edu.salford.ac.uk",
+ "phone": "078 **** ****",
+ "email": "*****@edu.salford.ac.uk",
"absent": false
},
{
"name": "Leigha Blanchard",
"role": "Set-design / GFX opperator",
- "phone": "074 7700 0501",
- "email": "L.blanchard@salford.ac.uk",
+ "phone": "074 **** ****",
+ "email": "*****@salford.ac.uk",
"absent": false
},
{
"name": "Daisy Devoe",
"role": "Set-design / GFX opperator",
- "phone": "079 7056 4500",
- "email": "D.Devoe@edu.salford.ac.uk",
+ "phone": "079 **** ****",
+ "email": "*****@edu.salford.ac.uk",
"absent": false
},
{
"name": "Brynn Yates",
"role": "GFX opperator",
- "phone": "073 7766 9812",
- "email": "M.Yates5@edu.salford.ac.uk",
+ "phone": "073 **** ****",
+ "email": "*****@edu.salford.ac.uk",
"absent": false
},
{
"name": "Shan Hackwood",
"role": "Engineer",
- "phone": "075 3068 9322",
- "email": "S.Hackwood@edu.salford.ac.uk",
+ "phone": "075 **** ****",
+ "email": "*****@edu.salford.ac.uk",
"absent": false
}
],
@@ -114,8 +114,8 @@
{
"name": "David Smith",
"role": "Anchor",
- "phone": "078 8839 8003",
- "email": "D.Smith51@edu.salford.ac.uk",
+ "phone": "078 **** ****",
+ "email": "*****@edu.salford.ac.uk",
"absent": false
}
],
@@ -143,8 +143,8 @@
"time": "1215",
"title": "Crew arrives back to studio",
"extra": [
- "Final full overview of responsibilites",
- "Moving onto smaller run-thoughs and trying new tecnicues"
+ "Final full overview of responsibilities",
+ "Moving onto smaller run-throughs and trying new techniques"
]
},
{
@@ -155,7 +155,7 @@
{
"time": "1330",
"title": "Prep for, and record, 25 minute continuous run",
- "extra": ["30 minuntes contingency"]
+ "extra": ["30 minutes contingency"]
},
{
"time": "1430",
@@ -172,13 +172,13 @@
"title": "Kit returned to store",
"extra": [
"Anchor dismissed.",
- "Producer and Direcors meeting till dissmissed"
+ "Producer and Directors meeting till dismissed"
]
}
],
"notes": [
"Note that this is a practice session, nothing forbidden is practiced or revealed.",
- "Small test runs of small GFX features (e.g. Multiple simultanious timers)",
+ "Small test runs of small GFX features (e.g. Multiple simultaneous timers)",
"Run through at least 25 minutes of continuous teleshopping (Recorded).",
"Particularly looking for feedback on: new sound system, new feature text, new sigil visuals, new GFX control layout",
"Additional notes on further features ahead of the next practice session."
diff --git a/templates/admin.html b/templates/admin.html
index fece3cf..f7dae2e 100644
--- a/templates/admin.html
+++ b/templates/admin.html
@@ -16,5 +16,12 @@
<li><a href="/admin/timer">Timer panel</a></li>
</ul>
</fieldset>
+ <fieldset>
+ <legend>Other links</legend>
+ <ul>
+ <li><a href="/sounds">SFX system</a></li>
+ <li><a href="/docs">Documentation</a></li>
+ </ul>
+ </fieldset>
</body>
</html>
diff --git a/templates/clock.html b/templates/clock.html
index aba0241..64a1d6b 100644
--- a/templates/clock.html
+++ b/templates/clock.html
@@ -65,6 +65,7 @@ media query to make sure the clock is always displayed well
</style>
</head>
<body>
+ <a href="/admin">.. Back to admin pannel</a>
<form action="/admin/clock" method="POST">
<fieldset>
<legend>Doomsday clock <em>(Incr. {{positions[1].i}} deg)</em></legend>
diff --git a/templates/docs.html b/templates/docs.html
index 5fb84f3..b90805a 100644
--- a/templates/docs.html
+++ b/templates/docs.html
@@ -25,6 +25,12 @@ details {
</style>
</head>
<body>
+
+ {% if not book %}
+ <a href="/admin">. Admin menu</a><br>
+ <a href="/sounds">. SFX system</a>
+ {% endif %}
+
<h1>XMDV Teleshopping documentation</h1>
<h2 style="color: red">Contains forbidden information</h2>
<h2>{{info.shoot.date}}</h2>
@@ -60,6 +66,7 @@ details {
</tr>
{% endfor %}
</table>
+ <p>People with a (T) after their name are to have a tablet for documents.</p>
<p><em>First Aider: William Greenwood 075 9476 8180</em></p>
@@ -161,10 +168,12 @@ details {
<img src="./cameras.png" style="width:100%"></img>
{% else %}
<h2>Floor-plan</h2>
- <img src="/static/floorplan.png" style="width:100%"></img>
+ <p><em>Click to enlarge...</em></p>
+ <a href="/static/floorplan.png"><img src="/static/floorplan.png" style="width:100%"></img></a>
<h2>Camera layout</h2>
- <img src="/static/cameras.png" style="width:100%"></img>
+ <p><em>Click to enlarge...</em></p>
+ <a href="/static/cameras.png"><img src="/static/cameras.png" style="width:100%"></img></a>
{% endif %}
<h2>Text options</h2>
diff --git a/templates/price.html b/templates/price.html
index 1cb8c44..0515521 100644
--- a/templates/price.html
+++ b/templates/price.html
@@ -5,6 +5,7 @@
<title>XMDV</title>
</head>
<body>
+ <a href="/admin">.. Back to admin pannel</a>
<form action="/admin/price" method="POST">
<fieldset>
<legend>Products</legend>
diff --git a/templates/sounds.html b/templates/sounds.html
index 756e16e..fbbd440 100644
--- a/templates/sounds.html
+++ b/templates/sounds.html
@@ -5,6 +5,7 @@
<title>XMDV</title>
</head>
<body>
+ <a href="/admin">. Admin pannel</a>
<h2>Timers</h2>
<table>
<tr>
diff --git a/templates/text.html b/templates/text.html
index 5f9b33c..0a50f07 100644
--- a/templates/text.html
+++ b/templates/text.html
@@ -5,6 +5,7 @@
<title>XMDV</title>
</head>
<body>
+ <a href="/admin">.. Back to admin pannel</a>
<form action="/admin/text" method="POST">
<fieldset>
<legend>Crawler top text</legend>
diff --git a/templates/timer.html b/templates/timer.html
index 78409da..efe7ae6 100644
--- a/templates/timer.html
+++ b/templates/timer.html
@@ -5,6 +5,7 @@
<title>XMDV</title>
</head>
<body onload="update();">
+ <a href="/admin">.. Back to admin pannel</a>
<form action="/admin/timer" method="POST">
<fieldset>
<legend>Timers</legend>