folder fixes

This commit is contained in:
SJ
2013-03-31 14:50:21 +02:00
parent 5d7a349741
commit 26d18671da
9 changed files with 118 additions and 87 deletions

View File

@ -1,53 +0,0 @@
<?php if(Registry::get('username')) { ?>
<div class="row">
<div class="leftcell">
<div id="ss1">
<div class="row">
<div class="mcell">
<ul class="dropdown">
<li class="search_li"><a class="hide" href="#"<?php if(strstr($_SERVER['QUERY_STRING'], "stat/") || strstr($_SERVER['QUERY_STRING'], "health/") || strstr($_SERVER['QUERY_STRING'], "audit/") ) { ?> id="active"<?php } ?>><?php print $text_monitor; ?></a> |
<ul class="sub_menu">
<li><a href="index.php?route=stat/stat&timespan=daily"><?php print $text_statistics; ?></a></li>
<li><a href="index.php?route=health/health"><?php print $text_health; ?></a></li>
<li><a href="index.php?route=accounting/accounting&view=email"><?php print $text_accounting; ?></a></li>
<?php if(ENABLE_AUDIT == 1) { ?>
<li><a href="index.php?route=audit/audit"><?php print $text_audit; ?></a></li>
<?php } ?>
</ul>
</li>
<li class="search_li"><a class="hide" href="#"<?php if(strstr($_SERVER['QUERY_STRING'], "domain/") || ($_SERVER['QUERY_STRING'] != "route=user/settings" && strstr($_SERVER['QUERY_STRING'], "user/")) || strstr($_SERVER['QUERY_STRING'], "policy/") || strstr($_SERVER['QUERY_STRING'], "import/")) { ?> id="active"<?php } ?>><?php print $text_administration; ?></a> |
<ul class="sub_menu">
<li><a href="index.php?route=user/list"><?php print $text_users; ?></a></li>
<li><a href="index.php?route=group/list"><?php print $text_groups; ?></a></li>
<li><a href="index.php?route=domain/domain"><?php print $text_domain; ?></a></li>
<li><a href="index.php?route=policy/archiving"><?php print $text_archiving_rules; ?></a></li>
<li><a href="index.php?route=policy/retention"><?php print $text_retention_rules; ?></a></li>
</ul>
</li>
<li class="last_li"><a href="settings.php"<?php if(strstr($_SERVER['REQUEST_URI'], "settings.php")){ ?> id="active"<?php } ?>><?php print $text_settings; ?></a></li>
</ul>
</div>
</div>
</div>
</div>
<div class="rightcell">
<div class="logout22">
<?php if(isset($_SESSION['realname'])) { print $text_realname; ?>: <?php print $_SESSION['realname']; ?>, <?php } ?> <a class="logout" href="logout.php"<?php if(strstr($_SERVER['QUERY_STRING'], "login/logout")){ ?> id="active"<?php } ?>><?php print $text_logout; ?></a>
</div>
</div>
</div>
<?php } ?>

View File

@ -39,6 +39,9 @@
<?php } else { ?>
<li<?php if($_SERVER['REQUEST_URI'] == '/' || strstr($_SERVER['REQUEST_URI'], "search.php")){ ?> class="active"<?php } ?>><a href="search.php"><?php print $text_search; ?></a></li>
<?php if(ENABLE_FOLDER_RESTRICTIONS == 1) { ?>
<li<?php if($_SERVER['REQUEST_URI'] == '/' || strstr($_SERVER['REQUEST_URI'], "folders.php")){ ?> class="active"<?php } ?>><a href="folders.php"><?php print $text_folder; ?></a></li>
<?php } ?>
<?php } ?>

View File

@ -16,7 +16,7 @@
<div class="row">
<div class="cell1">&nbsp;</div>
<div class="cell2"><input type="submit" value="<?php print $text_add; ?>" /> <input type="reset" value="<?php print $text_cancel; ?>" /></div>
<div class="cell2"><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>

View File

@ -1,11 +1,13 @@
<p style="text-align:left; font-weight: bold; "><?php print $text_folders; ?>:</p>
<p class="bold"><?php print $text_folders; ?>:</p>
<div id="folders" style="text-align:left;">
<div id="folders">
<?php foreach ($extra_folders as $folder) { ?>
<blockquote style="border: 0px solid red; margin: 0 0 5px 10px;">
<img src="<?php print ICON_EMPTY; ?>" width="12" height="12" alt="" /> <input type="checkbox" id="extra_folder_<?php print $folder['id']; ?>" name="extra_folder_<?php print $folder['id']; ?>" /> <input type="text" ondrop="copy_message_to_folder('<?php print $folder['id']; ?>', current_message_id, '<?php print $text_copied; ?>'); return false;" class="extra_folder" value="<?php print $folder['name']; ?>" />
<blockquote class="folder">
<form class="form-search sleek">
<img src="<?php print ICON_EMPTY; ?>" width="12" height="12" alt="" /> <input type="checkbox" id="extra_folder_<?php print $folder['id']; ?>" name="extra_folder_<?php print $folder['id']; ?>" /> <input type="text" ondrop="Piler.copy_message_to_folder('<?php print $folder['id']; ?>', Piler.current_message_id, '<?php print $text_copied; ?>'); return false;" class="input-small bold" style="color: #850505; border:none; background: transparent; " value="<?php print $folder['name']; ?>" />
</form>
</blockquote>
<?php } ?>
@ -16,7 +18,7 @@
function display_folders($arr = array(), &$i) {
?>
<blockquote id="fldr_<?php print $i; ?>" style="border: 0px solid red; margin: 0 0 5px 10px;">
<blockquote id="fldr_<?php print $i; ?>" class="folder">
<?php
$i++;
@ -24,8 +26,8 @@ function display_folders($arr = array(), &$i) {
?>
<?php if(count($a['children']) > 0) { ?>
<a id="fldr_collapse_<?php print $i; ?>" href="#" onclick="close_folder(<?php print $i; ?>); return false;"><img src="<?php print ICON_MINUS; ?>" alt="" /></a>
<a id="fldr_open_<?php print $i; ?>" href="#" onclick="open_folder(<?php print $i; ?>); return false;" style="display:none;"><img src="<?php print ICON_PLUS; ?>" alt="" /></a>
<a id="fldr_collapse_<?php print $i; ?>" href="#" onclick="Piler.close_folder(<?php print $i; ?>); return false;"><img src="<?php print ICON_MINUS; ?>" alt="" /></a>
<a id="fldr_open_<?php print $i; ?>" href="#" onclick="Piler.open_folder(<?php print $i; ?>); return false;" style="display:none;"><img src="<?php print ICON_PLUS; ?>" alt="" /></a>
<?php } else { ?> <img src="<?php print ICON_EMPTY; ?>" width="12" height="12" alt="" /> <?php } ?>
<input type="checkbox" id="folder_<?php print $a['id']; ?>" name="folder_<?php print $a['id']; ?>" /> <?php print $a['name']; ?><br />

View File

@ -45,7 +45,7 @@
<tbody>
<?php $i=0; foreach ($messages as $message) { ?>
<tr id="e_<?php print $message['id']; ?>" class="resultrow new<?php if($i % 2) { ?> odd<?php } ?><?php if($message['spam'] == 1) { ?> spam<?php } ?>">
<tr onmouseover="Piler.current_message_id = <?php print $message['id']; ?>; return false;" id="e_<?php print $message['id']; ?>" class="resultrow new<?php if($i % 2) { ?> odd<?php } ?><?php if($message['spam'] == 1) { ?> spam<?php } ?>">
<td><input type="checkbox" id="r_<?php print $message['id']; ?>" name="r_<?php print $message['id']; ?>" value="iiii" <?php if(SEARCH_RESULT_CHECKBOX_CHECKED == 1) { ?>checked="checked"<?php } ?> /></td>
<td><a href="#" onclick="Piler.view_message_by_pos(<?php print $i; ?>);"><?php print ($page*$page_len) + $i + 1; ?>.</a></td>
<td><?php print $message['date']; ?></td>
@ -82,7 +82,7 @@
<div class="boxfooter">
<form class="form-inline slick" name="tagging">
<form class="form-inline sleek" name="tagging">
<?php if($n >= $page_len){ ?>
<span class="piler-right-margin">