From d58f02e0214153e713150ff51ecb85608b5aa93e Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Tue, 1 Nov 2022 10:21:43 +0000 Subject: [PATCH 1/7] Add github+gitlab. Change ogp/twitter to proj img --- content/about/contents.lr | 2 ++ content/contents.lr | 2 ++ content/projects/butterflysoup/contents.lr | 2 ++ content/projects/butterflysoup2/contents.lr | 2 ++ content/projects/contents.lr | 2 ++ content/projects/lucahboad/contents.lr | 2 ++ models/about.ini | 4 ++++ models/index.ini | 4 ++++ models/project.ini | 4 ++++ models/projects.ini | 4 ++++ templates/footer.html | 8 +++++--- templates/meta.html | 4 ++-- 12 files changed, 35 insertions(+), 5 deletions(-) diff --git a/content/about/contents.lr b/content/about/contents.lr index 9b9dfe6..4cb1430 100644 --- a/content/about/contents.lr +++ b/content/about/contents.lr @@ -1,5 +1,7 @@ _model: about --- +ogpimage: /images/ogp.png +--- intro: --- diff --git a/content/contents.lr b/content/contents.lr index 769b331..a831896 100644 --- a/content/contents.lr +++ b/content/contents.lr @@ -1,5 +1,7 @@ _model: index --- +ogpimage: /images/ogp.png +--- title: Queerscriptors --- body: A community of people that translate queer games diff --git a/content/projects/butterflysoup/contents.lr b/content/projects/butterflysoup/contents.lr index 56eb09d..a254c55 100644 --- a/content/projects/butterflysoup/contents.lr +++ b/content/projects/butterflysoup/contents.lr @@ -1,5 +1,7 @@ _model: project --- +ogpimage: main.jpg +--- sort_key: 2 --- title: Butterfly Soup diff --git a/content/projects/butterflysoup2/contents.lr b/content/projects/butterflysoup2/contents.lr index 7d6d518..b4bc39b 100644 --- a/content/projects/butterflysoup2/contents.lr +++ b/content/projects/butterflysoup2/contents.lr @@ -1,5 +1,7 @@ _model: project --- +ogpimage: main.jpg +--- sort_key: 0 --- title: Butterfly Soup 2 diff --git a/content/projects/contents.lr b/content/projects/contents.lr index e9e1b63..860ba99 100644 --- a/content/projects/contents.lr +++ b/content/projects/contents.lr @@ -1 +1,3 @@ _model: projects +--- +ogpimage: /images/ogp.png diff --git a/content/projects/lucahboad/contents.lr b/content/projects/lucahboad/contents.lr index a5de626..451f59c 100644 --- a/content/projects/lucahboad/contents.lr +++ b/content/projects/lucahboad/contents.lr @@ -1,5 +1,7 @@ _model: project --- +ogpimage: main.jpg +--- sort_key: 1 --- title: Lucah Born Of A Dream diff --git a/models/about.ini b/models/about.ini index 87e9ee8..b974007 100644 --- a/models/about.ini +++ b/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 diff --git a/models/index.ini b/models/index.ini index adaa9e0..13a80c7 100644 --- a/models/index.ini +++ b/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 diff --git a/models/project.ini b/models/project.ini index 71f21da..b55cb1f 100644 --- a/models/project.ini +++ b/models/project.ini @@ -2,6 +2,10 @@ name = Project label = {{ this.title }} +[fields.ogpimage] +type = string +translate = False + [attachment] order_by = _id diff --git a/models/projects.ini b/models/projects.ini index 88cad5c..6eb399f 100644 --- a/models/projects.ini +++ b/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 diff --git a/templates/footer.html b/templates/footer.html index ee61080..9a1a15e 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -4,7 +4,9 @@ - + + +

queer@queerscriptors.org

@@ -12,7 +14,7 @@
Copyright © Queerscriptors 2022
- +{# - +#} diff --git a/templates/meta.html b/templates/meta.html index d1d0217..65a63b2 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -6,7 +6,7 @@ - + @@ -15,7 +15,7 @@ - + {{ this.title }} From 5ff1a269d7c17d08ad706271e9685167d8da1684 Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Tue, 1 Nov 2022 10:40:23 +0000 Subject: [PATCH 2/7] Allow for changing OGP title and desc --- content/projects/butterflysoup/contents.lr | 4 +++- content/projects/butterflysoup2/contents.lr | 4 +++- content/projects/lucahboad/contents.lr | 4 +++- models/project.ini | 5 +++++ templates/meta.html | 10 +++++----- templates/project.html | 3 +++ 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/content/projects/butterflysoup/contents.lr b/content/projects/butterflysoup/contents.lr index a254c55..3890d01 100644 --- a/content/projects/butterflysoup/contents.lr +++ b/content/projects/butterflysoup/contents.lr @@ -6,9 +6,11 @@ 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. +--- +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. --- diff --git a/content/projects/butterflysoup2/contents.lr b/content/projects/butterflysoup2/contents.lr index b4bc39b..d9cabe8 100644 --- a/content/projects/butterflysoup2/contents.lr +++ b/content/projects/butterflysoup2/contents.lr @@ -6,9 +6,11 @@ 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. +--- +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 --- diff --git a/content/projects/lucahboad/contents.lr b/content/projects/lucahboad/contents.lr index 451f59c..c1e3cb6 100644 --- a/content/projects/lucahboad/contents.lr +++ b/content/projects/lucahboad/contents.lr @@ -6,9 +6,11 @@ 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. +--- +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. --- diff --git a/models/project.ini b/models/project.ini index b55cb1f..6029e37 100644 --- a/models/project.ini +++ b/models/project.ini @@ -18,6 +18,11 @@ label = Title type = string translate = False +[fields.shortbody] +label = Short Body +type = markdown +translate = True + [fields.body] label = Body type = markdown diff --git a/templates/meta.html b/templates/meta.html index 65a63b2..ef0bc3a 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -1,20 +1,20 @@ - + - + - + - - + + {{ this.title }} diff --git a/templates/project.html b/templates/project.html index 1ef7d66..66ca77e 100644 --- a/templates/project.html +++ b/templates/project.html @@ -1,4 +1,6 @@ {% extends "layout.html" %} +{% block ogpdesc %}{{ this.shortbody }}{% endblock %} +{% block ogptitle %}{{ this.title }} | Queerscriptors{% endblock %} {% block page %} {% include 'header.html' %}
@@ -9,6 +11,7 @@

{{ _("Project Description") }}

+

{{this.shortbody}}

{{this.body}}

{{ _("Weblate status") }}

From ced927db57a08ad11978d4bb051d88bf45b8c00f Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Tue, 1 Nov 2022 10:42:16 +0000 Subject: [PATCH 3/7] Rename ogp blocks in twitter to twitter* --- templates/meta.html | 4 ++-- templates/project.html | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/meta.html b/templates/meta.html index ef0bc3a..93ba7cd 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -13,8 +13,8 @@ - - + + {{ this.title }} diff --git a/templates/project.html b/templates/project.html index 66ca77e..0ca5cba 100644 --- a/templates/project.html +++ b/templates/project.html @@ -1,6 +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' %}
From 1db94ef335a6be496a046e93c058fd59bea458fd Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Tue, 1 Nov 2022 10:44:37 +0000 Subject: [PATCH 4/7] Don't use block for meta desc --- templates/meta.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/meta.html b/templates/meta.html index 93ba7cd..25702ac 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -1,7 +1,7 @@ - + From 3b8688b10e8fa05ba27af09cfdfe2f9ba6dbebac Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Tue, 1 Nov 2022 10:49:25 +0000 Subject: [PATCH 5/7] Move meta to layout --- templates/layout.html | 30 +++++++++++++++++++++++++++++- templates/meta.html | 29 ----------------------------- 2 files changed, 29 insertions(+), 30 deletions(-) delete mode 100644 templates/meta.html diff --git a/templates/layout.html b/templates/layout.html index ff15f92..687a62e 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -1,6 +1,34 @@ -{% include 'meta.html' %} + + + + + + + + + + + + + + + + + + + + {{ this.title }} + + + + + + + + + {% block page %}{% endblock %} {% include 'footer.html' %} diff --git a/templates/meta.html b/templates/meta.html deleted file mode 100644 index 25702ac..0000000 --- a/templates/meta.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - - - - - - - {{ this.title }} - - - - - - - - - From d17736d2d8510ffa0ca9f744602a57bde165dd18 Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Tue, 1 Nov 2022 10:53:13 +0000 Subject: [PATCH 6/7] Dont use markup for shortbody. Don't have empty p --- content/projects/butterflysoup/contents.lr | 8 ++------ content/projects/butterflysoup2/contents.lr | 8 ++------ content/projects/lucahboad/contents.lr | 8 ++------ models/project.ini | 2 +- templates/project.html | 2 +- 5 files changed, 8 insertions(+), 20 deletions(-) diff --git a/content/projects/butterflysoup/contents.lr b/content/projects/butterflysoup/contents.lr index 3890d01..5c1d370 100644 --- a/content/projects/butterflysoup/contents.lr +++ b/content/projects/butterflysoup/contents.lr @@ -6,13 +6,9 @@ sort_key: 2 --- title: Butterfly Soup --- -shortbody: - -Butterfly Soup is a romantic sports visual novel about four LGBT+ Asian-American teens playing baseball and falling in love. +shortbody: 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. +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. --- weblate: butterfly-soup --- diff --git a/content/projects/butterflysoup2/contents.lr b/content/projects/butterflysoup2/contents.lr index d9cabe8..24bb1e8 100644 --- a/content/projects/butterflysoup2/contents.lr +++ b/content/projects/butterflysoup2/contents.lr @@ -6,13 +6,9 @@ sort_key: 0 --- title: Butterfly Soup 2 --- -shortbody: - -A sequel to Butterfly Soup, a romantic sports visual novel about gay Asian-American teens playing baseball and falling in love. +shortbody: 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 +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 --- weblate: butterfly-soup2 --- diff --git a/content/projects/lucahboad/contents.lr b/content/projects/lucahboad/contents.lr index c1e3cb6..1442eec 100644 --- a/content/projects/lucahboad/contents.lr +++ b/content/projects/lucahboad/contents.lr @@ -6,13 +6,9 @@ sort_key: 1 --- title: Lucah Born Of A Dream --- -shortbody: - -HACK, SLASH, ASCEND. Lucah: Born of a Dream is a harrowing struggle through our worst nightmares. +shortbody: 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. +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. --- weblate: lucah --- diff --git a/models/project.ini b/models/project.ini index 6029e37..86c61b9 100644 --- a/models/project.ini +++ b/models/project.ini @@ -20,7 +20,7 @@ translate = False [fields.shortbody] label = Short Body -type = markdown +type = string translate = True [fields.body] diff --git a/templates/project.html b/templates/project.html index 0ca5cba..7f6262a 100644 --- a/templates/project.html +++ b/templates/project.html @@ -14,7 +14,7 @@

{{ _("Project Description") }}

{{this.shortbody}}

-

{{this.body}}

+ {{this.body}}

{{ _("Weblate status") }}

 Translation status From 7c8137cbc89abdb79c38de983160bb9fa2019779 Mon Sep 17 00:00:00 2001 From: HackerNCoder Date: Tue, 1 Nov 2022 15:34:15 +0100 Subject: [PATCH 7/7] Move source code links to newline in footer --- templates/footer.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/footer.html b/templates/footer.html index 9a1a15e..eb57c45 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -4,6 +4,8 @@ +
+