Skip to content

Commit

Permalink
[WebUI] Removing colon symbol from multiple dialogs (librenms#13742)
Browse files Browse the repository at this point in the history 
* [WebUI] Removing the colon symbol from dialogs

In order to make multiple pages more visually consistent with other pages in the system, removed the colon simbol ":" to the very right of each control description, where present.

Regards
GG

* Update new_alert_rule.inc.php

* Update alert_schedule.inc.php

* Update alert_template.inc.php
  • Loading branch information
@ilGino
ilGino authored Feb 3, 2022
1 parent 71bb7bd commit 58c88a6
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 44 deletions.
22 changes: 11 additions & 11 deletions includes/html/modal/alert_schedule.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,64 +39,64 @@
</div>
</div>
<div class="form-group">
<label for="title" class="col-sm-4 control-label">Title <exp>*</exp>: </label>
<label for="title" class="col-sm-4 control-label">Title <exp>*</exp> </label>
<div class="col-sm-8">
<input type="text" class="form-control" id="title" name="title" placeholder="Maintenance title">
</div>
</div>
<div class="form-group">
<label for="notes" class="col-sm-4 control-label">Notes: </label>
<label for="notes" class="col-sm-4 control-label">Notes </label>
<div class="col-sm-8">
<textarea class="form-control" id="notes" name="notes" placeholder="Maintenance notes"></textarea>
</div>
</div>
<div class="form-group">
<label for="recurring" class="col-sm-4 control-label">Recurring <strong class="text-danger">*</strong>: </label>
<label for="recurring" class="col-sm-4 control-label">Recurring <strong class="text-danger">*</strong> </label>
<div class="col-sm-8">
<input type="checkbox" id="recurring" name="recurring" data-size="small" data-on-text="Yes" data-off-text="No" onChange="recurring_switch();" value=0 />
</div>
</div>
<div id="norecurringgroup">
<div class="form-group">
<label for="start" class="col-sm-4 control-label">Start <exp>*</exp>: </label>
<label for="start" class="col-sm-4 control-label">Start <exp>*</exp> </label>
<div class="col-sm-8">
<input type="text" class="form-control date" id="start" name="start" value="" data-date-format="YYYY-MM-DD HH:mm">
</div>
</div>
<div class="form-group">
<label for="end" class="col-sm-4 control-label">End <exp>*</exp>: </label>
<label for="end" class="col-sm-4 control-label">End <exp>*</exp> </label>
<div class="col-sm-8">
<input type="text" class="form-control date" id="end" name="end" value="" data-date-format="YYYY-MM-DD HH:mm">
</div>
</div>
</div>
<div id="recurringgroup" style="display:none;">
<div class="form-group">
<label for="start_recurring_dt" class="col-sm-4 control-label">Start date <exp>*</exp>: </label>
<label for="start_recurring_dt" class="col-sm-4 control-label">Start date <exp>*</exp> </label>
<div class="col-sm-8">
<input type="text" class="form-control date" id="start_recurring_dt" name="start_recurring_dt" value="" data-date-format="YYYY-MM-DD">
</div>
</div>
<div class="form-group">
<label for="end_recurring_dt" class="col-sm-4 control-label">End date: </label>
<label for="end_recurring_dt" class="col-sm-4 control-label">End date </label>
<div class="col-sm-8">
<input type="text" class="form-control date" id="end_recurring_dt" name="end_recurring_dt" value="" data-date-format="YYYY-MM-DD">
</div>
</div>
<div class="form-group">
<label for="start_recurring_hr" class="col-sm-4 control-label">Start hour <exp>*</exp>: </label>
<label for="start_recurring_hr" class="col-sm-4 control-label">Start hour <exp>*</exp> </label>
<div class="col-sm-8">
<input type="text" class="form-control date" id="start_recurring_hr" name="start_recurring_hr" value="" data-date-format="HH:mm">
</div>
</div>
<div class="form-group">
<label for="end_recurring_hr" class="col-sm-4 control-label">End hour <exp>*</exp>: </label>
<label for="end_recurring_hr" class="col-sm-4 control-label">End hour <exp>*</exp> </label>
<div class="col-sm-8">
<input type="text" class="form-control date" id="end_recurring_hr" name="end_recurring_hr" value="" data-date-format="HH:mm">
</div>
</div>
<div class="form-group">
<label for="recurring_day" class="col-sm-4 control-label">Only on weekday: </label>
<label for="recurring_day" class="col-sm-4 control-label">Only on weekday </label>
<div class="col-sm-8">
<div style="float: left;"><label><input type="checkbox" style="width: 20px;" class="form-control" name="recurring_day[]" value="1" />Mo</label></div>
<div style="float: left;padding-left: 20px;"><label><input type="checkbox" style="width: 20px;" class="form-control" name="recurring_day[]" value="2" />Tu</label></div>
Expand All @@ -109,7 +109,7 @@
</div>
</div>
<div class="form-group">
<label for='maps' class='col-sm-4 control-label'>Map To <exp>*</exp>: </label>
<label for='maps' class='col-sm-4 control-label'>Map To <exp>*</exp> </label>
<div class="col-sm-8">
<select id="maps" name="maps[]" class="form-control" multiple="multiple"></select>
</div>
Expand Down
10 changes: 5 additions & 5 deletions includes/html/modal/alert_template.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,23 @@
<div class="row">
<div class="col-md-12">
<div class="form-group">
<label for="name">Template name: </label>
<label for="name">Template name </label>
<input type="text" class="form-control input-sm" id="name" name="name">
</div>
<div class="form-group">
<label for="template">Template: </label>
<label for="template">Template </label>
<textarea class="form-control" id="template" name="template" style="font-family: Menlo, Monaco, Consolas, 'Courier New', monospace;" rows="15"></textarea>
</div>
<div class="form-group">
<label for="rules_list">Attach template to rules: </label>
<label for="rules_list">Attach template to rules </label>
<select id="rules_list" name="rules_list[]" class="form-control" multiple="multiple"></select>
</div>
<div class="form-group">
<label for="title">Alert title: </label>
<label for="title">Alert title </label>
<input type="text" class="form-control input-sm" id="title" name="title" placeholder="Alert Title">
</div>
<div class="form-group">
<label for="title_rec">Recovery title: </label>
<label for="title_rec">Recovery title </label>
<input type="text" class="form-control input-sm" id="title_rec" name="title_rec" placeholder="Recovery Title">
</div>
<button type="button" class="btn btn-primary btn-sm" name="create-template" id="create-template">Create template</button>
Expand Down
24 changes: 12 additions & 12 deletions includes/html/modal/new_alert_rule.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="main">
<div class='form-group' title="The description of this alert rule.">
<label for='rule_name' class='col-sm-3 col-md-2 control-label'>Rule name: </label>
<label for='rule_name' class='col-sm-3 col-md-2 control-label'>Rule name </label>
<div class='col-sm-9 col-md-10'>
<input type='text' id='rule_name' name='name' class='form-control validation' maxlength='200' required>
</div>
Expand All @@ -79,7 +79,7 @@
</div>
</div>
<div class="form-group" title="How to display the alert. OK: green, Warning: yellow, Critical: red">
<label for='severity' class='col-sm-3 col-md-2 control-label'>Severity: </label>
<label for='severity' class='col-sm-3 col-md-2 control-label'>Severity </label>
<div class="col-sm-2">
<select name='severity' id='severity' class='form-control'>
<option value='ok'>OK</option>
Expand All @@ -89,53 +89,53 @@
</div>
</div>
<div class="form-group form-inline">
<label for='count' class='col-sm-3 col-md-2 control-label' title="How many notifications to issue while active before stopping. -1 means no limit. If interval is 0, this has no effect.">Max alerts: </label>
<label for='count' class='col-sm-3 col-md-2 control-label' title="How many notifications to issue while active before stopping. -1 means no limit. If interval is 0, this has no effect.">Max alerts </label>
<div class="col-sm-2" title="How many notifications to issue while active before stopping. -1 means no limit. If interval is 0, this has no effect.">
<input type='text' id='count' name='count' class='form-control' size="4" value="123">
</div>
<div class="col-sm-3" title="How long to wait before issuing a notification. If the alert clears before the delay, no notification will be issued. (s,m,h,d)">
<label for='delay' class='control-label' style="vertical-align: top;">Delay: </label>
<label for='delay' class='control-label' style="vertical-align: top;">Delay </label>
<input type='text' id='delay' name='delay' class='form-control' size="4">
</div>
<div class="col-sm-4 col-md-3" title="How often to re-issue notifications while this alert is active. 0 means notify once. This is affected by the poller interval. (s,m,h,d)">
<label for='interval' class='control-label' style="vertical-align: top;">Interval: </label>
<label for='interval' class='control-label' style="vertical-align: top;">Interval </label>
<input type='text' id='interval' name='interval' class='form-control' size="4">
</div>
</div>
<div class='form-group form-inline'>
<label for='mute' class='col-sm-3 col-md-2 control-label' title="Show alert status in the webui, but do not issue notifications.">Mute alerts: </label>
<label for='mute' class='col-sm-3 col-md-2 control-label' title="Show alert status in the webui, but do not issue notifications.">Mute alerts </label>
<div class='col-sm-2' title="Show alert status in the webui, but do not issue notifications.">
<input type="checkbox" name="mute" id="mute">
</div>
<label for='invert' class='col-sm-3 col-md-3 control-label' title="Alert when this rule doesn't match." style="vertical-align: top;">Invert rule match: </label>
<label for='invert' class='col-sm-3 col-md-3 control-label' title="Alert when this rule doesn't match." style="vertical-align: top;">Invert rule match </label>
<div class='col-sm-2' title="Alert when this rule doesn't match.">
<input type='checkbox' name='invert' id='invert'>
</div>
</div>
<div class="form-group" title="Issue recovery notifications.">
<label for='recovery' class='col-sm-3 col-md-2 control-label'>Recovery alerts: </label>
<label for='recovery' class='col-sm-3 col-md-2 control-label'>Recovery alerts </label>
<div class='col-sm-2'>
<input type='checkbox' name='recovery' id='recovery'>
</div>
</div>
<div class="form-group form-inline">
<label for='maps' class='col-sm-3 col-md-2 control-label' title="Restricts this alert rule to the selected devices, groups and locations.">Match devices, groups and locations list: </label>
<label for='maps' class='col-sm-3 col-md-2 control-label' title="Restricts this alert rule to the selected devices, groups and locations.">Match devices, groups and locations list </label>
<div class="col-sm-7" style="width: 56%;">
<select id="maps" name="maps[]" class="form-control" multiple="multiple"></select>
</div>
<div>
<label for='invert_map' class='col-md-1' style="width: 14.1333%;" text-align="left" title="If ON, alert rule check will run on all devices except the selected devices and groups.">All devices except in list: </label>
<label for='invert_map' class='col-md-1' style="width: 14.1333%;" text-align="left" title="If ON, alert rule check will run on all devices except the selected devices and groups.">All devices except in list </label>
<input type='checkbox' name='invert_map' id='invert_map'>
</div>
</div>
<div class="form-group" title="Restricts this alert rule to specified transports.">
<label for="transports" class="col-sm-3 col-md-2 control-label">Transports: </label>
<label for="transports" class="col-sm-3 col-md-2 control-label">Transports </label>
<div class="col-sm-9 col-md-10">
<select id="transports" name="transports[]" class="form-control" multiple="multiple"></select>
</div>
</div>
<div class='form-group' title="A link to some documentation on how to handle this alert. This will be included in notifications.">
<label for='proc' class='col-sm-3 col-md-2 control-label'>Procedure URL: </label>
<label for='proc' class='col-sm-3 col-md-2 control-label'>Procedure URL </label>
<div class='col-sm-9 col-md-10'>
<input type='text' id='proc' name='proc' class='form-control validation' pattern='(http|https)://.*' maxlength='80'>
</div>
Expand Down
Loading

0 comments on commit 58c88a6

Please sign in to comment.