Skip to content
This repository has been archived by the owner on Mar 15, 2018. It is now read-only.

Commit

Permalink
Merge pull request #670 from ngokevin/mobilequeuesearch
Browse files Browse the repository at this point in the history 
add mobile review queue advanced search (bug 839542)
  • Loading branch information
@ngokevin
ngokevin committed Mar 21, 2013
2 parents c6d0f74 + a1fa814 commit 3057a0f
Show file tree
Hide file tree
Showing 27 changed files with 629 additions and 107 deletions.
84 changes: 43 additions & 41 deletions apps/amo/templates/amo/mobile/impala_paginator.html
View file
@@ -1,41 +1,43 @@
{% if pager.paginator.num_pages > 1 %}
<nav class="paginator c pjax-trigger">
<p class="rel">
<a href="{{ pager.url|urlparams(page=1)
if pager.has_previous() else '#' }}"
title="{{ _('Jump to first page') }}"
class="button jump{{ ' disabled' if not pager.has_previous() }}">
<span>&#x25C2;&#x25C2;</span></a>
<a href="{{ pager.url|urlparams(page=pager.previous_page_number())
if pager.has_previous() else '#' }}"
class="button prev{% if not pager.has_previous() %} disabled{% endif %}">
<span>&#x25C2; {{ _('Previous') }}</span></a>
<a href="{{ pager.url|urlparams(page=pager.next_page_number())
if pager.has_next() else '#' }}"
class="button next{% if not pager.has_next() %} disabled{% endif %}">
<span>{{ _('Next') }} &#x25B8;</span></a>
<a href="{{ pager.url|urlparams(page=pager.paginator.num_pages)
if pager.has_next() else '#' }}"
class="button jump{{ ' disabled' if not pager.has_next() }}">
<span>&#x25B8;&#x25B8;</span></a>
</p>
<p class="num">
{# L10n: This is a page range (e.g., Page 1 of 50). #}
{% trans current_pg=pager.number,
last_pg=pager.paginator.num_pages,
current_pg_url=pager.url|urlparams(page=pager.number),
last_pg_url=pager.url|urlparams(page=pager.paginator.num_pages) %}
Page <a href="{{ current_pg_url }}">{{ current_pg }}</a> of
<a href="{{ last_pg_url }}">{{ last_pg }}</a>
{% endtrans %}
</p>
<p class="pos">
{# L10n: First and second arguments are the result range (e.g., 1-20);
third argument is the number of total results (e.g., 1,000). #}
{% trans begin=pager.start_index(), end=pager.end_index(),
count=pager.paginator.count|numberfmt %}
Showing <b>{{ begin }}</b>&ndash;<b>{{ end }}</b> of <b>{{ count }}</b>
{% endtrans %}
</p>
</nav>
{% endif %}
<nav class="paginator c pjax-trigger">
{% if pager.paginator.num_pages > 1 %}
<p class="rel">
<a href="{{ pager.url|urlparams(page=1)
if pager.has_previous() else '#' }}"
title="{{ _('Jump to first page') }}"
class="button jump{{ ' disabled' if not pager.has_previous() }}">
<span>&#x25C2;&#x25C2;</span></a>
<a href="{{ pager.url|urlparams(page=pager.previous_page_number())
if pager.has_previous() else '#' }}"
class="button prev{% if not pager.has_previous() %} disabled{% endif %}">
<span>&#x25C2; {{ _('Previous') }}</span></a>
<a href="{{ pager.url|urlparams(page=pager.next_page_number())
if pager.has_next() else '#' }}"
class="button next{% if not pager.has_next() %} disabled{% endif %}">
<span>{{ _('Next') }} &#x25B8;</span></a>
<a href="{{ pager.url|urlparams(page=pager.paginator.num_pages)
if pager.has_next() else '#' }}"
class="button jump{{ ' disabled' if not pager.has_next() }}">
<span>&#x25B8;&#x25B8;</span></a>
</p>
{% endif %}

<p class="num">
{# L10n: This is a page range (e.g., Page 1 of 50). #}
{% trans current_pg=pager.number,
last_pg=pager.paginator.num_pages,
current_pg_url=pager.url|urlparams(page=pager.number),
last_pg_url=pager.url|urlparams(page=pager.paginator.num_pages) %}
Page <a href="{{ current_pg_url }}">{{ current_pg }}</a> of
<a href="{{ last_pg_url }}">{{ last_pg }}</a>
{% endtrans %}
</p>

<p class="pos">
{# L10n: First and second arguments are the result range (e.g., 1-20);
third argument is the number of total results (e.g., 1,000). #}
{% trans begin=pager.start_index(), end=pager.end_index(),
count=pager.paginator.count|numberfmt %}
Showing <b>{{ begin }}</b>&ndash;<b>{{ end }}</b> of <b>{{ count }}</b>
{% endtrans %}
</p>
</nav>
119 changes: 98 additions & 21 deletions media/css/devreg/reviewers.styl
View file
Expand Up @@ -564,10 +564,10 @@ div.editor-stats-table > div.editor-stats-dark {
}
}

#queue-search {
.queue-search {
padding: 1em;
margin-bottom: 1em;
#clear-queue-search {
.clear-queue-search {
text-transform: lowercase;
}
.date_range {
Expand Down Expand Up @@ -606,11 +606,6 @@ div.editor-stats-table > div.editor-stats-dark {
position: relative;
bottom: 3px;
}
label {
display: block;
float: left;
width: 13em;
}
}
.device-type-select, .premium-type-select {
float: left;
Expand All @@ -631,6 +626,11 @@ div.editor-stats-table > div.editor-stats-dark {
height: 0;
visibility: hidden;
}
.basic-filters label {
display: block;
float: left;
width: 13em;
}
}
#id_q {
height: 2em;
Expand Down Expand Up @@ -1192,7 +1192,7 @@ iframe#manifest-contents {
margin-top: .5em;
width: 100%;
}
#queue-search button {
.queue-search button {
margin: .5em .5em 0 0;
}
html, body {
Expand Down Expand Up @@ -1372,13 +1372,14 @@ iframe#manifest-contents {

$mobileborder = #d7d2c3;
@media $portrait-max {
.mobile-queue-search, .mobile-paginator {
.queue-search-mobile, .mobile-paginator {
display: block;
}
.impala-paginator {
.impala-paginator, .advanced-search.desktop {
display: none;
}
.toggle-queue-search, #queue-search .button span, ul.tabnav a {
.advanced-search, .toggle-queue-search, .queue-search .button span,
ul.tabnav a, .clear-queue-search {
font-size: 16px;
}
.button {
Expand Down Expand Up @@ -1406,6 +1407,7 @@ $mobileborder = #d7d2c3;
height: 100%;
&.selected {
background: rgb(62, 52, 62);
padding-bottom: 4px;
a {
color: $white;
}
Expand All @@ -1424,7 +1426,7 @@ $mobileborder = #d7d2c3;
#site-notice {
margin-top: 0;
}
#queue-search {
.queue-search {
padding: 0;
margin: 26px 0 6px;
label[for="id_q"] {
Expand All @@ -1441,15 +1443,18 @@ $mobileborder = #d7d2c3;
max-width: 22%;
margin-right: 0;
}
.toggle-queue-search {
.toggle-queue-search, .clear-queue-search {
bottom: 64px;
float: right;
line-height: 6px;
margin-right: 3px;
position: relative;
}
.clear-queue-search {
text-transform: none;
}
}
.island #queue-search {
.queue-search-desktop {
display: none;
}
#reviewers-score-bar {
Expand Down Expand Up @@ -1480,12 +1485,12 @@ $mobileborder = #d7d2c3;
display: none;
}
&.app-install button.product, .button {
padding: 0;
top: 0;
height: 48px;
border: 0;
font-size: 13px;
font-weight: normal;
border: 0;
height: 48px;
padding: 0;
top: 0;
}
}
#page h1.menutrigger {
Expand Down Expand Up @@ -1562,12 +1567,22 @@ $mobileborder = #d7d2c3;
#queue-tab-overlay > menu.nav-action-menu > div button {
margin-bottom: 7px;
}
.status-overlay, .premium_types-overlay {
span {
font-size: 14px;
}
}
html {
font-size: 10px;
}
#page form[role="dialog"][data-type="action"] {
#page form[role="dialog"][data-type="action"],
#page .queue-search div[role="dialog"] {
position: fixed;
z-index: 1007;
button {
section h1 {
margin: 0 -15px
}
button, label[for] {
position: static;
}
}
Expand All @@ -1576,7 +1591,7 @@ $mobileborder = #d7d2c3;
display: block;
position: absolute;
right: 6px;
&:before {
&:after {
/* Triangle bottom-right. */
border-bottom: 10px solid $medium-gray;
border-left: 10px solid transparent;
Expand Down Expand Up @@ -1646,6 +1661,9 @@ $mobileborder = #d7d2c3;
display: none;
}
}
.no-results {
margin-top: 13px;
}
#log-filter, #log-listing thead {
display: none;
}
Expand Down Expand Up @@ -1790,6 +1808,65 @@ $mobileborder = #d7d2c3;
#site-nav nav.menu-nav li a {
font-size: 14px;
}
.queue-search .advanced-search {
margin: 13px 0 26px;
> div, .form-row, .form-elem {
width: 100%;
}
.basic-filters label {
width: auto;
}
label {
margin-bottom: 0;
}
.form-elem {
margin-bottom: 0;
min-height: 50px;
&:not(:first-child) {
border-top: 1px solid $light-gray;
}
label {
&[for] {
position: relative;
top: 17px;
}
&:not([for]) {
float: right;
}
&:first-child {
clear: both;
position: relative;
top: 17px;
left: 10px;
width: auto;
}
}
}
input[type="checkbox"], .selected-val {
float: right;
}
.selected-val {
background: $faint-gray;
border: 1px solid $medium-gray;
border-radius: 2px;
padding: 10px 30px 10px 10px;
position: relative;
right: 10px;
top: 6px;
.tabnav-sprite {
bottom: 3px;
right: 3px;
}
&.multi-val {
display: block;
float: none;
left: 0px;
margin: 16px auto;
position: relative;
width: 80%;
}
}
}
}

@media $landscape-max {
Expand Down

0 comments on commit 3057a0f

Please sign in to comment.