From 439b190dd698884fe002cc80c09fd9ce5ce1ca97 Mon Sep 17 00:00:00 2001
From: Sasi Olin <hel@lcp.world>
Date: Jun 17 2022 19:32:10 +0000
Subject: Update the openSUSE theme


Signed-off-by: Sasi Olin <hel@lcp.world>

---
diff --git a/themes/openSUSE/templates/layout.html b/themes/openSUSE/templates/layout.html
index 26bea0b..7fed587 100644
--- a/themes/openSUSE/templates/layout.html
+++ b/themes/openSUSE/templates/layout.html
@@ -5,12 +5,14 @@
         <title>{% block title %}{{ title }}{% endblock %}</title>
 
         <link rel="shortcut icon" type="image/vnd.microsoft.icon"
-            href="//static.opensuse.org/chameleon/dist/images/favicons/favicon.ico"/>
+            href="//static.opensuse.org/favicon.ico"/>
 
-        <link href="https://static.opensuse.org/chameleon/dist/css/chameleon.css" rel="stylesheet">
+        <link href="//static.opensuse.org/chameleon-3.0/dist/css/chameleon.css" rel="stylesheet">
         <link href='/ui/res/login.css' rel='stylesheet' type='text/css'>
         <meta name="generator" content="Ipsilon">
-        <script defer src="https://static.opensuse.org/chameleon/dist/js/chameleon.js" type="text/javascript" charset="utf-8"></script>
+        <script defer src="//static.opensuse.org/chameleon-3.0/dist/js/jquery.slim.js" type="text/javascript" charset="utf-8"></script>
+        <script defer src="//static.opensuse.org/chameleon-3.0/dist/js/bootstrap.bundle.js" type="text/javascript" charset="utf-8"></script>
+        <script defer src="//static.opensuse.org/chameleon-3.0/dist/js/chameleon.js" type="text/javascript" charset="utf-8"></script>
 
         {%- if heads %}
           {%- for group, value in heads.items() %}
@@ -21,15 +23,22 @@
         {%- endif %}
     </head>
     <body>
-        <nav class="navbar navbar-expand-md navbar-light bg-light noprint">
+        <nav class="navbar navbar-expand-md noprint">
             <a class="navbar-brand" href="/">
-                <img src="https://static.opensuse.org/chameleon/dist/images/logo/logo-white.svg" class="mr-2" alt="Logo">
-                <span>Login</span>
+                <img src="//static.opensuse.org/favicon.svg" class="d-inline-block align-top" alt="openSUSE" title="openSUSE" width="30" height="30">
+                <span class="navbar-title">Login</span>
             </a>
             <div class="ml-auto">
             </div>
+            <button class="navbar-toggler megamenu-toggler" type="button" data-toggle="collapse" data-target="#megamenu" aria-expanded="true">
+                <svg class="bi bi-grid" width="1em" height="1em" viewBox="0 0 16 16" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+                    <path fill-rule="evenodd" d="M1 2.5A1.5 1.5 0 0 1 2.5 1h3A1.5 1.5 0 0 1 7 2.5v3A1.5 1.5 0 0 1 5.5 7h-3A1.5 1.5 0 0 1 1 5.5v-3zM2.5 2a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3zm6.5.5A1.5 1.5 0 0 1 10.5 1h3A1.5 1.5 0 0 1 15 2.5v3A1.5 1.5 0 0 1 13.5 7h-3A1.5 1.5 0 0 1 9 5.5v-3zm1.5-.5a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3zM1 10.5A1.5 1.5 0 0 1 2.5 9h3A1.5 1.5 0 0 1 7 10.5v3A1.5 1.5 0 0 1 5.5 15h-3A1.5 1.5 0 0 1 1 13.5v-3zm1.5-.5a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3zm6.5.5A1.5 1.5 0 0 1 10.5 9h3a1.5 1.5 0 0 1 1.5 1.5v3a1.5 1.5 0 0 1-1.5 1.5h-3A1.5 1.5 0 0 1 9 13.5v-3zm1.5-.5a.5.5 0 0 0-.5.5v3a.5.5 0 0 0 .5.5h3a.5.5 0 0 0 .5-.5v-3a.5.5 0 0 0-.5-.5h-3z">
+                    </path>
+                </svg>
+            </button>
         </nav>
-        <div class="container m-auto">
+        <div id="megamenu" class="megamenu collapse"></div>
+        <main class="page-content flex-fill">
             <div class="m-auto {% block cardwidths %}col-md-6{% endblock %}">
                 {% block toptext %}{% endblock %}
                 <div class="card">
@@ -37,7 +46,7 @@
                 </div>
                 {% block after_card %}{% endblock %}
             </div>
-        </div>
+        </main>
 
         <div class="global-footer py-3 text-center">
             <div class="container">
diff --git a/themes/openSUSE/templates/login/form.html b/themes/openSUSE/templates/login/form.html
index 596410e..3630978 100644
--- a/themes/openSUSE/templates/login/form.html
+++ b/themes/openSUSE/templates/login/form.html
@@ -11,25 +11,32 @@
   wants to use your openSUSE Account credentials
 </div>
 {% endblock %}
+{% block after_card %}
+                <p class="my-3 text-center">
+                    Don't have an openSUSE Account? <a target="_blank" href="https://idp-portal.suse.com/univention/self-service/#page=createaccount">Sign up</a>.
+                </p>
+{% endblock %}
 {% block cardwidths %}col-md-6 col-sm-8{% endblock %}
 {% block main %}
                 {% if error %}<p>{{error}}</p>{% endif %}
                 <form method="post" action="{{ action }}" enctype="application/x-www-form-urlencoded">
                     <div class="card-body">
-                    <input type="hidden" name="ipsilon_transaction_id" id="ipsilon_transaction_id" value="{{ ipsilon_transaction_id}}"/>
-                    <div class="form-group">
-                        <input class="form-control" id="username" name="login_name" placeholder="Username" autofocus value="{{ username | e }}" />
-                    </div>
-                    <div class="form-group">
-                        <input class="form-control" id="password" name="login_password" type="password" placeholder="Password" />
-                    </div>
-                    <div class="form-group mb-0">
-                        <input class="form-control" id="otp" name="login_otp" placeholder="One-Time-Password (if you have one)" />
-                        <a target="_blank" href="https://www.microfocus.com/selfreg/jsp/forgotPassword.jsp">Forgot password?</a>
-                    </div>
+                        <input type="hidden" name="ipsilon_transaction_id" id="ipsilon_transaction_id" value="{{ ipsilon_transaction_id}}"/>
+                        <div class="form-group">
+                            <label for="username">Username</label>
+                            <input class="form-control" id="username" name="login_name" placeholder="Username" autofocus value="{{ username | e }}" />
+                        </div>
+                        <div class="form-group">
+                            <label for="password">Password</label>
+                            <input class="form-control" id="password" name="login_password" type="password" placeholder="Password" />
+                        </div>
+                        <div class="form-group mb-0">
+                            <label for="otp">One-Time-Password</label>
+                          <input class="form-control" id="otp" name="login_otp" placeholder="One-Time-Password (if you have one)" />
+                        </div>
                     </div>
                     <div class="card-footer d-flex justify-content-between align-items-center">
-                        <a target="_blank" href="https://www.microfocus.com/selfreg/jsp/createOpenSuseAccount.jsp">Sign up</a>
+                        <a target="_blank" href="https://idp-portal.suse.com/univention/self-service/#page=passwordreset">Forgot password?</a>
                         <input class="btn btn-primary" type="submit" id="loginbutton" value="Log in" />
                     </div>
                 </form>

