diff options
| -rw-r--r-- | templates/web/fixmystreet/pagination.html | 15 | ||||
| -rwxr-xr-x | templates/web/fixmystreet/reports/council.html | 4 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/base.scss | 79 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 6 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/layout.scss | 30 |
5 files changed, 82 insertions, 52 deletions
diff --git a/templates/web/fixmystreet/pagination.html b/templates/web/fixmystreet/pagination.html new file mode 100644 index 000000000..4f4d00a79 --- /dev/null +++ b/templates/web/fixmystreet/pagination.html @@ -0,0 +1,15 @@ +[% IF pager.last_page > 1 %] +<section class="full-width"> + <p class="pagination"> + [% IF pager.previous_page %] + <a class="prev" href="[% c.req.uri_with({ $param => pager.previous_page }) %]">Previous</a> + [% END %] + + [% pager.first %] to [% pager.last %] of [% pager.total_entries %] + + [% IF pager.next_page %] + <a class="next" href="[% c.req.uri_with({ $param => pager.next_page }) %]">Next</a> + [% END %] + </p> +</section> +[% END %] diff --git a/templates/web/fixmystreet/reports/council.html b/templates/web/fixmystreet/reports/council.html index 374f9713a..b426adcaa 100755 --- a/templates/web/fixmystreet/reports/council.html +++ b/templates/web/fixmystreet/reports/council.html @@ -61,7 +61,7 @@ <ul id="key-tools"[% IF NOT children.size %] class="singleton"[% END %]> <li><a rel="nofollow" id="key-tool-updates-area" class="feed" href="[% rss_url %]">[% tprintf(loc('Get updates of problems in this %s'), thing) %]</a></li> [% IF children.size %] - <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% loc('Wards of this council') %]</a> + <li><a href="#council_wards" id="key-tool-wards" class="chevron">[% loc('Wards of this council') %]</a></li> [% END %] </ul> </div> @@ -96,6 +96,8 @@ %] </section> +[% INCLUDE 'pagination.html', param = 'p' %] + </div> [% INCLUDE 'footer.html' %] diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss index 8def019c3..068f33ab6 100644 --- a/web/cobrands/fixmystreet/base.scss +++ b/web/cobrands/fixmystreet/base.scss @@ -580,7 +580,7 @@ p.label-valid { size:0.6875em; family: 'helvetica', 'arial', sans-serif; } - &:hover, &.hover { + &:hover, &.hover, &.active { text-decoration:none; background-color:#333; color:#fff; @@ -597,7 +597,7 @@ p.label-valid { background-image:url('images/sprite.png'); background-position:center -2716px; } - &.hover { + &.hover, &.active { background-image:url('images/sprite.png'); background-position:center -2064px; } @@ -944,6 +944,41 @@ a:hover.button-left { } } +// fancybox gallery images have a magnifying glass in the corner +.update-img { + a { + @include inline-block; + position:relative; + span { + position:absolute; + top:0; + right:0; + display:block; + width:20px; + height:20px; + opacity: 0.5; + background:#fff url(images/sprite.png) -16px -1098px no-repeat; + //hide text - http://nicolasgallagher.com/another-css-image-replacement-technique/ + font: 0/0 a; + color: transparent; + } + &:hover span { + opacity: 1; + } + } +} +//bit of a hack - as we can't use em's, push the span out to the right +//by how much it would be if the user did not resize the text +.issue-list li .update-wrap .update-img a span { + right:-16px; + top:-8px; +} + +.problem-header { + margin-bottom:1em; +} + + // map stuff #map_box{ @extend .full-width; @@ -1330,23 +1365,29 @@ table.nicetable { } } -ul.breadcrumb { - @include list-reset; - margin:-1em -1em 1em -1em; - overflow:hidden; - li { - span { - display:block; - padding:0.5em 1em 0.5em 0; - } - a { - background:url('images/sprite.png') right -3220px no-repeat; - padding:0.5em 2.5em 0.5em 1em; - color:#333; - &:hover { - color:#000; - text-decoration:none; - } +.pagination { + text-align:center; + padding:0.5em 1em; + background:#eee; + position:relative; + .prev { + position:absolute; + left:0.5em; + } + .next { + position:absolute; + right:0.5em; + } + a { + @include inline-block; + background:$primary; + padding-left:0.5em; + padding-right:0.5em; + color:#1a1a1a; + &:hover { + color:#1a1a1a; + text-decoration:none; + background:$primary/1.1; } } } diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 3074569ac..6b26a94cd 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -308,7 +308,7 @@ $(function(){ //move 'skip this step' link on mobile $('.mobile #skip-this-step').hide(); - $('.mobile #skip-this-step a').appendTo('#key-tools').addClass('chevron').wrap('<li>'); + $('.mobile #skip-this-step a').addClass('chevron').wrap('<li>').appendTo('#key-tools'); /* * Tabs @@ -465,7 +465,9 @@ $.fn.drawer = function(id, ajax) { $('#council_wards').hide().removeClass('hidden-js').find('h2').hide(); $('#key-tool-wards').click(function(e){ e.preventDefault(); - $('#council_wards').slideToggle(); + $('#council_wards').slideToggle('800', function(){ + $('#key-tool-wards').toggleClass('active'); + }); }); } else { $('#key-tool-wards').drawer('council_wards', false); diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss index 139b9257a..191793fcb 100644 --- a/web/cobrands/fixmystreet/layout.scss +++ b/web/cobrands/fixmystreet/layout.scss @@ -683,36 +683,6 @@ body.twothirdswidthpage { width: 29em; } -// fancybox gallery images have a magnifying glass in the corner -.update-img { - a { - @include inline-block; - position:relative; - span { - position:absolute; - top:0; - right:0; - display:block; - width:20px; - height:20px; - opacity: 0.5; - background:#fff url(images/sprite.png) -16px -1098px no-repeat; - //hide text - http://nicolasgallagher.com/another-css-image-replacement-technique/ - font: 0/0 a; - color: transparent; - } - &:hover span { - opacity: 1; - } - } -} -//bit of a hack - as we can't use em's, push the span out to the right -//by how much it would be if the user did not resize the text -.issue-list li .update-wrap .update-img a span { - right:-16px; - top:-8px; -} - /*FORMS*/ input[type=text], input[type=password], |