Merge branch 'fix-forms' into 'master'

Restore form into a configuration option

See merge request !50

egi-devel/deployments/hub.yaml

@@ -166,6 +166,8 @@ hub:
       # keep in sync with:
       # - cesnet/playbooks/templates/binder.yaml
       # - documentation/content/en/users/dev-env/notebooks/_index.md
+      admin_groups:
+        - urn:mace:egi.eu:group:vo.notebooks.egi.eu:role=admin#aai.egi.eu
       allowed_groups:
         # EISCAT Dirac testing
         - urn:mace:egi.eu:group:cc-eiscat3d#sso.egi.eu
@@ -195,7 +197,7 @@ hub:
         - urn:egi.eu:group:fedcloud-users
         - urn:egi.eu:group:egi-ace-all
       auto_login: true
-      claim_groups_key: "entitlements"
+      auth_state_groups_key: "oauth_user.entitlements"
     OnedataAuthenticator:
       oneprovider_host: "cesnet-oneprovider-01.datahub.egi.eu"
       authorize_url: "https://{{ secrets['checkin_host'] }}/auth/realms/egi/protocol/openid-connect/auth"
@@ -218,7 +220,7 @@ hub:
       admin_access: true
       authenticate_prometheus: false
       authenticator_class: egi_notebooks_hub.onedata.OnedataAuthenticator
-      logo_file: "/egi-notebooks-hub/static/images/egi-notebooks.png"
+      logo_file: "/egi-notebooks-hub/static/images/egi-logo.svg"
       # spawner_class: (in egi-notebooks-b2drop)
   extraConfig:
     egi-notebooks-welcome: |-
@@ -313,29 +315,37 @@ hub:
       c.JupyterHub.spawner_class = B2DropSpawner
       c.B2DropSpawner.http_timeout = 90
       c.B2DropSpawner.args = ["--FileCheckpoints.checkpoint_dir='/home/jovyan/.notebookCheckpoints'"]
-      c.B2DropSpanwer.additional_profile_form_template_paths = "/egi-notebooks-hub/templates"
-{% endraw %}
-  templatePaths:
-    - /egi-notebooks-hub/templates
-  extraFiles:
-    login.html:
-      mountPath: /egi-notebooks-hub/templates/login.html
-      stringData: |-
-{%- raw %}
-        {% extends "egi-login.html" %}
-        {% block main_resources %}
-        <p>
-        Default environment provides 4 vCPU cores, 6 GB RAM and 10GB of personal storage space per user.
-        </p>
-        {% endblock main_resources %}
-{% endraw %}
-  extraFiles:
-    form.html:
-      mountPath: /egi-notebooks-hub/templates/form.html
-      stringData: |-
-{%- raw %}
+      c.B2DropSpawner.profile_form_template = """
         <style>
-        {% include 'style.css' %}
+            /*
+                .profile divs holds two div tags: one for a radio button, and one
+                for the profile's content.
+            */
+            #kubespawner-profiles-list .profile {
+                display: flex;
+                flex-direction: row;
+                font-weight: normal;
+                border-bottom: 1px solid #ccc;
+                padding-bottom: 12px;
+            }
+
+            #kubespawner-profiles-list .profile .radio {
+                padding: 12px;
+            }
+
+            /* .option divs holds a label and a select tag */
+            #kubespawner-profiles-list .profile .option {
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                padding-bottom: 12px;
+            }
+
+            #kubespawner-profiles-list .profile .option label {
+                font-weight: normal;
+                margin-right: 8px;
+                min-width: 96px;
+            }
 
             #kubespawner-profiles-list h4 {
                margin-top: 10px;
@@ -469,4 +479,19 @@ hub:
             $('.js-profile-option-select').trigger('change');
           });
         </script>
+      """
+{% endraw %}
+  templatePaths:
+    - /egi-notebooks-hub/templates
+  extraFiles:
+    login.html:
+      mountPath: /egi-notebooks-hub/templates/login.html
+      stringData: |-
+{%- raw %}
+        {% extends "egi-login.html" %}
+        {% block main_resources %}
+        <p>
+        Default environment provides 4 vCPU cores, 6 GB RAM and 10GB of personal storage space per user.
+        </p>
+        {% endblock main_resources %}
 {% endraw %}