Skip to content

Commit 7e2c082

Browse files
bkhelifibkhelifi
authored
Merge pull request #52 from bkhelifi/refactoring
Refactoring of the html pages
2 parents ada5e45 + 1083430 commit 7e2c082

17 files changed

+1283
-1268
lines changed

‎404.html

+29-31
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- Licensed under the MIT license - see LICENSE -->
12
<!DOCTYPE html>
23
<html>
34

@@ -9,45 +10,42 @@
910
height: 125px;
1011
}
1112
</style>
13+
<head>
14+
<!-- Common scripts -->
15+
<script src="scripts/load-scripts.js"></script>
16+
<meta charset="utf-8">
17+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
18+
<title>Gammapy - Error 404</title>
19+
<!-- head placeholder -->
20+
<div id="head-placeholder"></div>
21+
</head>
1222

1323

14-
<script src="scripts/matomo.js" defer></script>
15-
<script src="scripts/myscripts.js" defer></script>
16-
<script src="scripts/includeHTML.js" defer></script>
17-
18-
<div data-include="header.html"></div>
19-
2024
<body>
25+
<!-- Navbar placeholder -->
26+
<div id="navbar-placeholder"></div>
2127

22-
<div data-include="navbar.html"></div>
28+
<main>
2329

24-
<main>
25-
26-
<div class="opener container" align="center">
27-
<p class="lead mb-4">
28-
Error 404: Page not found.
29-
</p>
30-
<div>
31-
<p class="mb-2">
32-
Looks like you followed a bad link.
33-
Here's a link to the <a href="index.html">homepage</a>.
34-
</p>
35-
<p>
36-
If there's a problem with the website, please <a href="contact.html">let us know</a>.
30+
<div class="opener container" align="center">
31+
<p class="lead mb-4">
32+
Error 404: Page not found.
3733
</p>
34+
<div>
35+
<p class="mb-2">
36+
Looks like you followed a bad link.
37+
Here's a link to the <a href="index.html">homepage</a>.
38+
</p>
39+
<p>
40+
If there's a problem with the website, please <a href="contact.html">let us know</a>.
41+
</p>
42+
</div>
3843
</div>
39-
</div>
40-
41-
</main>
42-
43-
<!-- Footer Section -->
44-
<div data-include="footer.html"></div>
45-
46-
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
47-
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
48-
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
4944

45+
</main>
5046

51-
<script src="scripts/navbarCollapse.js" defer></script>
47+
<!-- Footer Section -->
48+
<div id="footer-placeholder"></div>
49+
<script src="scripts/load-components.js"></script>
5250
</body>
5351
</html>

‎CoC.html

+16-18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- Licensed under the MIT license - see LICENSE -->
12
<!DOCTYPE html>
23
<html>
34

@@ -10,18 +11,21 @@
1011
}
1112
</style>
1213

13-
<script src="scripts/matomo.js" defer></script>
14-
<script src="scripts/myscripts.js" defer></script>
15-
<script src="scripts/includeHTML.js" defer></script>
16-
17-
<div data-include="header.html"></div>
18-
14+
<head>
15+
<!-- Common scripts -->
16+
<script src="scripts/load-scripts.js"></script>
17+
<meta charset="utf-8">
18+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
19+
<title>Gammapy - Code of Conduct</title>
20+
<!-- head placeholder -->
21+
<div id="head-placeholder"></div>
22+
</head>
1923

2024
<body>
25+
<!-- Navbar placeholder -->
26+
<div id="navbar-placeholder"></div>
2127

22-
<div data-include="navbar.html"></div>
23-
24-
<main>
28+
<main>
2529
<div class="container">
2630
<h1>Gammapy Community Code of Conduct</h1>
2731
<br><br>
@@ -75,14 +79,8 @@ <h1>Gammapy Community Code of Conduct</h1>
7579
</div>
7680
</main>
7781

78-
<!-- Footer Section -->
79-
<div data-include="footer.html"></div>
80-
81-
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
82-
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
83-
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
84-
85-
<script src="scripts/navbarCollapse.js" defer></script>
86-
82+
<!-- Footer Section -->
83+
<div id="footer-placeholder"></div>
84+
<script src="scripts/load-components.js"></script>
8785
</body>
8886
</html>

‎DataPrivacy.html

+113-114
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
<!-- Licensed under the MIT license - see LICENSE -->
12
<!DOCTYPE html>
23
<html>
34

@@ -10,122 +11,120 @@
1011
}
1112
</style>
1213

13-
<script src="scripts/matomo.js" defer></script>
14-
<script src="scripts/myscripts.js" defer></script>
15-
<script src="scripts/includeHTML.js" defer></script>
16-
17-
<div data-include="header.html"></div>
14+
<head>
15+
<!-- Common scripts -->
16+
<script src="scripts/load-scripts.js"></script>
17+
<meta charset="utf-8">
18+
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
19+
<title>Gammapy - Privacy Policy</title>
20+
<!-- head placeholder -->
21+
<div id="head-placeholder"></div>
22+
</head>
1823

1924
<body>
20-
21-
<div data-include="navbar.html"></div>
22-
23-
<main>
24-
<div class="container">
25-
<h1>Privacy Policy for Gammapy Websites</h1>
26-
<br><br>
27-
28-
<p>
29-
<b>Effective Date:</b> October 14th, 2024.
30-
</p>
31-
32-
<p>
33-
Thank you for visiting our websites, gammapy.org and docs.gammapy.org. At Gammapy, we are committed to protecting your
34-
privacy and ensuring that your personal data is handled in a safe and responsible manner. This Privacy Policy explains
35-
how we collect, use, and protect any information obtained during your visit to our websites.
36-
</p>
37-
38-
<p>
39-
We use an open-source analytics platform called Matomo to collect anonymized information about how users interact with our
40-
websites. The data we collect includes:
41-
<ul>
42-
<li>the pages you visit on our sites,</li>
43-
<li>the time spent on each page,</li>
44-
<li>your approximate location (based on anonymized IP addresses),</li>
45-
<li>the device and browser you use to access our sites.</li>
46-
</ul>
47-
</p>
48-
49-
<p><b>Important:</b> all data collected is strictly anonymized, and we do not collect any personally identifiable
50-
information (PII).</p>
51-
52-
<h1>2. How We Collect Data</h1>
53-
54-
<p>
55-
We have configured Matomo to prioritize your privacy:
56-
<ul>
57-
<li>no Cookies: We do not use tracking cookies. This means we cannot track users across different browsing sessions or
58-
websites,</li>
59-
<li>anonymized IP Addresses: We anonymize your IP address by removing the last two bytes (e.g., 192.168.x.x). This makes
60-
it impossible to identify your specific location or device,</li>
61-
<li>no User Tracking: We do not assign unique user IDs, nor do we track individuals over time.</li>
62-
</ul>
63-
64-
</p>
65-
66-
<h1>3. Why We Collect Data</h1>
67-
68-
<p>
69-
We only use the collected data for the following purposes:
70-
<ul>
71-
<li>to analyze overall website performance,</li>
72-
<li>to improve the structure, content, and functionality of our sites,</li>
73-
<li>to understand how visitors use our websites.</li>
74-
</ul>
75-
76-
We do not use this data for any commercial or marketing purposes, and we do not share the data with third parties.
77-
78-
</p>
79-
80-
<h1>4. How We Protect Your Data</h1>
81-
82-
<p>
83-
We take your privacy seriously and have taken the following steps to protect any data collected:
84-
<ul>
85-
<li>all data is stored securely on our server at the AstroParticule & Cosmologie laboratory located in Paris, France,
86-
and is not accessible to third parties,</li>
87-
<li>we anonymize all data to ensure that no personally identifiable information is ever collected or processed,</li>
88-
<li>we do not combine the data we collect with any external databases or information.</li>
89-
</ul>
90-
91-
</p>
92-
93-
<h1>5. Your Privacy Choices</h1>
94-
95-
<p>
96-
Since we do not use cookies, there is no need to accept or manage cookie consent for analytics purposes. However, if you
97-
wish to opt out of being tracked by our anonymized analytics, you can configure your browser to block all tracking or
98-
analytics requests.
99-
</p>
100-
101-
<h1>6. Third-Party Links</h1>
102-
103-
<p>
104-
Our websites may contain links to external sites, such as documentation resources or partner organizations. We are not
105-
responsible for the privacy practices or content of these third-party sites. We encourage you to review their privacy
106-
policies before sharing any personal information with them.
107-
</p>
108-
109-
<h1>7. Contact Us</h1>
110-
111-
<p>
112-
If you have any questions or concerns about our privacy practices, please feel free to contact us at:
113-
<>
114-
Email: <a href="mailto:gammapy-coordination-l@in2p3.fr">gammapy-coordination-l [at] in2p3 [dot] fr</a>
115-
</p>
116-
117-
</div>
118-
</main>
119-
120-
<!-- Footer Section -->
121-
<div data-include="footer.html"></div>
122-
123-
<script src="https://cdn.jsdelivr.net/npm/@popperjs/core@2.11.6/dist/umd/popper.min.js"></script>
124-
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js" integrity="sha384-YvpcrYf0tY3lHB60NNkmXc5s9fDVZLESaAA55NDzOxhy9GkcIdslK1eN7N6jIeHz" crossorigin="anonymous"></script>
125-
<script src="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/js/bootstrap.bundle.min.js"></script>
126-
127-
128-
<script src="scripts/navbarCollapse.js" defer></script>
25+
<!-- Navbar placeholder -->
26+
<div id="navbar-placeholder"></div>
27+
28+
<main>
29+
<div class="container">
30+
<h1>Privacy Policy for Gammapy Websites</h1>
31+
<br><br>
32+
33+
<p>
34+
<b>Effective Date:</b> October 14th, 2024.
35+
</p>
36+
37+
<p>
38+
Thank you for visiting our websites, gammapy.org and docs.gammapy.org. At Gammapy, we are committed to protecting your
39+
privacy and ensuring that your personal data is handled in a safe and responsible manner. This Privacy Policy explains
40+
how we collect, use, and protect any information obtained during your visit to our websites.
41+
</p>
42+
43+
<p>
44+
We use an open-source analytics platform called Matomo to collect anonymized information about how users interact with our
45+
websites. The data we collect includes:
46+
<ul>
47+
<li>the pages you visit on our sites,</li>
48+
<li>the time spent on each page,</li>
49+
<li>your approximate location (based on anonymized IP addresses),</li>
50+
<li>the device and browser you use to access our sites.</li>
51+
</ul>
52+
</p>
53+
54+
<p><b>Important:</b> all data collected is strictly anonymized, and we do not collect any personally identifiable
55+
information (PII).</p>
56+
57+
<h1>2. How We Collect Data</h1>
58+
59+
<p>
60+
We have configured Matomo to prioritize your privacy:
61+
<ul>
62+
<li>no Cookies: We do not use tracking cookies. This means we cannot track users across different browsing sessions or
63+
websites,</li>
64+
<li>anonymized IP Addresses: We anonymize your IP address by removing the last two bytes (e.g., 192.168.x.x). This makes
65+
it impossible to identify your specific location or device,</li>
66+
<li>no User Tracking: We do not assign unique user IDs, nor do we track individuals over time.</li>
67+
</ul>
68+
69+
</p>
70+
71+
<h1>3. Why We Collect Data</h1>
72+
73+
<p>
74+
We only use the collected data for the following purposes:
75+
<ul>
76+
<li>to analyze overall website performance,</li>
77+
<li>to improve the structure, content, and functionality of our sites,</li>
78+
<li>to understand how visitors use our websites.</li>
79+
</ul>
80+
81+
We do not use this data for any commercial or marketing purposes, and we do not share the data with third parties.
82+
83+
</p>
84+
85+
<h1>4. How We Protect Your Data</h1>
86+
87+
<p>
88+
We take your privacy seriously and have taken the following steps to protect any data collected:
89+
<ul>
90+
<li>all data is stored securely on our server at the AstroParticule & Cosmologie laboratory located in Paris, France,
91+
and is not accessible to third parties,</li>
92+
<li>we anonymize all data to ensure that no personally identifiable information is ever collected or processed,</li>
93+
<li>we do not combine the data we collect with any external databases or information.</li>
94+
</ul>
95+
96+
</p>
97+
98+
<h1>5. Your Privacy Choices</h1>
99+
100+
<p>
101+
Since we do not use cookies, there is no need to accept or manage cookie consent for analytics purposes. However, if you
102+
wish to opt out of being tracked by our anonymized analytics, you can configure your browser to block all tracking or
103+
analytics requests.
104+
</p>
105+
106+
<h1>6. Third-Party Links</h1>
107+
108+
<p>
109+
Our websites may contain links to external sites, such as documentation resources or partner organizations. We are not
110+
responsible for the privacy practices or content of these third-party sites. We encourage you to review their privacy
111+
policies before sharing any personal information with them.
112+
</p>
113+
114+
<h1>7. Contact Us</h1>
115+
116+
<p>
117+
If you have any questions or concerns about our privacy practices, please feel free to contact us at:
118+
<>
119+
Email: <a href="mailto:gammapy-coordination-l@in2p3.fr">gammapy-coordination-l [at] in2p3 [dot] fr</a>
120+
</p>
121+
122+
</div>
123+
</main>
124+
125+
<!-- Footer Section -->
126+
<div id="footer-placeholder"></div>
127+
<script src="scripts/load-components.js"></script>
129128

130129
</body>
131130
</html>

0 commit comments

Comments
 (0)