[GNUnet-SVN] r31594 - gnunet/contrib

[gnunet]

Author: grothoff
Date: 2013-12-20 09:00:23 +0100 (Fri, 20 Dec 2013)
New Revision: 31594

Modified:
   gnunet/contrib/gns-bcd.html
   gnunet/contrib/gns-bcd.tex
Log:
-fix single-page layout to include gpg key

Modified: gnunet/contrib/gns-bcd.html
===================================================================
--- gnunet/contrib/gns-bcd.html 2013-12-20 04:46:56 UTC (rev 31593)
+++ gnunet/contrib/gns-bcd.html 2013-12-20 08:00:23 UTC (rev 31594)
@@ -13,9 +13,6 @@
 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>

Modified: gnunet/contrib/gns-bcd.tex
===================================================================
--- gnunet/contrib/gns-bcd.tex  2013-12-20 04:46:56 UTC (rev 31593)
+++ gnunet/contrib/gns-bcd.tex  2013-12-20 08:00:23 UTC (rev 31594)
@@ -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};