merging new gui part #1

This commit is contained in:
SJ
2013-04-05 10:16:33 +02:00
parent 38f1ba579f
commit b428783ce9
208 changed files with 5880 additions and 1654 deletions

View File

@ -1,49 +1,55 @@
<?php if(isset($errorstring)){ ?><p class="text-error bold"><?php print $text_error; ?>: <?php print $errorstring; ?></p><?php } ?>
<?php if(isset($errorstring)){ ?><div class="alert alert-danger"><?php print $text_error; ?>: <?php print $errorstring; ?></div><?php } ?>
<?php if(isset($x)){ ?>
<form action="index.php?route=group/add" name="adduser" method="post" autocomplete="off">
<div class="alert alert-success"><?php print $x; ?>.</div>
<p><a href="index.php?route=group/list"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a></p>
<div id="ss1">
<?php } else { ?>
<div class="domainrow">
<div class="domaincell"><?php print $text_groupname; ?>:</div>
<div class="domaincell"><input type="text" name="groupname" value="<?php if(isset($post['groupname'])){ print $post['groupname']; } ?>" class="span5" /></div>
</div>
<p><a href="index.php?route=group/list"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a></p>
<div class="domainrow">
<div class="domaincell"><?php print $text_search_emails; ?>*:</div>
<div class="domaincell"><input type="text" id="s_piler_email" name="s_piler_email" placeholder="<?php print $text_search_email_to_add; ?>" class="span5" /></div>
</div>
<form action="index.php?route=group/add" name="addgroup" method="post" autocomplete="off" class="form-horizontal">
<div class="domainrow">
<div class="domaincell"><?php print $text_email_addresses; ?>**:</div>
<div class="domaincell"><textarea style="height:280px;" name="email" id="email" class="span5"><?php if(isset($post['email'])){ print $post['email']; } ?></textarea></div>
<div class="domaincell">
<?php foreach(Registry::get('letters') as $letter) { ?>
<div class="control-group">
<label class="control-label" for="groupname"><?php print $text_groupname; ?>:</label>
<div class="controls">
<input type="text" name="groupname" id="groupname" value="<?php if(isset($post['groupname'])){ print $post['groupname']; } ?>" class="text" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="s_piler_email"><?php print $text_search_emails; ?>*:</label>
<div class="controls">
<input type="text" id="s_piler_email" name="s_piler_email" placeholder="<?php print $text_search_email_to_add; ?>" class="autocompletetext" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="throwaway"><?php print $text_select_letter; ?>:</label>
<div class="controls">
<?php foreach(Registry::get('letters') as $letter) { ?>
<a href="#" onclick="window.open('<?php print SITE_URL; ?>index.php?route=group/email&term=<?php print $letter; ?>', 'aaa', 'width=300,height=400');" ><?php print $letter; ?></a>
<?php } ?>
</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_email_address_per_line; ?></div>
</div>
<div class="domainrow">
<div class="domaincell">&nbsp;</div>
<div class="domaincell"><input type="submit" class="btn btn-primary" value="<?php print $text_add; ?>" /><input type="reset" class="btn" value="<?php print $text_cancel; ?>" /></div>
</div>
</div>
</div>
</div>
<div class="control-group">
<label class="control-label" for="s_piler_email"><?php print $text_email_addresses; ?>**:</label>
<div class="controls">
<textarea style="height:280px;" name="email" id="email" class="domain"><?php if(isset($post['email'])){ print $post['email']; } ?></textarea>
</div>
</div>
<div class="alert alert-info">*: <?php print $text_min_2_chars; ?><br />**: <?php print $text_enter_one_email_address_per_line; ?></div>
<div class="form-actions">
<input type="submit" id="button_add" class="btn btn-primary" value="<?php print $text_add; ?>" />
<a href="index.php?route=group/list" class="btn"><?php print $text_cancel; ?></a>
</div>
</form>
<?php if(isset($x)){ print $x; ?>. <a href="index.php?route=group/list"><?php print $text_back; ?></a>
<?php } ?>

View File

@ -1,54 +1,55 @@
<?php if(isset($errorstring)){ ?><p class="text-error bold"><?php print $text_error; ?>: <?php print $errorstring; ?></p><?php } ?>
<?php if(isset($errorstring)){ ?><div class="alert alert-danger"><?php print $text_error; ?>: <?php print $errorstring; ?></div><?php } ?>
<?php if(isset($group)) { ?>
<?php if(isset($x)){ ?>
<form action="index.php?route=group/edit" name="addgroup" method="post" autocomplete="off">
<div class="alert alert-success"><?php print $x; ?>.</div>
<p><a href="index.php?route=group/list"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a></p>
<?php } elseif(isset($group)) { ?>
<p><a href="index.php?route=group/list"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a> | <a href="index.php?route=group/remove&amp;id=<?php print $group['id']; ?>&amp;group=<?php print $group['groupname']; ?>"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove_this_group; ?>: <?php print $group['groupname']; ?></a></p>
<form action="index.php?route=group/edit" name="addgroup" method="post" autocomplete="off" class="form-horizontal">
<input type="hidden" name="id" value="<?php print $id; ?>" />
<div id="ss1">
<div class="control-group">
<label class="control-label" for="groupname"><?php print $text_groupname; ?>:</label>
<div class="controls">
<input type="text" name="groupname" id="groupname" value="<?php print $group['groupname']; ?>" class="text" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="s_piler_email"><?php print $text_search_emails; ?>*:</label>
<div class="controls">
<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_groupname; ?>:</div>
<div class="domaincell"><input type="text" name="groupname" id="groupname" value="<?php print $group['groupname']; ?>" class="span5" /></div>
</div>
<div class="domainrow">
<div class="domaincell"><?php print $text_search_emails; ?>*:</div>
<div class="domaincell"><input type="text" id="s_piler_email" name="s_piler_email" placeholder="<?php print $text_search_email_to_add; ?>" class="span5" /></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="span5"><?php if(isset($email)){ print $email; } ?></textarea></div>
<div class="domaincell">
<?php foreach(Registry::get('letters') as $letter) { ?>
<div class="control-group">
<label class="control-label" for="throwaway"><?php print $text_select_letter; ?>:</label>
<div class="controls">
<?php foreach(Registry::get('letters') as $letter) { ?>
<a href="#" onclick="window.open('<?php print SITE_URL; ?>index.php?route=group/email&term=<?php print $letter; ?>', 'aaa', 'width=300,height=400');" ><?php print $letter; ?></a>
<?php } ?>
</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_email_address_per_line; ?></div>
</div>
<div class="domainrow">
<div class="domaincell">&nbsp;</div>
<div class="domaincell"><input type="submit" class="btn btn-primary" value="<?php print $text_modify; ?>" /><input type="reset" class="btn" value="<?php print $text_cancel; ?>" /></div>
</div>
</div>
</div>
</div>
<div class="control-group">
<label class="control-label" for="groupname"><?php print $text_email_addresses; ?>**:</label>
<div class="controls">
<textarea style="height:280px;" name="email" id="email" class="domain"><?php if(isset($email)){ print $email; } ?></textarea>
</div>
</div>
<div class="alert alert-info">*: <?php print $text_min_2_chars; ?><br />**: <?php print $text_enter_one_email_address_per_line; ?></div>
<div class="form-actions">
<input type="submit" id="button_edit" class="btn btn-primary" value="<?php print $text_modify; ?>" />
<a href="index.php?route=group/list" class="btn"><?php print $text_cancel; ?></a>
</div>
</form>
<p>&nbsp;</p>
<p>
<?php } else if(isset($x)){ print $x; ?>.
<?php } ?>
<a href="index.php?route=group/list"><?php print $text_back; ?></a>
</p>
<?php } ?>

View File

@ -1,16 +1,19 @@
<table class="table table-striped table-condensed">
<?php foreach($emails as $email) { ?>
<a href="#" onclick="append_value_from_slider('email', '<?php print $email['email']; ?>');"><?php print $email['email']; ?></a><br />
<tr><td><a href="#" onclick="append_value_from_slider('email', '<?php print $email['email']; ?>');"><?php print $email['email']; ?></a></td></tr>
<?php } ?>
</table>
<div id="pagenav">
<?php if($page > 0){ ?><a href="index.php?route=group/email&amp;page=0&amp;term=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &laquo; <?php if($page > 0){ ?></a><?php } ?>
<?php if($page > 0){ ?><a href="index.php?route=group/email&amp;page=<?php print $prev_page; ?>&amp;term=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &lsaquo; <?php if($page > 0){ ?></a><?php } ?>
<?php if($page > 0){ ?><a href="index.php?route=group/email&amp;page=0&amp;term=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-double-angle-left"></i><?php if($page > 0){ ?></a><?php } ?>
&nbsp;
<?php if($page > 0){ ?><a href="index.php?route=group/email&amp;page=<?php print $prev_page; ?>&amp;term=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-angle-left"></i><?php if($page > 0){ ?></a><?php } ?>
&nbsp;
<?php if(count($emails) > 0) { print $emails[0][$sort]; ?> - <?php print $emails[count($emails)-1][$sort]; } ?>
<?php if($total >= $page_len*($page+1) && $total > $page_len){ ?><a href="index.php?route=group/email&amp;page=<?php print $next_page; ?>&amp;term=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &rsaquo; <?php if($total >= $page_len*($page+1) && $total > $page_len){ ?></a><?php } ?>
<?php if($page < $total_pages){ ?><a href="index.php?route=group/email&amp;page=<?php print $total_pages; ?>&amp;term=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &raquo; <?php if($page < $total_pages){ ?></a><?php } ?>
&nbsp;
<?php if($total >= $page_len*($page+1) && $total > $page_len){ ?><a href="index.php?route=group/email&amp;page=<?php print $next_page; ?>&amp;term=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-angle-right"></i><?php if($total >= $page_len*($page+1) && $total > $page_len){ ?></a><?php } ?>
&nbsp;
<?php if($page < $total_pages){ ?><a href="index.php?route=group/email&amp;page=<?php print $total_pages; ?>&amp;term=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-double-angle-right"></i><?php if($page < $total_pages){ ?></a><?php } ?>
</div>
<div style="margin-top: 20px;"><a href="#" onclick="window.close();">close</a></div>
<div style="margin-top: 20px;"><a href="#" onclick="window.close();"><i class="icon-remove-sign"></i>&nbsp;close</a></div>

View File

@ -1,59 +1,63 @@
<form method="post" name="search1" action="index.php?route=group/list" class="form-inline pull-right">
<div class="input-append">
<input type="text" name="search" class="input-medium" value="<?php print $search; ?>" />
<input type="submit" class="btn" value="<?php print $text_search; ?>" />
</div>
</form>
<p/>
<p><a href="index.php?route=group/add"><?php print $text_add_new_group; ?></a></p>
<p><a href="index.php?route=group/add"><i class="icon-plus"></i>&nbsp;<?php print $text_add_new_group; ?></a></p>
<h4><?php print $text_existing_groups; ?></h4>
<form method="post" name="search1" class="form-search" action="index.php?route=group/list">
<input type="text" name="search" value="<?php print $search; ?>" />
<input type="submit" class="btn btn-primary" value="<?php print $text_search; ?>" />
</form>
<p>&nbsp;</p>
<?php if(isset($groups) && count($groups) > 0){ ?>
<div id="pagenav">
<?php if($page > 0){ ?><a href="index.php?route=group/list&amp;page=0&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &laquo; <?php if($page > 0){ ?></a><?php } ?>
<?php if($page > 0){ ?><a href="index.php?route=group/list&amp;page=<?php print $prev_page; ?>&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &lsaquo; <?php if($page > 0){ ?></a><?php } ?>
<?php print $groups[0][$sort]; ?> - <?php print $groups[count($groups)-1][$sort]; ?>
<?php if($total_groups >= $page_len*($page+1) && $total_groups > $page_len){ ?><a href="index.php?route=group/list&amp;page=<?php print $next_page; ?>&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &rsaquo; <?php if($total_groups >= $page_len*($page+1) && $total_groups > $page_len){ ?></a><?php } ?>
<?php if($page < $total_pages){ ?><a href="index.php?route=group/list&amp;page=<?php print $total_pages; ?>&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &raquo; <?php if($page < $total_pages){ ?></a><?php } ?>
<div class="pagenav">
<?php if($page > 0){ ?><a href="index.php?route=group/list&amp;page=0&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-double-angle-left"></i><?php if($page > 0){ ?></a><?php } ?>
&nbsp;
<?php if($page > 0){ ?><a href="index.php?route=group/list&amp;page=<?php print $prev_page; ?>&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-angle-left"></i><?php if($page > 0){ ?></a><?php } ?>
&nbsp;
<?php print $groups[0][$sort]; ?> - <?php print $groups[count($groups)-1][$sort]; ?>
&nbsp;
<?php if($total_groups >= $page_len*($page+1) && $total_groups > $page_len){ ?><a href="index.php?route=group/list&amp;page=<?php print $next_page; ?>&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-angle-right"></i><?php if($total_groups >= $page_len*($page+1) && $total_groups > $page_len){ ?></a><?php } ?>
&nbsp;
<?php if($page < $total_pages){ ?><a href="index.php?route=group/list&amp;page=<?php print $total_pages; ?>&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-double-angle-right"></i><?php if($page < $total_pages){ ?></a><?php } ?>
</div>
<div id="ss1">
<div class="domainrow">
<div class="domaincell"><?php print $text_groupname; ?> <a href="index.php?route=group/list&amp;sort=groupname&amp;order=0"><img src="<?php print ICON_ARROW_UP; ?>" border="0"></a> <a href="index.php?route=group/list&amp;sort=groupname&amp;order=1"><img src="<?php print ICON_ARROW_DOWN; ?>" border="0"></a></div>
<div class="domaincell">&nbsp;</div>
<div class="domaincell">&nbsp;</div>
</div>
<table class="table table-striped table-condensed" id="ss1">
<thead>
<tr class="domainrow">
<th class="domaincell"><?php print $text_groupname; ?> <a href="index.php?route=group/list&amp;sort=groupname&amp;order=0"><i class="icon-chevron-up"></i></a>&nbsp;<a href="index.php?route=group/list&amp;sort=groupname&amp;order=1"><i class="icon-chevron-down"></i></a></th>
<th class="domaincell">&nbsp;</th>
</tr>
</thead>
<tbody>
<?php foreach($groups as $group) { ?>
<div class="domainrow">
<div class="domaincell"><?php print $group['groupname']; ?></div>
<div class="domaincell"><a href="index.php?route=group/edit&amp;id=<?php print $group['id']; ?>"><?php print $text_edit_or_view; ?></a></div>
<div class="domaincell"><a href="index.php?route=group/remove&amp;confirmed=1&amp;id=<?php print $group['id']; ?>" onclick="if(confirm('<?php print $text_remove_this_group; ?>: ' + '\'<?php print $group['groupname']; ?>\'')) return true; return false;"><?php print $text_remove; ?></a></div>
</div>
<tr class="domainrow">
<td class="domaincell"><?php print $group['groupname']; ?></td>
<td class="domaincell"><a href="index.php?route=group/edit&amp;id=<?php print $group['id']; ?>"><?php print $text_edit_or_view; ?></a></td>
</tr>
<?php } ?>
</tbody>
</table>
</div>
<div id="pagenav">
<?php if($page > 0){ ?><a href="index.php?route=group/list&amp;page=0&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &laquo; <?php if($page > 0){ ?></a><?php } ?>
<?php if($page > 0){ ?><a href="index.php?route=group/list&amp;page=<?php print $prev_page; ?>&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &lsaquo; <?php if($page > 0){ ?></a><?php } ?>
<?php print $groups[0][$sort]; ?> - <?php print $groups[count($groups)-1][$sort]; ?>
<?php if($total_groups >= $page_len*($page+1) && $total_groups > $page_len){ ?><a href="index.php?route=group/list&amp;page=<?php print $next_page; ?>&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &rsaquo; <?php if($total_groups >= $page_len*($page+1) && $total_groups > $page_len){ ?></a><?php } ?>
<?php if($page < $total_pages){ ?><a href="index.php?route=group/list&amp;page=<?php print $total_pages; ?>&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?> &raquo; <?php if($page < $total_pages){ ?></a><?php } ?>
<div class="pagenav">
&nbsp;
<?php if($page > 0){ ?><a href="index.php?route=group/list&amp;page=0&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-double-angle-left"></i><?php if($page > 0){ ?></a><?php } ?>
&nbsp;
<?php if($page > 0){ ?><a href="index.php?route=group/list&amp;page=<?php print $prev_page; ?>&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-angle-left"></i><?php if($page > 0){ ?></a><?php } ?>
&nbsp;
<?php print $groups[0][$sort]; ?> - <?php print $groups[count($groups)-1][$sort]; ?>
&nbsp;
<?php if($total_groups >= $page_len*($page+1) && $total_groups > $page_len){ ?><a href="index.php?route=group/list&amp;page=<?php print $next_page; ?>&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-angle-right"></i><?php if($total_groups >= $page_len*($page+1) && $total_groups > $page_len){ ?></a><?php } ?>
&nbsp;
<?php if($page < $total_pages){ ?><a href="index.php?route=group/list&amp;page=<?php print $total_pages; ?>&amp;search=<?php print $search; ?>&amp;sort=<?php print $sort; ?>&amp;order=<?php print $order; ?>" class="navlink"><?php } ?><i class="icon-double-angle-right"></i><?php if($page < $total_pages){ ?></a><?php } ?>
&nbsp;
</div>
<?php } else { ?>
<div class="alert alert-error lead">
<?php print $text_not_found; ?>
</div>
<?php } ?>

View File

@ -1,13 +1,14 @@
<p>
<div>
<?php if($confirmed){ ?>
<?php print $x; ?>. <a href="index.php?route=group/list"><?php print $text_back; ?></a>
<div class="alert alert-success"><?php print $x; ?>.</div>
<p><a href="index.php?route=group/list"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a></p>
<?php } else { ?>
<a href="index.php?route=group/remove&amp;id=<?php print $id; ?>&amp;group=<?php print $group; ?>&amp;confirmed=1"><?php print $text_remove_this_group; ?>: <?php print $group; ?></a>
<p><a href="index.php?route=group/edit&amp;id=<?php print $id; ?>"><i class="icon-circle-arrow-left"></i>&nbsp;<?php print $text_back; ?></a> | <a href="index.php?route=group/remove&amp;id=<?php print $id; ?>&amp;group=<?php print $group; ?>&amp;confirmed=1"><i class="icon-remove-sign"></i>&nbsp;<?php print $text_remove_this_group; ?>: <?php print $group; ?></a></p>
<?php } ?>
</p>
</div>