Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbenakamoorthi <benaka.moorthi@gmail.com>2012-08-02 05:38:02 +0400
committerbenakamoorthi <benaka.moorthi@gmail.com>2012-08-02 05:38:02 +0400
commit62017e944d96446bc975865e17afbbb4e787fe14 (patch)
tree5d547d702bc92de6f1cf5533fe47cea990f6829f /plugins/UsersManager
parent0c000adbd52945baf8ec5c075211e6b36714fb3f (diff)
Refs #3184, hide 'done' div in UsersManager.tpl in HTML not in javascript, and move it to right of table so page doesn't jump when it's toggled.
git-svn-id: http://dev.piwik.org/svn/trunk@6634 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r--plugins/UsersManager/templates/UsersManager.js3
-rw-r--r--plugins/UsersManager/templates/UsersManager.tpl6
2 files changed, 4 insertions, 5 deletions
diff --git a/plugins/UsersManager/templates/UsersManager.js b/plugins/UsersManager/templates/UsersManager.js
index 21ff16b16e..99b1e5f839 100644
--- a/plugins/UsersManager/templates/UsersManager.js
+++ b/plugins/UsersManager/templates/UsersManager.js
@@ -138,7 +138,7 @@ function bindUpdateAccess()
.attr('src',"plugins/UsersManager/images/ok.png" )
.attr('class',"accessGranted" )
;
- $('#accessUpdated').show();
+ $('#accessUpdated').css('display', 'inline-block');
hideAccessUpdated();
}
}
@@ -165,7 +165,6 @@ function bindUpdateAccess()
}
$(document).ready( function() {
- $('#accessUpdated').hide();
var alreadyEdited = new Array;
// when click on edituser, the cells become editable
$('.edituser')
diff --git a/plugins/UsersManager/templates/UsersManager.tpl b/plugins/UsersManager/templates/UsersManager.tpl
index f24dfb0e99..e1ebe03c10 100644
--- a/plugins/UsersManager/templates/UsersManager.tpl
+++ b/plugins/UsersManager/templates/UsersManager.tpl
@@ -53,10 +53,9 @@
{ajaxErrorDiv}
{ajaxLoadingDiv}
-<div id="accessUpdated" class="ajaxSuccess">{'General_Done'|translate}!</div>
-<div class="entityContainer" style='width:500px'>
- <table class="entityTable dataTable" id="access">
+<div class="entityContainer" style='width:600px'>
+ <table class="entityTable dataTable" id="access" style="display:inline-table;width:500px;">
<thead>
<tr>
<th class='first'>{'UsersManager_User'|translate}</th>
@@ -81,6 +80,7 @@
{/foreach}
</tbody>
</table>
+ <div id="accessUpdated" class="ajaxSuccess" style="display:none;vertical-align:top;">{'General_Done'|translate}!</div>
</div>
<div class="ui-confirm" id="confirm">