diff --git a/apps/addons/templates/addons/impala/author_other_addons.html b/apps/addons/templates/addons/impala/author_other_addons.html deleted file mode 100644 index c12f9b4544..0000000000 --- a/apps/addons/templates/addons/impala/author_other_addons.html +++ /dev/null @@ -1,11 +0,0 @@ -{% if author_addons %} -
    - {% for other in author_addons %} - {% if other.id == addon.id %}{% continue %}{% endif %} -
  1. - - {{ other.name|string|truncate(50) }} -
    2. - {% endfor %} -
-{% endif %} diff --git a/apps/addons/templates/addons/impala/contribution.html b/apps/addons/templates/addons/impala/contribution.html index cab43ed05d..486f91f5ae 100644 --- a/apps/addons/templates/addons/impala/contribution.html +++ b/apps/addons/templates/addons/impala/contribution.html @@ -1,4 +1,3 @@ -{% set meet_url = url('addons.meet', addon.slug) %} {% if addon.charity %} {% set charity_url = addon.charity.outgoing_url %} {% set charity_name = addon.charity.name %} @@ -6,16 +5,22 @@
{% with single_dev = addon.listed_authors|random %} - {{ single_dev.name }} + {{ single_dev.name }} {% endwith %} -
+
{{ _('Contribute') }} + {% if show_install %} + {# L10n: Click Contribute button OR Install button #} + {{ _('or') }} + {% set ver = version or None %} + {{ install_button(addon, version=ver, show_contrib=False, src=src) }} + {% endif %}
{# /button-wrapper #}

@@ -25,14 +30,6 @@ {% endtrans %} {% endif %}

{# /suggestion #} - - {% if show_install %} - {# L10n: Click Contribute button OR Install button #} - {{ _('or') }} - {% set ver = version or None %} - {{ install_button(addon, impala=True, version=ver, show_contrib=False, - src=src) }} - {% endif %}
{# /aux #}

{{ _('Enjoy this add-on?') }}

@@ -40,17 +37,17 @@ {% if text %} {{ text }} {% elif not addon.charity %} - {% trans %} - The developer of this add-on asks that you help support its + {% trans meet_url=url('addons.meet', addon.slug) %} + The developer of this add-on asks that you help support its continued development by making a small contribution. {% endtrans %} {% elif addon.charity_id == amo.FOUNDATION_ORG %} - {% trans %} + {% trans meet_url=url('addons.meet', addon.slug) %} The developer of this add-on asks that you show your support by making a donation to the {{ charity_name }}. {% endtrans %} {% else %} - {% trans %} + {% trans meet_url=url('addons.meet', addon.slug) %} The developer of this add-on asks that you show your support by making a small contribution to {{ charity_name }}. {% endtrans %} diff --git a/apps/addons/templates/addons/impala/details.html b/apps/addons/templates/addons/impala/details.html index ab39d82a4f..889b3076d4 100644 --- a/apps/addons/templates/addons/impala/details.html +++ b/apps/addons/templates/addons/impala/details.html @@ -233,7 +233,7 @@ - {{ install_button(addon, impala=True, collection=collection) }} + {{ install_button(addon, impala=True) }}
{% endfor %} {% endcache %} diff --git a/apps/addons/urls.py b/apps/addons/urls.py index 45d66d8865..76d2d16199 100644 --- a/apps/addons/urls.py +++ b/apps/addons/urls.py @@ -42,12 +42,6 @@ detail_patterns = patterns('', impala_detail_patterns = patterns('', url('^$', views.impala_addon_detail, name='addons.i_detail'), ('^reviews/', include('reviews.impala_urls')), - url('^developers$', views.impala_developers, {'page': 'developers'}, - name='addons.meet'), - url('^contribute/roadblock/', views.impala_developers, - {'page': 'roadblock'}, name='addons.roadblock'), - url('^contribute/installed/', views.impala_developers, - {'page': 'installed'}, name='addons.installed'), ) diff --git a/apps/addons/views.py b/apps/addons/views.py index 38dae3c290..ffbe1298c3 100644 --- a/apps/addons/views.py +++ b/apps/addons/views.py @@ -532,7 +532,8 @@ def privacy(request, addon): return jingo.render(request, 'addons/privacy.html', {'addon': addon}) -def _developers(request, addon, page, template=None): +@addon_view +def developers(request, addon, page): if 'version' in request.GET: qs = addon.versions.filter(files__status__in=amo.VALID_STATUSES) version = get_list_or_404(qs, version=request.GET['version'])[0] @@ -553,23 +554,13 @@ def _developers(request, addon, page, template=None): if addon.is_persona(): raise http.Http404() author_addons = order_by_translation(addon.authors_other_addons, 'name') - return jingo.render(request, template, + return jingo.render(request, 'addons/developers.html', {'addon': addon, 'author_addons': author_addons, 'page': page, 'src': src, 'contribution_src': contribution_src, 'version': version}) -@addon_view -def developers(request, addon, page): - return _developers(request, addon, page, 'addons/developers.html') - - -@addon_view -def impala_developers(request, addon, page): - return _developers(request, addon, page, 'addons/impala/developers.html') - - @addon_view def contribute(request, addon): contrib_type = request.GET.get('type', 'suggested') diff --git a/apps/reviews/views.py b/apps/reviews/views.py index 0d6ef6d012..ef1f0d6aa9 100644 --- a/apps/reviews/views.py +++ b/apps/reviews/views.py @@ -71,7 +71,7 @@ def review_list(request, addon, review_id=None, user_id=None, template=None): @addon_view -def impala_review_list(request, addon, review_id=None, user_id=None): +def impala_review_list(request, addon, review_id=None, user_id=None, template=None): q = (Review.objects.valid().filter(addon=addon) .order_by('-created')) diff --git a/apps/users/templates/users/impala/vcard.html b/apps/users/templates/users/impala/vcard.html deleted file mode 100644 index c88dcf70d8..0000000000 --- a/apps/users/templates/users/impala/vcard.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - {% if profile.location %} - - - - - {% endif %} - {% if profile.occupation %} - - - - - {% endif %} - {% if profile.homepage %} - - - - - {% endif %} - {% if not profile.emailhidden %} - - - - - {% endif %} - - - - - {% if author_addons %} - - - - - {% endif %} - - - - - -
{{ _('Developer Information') }}
{{ _('Name') }}{{ profile.name }}
{{ _('Location') }}{{ profile.location }}
{{ _('Occupation') }}{{ profile.occupation }}
{{ _('Homepage') }} - {{ profile.homepage }}
{{ _('Email address') }}{{ emaillink(profile.email) }}
{{ _('User since') }}{{ profile.created|datetime }}
{{ _('Other Add-ons developed') }}{% include "addons/impala/author_other_addons.html" %}
{{ _('Average rating for their Add-ons') }}{{ profile.averagerating|float|stars }}
diff --git a/media/css/impala/addon_details.less b/media/css/impala/addon_details.less index 38ee8d9526..55e3c098ee 100644 --- a/media/css/impala/addon_details.less +++ b/media/css/impala/addon_details.less @@ -12,6 +12,7 @@ margin: 0 12px 1em 0; } h2 { + font-size: 24px; padding-right: 54px; } .install { @@ -63,7 +64,7 @@ .border-radius(5px); .box-shadow(0 -1px 0 #D7E1ED inset, 0 1px 0 rgba(0, 0, 0, 0.05)); border: 1px solid #CCD6E3; - padding: 14px 14px 14px 104px; + padding: 1em 1em 1em 104px; background: #E3EDFA; margin-bottom: 1em; h3 { @@ -79,23 +80,17 @@ } .notice.author { - min-height: 64px; position: relative; + height: 64px; .aux { float: right; - margin-left: 7px; text-align: center; + margin: 0 1em; p { font-size: 11px; } } - .continue { - display: block; - margin-top: .25em; - } .avatar { - height: 64px; - width: 64px; position: absolute; left: 20px; top: 1em; @@ -406,8 +401,8 @@ } h4 { font-size: 12px; - line-height: 14px; } + } } @@ -426,93 +421,3 @@ span.featured { span.featured { background-color: #093; } - -span.emaillink { - direction: rtl; - unicode-bidi: bidi-override; - .i { - display: none; - } -} - -caption { - display: none; -} - -th { - text-align: left; -} - -.html-rtl th { - text-align: right; -} - -table.person-info { - width: 100%; - th, td { - border-top: 1px solid @border-black; - padding: 8px 0; - } - th { - color: #333; - line-height: 15px; - width: 40%; - } - tr:first-child { - th, td { - border-top: none; - } - } - td { - padding-top: 0; - } - ol { - list-style: decimal; - margin: 0 0 0 1.5em; - } -} - -img.avatar { - border: 3px solid #fff; -} -img.icon { - padding: 4px; -} - -.meet { - .hero h2 { - margin-top: 1em; - } - hgroup.hero h2 { - margin-bottom: 1em; - } - &.about { - hgroup.hero h2 { - margin: 2em 0; - } - } - .author-bio { - border-top: 1px dotted @border-blue; - margin-top: 1em; - padding-top: 1em; - } - .notice.author { - padding-left: 14px; - .avatar { - display: none; - } - } - .island { - > h3 { - margin: 0; - } - > section { - float: none; - padding: 0 14px 0 0; - width: auto; - } - .secondary { - width: 208px; - } - } -} diff --git a/media/css/impala/copy.less b/media/css/impala/copy.less new file mode 100644 index 0000000000..ac301be1c0 --- /dev/null +++ b/media/css/impala/copy.less @@ -0,0 +1,16 @@ +.copy { + b { + font-weight: bold; + } + ul { + list-style: disc outside none; + margin: 0 0 0 20px; + } + ol { + list-style: decimal outside none; + margin: 0 0 0 20px; + } + blockquote { + margin-bottom: 0; + } +} \ No newline at end of file diff --git a/media/css/impala/lib.less b/media/css/impala/lib.less index 2a0bf2118c..1848966946 100644 --- a/media/css/impala/lib.less +++ b/media/css/impala/lib.less @@ -7,7 +7,6 @@ @error-red: #C00000; @orange: #D16B00; @border-blue: #C9DDF2; -@border-black: fadeOut(#000, 80%); @green: #093; diff --git a/media/css/impala/prose.less b/media/css/impala/prose.less index b0e49d8e0b..b623c5eb6a 100644 --- a/media/css/impala/prose.less +++ b/media/css/impala/prose.less @@ -1,13 +1,10 @@ .prose { line-height: 1.2em; - ul, ol { - margin: 0 0 0 20px; - } ul { - list-style: disc; + list-style-type: disc; } ol { - list-style: decimal; + list-style-type: decimal; } li { margin-left: 1em; @@ -19,6 +16,6 @@ font-style: italic; } blockquote { - margin: 1em 1em 0; + margin: 1em; } -} +} \ No newline at end of file diff --git a/media/css/impala/site.less b/media/css/impala/site.less index d0d550c1ea..f8c68454c8 100644 --- a/media/css/impala/site.less +++ b/media/css/impala/site.less @@ -54,12 +54,11 @@ a { } .primary { - margin-left: 210px; position: relative; - &.full { - margin: 0; - width: 100%; - } +} + +.primary { + margin-left: 210px; .primary { margin-right: 210px; margin-left: 0; @@ -72,9 +71,6 @@ a { .html-rtl.gutter .primary { margin-left: 210px; margin-right: 0; - &.full { - margin: 0; - } } .secondary { @@ -117,7 +113,7 @@ a { margin-bottom: 28px; } li { - border: 1px solid @border-black; + border: 1px solid fadeOut(#000, 80%); border-width: 0 0 1px 0; position: relative; &:first-child { @@ -168,7 +164,7 @@ a { padding: 0 6px; } section > h3 { - border-bottom: 1px solid @border-black; + border-bottom: 1px solid fadeOut(#000, 80%); color: #484848; font-size: 12px; font-weight: bold; diff --git a/media/css/impala/typography.less b/media/css/impala/typography.less index 70608c5899..d21ad1eed6 100644 --- a/media/css/impala/typography.less +++ b/media/css/impala/typography.less @@ -25,10 +25,6 @@ h1 { text-transform: uppercase; } -h2 { - font-size: 24px; -} - h4 { font-size: 14px; } @@ -103,6 +99,10 @@ pre, code, kbd, tt, samp, tt { } } &.hero { + h2 { + color: @red; + font-size: 24px; + } hgroup { h3 { color: #666; @@ -119,20 +119,6 @@ pre, code, kbd, tt, samp, tt { } } -.primary { - .hero { - h2 { - color: @red; - } - } - .prose { - h3 { - font: italic 16px/18px @serif-stack; - margin-top: 1em; - } - } -} - .secondary { h2 { font-family: @sans-stack; @@ -152,4 +138,4 @@ pre, code, kbd, tt, samp, tt { .error { color: @red; -} +} \ No newline at end of file diff --git a/media/js/impala/global.js b/media/js/impala/global.js index e0f11f06cd..6beb4f3f09 100644 --- a/media/js/impala/global.js +++ b/media/js/impala/global.js @@ -108,14 +108,6 @@ $(function() { $img.attr('src', $img.attr('data-defer-src')); }); - // Email obfuscation. - $('span.emaillink').each(function() { - var $this = $(this); - $this.find('.i').remove(); - var em = $this.text().split('').reverse().join(''); - $this.prev('a').attr('href', 'mailto:' + em); - }); - //allow dismissal of site-balloons. $('.site-balloon .close').click(function(e) { e.preventDefault(); diff --git a/settings.py b/settings.py index 2f899daf9c..8b6699cafc 100644 --- a/settings.py +++ b/settings.py @@ -428,9 +428,10 @@ MINIFY_BUNDLES = { 'css/impala/l10n.less', 'css/impala/contributions.less', 'css/impala/lightbox.less', - 'css/impala/prose.less', + 'css/impala/copy.less', 'css/impala/sharing.less', 'css/impala/abuse.less', + 'css/impala/prose.less', 'css/impala/paginator.less', 'css/impala/listing.less', 'css/impala/users.less', @@ -697,6 +698,7 @@ PREVIEWS_PATH = UPLOADS_PATH + '/previews' USERPICS_PATH = UPLOADS_PATH + '/userpics' PACKAGER_PATH = os.path.join(TMP_PATH, 'packager') ADDON_ICONS_DEFAULT_PATH = os.path.join(MEDIA_ROOT, 'img/addon-icons') + PREVIEW_THUMBNAIL_PATH = (PREVIEWS_PATH + '/thumbs/%s/%d.png') PREVIEW_FULL_PATH = (PREVIEWS_PATH + '/full/%s/%d.png') @@ -707,7 +709,6 @@ ADDON_ICONS_DEFAULT_URL = MEDIA_URL + '/img/addon-icons' ADDON_ICON_BASE_URL = MEDIA_URL + 'img/icons/' ADDON_ICON_URL = ('%s/images/addon_icon/%%d-%%d.png?modified=%%s' % STATIC_URL) - PREVIEW_THUMBNAIL_URL = (STATIC_URL + '/img/uploads/previews/thumbs/%s/%d.png?modified=%d') PREVIEW_FULL_URL = (STATIC_URL + diff --git a/urls.py b/urls.py index ad73a0f2e4..8defe4b00c 100644 --- a/urls.py +++ b/urls.py @@ -45,7 +45,7 @@ urlpatterns = patterns('', ('', include('users.urls')), # Developer Hub. - ('^developers/', include('devhub.urls')), + ('developers/', include('devhub.urls')), # Developer Hub. ('editors/', include('editors.urls')),