added overview page, impressum and header has been adjusted

IWUGERMANY · Apr 22, 2024 · 7e0807c · 7e0807c
1 parent d8d59d3
commit 7e0807c
Show file tree

Hide file tree

Showing 7 changed files with 77 additions and 29 deletions.
diff --git a/_includes/header.html b/_includes/header.html
@@ -9,21 +9,18 @@
 <body>
     <nav>
         <div class="logo">
-                <a href="."><img src="assets/images/iwulogo.svg" alt=""></a>
+                <a href="."><span id="dibs_span">DIBS</span></a>
         </div>
         <div class="navlinks">
             <ul id="my_elements">
                 <li><a class="a_tag" href="overview">Overwiew</a></li>
-                <li><a class="a_tag" href="wikii">Wiki</a></li>
-                <li><a class="a_tag" href="validation">Validation</a></li>
-                <li><a class="a_tag" href="contri">Contributors</a></li>
-                <li><a class="a_tag" href="versions">Versions</a></li>
-                <li><a class="a_tag" href="pypi">Pypi</a></li>
+                <li><a class="a_tag" href="contri">How to cite</a></li>
                 <li><a class="a_tag" href="faq">FAQ</a></li>
+                <li><a class="a_tag" href="impressum">Impressum</a></li>
             </ul>
         </div>
         <div class="github">
-            <a href="https://github.com/IWUGERMANY/DibsComputingCore" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#fff; color:#3998B6; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
+            <a href="https://github.com/IWUGERMANY/DibsCLI" class="github-corner" aria-label="View source on GitHub"><svg width="80" height="80" viewBox="0 0 250 250" style="fill:#fff; color:#333F50; position: absolute; top: 0; border: 0; right: 0;" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
         </div>
 
     </nav>

diff --git a/assets/css/footer.css b/assets/css/footer.css
@@ -14,9 +14,9 @@ footer{
 
 
 footer span{
-    font-size: 16px;
+    font-size: 15px;
     font-weight: 500;
     padding: 10px 20px;
     border-radius: 10px;
-    color: #3998B6;
+    color: white;
 }
diff --git a/assets/css/header.css b/assets/css/header.css
@@ -16,6 +16,7 @@ nav{
     top: 0;
     z-index: 3;
     box-shadow: rgba(227, 227, 230, 0.25) 0px 50px 100px -20px, rgba(0, 0, 0, 0.3) 0px 30px 60px -30px;
+    text-transform: capitalize;
   }
 
   ul {
@@ -31,22 +32,27 @@ nav{
   .a_tag{
     display: block;
     text-decoration: none !important;
-    color: #3998B6 !important;
+    color: white !important;
     padding: 10px 15px;
     border-radius: 7px;
     background-color: transparent;
     font-size: 16px;
     font-weight: 600;
     transition-delay: 100ms;
     margin: 0 10px;
+    transition: .4s;
   }
 
   .a_tag:hover{
-    color:white !important;
+    color:#3998B6 !important;
+  }
+
+  a{
+    text-decoration: none !important;
   }
 
 
-  .logo{
+  #dibs_span{
     display: flex;
     align-items: center;
     justify-content: center;
@@ -55,16 +61,19 @@ nav{
     width: 80px;
     height: 50px;
     background-color: white;
+    font-weight: bold;
+    font-size: 30px;
+    color: #333F50;
+    transition: .4s;
   }
 
-  .logo img {
-    width: 80px;
-    height: 50px;
-    object-fit: contain;
+  #dibs_span:hover{
+    background-color: #333F50;
+    color: white;
   }
 
   .active {
-    color: white !important;
+    color: #3998B6 !important;
     text-decoration: none;
     display: block;
     text-decoration: none;
@@ -75,4 +84,4 @@ nav{
     font-weight: 600;
     transition-delay: 100ms;
     margin: 0 10px;
-  }
+  }
diff --git a/impressum.md b/impressum.md
@@ -0,0 +1,29 @@
+---
+layout: page
+title: Impressum
+permalink: /impressum
+---
+
+Institut Wohnen und Umwelt GmbH\
+Rheinstraße 65\
+64295 Darmstadt
+
+Telefon: 06151 2904-0\
+Fax: 06151 2904-97\
+E-Mail: [email protected]\
+Internet: [www.iwu.de](https://www.iwu.de/aktuell/)
+
+Vertretungsberechtigte Geschäftsführerin ist Dr. Monika Meyer.\
+Prokuristen sind Ingo Fuß und Dr. Holger Cischinsky.
+
+**Registergericht**: Amtsgericht Darmstadt\
+**Registernummer**: HRB 1649    
+
+**Umsatzsteuer-Identifikationsnummer gemäß § 27 a Umsatzsteuergesetz**: DE 168170950
+
+**Inhaltlich verantwortlich**: Dr. Monika Meyer
+
+**Haftungshinweis**\
+Trotz sorgfältiger inhaltlicher Kontrolle übernehmen wir keine Haftung für die Inhalte externer Links. Für den Inhalt der verlinkten Seiten sind ausschließlich deren Betreiber verantwortlich.
+
+Hinsichtlich der bereitgestellten Informationen wird keine Gewähr für Aktualität, Korrektheit, Vollständigkeit oder Qualität übernommen. Die Benutzung dieses Services erfolgt auf eigene Gefahr und eigenes Risiko! Wir schließen ausdrücklich jede Haftung für Schäden aus, die auf die Verwendung unseres Systems zurückzuführen sind. Wir übernehmen keine Garantie für die Erreichbarkeit und die Aktualität der von uns erstellten Seiten und Internet-Links.
diff --git a/index.md b/index.md
@@ -5,8 +5,6 @@
 layout: home
 ---
 
-# DIBS
-
 ![DIBS_Logo](./assets/images/DIBS_Logo.png)
 Dynamic ISO Building Simulator (DIBS) is a simulation program for calculating the space heating, occupancy hot water, cooling and electricity demand of German non-residential buildings. Further the DIBS calculates the heating value based energy uses, the primary energy and the greenhouse gas emission based on the defined factors of the German building energy ordinance (Gebäudeenergiegesetz). The adapted hourly dynamic building energy simulator for single buildings and building stocks is ready to use with [ENOB:dataNWG interview](https://www.datanwg.de/stichprobenerhebung/breitenerhebung) and [on-site inspection](https://www.datanwg.de/stichprobenerhebung/tiefenerhebung) data. The underlying resistance-capacity-model is based on the simplified hourly method of ISO 13790:2008. DIBS is based on the [RC_BuildingSimulator](https://github.com/architecture-building-systems/RC_BuildingSimulator) and represents an extension of capabilities and adaptation to the requirements of the ENOB:dataNWG project.
 

diff --git a/overview.md b/overview.md
@@ -2,4 +2,21 @@
 layout: page
 title: Overview
 permalink: /overview
----
+---
+
+Welcome to the Project Overview!
+
+This project consists of four packages designed to facilitate building simulation tasks:
+
+1. **dibs_computing_core**: This package contains the core calculation functionality for building simulations.
+2. **dibs_datasource_csv**: It provides utilities to handle CSV files, which are commonly used as data sources in building simulations.
+3. **dibs_data**: This package contains data that aids in building simulation tasks.
+4. **dibs_cli**: A command-line interface (CLI) tool that allows users to simulate buildings using the functionality provided by dibs_computing_core.
+
+For more detailed information on each package and its functionalities, please refer to the README.md of each package:
+
+1. [dibs_computing_core README.md](https://github.com/IWUGERMANY/DibsComputingCore/blob/main/README.md)
+2. [dibs_datasource_csv README.md](https://github.com/IWUGERMANY/DibsDataSourceCSV/blob/main/README.md)
+3. [dibs_data README.md](https://github.com/IWUGERMANY/DibsData/blob/main/README.md)
+4. [dibs_cli README.md](https://github.com/IWUGERMANY/DibsCLI/blob/main/README.md)
+
diff --git a/wikii.md b/wikii.md
@@ -4,35 +4,33 @@ title: Wiki
 permalink: /wikii
 ---
 
-Welcome to the `dibs_computing_core` wiki!
+Welcome to the `dibs_cli` wiki!
 
 ## Prerequisites
-
 Before running this program, ensure you have Python 3.10 or higher installed on your system. If Python is not already
 installed, you can download and install it from the official website: [Python.org](https://www.python.org/downloads/)
 
 ### Installing Python
-
 1. Visit the [Python Downloads](https://www.python.org/downloads/) page.
 2. Choose the version appropriate for your operating system (Windows, macOS, or Linux) and click on the download link.
 3. Run the installer and follow the installation instructions.
-4. During the installation process, make sure to check the box that says "Add Python to **PATH**" or "Add Python to
-   environment variables" to ensure Python is added to your system **PATH**.
+4. During the installation process, make sure to check the box that says "Add Python to **PATH**" or "Add Python to environment variables" to ensure Python is added to your system **PATH**.
 5. Once the installation is complete, open a command prompt or terminal and type  
 `python --version` to verify that Python is installed correctly.
 
 ## Installation Guide
-To install the module `dibs_computing_core` use the command `pip` like this: 
+You can install `dibs_cli` using `pip`. First, make sure you have Python and pip ([How to install pip](https://pip.pypa.io/en/stable/installation/)) installed on your system. Then, open a terminal or command prompt and run the following command:
 
 ```bash
-pip install dibs_computing_core == 1.0.0
+pip install dibs_cli
 ```
+This will download and install the package `dibs_cli` and all its dependencies from the Python Package Index (PyPI). While the installation, The Package `dibs_cli` will automatically install packages [dibs_computing_core](https://github.com/IWUGERMANY/DibsComputingCore), [dibs_datasource_csv](https://github.com/IWUGERMANY/DibsDataSourceCSV) and [dibs_data](https://github.com/IWUGERMANY/DibsData), which are necessary for buildings simulation.
 
 ## Documentation 
 Full documentation of the structure of `dibs_computing_core` (classes, interfaces and methodes) has been bundled in a PDF document which can be found in this repository. [Open PDF document](https://github.com/IWUGERMANY/DibsComputingCore/blob/main/src/DibsDocumentation.pdf).
 
 #### Usage
-There are two ways 
+To use this package `dibs_cli` read the Repository [**README.md**](https://github.com/IWUGERMANY/DibsCLI)
 
 ## Description of input parameters
 The following input parameters are used in the building simulation:
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,8 +5,6 @@ @@
     layout: home
     ---
-    # DIBS
     ![DIBS_Logo](./assets/images/DIBS_Logo.png)
     Dynamic ISO Building Simulator (DIBS) is a simulation program for calculating the space heating, occupancy hot water, cooling and electricity demand of German non-residential buildings. Further the DIBS calculates the heating value based energy uses, the primary energy and the greenhouse gas emission based on the defined factors of the German building energy ordinance (Gebäudeenergiegesetz). The adapted hourly dynamic building energy simulator for single buildings and building stocks is ready to use with [ENOB:dataNWG interview](https://www.datanwg.de/stichprobenerhebung/breitenerhebung) and [on-site inspection](https://www.datanwg.de/stichprobenerhebung/tiefenerhebung) data. The underlying resistance-capacity-model is based on the simplified hourly method of ISO 13790:2008. DIBS is based on the [RC_BuildingSimulator](https://github.com/architecture-building-systems/RC_BuildingSimulator) and represents an extension of capabilities and adaptation to the requirements of the ENOB:dataNWG project.
@@ Expand Down @@