Rework ingress detail page

rancher/rancher#15096

app/components/new-edit-ingress/template.hbs

@@ -31,24 +31,24 @@
 
 {{#accordion-list as | al expandFn | }}
   {{form-ssl-termination
+      certificates=certificates
       editing=true
+      expandAll=al.expandAll
+      expandFn=expandFn
       ingress=ingress
       namespace=namespace
       namespacedCertificates=namespacedCertificates
-    certificates=certificates
-    expandAll=al.expandAll
-    expandFn=expandFn
   }}
 
   {{form-labels-annotations
+      annotationErrors=annotationErrors
       classNames="accordion-wrapper"
-    labelErrors=labelErrors
-    initialLabels=ingress.labels
-    setLabels=(action 'setLabels')
       expandAll=al.expandAll
       expandFn=expandFn
+      initialLabels=ingress.labels
+      labelErrors=labelErrors
       model=ingress
-    annotationErrors=annotationErrors
+      setLabels=(action 'setLabels')
   }}
 {{/accordion-list}}
 

app/ingress/template.hbs

@@ -21,13 +21,30 @@
       ingress=model.ingress
       editing=false
   }}
-  <hr class="mt-30 mb-30" />
 </section>
 
-{{form-ssl-termination
+<hr class="mt-30 mb-30" />
+
+<section class="horizontal-form container-fluid">
+  {{#accordion-list as | al expandFn | }}
+    {{form-ssl-termination
         editing=false
+        expandAll=al.expandAll
+        expandFn=expandFn
         ingress=model.ingress
         namespace=model.ingress.namespace
         namespacedCertificates=model.namespacedCertificates
         certificates=model.certificates
-}}
+    }}
+
+
+    {{form-labels-annotations
+        classNames="accordion-wrapper"
+        editing=false
+        expandAll=al.expandAll
+        expandFn=expandFn
+        initialLabels=model.ingress.labels
+        model=model.ingress
+    }}
+  {{/accordion-list}}
+</section>

lib/shared/addon/components/form-ingress-rows/template.hbs

@@ -19,7 +19,8 @@
     </div>
 
     <div class="row">
-      <div class="col span-6 mt-0 mb-0">
+      <div class="col mt-0 mb-0 {{if (eq mode 'manual') 'span-6' 'span-12'}}" >
+        {{#if editing}}
           {{#unless rule.new}}
             <div class="radio">
               <label>{{radio-button selection=mode value="existing"}} {{t 'formIngress.hostMode.existing' domain=(if existingHost existingHost 'n/a') htmlSafe=true}}</label>
@@ -36,6 +37,25 @@
           <div class="radio">
             <label class="{{if defaultDisabled 'text-muted'}}">{{radio-button selection=mode value="default" disabled=defaultDisabled}} {{t 'formIngress.hostMode.default'}}</label>
           </div>
+        {{else}}
+          {{#if (eq mode "existing")}}
+            <div>
+              <label>{{t 'formIngress.hostMode.existing' domain=(if existingHost existingHost 'n/a') htmlSafe=true}}</label>
+            </div>
+          {{else if (eq mode "automatic")}}
+            <div>
+              <label>{{t 'formIngress.hostMode.automatic' domain=settings.ingress-ip-domain htmlSafe=true}}</label>
+            </div>
+          {{else if (eq mode "manual")}}
+            <div>
+              <label>{{t 'formIngress.hostMode.manual'}}</label>
+            </div>
+          {{else}}
+            <div>
+              <label>{{t 'formIngress.hostMode.default'}}</label>
+            </div>
+          {{/if}}
+        {{/if}}
       </div>
 
       {{#if (eq mode "manual")}}
@@ -50,5 +70,10 @@
 
     <hr class="mt-20 mb-20" />
 
-    {{form-ingress-backends ingress=ingress isDefault=isDefault rule=rule editing=editing}}
+    {{form-ingress-backends
+        ingress=ingress
+        isDefault=isDefault
+        rule=rule
+        editing=editing
+    }}
   </div>

lib/shared/addon/components/form-ingress-rule/template.hbs

@@ -8,7 +8,8 @@
       rules=rules
       rule=rule
       ingress=ingress
-    editing=editing}}
+      editing=editing
+  }}
 {{else}}
   <div class="p-20">{{t 'formIngress.noRules'}}</div>
 {{/each}}