-fix single-page layout to include gpg key

2 files changed, 9 insertions, 11 deletions

diff --git a/contrib/gns-bcd.html b/contrib/gns-bcd.html
index c700e17b5..2c73b2fde 100644
--- a/contrib/gns-bcd.html
+++ b/contrib/gns-bcd.html
@@ -13,9 +13,6 @@ Academic Title (prefix): <input type="text" name="prefix"><br>
 Name: <input type="text" name="name"><br>
 Academic Title (suffix): <input type="text" name="suffix"><br>
 <p>
-Street: <input type="text" name="street"><br>
-City (and ZIP code): <input type="text" name="city"><br>
-<p>
 Phone: <input type="text" name="phone"><br>
 Fax: <input type="text" name="fax"><br>
 E-mail: <input type="text" name="email"><br>
diff --git a/contrib/gns-bcd.tex b/contrib/gns-bcd.tex
index c8c37d226..36df8e022 100644
--- a/contrib/gns-bcd.tex
+++ b/contrib/gns-bcd.tex
@@ -18753,16 +18753,17 @@
             \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-27.0mm) {\ifthenelse{\equal{#1}{english}}{\subdepartmenten}{\subdepartmentde}};
 
             \ifthenelse{\equal{\gpglineone}{}\or\equal{#1}{german}}{
-                \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-35mm) {\street};
-                \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-37.5mm) {\city};
+                \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-33.0mm) {Tel};
+                \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-35.5mm) {Fax};
+                \node[rectangle,draw=white,minimum height=7pt,text width=30mm,inner sep=0pt] at (65mm,-33.0mm) {\phone};
+                \node[rectangle,draw=white,minimum height=7pt,text width=30mm,inner sep=0pt] at (65mm,-35.5mm) {\fax};
 
-                \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-41.5mm) {Tel};
-                \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-44.0mm) {Fax};
-                \node[rectangle,draw=white,minimum height=7pt,text width=30mm,inner sep=0pt] at (65mm,-41.5mm) {\phone};
-                \node[rectangle,draw=white,minimum height=7pt,text width=30mm,inner sep=0pt] at (65mm,-44.0mm) {\fax};
+                \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-38.5mm) {\email};
+                \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-41.0mm) {\homepage};
 
-                \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-48.0mm) {\email};
-                \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-50.5mm) {\homepage};
+                \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-44.0mm) {GPG Fingerprint:};
+                \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-46.5mm) {\gpglineone};
+                \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-49.0mm) {\gpglinetwo};
             }
             {
                 \node[rectangle,draw=white,minimum height=7pt,text width=37.5mm,inner sep=0pt] at (64.25mm,-35.0mm) {\email};