首頁 探索 說明
註冊 登入
DricomDragon
/
StaticWebsiteJovian
1
0
複刻 0
檔案 問題管理 1 合併請求 0 Wiki
瀏覽代碼

Merge branch 'footer' into dev

DricomDragon 5 年之前
父節點
4f40eb9d48 946410e324
當前提交
5cfdea5048
共有 16 個文件被更改，包括 125 次插入 和 82 次删除
分割檢視 顯示文件統計
  1. 5 0
      undeployed/scripts/deploy/README.md
  2. 3 0
      undeployed/scripts/deploy/up-date.sh
  3. 3 0
      undeployed/scripts/deploy/up-version.sh
  4. 16 0
      web/include/footer.php
  5. 3 0
      web/include/generated/README.md
  6. 1 0
      web/include/generated/date.txt
  7. 1 0
      web/include/generated/version.txt
  8. 3 8
      web/public/contact.php
  9. 64 0
      web/public/credit.php
  10. 3 10
      web/public/cv.php
  11. 3 5
      web/public/index.php
  12. 3 12
      web/public/projets.php
  13. 3 8
      web/public/projets/pro_ascii_space.php
  14. 3 9
      web/public/projets/pro_pulsar.php
  15. 3 9
      web/public/projets/pro_quoridor.php
  16. 8 21
      web/public/projets/pro_static_site.php

+ 5 - 0
undeployed/scripts/deploy/README.md
查看文件 

@@ -0,0 +1,5 @@
 
+# Deploy
 
+
 
+_folder_
 
+
 
+Contains scripts to be run at deployment time

+ 3 - 0
undeployed/scripts/deploy/up-date.sh
查看文件 

@@ -0,0 +1,3 @@
 
+#!/bin/sh
 
+
 
+date "+%F" > ../../../web/include/generated/date.txt

+ 3 - 0
undeployed/scripts/deploy/up-version.sh
查看文件 

@@ -0,0 +1,3 @@
 
+#!/bin/sh
 
+
 
+git describe > ../../../web/include/generated/version.txt

+ 16 - 0
web/include/footer.php
查看文件 

@@ -0,0 +1,16 @@
 
+<footer class="footer bg-dark mt-5">
 
+    <div class="container">
 
+        <span class="text-muted">
 
+            Version
 
+            <?php include ("generated/version.txt"); ?>
 
+            -
 
+            Mis en ligne le
 
+            <?php include("generated/date.txt"); ?>
 
+            -
 
+            <a href="/public/credit.php">
 
+            Credits
 
+            </a>
 
+        </span>
 
+    </div>
 
+</footer>
 
+

+ 3 - 0
web/include/generated/README.md
查看文件 

@@ -0,0 +1,3 @@
 
+# Generated
 
+
 
+Every file there are placeholders which are replaced with **scripts** at deployment time.

+ 1 - 0
web/include/generated/date.txt
查看文件 

@@ -0,0 +1 @@
 
+yyyy-MM-dd

+ 1 - 0
web/include/generated/version.txt
查看文件 

@@ -0,0 +1 @@
 
+dev

+ 3 - 8
web/public/contact.php
查看文件 

@@ -33,14 +33,9 @@
 
     </main>
 
 
     <!-- Footer -->
 
-    <footer class="footer fixed-bottom bg-dark mt-5">
 
-        <div class="container">
 
-            <span class="text-muted">Images sources : ICON8</span>
 
-            <a href="https://icons8.com/icon/104082/cv">CV icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/104084/city">City icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/19293/code">Code icon by Icons8</a>
 
-        </div>
 
-    </footer>
 
+    <?php
 
+        include("../include/footer.php")
 
+    ?>
 
 
     <!-- Scripts -->
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"

+ 64 - 0
web/public/credit.php
查看文件 

@@ -0,0 +1,64 @@
 
+<!DOCTYPE html>
 
+<html lang="fr">
 
+
 
+<?php
 
+    $title = "Credit";
 
+    include("../include/head.php");
 
+?>
 
+
 
+<body>
 
+    <!-- Navbar -->
 
+    <?php
 
+        include("../include/navbar.php")
 
+    ?>
 
+
 
+    <!-- Content -->
 
+    <main role="main" class="container">
 
+
 
+        <!-- Leader -->
 
+        <div class="focus-center">
 
+            <h1>Credit</h1>
 
+            <img src="https://img.icons8.com/officel/96/000000/icons8-new-logo.png" alt="logo icons8">
 
+            <p class="lead">Cette page rassemble les ressources externes utilisees sur ce site.</p>
 
+        </div>
 
+
 
+        <!-- List -->
 
+        <h3>Icons8</h3>
 
+        <ul>
 
+            <li><a href="https://img.icons8.com/color/48/000000/menu-2.png">https://img.icons8.com/color/48/000000/menu-2.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/48/000000/city.png">https://img.icons8.com/color/48/000000/city.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/48/000000/parse-from-clipboard.png">https://img.icons8.com/color/48/000000/parse-from-clipboard.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/48/000000/code.png">https://img.icons8.com/color/48/000000/code.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/48/000000/secured-letter.png">https://img.icons8.com/color/48/000000/secured-letter.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/48/000000/term.png">https://img.icons8.com/color/48/000000/term.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/50/000000/rocket.png">https://img.icons8.com/color/50/000000/rocket.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/50/000000/space-shuttle.png">https://img.icons8.com/color/50/000000/space-shuttle.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/50/000000/blueprint.png">https://img.icons8.com/color/50/000000/blueprint.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/48/000000/uranus-planet.png">https://img.icons8.com/color/48/000000/uranus-planet.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/50/000000/student-male.png">https://img.icons8.com/color/50/000000/student-male.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/48/000000/compass.png">https://img.icons8.com/color/48/000000/compass.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/48/000000/development-skill.png">https://img.icons8.com/color/48/000000/development-skill.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/48/000000/treble-clef.png">https://img.icons8.com/color/48/000000/treble-clef.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/96/000000/filled-message.png">https://img.icons8.com/color/96/000000/filled-message.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/48/000000/linkedin.png">https://img.icons8.com/color/48/000000/linkedin.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/96/000000/html-5.png">https://img.icons8.com/color/96/000000/html-5.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/48/000000/bootstrap.png">https://img.icons8.com/color/48/000000/bootstrap.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/48/000000/raspberry-pi.png">https://img.icons8.com/color/48/000000/raspberry-pi.png</a></li>
 
+            <li><a href="https://img.icons8.com/color/48/000000/dns.png">https://img.icons8.com/color/48/000000/dns.png</a></li>
 
+            <li><a href="https://img.icons8.com/officel/48/000000/icons8-new-logo.png">https://img.icons8.com/officel/48/000000/icons8-new-logo.png</a></li>
 
+        </ul>
 
+
 
+    </main>
 
+
 
+    <!-- Footer -->
 
+    <?php
 
+        include("../include/footer.php");
 
+    ?>
 
+
 
+    <!-- Scripts -->
 
+    <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
 
+            integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
 
+            crossorigin="anonymous"></script>
 
+    <script src="../include/js/bootstrap.js"></script>
 
+</body>
 
+</html>

+ 3 - 10
web/public/cv.php
查看文件 

@@ -352,16 +352,9 @@
 
     </main>
 
 
     <!-- Footer -->
 
-    <footer class="footer bg-dark mt-5">
 
-        <div class="container">
 
-            <span class="text-muted">Images sources : ICON8</span>
 
-            <a href="https://icons8.com/icon/23319/student-male">Student Male icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/104082/cv">CV icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/12810/treble-clef">Treble Clef icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/104084/city">City icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/19293/code">Code icon by Icons8</a>
 
-        </div>
 
-    </footer>
 
+    <?php
 
+        include("../include/footer.php")
 
+    ?>
 
 
     <!-- Scripts -->
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"

+ 3 - 5
web/public/index.php
查看文件 

@@ -35,11 +35,9 @@
 
     </main>
 
 
     <!-- Footer -->
 
-    <footer class="footer bg-dark mt-5">
 
-        <div class="container">
 
-            <span class="text-muted">Version v2.05 - mise en ligne le 4 aout 2019</span>
 
-        </div>
 
-    </footer>
 
+    <?php
 
+        include("../include/footer.php")
 
+    ?>
 
 
     <!-- Scripts -->
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"

+ 3 - 12
web/public/projets.php
查看文件 

@@ -197,18 +197,9 @@
 
     </main>
 
 
     <!-- Footer -->
 
-    <footer class="footer bg-dark mt-5">
 
-        <div class="container">
 
-            <span class="text-muted">Images sources : ICON8</span>
 
-            <a href="https://icons8.com/icon/104082/cv">CV icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/104084/city">City icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/19293/code">Code icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/15175/rocket">Rocket icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/21447/space-shuttle">Space Shuttle icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/23885/blueprint">Blueprint icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/62040/uranus-planet">Uranus Planet icon by Icons8</a>
 
-        </div>
 
-    </footer>
 
+    <?php
 
+        include("../include/footer.php")
 
+    ?>
 
 
     <!-- Scripts -->
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"

+ 3 - 8
web/public/projets/pro_ascii_space.php
查看文件 

@@ -491,14 +491,9 @@
 
     </main>
 
 
     <!-- Footer -->
 
-    <footer class="footer bg-dark mt-5">
 
-        <div class="container">
 
-            <span class="text-muted">Images sources : ICON8</span>
 
-            <a href="https://icons8.com/icon/104082/cv">CV icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/104084/city">City icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/19293/code">Code icon by Icons8</a>
 
-        </div>
 
-    </footer>
 
+    <?php
 
+        include("../../include/footer.php")
 
+    ?>
 
 
     <!-- Scripts -->
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"

+ 3 - 9
web/public/projets/pro_pulsar.php
查看文件 

@@ -63,15 +63,9 @@
 
     </main>
 
 
     <!-- Footer -->
 
-    <!-- todo : remove fixed-bottom as soon as content was filled -->
 
-    <footer class="footer bg-dark mt-5 fixed-bottom">
 
-            <div class="container">
 
-                    <span class="text-muted">Images sources : ICON8</span>
 
-                    <a href="https://icons8.com/icon/104082/cv">CV icon by Icons8</a>
 
-                    <a href="https://icons8.com/icon/104084/city">City icon by Icons8</a>
 
-                    <a href="https://icons8.com/icon/19293/code">Code icon by Icons8</a>
 
-            </div>
 
-    </footer>
 
+    <?php
 
+        include("../../include/footer.php")
 
+    ?>
 
 
     <!-- Scripts -->
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"

+ 3 - 9
web/public/projets/pro_quoridor.php
查看文件 

@@ -64,15 +64,9 @@
 
     </main>
 
 
     <!-- Footer -->
 
-    <!-- todo : remove fixed-bottom as soon as content was filled -->
 
-    <footer class="footer bg-dark mt-5 fixed-bottom">
 
-            <div class="container">
 
-                    <span class="text-muted">Images sources : ICON8</span>
 
-                    <a href="https://icons8.com/icon/104082/cv">CV icon by Icons8</a>
 
-                    <a href="https://icons8.com/icon/104084/city">City icon by Icons8</a>
 
-                    <a href="https://icons8.com/icon/19293/code">Code icon by Icons8</a>
 
-            </div>
 
-    </footer>
 
+    <?php
 
+        include("../../include/footer.php")
 
+    ?>
 
 
     <!-- Scripts -->
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"

+ 8 - 21
web/public/projets/pro_static_site.php
查看文件 

@@ -183,20 +183,18 @@
 
             ICONS8 : des icônes colorées
 
         </h3>
 
         <p>
 
-            Vous avez sans doute déjà remarqué que j'utilise de nombreuses icônes sur mon site. Les plus observateurs auront
 
-            de plus remarqué une liste de liens en bas de certaines pages (comme celle-ci), et les plus techniques et
 
-            curieux d'entres vous auront peut-être remarqué que ces icônes ne sont pas hébergées sur mon serveur.
 
-        </p>
 
-        <p>
 
-            En fait j'utilise un site web appelé
 
+            Vous avez sans doute déjà remarqué que j'utilise de nombreuses icônes sur mon site. J'ai en effet recours à
 
             <a href="https://icons8.com/">Icons8</a>
 
-            qui regorge d'icônes en tous genres. C'est très pratique.
 
+            qui regorge d'icônes en tous genres, ce qui est très pratique pour illustrer un site web.
 
         </p>
 
         <p>
 
             J'utilise pour l'instant ce service gratuitement. Cela limite son utilisation à de petites résolutions et ne
 
             permet pas d'avoir des images vectorielles. Peut-être aurai-je recours à la solution premium plus tard, afin
 
             d'améliorer le contenu proposé sur ce site et pour soutenir les développeurs d'Icons8.
 
         </p>
 
+        <p>
 
+            Voici la <a href="/public/credit.php">liste des icônes utilisées sur ce site</a>.
 
+        </p>
 
 
         <h3>
 
             Conclusion
 
@@ -246,20 +244,9 @@
 
     </main>
 
 
     <!-- Footer -->
 
-    <footer class="footer bg-dark mt-5">
 
-        <div class="container">
 
-            <span class="text-muted">Images sources : ICON8</span>
 
-            <a href="https://icons8.com/icon/104082/cv">CV icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/104084/city">City icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/19293/code">Code icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/20909/html-5">Html 5 icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/31748/term">Term icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/84710/bootstrap">Bootstrap icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/13443/raspberry-pi">Raspberry Pi icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/63267/dns">DNS icon by Icons8</a>
 
-            <a href="https://icons8.com/icon/20825/icons8">Icons8 icon by Icons8</a>
 
-        </div>
 
-    </footer>
 
+    <?php
 
+        include("../../include/footer.php")
 
+    ?>
 
 
     <!-- Scripts -->
 
     <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"