Merge pull request sakaiproject#1759 from colczr/SAK-30330

SAK-30330 fixed worksite setup markup
bizzkriss · Feb 19, 2016 · 472eaf9 · 472eaf9
2 parents 5ca8529 + 24d700e
commit 472eaf9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-list.vm b/site-manage/site-manage-tool/tool/src/webapp/vm/sitesetup/chef_site-list.vm
@@ -69,7 +69,6 @@
 					#end
 				</select>
 				#if(!$hideTermFilter)
-					<br/>
 					<label for="termview">$tlang.getString("list.selectTerm")</label>
 					<select id="termview" name="termview" size="1" onchange="document.viewForm.submit();">
 						#foreach($view in $termViewKeys)
@@ -124,9 +123,11 @@
                             </fieldset>
 							</form>
 						#else
-							<fieldset><legend>$tlang.getString('list.previous') $pagesize $tlang.getString('list.items')</legend>
+							<form name="nextpageForm" class="inlineForm" method="post" action="#toolForm("$action")">
+              <fieldset><legend>$tlang.getString('list.previous') $pagesize $tlang.getString('list.items')</legend>
                             <input type="submit" disabled="disabled" name="eventSubmit_doList_prev" value="&lt;" />
                             </fieldset>
+              </form>
 						#end
 					#end
 					<form name="pagesizeForm"  class="inlineForm" method="post" action="#toolForm("$action")">

diff --git a/site/site-tool/tool/src/webapp/vm/adminsites/chef_sites_list.vm b/site/site-tool/tool/src/webapp/vm/adminsites/chef_sites_list.vm
@@ -82,7 +82,6 @@
 								</form>
 							#end
 						#end
-					</div>
 				</div> ##end navPanel
 
 
@@ -172,4 +171,3 @@
 		</div>
 #end
 	</div>
-
-Original file line number
+Diff line change
@@ Expand Up / @@ -82,7 +82,6 @@ @@
     								</form>
     							#end
     						#end
-    					</div>
     				</div> ##end navPanel
@@ Expand Down Expand Up / @@ -172,4 +171,3 @@ @@
     		</div>
     #end
     	</div>