mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

User management works, now we need some usability expert ...

This commit is contained in:
Jakob Sack 2011-04-18 09:30:37 +02:00
parent 8c5831d958
commit 43646dbf8d
3 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
admin/js/users.js
View File

@ -23,7 +23,12 @@ $(document).ready(function(){
groups.push($(this).val());
}
});
$("#changegroups").prev().html( groups.join(", "));
if( groups.length == 0 ){
$("#changegroups").prev().html( ' ' );
}
else{
$("#changegroups").prev().html( groups.join(", "));
}
}
else{
alert( "something went wrong! sorry!" );
@ -38,10 +43,15 @@ $(document).ready(function(){
// Manipulating the page after crteating a user
function userCreated( username, groups ){
// We need at least a space for showing the div
if( groups == "" ){
groups = '&nbps;';
}
// Add user to table
var newrow = '<tr x-uid="'+username+'"><td x-use="username"><span x-use="usernamespan">'+username+'</span></td>';
newrow = newrow+'<td x-use="usergroups">'+groups+'</td>';
newrow = newrow+'<td><a href="" class="edituserbutton">edit</a> | <a class="removeuserbutton" href="">remove</a></td></tr>';
var newrow = '<tr x-uid="'+username+'"><td x-use="username"><div x-use="usernamediv">'+username+'</div></td>';
newrow = newrow+'<td x-use="usergroups"><div x-use="usergroupsdiv">'+groups+'</td>';
newrow = newrow+'<td><a class="removeuserbutton" href="">remove</a></td></tr>';
$("#usertable").append( newrow );
// Clear forms
@ -96,7 +106,7 @@ $(document).ready(function(){
//#########################################################################
// Password (clicking on user name)
$("span[x-use='usernamespan']").live( "click", function(){
$("div[x-use='usernamediv']").live( "click", function(){
if( togglepassword == "" || $(this).parent().parent().attr("x-uid") != togglepassword ){
togglepassword = $(this).parent().parent().attr("x-uid");
// Set the username!
@ -128,7 +138,7 @@ $(document).ready(function(){
});
// Groups
$("span[x-use='usergroupsspan']").live( "click", function(){
$("div[x-use='usergroupsdiv']").live( "click", function(){
if( togglegroup == "" || $(this).parent().parent().attr("x-uid") != togglegroup){
togglegroup = $(this).parent().parent().attr("x-uid");
var groups = $(this).text();
@ -161,7 +171,12 @@ $(document).ready(function(){
groups.push($(this).val());
}
});
$(this).html( groups.join(", "));
if( groups.length == 0 ){
$("#changegroups").prev().html( '&nbsp;' );
}
else{
$("#changegroups").prev().html( groups.join(", "));
}
$('#changegroups').hide();
togglegroup = "";
}

4
admin/templates/users.php
View File

@ -35,8 +35,8 @@
<tbody>
<?php foreach($_["users"] as $user): ?>
<tr x-uid="<?php echo $user["name"] ?>">
<td x-use="username"><span x-use="usernamespan"><?php echo $user["name"]; ?></span></td>
<td x-use="usergroups"><span x-use="usergroupsspan"><?php echo $user["groups"]; ?></span></td>
<td x-use="username"><div x-use="usernamediv"><?php echo $user["name"]; ?></div></td>
<td x-use="usergroups"><div x-use="usergroupsdiv"><?php if( $user["groups"] ){ echo $user["groups"]; }else{echo "&nbsp";} ?></div></td>
<td><a class="removeuserbutton" href="">remove</a></td>
</tr>
<?php endforeach; ?>

2
help/appinfo/app.php
View File

@ -4,7 +4,7 @@ OC_APP::register( array( "order" => 1, "id" => "help", "name" => "Help" ));
// Workaround for having help as the last entry always
$entry = array( "id" => "help", "order" => 1000, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "help", "help.png" ));
if( OC_GROUP::inGroup( $_SESSION["user_id"], "admin" )){
if( isset( $_SESSION["user_id"] ) && OC_GROUP::inGroup( $_SESSION["user_id"], "admin" )){
OC_APP::addAdminPage( $entry );
}
else{