Ia7 v1.2.301 #599
Merged
Ia7 v1.2.301 #599
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
longer sockets such as speech never closing the ajax port
… and banners, added in user color selection
Added Last updated to Weatherstation 2
Updated http_server to respond to range header
… gear on ios for sound
Merge branch 'master' into ia7 to sync with v4.1
… the end user with some guidance if the collections or prefs.json file isn't parsed properly
- Added in purple button, default for an unknown state - ia7_config.json state_colors section allow for color overrides - print log will now give a few hints if collections.json or ia7_config.json file has syntax errors - removed old versions of bootstrap and font awesome
…dal rather than breaking the IA7 environment. Common and User code modules updated
… the ia7 config files (ia7_config and ia7_rrd_config)
… Need to test all operations logged in as noone, family, and admin
Common code module to provide ability to modify collections.json if structural change is needed
web/ia7/include/javascript.js:
* If you append '&show_pos' to the flooplan URL you
it enables drag&drop item positioning: grab fp items with the
mouse and drop them where you would like to have tem positioned.
perl code do do the positioning is generated below the fp. Copy
and paste this code into your favourite mh code file. For me this
is 'zzzzzzz_fp_positions.pl', the weird name makes sure to load
this file last and all the items do exist.
* use the actual display width of fp image is used as the base for
resizing (instead of $(window).width() to make the floorplan work
on bigger screens too. For those the the floorplan image is smaller
than the windows width)
* scale the item icons proportional to the original size of the fp
background image. This means when you create your background image
you should choose the image size it in a way that the XXX_48.png
variants of the icons fit well into it.
* coordinates of fp items are now the center of the items icon
and not the top left corner.
lib/json_server.pl:
* add querry to get a list of available iconsets
Ia7 1.2 floorplan merge
- added a 'developer' mode and flag. Choosing Developer adds in the advanced collection set and can show additional information such as floorplan coordinates - included tobias's code - fixed the caret padding for voice commands
|
Was merged against the stable branch, should be against master. I'll revert this pull request. |
This was referenced Jul 25, 2016
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Includes all the v1.1 updates (sound, notifications), plus