From e31809f7222bedd9d1dd03963292b72c03375c24 Mon Sep 17 00:00:00 2001
From: Tobias Hopp <tobi@gaminggeneration.de>
Date: Sun, 4 Oct 2020 21:08:46 +0200
Subject: [PATCH] Fix bug #11, little boring
Took 4 minutes
---
.idea/workspace.xml | 21 ++++++++++++++-------
templates/faq.tmpl.html | 2 +-
vendor/js/faq.js | 4 ++--
3 files changed, 17 insertions(+), 10 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e2372b9..04c4940 100755
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,7 +21,6 @@
<component name="ChangeListManager">
<list default="true" id="fc13552d-b118-4828-b78f-fc8714e0cfdc" name="Default Changelist" comment="Final COMMIT!!!">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/model/FaqModel.class.inc.php" beforeDir="false" afterPath="$PROJECT_DIR$/model/FaqModel.class.inc.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/templates/faq.tmpl.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/faq.tmpl.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/vendor/js/faq.js" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/js/faq.js" afterDir="false" />
</list>
@@ -34,7 +33,7 @@
<execution />
</component>
<component name="DarkyenusTimeTracker">
- <option name="totalTimeSeconds" value="85844" />
+ <option name="totalTimeSeconds" value="86128" />
<option name="gitIntegration" value="true" />
<option name="naggedAbout" value="1" />
</component>
@@ -80,7 +79,7 @@
<updated>1601618466935</updated>
<workItem from="1601618467981" duration="36776000" />
<workItem from="1601809534320" duration="1558000" />
- <workItem from="1601811106543" duration="15934000" />
+ <workItem from="1601811106543" duration="16219000" />
</task>
<task id="LOCAL-00001" summary="Initial commit">
<created>1601618764031</created>
@@ -250,7 +249,14 @@
<option name="project" value="LOCAL" />
<updated>1601836234258</updated>
</task>
- <option name="localTasksCounter" value="25" />
+ <task id="LOCAL-00025" summary="Fix issue #10, newlines should be showing up now">
+ <created>1601838265842</created>
+ <option name="number" value="00025" />
+ <option name="presentableId" value="LOCAL-00025" />
+ <option name="project" value="LOCAL" />
+ <updated>1601838265842</updated>
+ </task>
+ <option name="localTasksCounter" value="26" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@@ -290,7 +296,8 @@
<MESSAGE value="Updating FAQ-Gui" />
<MESSAGE value="Fix issue #9" />
<MESSAGE value="Updating a little time-issue and install gitignore" />
- <option name="LAST_COMMIT_MESSAGE" value="Updating a little time-issue and install gitignore" />
+ <MESSAGE value="Fix issue #10, newlines should be showing up now" />
+ <option name="LAST_COMMIT_MESSAGE" value="Fix issue #10, newlines should be showing up now" />
</component>
<component name="WindowStateProjectService">
<state x="728" y="326" width="800" height="683" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1601632929047">
@@ -329,10 +336,10 @@
<screen x="0" y="34" width="1920" height="1046" />
</state>
<state x="441" y="192" width="1037" height="736" key="SettingsEditor/0.34.1920.1046@0.34.1920.1046" timestamp="1601632853044" />
- <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2" timestamp="1601836167481">
+ <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2" timestamp="1601838267140">
<screen x="0" y="34" width="1920" height="1046" />
</state>
- <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2/0.34.1920.1046@0.34.1920.1046" timestamp="1601836167481" />
+ <state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2/0.34.1920.1046@0.34.1920.1046" timestamp="1601838267140" />
<state x="809" y="122" width="639" height="876" key="com.intellij.database.view.ui.AbstractDbRefactoringDialog" timestamp="1601632983240">
<screen x="0" y="34" width="1920" height="1046" />
</state>
diff --git a/templates/faq.tmpl.html b/templates/faq.tmpl.html
index 7d5e972..65422c1 100755
--- a/templates/faq.tmpl.html
+++ b/templates/faq.tmpl.html
@@ -35,7 +35,7 @@
<header>
<!-- Fixed navbar -->
<nav class="navbar navbar-expand-md navbar-dark fixed-top bg-dark">
- <a class="navbar-brand" href="#">Online-FAQ</a>
+ <a class="navbar-brand" href="?">Online-FAQ</a>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarCollapse" aria-controls="navbarCollapse" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
diff --git a/vendor/js/faq.js b/vendor/js/faq.js
index 918a4a4..0598a16 100644
--- a/vendor/js/faq.js
+++ b/vendor/js/faq.js
@@ -218,8 +218,8 @@ function getQuestions()
' <h5 class="card-title text-warning">Question</h5>' +
' <h6 class="card-subtitle mb-2 text-muted">From ' + result.data.questions[i].created_by + '</h6>' +
' <p class="card-text">'+ result.data.questions[i].question + '</p>' +
- ' <a href="#" onclick="openReadMoreModal(\''+ result.data.questions[i].id + '\');" class="card-link">Read more</a>' +
- ' <a href="#" onclick="openAnswerModal(\'' + result.data.questions[i].id + '\');" class="card-link">Answer</a>' +
+ ' <a href="javascript:void(0);" onclick="openReadMoreModal(\''+ result.data.questions[i].id + '\');" class="card-link">Read more</a>' +
+ ' <a href="javascript:void(0);" onclick="openAnswerModal(\'' + result.data.questions[i].id + '\');" class="card-link">Answer</a>' +
' </div>' +
' </div>' +
'</div> ' )