diff --git a/administrativt/medlemslapp/conditions.tex b/administrativt/medlemslapp/conditions.tex
index 8d398bfc6c0e3bc007040c3de063b785ef44dd94..9e85576bd47c3c03db8896717b68e9beecac3db6 100644
--- a/administrativt/medlemslapp/conditions.tex
+++ b/administrativt/medlemslapp/conditions.tex
@@ -6,20 +6,28 @@
\topmargin -1.5cm
\textheight 25cm
\pagestyle{empty}
+
+
+\usepackage{hyperref}
+\usepackage{tabularx}
+\newcommand{\formline}[2]{
+ #1 & \TextField[width=\linewidth,height=0pt,borderwidth=0pt,name=#2]{}
+}
+
\begin{document}
%\epsfysize 30 mm
% \mbox{\hspace{8cm}
% \vspace{-5cm}
% \epsfbox{lyslogo.ps}}
-\section*{Terms for accounts (v1.3)}
+\section*{Terms for accounts (en/v1.5)}
Welcome to LYSATOR!
As a member of Lysator you have wide possibilities to explore many
interesting areas in computing. You are free to, within reasonable
-borders, do almost anything on the computer systems of Lysator,
-but there are certain rules that Lysator wants you to abide to.
+limits, do almost anything on the computer systems of Lysator,
+but there are certain rules that Lysator wants you to abide by.
\begin{enumerate}
\item The account is personal, and may not be transfered or extradited
@@ -38,7 +46,7 @@ copyright protected material if you don't have permission to do so.
\item Beyond the above rules does Lysator also apply the rules that
Linköpings universitet have stated in {\textless}Rules for computers,
network and system facilities at Linköpings universitet, DNR: LiU
-1299/97-14{\textgreater}.
+2018-01846{\textgreater}.
\end{enumerate}
In addition the following can be noted:
@@ -54,6 +62,12 @@ donators have special donation terms. Check with datorhandboken\\
{\textless}http://datorhandbok.lysator.liu.se/{\textgreater} if you
are unsure about what terms apply to the system you use, or ask a
system administrator ("root").
+
+\item Lysator stores the information given on this paper. The username
+has a direct connection to your name and this is visible to all members
+of Lysator. Only the board has access to the remainder of the information.
+Inform the board if you wish to be forgotten.
+
\end{itemize}
These rules exist so that we may all enjoy our login sessions on
@@ -69,37 +83,54 @@ connection. We risk losing the connection unless we behave.
\section*{Filled in by the applicant}
\renewcommand{\arraystretch}{2.57}
+\begin{center}
\fbox{
- \begin{tabular}{@{}ll}
- Name: & \hspace{9.4cm} \\ \cline{2-2}
- Address: \\ \cline{2-2}
- \\ \cline{2-2}
- Phone: \\ \cline{2-2}
- \end{tabular}
+ \begin{tabularx}{.9\textwidth}{@{}l@{}X}
+ \formline{Name}{NAMN}\\
+ \formline{Address}{ADRESS}\\
+ \formline{Postcode}{PSNRORT}\\
+ \formline{Phone}{TELNR}\\
+ \formline{LiU-ID}{LIUID}
+ \end{tabularx}
}
+\end{center}
+
+\section*{Date and signature}
+ I have read the conditions in the paper ''Terms for accounts (en/v1.5)''
+ and promise to follow them.
+
+\begin{tabular}{@{}rlrl}
+ Date & \hspace{3cm} & Signature & \hspace{4.2cm} \\ \cline{2-2} \cline{4-4}
+\end{tabular}
\vspace{1cm}
\section*{Filled in by the root}
+\begin{center}
\fbox{
- \begin{tabular}{@{}ll}
- Username: & \hspace{7.7cm} \\ \cline{2-2}
- UID: \\ \cline{2-2}
- Personal ID: \\ \cline{2-2}
- Creating root: \\ \cline{2-2}
- Payment method: \\ \cline{2-2}
- LiU-kort? \\ \cline{2-2}
- \end{tabular}
+ \begin{tabularx}{.9\textwidth}{@{}l@{}X}
+ \formline{Username}{ANAMN}\\
+ \formline{UID}{UID}\\
+ \formline{ID number}{PNR}\\
+ \formline{Creating root}{ROOT}\\
+ \formline{Payment method}{BETMETD}\\
+ \formline{LiU card?}{LIUKORT}
+ \end{tabularx}
}
+\end{center}
\vspace{1cm}
-\section*{Date and signature}
- I have read the conditions in the paper "Terms for accounts (v1.3)"
- and promise to follow them.
-
-\begin{tabular}{@{}rlrl}
- Date & \hspace{3cm} & Signature & \hspace{4.2cm} \\ \cline{2-2} \cline{4-4}
-
+\vspace{1cm}
+Cut here and give the left copy to the treasurer and the right to the member.
+\hrule\
+\begin{tabular}{@{}ll|ll}
+ {\large Receipt} & & {\large Receipt}\\[-0.6cm]
+ Date: & \hspace{3cm} & Date: & \hspace{3cm} \\[-0.6cm]
+ Location: & \hspace{3cm} & Location: & \hspace{3cm} \\[-0.6cm]
+ User: & \hspace{3cm} & User: & \hspace{3cm} \\[-0.6cm]
+ Amount: & \hspace{3cm} & Amount: & \hspace{3cm} \\[-0.6cm]
+ Root signature: & \hspace{3cm} & Root signature: & \hspace{3cm} \\[-0.6cm]
\end{tabular}
+
\end{document}
diff --git a/administrativt/medlemslapp/villkor.tex b/administrativt/medlemslapp/villkor.tex
index 725f6a3adaf45ed2a36bf35b55757c6e0c9cc159..03c190c8ed77f20f41bf3e961c3f8c28366f2970 100644
--- a/administrativt/medlemslapp/villkor.tex
+++ b/administrativt/medlemslapp/villkor.tex
@@ -3,11 +3,16 @@
\usepackage[latin1]{inputenc}
% \usepackage{epsfig}
% \usepackage{boxedminipage}
+
\topmargin=-1.5cm
\textheight=25cm
\pagestyle{empty}
-% \pagestyle{empty}
+\usepackage{hyperref}
+\usepackage{tabularx}
+\newcommand{\formline}[2]{
+ #1 & \TextField[width=\linewidth,height=0pt,borderwidth=0pt,name=#2]{}
+}
\newcommand{\villkorversion}{(v1.5)}
\begin{document}
@@ -81,19 +86,22 @@ sk
%\mbox{\hspace{8cm}
% \vspace{-5cm}
% \epsfbox{lyslogo.eps}}
+\begin{Form}
\section*{Fylls i av användaren}
\renewcommand{\arraystretch}{2.57}
+\begin{center}
\fbox{%
- \begin{tabular}{@{}ll}
- Namn: & \hspace{9.4cm} \\ \cline{2-2}
- Adress: \\ \cline{2-2}
- \\ \cline{2-2}
- Telefon: \\ \cline{2-2}
- LiU-ID: \\ \cline{2-2}
- \end{tabular}
+ \begin{tabularx}{.9\textwidth}{@{}l X@{}}
+ \formline{Namn}{NAMN}\\
+ \formline{Gatuadress}{ADRESS}\\
+ \formline{Postnr\&ort}{PSNRORT}\\
+ \formline{Telefon}{TELNR}\\
+ \formline{Liu-ID}{LIUID}
+ \end{tabularx}
}
+\end{center}
\section*{Datum och underskrift}
Jag har tagit del av villkoren i pappret "Villkor för konto
@@ -107,19 +115,19 @@ Datum & \hspace{3cm} & Underskrift & \hspace{4.2cm} \\ \cline{2-2}\cline{4-4}
\section*{Fylls i av rooten}
+\begin{center}
\fbox{%
- \begin{tabular}{@{}ll}
- Användaridentitet: & \hspace{7.7cm} \\ \cline{2-2}
- UID: \\ \cline{2-2}
- Personnummer: \\ \cline{2-2}
- Skapande root: \\ \cline{2-2}
- Betalsätt: \\ \cline{2-2}
- LiU-kort? \\ \cline{2-2}
- \end{tabular}
+ \begin{tabularx}{.9\textwidth}{@{}l X@{}}
+ \formline{Användaridentitet}{ANAMN}\\
+ \formline{UID}{UID}\\
+ \formline{Personnummer}{PNR}\\
+ \formline{Skapande root}{ROOT}\\
+ \formline{Betalsätt}{BETMETD}\\
+ \formline{Liu-kort?}{LIUKORT}
+ \end{tabularx}
}
-
+\end{center}
\vspace{1cm}
-
Klipp här! Vänstra till kassören och högra till medlemmen.
\hrule\
@@ -132,4 +140,7 @@ Klipp h
Rootunderskrift: & \hspace{3cm} & Rootunderskrift: & \hspace{3cm} \\[-0.6cm]
\end{tabular}
+\end{Form}
+
\end{document}
+