LSNBLDR-710; misalignments (sakaiproject#3134)

cwarden · Aug 4, 2016 · 205899b · 205899b
1 parent af9db2c
commit 205899b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/...der/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java b/...der/tool/src/java/org/sakaiproject/lessonbuildertool/tool/producers/ShowPageProducer.java
@@ -1340,7 +1340,7 @@ public int compare(SimpleStudentPage o1, SimpleStudentPage o2) {
 					if (!isInline) {
 					    linkdiv = UIBranchContainer.make(tableRow, "link-div:");
 					}
-					if (!isInline && !navButton) {
+					if (!isInline && !navButton && !"button".equals(i.getFormat())) {
 					    UIOutput itemicon = UIOutput.make(linkdiv,"item-icon");
 					    switch (i.getType()) {
 					    case SimplePageItem.FORUM:
@@ -3384,9 +3384,6 @@ protected static boolean makeLink(UIContainer container, String ID, SimplePageIt
 					isbutton = true;
 					UIOutput span = UIOutput.make(container, ID + "-button-span");
 					ID = ID + "-button";
-					if (!i.isRequired()) {
-						span.decorate(new UIFreeAttributeDecorator("class", "navIntraTool buttonItem"));
-					}
 					isbutton = true;
 				}
 

diff --git a/lessonbuilder/tool/src/webapp/templates/ShowPage.html b/lessonbuilder/tool/src/webapp/templates/ShowPage.html
@@ -392,9 +392,9 @@ <h3 rsf:id="sectionHeader" id="sectionHeader" class="sectionHeader"><span rsf:id
                       <div rsf:id="contentCol" class="contentCol">
                         <div rsf:id="link-div:" class="link-div">
                           <span rsf:id="item-icon" aria-hidden="true" class="fa-item-text"></span>
-                          <span rsf:id="link-note" class="offscreen"></span><h3 class="link-div-head"><a class="itemlink" href="#" rsf:id="link"><span rsf:id="link-text" class="link-text itemtext"></span></a></h3>
-                          <span><span rsf:id="link-fake-note" class="offscreen"></span><span rsf:id="link-fake" class="link-text itemtext fake-disabled"></span></span>
-                          <span rsf:id="link-button-span" class="navIntraTool" style="background-color:transparent;border:none">
+                          <span rsf:id="link-note" class="offscreen"></span><span class="link-div-head" role="heading" aria-level="3"><a class="itemlink" href="#" rsf:id="link"><span rsf:id="link-text" class="link-text itemtext"></span></a></span>
+                          <span><span rsf:id="link-fake-note" class="offscreen"></span><span rsf:id="link-fake" class="link-text itemtext fake-disabled" role="heading" aria-level="3"></span></span>
+                          <span rsf:id="link-button-span" class="" style="background-color:transparent;border:none">
                             <a href="#" class="usebutton" rsf:id="link-button">
                                 <span rsf:id="link-button-text" class="link-text"></span>
                             </a>