Zmiany formatowania i układu materiałów.

xinulsw · Jan 28, 2017 · 4ff7eaa · 4ff7eaa
1 parent 46f71b7
commit 4ff7eaa
Show file tree

Hide file tree

Showing 24 changed files with 191 additions and 482 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -38,6 +38,11 @@
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
+# the path to the latex executable
+pngmath_latex = "/usr/bin/latex"
+# the path to the dvipng executable
+pngmath_dvipng = "/usr/bin/dvipng"
+
 # The suffix of source filenames.
 source_suffix = '.rst'
 
@@ -49,7 +54,7 @@
 
 # General information about the project.
 project = u'Materiały eCG IT'
-copyright = u'2016, Robert Bednarz'
+copyright = u'2016, Robert Bednarz (ecg@ecg.vot.pl)'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -65,7 +70,7 @@
 #
 # This is also used if you do content translation via gettext catalogs.
 # Usually you set "language" from the command line for these cases.
-language = 'pl'
+#language = 'pl'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -198,7 +203,7 @@
 #html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = u'Materiały CG IT'
+htmlhelp_basename = u'Materiały eCG IT'
 
 # -- Options for LaTeX output ---------------------------------------------
 
@@ -220,8 +225,8 @@
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  ('index', 'MateriayeCGIT.tex', u'Materiały eCG IT Documentation',
-   u'Robert Bednarz', 'manual'),
+    ('index', 'eCG-IT.tex', u'Materiały eCG IT',
+     u'Robert Bednarz', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -250,7 +255,7 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'materialyecgit', u'Materiały eCG IT Documentation',
+    ('index', 'ecg-it', u'Materiały eCG IT',
      [u'Robert Bednarz'], 1)
 ]
 
@@ -264,9 +269,9 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'MaterialyeCGIT', u'Materiały eCG IT Documentation',
-   u'Robert Bednarz', 'MaterialyeCGIT', 'One line description of project.',
-   'Miscellaneous'),
+    ('index', 'eCG-IT', u'Materiały eCG IT',
+     u'Robert Bednarz', 'eCG-IT', 'Materiały do nauki IT.',
+     'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.
@@ -281,6 +286,8 @@
 # If true, do not generate a @detailmenu in the "Top" node's menu.
 #texinfo_no_detailmenu = False
 
+import sphinx
+
 rst_prolog = u"""
 .. raw:: html
 
@@ -294,6 +301,19 @@
 
 """
 
+rst_epilog = u"""
+.. raw:: html
+
+    <hr>
+
+.. |date| date::
+.. |time| date:: %H:%M
+.. |sphinx_version| replace:: {}
+
+:Utworzony: |date| o |time| w Sphinx |sphinx_version|
+
+""".format(sphinx.__version__)
+
 try:
     import sphinx_rtd_theme
     html_theme = "sphinx_rtd_theme"
@@ -302,6 +322,7 @@
 except:
     pass
 
+
 def setup(app):
     app.add_javascript('custom.js')
     app.add_javascript('jquery.prettyPhoto.js')
diff --git a/docs/cppqt/adresy/index.rst b/docs/cppqt/adresy/index.rst
@@ -428,22 +428,3 @@ Pojęcia
 ===============
 
 .. include:: ../glossary.rst
-
-.. raw:: html
-
-  <hr>
-
-
-:Autor: Robert Bednarz (ecg@ecg.vot.pl)
-
-:Utworzony: |date| o |time|
-
-.. |date| date::
-.. |time| date:: %H:%M
-
-.. raw:: html
-
-    <style>
-        div.code_no { text-align: right; background: #e3e3e3; padding: 6px 12px; }
-        div.highlight, div.highlight-python { margin-top: 0px; }
-    </style>
diff --git a/docs/cppqt/index.rst b/docs/cppqt/index.rst
@@ -8,22 +8,3 @@ Poniżej przedstawiamy realizację przykładowej aplikacji w Qt 5.
 
     adresy/index
     zadania/index
-
-.. raw:: html
-
-  <hr>
-
-
-:Autor: Robert Bednarz (ecg@ecg.vot.pl)
-
-:Utworzony: |date| o |time|
-
-.. |date| date::
-.. |time| date:: %H:%M
-
-.. raw:: html
-
-    <style>
-        div.code_no { text-align: right; background: #e3e3e3; padding: 6px 12px; }
-        div.highlight, div.highlight-python { margin-top: 0px; }
-    </style>
diff --git a/docs/cppqt/zadania/index.rst b/docs/cppqt/zadania/index.rst
@@ -63,22 +63,3 @@ Pojęcia
 ==============
 
 .. include:: ../glossary.rst
-
-.. raw:: html
-
-  <hr>
-
-
-:Autor: Robert Bednarz (ecg@ecg.vot.pl)
-
-:Utworzony: |date| o |time|
-
-.. |date| date::
-.. |time| date:: %H:%M
-
-.. raw:: html
-
-    <style>
-        div.code_no { text-align: right; background: #e3e3e3; padding: 6px 12px; }
-        div.highlight, div.highlight-python { margin-top: 0px; }
-    </style>
diff --git a/docs/galerie/index.rst b/docs/galerie/index.rst
@@ -28,20 +28,3 @@ Instalacja
         <li><a href="../_static/images/gsimple/getsimple14.jpg" rel="prettyPhoto[getsimple]"><img src="../_static/images/gsimple/getsimple14.jpg" width="60" height="60" alt="Domyślna demonstracyjna strona główna w GS" /></a></li>
     </ul>
 
-.. raw:: html
-
-  <hr>
-
-:Autor: Robert Bednarz (ecg@ecg.vot.pl)
-
-:Utworzony: |date| o |time|
-
-.. |date| date::
-.. |time| date:: %H:%M
-
-.. raw:: html
-
-    <style>
-        div.code_no { text-align: right; background: #e3e3e3; padding: 6px 12px; }
-        div.highlight, div.highlight-python { margin-top: 0px; }
-    </style>
diff --git a/docs/index.rst b/docs/index.rst
@@ -30,6 +30,3 @@ Indeks
 
 * :ref:`genindex`
 
-.. raw:: html
-
-  <hr>
diff --git a/docs/inne/index.rst b/docs/inne/index.rst
@@ -3,19 +3,3 @@ Inne
 
 [todo]
 
-Metryka
-**********
-
-:Autor: Robert Bednarz (ecg@ecg.vot.pl)
-
-:Utworzony: |date| o |time|
-
-.. |date| date::
-.. |time| date:: %H:%M
-
-.. raw:: html
-
-    <style>
-        div.code_no { text-align: right; background: #e3e3e3; padding: 6px 12px; }
-        div.highlight, div.highlight-python { margin-top: 0px; }
-    </style>
diff --git a/docs/inne/jvm.rst b/docs/inne/jvm.rst
@@ -30,20 +30,3 @@ Ustawienia i programy
 * **Terminale**: [JVM] Menu/Narzędzia
 * **Ustawienie daty i czasu**: [JVM] ...
 
-.. raw:: html
-
-    <hr />
-
-:Autor: Robert Bednarz (ecg@ecg.vot.pl)
-
-:Utworzony: |date| o |time|
-
-.. |date| date::
-.. |time| date:: %H:%M
-
-.. raw:: html
-
-    <style>
-        div.code_no { text-align: right; background: #e3e3e3; padding: 6px 12px; }
-        div.highlight, div.highlight-python { margin-top: 0px; }
-    </style>
diff --git a/docs/inne/konfiguracja.rst b/docs/inne/konfiguracja.rst
@@ -125,20 +125,3 @@ Czcionki
 Czcionki *ttf* wystarczy wgrać do katalogu :file:`/usr/share/fonts/default/TTF`.
 Można użyć narzędzia *Manager fontów* (Start/Desktop/Desktop).
 
-.. raw:: html
-
-    <hr />
-
-:Autor: Robert Bednarz (ecg@ecg.vot.pl)
-
-:Utworzony: |date| o |time|
-
-.. |date| date::
-.. |time| date:: %H:%M
-
-.. raw:: html
-
-    <style>
-        div.code_no { text-align: right; background: #e3e3e3; padding: 6px 12px; }
-        div.highlight, div.highlight-python { margin-top: 0px; }
-    </style>
diff --git a/docs/inne/linki.rst b/docs/inne/linki.rst
@@ -15,22 +15,3 @@ System linux
 * `Poradnik-systemd-cz.-3 <http://www.dobreprogramy.pl/mariushko/Poradnik-systemd-cz.-3,68067.html>`_
 * `LxPup : a Puppy with LXDE as its desktop environment <http://www.murga-linux.com/puppy/viewtopic.php?t=89270&start=690&sid=435b2a9732449069870a278a2601f5a1>`_
 
-.. raw:: html
-
-    <hr />
-
-:Autor: Robert Bednarz (ecg@ecg.vot.pl)
-
-:Utworzony: |date| o |time|
-
-.. |date| date::
-.. |time| date:: %H:%M
-
-.. raw:: html
-
-    <style>
-        div.code_no { text-align: right; background: #e3e3e3; padding: 6px 12px; }
-        div.highlight, div.highlight-python { margin-top: 0px; }
-    </style>
-
-
diff --git a/docs/inne/linux.rst b/docs/inne/linux.rst
@@ -315,20 +315,3 @@ Materiały dodatkowe
     xfce
     problemy_llusb
 
-.. raw:: html
-
-    <hr />
-
-:Autor: Robert Bednarz (ecg@ecg.vot.pl)
-
-:Utworzony: |date| o |time|
-
-.. |date| date::
-.. |time| date:: %H:%M
-
-.. raw:: html
-
-    <style>
-        div.code_no { text-align: right; background: #e3e3e3; padding: 6px 12px; }
-        div.highlight, div.highlight-python { margin-top: 0px; }
-    </style>
diff --git a/docs/inne/problemy_llusb.rst b/docs/inne/problemy_llusb.rst
@@ -74,20 +74,3 @@ Inne narzędzia
 .. figure:: linimg/bootice02.jpg
 .. figure:: linimg/bootice03.jpg
 
-.. raw:: html
-
-    <hr />
-
-:Autor: Robert Bednarz (ecg@ecg.vot.pl)
-
-:Utworzony: |date| o |time|
-
-.. |date| date::
-.. |time| date:: %H:%M
-
-.. raw:: html
-
-    <style>
-        div.code_no { text-align: right; background: #e3e3e3; padding: 6px 12px; }
-        div.highlight, div.highlight-python { margin-top: 0px; }
-    </style>
diff --git a/docs/inne/puppy_linux.rst b/docs/inne/puppy_linux.rst
@@ -119,20 +119,3 @@ Zawiera on wstępną konfigurację oraz następujące dostosowania:
 W systemie *TahrPup* pulpit JVM/ROX uruchomić można przy użyciu narzędzia *WM Switcher*
 – przełączanie menedżerów okien.
 
-.. raw:: html
-
-    <hr />
-
-:Autor: Robert Bednarz (ecg@ecg.vot.pl)
-
-:Utworzony: |date| o |time|
-
-.. |date| date::
-.. |time| date:: %H:%M
-
-.. raw:: html
-
-    <style>
-        div.code_no { text-align: right; background: #e3e3e3; padding: 6px 12px; }
-        div.highlight, div.highlight-python { margin-top: 0px; }
-    </style>
diff --git a/docs/inne/xfce.rst b/docs/inne/xfce.rst
@@ -49,20 +49,3 @@ Ustawienia i programy
 * **Terminale**: [XFCE] Programy/Akcesoria
 * **Ustawienie daty i czasu**: [XFCE] Programy/Ustawienia/Set date and time
 
-.. raw:: html
-
-    <hr />
-
-:Autor: Robert Bednarz (ecg@ecg.vot.pl)
-
-:Utworzony: |date| o |time|
-
-.. |date| date::
-.. |time| date:: %H:%M
-
-.. raw:: html
-
-    <style>
-        div.code_no { text-align: right; background: #e3e3e3; padding: 6px 12px; }
-        div.highlight, div.highlight-python { margin-top: 0px; }
-    </style>