fixes #3065, refs #3011 initial version of multiple dashboard feature

refs #2857 fixed id collisions in modal confirm windows by using an role attribute instead of id

git-svn-id: http://dev.piwik.org/svn/trunk@6142 59fd770c-687e-43c8-a1e3-f5a4ff64c105

4 files changed, 13 insertions, 13 deletions

diff --git a/plugins/UsersManager/templates/UsersManager.js b/plugins/UsersManager/templates/UsersManager.js
index 652f5be2a5..266432521e 100644
--- a/plugins/UsersManager/templates/UsersManager.js
+++ b/plugins/UsersManager/templates/UsersManager.js
@@ -167,7 +167,7 @@ function bindUpdateAccess()
 		{			
 			launchAjaxRequest(target, successCallback);	
 		}
-		piwikHelper.windowModal( '#confirm', onValidate)
+		piwikHelper.modalConfirm( '#confirm', {yes: onValidate})
 	}
 	else
 	{
@@ -208,7 +208,7 @@ $(document).ready( function() {
 						$.ajax( getUpdateUserAJAX( $('tr#'+idRow) ) ); 
 					};
 					if($('tr#'+idRow).find('input#password').val() != '-') {
-						piwikHelper.windowModal( '#confirmPasswordChange', onValidate);
+						piwikHelper.modalConfirm( '#confirmPasswordChange', {yes: onValidate});
 					} else {
 						onValidate();
 					}
@@ -228,7 +228,7 @@ $(document).ready( function() {
 			var idRow = $(this).attr('id');
 			var loginToDelete = $(this).parent().parent().find('#userLogin').html();
 			$('#confirmUserRemove h2').text(sprintf(_pk_translate('UsersManager_DeleteConfirm_js'),'"'+loginToDelete+'"'));
-			piwikHelper.windowModal( '#confirmUserRemove', function(){ $.ajax( getDeleteUserAJAX( loginToDelete ) ); });
+			piwikHelper.modalConfirm( '#confirmUserRemove', {yes: function(){ $.ajax( getDeleteUserAJAX( loginToDelete ) ); }});
 		}
 	);
 	
diff --git a/plugins/UsersManager/templates/UsersManager.tpl b/plugins/UsersManager/templates/UsersManager.tpl
index a228feabfa..471e0da89a 100644
--- a/plugins/UsersManager/templates/UsersManager.tpl
+++ b/plugins/UsersManager/templates/UsersManager.tpl
@@ -85,20 +85,20 @@
 
 <div class="ui-confirm" id="confirm">
 	<h2>{'UsersManager_ChangeAllConfirm'|translate:"<span id='login'></span>"}</h2>
-    <input id="yes" type="button" value="{'General_Yes'|translate}" />
-    <input id="no" type="button" value="{'General_No'|translate}" />
+    <input role="yes" type="button" value="{'General_Yes'|translate}" />
+    <input role="no" type="button" value="{'General_No'|translate}" />
 </div> 
 
 {if $userIsSuperUser}
     <div class="ui-confirm" id="confirmUserRemove">
         <h2></h2>
-        <input id="yes" type="button" value="{'General_Yes'|translate}" />
-        <input id="no" type="button" value="{'General_No'|translate}" />
+        <input role="yes" type="button" value="{'General_Yes'|translate}" />
+        <input role="no" type="button" value="{'General_No'|translate}" />
     </div> 
     <div class="ui-confirm" id="confirmPasswordChange">
         <h2>{'UsersManager_ChangePasswordConfirm'|translate}</h2>
-        <input id="yes" type="button" value="{'General_Yes'|translate}" />
-        <input id="no" type="button" value="{'General_No'|translate}" />
+        <input role="yes" type="button" value="{'General_Yes'|translate}" />
+        <input role="no" type="button" value="{'General_No'|translate}" />
     </div> 
 
 	<br />
@@ -131,7 +131,7 @@
 					<td id="password" class="editable">-</td>
 					<td id="email" class="editable">{$user.email}</td>
 					<td id="alias" class="editable">{$user.alias}</td>
-					<td id="alias">{$user.token_auth}</td>
+					<td id="token_auth">{$user.token_auth}</td>
 					<td><span class="edituser link_but" id="row{$i}"><img title="{'General_Edit'|translate}" src='themes/default/images/ico_edit.png' /> {'General_Edit'|translate} </span></td>
 					<td><span class="deleteuser link_but" id="row{$i}"><img title="{'General_Delete'|translate}" src='themes/default/images/ico_delete.png' /> {'General_Delete'|translate} </span></td>
 				</tr>
diff --git a/plugins/UsersManager/templates/userSettings.js b/plugins/UsersManager/templates/userSettings.js
index 1e2eb149de..46c4fa699a 100644
--- a/plugins/UsersManager/templates/userSettings.js
+++ b/plugins/UsersManager/templates/userSettings.js
@@ -67,7 +67,7 @@ $(document).ready( function() {
 			$.ajax( getUserSettingsAJAX() );
 		}
 		if($('#password').val() != '') {
-			piwikHelper.windowModal( '#confirmPasswordChange', onValidate);
+			piwikHelper.modalConfirm( '#confirmPasswordChange', {yes: onValidate});
 		} else {
 			onValidate();
 		}
diff --git a/plugins/UsersManager/templates/userSettings.tpl b/plugins/UsersManager/templates/userSettings.tpl
index 48c0bcb74c..4d3c1ab1bb 100644
--- a/plugins/UsersManager/templates/userSettings.tpl
+++ b/plugins/UsersManager/templates/userSettings.tpl
@@ -8,8 +8,8 @@
 
 <div class="ui-confirm" id="confirmPasswordChange">
     <h2>{'UsersManager_ChangePasswordConfirm'|translate}</h2>
-    <input id="yes" type="button" value="{'General_Yes'|translate}" />
-    <input id="no" type="button" value="{'General_No'|translate}" />
+    <input role="yes" type="button" value="{'General_Yes'|translate}" />
+    <input role="no" type="button" value="{'General_No'|translate}" />
 </div> 
 
 <table id='userSettingsTable' class="adminTable" style='width:1000px'>