change register page style

media/css/seahub.css

@@ -2195,6 +2195,7 @@ a.sf-popover-item {
   margin-bottom: 5px;
 }
 
+/* policy service link */
 .login-panel-bottom-divider {
   border: 0;
   height: 1px;
@@ -2207,17 +2208,27 @@ a.sf-popover-item {
   font-size: 12px;
   line-height: 1;
   margin-top: 12px;
+  display: flex;
+  justify-content: center;
 }
 
 .login-panel-bottom-privacy-policy a {
   color: #EC8000;
   font-size: 12px;
+  font-weight: normal;
+  padding: 0 0.5rem;
 }
 
-.login-panel-bottom-privacy-policy .bottom-item {
+.login-panel-bottom-privacy-policy .login-panel-bottom-seperator {
   border-right: 1px solid #EC8000;
 }
 
+#registration-form .login-panel-bottom-divider,
+#org-register .login-panel-bottom-divider,
+#choose-register .login-panel-bottom-divider {
+  margin: 20px -60px 0px -60px;
+}
+
 /*myhome*/
 #quota-bar {
   display: block;
@@ -2897,25 +2908,6 @@ a.sf-popover-item {
   padding-left: 0;
 }
 
-/* policy, terms link */
-.privacy-policy-link {
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin-top: 50px;
-}
-
-.privacy-policy-link-text {
-  color: #666666;
-  font-size: 12px;
-}
-
-.privacy-policy-link-split {
-  width: 1px;
-  background: #6e7687;
-  height: 12px;
-}
-
 #email-audit-form .email-input {
   width: 172px;
 }

seahub/organizations/templates/organizations/org_register.html

@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block main_content %}
-<div class="login-panel-outer-container vh">
+<div class="login-panel-outer-container vh" id="org-register">
     <div class="login-panel">
         <h1 class="login-panel-hd">{% trans "Signup" %}</h1>
         {% if request.user.is_authenticated %}
@@ -54,10 +54,12 @@
         <div class="login-panel-bottom-container">
             {# language will be shown here #}
         </div>
+        <div>
+            {% include "snippets/policy_service_link.html" %}
+        </div>
         {% endif %}
     </div>
 </div>
-{% include "snippets/policy_service_link.html" %}
 {% endblock %}
 
 {% block extra_script %}{{block.super}}

seahub/templates/choose_register.html

@@ -3,14 +3,14 @@
 {% block sub_title %}{% trans "Signup" %} - {% endblock %}
 
 {% block main_content %}
-<div class="login-panel-outer-container vh">
+<div class="login-panel-outer-container vh" id="choose-register">
     <div class="login-panel">
         <h1 class="login-panel-hd">{% trans "Signup" %}</h1>
         <button id="personal" class="submit btn btn-primary btn-block">{% trans "Create a personal account" %}</button>
         <button id="org" class="submit btn btn-primary btn-block">{% trans "Create an organization account" %}</button>
+        {% include "snippets/policy_service_link.html" %}
     </div>
 </div>
-{% include "snippets/policy_service_link.html" %}
 {% endblock %}
 
 {% block extra_script %}{{block.super}}

seahub/templates/registration/login.html

@@ -118,22 +118,7 @@ html, body, #wrapper { height:100%; }
         <a href="{{ signup_url }}" class="normal px-2 bottom-item" id="sign-up">{% trans "Signup" %}</a>
         {% endif %}
     </div>
-    {% if privacy_policy_link or terms_of_service_link %}
+    {% include "snippets/policy_service_link.html" %}
-    <hr class="login-panel-bottom-divider">
-    <div class="login-panel-bottom-privacy-policy d-flex justify-content-center">
-        {% if privacy_policy_link %}
-        <a href="{{ privacy_policy_link }}" class="normal px-2">{% trans "Privacy Policy" %}</a>
-        {% endif %}
-
-        {% if privacy_policy_link and terms_of_service_link %}
-        <span class="bottom-item"></span>
-        {% endif %}
-
-        {% if terms_of_service_link %}
-        <a href="{{ terms_of_service_link }}" class="normal px-2">{% trans "Terms of Service" %}</a>
-        {% endif %}
-    </div>
-    {% endif %}
 </div>
 </div>
 {% endblock %}

seahub/templates/registration/multi_adfs_sso.html

@@ -46,9 +46,11 @@ html, body, #wrapper { height:100%; }
         <button type="submit" class="submit btn btn-primary btn-block h-auto mb-3">{% trans "Log In" %}</button>
     </form>
     <div class="login-panel-bottom-container d-flex justify-content-center" id="login-bottom"></div>
+    <div>
+        {% include "snippets/policy_service_link.html" %}
+    </div>
 </div>
 </div>
-{% include "snippets/policy_service_link.html" %}
 {% endblock %}
 
 {% block extra_script %}

seahub/templates/registration/registration_form.html

@@ -9,7 +9,7 @@
 {% endblock %}
 
 {% block main_content %}
-<div class="login-panel-outer-container vh">
+<div class="login-panel-outer-container vh" id="registration-form">
     <div class="login-panel">
         <h1 class="login-panel-hd">{% trans "Signup" %}</h1>
         {% if request.user.is_authenticated %}
@@ -54,10 +54,12 @@
         <div class="login-panel-bottom-container">
             {# language will be shown here #}
         </div>
+        <div>
+            {% include "snippets/policy_service_link.html" %}
+        </div>
         {% endif %}
     </div>
 </div>
-{% include "snippets/policy_service_link.html" %}
 {% endblock %}
 
 {% block extra_script %}{{ block.super }}

seahub/templates/snippets/policy_service_link.html

@@ -1,14 +1,15 @@
 {% load i18n %}
 {% if privacy_policy_link or terms_of_service_link %}
-    <div class="privacy-policy-link">
+    <hr class="login-panel-bottom-divider"/>
+    <div class="login-panel-bottom-privacy-policy">
         {% if privacy_policy_link and terms_of_service_link %}
-            <a href="{{ privacy_policy_link }}" class="privacy-policy-link-text px-3">{% trans "Privacy Policy" %}</a>
+            <a href="{{ privacy_policy_link }}">{% trans "Privacy Policy" %}</a>
-            <span class="privacy-policy-link-split  "></span>
+            <span class="login-panel-bottom-seperator"></span>
-            <a href="{{ terms_of_service_link }}" class="privacy-policy-link-text px-3">{% trans "Terms of Service" %}</a>
+            <a href="{{ terms_of_service_link }}">{% trans "Terms of Service" %}</a>
         {% elif privacy_policy_link %}
-            <a href="{{ privacy_policy_link }}" class="privacy-policy-link-text px-3">{% trans "Privacy Policy" %}</a>
+            <a href="{{ privacy_policy_link }}">{% trans "Privacy Policy" %}</a>
         {% elif terms_of_service_link %}
-            <a href="{{ terms_of_service_link }}" class="privacy-policy-link-text px-3">{% trans "Terms of Service" %}</a>
+            <a href="{{ terms_of_service_link }}">{% trans "Terms of Service" %}</a>
         {% endif %}
     </div>
 {% endif %}