aboutsummaryrefslogtreecommitdiffstats
path: root/resources
diff options
context:
space:
mode:
authorGustav Eek <gustav.eek@fripost.org>2018-04-30 17:25:26 +0200
committerGustav Eek <gustav.eek@fripost.org>2018-04-30 17:25:26 +0200
commitd088b6db81ceca6bd5982bfbf6230e0c4530def7 (patch)
tree7f5dcfdb6edce92c4fe6ab956263c59856d8ae5d /resources
parentc6bbe516195f412837e6004b551bf78ab235fef6 (diff)
parente2b17e3955fd77d9d08d8a3b53094b8658517848 (diff)
Merge branch 'master' into intgr/2017 for send updateintgr/2017ge/2017-06-26-board
Diffstat (limited to 'resources')
-rw-r--r--resources/Makefile-common5
-rw-r--r--resources/board-minutes-template-en.tex34
-rw-r--r--resources/board-minutes-template-sv.tex38
3 files changed, 52 insertions, 25 deletions
diff --git a/resources/Makefile-common b/resources/Makefile-common
index 3d066b1..80713a6 100644
--- a/resources/Makefile-common
+++ b/resources/Makefile-common
@@ -1,3 +1,4 @@
+# -*- mode: makefile ; -*-
# This Makefile is used as common denominator for the compilation of a
# PDF file from a minutes.
#
@@ -53,7 +54,9 @@ clean:
# Sends to fripost.org for publication
send:
- rsync -ruvp --chmod=Dugo+rx,Fugo+r $(send-files) fripost@fripost.org:fripost.org/minutes/
+ rsync -ruvp --chmod=Dugo+rx,Fugo+r $(send-files) www.fripost.org:/var/www/fripost.org/minutes
+ @echo; echo Now avialable as; for f in $(send-files); do echo " - https://fripost.org/minutes/$$f"; done
+
# Help
help:
diff --git a/resources/board-minutes-template-en.tex b/resources/board-minutes-template-en.tex
index c665f5d..ac1ce40 100644
--- a/resources/board-minutes-template-en.tex
+++ b/resources/board-minutes-template-en.tex
@@ -27,23 +27,25 @@
}%
\parbox[t]{\tempTwo}{\mbox{}\vspace{-2\baselineskip}\vspace{2pt}%
\begin{multicols}{3}%
-% Gustav Eek\\
-% Guilhem Moulin\\
-% Lola Möller\\
-% Leif-Jöran Olsson\\
-% Stian Rødven Eide\\
-% Delphine Szymczak
+ % Gustav Eek \\
+ % Guilhem Moulin \\
+ % Lola Möller \\
+ % Leif-Jöran Olsson \\
+ % Stian Rødven Eide \\
+ % Albin Söderqvist \\
\end{multicols}%
}
\newcommand \meetingchairman {Stian Rødven Eide}
\newcommand \meetingsecretary {Gustav Eek}
-\newcommand \approver {Leif-Jöran Olsson}
+\newcommand \approval {Leif-Jöran Olsson}
\begin{enumerate}
\item The meeting was opened.
-\item \meetingchairman\ was elected meeting chairman, \meetingsecretary\ meeting secretary, and \approver\ approver.
-\item The agenda was confirmed.
-\item The meeting went through the minutes from \lastmeetingdate.
+\item Övrig mötesformalia
+ \begin{enumerate}
+ \item \meetingchairman\ was elected meeting chairman, \meetingsecretary\ meeting secretary, and \approval\ approver.
+ \item The agenda was confirmed.
+ \end{enumerate}
\item Reports
\begin{enumerate}
\item Economy
@@ -62,16 +64,26 @@
\item
\end{itemize}
\end{enumerate}
-\item Activity days and other activities
+\item Activity days, parties, and other activities
\begin{enumerate}
\item Previous activities
\item Coming activities
\end{enumerate}
+\item Board's workmeetings
+ \begin{itemize}
+ \item
+ \item
+ \end{itemize}
\item Outreach and information spread
\begin{enumerate}
\item Follow up
\item Items to attend
\end{enumerate}
+\item The meeting went through the minutes from \lastmeetingdate.
+ \begin{itemize}
+ \item
+ \item
+ \end{itemize}
\item To do list
\begin{itemize}
\item
diff --git a/resources/board-minutes-template-sv.tex b/resources/board-minutes-template-sv.tex
index 6cb94cf..2329044 100644
--- a/resources/board-minutes-template-sv.tex
+++ b/resources/board-minutes-template-sv.tex
@@ -27,12 +27,12 @@
}%
\parbox[t]{\tempTwo}{\mbox{}\vspace{-2\baselineskip}\vspace{2pt}%
\begin{multicols}{3}%
-% Gustav Eek\\
-% Guilhem Moulin\\
-% Lola Möller\\
-% Leif-Jöran Olsson\\
-% Stian Rødven Eide\\
-% Delphine Szymczak
+ % Gustav Eek \\
+ % Guilhem Moulin \\
+ % Lola Möller \\
+ % Leif-Jöran Olsson \\
+ % Stian Rødven Eide \\
+ % Albin Söderqvist \\
\end{multicols}%
}
\newcommand \meetingchairman {Stian Rødven Eide}
@@ -41,9 +41,11 @@
\begin{enumerate}
\item Mötet öppnades.
-\item \meetingchairman\ valdes till ordförande, \meetingsecretary\ till sekreterare och \approval\ till justeringsperson.
-\item Fastställande av dagordning
-\item Mötesprotokollet från \lastmeetingdate\ gicks igenom
+\item Övrig mötesformalia
+ \begin{enumerate}
+ \item \meetingchairman\ valdes till ordförande, \meetingsecretary\ till sekreterare och \approval\ till justeringsperson.
+ \item Dagordningen fastställdes enligt förslag.
+ \end{enumerate}
\item Rapporter
\begin{enumerate}
\item Ekonomi
@@ -62,17 +64,27 @@
\item
\end{itemize}
\end{enumerate}
-\item Aktivitetsdagar, etc
+\item Aktivitetsdagar, fester, och övriga aktiviteter
\begin{enumerate}
- \item Tidigare aktiviteter
- \item Kommande aktiviteter
+ \item
+ \item
\end{enumerate}
+\item Styrelsens arbetsträffar
+ \begin{itemize}
+ \item
+ \item
+ \end{itemize}
\item Informationsspridning
\begin{enumerate}
\item Uppföljning
\item Åtgärder
\end{enumerate}
-\item Att-göralistan
+\item Mötesprotokollet från \lastmeetingdate\ gicks igenom:
+ \begin{itemize}
+ \item
+ \item
+ \end{itemize}
+\item Genomgång av systemens att-göralistor
\begin{itemize}
\item
\item