diff --git a/cd-template/doku/cryptocd.css b/cd-template/doku/cryptocd.css
index f5a555b..7d883d5 100644
--- a/cd-template/doku/cryptocd.css
+++ b/cd-template/doku/cryptocd.css
@@ -145,9 +145,6 @@ hr {
float: left;
background-color: transparent;
text-align: left;
- /*position: absolute;
- top: 130px;
- right: 10px;*/
width: 180px;
margin: 0 0 0.5em 2em;
padding: 0.75em;
@@ -248,6 +245,31 @@ caption {
padding-left: 1em;
}
+#progress {
+ background-color: transparent;
+ text-align: left;
+ width: 400px;
+ margin: 0 0 0.5em 2em;
+ padding: 0.75em;
+ border:1px solid #ccc;
+ background-color: #f6f6f6;
+ line-height: normal;
+}
+
+#progresstitle{
+ color: #888;
+ font-size: 90%;
+}
+
+.done, .done a {
+ color: grey;
+ font-size: 90%;
+}
+
+.nextnext, .nextnext a {
+ color: grey;
+ font-size: 90%;
+}
/* #### Footer #### */
diff --git a/documents/common/chat/chat.lyx b/documents/common/chat/chat.lyx
index e120822..067dadb 100644
--- a/documents/common/chat/chat.lyx
+++ b/documents/common/chat/chat.lyx
@@ -203,35 +203,8 @@ t zur Verschl
\end_layout
\begin_layout Standard
-Na dann mal los:
-\end_layout
-
-\begin_layout Enumerate
-\begin_inset ERT
-status open
-
-\begin_layout Standard
-
-
-\backslash
-htmladdnormallink{Benötigte Programme}{chat_programme.html}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Enumerate
-\begin_inset ERT
-status open
-
-\begin_layout Standard
-
-
-\backslash
-htmladdnormallink{Verschlüsselt Chatten}{chat_anwendung.html}
-\end_layout
+\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/progress_chat.inc}
+preview false
\end_inset
diff --git a/documents/common/chat_programme/chat_programme.lyx b/documents/common/chat_programme/chat_programme.lyx
new file mode 100644
index 0000000..e91e714
--- /dev/null
+++ b/documents/common/chat_programme/chat_programme.lyx
@@ -0,0 +1,141 @@
+#LyX 1.4.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 245
+\begin_document
+\begin_header
+\textclass article
+\begin_preamble
+\usepackage{hyperref}
+\usepackage{html}
+\usepackage{german}
+\end_preamble
+\language ngerman
+\inputencoding auto
+\fontscheme default
+\graphics default
+\paperfontsize default
+\spacing single
+\papersize default
+\use_geometry false
+\use_amsmath 1
+\cite_engine basic
+\use_bibtopic false
+\paperorientation portrait
+\secnumdepth 3
+\tocdepth 3
+\paragraph_separation skip
+\defskip medskip
+\quotes_language english
+\papercolumns 1
+\papersides 1
+\paperpagestyle default
+\tracking_changes false
+\output_changes true
+\end_header
+
+\begin_body
+
+\begin_layout Standard
+\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/titlebar.inc}
+preview false
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/menue_chat.inc}
+preview false
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Standard
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+begin{rawhtml}
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\end_layout
+
+\begin_layout Standard
+
+\end_layout
+
+\begin_layout Standard
+
+
+\backslash
+end{rawhtml}
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Title
+Benötigte Programme
+\end_layout
+
+\begin_layout Author
+Verschlüsselt Chatten mit Gaim
+\end_layout
+
+\begin_layout Standard
+Voraussetzung für das verschlüsselte Chatten ist die korrekte Installation
+ und Einrichtung der benötigten Programme.
+ Als Chat-Programm wird dabei
+\begin_inset ERT
+status collapsed
+
+\begin_layout Standard
+
+
+\backslash
+htmladdnormallink{Gaim}{http://gaim.sf.net}
+\end_layout
+
+\end_inset
+
+ benutzt.
+ Gaim bietet den Vorteil, dass es nahezu alle verfügbaren Dienste (Jabber,
+ ICQ, MSN, Yahoo, usw.) unterstützt und einfach bedienbar ist.
+ Damit du mit Gaim verschlüsselt Chatten kannst, muss es mit der Erweiterung
+ Gaim-Encryption ausgestattet werden.
+\end_layout
+
+\begin_layout Standard
+\begin_inset Include \input{/home/phil/daten/sao/svn/cryptocd/trunk/documents/progress_chat_programme.inc}
+preview false
+
+\end_inset
+
+
+\end_layout
+
+\end_body
+\end_document
diff --git a/documents/menue.inc b/documents/menue.inc
index 95ae3ec..f0afba1 100644
--- a/documents/menue.inc
+++ b/documents/menue.inc
@@ -1,6 +1,6 @@
\begin{rawhtml}
- Einführung ins Thema
- E-Mails verschlüsseln
diff --git a/documents/menue_chat.inc b/documents/menue_chat.inc
index 09b93c3..1057bf8 100644
--- a/documents/menue_chat.inc
+++ b/documents/menue_chat.inc
@@ -1,6 +1,6 @@
\begin{rawhtml}
- Einführung ins Thema
- E-Mails verschlüsseln
diff --git a/documents/menue_email.inc b/documents/menue_email.inc
index 6c6ccd9..e58a06c 100644
--- a/documents/menue_email.inc
+++ b/documents/menue_email.inc
@@ -1,6 +1,6 @@
\begin{rawhtml}
- Einführung ins Thema
- E-Mails verschlüsseln
diff --git a/documents/mod_html_files.py b/documents/mod_html_files.py
index 1a7be9e..9ef77b3 100644
--- a/documents/mod_html_files.py
+++ b/documents/mod_html_files.py
@@ -45,7 +45,15 @@ try:
#remove empty image subtitles
content = string.replace(content,"Abbildung:","")
-
+
+ #Bereich "author_info": Entfernen der Formatierung
+ startoffset=string.find(content,'",startoffset)+len("")
+ if (startoffset >10) and (endoffset>startoffset):
+ content=string.replace(content,'
',"
")
+ content=string.replace(content,"","")
+ content=string.replace(content,"","")
+
# replace "./filename.png" references with "filename.png"
# (this avoids validation warnings)
content = string.replace(content,'HREF="./','HREF="')
diff --git a/documents/progress_chat.inc b/documents/progress_chat.inc
new file mode 100644
index 0000000..e1ad34d
--- /dev/null
+++ b/documents/progress_chat.inc
@@ -0,0 +1,11 @@
+\begin{rawhtml}
+
+\end{rawhtml}
diff --git a/documents/progress_chat_programme.inc b/documents/progress_chat_programme.inc
new file mode 100644
index 0000000..3a4d631
--- /dev/null
+++ b/documents/progress_chat_programme.inc
@@ -0,0 +1,20 @@
+\begin{rawhtml}
+
+\end{rawhtml}
diff --git a/documents/progress_einfuehrung.inc b/documents/progress_einfuehrung.inc
index 18f1186..bc5aa22 100644
--- a/documents/progress_einfuehrung.inc
+++ b/documents/progress_einfuehrung.inc
@@ -2,10 +2,10 @@