updated the group handling + revised admin permissions

This commit is contained in:
SJ
2012-06-25 22:14:30 +02:00
parent 9900f0aed2
commit 095f22c7b2
25 changed files with 323 additions and 68 deletions

View File

@ -16,9 +16,12 @@
<script type="text/javascript" src="/view/javascript/jquery-1.7.1.min.js"></script>
<script type="text/javascript" src="/view/javascript/jquery-ui-1.8.13.custom.min.js"></script>
<script type="text/javascript" src="/view/javascript/jquery.dropdownPlain.js"></script>
<script type="text/javascript" src="/view/javascript/colorbox.js"></script>
<script type="text/javascript">
var piler_ui_lang = '<?php if(LANG == 'en') { ?>en-GB<?php } else { print LANG; } ?>';
var email_search_url = '<?php print SITE_URL; ?>/index.php?route=group/email&';
var group_search_url = '<?php print SITE_URL; ?>/index.php?route=group/group&';
</script>
<script type="text/javascript" src="/view/javascript/piler.js"></script>

View File

@ -12,13 +12,18 @@
</div>
<div class="domainrow">
<div class="domaincell"><?php print $text_email_addresses; ?>*:</div>
<div class="domaincell"><?php print $text_search_emails; ?>*:</div>
<div class="domaincell"><input type="text" id="s_piler_email" name="s_piler_email" value="<?php print $text_search_email_to_add; ?>" class="autocompletetext" onfocus="javascript:toggle_hint('s_piler_email', '<?php print $text_search_email_to_add; ?>', 1);" onblur="javascript:toggle_hint('s_piler_email', '<?php print $text_search_email_to_add; ?>', 0);" /></div>
</div>
<div class="domainrow">
<div class="domaincell"><?php print $text_email_addresses; ?>**:</div>
<div class="domaincell"><textarea style="height:280px;" name="email" id="email" class="domain"><?php if(isset($post['email'])){ print $post['email']; } ?></textarea></div>
</div>
<div class="domainrow">
<div class="domaincell">&nbsp;</div>
<div class="domaincell">*: <?php print $text_enter_one_email_address_per_line; ?></div>
<div class="domaincell">*: <?php print $text_min_2_chars; ?><br />**: <?php print $text_enter_one_email_address_per_line; ?></div>
</div>

View File

@ -10,17 +10,22 @@
<div class="domainrow">
<div class="domaincell"><?php print $text_groupname; ?>:</div>
<div class="domaincell"><input type="text" name="groupname" value="<?php print $group['groupname']; ?>" class="text" /></div>
<div class="domaincell"><input type="text" name="groupname" id="groupname" value="<?php print $group['groupname']; ?>" class="text" /></div>
</div>
<div class="domainrow">
<div class="domaincell"><?php print $text_email_addresses; ?>*:</div>
<div class="domaincell"><textarea style="height:280px;" name="email" class="domain"><?php if(isset($email)){ print $email; } ?></textarea></div>
<div class="domaincell"><?php print $text_search_emails; ?>*:</div>
<div class="domaincell"><input type="text" id="s_piler_email" name="s_piler_email" value="<?php print $text_search_email_to_add; ?>" class="autocompletetext" onfocus="javascript:toggle_hint('s_piler_email', '<?php print $text_search_email_to_add; ?>', 1);" onblur="javascript:toggle_hint('s_piler_email', '<?php print $text_search_email_to_add; ?>', 0);" /></div>
</div>
<div class="domainrow">
<div class="domaincell"><?php print $text_email_addresses; ?>**:</div>
<div class="domaincell"><textarea style="height:280px;" name="email" id="email" class="domain"><?php if(isset($email)){ print $email; } ?></textarea></div>
</div>
<div class="domainrow">
<div class="domaincell">&nbsp;</div>
<div class="domaincell">*: <?php print $text_enter_one_email_address_per_line; ?></div>
<div class="domaincell">*: <?php print $text_min_2_chars; ?><br />**: <?php print $text_enter_one_email_address_per_line; ?></div>
</div>
<div class="domainrow">
@ -33,6 +38,7 @@
</form>
<p>&nbsp;</p>
<p><a href="index.php?route=group/remove&amp;id=<?php print $group['id']; ?>&amp;group=<?php print $group['groupname']; ?>"><?php print $text_remove_this_group; ?>: <?php print $group['groupname']; ?></a></p>
<p>&nbsp;</p>

View File

@ -32,17 +32,14 @@
</div>
</div>
<div class="domainrow">
<div class="domaincell"><?php print $text_search_groups; ?>*:</div>
<div class="domaincell"><input type="text" id="s_piler_group" name="s_piler_group" value="<?php print $text_search_group_to_add; ?>" class="autocompletetext" onfocus="javascript:toggle_hint('s_piler_group', '<?php print $text_search_group_to_add; ?>', 1);" onblur="javascript:toggle_hint('s_piler_group', '<?php print $text_search_group_to_add; ?>', 0);" /></div>
</div>
<div class="domainrow">
<div class="domaincell"><?php print $text_groups; ?>:</div>
<div class="domaincell">
<select name="gid">
<option value="0"<?php if(isset($post) && $post['gid'] == 0){ ?> selected="selected"<?php } ?>>-</option>
<?php foreach ($groups as $group) { ?>
<option value="<?php print $group['id']; ?>"<?php if(isset($post) && $post['gid'] == $group['id']){ ?> selected="selected"<?php } ?>><?php print $group['groupname']; ?></option>
<?php } ?>
</select>
</div>
<div class="domaincell"><?php print $text_groups; ?>**:</div>
<div class="domaincell"><textarea style="height:80px;" name="group" id="group" class="domain"><?php if(isset($post['group'])){ print $post['group']; } ?></textarea></div>
</div>
@ -76,6 +73,11 @@
</div>
</div>
<div class="domainrow">
<div class="domaincell">&nbsp;</div>
<div class="domaincell">*: <?php print $text_min_2_chars; ?><br />**: <?php print $text_enter_one_group_per_line; ?></div>
</div>
<div class="domainrow">
<div class="domaincell">&nbsp;</div>
<div class="domaincell"><input type="submit" value="<?php print $text_add; ?>" /><input type="reset" value="<?php print $text_cancel; ?>" /></div>

View File

@ -35,17 +35,14 @@
</div>
<div class="domainrow">
<div class="domaincell"><?php print $text_groups; ?>:</div>
<div class="domaincell">
<select name="gid">
<option value="0"<?php if($user['gid'] == 0){ ?> selected="selected"<?php } ?>>-</option>
<?php foreach ($groups as $group) { ?>
<option value="<?php print $group['id']; ?>"<?php if($user['gid'] == $group['id']){ ?> selected="selected"<?php } ?>><?php print $group['groupname']; ?></option>
<?php } ?>
</select>
</div>
<div class="domaincell"><?php print $text_search_groups; ?>*:</div>
<div class="domaincell"><input type="text" id="s_piler_group" name="s_piler_group" value="<?php print $text_search_group_to_add; ?>" class="autocompletetext" onfocus="javascript:toggle_hint('s_piler_group', '<?php print $text_search_group_to_add; ?>', 1);" onblur="javascript:toggle_hint('s_piler_group', '<?php print $text_search_group_to_add; ?>', 0);" /></div>
</div>
<div class="domainrow">
<div class="domaincell"><?php print $text_groups; ?>**:</div>
<div class="domaincell"><textarea style="height:80px;" name="group" id="group" class="domain"><?php if(isset($user['group'])){ print $user['group']; } ?></textarea></div>
</div>
<?php if(ENABLE_LDAP_IMPORT_FEATURE == 1) { ?>
<div class="domainrow">
@ -90,6 +87,11 @@
</div>
</div>
<div class="domainrow">
<div class="domaincell">&nbsp;</div>
<div class="domaincell">*: <?php print $text_min_2_chars; ?><br />**: <?php print $text_enter_one_group_per_line; ?></div>
</div>
<div class="domainrow">
<div class="domaincell">&nbsp;</div>
<div class="domaincell"><input type="submit" value="<?php print $text_modify; ?>" /><input type="reset" value="<?php print $text_cancel; ?>" /></div>