bashclub/piler
1
0
Fork 0
mirror of https://bitbucket.org/jsuto/piler.git synced 2025-06-13 00:07:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

updated the group handling + revised admin permissions

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

52
webui/view/javascript/piler.js
View File

@ -523,3 +523,55 @@ $(document).ready(function() {
});
$(function() {
$("#s_piler_email").autocomplete({
source: email_search_url,
minLength: 2,
select: function( event, ui ) {
if(ui.item){
var prefix = '\n';
var a = document.getElementById("email");
if(a && a.value == '') prefix = '';
$('#email').val($('#email').val() + prefix + ui.item.value);
}
ui.item.value = '';
}
});
$("#s_piler_group").autocomplete({
source: group_search_url,
minLength: 2,
select: function( event, ui ) {
if(ui.item){
var prefix = '\n';
var a = document.getElementById("group");
if(a && a.value == '') prefix = '';
$('#group').val($('#group').val() + prefix + ui.item.value);
}
ui.item.value = '';
}
});
});
function toggle_hint(id, s, focus) {
if(focus == 1){
if(document.getElementById(id).value == s) document.getElementById(id).value = '';
}
else {
if(document.getElementById(id).value == '') document.getElementById(id).value = s;
}
}

1
webui/view/theme/default/stylesheet/style-default.css
View File

@ -65,6 +65,7 @@
.restore_spinner { text-align: center; border: 0px solid black; }
.text { font: normal 12px Arial, sans-serif; font-weight: bold; text-align:left; width: 408px; }
.autocompletetext { font: normal 12px Arial, sans-serif; font-style: italic; color: gray; font-weight: bold; text-align:left; width: 408px; }
.ruletext { font: normal 12px Arial, sans-serif; font-weight: bold; text-align:left; width: 365px; }
.advtext { font: bold 12px Arial, sans-serif; font-weight: bold; text-align:left; width: 280px; }
.tagtext { font: normal 10px Arial, sans-serif; font-weight: bold; text-align:left; width: 265px; }

3
webui/view/theme/default/templates/common/layout.tpl
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>

9
webui/view/theme/default/templates/group/add.tpl
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>

14
webui/view/theme/default/templates/group/edit.tpl
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>

20
webui/view/theme/default/templates/user/add.tpl
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>

20
webui/view/theme/default/templates/user/edit.tpl
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>