Merge branch 'dev'

content/about/contents.lr

@@ -1,5 +1,7 @@
 _model: about
 ---
+ogpimage: /images/ogp.png
+---
 intro:
 
 ---

content/contents.lr

@@ -1,5 +1,7 @@
 _model: index
 ---
+ogpimage: /images/ogp.png
+---
 title: Queerscriptors
 ---
 body: A community of people that translate queer games

content/projects/butterflysoup/contents.lr

@@ -1,14 +1,14 @@
 _model: project
 ---
+ogpimage: main.jpg
+---
 sort_key: 2
 ---
 title: Butterfly Soup
 ---
-body:
+shortbody: Butterfly Soup is a romantic sports visual novel about four LGBT+ Asian-American teens playing baseball and falling in love.
-
+---
-Butterfly Soup is a romantic sports visual novel about four LGBT+ Asian-American teens playing baseball and falling in love.
+body: With California’s 2008 Proposition 8 debate as a backdrop, the story switches through the perspectives of Diya, Noelle, Akarsha, and Min-seo as they navigate high school life in the San Francisco Bay Area.
-
-With California’s 2008 Proposition 8 debate as a backdrop, the story switches through the perspectives of Diya, Noelle, Akarsha, and Min-seo as they navigate high school life in the San Francisco Bay Area.
 ---
 weblate: butterfly-soup
 ---

content/projects/butterflysoup2/contents.lr

@@ -1,14 +1,14 @@
 _model: project
 ---
+ogpimage: main.jpg
+---
 sort_key: 0
 ---
 title: Butterfly Soup 2
 ---
-body:
+shortbody: A sequel to Butterfly Soup, a romantic sports visual novel about gay Asian-American teens playing baseball and falling in love.
-
+---
-A sequel to Butterfly Soup, a romantic sports visual novel about gay Asian-American teens playing baseball and falling in love.
+body: Set a few months after the events of the original story, the game switches between the perspectives of Diya, Noelle, Akarsha, and Min-seo as they navigate high school life in the San Francisco Bay Area
-
-Set a few months after the events of the original story, the game switches between the perspectives of Diya, Noelle, Akarsha, and Min-seo as they navigate high school life in the San Francisco Bay Area
 ---
 weblate: butterfly-soup2
 ---

content/projects/contents.lr

@@ -1 +1,3 @@
 _model: projects
+---
+ogpimage: /images/ogp.png

content/projects/lucahboad/contents.lr

@@ -1,14 +1,14 @@
 _model: project
 ---
+ogpimage: main.jpg
+---
 sort_key: 1
 ---
 title: Lucah Born Of A Dream
 ---
-body:
+shortbody: HACK, SLASH, ASCEND.  Lucah: Born of a Dream is a harrowing struggle through our worst nightmares.
-
+---
-HACK, SLASH, ASCEND.  Lucah: Born of a Dream is a harrowing struggle through our worst nightmares.
+body: You have been MARKED, cursed to have your inner demons come to life as vicious Nightmares. After awakening a false god, you must atone. Traverse the hellish realm of dreams, endure the nightmare onslaught, and uncover the strength to accept yourself.
-
-You have been MARKED, cursed to have your inner demons come to life as vicious Nightmares. After awakening a false god, you must atone. Traverse the hellish realm of dreams, endure the nightmare onslaught, and uncover the strength to accept yourself.
 ---
 weblate: lucah
 ---

models/about.ini

@@ -3,6 +3,10 @@ name = about
 label = {{ this.title }}
 hidden = yes
 
+[fields.ogpimage]
+type = string
+translate = False
+
 [fields.intro]
 type = markdown
 translate = False

models/index.ini

@@ -3,6 +3,10 @@ name = Queerscriptors
 label = {{ this.title }}
 hidden = yes
 
+[fields.ogpimage]
+type = string
+translate = False
+
 [fields.title]
 label = Title
 type = string

models/project.ini

@@ -2,6 +2,10 @@
 name = Project
 label = {{ this.title }}
 
+[fields.ogpimage]
+type = string
+translate = False
+
 [attachment]
 order_by = _id 
 
@@ -14,6 +18,11 @@ label = Title
 type = string
 translate = False
 
+[fields.shortbody]
+label = Short Body
+type = string
+translate = True
+
 [fields.body]
 label = Body
 type = markdown

models/projects.ini

@@ -3,6 +3,10 @@ name = Projects
 label = Projects
 protected = yes
 
+[fields.ogpimage]
+type = string
+translate = False
+
 [children]
 model = project
 order_by = sort_key

templates/footer.html

@@ -4,7 +4,11 @@
 		<a class="mx-2" href="https://twitter.com/queerscriptors" aria-label="twitter"><i class="fa fa-twitter" aria-hidden="true"></i></a>
 		<a class="mx-2" href="https://mastodon.encryptionin.space/@queerscriptors" aria-label="mastodon"><i class="fa fa-mastodon" aria-hidden="true"></i></a>
 		<a class="mx-2" href="https://discord.gg/tzbXdkxWYF" aria-label="discord"><i class="fa fa-discord" aria-hidden="true"></i></a>
-		<a class="mx-2" href="https://lab.encryptionin.space/hackerncoder/Queerscriptors" aria-label="gitea"><i class="fa fa-gitea" aria-hidden="true"></i></a>
+	</div>
+	<div class="social d-flex justify-content-center pb-4">
+		<a class="mx-2" href="https://lab.encryptionin.space/Queerscriptors/Queerscriptors.org" aria-label="gitea"><i class="fa fa-gitea" aria-hidden="true"></i></a>
+		<a class="mx-2" href="https://github.com/queerscriptors/queerscriptors.org" aria-label="github"><i class="fa fa-github" aria-hidden="true"></i></a>
+		<a class="mx-2" href="https://gitlab.com/queerscriptors/queerscriptors.org" aria-label="gitlab"><i class="fa fa-gitlab" aria-hidden="true"></i></a>
 	</div>
 	<div class="social d-flex justify-content-center text-white-50">
         <p>queer@queerscriptors.org</p>
@@ -12,7 +16,7 @@
 </section>
 <!-- Footer-->
 <footer class="footer bg-black small text-center text-white-50 pt-0"><div class="container px-4 px-lg-5">Copyright &copy; Queerscriptors 2022</div></footer>
-<!-- Bootstrap core JS-->
+{#<!-- Bootstrap core JS-->
 <!--<script src="{{ '/js/bootstrap.bundle.min.js'|url }}"></script>-->
 <!-- Core theme JS-->
-<!-- <script src="{{ '/js/scripts.js'|url }}"></script> -->
+<!-- <script src="{{ '/js/scripts.js'|url }}"></script> -->#}

templates/layout.html

@@ -1,6 +1,34 @@
 <!DOCTYPE html>
 <html lang="{{ this.alt }}">
-{% include 'meta.html' %}
+<head>
+	<meta charset="utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
+	<meta name="description" content="{{ _("A community of people that translate queer games") }}" />
+	
+	<!-- Open Graph Protocol -->
+  <meta name="og:title" content="{% block ogptitle %}Queerscriptors{% endblock %}" />
+	<meta name="og:type" content="website" />
+	<meta name="og:image" content="{{ this.ogpimage|url(absolute=True,external=True) }}" />
+	<meta name="og:url" content="{{ '.'|url(absolute=True,external=True) }}" />
+  <meta name="og:description" content="{% block ogpdesc %}{{ _("A community of people that translate queer games") }}{% endblock %}" />
+	<!-- Twitter card (OGP equv) -->
+	<meta name="twitter:card" content="summary_large_image" />
+	<meta name="twitter:domain" content="queerscriptors.org" />
+	<meta name="twitter:url" content="{{ '.'|url(absolute=True,external=True) }}" />
+	<meta name="twitter:title" content="{% block twittertitle %}Queerscriptors{% endblock %}" />
+	<meta name="twitter:description" content="{% block twitterdesc %}{{ _("A community of people that translate queer games") }}{% endblock %}" />
+	<meta name="twitter:image" content="{{ this.ogpimage|url(absolute=True,external=True) }}" />
+
+	<title>{{ this.title }}</title>
+  <link rel="icon" type="image/svg+xml" href="{{ '/images/favicon.svg'|asseturl }}" />
+	<link rel="icon" type="image/png" href="{{ '/images/favicon.png'|asseturl }}" />
+	<!-- Fork Awesome-->
+	<link href="{{ '/css/fork-awesome.min.css'|asseturl }}" rel="stylesheet" />
+	<!-- Fonts-->
+	<link href="{{ '/css/fonts.min.css'|asseturl }}" rel="stylesheet" />
+	<!-- Core theme CSS (includes Bootstrap)-->
+	<link href="{{ '/css/styles.css'|asseturl }}" rel="stylesheet" />
+</head>
 <body id="page-top">
 {% block page %}{% endblock %}
 {% include 'footer.html' %}        

templates/meta.html

@@ -1,29 +0,0 @@
-<head>
-	<meta charset="utf-8" />
-	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
-	<meta name="description" content="{{ _("A community of people that translate queer games") }}" />
-	
-	<!-- Open Graph Protocol -->
-	<meta name="og:title" content="Queerscriptors" />
-	<meta name="og:type" content="website" />
-	<meta name="og:image" content="{{ '/images/ogp.png'|url(absolute=True,external=True) }}" />
-	<meta name="og:url" content="{{ '.'|url(absolute=True,external=True) }}" />
-	<meta name="og:description" content="{{ _("A community of people that translate queer games") }}" />
-	<!-- Twitter card (OGP equv) -->
-	<meta name="twitter:card" content="summary_large_image" />
-	<meta name="twitter:domain" content="queerscriptors.org" />
-	<meta name="twitter:url" content="{{ '.'|url(absolute=True,external=True) }}" />
-	<meta name="twitter:title" content="Queerscriptors" />
-	<meta name="twitter:description" content="{{ _("A community of people that translate queer games") }}" />
-	<meta name="twitter:image" content="{{ '/images/ogp.png'|url(absolute=True,external=True) }}" />
-
-	<title>{{ this.title }}</title>
-  <link rel="icon" type="image/svg+xml" href="{{ '/images/favicon.svg'|asseturl }}" />
-	<link rel="icon" type="image/png" href="{{ '/images/favicon.png'|asseturl }}" />
-	<!-- Fork Awesome-->
-	<link href="{{ '/css/fork-awesome.min.css'|asseturl }}" rel="stylesheet" />
-	<!-- Fonts-->
-	<link href="{{ '/css/fonts.min.css'|asseturl }}" rel="stylesheet" />
-	<!-- Core theme CSS (includes Bootstrap)-->
-	<link href="{{ '/css/styles.css'|asseturl }}" rel="stylesheet" />
-</head>

templates/project.html

@@ -1,4 +1,8 @@
 {% extends "layout.html" %}
+{% block ogpdesc %}{{ this.shortbody }}{% endblock %}
+{% block ogptitle %}{{ this.title }} | Queerscriptors{% endblock %}
+{% block twitterdesc %}{{ this.shortbody }}{% endblock %}
+{% block twittertitle %}{{ this.title }} | Queerscriptors{% endblock %}
 {% block page %}
 {% include 'header.html' %}
 <div class="container my-5 pt-5">
@@ -9,7 +13,8 @@
     </div>
     <div class="col-md-4">
       <h3 class="my-3">{{ _("Project Description") }}</h3>
-      <p>{{this.body}}</p>
+      <p>{{this.shortbody}}</p>
+      {{this.body}}
       <h3 class="my-3">{{ _("Weblate status") }}</h3>
       <a class="crop" href="https://littleroot.net/weblate/engage/{{ this.weblate }}/">
 			  <img src="https://littleroot.net/weblate/widgets/{{ this.weblate }}/-/multi-auto.svg" alt="Translation status" />