Add tagging controller (have yet to add tagging to motions views). #65

Merged
24 commits merged into from Dec 19, 2010

Projects

None yet

3 participants

@btelles
Collaborator
btelles commented Dec 16, 2010

Okay, this should be ready for pulling into master.
(as far as I can tell)... Would someone please pull this? :-)

btelles added some commits Dec 9, 2010
@btelles btelles Refactor flashes, place them into a partial. d1b3060
@btelles btelles add ability to delete members through ui. a55df4c
@btelles btelles Improve motions#index a little bit. 9dfaae8
@btelles btelles Merge branch 'master' of https://github.com/wycats/jquery-governance
Conflicts:
	app/views/motions/_motion.html.haml
50daccd
@btelles btelles Merge branch 'master' of https://github.com/wycats/jquery-governance
Conflicts:
	app/stylesheets/application.scss
	public/stylesheets/application.css
182ab9f
@btelles btelles Merge branch 'master' of https://github.com/wycats/jquery-governance
Conflicts:
	app/views/motions/_motion.html.haml
	public/stylesheets/application.css
43da542
@btelles btelles Merge branch 'master' of https://github.com/wycats/jquery-governance 59afe95
@btelles btelles Merge branch 'master' of https://github.com/wycats/jquery-governance
Conflicts:
	public/stylesheets/application.css
8b7a9a9
@btelles btelles Revert "add ability to delete members through ui."
This reverts commit a55df4c.
38c064f
@btelles btelles Merge branch 'master' of https://github.com/wycats/jquery-governance 85e8254
@btelles btelles Remove acts_as_paranoid. 89e3676
@btelles btelles Move current_member helpers to controller
and keep them as helpers.
1d59255
@btelles btelles Add tag model and default seeds
('swag' was in the PT story, not sure if it's necessary).
402ed6d
@btelles btelles Add tag story that is to be implemented. 46cf2b9
@btelles btelles Add blueprint grid for easy layouts. f80b11c
@btelles btelles Add jQueryUI & highlight fade js. 5f5a7dc
@btelles btelles Add remove image button. 56f0909
@btelles btelles Add tag functionality and make cucumber feature work. 9fb750a
Contributor

Do you use blueprint in any of the views? There is already a lot of CSS included in the page for the overall jQuery chrome. What does blueprint do for us that isn't already in place? I've never used it, so I honestly don't know.

Collaborator
btelles commented Dec 16, 2010

Hi Barrett, :-)
Sure, I use it in the new 'tags#index' view where it divides the list of tags into 3 evenly-spaced columns.

Here's a description of what the scss mixin does:
http://compass-style.org/docs/reference/blueprint/grid/

And here's the documentation for blueprint that is specific to blueprint grids:
http://compass-style.org/docs/reference/blueprint/grid/

(In all honesty, I find the YUI Grids CSS tool easier to use than blueprint's grid, but I think compass only comes with blueprint...they dropped YUI a while ago).

@btelles btelles Merge branch 'master' of https://github.com/wycats/jquery-governance
Conflicts:
	app/stylesheets/application.scss
	app/views/admin/members/edit.html.haml
	app/views/admin/members/index.html.haml
	app/views/admin/members/new.html.haml
	app/views/motions/_motion.html.haml
	app/views/motions/_motion_list.html.haml
	app/views/motions/index.html.haml
	public/stylesheets/application.css
6d3bf70
Collaborator

Here Bernardo, I pulled this in but its got some merge conflicts, can you pull from master, update them and then I'll pull it down?

Collaborator
btelles commented Dec 18, 2010

Joseph,
Thanks. I merged the results and tested that we're all green/yellow in rspec and cucumber. This should make us happy for a while...adding more tests right now just for good measure, but you should be able to pull now. (Or I can commit to master if you want.)
Cheers,
Bernie

This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment