diff options
| author | sgiehl <stefangiehl@gmail.com> | 2012-03-31 18:39:20 +0400 |
|---|---|---|
| committer | sgiehl <stefangiehl@gmail.com> | 2012-03-31 18:39:20 +0400 |
| commit | ffe67231337352e7f0f314bdfa06dae4c172ce36 (patch) | |
| tree | 894715cfb13c826ce2d35a2ce6a0c614812783e8 /plugins/SitesManager/templates | |
| parent | 5c6db65c7fd4201bf97b658934ba9b3679883eff (diff) | |
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
Diffstat (limited to 'plugins/SitesManager/templates')
| -rw-r--r-- | plugins/SitesManager/templates/SitesManager.js | 6 | ||||
| -rw-r--r-- | plugins/SitesManager/templates/SitesManager.tpl | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/SitesManager/templates/SitesManager.js b/plugins/SitesManager/templates/SitesManager.js index ef0c0973ff..54f65d2e80 100644 --- a/plugins/SitesManager/templates/SitesManager.js +++ b/plugins/SitesManager/templates/SitesManager.js @@ -178,9 +178,9 @@ function SitesManager ( _timezones, _currencies, _defaultTimezone, _defaultCurre var idsiteToDelete = $(this).parent().parent().find('#idSite').html(); $('#confirm h2').text(sprintf(_pk_translate('SitesManager_DeleteConfirm_js'),'"'+nameToDelete+'" (idSite = '+idsiteToDelete+')')); - piwikHelper.windowModal('#confirm', function(){ + piwikHelper.modalConfirm('#confirm', {yes: function(){ $.ajax( getDeleteSiteAJAX( idsiteToDelete ) ); - }); + }}); } ); @@ -193,7 +193,7 @@ function SitesManager ( _timezones, _currencies, _defaultTimezone, _defaultCurre if(siteBeingEdited) { $('#alert h2').text(sprintf(_pk_translate('SitesManager_OnlyOneSiteAtTime_js'), '"'+$("<div/>").html(siteBeingEditedName).text()+'"')); - piwikHelper.windowModal('#alert', function(){}); + piwikHelper.modalConfirm('#alert', {}); return; } siteBeingEdited = true; diff --git a/plugins/SitesManager/templates/SitesManager.tpl b/plugins/SitesManager/templates/SitesManager.tpl index ae82d4a674..a42d584d30 100644 --- a/plugins/SitesManager/templates/SitesManager.tpl +++ b/plugins/SitesManager/templates/SitesManager.tpl @@ -108,8 +108,8 @@ vertical-align:middle; {else} <div class="ui-confirm" id="confirm"> <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="entityContainer"> |