Skip to content

Commit 77a320d

Browse files
leiweibauleiweibau
committed
CSS work 02
1 parent 7754ebf commit 77a320d

File tree

4 files changed

+28
-28
lines changed

4 files changed

+28
-28
lines changed

‎front/css/pialert.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,8 +493,10 @@ body.modal-open {
493493
.bulked_dev_chk_cont {display: inline-block; height: 32px; width: 36px; margin-right: 3px; padding-left: 8px; padding-top: 6px;}
494494
.bulked_dev_chkbox {position: relative; margin-top:-3px !important; margin-right: 3px !important;}
495495
.bulked_table_cell_a {padding-left: 10px; height: 70px;}
496+
.bulked_online_border {border: 1px solid #00A000; box-shadow: inset 0px 0px 5px 0px #00A000;}
497+
.bulked_offline_border {border: 1px solid #888;}
496498
#bulked_checkall {display: block; margin-top: 20px; margin-bottom: 10px; min-width: 180px;}
497-
#bulk_editor_quit {position: absolute; display: inline-block; top: 5px; right: 15px;}
499+
.bulk_editor_quit {position: absolute; display: inline-block; top: 5px; right: 15px;}
498500
/* ----------------- Services ----------------------------------------------- */
499501
.icmplist_add_ip {display: inline-block; margin-top: -5px; margin-left: 15px;}
500502
.services_icon {position: relative; top: -58px; left: 0px; font-size: 58px; opacity: 0.2;}

‎front/devices.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ function print_box_bottom_element() {
6565

6666
echo '
6767
<h1 id="pageTitle">' . $pia_lang['Device_Title'] . ' - ' . $pia_lang['Device_bulkEditor_mode'] . '</h1>
68-
<a href="./devices.php" class="btn btn-success pull-right" role="button" id="bulk_editor_quit">' . $pia_lang['Device_bulkEditor_mode_quit'] . '</a>
68+
<a href="./devices.php" class="btn btn-success pull-right bulk_editor_quit" role="button">' . $pia_lang['Device_bulkEditor_mode_quit'] . '</a>
6969
</section>';
7070

7171
echo '<section class="content">
@@ -172,11 +172,10 @@ function print_box_bottom_element() {
172172
$sql = 'SELECT dev_Name, dev_MAC, dev_PresentLastScan, dev_Archived, dev_NewDevice, dev_AlertEvents, dev_AlertDeviceDown FROM Devices ORDER BY dev_Name COLLATE NOCASE ASC';
173173
$results = $db->query($sql);
174174
while ($row = $results->fetchArray()) {
175-
if ($row[2] == 1) {$status_border = 'border: 1px solid #00A000; box-shadow: inset 0px 0px 5px 0px #00A000;';} else { $status_border = 'border: 1px solid #888;';}
175+
if ($row[2] == 1) {$status_border = 'bulked_online_border';} else { $status_border = 'bulked_offline_border';}
176176
if ($row[3] == 1) {$status_box = 'background-color: #aaa;';} elseif ($row[4] == 1) {$status_box = 'background-color: #b1720c;';} else { $status_box = 'background-color: transparent;';}
177177
if ($row[5] == 1 && $row[6] == 1) {$status_text_color = 'bulked_checkbox_label_alldown';} elseif ($row[5] == 1) {$status_text_color = 'bulked_checkbox_label_all';} elseif ($row[6] == 1) {$status_text_color = 'bulked_checkbox_label_down';} else { $status_text_color = '';}
178-
//if ($row[4] == 1) {$status_box = 'background-color: #b1720c;';} else { $status_box = 'background-color: transparent;';}
179-
echo '<div class="bulked_dev_box" style="' . $status_border . '">
178+
echo '<div class="bulked_dev_box ' . $status_border . '">
180179
<div class="bulked_dev_chk_cont" style="' . $status_box . '">
181180
<input class="icheckbox_flat-blue hostselection bulked_dev_chkbox" id="' . $row[1] . '" name="' . $row[1] . '" type="checkbox">
182181
</div>

‎front/icmpmonitor.php

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ function print_box_bottom_element() {
6363

6464
echo '<section class="content-header">
6565
<h1 id="pageTitle">' . $pia_lang['ICMPMonitor_Title'] . ' - ' . $pia_lang['Device_bulkEditor_mode'] . '</h1>
66-
<a href="./icmpmonitor.php" class="btn btn-success pull-right" role="button" style="position: absolute; display: inline-block; top: 5px; right: 15px;">' . $pia_lang['Device_bulkEditor_mode_quit'] . '</a>
66+
<a href="./icmpmonitor.php" class="btn btn-success pull-right bulk_editor_quit" role="button">' . $pia_lang['Device_bulkEditor_mode_quit'] . '</a>
6767
</section>';
6868

6969
echo '<section class="content">
@@ -160,22 +160,21 @@ function print_box_bottom_element() {
160160
$sql = 'SELECT icmp_hostname, icmp_ip, icmp_PresentLastScan, icmp_AlertEvents, icmp_AlertDown FROM ICMP_Mon ORDER BY icmp_hostname COLLATE NOCASE ASC';
161161
$results = $db->query($sql);
162162
while ($row = $results->fetchArray()) {
163-
if ($row[2] == 1) {$status_border = 'border: 1px solid #00A000; box-shadow: inset 0px 0px 5px 0px #00A000;';} else { $status_border = 'border: 1px solid #888;';}
163+
if ($row[2] == 1) {$status_border = 'bulked_online_border';} else { $status_border = 'bulked_offline_border';}
164164
if ($row[3] == 1 && $row[4] == 1) {$status_text_color = 'bulked_checkbox_label_alldown';} elseif ($row[3] == 1) {$status_text_color = 'bulked_checkbox_label_all';} elseif ($row[4] == 1) {$status_text_color = 'bulked_checkbox_label_down';} else { $status_text_color = '';}
165-
//if ($row[4] == 1) {$status_box = 'background-color: #b1720c;';} else { $status_box = 'background-color: transparent;';}
166-
echo '<div class="table_settings_col_box" style="padding-left: 0px; padding-top: 0px; ' . $status_border . '">
167-
<div style="display: inline-block; ' . $status_box . ' height: 32px; width: 36px; margin-right: 3px; padding-left: 8px; padding-top: 6px;">
168-
<input class="icheckbox_flat-blue hostselection" id="' . str_replace(".", "_", $row[1]) . '" name="' . str_replace(".", "_", $row[1]) . '" type="checkbox" style="position: relative; margin-top:-3px; margin-right: 3px;">
165+
echo '<div class="bulked_dev_box ' . $status_border . '">
166+
<div class="bulked_dev_chk_cont" style="' . $status_box . '">
167+
<input class="icheckbox_flat-blue hostselection bulked_dev_chkbox" id="' . str_replace(".", "_", $row[1]) . '" name="' . str_replace(".", "_", $row[1]) . '" type="checkbox">
169168
</div>
170169
<label class="control-label ' . $status_text_color . '" for="' . str_replace(".", "_", $row[1]) . '" style="">' . $row[0] . '</label>
171170
</div>';
172171
}
173172

174173
// Check/Uncheck All Button
175-
echo '<button type="button" class="btn btn-warning pull-right checkall" style="display: block; margin-top: 20px; margin-bottom: 10px; min-width: 180px;">' . $pia_lang['Device_bulkEditor_selectall'] . '</button>';
174+
echo '<button type="button" class="btn btn-warning pull-right checkall" id="bulked_checkall">' . $pia_lang['Device_bulkEditor_selectall'] . '</button>';
176175
echo '<script>
177176
var clicked = false;
178-
$(".checkall").on("click", function() {
177+
$("#bulked_checkall").on("click", function() {
179178
$(".hostselection").prop("checked", !clicked);
180179
clicked = !clicked;
181180
this.innerHTML = clicked ? \'' . $pia_lang['Device_bulkEditor_selectnone'] . '\' : \'' . $pia_lang['Device_bulkEditor_selectall'] . '\';
@@ -187,14 +186,14 @@ function print_box_bottom_element() {
187186
// Inputs
188187
echo '<table style="margin-bottom:30px; width: 100%">
189188
<tr>
190-
<td style="padding-left: 10px; height: 70px; width: 80px;"><input class="icheckbox_flat-blue" id="en_bulk_owner" name="en_bulk_owner" type="checkbox"></td>
191-
<td style="">
189+
<td class="bulked_table_cell_a" style="width: 80px;"><input class="icheckbox_flat-blue" id="en_bulk_owner" name="en_bulk_owner" type="checkbox"></td>
190+
<td>
192191
<label for="bulk_owner">' . $pia_lang['DevDetail_MainInfo_Owner'] . ':</label><br>
193192
<input type="text" class="form-control" id="bulk_owner" name="bulk_owner" style="max-width: 400px;" disabled></td>
194193
</tr>
195194
<tr>
196-
<td style="padding-left: 10px; height: 70px;"><input class="icheckbox_flat-blue" id="en_bulk_type" name="en_bulk_type" type="checkbox"></td>
197-
<td style="">
195+
<td class="bulked_table_cell_a"><input class="icheckbox_flat-blue" id="en_bulk_type" name="en_bulk_type" type="checkbox"></td>
196+
<td>
198197
<label for="bulk_type">' . $pia_lang['DevDetail_MainInfo_Type'] . ':</label><br>
199198
<div class="input-group" style="max-width: 400px;">
200199
<input class="form-control" id="bulk_type" name="bulk_type" type="text" disabled>
@@ -218,8 +217,8 @@ function print_box_bottom_element() {
218217
</td>
219218
</tr>
220219
<tr>
221-
<td style="padding-left: 10px; height: 70px;"><input class="icheckbox_flat-blue" id="en_bulk_group" name="en_bulk_group" type="checkbox"></td>
222-
<td style="">
220+
<td class="bulked_table_cell_a"><input class="icheckbox_flat-blue" id="en_bulk_group" name="en_bulk_group" type="checkbox"></td>
221+
<td>
223222
<label for="bulk_group">' . $pia_lang['DevDetail_MainInfo_Group'] . ':</label><br>
224223
<div class="input-group" style="max-width: 400px;">
225224
<input class="form-control" id="bulk_group" name="bulk_group" type="text" disabled>
@@ -238,8 +237,8 @@ function print_box_bottom_element() {
238237
</td>
239238
</tr>
240239
<tr>
241-
<td style="padding-left: 10px; height: 70px;"><input class="icheckbox_flat-blue" id="en_bulk_location" name="en_bulk_location" type="checkbox"></td>
242-
<td style="">
240+
<td class="bulked_table_cell_a"><input class="icheckbox_flat-blue" id="en_bulk_location" name="en_bulk_location" type="checkbox"></td>
241+
<td>
243242
<label for="bulk_location">' . $pia_lang['DevDetail_MainInfo_Location'] . ':</label><br>
244243
<div class="input-group" style="max-width: 400px;">
245244
<input class="form-control" id="bulk_location" name="bulk_location" type="text" disabled>
@@ -260,20 +259,20 @@ function print_box_bottom_element() {
260259
</td>
261260
</tr>
262261
<tr>
263-
<td style="padding-left: 10px; height: 70px;"><input class="icheckbox_flat-blue" id="en_bulk_comments" name="en_bulk_comments" type="checkbox"></td>
264-
<td style="">
262+
<td class="bulked_table_cell_a"><input class="icheckbox_flat-blue" id="en_bulk_comments" name="en_bulk_comments" type="checkbox"></td>
263+
<td>
265264
<label for="bulk_comments">' . $pia_lang['DevDetail_MainInfo_Comments'] . ':</label><br>
266265
<textarea class="form-control" rows="3" id="bulk_comments" name="bulk_comments" spellcheck="false" data-gramm="false" style="max-width: 400px;" disabled></textarea></td>
267266
</tr>
268267
<tr>
269-
<td style="padding-left: 10px; height: 70px;"><input class="icheckbox_flat-blue" id="en_bulk_AlertAllEvents" name="en_bulk_AlertAllEvents" type="checkbox"></td>
270-
<td style="">
268+
<td class="bulked_table_cell_a"><input class="icheckbox_flat-blue" id="en_bulk_AlertAllEvents" name="en_bulk_AlertAllEvents" type="checkbox"></td>
269+
<td>
271270
<label for="bulk_AlertAllEvents" style="width: 200px;">' . $pia_lang['DevDetail_EveandAl_AlertAllEvents'] . ':</label>
272271
<input class="icheckbox_flat-blue" id="bulk_AlertAllEvents" name="bulk_AlertAllEvents" type="checkbox" disabled></td>
273272
</tr>
274273
<tr>
275-
<td style="padding-left: 10px; height: 70px;"><input class="icheckbox_flat-blue" id="en_bulk_AlertDown" name="en_bulk_AlertDown" type="checkbox"></td>
276-
<td style="">
274+
<td class="bulked_table_cell_a"><input class="icheckbox_flat-blue" id="en_bulk_AlertDown" name="en_bulk_AlertDown" type="checkbox"></td>
275+
<td>
277276
<label for="bulk_AlertDown" style="width: 200px;">' . $pia_lang['DevDetail_EveandAl_AlertDown'] . ':</label>
278277
<input class="icheckbox_flat-blue" id="bulk_AlertDown" name="bulk_AlertDown" type="checkbox" disabled></td>
279278
</tr>

‎front/journal.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ function get_pialert_journal() {
9494
$logclass = "";
9595

9696
echo '<tr>
97-
<td style="">' . $row['Journal_DateTime'] . '</td>
97+
<td>' . $row['Journal_DateTime'] . '</td>
9898
<td>' . $logclass . '</td>
9999
<td>' . $logcode . '</td>
100100
<td style="white-space: nowrap;">' . $pia_journ_lang[$row['LogClass']] . '</td>

0 commit comments

Comments
 (0)