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.

Sign up for GitHub

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

Jump to bottom

improve dehub navigation bar (bug 750904) #12

Merged
merged 1 commit into from Mar 27, 2014
Merged

improve dehub navigation bar (bug 750904) #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/devhub/templates/devhub/addons/edit.html
View file
Open in desktop
Expand Up @@ -19,7 +19,7 @@
<header>
{{ dev_breadcrumbs(addon) }}
{{ l10n_menu(addon.default_locale) }}
<h2>{{ title }}</h2>
<h2>{{ addon.name }}</h2>
</header>

<section class="primary" role="main">
Expand Down
2 changes: 1 addition & 1 deletion apps/devhub/templates/devhub/addons/owner.html
View file
Open in desktop
Expand Up @@ -16,7 +16,7 @@
<header>
{{ dev_breadcrumbs(addon, items=[(None, title)]) }}
{{ l10n_menu(addon.default_locale) }}
<h2>{{ title }}</h2>
<h2>{{ addon.name }}</h2>
</header>
<section id="edit-addon" class="primary devhub-form" role="main">
<form method="post" class="item" action="">
Expand Down
2 changes: 1 addition & 1 deletion apps/devhub/templates/devhub/addons/profile.html
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@
<header>
{{ dev_breadcrumbs(addon, items=[(None, title)]) }}
{{ l10n_menu(addon.default_locale) }}
<h2>{{ title }}</h2>
<h2>{{ addon.name }}</h2>
</header>
<section class="primary" role="main">
{% set remove_url = addon.get_dev_url('profile.remove') %}
Expand Down
145 changes: 143 additions & 2 deletions apps/devhub/templates/devhub/includes/addons_edit_nav.html
View file
Open in desktop
@@ -1,19 +1,160 @@
{% from "includes/forms.html" import tip %}
{% set urls = [
(addon.get_dev_url(), _('Edit Listing')),
(addon.get_dev_url('owner'), _('Manage Authors & License')),
(addon.get_dev_url('owner'), _('Manage Authors & License')),
(addon.get_dev_url('profile'), _('Manage Developer Profile')),
(addon.get_dev_url('payments'), _('Manage Payments')),
(addon.get_dev_url('versions'), _('Manage Status & Versions')),
] %}

{% macro status_and_tip(addon, tip) %}
{% if addon.status != amo.STATUS_DISABLED and addon.disabled_by_user %}
<span class="{{ status_class(addon) }}"><b>{{ _('You have disabled this add-on') }}</b></span>
{% else %}
<span class="{{ status_class(addon) }}"><b>{{ amo.STATUS_CHOICES[addon.status] }}</b></span>
{% endif %}
<span class="tip tooltip" title="{{ tip }}">?</span>
{% endmacro %}

<section class="secondary" role="complementary">
<div class="addon-status">
<img class="addon-icon" src="{{ addon.icon_url }}">
<ul class="addon-details">
<li>
<strong>
{{ _('Status:') }}

{% if addon.disabled_by_user and addon.status != amo.STATUS_DISABLED %}
<a href="{{ addon.get_dev_url('versions') }}">
{{ status_and_tip(addon,
_("Your add-on's listing is disabled and is not showing
anywhere in our gallery or update service.")) }}
</a>
{% elif addon.status == amo.STATUS_NULL %}
<a href="{{ url('devhub.submit.resume', addon.slug) }}">
{{ status_and_tip(addon, _('Please complete your add-on.')) }}
</a>
{% elif addon.status == amo.STATUS_PENDING %}
<a href="{{ addon.get_dev_url('versions') }}">
{{ status_and_tip(addon, _('You will receive an email when the review is complete.')) }}
</a>
{% elif addon.status == amo.STATUS_UNREVIEWED %}
<a href="{{ addon.get_dev_url('versions') }}">
{{ status_and_tip(addon,
_("You will receive an email when the review is complete. Until
then, your add-on is not listed in our gallery but can be
accessed directly from its details page.")) }}
</a>
{% elif addon.status == amo.STATUS_NOMINATED %}
<a href="{{ addon.get_dev_url('versions') }}">
{{ status_and_tip(addon,
_("You will receive an email when the review is complete. Until
then, your add-on is not listed in our gallery but can be
accessed directly from its details page. ")) }}
</a>
{% elif addon.status == amo.STATUS_PUBLIC %}
<a href="{{ addon.get_dev_url('versions') }}">
{{ status_and_tip(addon,
_("Your add-on is displayed in our gallery and users are
receiving automatic updates.")) }}
</a>
{% elif addon.status == amo.STATUS_DISABLED %}
<a href="{{ addon.get_dev_url('versions') }}#version-upload" class="version-upload">
{{ status_and_tip(addon,
_("Your add-on was disabled by a site administrator and is no
longer shown in our gallery. If you have any questions,
please email marketplace-staff@mozilla.org.")) }}
</a>
{% elif addon.status == amo.STATUS_LITE %}
<a href="{{ addon.get_dev_url('versions') }}">
{{ status_and_tip(addon,
_("Your add-on is displayed in our gallery as experimental
and users are receiving automatic updates. Some features
are unavailable to your add-on.")) }}
</a>
{% elif addon.status == amo.STATUS_LITE_AND_NOMINATED %}
<a href="{{ addon.get_dev_url('versions') }}">
{{ status_and_tip(addon,
_("You will receive an email when the full review is complete.
Until then, your add-on is displayed in our gallery as
experimental and users are receiving automatic updates.
Some features are unavailable to your add-on.")) }}
</a>
{% elif addon.status == amo.STATUS_PURGATORY %}
<a href="{{ addon.get_dev_url('versions') }}">
{{ status_and_tip(addon,
_("All add-ons hosted in our gallery must now be reviewed by an
editor. If you wish to continue hosting your add-on, please
click to select a review process.")) }}
</a>
{% endif %}
</strong>
</li>
{% if addon.current_version %}
<li>
<strong>{{ _('Current Version:') }}</strong>
<a href="{{ addon.current_version.get_url_path() }}">
{{ addon.current_version }}
<span class="tip tooltip" title="{{ _('This is the version of your add-on that will
be installed if someone clicks the Install
button on addons.mozilla.org.') }}">?</span>
</a>
</li>
{% endif %}
<li>
<strong>{{ _('Last Updated:') }}</strong>
{{ addon.last_updated|datetime(_('%b %e, %Y')) }}
</li>
{% if addon.latest_version and addon.latest_version != addon.current_version %}
<li>
<strong>{{ _('Next Version:') }}</strong>
<a href="{{ addon.latest_version.get_url_path() }}">
{{ addon.latest_version.version }}
<span class="tip tooltip" title="{{ _('This is the newest uploaded version, however
it isn’t live on the site yet.') }}">?</span>
</a>
</li>
{% endif %}
{% with position = get_position(addon) %}
{% if position and position.pos and position.total %}
<li>
<strong>{{ _('Queue Position:') }}</strong>
{% trans position=position.pos|numberfmt,
total=position.total|numberfmt %}
{{ position }} of {{ total }}
{% endtrans %}
</li>
{% endif %}
{% endwith %}
</ul>
<p class="addon-upload">
{% if not addon.is_incomplete() and not addon.is_disabled %}
<strong>
<a href="{{ addon.get_dev_url('versions') }}#version-upload" class="version-upload">{{ _('Upload New Version') }}</a>
</strong>
&middot;
{% endif %}
<a href="{{ addon.get_dev_url('versions') }}">{{ _('View All' ) }}</a>
</p>
</div>
<div class="highlight" id="edit-addon-nav">
<h3>{{ addon.name }}</h3>
<ul class="refinements">
{% for url, title in urls %}
<li {% if url in request.path %}class="selected"{% endif %}>
<a href="{{ url }}">{{ title }}</a></li>
{% endfor %}
<li class="addon-manage">
{% if check_addon_ownership(request, addon, dev=True) %}
{% if addon.disabled_by_user and addon.status != amo.STATUS_DISABLED %}
<a href="{{ addon.get_dev_url('enable') }}" class="enable-addon">{{ _('Enable Add-on') }}</a>
{% elif not addon.is_disabled %}
<a href="{{ addon.get_dev_url('versions') }}#disable-addon" class="disable-addon">{{ _('Disable Add-on') }}</a>
{% endif %}
{% endif %}
{% if check_addon_ownership(request, addon) and addon.can_be_deleted() %}
<a href="{{ addon.get_dev_url('versions') }}#delete-addon" class="delete-addon">{{ _('Delete Add-on') }}</a>
{% endif %}
</li>
</ul>
<ul class="refinements">
<li><a href="{{ addon.get_url_path() }}">
Expand Down
2 changes: 1 addition & 1 deletion apps/devhub/templates/devhub/payments/payments.html
View file
Open in desktop
Expand Up @@ -11,7 +11,7 @@
{% block content %}
<header>
{{ dev_breadcrumbs(addon, items=[(None, title)]) }}
<h2>{{ title }}</h2>
<h2>{{ addon.name }}</h2>
</header>
<section class="primary payments devhub-form" role="main">
{% set contrib = addon.takes_contributions and addon.has_full_profile() or errors %}
Expand Down
8 changes: 4 additions & 4 deletions apps/devhub/templates/devhub/versions/list.html
View file
Open in desktop
Expand Up @@ -10,7 +10,7 @@
{% block content %}
<header>
{{ dev_breadcrumbs(addon, items=[(None, title)]) }}
<h2>{{ title }}</h2>
<h2>{{ addon.name }}</h2>
</header>
<section id="edit-addon" class="primary devhub-form" role="main">
<h3>{{ _('Current Status') }}</h3>
Expand Down Expand Up @@ -86,15 +86,15 @@ <h3>{{ _('Current Status') }}</h3>

{% if check_addon_ownership(request, addon, dev=True) %}
{% if addon.disabled_by_user and addon.status != amo.STATUS_DISABLED %}
<a href="{{ addon.get_dev_url('enable') }}" id="enable-addon">
<a href="{{ addon.get_dev_url('enable') }}" class="enable-addon">
{{ _('Enable Add-on') }}</a>
{% elif not addon.is_disabled %}
<a href="#" id="disable-addon">
<a href="#" class="disable-addon">
{{ _('Disable Add-on') }}</a>
{% endif %}
{% endif %}
{% if check_addon_ownership(request, addon) and addon.can_be_deleted() %}
&middot; <a href="#" id="delete-addon">
&middot; <a href="#" class="delete-addon">
{{ _('Delete Add-on') }}</a>
{% endif %}
{% set current = addon.current_version %}
Expand Down
10 changes: 5 additions & 5 deletions apps/devhub/tests/test_views_versions.py
View file
Open in desktop
Expand Up @@ -221,25 +221,25 @@ def test_show_disable_button(self):
res = self.client.get(self.url)
doc = pq(res.content)
assert doc('#modal-disable')
assert doc('#disable-addon')
assert not doc('#enable-addon')
assert doc('.disable-addon')
assert not doc('.enable-addon')

def test_not_show_disable(self):
self.addon.update(status=amo.STATUS_DISABLED, disabled_by_user=False)
res = self.client.get(self.url)
doc = pq(res.content)
assert not doc('#modal-disable')
assert not doc('#disable-addon')
assert not doc('.disable-addon')

def test_show_enable_button(self):
self.addon.update(disabled_by_user=True)
res = self.client.get(self.url)
doc = pq(res.content)
a = doc('#enable-addon')
a = doc('.enable-addon')
assert a, "Expected Enable addon link"
eq_(a.attr('href'), self.enable_url)
assert not doc('#modal-disable')
assert not doc('#disable-addon')
assert not doc('.disable-addon')

def test_cancel_get(self):
cancel_url = reverse('devhub.addons.cancel', args=['a3615'])
Expand Down
80 changes: 80 additions & 0 deletions media/css/impala/developers.less
View file
Open in desktop
Expand Up @@ -69,6 +69,13 @@
right: 0;
}
}
ul.refinements li a {
padding: 0 10px 0 0;
}

ul.refinements li.selected a {
background: url("../../img/zamboni/arrow-left-blue.png") 100% .5em no-repeat;
}
}
}

Expand Down Expand Up @@ -356,6 +363,79 @@
}
}

/* Devhub navigation panel */
.secondary {
.addon-status {
background: white;
border: 1px solid @border-blue;
border-radius: 8px;
clear: both;
color: @medium-gray;
margin: 0 0 12px;
padding: 10px;
position: relative;
img {
left: 10px;
position: absolute;
top: 12px;
}
.addon-details {
font-size: 12px;
margin: 0 0 5px 45px;
li:first-child {
color: #444;
}
.tip {
border-radius: 6px;
font-size: 10px;
height: 12px;
line-height: 14px;
margin-left: 3px;
width: 12px;
}
}
.addon-upload {
border-top: 1px dotted #94bfce;
font-size: 11px;
margin: 0;
padding-top: 5px;
}
}
ul.refinements {
border-bottom: 1px dotted #94bfce;
margin-bottom: 1em;
padding-bottom: 1em;
&:last-child {
border-bottom: none;
}
li a {
color: #3d6db5;
font-size: .923em;
padding: 0 0 0 10px;
}
li.addon-manage a {
display: inline;
&:last-child {
padding-left: 0;
&:before {
content: "\00b7";
padding-right: 5px;
}
}
&:only-child {
padding-left: 10px;
&:before {
content: "";
padding: 0;
}
}
}
li.selected a {
background: url("../../img/zamboni/arrow-right-blue.png") 0 .5em no-repeat;
}
}
}

.modal p,
.popup p {
line-height: 1.3;
Expand Down
25 changes: 0 additions & 25 deletions media/css/zamboni/zamboni.css
View file
Open in desktop
Expand Up @@ -2252,37 +2252,12 @@ form .error .note.error {
color: #235;
}

.secondary ul.refinements {
border-bottom: 1px dotted #94bfce;
padding-bottom: 1em;
margin-bottom: 1em;
}

#refine-results div:last-child ul.refinements {
border-bottom: 0;
margin-bottom: 0;
padding-bottom: 0;
}

.secondary ul.refinements li a {
color: #3d6db5;
padding: 0 0 0 10px;
font-weight: bold;
font-size: .923em;
}

.html-rtl .secondary ul.refinements li a {
padding: 0 10px 0 0;
}

.secondary ul.refinements li.selected a {
background: transparent url("../../img/zamboni/arrow-right-blue.png") 0 .5em no-repeat;
}

.html-rtl .secondary ul.refinements li.selected a {
background: transparent url("../../img/zamboni/arrow-left-blue.png") 100% .5em no-repeat;
}

/** =Report abuse form *********/
.abuse {
border: 0;
Expand Down