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

Front end for detail.html, promotions, widgets, basket.html, checkout nav #642

Merged
merged 4 commits into from
Apr 15, 2013

Conversation

informa
Copy link

@informa informa commented Apr 14, 2013

Really sorry for the large commit!

Styling/markup for:

  • Detail.html - added varients to this page
  • Basket.html.

Carousels: now using the same js

  • Homepage, recently viewed, handpicked carousel, product gallery carousel, new featured product -- using styles for single product promotion (this could end up as a widget?)

Added markup for possible widgets

  • Left the markup on the home.html (will be moved)

Added checkout navigation.

Tidied some less (more needed around buttons, navbar)

Screen shot 2013-04-14 at 2 56 55 PM

Screen shot 2013-04-14 at 2 57 08 PM
Screen shot 2013-04-14 at 3 00 19 PM
Screen shot 2013-04-14 at 4 39 12 PM
Screen shot 2013-04-14 at 4 45 41 PM
Screen shot 2013-04-14 at 2 57 15 PM
Screen shot 2013-04-14 at 9 59 44 PM
Screen shot 2013-04-14 at 10 00 31 PM

Jon Price added 3 commits April 13, 2013 09:13
…sing the same js for all carousels, added markup for possible widgets, added checkout navigation, tidied some less(more needed around buttons, navbar)
@OliverRandell
Copy link
Contributor

A very minor point, but just put the 'trans' tags around the relevant content.

@informa
Copy link
Author

informa commented Apr 15, 2013

Screen shot 2013-04-15 at 3 40 16 PM
Screen shot 2013-04-15 at 3 40 41 PM


// Register mobile callback


// Register desktop callback
site.responsive.register(megaCarousel, ['desktop', 'tablet']);
site.responsive.register(productCarousel, ['desktop', 'tablet']);
site.responsive.register(productSingleCarousel, ['desktop', 'tablet']);

}(site, jQuery));
Copy link
Contributor

Choose a reason for hiding this comment

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

Should any of these JS changes go back into core?

Copy link
Author

Choose a reason for hiding this comment

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

Well there are a few things I would put into the core from demo.

  • Replace elastislide and gallery JS with flexslider for all carousels (added into demo)
  • I like this way of calling responsive js too (although instead of the above code I could have set carousels to display one item rather than disable)
  • I created a feature product promotion - which uses singleproductpromotion code as a carousel (pretty useful)
  • Review STARS I have replaced with icons (on product lists and product page)
  • Product page has variants feeding in.
  • Product lists are better with availability - ie with buttons buy, view range (if children), out of stock (or notify me), or not available badge.

Just thoughts anyway

Copy link
Author

Choose a reason for hiding this comment

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

Oh - the shipping page markup / and styles are better in my opinion. Shipping address page - with or without addresses. We need to add more {% block %}s in the checkout area - so we don't need to duplicate templates so much.

Copy link
Contributor

Choose a reason for hiding this comment

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

That all sounds fine to me. I guess it would need to be you who extracts the relevant changes into a new pull request - shall I create a ticket?

Copy link
Author

Choose a reason for hiding this comment

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

Yeah sure create a ticket and assign to me. Not to sure about when it will get done -- I think we need to finish off the demo site first. We really need to think of a way to separate fancypage statics from the front end too -- as it is a little tricky. Also had problems with icons font-awesome conflicting with icomoon, from fancypages and site frontend.

codeinthehole added a commit that referenced this pull request Apr 15, 2013
Front end for detail.html, promotions, widgets, basket.html, checkout nav
@codeinthehole codeinthehole merged commit 4384e09 into django-oscar:issue/557/demo Apr 15, 2013
@codeinthehole
Copy link
Contributor

Splendid work.

Can I be a total pedant and ask that you try and follow these guidelines with commit messages:
https://github.com/phonegap/phonegap/wiki/Git-Commit-Message-Format

The most important one is having a short summary as the first line. It makes lists of commits much easier to read in the logs and through Github's UI (look at the commits here: https://github.com/tangentlabs/django-oscar/pull/557).

Another trick for keeping a clean history is to pull in new commits with `git pull --rebaseinstead ofgit pull``. This avoids unnecessary merge commits.

@informa
Copy link
Author

informa commented Apr 16, 2013

Thanks @codeinthehole -- I will try your tips in my future pulls and pushes.

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

Successfully merging this pull request may close these issues.

3 participants