Aesthetic patch.

Maikuolan · Maikuolan · commit 748ac73962f3 · 2023-02-12T15:54:33.000+08:00
diff --git a/assets/bluemetal/frontend.css b/assets/bluemetal/frontend.css
@@ -31,6 +31,7 @@ a:hover,a:active,a:focus,.txtRd{color:#fca}
 .cat,.exp,.bNav,.gen,.nav,.s,.tip,.txtGn,.txtOe,.txtRd,.spanner,a,input,select,textarea{font-weight:700}
 .ci,.co,.gen,.center{margin:auto}
 .ci,.co,.ng1,.ng2{width:calc(100% - 32px)}
+.idx{width:calc(100% - 10px)}
 .ci{background-color:rgba(102,119,136,.5);text-align:{FE_Align};border-top-right-radius:24px}
 .ci{padding:12px}
 .co,body,.center{text-align:center}
@@ -137,3 +138,4 @@ input[type=checkbox]+label,input[type=radio]+label,input[type=radio]+label,.grid
 input[type=button].reset{background:none;cursor:pointer;border:none;padding:0 12px 0 12px;margin:0;width:auto;color:#fca}
 input[type=button].reset:hover,input[type=button].reset:active{color:#ffc}
 .tablend{margin-top:-2px}
+#logsTA{position:relative;top:-2px}
diff --git a/assets/default/_config.html b/assets/default/_config.html
@@ -2,8 +2,7 @@
 <tr>
   <td class="nav big">
 {nav}      <hr />
-    <table><tr><td class="ng1"><div class="idx">
-{Indexes}</div></td></tr></table>
+    <div class="ng1 idx">{Indexes}</div>
   </td>
   <td class="right extend">
     <div class="s">{state_msg}</div>
diff --git a/assets/default/_logs.html b/assets/default/_logs.html
@@ -2,11 +2,10 @@
 <tr>
   <td class="nav{mod_class_nav}"><div class="big">
 {nav}    <hr /></div>
-    <table><tr><td class="ng1"><div class="idx">
-      {LogFiles}
-    </div></td></tr></table>
+    <div class="ng1 idx">{LogFiles}</div>
   </td>
   <td class="right{mod_class_right}">
+  <div class="ng1 flong mob">{LogFiles}</div>
   <span class="s">{TextModeSwitchLink}{ProcessTime}</span>
   <hr />
 {logfileData}
diff --git a/assets/default/frontend.css b/assets/default/frontend.css
@@ -32,6 +32,7 @@ a:active,a:focus{color:red}
 .cat,.exp,.bNav,.gen,.nav,.s,.tip,.txtGn,.txtOe,.txtRd,.spanner,a,input,select,textarea{font-weight:700}
 .ci,.co,.gen,.center{margin:auto}
 .ci,.co,.ng1,.ng2{width:calc(100% - 32px)}
+.idx{width:calc(100% - 10px)}
 .ci{background-color:#fff;border-style:solid;border-width:1px;border-color:#aaa;text-align:{FE_Align};border-top-right-radius:24px}
 .ci{padding:12px}
 .co,body,.center{text-align:center}
@@ -141,3 +142,4 @@ input[type=checkbox]+label,input[type=radio]+label,input[type=radio]+label,.grid
 input[type=button].reset{background:none;cursor:pointer;border:none;padding:0 12px 0 12px;margin:0;width:auto;color:red}
 input[type=button].reset:hover,input[type=button].reset:active{color:#f88}
 .tablend{margin-top:-2px}
+#logsTA{position:relative;top:-2px}
diff --git a/assets/fullmoon/_config.html b/assets/fullmoon/_config.html
@@ -3,7 +3,6 @@
 <div class="s">{state_msg}</div>
   <form action="?phpmussel-page=config" method="POST">
     <input type="hidden" name="updatingConfig" value="1" />
-    <div style="display:none">{Indexes}</div>
     <table>
       <tr><td class="ng2"><div class="s">{link_config}</div></td></tr>
       <tr>
diff --git a/assets/fullmoon/frontend.css b/assets/fullmoon/frontend.css
@@ -28,6 +28,7 @@ a:hover,a:active,a:focus{color:#fff7bc}
 .cat,.exp,.gen,.nav,.s,.txtGn,.txtOe,.txtRd,.spanner,a,input,select,textarea{font-weight:700}
 .ci,.co,.gen,.center{margin:auto}
 .ci,.co,.ng1,.ng2{width:calc(100% - 32px)}
+.idx{width:calc(100% - 10px)}
 .ci{background-color:rgba(69,84,75,.5);border-style:solid;border-width:1px;border-color:#aaa;text-align:{FE_Align};border-top-right-radius:24px}
 .ci{padding:12px}
 .co,body,.nav,.center{text-align:center}
@@ -120,3 +121,4 @@ input[type=checkbox]+label,input[type=radio]+label,input[type=radio]+label,.grid
 input[type=button].reset{background:none;cursor:pointer;border:none;padding:0 12px 0 12px;margin:0;width:auto;color:#e7ab7d}
 input[type=button].reset:hover,input[type=button].reset:active{color:#fcefcf}
 .tablend{margin-top:-2px}
+#logsTA{position:relative;top:-2px}
diff --git a/assets/moss/frontend.css b/assets/moss/frontend.css
@@ -31,6 +31,7 @@ a:hover,a:active,a:focus{color:#866}
 .cat,.exp,.bNav,.gen,.nav,.s,.tip,.txtGn,.txtOe,.txtRd,.spanner,a,input,select,textarea{font-weight:700}
 .ci,.co,.gen,.center{margin:auto}
 .ci,.co,.ng1,.ng2{width:calc(100% - 32px)}
+.idx{width:calc(100% - 10px)}
 .ci{background-color:rgba(192,240,160,.6);border-style:solid;border-width:1px;border-color:#604848;text-align:{FE_Align};border-top-right-radius:24px}
 .ci{padding:12px}
 .co,body,.center{text-align:center}
@@ -138,3 +139,4 @@ input[type=checkbox]+label,input[type=radio]+label,input[type=radio]+label,.grid
 input[type=button].reset{background:none;cursor:pointer;border:none;padding:0 12px 0 12px;margin:0;width:auto;color:#a04848}
 input[type=button].reset:hover,input[type=button].reset:active{color:#b77}
 .tablend{margin-top:-2px}
+#logsTA{position:relative;top:-2px}
diff --git a/assets/primer/frontend.css b/assets/primer/frontend.css
@@ -21,6 +21,7 @@ a:active,a:focus{color:#cb2431}
 .cat,.exp,.bNav,.gen,.nav,.s,.tip,.txtGn,.txtOe,.txtRd,.spanner,a{font-weight:700}
 .ci,.co,.gen,.center{margin:auto}
 .ci,.co,.ng1,.ng2,.ci>.bNav:first-child{width:calc(100% - 32px)}
+.idx{width:calc(100% - 10px)}
 .ci{padding:12px}
 .ci{text-align:{FE_Align}}
 .co,body,.center{text-align:center}
@@ -143,3 +144,4 @@ input[type=text][pattern]:invalid:not(input[type=text]:placeholder-shown){backgr
 input[type=button].reset{box-shadow:none;background:none;cursor:pointer;border:none;padding:0 12px 0 12px;margin:0;width:auto;color:#cb2431}
 input[type=button].reset:hover,input[type=button].reset:active{color:#f88}
 .tablend{margin-top:-2px}
+#logsTA{position:relative;top:-2px}
diff --git a/assets/primerdark/frontend.css b/assets/primerdark/frontend.css
@@ -20,6 +20,7 @@ a:hover{color:#fc0;text-decoration:underline}
 .cat,.exp,.bNav,.gen,.nav,.s,.tip,.txtGn,.txtOe,.txtRd,.spanner,a{font-weight:700}
 .ci,.co,.gen,.center{margin:auto}
 .ci,.co,.ng1,.ng2,.ci>.bNav:first-child{width:calc(100% - 32px)}
+.idx{width:calc(100% - 10px)}
 .ci{padding:12px}
 .ci{text-align:{FE_Align}}
 .co,body,.center{text-align:center}
@@ -146,3 +147,4 @@ input[type=text][pattern]:invalid:not(input[type=text]:placeholder-shown){backgr
 input[type=button].reset{box-shadow:none;background:none;cursor:pointer;border:none;padding:0 12px 0 12px;margin:0;width:auto;color:#c99}
 input[type=button].reset:hover,input[type=button].reset:active{color:#eaa}
 .tablend{margin-top:-2px}
+#logsTA{position:relative;top:-2px}
diff --git a/assets/rbi/frontend.css b/assets/rbi/frontend.css
@@ -32,6 +32,7 @@ a:active,a:focus{color:red}
 .cat,.exp,.bNav,.gen,.nav,.s,.tip,.txtGn,.txtOe,.txtRd,.spanner,a,input,select,textarea{font-weight:700}
 .ci,.co,.gen,.center{margin:auto}
 .ci,.co,.ng1,.ng2{width:calc(100% - 32px)}
+.idx{width:calc(100% - 10px)}
 .ci{background-color:#fff;border-style:solid;border-width:1px;border-color:#aaa;text-align:{FE_Align};border-top-right-radius:24px}
 .ci{padding:12px}
 .co,body,.center{text-align:center}
@@ -141,3 +142,4 @@ input[type=checkbox]+label,input[type=radio]+label,input[type=radio]+label,.grid
 input[type=button].reset{background:none;cursor:pointer;border:none;padding:0 12px 0 12px;margin:0;width:auto;color:red}
 input[type=button].reset:hover,input[type=button].reset:active{color:#f88}
 .tablend{margin-top:-2px}
+#logsTA{position:relative;top:-2px}
diff --git a/assets/slate/frontend.css b/assets/slate/frontend.css
@@ -32,6 +32,7 @@ a:hover,a:active,a:focus{color:#fc6}
 .cat,.exp,.bNav,.gen,.nav,.s,.tip,.txtGn,.txtOe,.txtRd,.spanner,a,input,select,textarea{font-weight:700}
 .ci,.co,.gen,.center{margin:auto}
 .ci,.co,.ng1,.ng2{width:calc(100% - 32px)}
+.idx{width:calc(100% - 10px)}
 .ci{background-color:#333;border-style:solid;border-width:1px;border-color:#393939;text-align:{FE_Align};border-top-right-radius:24px}
 .ci{padding:12px}
 .co,body,.center{text-align:center}
@@ -139,3 +140,4 @@ input[type=checkbox]+label,input[type=radio]+label,input[type=radio]+label,.grid
 input[type=button].reset{background:none;cursor:pointer;border:none;padding:0 12px 0 12px;margin:0;width:auto;color:#f74}
 input[type=button].reset:hover,input[type=button].reset:active{color:#fa7}
 .tablend{margin-top:-2px}
+#logsTA{position:relative;top:-2px}
diff --git a/src/FrontEnd.php b/src/FrontEnd.php
@@ -8,7 +8,7 @@
  * License: GNU/GPLv2
  * @see LICENSE.txt
  *
- * This file: Front-end handler (last modified: 2023.02.10).
+ * This file: Front-end handler (last modified: 2023.02.12).
  */
 
 namespace phpMussel\FrontEnd;
@@ -403,9 +403,20 @@ public function view(string $Page = ''): void
 
         /** A simple passthru for the favicon. */
         if ($Page === 'favicon') {
+            $FavIconData = $this->Loader->getFavicon();
+            $OldETag = $_SERVER['HTTP_IF_NONE_MATCH'] ?? '';
+            $NewETag = hash('sha256', $FavIconData) . '-' . strlen($FavIconData);
+            header('ETag: "' . $NewETag . '"');
+            header('Expires: ' . gmdate('D, d M Y H:i:s T', $this->Loader->Time + 2592000));
+            if (preg_match('~(?:^|, )(?:"' . $NewETag . '"|' . $NewETag . ')(?:$|, )~', $OldETag)) {
+                header('HTTP/1.0 304 Not Modified');
+                header('HTTP/1.1 304 Not Modified');
+                header('Status: 304 Not Modified');
+                die;
+            }
             header('Content-Type: image/png');
-            echo $this->Loader->getFavicon();
-            return;
+            echo $FavIconData;
+            die;
         }
 
         /** Attempt to log the user in. */
@@ -2019,7 +2030,7 @@ public function view(string $Page = ''): void
 
             /** Prepare log data formatting. */
             if (!$TextMode) {
-                $FE['logfileData'] = '<textarea readonly>' . $FE['logfileData'] . '</textarea>';
+                $FE['logfileData'] = '<textarea id="logsTA" readonly>' . $FE['logfileData'] . '</textarea>';
             } else {
                 $this->formatter($FE['logfileData']);
             }
@@ -2857,7 +2868,7 @@ private function canonical(string $Path): string
      *
      * @param string $Asset The path to the asset.
      * @param ?callable $Callback An optional callback.
-     * @return exit
+     * @return never
      */
     private function eTaggable(string $Asset, ?callable $Callback = null): void
     {
