Browse Source

Fixed JS and CSS issues in users page

- Renamed "delete" to "deleteEntry" to make IE8 happy.
- Added missing "svg" class for the "+" button
- Added height to "+" button but was unable to properly align it
remotes/origin/fix-10825
Vincent Petry 11 years ago
parent
commit
4d5ebe61c4
  1. 5
      settings/css/settings.css
  2. 4
      settings/js/users/deleteHandler.js
  3. 2
      settings/js/users/groups.js
  4. 2
      settings/js/users/users.js
  5. 4
      settings/templates/users/part.grouplist.php

5
settings/css/settings.css

@ -54,6 +54,11 @@ table.nostyle td { padding: 0.2em 0; }
position: absolute; left: 12px; top:-2px; position: absolute; left: 12px; top:-2px;
content: '+'; font-weight: bold; font-size: 150%; content: '+'; font-weight: bold; font-size: 150%;
} }
.ie8 #newgroup-form .icon-add {
height: 30px;
}
.usercount { float: left; margin: 5px; } .usercount { float: left; margin: 5px; }
li.active span.utils .delete { li.active span.utils .delete {
float: left; position: relative; opacity: 0.5; float: left; position: relative; opacity: 0.5;

4
settings/js/users/deleteHandler.js

@ -116,7 +116,7 @@ DeleteHandler.prototype.hideNotification = function() {
*/ */
DeleteHandler.prototype.mark = function(oid) { DeleteHandler.prototype.mark = function(oid) {
if(this.oidToDelete !== false) { if(this.oidToDelete !== false) {
this.delete();
this.deleteEntry();
} }
this.oidToDelete = oid; this.oidToDelete = oid;
this.canceled = false; this.canceled = false;
@ -138,7 +138,7 @@ DeleteHandler.prototype.cancel = function() {
* OC.dialogs.alert. On success, a callback is fired so that the client can * OC.dialogs.alert. On success, a callback is fired so that the client can
* update the web interface accordingly. * update the web interface accordingly.
*/ */
DeleteHandler.prototype.delete = function() {
DeleteHandler.prototype.deleteEntry = function() {
if(this.canceled || this.oidToDelete === false) { if(this.canceled || this.oidToDelete === false) {
return false; return false;
} }

2
settings/js/users/groups.js

@ -237,7 +237,7 @@ GroupList = {
//delete a marked user when leaving the page //delete a marked user when leaving the page
$(window).on('beforeunload', function () { $(window).on('beforeunload', function () {
GroupDeleteHandler.delete();
GroupDeleteHandler.deleteEntry();
}); });
}, },

2
settings/js/users/users.js

@ -306,7 +306,7 @@ var UserList = {
//delete a marked user when leaving the page //delete a marked user when leaving the page
$(window).on('beforeunload', function () { $(window).on('beforeunload', function () {
UserDeleteHandler.delete();
UserDeleteHandler.deleteEntry();
}); });
}, },
update: function (gid) { update: function (gid) {

4
settings/templates/users/part.grouplist.php

@ -5,10 +5,10 @@
<span><?php p($l->t('Add Group'))?></span> <span><?php p($l->t('Add Group'))?></span>
</a> </a>
</li> </li>
<li id="newgroup-form">
<li id="newgroup-form" style="display: none">
<form> <form>
<input type="text" id="newgroupname" placeholder="<?php p($l->t('Group')); ?>..." /> <input type="text" id="newgroupname" placeholder="<?php p($l->t('Group')); ?>..." />
<input type="submit" class="button icon-add" value="" />
<input type="submit" class="button icon-add svg" value="" />
</form> </form>
</li> </li>
<!-- Everyone --> <!-- Everyone -->

Loading…
Cancel
Save