1 files changed, 51 insertions, 52 deletions
diff --git a/html/encyclopedia/physics.html b/html/encyclopedia/physics.html
index 7c00842..e15f48a 100644
--- a/html/encyclopedia/physics.html
+++ b/html/encyclopedia/physics.html
@@ -6,8 +6,8 @@
 		<script id="MathJax-script" async src="https://cdn.jsdelivr.net/npm/mathjax@3/es5/tex-mml-chtml.js"></script>
 	</head>
 	<body>
-		<!--#include virtual="/include/pghdr.shtml"-->
-		<div class="content">
+		<!--#include virtual="/include/pageHeader.shtml"-->
+		<div class="page">
 			<p class="pageTitle">Leksikon<sub> Fysik</sub></p>
 			<div class="section" id="measures-and-units">
 				<p class="large">Mål og Enheder</p>
@@ -19,40 +19,7 @@
 						<th>Symbol<sub> af enhed</sub></th>
 					</tr>
 					<tr class="small">
-						<th colspan="4">Grundlæggende Mål</th>
-					</tr>
-					<tr>
-						<td>strømstyrke</td>
-						<td class="math">\(I\)</td>
-						<td>ampere</td>
-						<td class="math">\(A\)</td>
-					</tr>
-					<tr>
-						<td>masse</td>
-						<td class="math">\(m\)</td>
-						<td>kilogram</td>
-						<td class="math">\(kg\)</td>
-					</tr>
-					<tr>
-						<td>afstand</td>
-						<td class="math">\(s\)</td>
-						<td>meter</td>
-						<td class="math">\(m\)</td>
-					</tr>
-					<tr>
-						<td>temperatur</td>
-						<td class="math">\(T\)</td>
-						<td>kelvin</td>
-						<td class="math">\(K\)</td>
-					</tr>
-					<tr>
-						<td>tid</td>
-						<td class="math">\(t\)</td>
-						<td>sekund</td>
-						<td class="math">\(s\)</td>
-					</tr>
-					<tr class="small">
-						<th colspan="4">Afledte Mål<sub> med navngivede enheder</sub></th>
+						<th colspan="4">Mål<sub> med navngivede enheder</sub></th>
 					</tr>
 					<tr>
 						<td>energi</td>
@@ -73,6 +40,18 @@
 						<td class="math">\(Hz\)</td>
 					</tr>
 					<tr>
+						<td>strømstyrke</td>
+						<td class="math">\(I\)</td>
+						<td>ampere</td>
+						<td class="math">\(A\)</td>
+					</tr>
+					<tr>
+						<td>masse</td>
+						<td class="math">\(m\)</td>
+						<td>kilogram</td>
+						<td class="math">\(kg\)</td>
+					</tr>
+					<tr>
 						<td>effekt</td>
 						<td class="math">\(P\)</td>
 						<td>watt</td>
@@ -90,8 +69,26 @@
 						<td>coulomb</td>
 						<td class="math">\(C\)</td>
 					</tr>
+					<tr>
+						<td>afstand</td>
+						<td class="math">\(s\)</td>
+						<td>meter</td>
+						<td class="math">\(m\)</td>
+					</tr>
+					<tr>
+						<td>temperatur</td>
+						<td class="math">\(T\)</td>
+						<td>kelvin</td>
+						<td class="math">\(K\)</td>
+					</tr>
+					<tr>
+						<td>tid</td>
+						<td class="math">\(t\)</td>
+						<td>sekund</td>
+						<td class="math">\(s\)</td>
+					</tr>
 					<tr class="small">
-						<th colspan="4">Afledte Mål<sub> med unavngivede enheder</sub></th>
+						<th colspan="4">Mål<sub> med unavngivede enheder</sub></th>
 					</tr>
 					<tr>
 						<td>areal</td>
@@ -141,16 +138,14 @@
 						<td>kilogram pr. kubikmeter</td>
 						<td class="math">\(\frac{kg}{m^3}\)</td>
 					</tr>
-				</table>
-				<p>Mål uden enheder:</p>
-				<table>
-					<tr>
-						<th>Mål</th>
-						<th>Symbol</th>
+					<tr class="small">
+						<th colspan="4">Mål<sub> uden enheder</sub></th>
 					</tr>
 					<tr>
 						<td>strålingsfaktor</td>
 						<td class="math">\(\varepsilon\)</td>
+						<th></th>
+						<th></th>
 					</tr>
 				</table>
 				<p>Mål med variante enheder:</p>
@@ -186,22 +181,24 @@
 					<tr>
 						<td>kinetisk energi</td>
 						<td class="math">\(K\)</td>
-						<td>energi</td>
+						<td rowspan="4">energi</td>
 					</tr>
 					<tr>
 						<td>potentiel energi</td>
 						<td class="math">\(U\)</td>
-						<td>energi</td>
 					</tr>
 					<tr>
 						<td>varmeenergi</td>
 						<td class="math">\(Q\)</td>
-						<td>energi</td>
+					</tr>
+					<tr>
+						<td>arbejde</td>
+						<td class="math">\(W\)</td>
 					</tr>
 					<tr>
 						<td>bølgelængde</td>
 						<td class="math">\(\lambda\)</td>
-						<td>distance</td>
+						<td>afstand</td>
 					</tr>
 				</table>
 				<p class="math">\(1\ {}^{\circ}C=\frac{5463}{20}\ K\)</p>
@@ -217,12 +214,14 @@
 				<p class="math">\(g=\frac{981}{100}\ \frac{m}{s^2}\)</p>
 				<p>... er standard på Jorden.</p>
 				<br />
-				<p class="math">\(E=Fs\)</p>
+				<p class="math">\(C=cm\)</p>
+				<br />
 				<p class="math">\(E=Pt\)</p>
 				<p class="math">\(K=\frac{mv^{2}}{2}\)</p>
-				<p class="math">\(Q=CT=cmT\)</p>
+				<p class="math">\(Q=CT\)</p>
+				<p class="math">\(W=Fs\)</p>
 				<p>Gravitation:</p>
-				<p class="math">\(U=Fs=mgs\)</p>
+				<p class="math">\(U=Fs\)</p>
 				<p>... hvori <i>F</i> er tyngdekraften og <i>g</i> er den lokale tyngeacceleration.</p>
 				<br />
 				<p class="math">\(F=ma\)</p>
@@ -231,7 +230,7 @@
 				<p class="math">\(F=\frac{Gm_{0}m_{1}}{r^{2}}\)</p>
 				<p>... <i>m_0</i> og <i>m_1</i> er masserne af objekterne og <i>r</i> er distancen mellem centrene af de to objekter.</p>
 				<br />
-				<p class="math">\(i={\sigma}T^4{\varepsilon}\)</p>
+				<p class="math">\(i=T^4{\sigma}{\varepsilon}\)</p>
 				<br />
 				<p class="math">\(P=\frac{E}{t}\)</p>
 				<p class="math">\(P=iA\)</p>
@@ -283,6 +282,6 @@
 				<p class="math">\(\sigma=\frac{2\pi^5k_B^4}{15h^3c^2} \approx \frac{5\ 670\ 374\ 419}{10^{17}}\ \frac{W}{m^2K^4}\)</p>
 			</div>
 		</div>
-		<!--#include virtual="/include/pgftr.shtml"-->
+		<!--#include virtual="/include/pageFooter.shtml"-->
 	</body>
 </html>