diff --git a/docs/DEVICE_MANAGEMENT.md b/docs/DEVICE_MANAGEMENT.md index 1fb37134..ed7150c2 100755 --- a/docs/DEVICE_MANAGEMENT.md +++ b/docs/DEVICE_MANAGEMENT.md @@ -33,7 +33,7 @@ To edit device information: ## Session Info - **Status**: Show device status : On-line / Off-Line - **First Session**: Date and time of the first connection - - **Last Session**: Date and time of the last connection + - **Last Offline**: Date and time of the last last time the device was offline - **Last IP**: Last known IP used during the last connection - **Static IP**: Check this box to identify devices that always use the same IP diff --git a/docs/NOTIFICATIONS.md b/docs/NOTIFICATIONS.md index 78c909c5..3c7efa17 100755 --- a/docs/NOTIFICATIONS.md +++ b/docs/NOTIFICATIONS.md @@ -32,13 +32,15 @@ On almost all plugins there are 2 core settings, `_WATCH` and `_ 1. `_WATCH` specifies the columns which the app should watch. If watched columns change the device state is considered changed. This changed status is then used to decide to send out notifications based on the `_REPORT_ON` setting. 2. `_REPORT_ON` let's you specify on which events the app should notify you. This is related to the `_WATCH` setting. So if you select `watched-changed` and in `_WATCH` you only select `Watched_Value1`, then a notification is triggered if `Watched_Value1` is changed from the previous value, but no notification is send if `Watched_Value2` changes. +Click the **Read more in the docs.** Link at the top of each plugin to get more details on how the given plugin works. + ## Global settings ⚙ ![Global notification settings](/docs/img/NOTIFICATIONS/Global-notification-settings.png) -In the Notification Processing section, you can specify blanket rules. These allow you to specify exceptions to the Plugin and Device settings and will override those. +In Notification Processing settings, you can specify blanket rules. These allow you to specify exceptions to the Plugin and Device settings and will override those. -1. Notify on (`NTFPRCS_INCLUDED_SECTIONS`) allows you to specify which events trigger notifications. Usual setups will have `new_devices`, `down_devices`, and possibly `events` set. Setting `plugin` might be too noisy for most setups. +1. Notify on (`NTFPRCS_INCLUDED_SECTIONS`) allows you to specify which events trigger notifications. Usual setups will have `new_devices`, `down_devices`, and possibly `events` set. Setting `plugin` might be too noisy for most setups. More info in the [NTFPRCS plugin](/front/plugins/notification_processing/README.md) 2. Alert down after (`NTFPRCS_alert_down_time`) is useful if you want to wait for some time before the system sends out a down notification for a device. This is related to the on-device **Alert down** setting and only devices with this checked will trigger a down notification. 3. A filter to allow you to set device-specific exceptions to New devices being added to the app. 4. A filter to allow you to set device-specific exceptions to generated Events. diff --git a/front/css/app.css b/front/css/app.css index f5a04993..b567e676 100755 --- a/front/css/app.css +++ b/front/css/app.css @@ -108,6 +108,10 @@ /* ----------------------------------------------------------------------------- Main Sections ----------------------------------------------------------------------------- */ +.content-header h1{ + font-size:24px; +} + .content-header { padding-top: 5px; } diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index 9f3088e6..7b68d2b9 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -112,7 +112,7 @@ "DevDetail_Run_Actions_Tooltip": "Run an action on the current device from the dropdown list.", "DevDetail_SessionInfo_FirstSession": "First Session", "DevDetail_SessionInfo_LastIP": "Last IP", - "DevDetail_SessionInfo_LastSession": "Last Session", + "DevDetail_SessionInfo_LastSession": "Last Offline", "DevDetail_SessionInfo_StaticIP": "Static IP", "DevDetail_SessionInfo_Status": "Status", "DevDetail_SessionInfo_Title": " Session Info", @@ -201,7 +201,7 @@ "Device_TableHead_Icon": "Icon", "Device_TableHead_LastIP": "Last IP", "Device_TableHead_LastIPOrder": "Last IP Order", - "Device_TableHead_LastSession": "Last Session", + "Device_TableHead_LastSession": "Last Offline", "Device_TableHead_Location": "Location", "Device_TableHead_MAC": "Random MAC", "Device_TableHead_MAC_full": "Full MAC", diff --git a/front/plugins/_publisher_mqtt/mqtt.py b/front/plugins/_publisher_mqtt/mqtt.py index b113fbf5..506a8cae 100755 --- a/front/plugins/_publisher_mqtt/mqtt.py +++ b/front/plugins/_publisher_mqtt/mqtt.py @@ -87,6 +87,7 @@ class sensor_config: self.sensorType = sensorType self.sensorName = sensorName self.icon = icon + self.mac = mac self.state_topic = '' self.json_attr_topic = '' self.topic = ''