Fixed bug SAK-30537 by changing incorrectly floated button to the cor…

…rect position so that button positions do not swap when becoming disabled.
K-Class · Mar 28, 2016 · aa216ab · aa216ab
1 parent 7db8e61
commit aa216ab
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/user/user-tool/tool/src/webapp/css/sakai-user-tool.css b/user/user-tool/tool/src/webapp/css/sakai-user-tool.css
@@ -178,6 +178,3 @@
     visibility: hidden;
 }
 
-#eventSubmit_doSave {
-    float: right;
-}
diff --git a/user/user-tool/tool/src/webapp/vm/user/chef_users_edit.vm b/user/user-tool/tool/src/webapp/vm/user/chef_users_edit.vm
@@ -231,12 +231,12 @@ function removeOptionalAttributeBlock(elem) {
 #set ($paramNames = $user.Properties.PropertyNames)
 
 			<div class="act">
+				<input type="submit" id="eventSubmit_doCancel" name="eventSubmit_doCancel" value="$tlang.getString("useedi.can")" accesskey="x" onclick="SPNR.disableControlsAndSpin( this, null );" />
 				#if($user)
 					<input type="submit" id="eventSubmit_doSave" class="active" name="eventSubmit_doSave" value="$tlang.getString("useedi.sav")" accesskey="s" onclick="SPNR.disableControlsAndSpin( this, null );" />
 				#else
 					<input type="submit" id="eventSubmit_doSave" class="active" name="eventSubmit_doSave" value="$tlang.getString("useedi.sav2")" accesskey="s" onclick="SPNR.disableControlsAndSpin( this, null );" />
 				#end					
-				<input type="submit" id="eventSubmit_doCancel" name="eventSubmit_doCancel" value="$tlang.getString("useedi.can")" accesskey="x" onclick="SPNR.disableControlsAndSpin( this, null );" />
 			</div>
 			<input type="hidden" name="sakai_csrf_token" value="$sakai_csrf_token" />
 			<input type="hidden" name="alert_message" id="alert_message" value="$alertMessage" />