Skip to content

Commit 7fd135a

Browse files
author
mreishman
committed
small style changes to watchlist buttons. Added buttons for move, needs js logic added
1 parent cc9681a commit 7fd135a

File tree

2 files changed

+55
-18
lines changed

2 files changed

+55
-18
lines changed

‎core/php/templateFiles/watchList.php‎

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,10 @@
123123
if(isset($approvedArrayKeys[$key2])):
124124
$j++;
125125
?>
126-
<br> <span class="leftSpacingserverNames" > <?php echo $approvedArrayKeys[$key2]; ?>: </span>
126+
<br>
127+
<?php if($key2 !== "Archive"): ?>
128+
<span class="leftSpacingserverNames" > <?php echo $approvedArrayKeys[$key2]; ?>: </span>
129+
<?php endif; ?>
127130
<input style="display: none;" type="text" name='watchListItem<?php echo $i; ?>-<?php echo $j; ?>-Name' value="<?php echo $key2;?>" >
128131
<?php
129132
if(!in_array($key2, $arrayOfKeys))
@@ -146,9 +149,9 @@
146149
<?php elseif($key2 === "Archive"): ?>
147150
<input id="archiveInput<?php echo $i; ?>" class='inputWidth300' type='hidden' name='watchListItem<?php echo $i; ?>-<?php echo $j; ?>' value='<?php if(isset($item[$key2])){ echo $item[$key2]; }else{echo "false";}?>'>
148151
<?php if ($item[$key2] === "true"): ?>
149-
<a id="archiveButton<?php echo $i; ?>" onclick="toggleArchive(<?php echo $i; ?>);" class="mainLinkClass" >Un-Archive</a>
152+
<a style="display: block;" id="archiveButton<?php echo $i; ?>" onclick="toggleArchive(<?php echo $i; ?>);" class="mainLinkClass" >Un-Archive</a>
150153
<?php else: ?>
151-
<a id="archiveButton<?php echo $i; ?>" onclick="toggleArchive(<?php echo $i; ?>);" class="mainLinkClass" >Archive</a>
154+
<a style="display: block;" id="archiveButton<?php echo $i; ?>" onclick="toggleArchive(<?php echo $i; ?>);" class="mainLinkClass" >Archive</a>
152155
<?php endif; ?>
153156
<?php else: ?>
154157
<input class='inputWidth300' type='text' name='watchListItem<?php echo $i; ?>-<?php echo $j; ?>' value='<?php if(isset($item[$key2])){ echo $item[$key2]; }?>'>
@@ -160,13 +163,27 @@
160163
$numCount = $j;
161164
}
162165
?>
163-
<br> <input style="display: none" type="text" name="watchListItem<?php echo $i;?>-0" value='<?php echo $j;?>'>
164-
<span class="leftSpacingserverNames" ></span>
165-
<?php if($type !== "external"): ?>
166-
<a class="mainLinkClass" onclick="deleteRowFunction(<?php echo $i; ?>, true);">Remove</a>
167-
<span> | </span>
168-
<?php endif; ?>
169-
<a class="mainLinkClass" onclick="testConnection(dataForWatchFolder<?php echo $i; ?>);" >Check Connection</a>
166+
<input style="display: none" type="text" name="watchListItem<?php echo $i;?>-0" value='<?php echo $j;?>'>
167+
<table width="100%">
168+
<tr>
169+
<th width="50%" style=" text-align: center;">
170+
<a style="display: block;" class="mainLinkClass" onclick="deleteRowFunction(<?php echo $i; ?>, true);">Remove</a>
171+
</th>
172+
<th width="50%" style=" text-align: center;">
173+
<a style="display: block;" class="mainLinkClass" onclick="testConnection(dataForWatchFolder<?php echo $i; ?>);" >Check Connection</a>
174+
</th>
175+
</tr>
176+
</table>
177+
<table width="100%">
178+
<tr>
179+
<th width="50%" style=" text-align: center;">
180+
<a style="display: block;" class="mainLinkClass" > Move Up One </a>
181+
</th>
182+
<th width="50%" style=" text-align: center;">
183+
<a style="display: block;" class="mainLinkClass" > Move Down One </a>
184+
</th>
185+
</tr>
186+
</table>
170187
</li>
171188
<?php endforeach; ?>
172189
<div style="display: inline-block;" id="newRowLocationForWatchList"></div>

‎core/php/templateFiles/watchListServer.php‎

Lines changed: 28 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,11 @@
9292
foreach($defaultArray as $key2 => $item2):
9393
$j++;
9494
?>
95-
<br> <span class="leftSpacingserverNames" > <?php echo $arrayKeys[$key2]; ?>: </span><input style="display: none;" type="text" name='watchListItem<?php echo $i; ?>-<?php echo $j; ?>-Name' value="<?php echo $key2;?>" >
95+
<br>
96+
<?php if($key2 !== "Archive"): ?>
97+
<span class="leftSpacingserverNames" > <?php echo $arrayKeys[$key2]; ?>: </span>
98+
<?php endif; ?>
99+
<input style="display: none;" type="text" name='watchListItem<?php echo $i; ?>-<?php echo $j; ?>-Name' value="<?php echo $key2;?>" >
96100
<?php
97101
if(!in_array($key2, $arrayOfKeys))
98102
{
@@ -115,9 +119,9 @@
115119
elseif($key2 === "Archive"): ?>
116120
<input id="archiveInput<?php echo $i; ?>" class='inputWidth300' type='hidden' name='watchListItem<?php echo $i; ?>-<?php echo $j; ?>' value='<?php if (isset($item[$key2])){ echo $item[$key2]; }else{echo "false";} ?>'>
117121
<?php if ($item[$key2] === "true"): ?>
118-
<a id="archiveButton<?php echo $i; ?>" onclick="toggleArchive(<?php echo $i; ?>);" class="mainLinkClass" >Un-Archive</a>
122+
<a style="display: block;" id="archiveButton<?php echo $i; ?>" onclick="toggleArchive(<?php echo $i; ?>);" class="mainLinkClass" >Un-Archive</a>
119123
<?php else: ?>
120-
<a id="archiveButton<?php echo $i; ?>" onclick="toggleArchive(<?php echo $i; ?>);" class="mainLinkClass" >Archive</a>
124+
<a style="display: block;" id="archiveButton<?php echo $i; ?>" onclick="toggleArchive(<?php echo $i; ?>);" class="mainLinkClass" >Archive</a>
121125
<?php endif; ?>
122126
<?php
123127
else: ?>
@@ -129,11 +133,27 @@
129133
$numCount = $j;
130134
}
131135
?>
132-
<br> <input style="display: none" type="text" name="watchListItem<?php echo $i;?>-0" value='<?php echo $j;?>'>
133-
<span class="leftSpacingserverNames" ></span>
134-
<a class="mainLinkClass" onclick="deleteRowFunction(<?php echo $i; ?>, true);">Remove</a>
135-
<span> | </span>
136-
<a class="mainLinkClass" onclick="testConnection(dataForWatchFolder<?php echo $i; ?>);" >Check Connection</a>
136+
<input style="display: none" type="text" name="watchListItem<?php echo $i;?>-0" value='<?php echo $j;?>'>
137+
<table width="100%">
138+
<tr>
139+
<th width="50%" style=" text-align: center;">
140+
<a style="display: block;" class="mainLinkClass" onclick="deleteRowFunction(<?php echo $i; ?>, true);">Remove</a>
141+
</th>
142+
<th width="50%" style=" text-align: center;">
143+
<a style="display: block;" class="mainLinkClass" onclick="testConnection(dataForWatchFolder<?php echo $i; ?>);" >Check Connection</a>
144+
</th>
145+
</tr>
146+
</table>
147+
<table width="100%">
148+
<tr>
149+
<th width="50%" style=" text-align: center;">
150+
<a style="display: block;" class="mainLinkClass" > Move Up One </a>
151+
</th>
152+
<th width="50%" style=" text-align: center;">
153+
<a style="display: block;" class="mainLinkClass" > Move Down One </a>
154+
</th>
155+
</tr>
156+
</table>
137157
</li>
138158
<?php endforeach; ?>
139159
<div style="display: inline-block;" id="newRowLocationForWatchList"></div>

0 commit comments

Comments
 (0)