Merge pull request #1910 from PenghaiZhang/feature/ebp-improvements

openequella · Jun 30, 2020 · 8bf4e81 · 8bf4e81
1 parent 6bf2f25
commit 8bf4e81
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 7 deletions.
diff --git a/Source/Plugins/Core/com.equella.core/resources/web/sass/legacy.scss b/Source/Plugins/Core/com.equella.core/resources/web/sass/legacy.scss
@@ -624,7 +624,7 @@ Contribution wizard inputs
 
 /************************/
 .wizard-controls .indent1 {
-  width: 556px;
+  width: 95%;
 }
 
 .wizard-controls .indent2 {
@@ -848,6 +848,24 @@ a[title="move-down"]:before {
   width: 476px;
 }
 
+@media only screen and (max-width: 768px) {
+  .wizard-layout .indent0 .shuffle-box-inner select {
+    width: 30%;
+  }
+}
+
+@media only screen and (min-width: 769px) and (max-width: 1200px) {
+  .wizard-layout .indent0 .shuffle-box-inner select {
+    width: 38%;
+  }
+}
+
+@media only screen and (min-width: 1201px) {
+  .wizard-layout .indent0 .shuffle-box-inner select {
+    width: 45%;
+  }
+}
+
 .wizard-layout .indent1 .shuffle-box-inner select {
   width: 236px;
 }
@@ -2652,7 +2670,11 @@ Contribution wizard styling
 .wizard-layout #col2,
 #affix-div {
   width: 221px;
-  top: 55px;
+}
+
+.wizard-layout .rightNav {
+  position: fixed;
+  right: 30px;
 }
 
 .wizard-layout #col2 {
@@ -2721,14 +2743,9 @@ Contribution wizard styling
 #wizard-navigation input[type="button"] {
   margin: 0 0 0 3px;
 }
-#wizard-major-actions {
-  display: flex;
-}
 
 #wizard-major-actions .action-button.save {
   background-image: url("../../images/baseline_save_white_18dp.png");
-  text-align: left;
-  padding-left: 42px;
 }
 
 #wizard-major-actions .action-button.edit {

diff --git a/Source/Plugins/Core/com.equella.core/src/com/tle/web/wizard/section/WizardBodySection.java b/Source/Plugins/Core/com.equella.core/src/com/tle/web/wizard/section/WizardBodySection.java
@@ -278,8 +278,13 @@ public SectionResult renderHtml(RenderEventContext context) throws Exception {
       Decorations decorations = Decorations.getDecorations(context);
       decorations.addContentBodyClasses(cssClass);
     }
+
+    // To make the Navigation bar stick to top of the page, Old UI uses Bootstrap affix
+    // whereas New UI adds a CSS style.
     if (!RenderNewTemplate.isNewLayout(context)) {
       model.getFixedDiv().getTagState().addReadyStatements(WizardJSLibrary.AffixDiv);
+    } else {
+      model.getFixedDiv().addClasses("rightNav");
     }
     return viewFactory.createTemplateResult("wizard/body.ftl", context);
   }