Skip to content

Commit

Permalink
Improve docs. See: #38
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcelloPerathoner committed Jan 12, 2020
1 parent 10f4d64 commit 9fd26cb
Show file tree
Hide file tree
Showing 97 changed files with 733 additions and 483 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ Documents
htdocs
node_modules
tools/reports
tools/phpcs/OldSniffs
vendor
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ docs: doc_src/phpdoc/structure.xml doc_src/jsdoc/structure.json
cd doc_src && $(MAKE) -e html

doccs: doc_src/phpdoc/structure.xml doc_src/jsdoc/structure.json
export SPHINXOPTS=-aE; cd doc_src && $(MAKE) -e html
$(RM) -r docs/*
cd doc_src && $(MAKE) -e html

jsdoc: doc_src/jsdoc/structure.json

Expand Down
2 changes: 1 addition & 1 deletion doc_src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ clean:

.PHONY: html
html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR) # -a -E
$(SPHINXBUILD) -T -b html $(ALLSPHINXOPTS) $(BUILDDIR) # -a -E
cp _config.yml $(BUILDDIR)/
@echo
@echo "Build finished. The HTML pages are in $(BUILDDIR)."
Expand Down
1 change: 1 addition & 0 deletions doc_src/autojsdoc
1 change: 1 addition & 0 deletions doc_src/autophpdoc
13 changes: 6 additions & 7 deletions doc_src/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,21 @@
'sphinxcontrib.phpdomain',
'autophpdoc.autophpdoc',

'sphinx_js',
'autojsdoc.autojsdoc',

# 'xpath.xpath',
'sauml.sauml',
'sqlalchemy-uml.sqlalchemy-uml',
]

#js_source_path = '../server/es6'
#jsdoc_config_path = '../jsdoc.json'

sauml_arguments = ['postgresql+psycopg2://capitularia@localhost:5432/capitularia']
sauml_dot_table = 'bgcolor=#e7f2fa&color=#2980B9'

# xpath_file = 'phpdoc/structure.xml'
autophpdoc_structure_xml = 'phpdoc/structure.xml'
autophpdoc_members = True
autophpdoc_title = True

autojsdoc_structure_json = 'jsdoc/structure.json'
autojsdoc_members = True
autojsdoc_title = True

# Add any paths that contain templates here, relative to this directory.
templates_path = ['_templates']
Expand Down
12 changes: 5 additions & 7 deletions doc_src/index.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

.. _contents:

===========================
Expand Down Expand Up @@ -26,10 +25,9 @@ Developer Manual



..
Indices and tables
==================
Indices and tables
==================

* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`
* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`
1 change: 0 additions & 1 deletion doc_src/sauml

This file was deleted.

1 change: 1 addition & 0 deletions doc_src/sqlalchemy-uml
1 change: 1 addition & 0 deletions doc_src/webprojekt.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ RRZK Web Projekt Capitularia

webprojekt/wordpress
webprojekt/database
webprojekt/wordpress-custom
4 changes: 2 additions & 2 deletions doc_src/webprojekt/database.rst
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.. _mysql:
.. _wp-db:

Database Structure (Wordpress)
==============================
Wordpress Database Structure
============================

The Wordpress Database for Capitularia. This is a mysql database that is a part
of the "RRZK Webprojekt" package.
Expand Down
13 changes: 13 additions & 0 deletions doc_src/webprojekt/wordpress-custom.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.. _wordpress:
.. _wp:

Wordpress Customizations
========================

The Wordpress customizations we did for Capitularia.

.. toctree::
:maxdepth: 2

wordpress/theme
wordpress/plugins
21 changes: 12 additions & 9 deletions doc_src/webprojekt/wordpress.rst
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
.. _wordpress:
.. _wp:
Wordpress Installation
======================

Wordpress
=========
The Wordpress installation in the RRZK Webprojekt.

The Wordpress installation for Capitularia.
The installation resides in the directory:
:file:`/afs/rrz.uni-koeln.de/vol/www/projekt/capitularia/http/docs/`.

.. toctree::
:maxdepth: 2
The web server has no write permission to the file system, so you cannot update
Wordpress from the dashboard. To update Wordpress, change into the installation
directory and use the command :program:`wp` like this:

wordpress/theme
wordpress/plugins
.. code:: shell
cd /afs/rrz.uni-koeln.de/vol/www/projekt/capitularia/http/docs/
./wp core update
4 changes: 0 additions & 4 deletions doc_src/webprojekt/wordpress/plugins/collation-tool.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ Collation Tool
:local:

.. php:automodule:: cap-collation-user/cap-collation-user.php cap-collation-user/
:members:
:title:
.. js:automodule:: module:plugins/collation
:members:
:title:
4 changes: 0 additions & 4 deletions doc_src/webprojekt/wordpress/plugins/dynamic-menu.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ Dynamic Menu
:local:

.. php:automodule:: cap-dynamic-menu/cap-dynamic-menu.php cap-dynamic-menu/
:members:
:title:
.. js:automodule:: module:plugins/dynamic-menu
:members:
:title:
4 changes: 0 additions & 4 deletions doc_src/webprojekt/wordpress/plugins/file-includer.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ File Includer
:local:

.. php:automodule:: cap-file-includer/cap-file-includer.php cap-file-includer/
:members:
:title:
.. js:automodule:: module:plugins/file-includer
:members:
:title:
4 changes: 0 additions & 4 deletions doc_src/webprojekt/wordpress/plugins/lib.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ Library
:local:

.. php:automodule:: cap-lib/cap-lib.php cap-lib/
:members:
:title:
.. js:automodule:: module:plugins/lib
:members:
:title:
4 changes: 0 additions & 4 deletions doc_src/webprojekt/wordpress/plugins/meta-search.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ Meta Search
:local:

.. php:automodule:: cap-meta-search/cap-meta-search.php cap-meta-search/
:members:
:title:
.. js:automodule:: module:plugins/meta-search
:members:
:title:
4 changes: 0 additions & 4 deletions doc_src/webprojekt/wordpress/plugins/page-generator.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ Page Generator
:local:

.. php:automodule:: cap-page-generator/cap-page-generator.php cap-page-generator/
:members:
:title:
.. js:automodule:: module:plugins/page-generator
:members:
:title:
4 changes: 0 additions & 4 deletions doc_src/webprojekt/wordpress/theme/main.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,5 @@ The Wordpress theme for Capitularia.
:local:

.. php:automodule:: ^themes/Capitularia/[^/]+$
:members:
:title:
.. js:automodule:: themes/capitularia
:members:
:title:
4 changes: 0 additions & 4 deletions doc_src/webprojekt/wordpress/theme/widgets.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,5 @@ The Widgets in the Wordpress theme for Capitularia.
:local:

.. php:automodule:: ^themes/Capitularia/widgets/
:members:
:title:
.. js:automodule:: themes/capitularia/widgets
:members:
:title:
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Binary file modified docs/_images/plantuml-4221c49e6f6f7f65c561e601c577315739d657d5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/plantuml-7328b0c7251de941a73aa19787156cc0fd222245.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/plantuml-99101418f7eeb7b5f4babfbad100ec775aa7d1aa.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/plantuml-b8ba3c086c512ecc8134163470ca17192c0643f2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/plantuml-ea37bbc49aa3a4a6939cbfb700f715a317f7d973.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/_images/plantuml-fb6fe2e385f76014ced39dca6b873185a7e0e296.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 5 additions & 7 deletions docs/_sources/index.rst.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

.. _contents:

===========================
Expand Down Expand Up @@ -26,10 +25,9 @@ Developer Manual



..
Indices and tables
==================
Indices and tables
==================

* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`
* :ref:`genindex`
* :ref:`modindex`
* :ref:`search`
1 change: 1 addition & 0 deletions docs/_sources/webprojekt.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ RRZK Web Projekt Capitularia

webprojekt/wordpress
webprojekt/database
webprojekt/wordpress-custom
4 changes: 2 additions & 2 deletions docs/_sources/webprojekt/database.rst.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
.. _mysql:
.. _wp-db:

Database Structure (Wordpress)
==============================
Wordpress Database Structure
============================

The Wordpress Database for Capitularia. This is a mysql database that is a part
of the "RRZK Webprojekt" package.
Expand Down
13 changes: 13 additions & 0 deletions docs/_sources/webprojekt/wordpress-custom.rst.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.. _wordpress:
.. _wp:

Wordpress Customizations
========================

The Wordpress customizations we did for Capitularia.

.. toctree::
:maxdepth: 2

wordpress/theme
wordpress/plugins
21 changes: 12 additions & 9 deletions docs/_sources/webprojekt/wordpress.rst.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
.. _wordpress:
.. _wp:
Wordpress Installation
======================

Wordpress
=========
The Wordpress installation in the RRZK Webprojekt.

The Wordpress installation for Capitularia.
The installation resides in the directory:
:file:`/afs/rrz.uni-koeln.de/vol/www/projekt/capitularia/http/docs/`.

.. toctree::
:maxdepth: 2
The web server has no write permission to the file system, so you cannot update
Wordpress from the dashboard. To update Wordpress, change into the installation
directory and use the command :program:`wp` like this:

wordpress/theme
wordpress/plugins
.. code:: shell
cd /afs/rrz.uni-koeln.de/vol/www/projekt/capitularia/http/docs/
./wp core update
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ Collation Tool
:local:

.. php:automodule:: cap-collation-user/cap-collation-user.php cap-collation-user/
:members:
:title:
.. js:automodule:: module:plugins/collation
:members:
:title:
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ Dynamic Menu
:local:

.. php:automodule:: cap-dynamic-menu/cap-dynamic-menu.php cap-dynamic-menu/
:members:
:title:
.. js:automodule:: module:plugins/dynamic-menu
:members:
:title:
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ File Includer
:local:

.. php:automodule:: cap-file-includer/cap-file-includer.php cap-file-includer/
:members:
:title:
.. js:automodule:: module:plugins/file-includer
:members:
:title:
4 changes: 0 additions & 4 deletions docs/_sources/webprojekt/wordpress/plugins/lib.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ Library
:local:

.. php:automodule:: cap-lib/cap-lib.php cap-lib/
:members:
:title:
.. js:automodule:: module:plugins/lib
:members:
:title:
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ Meta Search
:local:

.. php:automodule:: cap-meta-search/cap-meta-search.php cap-meta-search/
:members:
:title:
.. js:automodule:: module:plugins/meta-search
:members:
:title:
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,5 @@ Page Generator
:local:

.. php:automodule:: cap-page-generator/cap-page-generator.php cap-page-generator/
:members:
:title:
.. js:automodule:: module:plugins/page-generator
:members:
:title:
4 changes: 0 additions & 4 deletions docs/_sources/webprojekt/wordpress/theme/main.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,5 @@ The Wordpress theme for Capitularia.
:local:

.. php:automodule:: ^themes/Capitularia/[^/]+$
:members:
:title:
.. js:automodule:: themes/capitularia
:members:
:title:
4 changes: 0 additions & 4 deletions docs/_sources/webprojekt/wordpress/theme/widgets.rst.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,5 @@ The Widgets in the Wordpress theme for Capitularia.
:local:

.. php:automodule:: ^themes/Capitularia/widgets/
:members:
:title:
.. js:automodule:: themes/capitularia/widgets
:members:
:title:
Binary file modified docs/doctrees/environment.pickle
Binary file not shown.
Binary file modified docs/doctrees/index.doctree
Binary file not shown.
Binary file modified docs/doctrees/vm/database.doctree
Binary file not shown.
Binary file modified docs/doctrees/webprojekt.doctree
Binary file not shown.
Binary file modified docs/doctrees/webprojekt/database.doctree
Binary file not shown.
Binary file added docs/doctrees/webprojekt/wordpress-custom.doctree
Binary file not shown.
Binary file modified docs/doctrees/webprojekt/wordpress.doctree
Binary file not shown.
Binary file not shown.
Binary file modified docs/doctrees/webprojekt/wordpress/plugins/dynamic-menu.doctree
Binary file not shown.
Binary file modified docs/doctrees/webprojekt/wordpress/plugins/file-includer.doctree
Binary file not shown.
Binary file modified docs/doctrees/webprojekt/wordpress/plugins/lib.doctree
Binary file not shown.
Binary file modified docs/doctrees/webprojekt/wordpress/plugins/meta-search.doctree
Binary file not shown.
Binary file not shown.
Binary file modified docs/doctrees/webprojekt/wordpress/theme/main.doctree
Binary file not shown.
Loading

0 comments on commit 9fd26cb

Please sign in to comment.