+1 -1

src/http/handle_admin_index.rs

··· 17 17 ); 18 18 19 19 Ok(RenderHtml( 20 20 - "admin.en-us.html", 20 20 + "en-us/admin.html", 21 21 admin_ctx.web_context.engine.clone(), 22 22 template_context! { 23 23 ..admin_template_context(&admin_ctx, &canonical_url),

+3 -3

src/http/handle_create_event.rs

··· 392 392 let is_development = cfg!(debug_assertions); 393 393 394 394 let render_template = format!( 395 395 - "create_event.{}.starts_form.html", 395 395 + "{}/create_event.starts_form.html", 396 396 language.to_string().to_lowercase() 397 397 ); 398 398 ··· 480 480 let is_development = cfg!(debug_assertions); 481 481 482 482 let render_template = format!( 483 483 - "create_event.{}.location_form.html", 483 483 + "{}/create_event.location_form.html", 484 484 language.to_string().to_lowercase() 485 485 ); 486 486 ··· 554 554 let is_development = cfg!(debug_assertions); 555 555 556 556 let render_template = format!( 557 557 - "create_event.{}.link_form.html", 557 557 + "{}/create_event.link_form.html", 558 558 language.to_string().to_lowercase() 559 559 ); 560 560

+3 -3

src/http/handle_settings.rs

··· 95 95 }; 96 96 97 97 let error_template = select_template!(false, true, language); 98 98 - let render_template = format!("settings.{}.tz.html", language.to_string().to_lowercase()); 98 98 + let render_template = format!("{}/settings.tz.html", language.to_string().to_lowercase()); 99 99 100 100 let (_, timezones) = supported_timezones(Some(&current_handle)); 101 101 ··· 161 161 162 162 let error_template = select_template!(false, true, language); 163 163 let render_template = format!( 164 164 - "settings.{}.language.html", 164 164 + "{}/settings.language.html", 165 165 language.to_string().to_lowercase() 166 166 ); 167 167 ··· 254 254 255 255 let error_template = select_template!(false, true, language); 256 256 let render_template = format!( 257 257 - "settings.{}.email.html", 257 257 + "{}/settings.email.html", 258 258 language.to_string().to_lowercase() 259 259 ); 260 260

+2 -2

src/http/handle_view_feed.rs

··· 16 16 Cached(auth): Cached<Auth>, 17 17 ) -> Result<impl IntoResponse, WebError> { 18 18 let render_template = if hx_boosted { 19 19 - format!("index.{}.bare.html", language.to_string().to_lowercase()) 19 19 + format!("{}/index.bare.html", language.to_string().to_lowercase()) 20 20 } else { 21 21 - format!("index.{}.html", language.to_string().to_lowercase()) 21 21 + format!("{}/index.html", language.to_string().to_lowercase()) 22 22 }; 23 23 24 24 Ok(RenderHtml(

+9 -6

src/http/macros.rs

··· 6 6 ($template_name:expr, $hxboosted:expr, $hxrequest:expr, $language:expr) => {{ 7 7 if $hxboosted { 8 8 format!( 9 9 - concat!($template_name, ".{}.bare.html"), 10 10 - $language.to_string().to_lowercase() 9 9 + "{}/{}.bare.html", 10 10 + $language.to_string().to_lowercase(), 11 11 + $template_name 11 12 ) 12 13 } else if $hxrequest { 13 14 format!( 14 14 - concat!($template_name, ".{}.partial.html"), 15 15 - $language.to_string().to_lowercase() 15 15 + "{}/{}.partial.html", 16 16 + $language.to_string().to_lowercase(), 17 17 + $template_name 16 18 ) 17 19 } else { 18 20 format!( 19 19 - concat!($template_name, ".{}.html"), 20 20 - $language.to_string().to_lowercase() 21 21 + "{}/{}.html", 22 22 + $language.to_string().to_lowercase(), 23 23 + $template_name 21 24 ) 22 25 } 23 26 }};

+1 -1

src/http/templates.rs

··· 9 9 default_context: minijinja::Value, 10 10 ) -> impl IntoResponse { 11 11 RenderHtml( 12 12 - format!("prompt.{}.html", language), 12 12 + format!("{}/prompt.html", language), 13 13 engine, 14 14 template_context! { ..default_context, ..template_context! { 15 15 message => message.into(),

-4

templates/acknowledgement.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - {% include 'acknowledgement.en-us.common.html' %} 4 4 - {% endblock %}

templates/acknowledgement.en-us.common.html templates/en-us/acknowledgement.common.html

+2 -2

templates/acknowledgement.en-us.html templates/en-us/acknowledgement.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Acknowledgement - Smoke Signal{% endblock %} 3 3 {% block head %}{% endblock %} 4 4 {% block content %} 5 5 - {% include 'acknowledgement.en-us.common.html' %} 5 5 + {% include 'en-us/acknowledgement.common.html' %} 6 6 {% endblock %}

+1 -1

templates/admin.en-us.html templates/en-us/admin.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Smoke Signal Admin{% endblock %} 3 3 {% block head %}{% endblock %} 4 4 {% block content %}

+1 -1

templates/admin_denylist.en-us.html templates/en-us/admin_denylist.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% include 'pagination.html' %} 3 3 {% block title %}Manage Denylist - Smoke Signal Admin{% endblock %} 4 4 {% block head %}{% endblock %}

+1 -1

templates/admin_event.en-us.html templates/en-us/admin_event.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Event Record - Smoke Signal Admin{% endblock %} 3 3 {% block head %} 4 4 <style>

+1 -1

templates/admin_events.en-us.html templates/en-us/admin_events.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% include 'pagination.html' %} 3 3 {% block title %}Events - Smoke Signal Admin{% endblock %} 4 4 {% block head %}{% endblock %}

+1 -1

templates/admin_handles.en-us.html templates/en-us/admin_handles.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% include 'pagination.html' %} 3 3 {% block title %}Handles - Smoke Signal Admin{% endblock %} 4 4 {% block head %}{% endblock %}

+1 -1

templates/admin_rsvp.en-us.html templates/en-us/admin_rsvp.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}RSVP Record - Smoke Signal Admin{% endblock %} 3 3 {% block head %} 4 4 <style>

+1 -1

templates/admin_rsvps.en-us.html templates/en-us/admin_rsvps.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% include 'pagination.html' %} 3 3 {% block title %}RSVPs - Smoke Signal Admin{% endblock %} 4 4 {% block head %}{% endblock %}

-8

templates/alert.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - <section class="section"> 4 4 - <div class="container"> 5 5 - {% include 'alert.en-us.partial.html' %} 6 6 - </div> 7 7 - </section> 8 8 - {% endblock %}

+2 -2

templates/alert.en-us.html templates/en-us/alert.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Smoke Signal{% endblock %} 3 3 {% block head %}{% endblock %} 4 4 {% block content %} 5 5 <section class="section"> 6 6 <div class="container"> 7 7 - {% include 'alert.en-us.partial.html' %} 7 7 + {% include 'en-us/alert.partial.html' %} 8 8 </div> 9 9 </section> 10 10 {% endblock %}

templates/alert.en-us.partial.html templates/en-us/alert.partial.html

-3

templates/bare.en-us.html

··· 1 1 - {% include 'nav.en-us.html' %} 2 2 - {% block content %}{% endblock %} 3 3 - {% include 'footer.en-us.html' %}

+2 -2

templates/base.en-us.html templates/en-us/base.html

··· 19 19 <meta name="theme-color" content="#00d1b2"> 20 20 </head> 21 21 <body hx-ext="loading-states"> 22 22 - {% include 'nav.en-us.html' %} 22 22 + {% include 'en-us/nav.html' %} 23 23 {% block content %}{% endblock %} 24 24 - {% include 'footer.en-us.html' %} 24 24 + {% include 'en-us/footer.html' %} 25 25 </body> 26 26 27 27 </html>

-4

templates/cookie-policy.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - {% include 'cookie-policy.en-us.common.html' %} 4 4 - {% endblock %}

templates/cookie-policy.en-us.common.html templates/en-us/cookie-policy.common.html

+2 -2

templates/cookie-policy.en-us.html templates/en-us/cookie-policy.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Cookie Policy - Smoke Signal{% endblock %} 3 3 {% block head %}{% endblock %} 4 4 {% block content %} 5 5 - {% include 'cookie-policy.en-us.common.html' %} 5 5 + {% include 'en-us/cookie-policy.common.html' %} 6 6 {% endblock %}

-4

templates/create_event.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - {% include 'create_event.en-us.common.html' %} 4 4 - {% endblock %}

+1 -1

templates/create_event.en-us.common.html templates/en-us/create_event.common.html

··· 20 20 </div> 21 21 </article> 22 22 23 23 - {% include 'create_event.en-us.partial.html' %} 23 23 + {% include 'en-us/create_event.partial.html' %} 24 24 25 25 </div> 26 26 </section>

+2 -2

templates/create_event.en-us.html templates/en-us/create_event.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Smoke Signal - Create Event{% endblock %} 3 3 {% block head %}{% endblock %} 4 4 {% block content %} 5 5 - {% include 'create_event.en-us.common.html' %} 5 5 + {% include 'en-us/create_event.common.html' %} 6 6 {% endblock %}

templates/create_event.en-us.link_form.html templates/en-us/create_event.link_form.html

templates/create_event.en-us.location_form.html templates/en-us/create_event.location_form.html

+3 -3

templates/create_event.en-us.partial.html templates/en-us/create_event.partial.html

··· 125 125 </div> 126 126 127 127 <div class="box content pb-0"> 128 128 - {% include "create_event.en-us.starts_form.html" %} 128 128 + {% include "en-us/create_event.starts_form.html" %} 129 129 </div> 130 130 131 131 <div class="box content"> 132 132 {% if locations_editable or create_event %} 133 133 - {% include "create_event.en-us.location_form.html" %} 133 133 + {% include "en-us/create_event.location_form.html" %} 134 134 {% else %} 135 135 <div class="field"> 136 136 <label class="label">Location</label> ··· 172 172 </div> 173 173 174 174 <div class="box content"> 175 175 - {% include "create_event.en-us.link_form.html" %} 175 175 + {% include "en-us/create_event.link_form.html" %} 176 176 </div> 177 177 178 178 <div class="field">

templates/create_event.en-us.starts_form.html templates/en-us/create_event.starts_form.html

-4

templates/create_rsvp.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - {% include 'create_rsvp.en-us.common.html' %} 4 4 - {% endblock %}

+1 -1

templates/create_rsvp.en-us.common.html templates/en-us/create_rsvp.common.html

··· 21 21 </div> 22 22 </article> 23 23 24 24 - {% include 'create_rsvp.en-us.partial.html' %} 24 24 + {% include 'en-us/create_rsvp.partial.html' %} 25 25 26 26 </div> 27 27

+2 -2

templates/create_rsvp.en-us.html templates/en-us/create_rsvp.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Smoke Signal - Create RSVP{% endblock %} 3 3 {% block head %}{% endblock %} 4 4 {% block content %} 5 5 - {% include 'create_rsvp.en-us.common.html' %} 5 5 + {% include 'en-us/create_rsvp.common.html' %} 6 6 {% endblock %}

templates/create_rsvp.en-us.partial.html templates/en-us/create_rsvp.partial.html

+2 -2

templates/delete_event.en-us.html templates/en-us/delete_event.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Smoke Signal - Delete Event{% endblock %} 3 3 {% block head %}{% endblock %} 4 4 {% block content %} ··· 6 6 {% from "form_include.html" import text_input %} 7 7 <section class="section is-fullheight"> 8 8 <div class="container "> 9 9 - {% include 'delete_event.en-us.partial.html' %} 9 9 + {% include 'en-us/delete_event.partial.html' %} 10 10 </div> 11 11 </section> 12 12

templates/delete_event.en-us.partial.html templates/en-us/delete_event.partial.html

-4

templates/edit_event.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - {% include 'edit_event.en-us.common.html' %} 4 4 - {% endblock %}

+2 -2

templates/edit_event.en-us.common.html templates/en-us/edit_event.common.html

··· 4 4 <div class="container"> 5 5 <h1 class="title">Edit Event</h1> 6 6 7 7 - {% include 'create_event.en-us.partial.html' %} 7 7 + {% include 'en-us/create_event.partial.html' %} 8 8 9 9 <div class="box has-background-primary-light"> 10 10 <h2 class="title is-4">Export RSVPs</h2> ··· 18 18 </div> 19 19 20 20 {% if delete_event_url %} 21 21 - {% include 'delete_event.en-us.partial.html' %} 21 21 + {% include 'en-us/delete_event.partial.html' %} 22 22 {% endif %} 23 23 </div> 24 24 </section>

+2 -2

templates/edit_event.en-us.html templates/en-us/edit_event.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Smoke Signal - Edit Event{% endblock %} 3 3 {% block head %}{% endblock %} 4 4 {% block content %} 5 5 - {% include 'edit_event.en-us.common.html' %} 5 5 + {% include 'en-us/edit_event.common.html' %} 6 6 {% endblock %}

-1

templates/edit_event.en-us.partial.html

··· 1 1 - {% include 'create_event.en-us.partial.html' %}

+4

templates/en-us/acknowledgement.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + {% include 'en-us/acknowledgement.common.html' %} 4 4 + {% endblock %}

+8

templates/en-us/alert.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + <section class="section"> 4 4 + <div class="container"> 5 5 + {% include 'en-us/alert.partial.html' %} 6 6 + </div> 7 7 + </section> 8 8 + {% endblock %}

+25

templates/en-us/bare.html

··· 1 1 + <!DOCTYPE html> 2 2 + <html lang="en" class="has-navbar-fixed-top"> 3 3 + <head> 4 4 + <meta charset="utf-8"> 5 5 + <meta name="viewport" content="width=device-width, initial-scale=1"> 6 6 + <title>{% block title %}Smoke Signal{% endblock %}</title> 7 7 + <link rel="stylesheet" href="/static/bulma.min.css"> 8 8 + <link rel="stylesheet" href="/static/fontawesome.min.css"> 9 9 + <meta name="htmx-config" content='{"globalViewTransitions":true}'> 10 10 + <link rel="icon" type="image/x-icon" href="/favicon.ico"> 11 11 + <script src="/static/htmx.js"></script> 12 12 + <script src="/static/loading-states.js"></script> 13 13 + <script src="/static/sse.js"></script> 14 14 + <script src="/static/site.js"></script> 15 15 + {% block head %} 16 16 + {% endblock %} 17 17 + <meta name="theme-color" content="#00d1b2"> 18 18 + </head> 19 19 + <body hx-ext="loading-states"> 20 20 + {% include 'en-us/nav.html' %} 21 21 + {% block content %}{% endblock %} 22 22 + {% include 'en-us/footer.html' %} 23 23 + </body> 24 24 + 25 25 + </html>

+4

templates/en-us/cookie-policy.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + {% include 'en-us/cookie-policy.common.html' %} 4 4 + {% endblock %}

+4

templates/en-us/create_event.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + {% include 'en-us/create_event.common.html' %} 4 4 + {% endblock %}

+4

templates/en-us/create_rsvp.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + {% include 'en-us/create_rsvp.common.html' %} 4 4 + {% endblock %}

+4

templates/en-us/edit_event.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + {% include 'en-us/edit_event.common.html' %} 4 4 + {% endblock %}

+1

templates/en-us/edit_event.partial.html

··· 1 1 + {% include 'en-us/create_event.partial.html' %}

+4

templates/en-us/import.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + {% include 'en-us/import.common.html' %} 4 4 + {% endblock %}

+4

templates/en-us/index.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + {% include 'en-us/index.common.html' %} 4 4 + {% endblock %}

+1

templates/en-us/migrate_event.bare.html

··· 1 1 + {% include 'en-us/migrate_event.common.html' %}

+5

templates/en-us/migrate_event.html

··· 1 1 + {% extends "en-us/base.html" %} 2 2 + {% block title %}Event Migration Complete - Smoke Signal{% endblock %} 3 3 + {% block content %} 4 4 + {% include 'en-us/migrate_event.common.html' %} 5 5 + {% endblock %}

+4

templates/en-us/privacy-policy.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + {% include 'en-us/privacy-policy.common.html' %} 4 4 + {% endblock %}

+4

templates/en-us/profile.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + {% include 'en-us/profile.common.html' %} 4 4 + {% endblock %}

+4

templates/en-us/settings.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + {% include 'en-us/settings.common.html' %} 4 4 + {% endblock %}

+4

templates/en-us/terms-of-service.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + {% include 'en-us/terms-of-service.common.html' %} 4 4 + {% endblock %}

+4

templates/en-us/view_event.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + {% include 'en-us/view_event.common.html' %} 4 4 + {% endblock %}

+4

templates/en-us/view_rsvp.bare.html

··· 1 1 + {% extends "en-us/bare.html" %} 2 2 + {% block content %} 3 3 + {% include 'en-us/view_rsvp.common.html' %} 4 4 + {% endblock %}

templates/event_list.en-us.incl.html templates/en-us/event_list.incl.html

templates/footer.en-us.html templates/en-us/footer.html

-4

templates/import.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - {% include 'import.en-us.common.html' %} 4 4 - {% endblock %}

+1 -1

templates/import.en-us.common.html templates/en-us/import.common.html

··· 6 6 7 7 <h1>Import</h1> 8 8 9 9 - {% include 'import.en-us.partial.html' %} 9 9 + {% include 'en-us/import.partial.html' %} 10 10 11 11 </div> 12 12

+2 -2

templates/import.en-us.html templates/en-us/import.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Smoke Signal - Import{% endblock %} 3 3 {% block head %}{% endblock %} 4 4 {% block content %} 5 5 - {% include 'import.en-us.common.html' %} 5 5 + {% include 'en-us/import.common.html' %} 6 6 {% endblock %}

templates/import.en-us.partial.html templates/en-us/import.partial.html

-4

templates/index.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - {% include 'index.en-us.common.html' %} 4 4 - {% endblock %}

templates/index.en-us.common.html templates/en-us/index.common.html

+2 -2

templates/index.en-us.html templates/en-us/index.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Smoke Signal{% endblock %} 3 3 {% block head %} 4 4 <meta name="description" content="Smoke Signal is an event and RSVP management system."> ··· 12 12 </script> 13 13 {% endblock %} 14 14 {% block content %} 15 15 - {% include 'index.en-us.common.html' %} 15 15 + {% include 'en-us/index.common.html' %} 16 16 {% endblock %}

+2 -2

templates/login.en-us.bare.html templates/en-us/login.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 1 1 + {% extends "en-us/bare.html" %} 2 2 {% block content %} 3 3 <section class="section is-fullheight"> 4 4 <div class="container is-max-tablet"> ··· 14 14 </div> 15 15 </article> 16 16 17 17 - {% include 'login.en-us.partial.html' %} 17 17 + {% include 'en-us/login.partial.html' %} 18 18 19 19 <p><a target="_blank" href="https://discourse.smokesignal.events/t/login-troubleshooting/82">Trouble signing in?</a></p> 20 20

+2 -2

templates/login.en-us.html templates/en-us/login.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Smoke Signal - Login{% endblock %} 3 3 {% block head %}{% endblock %} 4 4 {% block content %} ··· 16 16 </div> 17 17 </article> 18 18 19 19 - {% include 'login.en-us.partial.html' %} 19 19 + {% include 'en-us/login.partial.html' %} 20 20 21 21 <p><a target="_blank" href="https://discourse.smokesignal.events/t/login-troubleshooting/82">Trouble signing in?</a></p> 22 22

templates/login.en-us.partial.html templates/en-us/login.partial.html

-1

templates/migrate_event.en-us.bare.html

··· 1 1 - {% include 'migrate_event.en-us.common.html' %}

templates/migrate_event.en-us.common.html templates/en-us/migrate_event.common.html

-5

templates/migrate_event.en-us.html

··· 1 1 - {% extends "base.en-us.html" %} 2 2 - {% block title %}Event Migration Complete - Smoke Signal{% endblock %} 3 3 - {% block content %} 4 4 - {% include 'migrate_event.en-us.common.html' %} 5 5 - {% endblock %}

templates/nav.en-us.html templates/en-us/nav.html

-4

templates/privacy-policy.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - {% include 'privacy-policy.en-us.common.html' %} 4 4 - {% endblock %}

templates/privacy-policy.en-us.common.html templates/en-us/privacy-policy.common.html

+2 -2

templates/privacy-policy.en-us.html templates/en-us/privacy-policy.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Privacy Policy - Smoke Signal{% endblock %} 3 3 {% block head %}{% endblock %} 4 4 {% block content %} 5 5 - {% include 'privacy-policy.en-us.common.html' %} 5 5 + {% include 'en-us/privacy-policy.common.html' %} 6 6 {% endblock %}

-4

templates/profile.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - {% include 'profile.en-us.common.html' %} 4 4 - {% endblock %}

+1 -1

templates/profile.en-us.common.html templates/en-us/profile.common.html

··· 79 79 </div> 80 80 {% elif tab == "events" %} 81 81 <!-- Events Tab Content --> 82 82 - {% include 'event_list.en-us.incl.html' %} 82 82 + {% include 'en-us/event_list.incl.html' %} 83 83 {% if pagination %} 84 84 {{ view_pagination((canonical_url ~ "?"), pagination) }} 85 85 {% endif %}

+2 -2

templates/profile.en-us.html templates/en-us/profile.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Smoke Signal{% endblock %} 3 3 {% block head %} 4 4 <link rel="alternate" href="at://{{ profile.did }}" /> ··· 17 17 } 18 18 </script>{% endblock %} 19 19 {% block content %} 20 20 - {% include 'profile.en-us.common.html' %} 20 20 + {% include 'en-us/profile.common.html' %} 21 21 {% endblock %}

-4

templates/settings.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - {% include 'settings.en-us.common.html' %} 4 4 - {% endblock %}

+3 -3

templates/settings.en-us.common.html templates/en-us/settings.common.html

··· 32 32 <h2 class="subtitle">Preferences</h2> 33 33 34 34 <div id="language-form"> 35 35 - {% include "settings.en-us.language.html" %} 35 35 + {% include "en-us/settings.language.html" %} 36 36 </div> 37 37 38 38 <div id="timezone-form"> 39 39 - {% include "settings.en-us.tz.html" %} 39 39 + {% include "en-us/settings.tz.html" %} 40 40 </div> 41 41 42 42 <div id="email-form" class="mt-4"> 43 43 - {% include "settings.en-us.email.html" %} 43 43 + {% include "en-us/settings.email.html" %} 44 44 </div> 45 45 </div> 46 46 </div>

templates/settings.en-us.email.html templates/en-us/settings.email.html

+2 -2

templates/settings.en-us.html templates/en-us/settings.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Settings - Smoke Signal{% endblock %} 3 3 {% block content %} 4 4 <section class="section"> ··· 12 12 </div> 13 13 {% endif %} 14 14 15 15 - {% include "settings.en-us.common.html" %} 15 15 + {% include "en-us/settings.common.html" %} 16 16 </div> 17 17 </section> 18 18 {% endblock %}

templates/settings.en-us.language.html templates/en-us/settings.language.html

templates/settings.en-us.tz.html templates/en-us/settings.tz.html

-4

templates/terms-of-service.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - {% include 'terms-of-service.en-us.common.html' %} 4 4 - {% endblock %}

templates/terms-of-service.en-us.common.html templates/en-us/terms-of-service.common.html

+2 -2

templates/terms-of-service.en-us.html templates/en-us/terms-of-service.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Terms of Service - Smoke Signal{% endblock %} 3 3 {% block head %}{% endblock %} 4 4 {% block content %} 5 5 - {% include 'terms-of-service.en-us.common.html' %} 5 5 + {% include 'en-us/terms-of-service.common.html' %} 6 6 {% endblock %}

-4

templates/view_event.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - {% include 'view_event.en-us.common.html' %} 4 4 - {% endblock %}

templates/view_event.en-us.common.html templates/en-us/view_event.common.html

+2 -2

templates/view_event.en-us.html templates/en-us/view_event.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Smoke Signal{% endblock %} 3 3 {% block head %} 4 4 <meta name="description" content="{{ event.description_short }}"> ··· 19 19 <link rel="alternate" href="{{ event.aturi }}" /> 20 20 {% endblock %} 21 21 {% block content %} 22 22 - {% include 'view_event.en-us.common.html' %} 22 22 + {% include 'en-us/view_event.common.html' %} 23 23 {% endblock %}

-4

templates/view_rsvp.en-us.bare.html

··· 1 1 - {% extends "bare.en-us.html" %} 2 2 - {% block content %} 3 3 - {% include 'view_rsvp.en-us.common.html' %} 4 4 - {% endblock %}

+1 -1

templates/view_rsvp.en-us.common.html templates/en-us/view_rsvp.common.html

··· 26 26 </form> 27 27 </div> 28 28 <div id="rsvp-result"> 29 29 - {% include 'view_rsvp.en-us.partial.html' %} 29 29 + {% include 'en-us/view_rsvp.partial.html' %} 30 30 </div> 31 31 </div> 32 32 </div>

+2 -2

templates/view_rsvp.en-us.html templates/en-us/view_rsvp.html

··· 1 1 - {% extends "base.en-us.html" %} 1 1 + {% extends "en-us/base.html" %} 2 2 {% block title %}Smoke Signal{% endblock %} 3 3 {% block head %} 4 4 <meta property="og:site_name" content="Smoke Signal" /> 5 5 <meta property="og:type" content="website" /> 6 6 {% endblock %} 7 7 {% block content %} 8 8 - {% include 'view_rsvp.en-us.common.html' %} 8 8 + {% include 'en-us/view_rsvp.common.html' %} 9 9 {% endblock %}

templates/view_rsvp.en-us.partial.html templates/en-us/view_rsvp.partial.html