Merge pull request #529 from Lenni009/staging

add Eisvana banner
Eisvana · Dec 9, 2023 · 3833471 · 3833471
2 parents f52d568 + b75bc97
commit 3833471
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 16 deletions.
diff --git a/base.html b/base.html
@@ -323,7 +323,7 @@ <h1 class="title is-3">Eisvana Wiki Page Creator - Base</h1>
       <div id="output" class="column is-full-mobile">
         <div class="wikiText" id="fullArticle" data-link="page">
           <div>{{Version|<output id="release" name="release"></output>}}</div>
-          <!-- <div>{{<output id="civStub"></output>}}</div> -->
+          <div>{{Eisvana}}</div>
           <div>{{Base infobox</div>
           <div>| name = <output id="name" name="name"></output></div>
           <div>| image = <output id="image"></output></div>

diff --git a/biofrig.html b/biofrig.html
@@ -247,7 +247,7 @@ <h1 class="title is-3">Eisvana Wiki Page Creator - Organic Frigate</h1>
 			<div id="output" class="column is-full-mobile">
 				<div class="wikiText" id="fullArticle" data-link="page">
 					<div>{{Version|<output id="release" name="release"></output>}}</div>
-					<!-- <div>{{<output id="civStub"></output>}}</div> -->
+          <div>{{Eisvana}}</div>
 					<div>{{Starship infobox</div>
 					<div>| name = <output id="name" name="name"></output></div>
 					<div>| image = <output id="image" name="image"></output></div>

diff --git a/derelict.html b/derelict.html
@@ -218,7 +218,7 @@ <h1 class="title is-3">Eisvana Wiki Page Creator - Derelict Freighter</h1>
 			<div id="output" class="column is-full-mobile">
 				<div class="wikiText" id="fullArticle" data-link="page">
 					<div>{{Version|<output name="release"></output>}}</div>
-					<!-- <div>{{GHub}}</div> -->
+          <div>{{Eisvana}}</div>
 					<div>{{Starship infobox</div>
 					<div>| name = <output id="name" name="name"></output></div>
 					<div>| image = <output id="image" name="image"></output></div>

diff --git a/fauna.html b/fauna.html
@@ -504,7 +504,7 @@ <h1 class="title is-3">Eisvana Wiki Page Creator - Fauna</h1>
 			<div id="output" class="column is-full-mobile">
 				<div class="wikiText" id="fullArticle" data-link="page">
 					<div>{{Version|<output id="release" name="release"></output>}}</div>
-					<!-- <div>{{<output id="civStub"></output>}}</div> -->
+          <div>{{Eisvana}}</div>
 					<div>{{Creature infobox</div>
 					<div>| name = <output id="name" name="newName"></output></div>
 					<div>| image = <output id="image" name="image"></output></div>

diff --git a/moon.html b/moon.html
@@ -516,7 +516,7 @@ <h1 class="title is-3">Eisvana Wiki Page Creator - Moon</h1>
 			<div id="output" class="column is-full-mobile">
 				<div class="wikiText" id="fullArticle" data-link="page">
 					<div>{{Version|<output id="release" name="release"></output>}}</div>
-					<!-- <div>{{<output id="civStub"></output>}}</div> -->
+          <div>{{Eisvana}}</div>
 					<div>{{Moon infobox</div>
 					<div>| name = <output id="name" name="name"></output></div>
 					<div>| image = <output id="image"></output></div>

diff --git a/multitool.html b/multitool.html
@@ -440,7 +440,7 @@ <h1 class="title is-3">Eisvana Wiki Page Creator - Multi-Tool</h1>
 			<div id="output" class="column is-full-mobile">
 				<div class="wikiText" id="fullArticle" data-link="page">
 					<div>{{Version|<output id="release" name="release"></output>}}</div>
-					<!-- <div>{{<output id="civStub"></output>}}</div> -->
+          <div>{{Eisvana}}</div>
 					<div>{{Multitool infobox</div>
 					<div>| name = <output id="name" name="name"></output></div>
 					<div>| image = <output id="image" name="image"></output></div>

diff --git a/planet.html b/planet.html
@@ -543,7 +543,7 @@ <h1 class="title is-3">Eisvana Wiki Page Creator - Planet</h1>
 			<div id="output" class="column is-full-mobile">
 				<div class="wikiText" id="fullArticle" data-link="page">
 					<div>{{Version|<output id="release" name="release"></output>}}</div>
-					<!-- <div>{{<output id="civStub"></output>}}</div> -->
+          <div>{{Eisvana}}</div>
 					<div>{{Planet infobox</div>
 					<div>| name = <output id="name" name="name"></output></div>
 					<div>| image = <output id="image"></output></div>

diff --git a/sandworm.html b/sandworm.html
@@ -252,7 +252,7 @@ <h1 class="title is-3">Eisvana Wiki Page Creator - Sandworm</h1>
 			<div id="output" class="column is-full-mobile">
 				<div class="wikiText" id="fullArticle" data-link="page">
 					<div>{{Version|<output id="release" name="release"></output>}}</div>
-					<!-- <div>{{<output id="civStub"></output>}}</div> -->
+          <div>{{Eisvana}}</div>
 					<div>{{Creature infobox</div>
 					<div>| name = Immortal Worm <output id="name" name="bodyName"></output></div>
 					<div>| image = <output id="image" name="image"></output></div>

diff --git a/src/components/structure/WikiTemplate.vue b/src/components/structure/WikiTemplate.vue
@@ -14,7 +14,7 @@ const wrapperElement = props.isSingleLine ? 'span' : 'div';
 <template>
   <component :is="wrapperElement">
     <span v-pre>{{</span>
-    <span>{{ templateName }}{{ isSingleLine ? '|' : '' }}</span></component
+    <span>{{ templateName }}{{ $slots.default && isSingleLine ? '|' : '' }}</span></component
   ><span><slot></slot></span>
   <component :is="wrapperElement">
     <span v-pre>}}</span>

diff --git a/src/htmlSnippets/footer.html b/src/htmlSnippets/footer.html
@@ -3,7 +3,6 @@
   <button type="button" id="openSettingsBtn">Global Defaults</button>
   <a href="./about.html" id="about">About</a>
   <a href="https://forms.gle/LRhzWjMRkXoKd9CcA" rel="noreferrer noopener" target="_blank">Feedback Form</a>
-  <a href="https://muhaddil.github.io/WikiPageCreator/">Spanish Translation</a>
 </div>
 <dialog id="settings" class="modal-content content">
   <h2 class="title is-4">Global Preload Values</h2> <!-- //NOSONAR

diff --git a/src/pages/Flora.vue b/src/pages/Flora.vue
@@ -305,6 +305,9 @@ function markCopy() {
       <div>
         <WikiTemplate template-name="Version">{{ release }}</WikiTemplate>
       </div>
+      <div>
+        <WikiTemplate template-name="Eisvana" />
+      </div>
       <FloraInfobox
         :plant-name="sanitisedStrings.name"
         :image="image"

diff --git a/src/pages/Mineral.vue b/src/pages/Mineral.vue
@@ -287,6 +287,9 @@ function markCopy() {
       <div>
         <WikiTemplate template-name="Version">{{ release }}</WikiTemplate>
       </div>
+      <div>
+        <WikiTemplate template-name="Eisvana" />
+      </div>
       <MineralInfobox
         :mineral-name="sanitisedStrings.name"
         :image="image"
@@ -337,9 +340,9 @@ function markCopy() {
       <div>==Location==</div>
       <div>
         It can be found on the
-        <span v-if="moon">[[moon]] [[{{ sanitisedStrings.moon }}]] of the</span> [[planet]] [[{{ sanitisedStrings.planet }}]] in the [[{{
-          sanitisedStrings.system
-        }}]] [[star system]].
+        <span v-if="moon">[[moon]] [[{{ sanitisedStrings.moon }}]] of the</span> [[planet]] [[{{
+          sanitisedStrings.planet
+        }}]] in the [[{{ sanitisedStrings.system }}]] [[star system]].
       </div>
       <div>
         <WikiTemplate template-name="CoordGlyphConvert">{{ glyphs }}</WikiTemplate>

diff --git a/src/pages/base/base.ts b/src/pages/base/base.ts
@@ -94,7 +94,7 @@ export function validateSocial() {
   const element = globalElements.input.censusSocialInput;
   const link = pageData.censussocial;
   if (typeof link !== 'string' || !(element instanceof HTMLInputElement)) return;
-  const isValid = !link || isValidHttpUrl(link);
+  const isValid = !link || isValidHttpUrl(link) || link.startsWith('{{');
   errorMessage(element, isValid ? undefined : 'Please provide the full link');
 }
 

diff --git a/starship.html b/starship.html
@@ -523,7 +523,7 @@ <h1 class="title is-3">Eisvana Wiki Page Creator - Starship</h1>
 			<div id="output" class="column is-full-mobile">
 				<div class="wikiText" id="fullArticle" data-link="page">
 					<div>{{Version|<output id="release" name="release"></output>}}</div>
-					<!-- <div>{{<output id="civStub"></output>}}</div> -->
+          <div>{{Eisvana}}</div>
 					<div>{{Starship infobox</div>
 					<div>| name = <output id="name" name="name"></output></div>
 					<div>| image = <output id="image" name="image"></output></div>

diff --git a/system.html b/system.html
@@ -981,7 +981,7 @@ <h1 class="title is-3">Eisvana Wiki Page Creator - System</h1>
 			<div id="output" class="column is-full-mobile">
 				<div class="wikiText" id="fullArticle" data-link="page">
 					<div>{{Version|<output id="release" name="release"></output>}}</div>
-					<!-- <div>{{<output id="civStub"></output>}}</div> -->
+          <div>{{Eisvana}}</div>
 					<div>{{System infobox</div>
 					<div>| name = <output id="name" name="name"></output></div>
 					<div>| image = <output id="image"></output></div>