From a082cb659f1cd90d9763d4aa05143456a18c9d74 Mon Sep 17 00:00:00 2001
From: mystie <oivan2401@gmail.com>
Date: Sat, 28 Sep 2024 00:40:30 +0300
Subject: [PATCH] mostly indentation fixes + trimmed content length

---
 templates/index.html | 166 ++++++++++++++++++++++---------------------
 1 file changed, 84 insertions(+), 82 deletions(-)

diff --git a/templates/index.html b/templates/index.html
index 3b092ea..e3909a3 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -5,7 +5,7 @@
 <link rel="stylesheet" href="{{ url_for('static', filename='css/toastify.css') }}">
 {% endblock %}
 {% block content %}
-<div class="mt-5 mb-sm-2 mb-md-5">
+<div class="mt-5 mb-sm-2 mb-md-5 col-sm-{% if cfg.style.infoBoxLayout == 'row' %}10{% else %}8{% endif %} m-auto{% if cfg.style.infoBoxLayout == 'row' %} d-lg-flex justify-content-between gap-2{% endif %}">
 	<div>
 		<h1 class="text-center fw-bold">{{ cfg.instance.title }}</h1>
 		{% autoescape off %}
@@ -13,7 +13,7 @@
 		{% endautoescape %}
 	</div>
 	{% if len(cfg.instance.rules) > 0 %}
-		<div class="m-auto col-sm-6">
+		<div class="m-auto col-sm-{% if cfg.style.infoBoxLayout == 'row' %}6{% else %}8{% endif %}">
 			<div class="accordion" id="rules-accordion">
 				<div class="accordion-item">
 					<h2 class="accordion-header">
@@ -32,7 +32,7 @@
 	{% endif %}
 </div>
 <div class="row">
-	<div class="col-sm-{% if combined %}4{% else %}8{% endif %}{% if not combined %} m-auto{% endif %}">
+	<div class="col-sm-{% if combined %}4{% else %}6{% endif %}{% if not combined %} m-auto{% endif %}">
 		<div class="mb-5 sticky-md-top">
 			{% if cfg.lockInbox == false %}
 			<br>
@@ -54,7 +54,7 @@
 				<div class="form-group d-grid d-lg-flex align-items-center justify-content-lg-end mt-3">
 					{#
 					<div class="form-check mb-0 w-100">
-							reserved for version 1.5.0 or later
+							reserved for version 1.6.0 or later
 							<input
 								class="form-check-input"
 								type="checkbox"
@@ -114,11 +114,11 @@
 					{% endif %}
 				</div>
 				<div class="d-flex align-items-center">
-					<a href="{{ url_for('viewQuestion', question_id=item.question.id) }}" class="btn pt-2 pb-2 text-body-secondary" data-bs-toggle="tooltip" data-bs-title="View question" aria-label="View question"><i class="bi bi-box-arrow-up-right"></i></a>
+					<a href="{{ url_for('viewQuestion', question_id=item.question.id) }}" class="btn btn-basic pt-2 pb-2 text-body-secondary" data-bs-toggle="tooltip" data-bs-title="View question" aria-label="View question"><i class="bi bi-box-arrow-up-right"></i></a>
 					<div class="dropdown">
-						<button class="btn pt-2 pb-2 no-arrow text-body-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" aria-label="Share question"><i class="bi bi-share"></i></button>
+						<button class="btn btn-basic pt-2 pb-2 no-arrow text-body-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" aria-label="Share question"><i class="bi bi-share"></i></button>
 						<ul class="dropdown-menu">
-							<li><button class="dropdown-item" onclick="copyFull(`{{ trimContent(item.question.content, 30) + ' — ' + trimContent(answer.content, 30) }} {{ cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=item.question.id) }}`)"><i class="bi bi-copy me-1"></i> Copy to clipboard</button></li>
+							<li><button class="dropdown-item" onclick="copyFull(`{{ trimContent(item.question.content, cfg.trimContentAfter) + ' — ' + trimContent(answer.content, cfg.trimContentAfter) }} {{ cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=item.question.id) }}`)"><i class="bi bi-copy me-1"></i> Copy to clipboard</button></li>
 							<li>
 								<button class="dropdown-item d-flex align-items-center gap-1" data-bs-toggle="modal" data-bs-target="#question-{{ item.question.id }}-modal">
 									<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 64 64" class="me-1">
@@ -141,9 +141,9 @@
 									Share on Fediverse
 								</button>
 							</li>
-							<li><a class="dropdown-item" target="_blank" href="https://twitter.com/intent/tweet?text={{ urllib.parse.quote(trimContent(item.question.content, 30) + ' — ' + trimContent(answer.content, 30),safe='') }}%20{{ urllib.parse.quote(cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=item.question.id), safe='') }}"><i class="bi bi-twitter me-1"></i> Share on Twitter</a></li>
+							<li><a class="dropdown-item" target="_blank" href="https://twitter.com/intent/tweet?text={{ urllib.parse.quote(trimContent(item.question.content, cfg.trimContentAfter) + ' — ' + trimContent(answer.content, cfg.trimContentAfter),safe='') }}%20{{ urllib.parse.quote(cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=item.question.id), safe='') }}"><i class="bi bi-twitter me-1"></i> Share on Twitter</a></li>
 							<li>
-								<a class="dropdown-item d-flex align-items-center gap-1" target="_blank" href="https://bsky.app/intent/compose?text={{ urllib.parse.quote(trimContent(item.question.content, 30) + ' — ' + trimContent(answer.content, 30),safe='') }}%20{{ urllib.parse.quote(cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=item.question.id), safe='') }}">
+								<a class="dropdown-item d-flex align-items-center gap-1" target="_blank" href="https://bsky.app/intent/compose?text={{ urllib.parse.quote(trimContent(item.question.content, cfg.trimContentAfter) + ' — ' + trimContent(answer.content, cfg.trimContentAfter),safe='') }}%20{{ urllib.parse.quote(cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=item.question.id), safe='') }}">
 									<svg width="16" height="16" class="me-1" viewBox="0 0 568 501" fill="none" xmlns="http://www.w3.org/2000/svg">
 										<path fill="currentColor" d="M123.121 33.6637C188.241 82.5526 258.281 181.681 284 234.873C309.719 181.681 379.759 82.5526 444.879 33.6637C491.866 -1.61183 568 -28.9064 568 57.9464C568 75.2916 558.055 203.659 552.222 224.501C531.947 296.954 458.067 315.434 392.347 304.249C507.222 323.8 536.444 388.56 473.333 453.32C353.473 576.312 301.061 422.461 287.631 383.039C285.169 375.812 284.017 372.431 284 375.306C283.983 372.431 282.831 375.812 280.369 383.039C266.939 422.461 214.527 576.312 94.6667 453.32C31.5556 388.56 60.7778 323.8 175.653 304.249C109.933 315.434 36.0535 296.954 15.7778 224.501C9.94525 203.659 0 75.2916 0 57.9464C0 -28.9064 76.1345 -1.61183 123.121 33.6637Z" fill="black"/>
 									</svg>
@@ -151,7 +151,7 @@
 								</a>
 							</li>
 							<li>
-								<a class="dropdown-item d-flex align-items-center gap-1" target="_blank" href="https://www.tumblr.com/widgets/share/tool?shareSource=legacy&posttype=text&title={{ urllib.parse.quote(trimContent(item.question.content, 30), safe='') }}&url={{ urllib.parse.quote(cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=item.question.id), safe='') }}&caption=&content={{ urllib.parse.quote(trimContent(answer.content, 30),safe='') }}%20{{ urllib.parse.quote(cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=item.question.id), safe='') }}">
+								<a class="dropdown-item d-flex align-items-center gap-1" target="_blank" href="https://www.tumblr.com/widgets/share/tool?shareSource=legacy&posttype=text&title={{ urllib.parse.quote(trimContent(item.question.content, cfg.trimContentAfter), safe='') }}&url={{ urllib.parse.quote(cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=item.question.id), safe='') }}&caption=&content={{ urllib.parse.quote(trimContent(answer.content, cfg.trimContentAfter),safe='') }}%20{{ urllib.parse.quote(cfg.instance.fullBaseUrl + url_for('viewQuestion',question_id=item.question.id), safe='') }}">
 									<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor" width="16" height="16" class="me-1">
 										<path d="M6.27051 7.62976C8.86829 7.07312 10.816 4.76401 10.816 2H13.8463V7.15152H17.4826V10.7879H13.8463V16.2424C13.8463 16.7566 14.044 17.4493 14.7554 17.9091C15.2296 18.2156 16.2397 18.3671 17.7857 18.3636V22H13.5432C11.0329 22 8.99778 19.9649 8.99778 17.4545V10.7879H6.27051V7.62976Z"></path>
 									</svg>
@@ -161,7 +161,7 @@
 						</ul>
 					</div>
 					<div class="dropdown">
-						<button class="btn pt-2 pb-2 no-arrow text-body-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" aria-label="Miscellaneous menu"><i class="bi bi-three-dots"></i></button>
+						<button class="btn btn-basic pt-2 pb-2 no-arrow text-body-secondary dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false" aria-label="Miscellaneous menu"><i class="bi bi-three-dots"></i></button>
 						<ul class="dropdown-menu">
 							<li><button class="dropdown-item" onclick="copy({{ item.question.id }})"><i class="bi bi-copy me-1"></i> Copy link</button></li>
 							{% if logged_in %}
@@ -181,28 +181,28 @@
 		{% endfor %}
 		{% for item in combined %}
 		{% for answer in item.answers %}
-									<div class="modal fade" id="question-{{ item.question.id }}-modal" tabindex="-1" aria-labelledby="q-{{ item.question.id }}-modal-label" aria-hidden="true">
-								<div class="modal-dialog modal-dialog-centered">
-									<div class="modal-content">
-										<div class="modal-header">
-											<h1 class="modal-title fs-5" id="q-{{ item.question.id }}-modal-label">Share on Fediverse</h1>
-											<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
-										</div>
-										<div class="modal-body">
-											<div class="form-group mb-3">
-												<label for="fediInstance">Fediverse instance domain:</label>
-												<input type="text" id="fediInstance-{{item.question.id}}" name="fediInstance" class="form-control">
-											</div>
-										</div>
-										<div class="modal-footer">
-											<button type="button" class="btn" data-bs-dismiss="modal">Cancel</button>
-											<button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="shareOnFediverse('{{ item.question.id }}', `{{ urllib.parse.quote(trimContent(item.question.content, 30) + ' — ' + trimContent(answer.content, 30),safe='') }}%20{{ urllib.parse.quote(cfg.instance.fullBaseUrl + '/q/' + str(item.question.id),safe='') }}`)">Share</button>
-										</div>
-									</div>
-								</div>
-							</div>
-			{% endfor %}
-			{% endfor %}
+		<div class="modal fade" id="question-{{ item.question.id }}-modal" tabindex="-1" aria-labelledby="q-{{ item.question.id }}-modal-label" aria-hidden="true">
+			<div class="modal-dialog modal-dialog-centered">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h1 class="modal-title fs-5" id="q-{{ item.question.id }}-modal-label">Share on Fediverse</h1>
+						<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+					</div>
+					<div class="modal-body">
+						<div class="form-group mb-3">
+							<label for="fediInstance">Fediverse instance domain:</label>
+							<input type="text" id="fediInstance-{{item.question.id}}" name="fediInstance" class="form-control">
+						</div>
+					</div>
+					<div class="modal-footer">
+						<button type="button" class="btn btn-outline-secondary" data-bs-dismiss="modal">Cancel</button>
+						<button type="button" class="btn btn-primary" data-bs-dismiss="modal" onclick="shareOnFediverse('{{ item.question.id }}', `{{ urllib.parse.quote(trimContent(item.question.content, cfg.trimContentAfter) + ' — ' + trimContent(answer.content, cfg.trimContentAfter),safe='') }}%20{{ urllib.parse.quote(cfg.instance.fullBaseUrl + '/q/' + str(item.question.id),safe='') }}`)">Share</button>
+					</div>
+				</div>
+			</div>
+		</div>
+		{% endfor %}
+		{% endfor %}
 	</div>
 	{% endif %}
 </div>
@@ -220,55 +220,55 @@
 <script>
 	function copy(questionId) {
 		navigator.clipboard.writeText("{{ cfg.instance.fullBaseUrl }}/q/" + questionId + "/");
-			Toastify({
-				text: "Successfully copied link to clipboard!",
-				duration: 3000,
-				gravity: "top",
-				position: "right",
-				stopOnFocus: true,
-				className: `alert alert-success shadow alert-dismissible`,
-				close: true
-			}).showToast();
+		Toastify({
+			text: "Successfully copied link to clipboard!",
+			duration: 3000,
+			gravity: "top",
+			position: "right",
+			stopOnFocus: true,
+			className: `alert alert-success shadow alert-dismissible`,
+			close: true
+		}).showToast();
 	}
 	function copyFull(text) {
 		navigator.clipboard.writeText(text);
-			Toastify({
-				text: "Successfully copied text to clipboard!",
-				duration: 3000,
-				gravity: "top",
-				position: "right",
-				stopOnFocus: true,
-				className: `alert alert-success shadow alert-dismissible`,
-				close: true
-			}).showToast();
+		Toastify({
+			text: "Successfully copied text to clipboard!",
+			duration: 3000,
+			gravity: "top",
+			position: "right",
+			stopOnFocus: true,
+			className: `alert alert-success shadow alert-dismissible`,
+			close: true
+		}).showToast();
 	}
 
-		const input = document.getElementById('question');
-		const charCount = document.getElementById('charCount');
+	const input = document.getElementById('question');
+	const charCount = document.getElementById('charCount');
 	function updateCharCount() {
-	    const maxLength = input.getAttribute('maxlength');
-	    const currentLength = input.value.length;
-	    const remaining = maxLength - currentLength;
-	    charCount.textContent = remaining;
-	    if (remaining <= 50) {
-	        charCount.classList.add('text-warning');
-	    } else {
-	        charCount.classList.remove('text-warning');
-	    }
-	    if (remaining <= 10) {
-	        charCount.classList.add('text-danger');
-	        charCount.classList.remove('text-warning');
-	    } else {
-	        charCount.classList.remove('text-danger');
-	    }
+		const maxLength = input.getAttribute('maxlength');
+		const currentLength = input.value.length;
+		const remaining = maxLength - currentLength;
+		charCount.textContent = remaining;
+		if (remaining <= 50) {
+			charCount.classList.add('text-warning');
+		} else {
+			charCount.classList.remove('text-warning');
+		}
+		if (remaining <= 10) {
+			charCount.classList.add('text-danger');
+			charCount.classList.remove('text-warning');
+		} else {
+			charCount.classList.remove('text-danger');
+		}
 	}
 	input.addEventListener('input', updateCharCount);
-function shareOnFediverse(questionId, contentToShare) {
-    const instanceDomain = document.getElementById(`fediInstance-${questionId}`).value.trim();
-    const shareUrl = `https://${instanceDomain}/share?text=${contentToShare}`;
+	function shareOnFediverse(questionId, contentToShare) {
+		const instanceDomain = document.getElementById(`fediInstance-${questionId}`).value.trim();
+		const shareUrl = `https://${instanceDomain}/share?text=${contentToShare}`;
 
-   	window.open(shareUrl, '_blank');
-}
+		window.open(shareUrl, '_blank');
+	}
 
 </script>
 <script>
@@ -297,15 +297,17 @@ function shareOnFediverse(questionId, contentToShare) {
 				if (document.getElementById(targetElementId) && targetElementId.includes("question-")) {
 					document.getElementById(targetElementId).outerHTML = '';
 				}
-				Toastify({
-					text: msgType,
-					duration: 3000,
-					gravity: "top",
-					position: "right",
-					stopOnFocus: true,
-					className: `alert alert-${alertType} shadow alert-dismissible`,
-					close: true
-				}).showToast();
+				if (msgType) {
+					Toastify({
+						text: msgType,
+						duration: 3000,
+						gravity: "top",
+						position: "right",
+						stopOnFocus: true,
+						className: `alert alert-${alertType} shadow alert-dismissible`,
+						close: true
+					}).showToast();
+				}
 				console.log(event.detail.requestConfig.elt);
 				if (event.detail.requestConfig.elt.id == 'question-form') {
 					document.getElementById('question-form').reset();