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

Bootstrap skin #546

Closed
wants to merge 257 commits into from
Closed

Conversation

kylejohnson
Copy link
Member

I started to fix bugs in the flat skin and decided to start over... ish.

Reusing most of the existing ZM framework - just changing client side to look better and be easier to maintain. That means using bootstrap for css.

This PR is not ready to merge, but I would like feedback as I go through and make my changes. This PR should however work fine if it were merged - it just isn't complete.

2014-10-31-163845_1894x692_scrot

@kylejohnson
Copy link
Member Author

commit 1a83b30

2014-11-01-112546_1366x768_scrot

This was referenced Nov 1, 2014
@kylejohnson kylejohnson added this to the 1.29.0 milestone Nov 1, 2014
You should now be able to see a monitor's zones by clicking on the
respective 'Edit' link.  From there, you'll see a list view of that
monitor's Zones.

From there, you can click on the Zone name, which will bring up the
details for that zone.

You can not yet save zones, and not all of the values for that zone
are displayed.
I wish I knew about this plugin months ago.

By default PDO and CakePHP cast int as string.  This prevents me
from using `<input type="number">`, as the modle that the input
is bound to is actually a string, not an int.

Crud by default casts int back to int via ApiTransformationListener

It also has a bunch of other features which makes the life of a
REST / CRUD developer easier.
 * Add routes for each individual options tab
 * Add options files for each category
 * Use ui-router with ui-view for tab functionality

Previously the options tabs were dynamically generated from the
API, and returned as HTML-formed json.  These were then dynamically
inserted into the page.

From there, tab functionality was added with bootstrap + jquery.
ui-router broke that tab functionality.
This commits adds some styling for the stacked tabs in the Options
and Monitors views.
This commit will pass in a $scope.configData array to the 'options'
state before the page loads.  This ensures that the config data
is in scope before the page loads.
We're now grabbing only the json from the api, passing it through
the Crud plugin so that ints stay as ints, and then assigning the
json to the scope via app.js resolve.

 * Saving Config is not tested here.
 * This commit may deprecate the ConfigParserComponent
 * Options must be saved before changing the tab, lest they are lost.
 * That'll be fixed in another commit.
@kylejohnson
Copy link
Member Author

I'm going to close this PR, and create a second one which targets a branch off of master, instead of master itself. That way I can get this into the hands of more people earlier, without having to worry about screwing things up in master.

@kylejohnson kylejohnson closed this Mar 5, 2015
@kylejohnson kylejohnson deleted the bootstrap-skin branch March 5, 2015 13:16
@kylejohnson
Copy link
Member Author

This code is now tracked in the angular-ui branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants