-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Changing carousel to have a static square image size (cropped to cent…
…er via CSS), flush left, 3 items + peeking at 320 px width, currently omitting the dummy items (Github issues #34 and #35)
- Loading branch information
1 parent
c888621
commit b712c7f
Showing
20 changed files
with
493 additions
and
194 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,193 @@ | ||
|
|
||
| <!--[if i]><![endif]--> | ||
| <!doctype html> | ||
| <!--[if lte IE 8]> <html class="no-js lt-ie10 lt-ie9 " lang="en"> <![endif]--> | ||
| <!--[if IE 9]> <html class="no-js lt-ie10 modern" lang="en"> <![endif]--> | ||
| <!--[if gt IE 9]><!--> <html class="no-js modern" lang="en"> <!--<![endif]--> | ||
| <head> | ||
| <meta charset="utf-8" /> | ||
|
|
||
| <title>Discover - Artbot</title> | ||
|
|
||
| <meta name="viewport" content="width=device-width, initial-scale=1" /> | ||
| <meta name="apple-mobile-web-app-capable" content="yes" /> | ||
| <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" /> | ||
|
|
||
| <link rel="shortcut icon" sizes="16x16" href="/favicon.ico" /> | ||
| <link rel="shortcut icon" sizes="32x32" href="/ui/img/favicon-32px.png" /> | ||
| <!-- non-retina iPhone pre iOS 7 --> | ||
| <link rel="apple-touch-icon" href="/ui/img/favicon-57px.png" sizes="57x57"> | ||
| <!-- non-retina iPad pre iOS 7 --> | ||
| <link rel="apple-touch-icon" href="/ui/img/favicon-72px.png" sizes="72x72"> | ||
| <!-- non-retina iPad iOS 7 --> | ||
| <link rel="apple-touch-icon" href="/ui/img/favicon-76px.png" sizes="76x76"> | ||
| <!-- retina iPhone pre iOS 7 --> | ||
| <link rel="apple-touch-icon" href="/ui/img/favicon-114px.png" sizes="114x114"> | ||
| <!-- retina iPhone iOS 7 --> | ||
| <link rel="apple-touch-icon" href="/ui/img/favicon-120px.png" sizes="120x120"> | ||
| <!-- retina iPad pre iOS 7 --> | ||
| <link rel="apple-touch-icon" href="/ui/img/favicon-144px.png" sizes="144x144"> | ||
| <!-- retina iPad iOS 7 --> | ||
| <link rel="apple-touch-icon" href="/ui/img/favicon-152px.png" sizes="152x152"> | ||
|
|
||
| <!-- Windows 8 / RT --> | ||
| <meta name="msapplication-TileImage" content="/ui/img/favicon-144px.png" /> | ||
| <meta name="msapplication-TileColor" content="#ffffff" /> | ||
|
|
||
| <!-- Styles --> | ||
| <link href='https://api.tiles.mapbox.com/mapbox.js/v2.0.0/mapbox.css' rel='stylesheet' /> | ||
| <link rel="stylesheet" href="ui/css/styles.css" /> | ||
|
|
||
| <script src="ui/js/standalone/modernizr-2.7.1.min.js"></script> | ||
|
|
||
| <!--[if (lt IE 9) & (!IEMobile)]> | ||
| <script src="/ui/js/standalone/respond.min.js"></script> | ||
| <![endif]--> | ||
|
|
||
| <!-- Detect IE10 and insert a CSS class in the HTML element --> | ||
| <!--[if !IE]><!--><script> | ||
| if (/*@cc_on!@*/false) { | ||
| document.documentElement.className+=' ie10'; | ||
| } | ||
| </script><!--<![endif]--> | ||
|
|
||
| <!-- Responsive fix for certain Windows phones --> | ||
| <script> | ||
| (function() { | ||
| if ("-ms-user-select" in document.documentElement.style && navigator.userAgent.match(/IEMobile\/10\.0/)) { | ||
| var msViewportStyle = document.createElement("style"); | ||
| msViewportStyle.appendChild( | ||
| document.createTextNode("@-ms-viewport{width:auto!important}") | ||
| ); | ||
| document.getElementsByTagName("head")[0].appendChild(msViewportStyle); | ||
| } | ||
| })(); | ||
| </script> | ||
|
|
||
| </head> | ||
| <body id="page--home" class="page--home ui-page-theme-a"> | ||
|
|
||
| <div data-role="page" class="wrapper"> | ||
|
|
||
| <header class="masthead" role="banner" data-role="header" data-position="fixed" data-tap-toggle="false"> | ||
| <h1><a href="index.html">Discover</a></h1> | ||
|
|
||
| <a href="#menu-panel" id="menu-trigger" class="ui-btn-right ui-btn-noborder ui-btn-nopadding ui-btn-icon-notext btn btn-round" title="Menu"><i class="icon icon-menu"></i><span class="visuallyhidden">Menu</span></a> | ||
| </header> <!-- /header --> | ||
|
|
||
| <div class="content layout-footer" role="main"> | ||
|
|
||
| </div> <!-- /content --> | ||
|
|
||
| <footer class="footer"> | ||
| <div class="footer-header cf"> | ||
| <h2 class="h3 if-loggedin"><a href="favorites.html">My favorites <i class="icon icon-fast-forward"></i></a></h2> | ||
| <h2 class="h3 no-link if-not-loggedin">My favorites</h2> | ||
| </div> | ||
| <div class="footer-slider-messages error-messages"> | ||
|
|
||
| <p id="footer-slider-msg-favoritesignup" class="footer-slider-msg">You have no favorites yet. <a href="#" class="signup-trigger">Sign up</a> or <a href="sign-in.html" class="signin-link">sign in</a> to save and access your favorite events and exhibitions!</p> | ||
|
|
||
| <p id="footer-slider-msg-nofavorites" class="footer-slider-msg">You have no favorites yet. Tap the star icon to save an event or exhibition!</p> | ||
|
|
||
| <p id="footer-slider-msg-noevents" class="footer-slider-msg">No exhibitions found.</p> | ||
|
|
||
| <p id="footer-slider-msg-generalerror" class="footer-slider-msg">An error occurred, please reload the page and try again.</p> | ||
|
|
||
| <p id="footer-slider-msg-noeventsnearby" class="footer-slider-msg">There are no exhibitions within <span id="location-radius">X</span> miles of your current location.</p> | ||
|
|
||
| <p id="footer-slider-msg-nogeolocation" class="footer-slider-msg">Artbot couldn't detect your location.</p> | ||
|
|
||
| </div> | ||
|
|
||
| <div id="favorites-slider" class="footer-slider"> | ||
|
|
||
| <ul id="footer-slider" class="bxslider cf"> | ||
| <li><a href="#"><img src="http://mfas3.s3.amazonaws.com/styles/banner_grid-9_retina/s3/66.152_exhibition_page.jpg?itok=aU2W2utf" alt="" onerror="if (this.src != '/ui/img/rect-noimage.jpg') this.src = '/ui/img/rect-noimage.jpg';" /></a></li> | ||
| <li><a href="#"><img src="http://mfas3.s3.amazonaws.com/styles/banner_grid-9_retina/s3/66.152_exhibition_page.jpg?itok=aU2W2utf" alt="" onerror="if (this.src != '/ui/img/rect-noimage.jpg') this.src = '/ui/img/rect-noimage.jpg';" /></a></li> | ||
| <li><a href="#"><img src="http://mfas3.s3.amazonaws.com/styles/banner_grid-9_retina/s3/66.152_exhibition_page.jpg?itok=aU2W2utf" alt="" onerror="if (this.src != '/ui/img/rect-noimage.jpg') this.src = '/ui/img/rect-noimage.jpg';" /></a></li> | ||
| <li><a href="#"><img src="http://mfas3.s3.amazonaws.com/styles/banner_grid-9_retina/s3/66.152_exhibition_page.jpg?itok=aU2W2utf" alt="" onerror="if (this.src != '/ui/img/rect-noimage.jpg') this.src = '/ui/img/rect-noimage.jpg';" /></a></li> | ||
| <li><a href="#"><img src="http://mfas3.s3.amazonaws.com/styles/banner_grid-9_retina/s3/66.152_exhibition_page.jpg?itok=aU2W2utf" alt="" onerror="if (this.src != '/ui/img/rect-noimage.jpg') this.src = '/ui/img/rect-noimage.jpg';" /></a></li> | ||
| <li><a href="#"><img src="http://mfas3.s3.amazonaws.com/styles/banner_grid-9_retina/s3/66.152_exhibition_page.jpg?itok=aU2W2utf" alt="" onerror="if (this.src != '/ui/img/rect-noimage.jpg') this.src = '/ui/img/rect-noimage.jpg';" /></a></li> | ||
| <li><a href="#"><img src="http://mfas3.s3.amazonaws.com/styles/banner_grid-9_retina/s3/66.152_exhibition_page.jpg?itok=aU2W2utf" alt="" onerror="if (this.src != '/ui/img/rect-noimage.jpg') this.src = '/ui/img/rect-noimage.jpg';" /></a></li> | ||
| <li><a href="#"><img src="http://mfas3.s3.amazonaws.com/styles/banner_grid-9_retina/s3/66.152_exhibition_page.jpg?itok=aU2W2utf" alt="" onerror="if (this.src != '/ui/img/rect-noimage.jpg') this.src = '/ui/img/rect-noimage.jpg';" /></a></li> | ||
| <li><a href="#"><img src="http://mfas3.s3.amazonaws.com/styles/banner_grid-9_retina/s3/66.152_exhibition_page.jpg?itok=aU2W2utf" alt="" onerror="if (this.src != '/ui/img/rect-noimage.jpg') this.src = '/ui/img/rect-noimage.jpg';" /></a></li> | ||
| </ul> | ||
|
|
||
| <span id="footer-slider-previous" class="footer-slider-previous"></span> | ||
| <span id="footer-slider-next" class="footer-slider-next"></span> | ||
|
|
||
| </div> <!-- /favorite-slider --> | ||
|
|
||
|
|
||
| </footer> <!-- /footer --> | ||
|
|
||
| <div id="menu-panel" data-role="panel" data-position="right" data-position-fixed="true" data-display="overlay" class="menu-panel"> | ||
| <ul> | ||
| <li class="menu-home active"><a href="index.html">Discover Artbot</a></li> | ||
| <li class="menu-calendar"><a href="bydate.html">By Date</a></li> | ||
| <li class="menu-location"><a href="bylocation.html">By Location</a></li> | ||
| <li class="menu-favorites"><a href="favorites.html">Favorites</a></li> | ||
| <li class="menu-history"><a href="history.html">History</a></li> | ||
| <li class="menu-settings"><a href="settings.html">Settings</a></li> | ||
| <li class="menu-interests"><a href="interests.html">My Interests</a></li> | ||
| <li class="menu-signin"><a href="sign-in.html" class="signin-link">Sign in</a></li> | ||
| <li class="menu-logout"><a href="#" class="action-logout">Log out</a></li> | ||
| </ul> | ||
| </div> | ||
|
|
||
| </div> | ||
|
|
||
| <div id="signup-popup" class="modal" data-history="false"> | ||
| <div class="modal-content"> | ||
| <h2>Sign up</h2> | ||
|
|
||
| <p>Sign up so Artbot can recommend events and exhibitions based on your interests.</p> | ||
|
|
||
| <form id="signup-form" name="signup-form" method="post" action=""> | ||
|
|
||
| </form> | ||
| </div> | ||
| <a href="#close" data-rel="back" class="btn btn-round ui-btn close"><i class="icon icon-cross"></i><span class="visuallyhidden">Close</span></a> | ||
| </div> | ||
|
|
||
| <!-- Javascript --> | ||
| <script src="ui/js/jquery/jquery-1.10.2.min.js"></script> | ||
| <script src="ui/js/jquery/jquery.migrate.1.2.1.min.js"></script> | ||
| <script src='https://api.tiles.mapbox.com/mapbox.js/v2.0.0/mapbox.js'></script> | ||
| <!--<script src="ui/js/scripts-concat.min.js"></script>--> | ||
| <script src="ui/js/jquery/jquery.mobile-1.4.3.min.js"></script> | ||
|
|
||
| <script> | ||
| (function (i, s, o, g, r, a, m) { | ||
| i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () { | ||
| (i[r].q = i[r].q || []).push(arguments) | ||
| }, i[r].l = 1 * new Date(); a = s.createElement(o), | ||
| m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g; m.parentNode.insertBefore(a, m) | ||
| })(window, document, 'script', '//www.google-analytics.com/analytics.js', 'ga'); | ||
|
|
||
| ga('create', 'UA-54232936-1', 'auto'); | ||
| ga('send', 'pageview'); | ||
|
|
||
| $(function () { | ||
| $(document).on('pageshow', function (event, ui) { | ||
| //console.log("Google Analytics firing on pageshow"); | ||
| try { | ||
| if (location.hash) { | ||
| ga('send', 'pageview', location.hash); | ||
| //console.log("Sending GA a pageview with a location hash"); | ||
| } | ||
| else { | ||
| ga('send', 'pageview'); | ||
| //console.log("Sending GA a pageview without a location hash"); | ||
| } | ||
| } | ||
| catch (error) { | ||
| console.log("There's been an error; GA code did not execute as expected."); | ||
| } | ||
| }); | ||
| }); | ||
| </script> | ||
|
|
||
| </body> | ||
| </html> |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,10 @@ | |
| * Written while drinking Belgian ales and listening to jazz | ||
| * | ||
| * Released under the MIT license - http://opensource.org/licenses/MIT | ||
| * | ||
| * 11/12/2014: Altered slightly to fix issues with Prev/Next when all carousel items are showing | ||
| * Sherri Alexander, [email protected] | ||
| * | ||
| */ | ||
|
|
||
| ;(function($){ | ||
|
|
@@ -849,7 +853,13 @@ | |
| // if first slide | ||
| if (slider.active.index == 0){ | ||
| slider.controls.prev.addClass('disabled'); | ||
| slider.controls.next.removeClass('disabled'); | ||
|
|
||
| // in case it's a carousel with all items showing | ||
| if (slider.active.index == getPagerQty() - 1){ | ||
| slider.controls.next.addClass('disabled'); | ||
| } else { | ||
| slider.controls.next.removeClass('disabled'); | ||
| } | ||
| // if last slide | ||
| }else if(slider.active.index == getPagerQty() - 1){ | ||
| slider.controls.next.addClass('disabled'); | ||
|
|
||
Oops, something went wrong.