Skip to content

cancel search link, fix p.2 from #1850 #1922

Closed
wants to merge 5 commits into from

4 participants

@keram
keram commented Sep 3, 2012

@parndt ? :)

@parndt parndt commented on an outdated diff Sep 3, 2012
core/config/locales/en.yml
@@ -50,8 +50,9 @@ en:
current: Current File
search:
button_text: Search
- results_for: "Search results for '%{query}'"
+ results_for: "Search results for &#8216;<em>%{query}</em>&#8217;"
@parndt
Refinery member
parndt added a note Sep 3, 2012

This key should be results_for_html now given it contains HTML.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@parndt
Refinery member
parndt commented Sep 3, 2012

Can you please put a before/after screenshot here so that we have the history of what this did?

Thanks :)

@travisbot

This pull request passes (merged ea2d36e into 0b1de8b).

@keram
keram commented Sep 3, 2012

captain here are screenshots
before
after

@travisbot

This pull request passes (merged 1edcdc4 into 0b1de8b).

@travisbot

This pull request passes (merged fcbc5fa into 0b1de8b).

@ugisozols
Refinery member

Looks good.

@ugisozols
Refinery member

Unfortunately I can't comment inline so I'm putting some code here.

In the engine generator template (2nd line) there's code:

refinery.admin_<%= plural_name %>_path

The link won't work because engine routes are namespaced. You should use:

refinery.<%= namespacing.underscore %>_admin_<%= plural_name %>_path
@ugisozols
Refinery member

One more thing - changes to css makes the backed look a bit different than it is now:

original:
before

after changes:
after

Please fix that and also do a squash. Thanks :)

@keram
keram commented Sep 7, 2012

@ugisozols please check if is look good for you now.
I tested this only on ubuntu and on other platforms may been still some small issues

@keram keram referenced this pull request Sep 7, 2012
Closed

User admin #1934

@ugisozols
Refinery member

@keram I squashed your commits and merged this in 1a35085 + updated other locales here - a75309d

@ugisozols ugisozols closed this Sep 10, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.