Skip to content

Commit

Permalink
Merge branch 'logo_cc_by' into 'develop'
Browse files Browse the repository at this point in the history
explicitly state logo license as cc-by

See merge request mhm/mhm!171
  • Loading branch information
MuellerSeb committed Apr 8, 2024
2 parents f1c183c + 48f63ea commit 32d3a36
Show file tree
Hide file tree
Showing 15 changed files with 4,897 additions and 4,197 deletions.
12 changes: 12 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,18 @@ have been taken:
> the original code of mHM.

## Logo License

Notwithstanding the licensing terms applied to the software and its documentation as detailed above, the logo of mHM (doc/figures/logo) is made available under the Creative Commons Attribution 4.0 International License (CC BY 4.0). This grants permission to use, share, and adapt the logo, provided appropriate credit is given, and any changes are indicated. For more information on this license, visit https://creativecommons.org/licenses/by/4.0/.

To attribute correctly, please include the following:

- Credit to mHM and, if possible, a link back to our website or the relevant repository.
- Indication if changes were made to the logo.

This licensing applies solely to the logo and is independent of the software's licensing terms, including any of its other graphical assets or documentation, which may be subject to different licensing terms as specified in other sections of this document.


## Breach of the Copyright

The following are the potential causes for the Breach of mHM Copyright.
Expand Down
5 changes: 3 additions & 2 deletions doc/doxygen.config
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ PROJECT_BRIEF = "The mesoscale Hydrological Model"
# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
# the logo to the output directory.

PROJECT_LOGO = doc/figures/mhm-logo_minimal.png
PROJECT_LOGO = doc/figures/logo/mhm-logo_minimal.png

# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
# into which the generated documentation will be written. If a relative path is
Expand Down Expand Up @@ -1088,7 +1088,8 @@ EXAMPLE_RECURSIVE = NO
# \image command).

IMAGE_PATH = doc/figures \
doc/figures/getting_started
doc/figures/getting_started \
doc/figures/logo

# The INPUT_FILTER tag can be used to specify a program that doxygen should
# invoke to filter for each input file. Doxygen will invoke the filter program
Expand Down
Binary file removed doc/figures/by_large.png
Binary file not shown.
Binary file removed doc/figures/cc_large.png
Binary file not shown.
File renamed without changes.
File renamed without changes
File renamed without changes
4,880 changes: 4,880 additions & 0 deletions doc/figures/logo/mhm5-logo.eps

Large diffs are not rendered by default.

Binary file added doc/figures/logo/mhm5-logo.pdf
Binary file not shown.
Binary file added doc/figures/logo/mhm5-logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4,189 changes: 0 additions & 4,189 deletions doc/figures/mhm5-logo.eps

This file was deleted.

Binary file removed doc/figures/mhm5-logo.pdf
Binary file not shown.
Binary file removed doc/figures/mhm5-logo.png
Binary file not shown.
Binary file removed doc/figures/sa_large.png
Binary file not shown.
8 changes: 2 additions & 6 deletions doc/header_doxygen.tex
Original file line number Diff line number Diff line change
Expand Up @@ -128,10 +128,10 @@
\begin{titlepage}
\vspace*{5cm}
\begin{center}%
\includegraphics[width=6.0cm]{../doc/figures/mHM_textlogo.pdf}\\
\includegraphics[width=6.0cm]{../doc/figures/logo/mHM_textlogo.pdf}\\

\vspace*{1cm}
\includegraphics[width=6.0cm]{../doc/figures/mhm5-logo.pdf}\\
\includegraphics[width=6.0cm]{../doc/figures/logo/mhm5-logo.pdf}\\
\vspace*{1.5cm}
{\Large Documentation for version \input{../version.txt}}\\
\vspace*{5cm}
Expand All @@ -158,10 +158,6 @@
{\large \copyright 2005 - \the\year{}}\\
{\large Helmholtz Centre for Environmental Research - UFZ}\\
\vspace*{0.2cm}
\includegraphics[totalheight=5.mm]{../doc/figures/cc_large.png}\,%
\includegraphics[totalheight=5.mm]{../doc/figures/by_large.png}\,%
\includegraphics[totalheight=5.mm]{../doc/figures/sa_large.png}%
\vspace*{0.25cm}

\end{center}

Expand Down

0 comments on commit 32d3a36

Please sign in to comment.