Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ia7 1.2 floorplan merge #2

Merged
merged 2 commits into from
May 30, 2016
Merged

Conversation

tobser
Copy link

@tobser tobser commented May 30, 2016

No description provided.

Tobias Sachs added 2 commits May 29, 2016 17:22
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
@hplato
Copy link
Owner

hplato commented May 30, 2016

Thanks for doing this! I'll update my dev box and test out your changes. Any other comments on v1.2?

Sent from my mobile device.

On May 30, 2016, at 11:45 AM, Tobi [email protected] wrote:

You can view, comment on, or merge this pull request online at:

#2

Commit Summary

Make ia7 floorplan setup interactive
do not access ia7_config.state_colors if it was not defined in user config
File Changes

M lib/json_server.pl (8)
M web/ia7/include/javascript.js (762)
Patch Links:

https://github.com/hplato/misterhouse/pull/2.patch
https://github.com/hplato/misterhouse/pull/2.diff

You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or mute the thread.

@hplato hplato merged commit db146cc into hplato:ia7 May 30, 2016
hplato pushed a commit that referenced this pull request Dec 9, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants