From f1664e00999fad8addba58e35351b1b404baa492 Mon Sep 17 00:00:00 2001 From: Julia Gschwend Date: Tue, 30 Jul 2024 12:18:42 -0300 Subject: [PATCH 1/6] Add several short texts to the home page. --- daiquiri/templates/core/banner.html | 9 +++---- daiquiri/templates/core/home.html | 37 +++++++---------------------- 2 files changed, 12 insertions(+), 34 deletions(-) diff --git a/daiquiri/templates/core/banner.html b/daiquiri/templates/core/banner.html index 2791cdf..6befb9e 100644 --- a/daiquiri/templates/core/banner.html +++ b/daiquiri/templates/core/banner.html @@ -13,11 +13,8 @@ src="{% static 'daiquiri/imgs/userquery_banner.jpg' %}" alt="First slide">
-

Linea Userquery

-

Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt - ut - labore et dolore magna aliqua. Ut quis nostrud exercitation ullamco - laboris nisi ut aliquip ex ea commodo consequat.

+

LIneA User query

+

An interface to query LIneA's database and create user-generated tables.

Sign up today

@@ -25,4 +22,4 @@

Linea Userquery

- + diff --git a/daiquiri/templates/core/home.html b/daiquiri/templates/core/home.html index a6cca42..8ad47dc 100644 --- a/daiquiri/templates/core/home.html +++ b/daiquiri/templates/core/home.html @@ -12,33 +12,17 @@
-

Welcome to LIneA services

+

Overview

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nullam a dui vitae enim vestibulum gravida non - congue risus. - Pellentesque id tortor sit amet elit aliquam iaculis. Donec molestie consectetur tristique. - Quisque tincidunt luctus gravida. Nullam vehicula erat nibh, nec tempor odio sodales quis. + The User query service based on daiquiri allows one to query the database to create temporary tables, + listing the results which can be immediately viewed using the Target Viewer.

- Nulla vehicula at felis vel faucibus. Vivamus lobortis nisi ante, eu pulvinar nunc eleifend id. - Sed dui erat, fringilla non nisi vel, hendrerit pretium turpis. - Nulla laoreet turpis dolor, nec posuere dolor bibendum in. - Donec non ligula neque. Quisque aliquam dolor nisi, in ultrices purus lobortis in. - Etiam quis nisl eu nunc facilisis tempor quis eget enim. Nam in dictum dolor. - Praesent dapibus mi eget interdum laoreet. Nam mollis dapibus lacus aliquam porttitor. - Nunc vehicula lorem lacus. Pellentesque rutrum interdum velit eu interdum. Ut rutrum porta condimentum. - Donec sagittis nunc nec dolor rhoncus aliquam et a dui. Sed non neque urna. -

-

- Vestibulum pellentesque eu diam suscipit tempus. Vivamus mi dui, fringilla luctus ante id, hendrerit - dictum nisl. - Duis rutrum ornare magna non mollis. Morbi vestibulum augue enim, sit amet vehicula nulla bibendum at. - Integer posuere volutpat lorem, ut sollicitudin lacus mollis eu. Phasellus consequat nibh ut efficitur - aliquam.. + User-generated data is managed by MyDB and can be accessed on LIneA JupyterHub using dblinea.

@@ -57,8 +41,7 @@

Welcome to LIneA services

d="M448 80v48c0 44.2-100.3 80-224 80S0 172.2 0 128V80C0 35.8 100.3 0 224 0S448 35.8 448 80zM393.2 214.7c20.8-7.4 39.9-16.9 54.8-28.6V288c0 44.2-100.3 80-224 80S0 332.2 0 288V186.1c14.9 11.8 34 21.2 54.8 28.6C99.7 230.7 159.5 240 224 240s124.3-9.3 169.2-25.3zM0 346.1c14.9 11.8 34 21.2 54.8 28.6C99.7 390.7 159.5 400 224 400s124.3-9.3 169.2-25.3c20.8-7.4 39.9-16.9 54.8-28.6V432c0 44.2-100.3 80-224 80S0 476.2 0 432V346.1z" />

Data Access

-

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula - porta felis euismod semper.

+

Interface to perform queries on the database.

View details »

@@ -68,8 +51,7 @@

Data Access

d="M256 512A256 256 0 1 0 256 0a256 256 0 1 0 0 512zM216 336h24V272H216c-13.3 0-24-10.7-24-24s10.7-24 24-24h48c13.3 0 24 10.7 24 24v88h8c13.3 0 24 10.7 24 24s-10.7 24-24 24H216c-13.3 0-24-10.7-24-24s10.7-24 24-24zm40-208a32 32 0 1 1 0 64 32 32 0 1 1 0-64z" />

Documentation

-

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Vestibulum id ligula - porta felis euismod semper

+

Details and instructions on how to use the query interface.

View details »

@@ -79,8 +61,7 @@

Documentation

d="M264.5 5.2c14.9-6.9 32.1-6.9 47 0l218.6 101c8.5 3.9 13.9 12.4 13.9 21.8s-5.4 17.9-13.9 21.8l-218.6 101c-14.9 6.9-32.1 6.9-47 0L45.9 149.8C37.4 145.8 32 137.3 32 128s5.4-17.9 13.9-21.8L264.5 5.2zM476.9 209.6l53.2 24.6c8.5 3.9 13.9 12.4 13.9 21.8s-5.4 17.9-13.9 21.8l-218.6 101c-14.9 6.9-32.1 6.9-47 0L45.9 277.8C37.4 273.8 32 265.3 32 256s5.4-17.9 13.9-21.8l53.2-24.6 152 70.2c23.4 10.8 50.4 10.8 73.8 0l152-70.2zm-152 198.2l152-70.2 53.2 24.6c8.5 3.9 13.9 12.4 13.9 21.8s-5.4 17.9-13.9 21.8l-218.6 101c-14.9 6.9-32.1 6.9-47 0L45.9 405.8C37.4 401.8 32 393.3 32 384s5.4-17.9 13.9-21.8l53.2-24.6 152 70.2c23.4 10.8 50.4 10.8 73.8 0z" />

Science Server

-

Deve ser um link para página com a lista de serviços do LIneA, Science Server, Jupiter Notebook e - documentações.

+

Visualization tools to explore astronomical images and catalogs.

View details »

@@ -92,7 +73,7 @@

Science Server

d="M217.9 105.9L340.7 228.7c7.2 7.2 11.3 17.1 11.3 27.3s-4.1 20.1-11.3 27.3L217.9 406.1c-6.4 6.4-15 9.9-24 9.9c-18.7 0-33.9-15.2-33.9-33.9l0-62.1L32 320c-17.7 0-32-14.3-32-32l0-64c0-17.7 14.3-32 32-32l128 0 0-62.1c0-18.7 15.2-33.9 33.9-33.9c9 0 17.6 3.6 24 9.9zM352 416l64 0c17.7 0 32-14.3 32-32l0-256c0-17.7-14.3-32-32-32l-64 0c-17.7 0-32-14.3-32-32s14.3-32 32-32l64 0c53 0 96 43 96 96l0 256c0 53-43 96-96 96l-64 0c-17.7 0-32-14.3-32-32s14.3-32 32-32z" />

Login

-

Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.

+

Login to access the data and tools.

View details »

@@ -136,4 +117,4 @@

Login

-{% endblock %} +{% endblock %} From 1ed1d1d5368fbf7bc461c4f4bb1b5b0fcf1fdfc3 Mon Sep 17 00:00:00 2001 From: Julia Gschwend Date: Tue, 30 Jul 2024 12:29:01 -0300 Subject: [PATCH 2/6] update text --- daiquiri/templates/core/home.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/daiquiri/templates/core/home.html b/daiquiri/templates/core/home.html index 8ad47dc..1d1c07c 100644 --- a/daiquiri/templates/core/home.html +++ b/daiquiri/templates/core/home.html @@ -18,11 +18,14 @@

Overview

- The User query service based on daiquiri allows one to query the database to create temporary tables, - listing the results which can be immediately viewed using the Target Viewer. + The User query service based on daiquiri is a user-friendly interface + that allows one to query the database to create temporary tables.

- User-generated data is managed by MyDB and can be accessed on LIneA JupyterHub using dblinea. + User-generated tables are managed by MyDB and can be immediately accessed on + LIneA JupyterHub using dblinea. Also, if a table contains equatorial + coordinates, it automatically becomes a list of targets, so the respective + images from DES DR2 can be visualized using the Target Viewer service.

From 08730e5e07962540ceddb9471201facda71075ae Mon Sep 17 00:00:00 2001 From: jandsonrj Date: Wed, 31 Jul 2024 16:09:32 -0300 Subject: [PATCH 3/6] call to action added --- daiquiri/templates/core/banner.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/daiquiri/templates/core/banner.html b/daiquiri/templates/core/banner.html index 6befb9e..b7fd0fd 100644 --- a/daiquiri/templates/core/banner.html +++ b/daiquiri/templates/core/banner.html @@ -15,7 +15,7 @@

LIneA User query

An interface to query LIneA's database and create user-generated tables.

-

Sign up today

+

Sign up today

From 36fe08b50d6dab4837b2b8028e04235223eaa4a4 Mon Sep 17 00:00:00 2001 From: jandsonrj Date: Wed, 31 Jul 2024 20:18:23 +0000 Subject: [PATCH 4/6] call to action has been removed --- daiquiri/templates/core/banner.html | 1 - 1 file changed, 1 deletion(-) diff --git a/daiquiri/templates/core/banner.html b/daiquiri/templates/core/banner.html index b7fd0fd..bf70820 100644 --- a/daiquiri/templates/core/banner.html +++ b/daiquiri/templates/core/banner.html @@ -15,7 +15,6 @@

LIneA User query

An interface to query LIneA's database and create user-generated tables.

-

Sign up today

From 089c016a3b7268e1d7dbc99ef44975143d5cc13c Mon Sep 17 00:00:00 2001 From: jandsonrj Date: Thu, 1 Aug 2024 14:39:12 -0300 Subject: [PATCH 5/6] social media added to the banner --- daiquiri/templates/core/banner.html | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/daiquiri/templates/core/banner.html b/daiquiri/templates/core/banner.html index bf70820..1344154 100644 --- a/daiquiri/templates/core/banner.html +++ b/daiquiri/templates/core/banner.html @@ -12,11 +12,36 @@ First slide
-
+

LIneA User query

An interface to query LIneA's database and create user-generated tables.

+
+ + + + + + + + + + + + + + + + + + + + + + + +
From 763c43dfdc8a460ddfc14af0738d94987099c510 Mon Sep 17 00:00:00 2001 From: jandsonrj Date: Thu, 1 Aug 2024 21:12:48 +0000 Subject: [PATCH 6/6] fix pre-commit --- daiquiri/templates/core/home.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/daiquiri/templates/core/home.html b/daiquiri/templates/core/home.html index 1d1c07c..99c3949 100644 --- a/daiquiri/templates/core/home.html +++ b/daiquiri/templates/core/home.html @@ -18,14 +18,14 @@

Overview

- The User query service based on daiquiri is a user-friendly interface - that allows one to query the database to create temporary tables. + The User query service based on daiquiri is a user-friendly interface + that allows one to query the database to create temporary tables.

- User-generated tables are managed by MyDB and can be immediately accessed on - LIneA JupyterHub using dblinea. Also, if a table contains equatorial - coordinates, it automatically becomes a list of targets, so the respective - images from DES DR2 can be visualized using the Target Viewer service. + User-generated tables are managed by MyDB and can be immediately accessed on + LIneA JupyterHub using dblinea. Also, if a table contains equatorial + coordinates, it automatically becomes a list of targets, so the respective + images from DES DR2 can be visualized using the Target Viewer service.