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

Button fixes in frontend editor #3263

Merged
merged 4 commits into from
Jun 28, 2014

Conversation

yakky
Copy link
Member

@yakky yakky commented Jun 22, 2014

This mixes @benjaoming work with django-suit plus one selector fix

@yakky yakky self-assigned this Jun 22, 2014
@yakky
Copy link
Member Author

yakky commented Jun 22, 2014

@benjaoming could you check if I correctly picked your fix?
@FinalAngel I restricted the selector https://github.com/divio/django-cms/pull/3263/files#diff-1995b31ad4aa5ec90e5a1a3aeba9f113R435 to avoid problems with other skins customizing header

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 5250e53 on yakky:feature/fix_submit_buttons2 into 5e20187 on divio:develop.

@@ -19,7 +19,8 @@ $(document).ready(function () {
'newPlugin': false,
'urls': {
'css_modal': 'cms/css/cms.toolbar.modal.css'
}
},
'has_django_suit': false
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use camelCase "hasDjangoSuit"

@FinalAngel
Copy link
Member

@yakky looks good to me 👍

@yakky
Copy link
Member Author

yakky commented Jun 28, 2014

Imported one more commit from @benjaoming PR
Closes #3192

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling a8b997b on yakky:feature/fix_submit_buttons2 into f58060c on divio:develop.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.01%) when pulling a8b997b on yakky:feature/fix_submit_buttons2 into f58060c on divio:develop.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling a8b997b on yakky:feature/fix_submit_buttons2 into f58060c on divio:develop.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) when pulling a8b997b on yakky:feature/fix_submit_buttons2 into f58060c on divio:develop.

@coveralls
Copy link

coveralls commented Jun 28, 2014

Coverage Status

Coverage decreased (-0.09%) to 87.973% when pulling 5250e53 on yakky:feature/fix_submit_buttons2 into 5e20187 on divio:develop.

yakky added a commit that referenced this pull request Jun 28, 2014
@yakky yakky merged commit c936fe1 into django-cms:develop Jun 28, 2014
@benjaoming
Copy link
Contributor

@yakky Thanks :)

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.

None yet

4 participants