mirror of
https://bitbucket.org/jsuto/piler.git
synced 2025-07-01 23:13:17 +02:00
Commit of UI changes:
- Enhanced delete function for users and domains (soon for all) - Fixed NavBar/Search bar quirks for smaller screens - Fixed Functions Row display for smaller screens, generally cleaner look Tested on IE8-10 (with IE Tester), latest versions of Firefox, Chrome. Will soon test on Android and Apple devices.
This commit is contained in:
Remi S
@ -12,50 +12,55 @@
|
||||
|
||||
<form action="index.php?route=user/add" name="adduser" method="post" autocomplete="off" class="form-horizontal">
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['email'])){ print " error"; } ?>">
|
||||
<input type="hidden" name="uid" value="<?php print $next_user_id; ?>" />
|
||||
<label class="control-label" for="email"><?php print $text_email_addresses; ?>:</label>
|
||||
<div class="controls">
|
||||
<textarea name="email"><?php if(isset($post['email'])){ print $post['email']; } ?></textarea>
|
||||
<textarea name="email" id="email"><?php if(isset($post['email'])){ print $post['email']; } ?></textarea>
|
||||
<?php if ( isset($errors['email']) ) { ?><span class="help-inline"><?php print $errors['email']; ?></span><?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['username'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="username"><?php print $text_username; ?>:</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="username" value="<?php if(isset($post['username'])){ print $post['username']; } ?>" class="text" />
|
||||
<input type="text" name="username" id="username" <?php if(isset($post['username'])){ print 'value="'.$post['username'].'" '; } ?>class="text" />
|
||||
<?php if ( isset($errors['username']) ) { ?><span class="help-inline"><?php print $errors['username']; ?></span><?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['realname'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="realname"><?php print $text_realname; ?>:</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="realname" value="<?php if(isset($post['realname'])){ print $post['realname']; } ?>" class="text" />
|
||||
<input type="text" name="realname" id="realname" <?php if(isset($post['realname'])){ print 'value="'.$post['realname'].'" '; } ?>class="text" />
|
||||
<?php if ( isset($errors['realname']) ) { ?><span class="help-inline"><?php print $errors['realname']; ?></span><?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['domain'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="domain"><?php print $text_domain; ?>:</label>
|
||||
<div class="controls">
|
||||
<select name="domain">
|
||||
<select name="domain" id="domain">
|
||||
<?php asort($domains); foreach ($domains as $domain) { ?>
|
||||
<option value="<?php if(is_array($domain)){ print $domain['mapped']; } else { print $domain; } ?>"<?php if( (isset($post) && $domain == $post['domain']) || (!isset($post) && isset($_SESSION['last_domain']) && $domain == $_SESSION['last_domain']) ){ ?> selected="selected"<?php } ?>><?php if(is_array($domain)){ print $domain['mapped']; } else { print $domain; } ?></option>
|
||||
<?php } ?>
|
||||
</select>
|
||||
<?php if ( isset($errors['domain']) ) { ?><span class="help-inline"><?php print $errors['domain']; ?></span><?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="s_piler_domains"><?php print $text_search_domains; ?>*:</label>
|
||||
<div class="controls">
|
||||
<input type="text" id="s_piler_domain" name="s_piler_domain" placeholder="<?php print $text_search_domain_to_add; ?>" class="autocompletetext" />
|
||||
<input type="text" id="s_piler_domains" name="s_piler_domains" placeholder="<?php print $text_search_domain_to_add; ?>" class="autocompletetext" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="group"><?php print $text_domains; ?>**:</label>
|
||||
<div class="control-group<?php if(isset($errors['domains'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="domains"><?php print $text_domains; ?>**:</label>
|
||||
<div class="controls">
|
||||
<textarea style="height:80px;" name="domains" id="domains"><?php if(isset($post['domains'])){ print $post['domains']; } ?></textarea>
|
||||
<?php if ( isset($errors['domains']) ) { ?><span class="help-inline"><?php print $errors['domains']; ?></span><?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -66,10 +71,11 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['group'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="group"><?php print $text_groups; ?>**:</label>
|
||||
<div class="controls">
|
||||
<textarea style="height:80px;" name="group" id="group"><?php if(isset($post['group'])){ print $post['group']; } ?></textarea>
|
||||
<?php if ( isset($errors['group']) ) { ?><span class="help-inline"><?php print $errors['group']; ?></span><?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -80,40 +86,45 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['folder'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="folder"><?php print $text_folders; ?>**:</label>
|
||||
<div class="controls">
|
||||
<textarea style="height:80px;" name="folder" id="folder"><?php if(isset($post['folder'])){ print $post['folder']; } ?></textarea>
|
||||
<?php if ( isset($errors['folder']) ) { ?><span class="help-inline"><?php print $errors['folder']; ?></span><?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php if(ENABLE_LDAP_IMPORT_FEATURE == 1) { ?>
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['dn'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="dn">LDAP DN:</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="dn" value="<?php if(isset($post['dn'])){ print $post['dn']; } ?>" class="text" /><br /> (<?php print $text_dn_asterisk_means_skip_sync; ?>)
|
||||
<input type="text" name="dn" id="dn" <?php if(isset($post['dn'])){ print 'value="'.$post['dn'].'" '; } ?>class="text" />
|
||||
<?php if ( isset($errors['dn']) ) { ?><span class="help-inline"><?php print $errors['dn']; ?></span><?php } ?>
|
||||
<br /> (<?php print $text_dn_asterisk_means_skip_sync; ?>)
|
||||
</div>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['password'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="password"><?php print $text_password; ?>:</label>
|
||||
<div class="controls">
|
||||
<input type="password" name="password" value="" class="text" />
|
||||
<input type="password" name="password" id="password" value="" class="text" />
|
||||
<?php if ( isset($errors['password']) ) { ?><span class="help-inline"><?php print $errors['password']; ?></span><?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['password2'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="password2"><?php print $text_password_again; ?>:</label>
|
||||
<div class="controls">
|
||||
<input type="password" name="password2" value="" class="text" />
|
||||
<input type="password" name="password2" id="password2" value="" class="text" />
|
||||
<?php if ( isset($errors['password2']) ) { ?><span class="help-inline"><?php print $errors['password2']; ?></span><?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="isadmin"><?php print $text_admin_user; ?>:</label>
|
||||
<div class="controls">
|
||||
<select name="isadmin">
|
||||
<select name="isadmin" id="isadmin">
|
||||
<option value="0"<?php if(isset($post['isadmin']) && $post['isadmin'] == 0){ ?> selected="selected"<?php } ?>><?php print $text_user_regular; ?></option>
|
||||
<?php if(Registry::get('admin_user') == 1) { ?><option value="1"<?php if(isset($post['isadmin']) && $post['isadmin'] == 1){ ?> selected="selected"<?php } ?>><?php print $text_user_masteradmin; ?></option><?php } ?>
|
||||
<option value="2"<?php if(isset($post['isadmin']) && $post['isadmin'] == 2){ ?> selected="selected"<?php } ?>><?php print $text_user_auditor; ?></option>
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
<div id="deleteconfirm-modal" class="modal hide fade">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" role="dialog" aria-hidden="true"><i class="icon-remove"></i></button>
|
||||
<h3><?php print $text_confirm; ?> <?php print $text_delete; ?></h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p><?php print $text_user_delete_confirm_message; ?> <span id="name">ERROR</span>?</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<a href="#" class="btn" data-dismiss="modal" aria-hidden="true"><?php print $text_close; ?></a>
|
||||
<a href="index.php?route=user/remove&id=-1&name=Error&confirmed=0" class="btn btn-primary" id="id"><?php print $text_delete; ?></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<?php if(isset($errorstring)){ ?><div class="alert alert-danger"><?php print $text_error; ?>: <?php print $errorstring; ?></div><?php } ?>
|
||||
|
||||
@ -8,32 +21,35 @@
|
||||
|
||||
<?php } elseif(isset($user)) { ?>
|
||||
|
||||
<p><a href="index.php?route=user/list"><i class="icon-circle-arrow-left"></i> <?php print $text_back; ?></a> | <a href="index.php?route=user/remove&uid=<?php print $user['uid']; ?>&user=<?php print $user['username']; ?>"><i class="icon-remove-sign"></i> <?php print $text_remove_this_user; ?>: <?php print $user['username']; ?></a></p>
|
||||
<p><a href="index.php?route=user/list"><i class="icon-circle-arrow-left"></i> <?php print $text_back; ?></a> | <a href="index.php?route=user/remove&id=<?php print $user['uid']; ?>&user=<?php print $user['username']; ?>" class="confirm-delete" data-id="<?php print $user['uid']; ?>" data-name="<?php print $user['realname']; ?>"><i class="icon-remove-sign"></i> <?php print $text_remove_this_user; ?>: <?php print $user['username']; ?></a></p>
|
||||
|
||||
<form action="index.php?route=user/edit" name="edituser" method="post" autocomplete="off" class="form-horizontal">
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['email'])){ print " error"; } ?>">
|
||||
<input type="hidden" name="uid" value="<?php print $uid; ?>" />
|
||||
<label class="control-label" for="email"><?php print $text_email_addresses; ?>:</label>
|
||||
<div class="controls">
|
||||
<textarea name="email"><?php print $emails; ?></textarea>
|
||||
<?php if ( isset($errors['email']) ) { ?><span class="help-inline"><?php print $errors['email']; ?></span><?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['username'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="username"><?php print $text_username; ?>:</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="username" value="<?php print $user['username']; ?>" class="text" />
|
||||
<?php if ( isset($errors['username']) ) { ?><span class="help-inline"><?php print $errors['username']; ?></span><?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['realname'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="realname"><?php print $text_realname; ?>:</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="realname" value="<?php print $user['realname']; ?>" class="text" />
|
||||
<?php if ( isset($errors['realname']) ) { ?><span class="help-inline"><?php print $errors['realname']; ?></span><?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['domain'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="domain"><?php print $text_domain; ?>:</label>
|
||||
<div class="controls">
|
||||
<select name="domain">
|
||||
@ -51,7 +67,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['domains'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="group"><?php print $text_domains; ?>**:</label>
|
||||
<div class="controls">
|
||||
<textarea style="height:80px;" name="domains" id="domains"><?php if(isset($user['domains'])){ print $user['domains']; } ?></textarea>
|
||||
@ -65,7 +81,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['group'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="group"><?php print $text_groups; ?>**:</label>
|
||||
<div class="controls">
|
||||
<textarea style="height:80px;" name="group" id="group"><?php if(isset($user['group'])){ print $user['group']; } ?></textarea>
|
||||
@ -79,7 +95,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['folder'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="folder"><?php print $text_folders; ?>**:</label>
|
||||
<div class="controls">
|
||||
<textarea style="height:80px;" name="folder" id="folder"><?php if(isset($user['folder'])){ print $user['folder']; } ?></textarea>
|
||||
@ -87,7 +103,7 @@
|
||||
</div>
|
||||
|
||||
<?php if(ENABLE_LDAP_IMPORT_FEATURE == 1) { ?>
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['dn'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="dn">LDAP DN:</label>
|
||||
<div class="controls">
|
||||
<input type="text" name="dn" value="<?php print $user['dn']; ?>" class="text" /><br /> (<?php print $text_dn_asterisk_means_skip_sync; ?>)
|
||||
@ -95,14 +111,14 @@
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['password'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="password"><?php print $text_password; ?>:</label>
|
||||
<div class="controls">
|
||||
<input type="password" name="password" value="" class="text" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="control-group">
|
||||
<div class="control-group<?php if(isset($errors['password2'])){ print " error"; } ?>">
|
||||
<label class="control-label" for="password2"><?php print $text_password_again; ?>:</label>
|
||||
<div class="controls">
|
||||
<input type="password" name="password2" value="" class="text" />
|
||||
|
||||
@ -1,3 +1,17 @@
|
||||
<div id="deleteconfirm-modal" class="modal hide fade">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" role="dialog" aria-hidden="true"><i class="icon-remove"></i></button>
|
||||
<h3><?php print $text_confirm; ?> <?php print $text_delete; ?></h3>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<p><?php print $text_user_delete_confirm_message; ?> <span id="name">ERROR</span>?</p>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<a href="#" class="btn" data-dismiss="modal" aria-hidden="true"><?php print $text_close; ?></a>
|
||||
<a href="index.php?route=user/remove&id=-1&name=Error&confirmed=0" class="btn btn-primary" id="id"><?php print $text_delete; ?></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form method="post" name="search1" action="index.php?route=user/list" class="form-inline pull-right">
|
||||
<div class="input-append">
|
||||
<input type="text" name="search" class="input-medium" value="<?php print $search; ?>" />
|
||||
@ -9,7 +23,7 @@
|
||||
|
||||
<h4><?php print $text_existing_users; ?></h4>
|
||||
|
||||
<?php if(isset($users)){ ?>
|
||||
<?php if(isset($users) && is_array($users)){ ?>
|
||||
|
||||
<div id="pagenav">
|
||||
<?php if($page > 0){ ?><a href="index.php?route=user/list&page=0&search=<?php print $search; ?>&sort=<?php print $sort; ?>&order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-double-angle-left"></i><?php if($page > 0){ ?></a><?php } ?>
|
||||
@ -25,17 +39,20 @@
|
||||
|
||||
<table class="table table-striped table-condensed" id="ss1">
|
||||
<tr class="domainrow">
|
||||
<th><?php print $text_realname; ?> <a href="index.php?route=user/list&sort=realname&order=0"><i class="icon-chevron-up"></i> <a href="index.php?route=user/list&sort=realname&order=1"><i class="icon-chevron-down"></i></a></th>
|
||||
<th><?php print $text_email; ?> <a href="index.php?route=user/list&sort=email&order=0"><i class="icon-chevron-up"></i> <a href="index.php?route=user/list&sort=email&order=1"><i class="icon-chevron-down"></i></a></th>
|
||||
<th><?php print $text_role; ?> <a href="index.php?route=user/list&sort=role&order=0"><i class="icon-chevron-up"></i> <a href="index.php?route=user/list&sort=role&order=1"><i class="icon-chevron-down"></i></a></th>
|
||||
<th><?php print $text_realname; ?> <a href="index.php?route=user/list&sort=realname&order=0<?php print $querystring; ?>"><i class="icon-chevron-up"></i> <a href="index.php?route=user/list&sort=realname&order=1<?php print $querystring; ?>"><i class="icon-chevron-down"></i></a></th>
|
||||
<th><?php print $text_username; ?> <a href="index.php?route=user/list&sort=username&order=0<?php print $querystring; ?>"><i class="icon-chevron-up"></i> <a href="index.php?route=user/list&sort=username&order=1<?php print $querystring; ?>"<?php print $querystring; ?>><i class="icon-chevron-down"></i></a></th>
|
||||
<th><?php print $text_email; ?> <a href="index.php?route=user/list&sort=email&order=0"><i class="icon-chevron-up"></i> <a href="index.php?route=user/list&sort=email&order=1<?php print $querystring; ?>"><i class="icon-chevron-down"></i></a></th>
|
||||
<th><?php print $text_role; ?> <a href="index.php?route=user/list&sort=role&order=0"><i class="icon-chevron-up"></i> <a href="index.php?route=user/list&sort=role&order=1<?php print $querystring; ?>"><i class="icon-chevron-down"></i></a></th>
|
||||
<th> </th>
|
||||
<th> </th>
|
||||
</tr>
|
||||
|
||||
<?php foreach($users as $user) { ?>
|
||||
<tr class="domainrow">
|
||||
<td class="domaincell"><?php print $user['realname']; ?></td>
|
||||
<td class="domaincell"><?php if($user['email'] != $user['shortemail']){ ?><span><?php print $user['shortemail']; ?></span><?php } else { print $user['email']; } ?></td>
|
||||
<td class="domaincell">
|
||||
<td><?php print $user['realname']; ?></td>
|
||||
<td><?php print $user['username']; ?></td>
|
||||
<td><?php if($user['email'] != $user['shortemail']){ ?><span><?php print $user['shortemail']; ?></span><?php } else { print $user['email']; } ?></td>
|
||||
<td>
|
||||
<?php
|
||||
if($user['isadmin'] == 0){ print $text_user_regular; }
|
||||
if($user['isadmin'] == 1){ print $text_user_masteradmin; }
|
||||
@ -43,13 +60,13 @@
|
||||
if($user['isadmin'] == 3){ print $text_user_read_only_admin; }
|
||||
?>
|
||||
</td>
|
||||
<td class="domaincell"><a href="index.php?route=user/edit&uid=<?php print $user['uid']; ?>"><?php print $text_edit_or_view; ?></a></td>
|
||||
<td><a href="index.php?route=user/edit&uid=<?php print $user['uid']; ?>"><i class="icon-edit"></i> <?php print $text_edit_or_view; ?></a></td>
|
||||
<td><a href="index.php?route=user/remove&id=<?php print $user['uid']; ?>&user=<?php print $user['username']; ?>" class="confirm-delete" data-id="<?php print $user['uid']; ?>" data-name="<?php print $user['realname']; ?>"><i class="icon-remove-sign"></i> Delete</a></td>
|
||||
</tr>
|
||||
<?php } ?>
|
||||
|
||||
</table>
|
||||
|
||||
|
||||
<div id="pagenav">
|
||||
<?php if($page > 0){ ?><a href="index.php?route=user/list&page=0&search=<?php print $search; ?>&sort=<?php print $sort; ?>&order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-double-angle-left"></i><?php if($page > 0){ ?></a><?php } ?>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user