search

OpenGeoscience / geoweb

Open source geoscience tools and applications
8 stars 3 forks source link

Use bootstrap modal dialogs for workflow and layer info #158

Closed aashish24 closed 10 years ago

aashish24 commented 11 years ago

@benbu Can we fix this as the current jquery ui is broken (the close cross)

benbu commented 11 years ago

Yeah, I made an attempt at it already but it's a bit tricky because bootstrap modal has fixed width and it's not very straightfoward to resize it for the workflows. I've come close to having something that looks right, but there are still quirks with the formatting.

benbu commented 11 years ago

I just pushed my progress on branch 158-workflow-bootstrap-modal, it is still a work in progress however.

benbu commented 11 years ago

I have now completed this on branch 158-workflow-bootstrap-modal. For the layer info, I bootstrap modal isn't really a good fit since it's tricky to resize and reposition it, and it darkens the background. I just made a custom div to display this, let me know what you think.

I tried merging to next but had conflicts, so I'll wait until some more things make it to master before trying to merge this with next.

aashish24 commented 11 years ago

Cool! Ok, let me have a look why you are getting conflicts. Will report back in an hour or so.

aashish24 commented 11 years ago

I hard reset next and then tried to merge your code. It seems like you have conflict with your own code from previous version. It could be my fault. I am pushing a fix to next. let me know if this looks correct to you.

aashish24 commented 11 years ago

Its looking pretty good!!! I am merging it to next. Have a look at it and let me know if the conflict resolution looks right to you. If you approve it, we will merge it to master. Thanks for the fix!

benbu commented 11 years ago

Approved!