LSNBLDR-755; move next/prev buttons out of top area (sakaiproject#3619)

alaminreaz · Nov 23, 2016 · 111bd3f · 111bd3f
1 parent 0684a00
commit 111bd3f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lessonbuilder/tool/src/webapp/css/Simplepagetool.css b/lessonbuilder/tool/src/webapp/css/Simplepagetool.css
@@ -1728,12 +1728,14 @@ span.nextprev {
 .fa-button-text{
   font-size:125%;
 }
-.navIntraTool li.contentButton a {
+.navIntraTool li.contentButton a, .topaction a {
   padding-top:2px !important;
   padding-bottom:2px !important;
+  text-transform: uppercase;
 }
 .navIntraTool li.contentButton a .fa-button-text, .fa-fw {
   font-family:FontAwesome;
+  font-size: 0.8em;
 }
 .studentRow > .fa-fw {
   width: 1em !important;

diff --git a/lessonbuilder/tool/src/webapp/templates/ShowPage.html b/lessonbuilder/tool/src/webapp/templates/ShowPage.html
@@ -120,7 +120,7 @@ <h2>
 				       <span rsf:id="pagetitle"></span><a role="button" class="portlet title-tools title reset" rsf:id="pagetitlelink"><span class="Mrphs-toolTitleNav__link Mrphs-toolTitleNav__link--reset"></span><span rsf:id="pagetitletext"></span></a>
 			   </h2>
 		       </div>
-	     <div class="action">
+	     <div class="action topaction">
                  <span id="expandCollapseButtons" style="display:none;">
                    <a href="#" role="button" id="expandAllSections"><span class="fa fa-toggle-down" aria-hidden="true" style="padding-right:5px;"></span><span rsf:id="msg=simplepage.expand.all"></span></a>
                    <a href="#" role="button" id="collapseAllSections" style="display:none;"><span class="fa fa-toggle-up" aria-hidden="true" style="padding-right:5px;"></span><span rsf:id="msg=simplepage.collapse.all"></span></a>
@@ -132,7 +132,7 @@ <h2>
 		 <span rsf:id="gradingSpan" class="gradingarea">
 		     <a role="button" href="#" rsf:id="gradingBack" style="margin-right:2px;background:none" class="usebutton grading-nextprev">&#60;</a><img class="statusImg" src="$context/images/no-status.png" id="statusImg" height="16px" width="16px" alt=""></img><span style="*vertical-align:13%"  rsf:id="msg=simplepage.comments-points"></span><span style="display:none" class="uuidBox" rsf:id="commentsUUID"></span><span style="display:none" class="pointsSpan" rsf:id="commentPoints"></span> <input rsf:id="studentPointsBox"  id="studentPointsBox" type="text" style="font-size:100%"  size="3"></input> / <span rsf:id="topmaxpoints"></span> <a role="button" class="usebutton" href="#" rsf:id="msg=simplepage.submit" style="background:none; width:auto; *vertical-align:13%;margin-right:.5em" id="submit-grading"></a> <a role="button" style="background:none" href="#" rsf:id="gradingForward" class="usebutton grading-nextprev">&#62;</a>
 		 </span>
-		 <span class="nextprev buttonset"> <a role="button" style="background:none" href="#" rsf:id="prev" class="nextprev nextbutton">next</a> <a role="button" style="background:none"  href="#" rsf:id="next" class="nextprev nextbutton">next</a> </span>
+		 <span class=""> <a role="button" style="" href="#" rsf:id="prev" class="nexprev menuitem button">next</a> <a role="button" href="#" rsf:id="next" class="nextprev menuitem button">next</a> </span>
 		   <a role="button" aria-haspopup="dialog" aria-controls="direct-dialog" href="#" rsf:id="directurl" id="directurl" class="title-tools tool-directurl Mrphs-toolTitleNav__link Mrphs-toolTitleNav__link--directurl">
 		       <img rsf:id="directimage" src="/library/image/transparent.gif"/>
 		   </a>
@@ -225,9 +225,13 @@ <h3 id="toolbar-label" rsf:id="msg=simplepage.toolbar" class="offscreen"></h3>
 		jQuery(".Mrphs-siteHierarchy").append(jQuery(".breadcrumbs span").slice(1));
 	    }
 	    jQuery(".Mrphs-siteHierarchy").children().wrapAll('<div class="hierarchyWrap" />');
-	    jQuery(".Mrphs-siteHierarchy").append(jQuery("span.nextprev"));
+	    //jQuery(".Mrphs-siteHierarchy").append(jQuery("span.nextprev"));
 	    jQuery(".neoPortletTitleWrap").before('<h2 class="genTitle"></h2>');
 	    jQuery(".genTitle").text(title);
+
+	    jQuery(".Mrphs-toolTitleNav__addRight").before(jQuery(".topaction > a"));
+	    jQuery(".Mrphs-toolTitleNav__button_container > a").addClass("Mrphs-toolTitleNav__link");
+
 	    // the top is position:fixed. The rest of the page is position static, put below the
 	    // fixed by a magic margin. However if the siteHierarchy is large, the magic margin
 	    // has to be adjusted.
@@ -241,6 +245,8 @@ <h3 id="toolbar-label" rsf:id="msg=simplepage.toolbar" class="offscreen"></h3>
             resizeContent();
 	    jQuery(window).load(resizeContent);
 	    jQuery(window).resize(resizeContent);
+         } else {
+	     jQuery(".topaction > a").addClass("button");
          }
 	 if (jQuery(".navIntraTool").size() > 0)
   	   jQuery(".navIntraTool").append(jQuery(".action"));