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

issue #985 #992

Closed
wants to merge 3 commits into from
Closed

issue #985 #992

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ca6fcc4
issue #985
Mariatta Aug 20, 2016
46a735e
remove extra text
Mariatta Aug 20, 2016
b886f55
Remove imagetoolbar tag
Mariatta Sep 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pydotorg/settings/pipeline.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
),
'output_filename': 'stylesheets/mq.css',
'extra_context': {
'media': 'not print, braille, embossed, speech, tty',
'media': 'not print, speech',
},
},
'no-mq': {
Expand Down
171 changes: 100 additions & 71 deletions static/sass/style.css
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions static/sass/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1114,6 +1114,10 @@ $colors: $blue, $psf, $yellow, $green, $purple, $red;
img { max-height: 5em; }

p { font-size: px2em( 14px ); }
border-width: 0;
width: 0;
border-spacing: 0;

}
}

Expand Down
54 changes: 27 additions & 27 deletions templates/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
{% comment %}
{# equivalent to: #}
<link rel="stylesheet" href="{{ STATIC_URL }}stylesheets/style.css" title="default">
<link rel="stylesheet" href="{{ STATIC_URL }}stylesheets/mq.css" media="not print, braille, embossed, speech, tty">
<link rel="stylesheet" href="{{ STATIC_URL }}stylesheets/mq.css" media="not print, speech">
{% endcomment %}

<!--[if (lte IE 8)&(!IEMobile)]>
Expand Down Expand Up @@ -145,7 +145,7 @@
<!-- Sister Site Links -->
<div id="top" class="top-bar do-not-print">

<nav class="meta-navigation container" role="navigation">
<nav class="meta-navigation container">

{# Allow Screen readers (hidden for all others) to skip the navigation and get to the main content #}
<div class="skip-link screen-reader-text">
Expand All @@ -168,7 +168,7 @@
</div>

<!-- Header elements -->
<header class="main-header" role="banner">
<header class="main-header">
<div class="container">

<h1 class="site-headline">
Expand All @@ -184,7 +184,7 @@ <h1 class="site-headline">
<span aria-hidden="true" class="icon-search"></span>

<label class="screen-reader-text" for="id-search-field">Search This Site</label>
<input id="id-search-field" name="q" type="search" role="textbox" class="search-field" placeholder="Search" value="{{ request.GET.q }}" tabindex="1">
<input id="id-search-field" name="q" type="search" class="search-field" placeholder="Search" value="{{ request.GET.q }}" tabindex="1">

<button type="submit" name="submit" id="submit" class="search-button" title="Submit this Search" tabindex="3">
GO
Expand All @@ -198,49 +198,49 @@ <h1 class="site-headline">
<ul class="navigation menu" aria-label="Adjust Text Size on Page">
<li class="tier-1 last" aria-haspopup="true">
<a href="#" class="action-trigger"><strong><small>A</small> A</strong></a>
<ul class="subnav menu">
<li class="tier-2 element-1" role="treeitem"><a class="text-shrink" title="Make Text Smaller" href="javascript:;">Smaller</a></li>
<li class="tier-2 element-2" role="treeitem"><a class="text-grow" title="Make Text Larger" href="javascript:;">Larger</a></li>
<li class="tier-2 element-3" role="treeitem"><a class="text-reset" title="Reset any font size changes I have made" href="javascript:;">Reset</a></li>
<ul class="subnav menu" role="menu">
<li class="tier-2 element-1" role="menuitem"><a class="text-shrink" title="Make Text Smaller" href="javascript:;">Smaller</a></li>
<li class="tier-2 element-2" role="menuitem"><a class="text-grow" title="Make Text Larger" href="javascript:;">Larger</a></li>
<li class="tier-2 element-3" role="menuitem"><a class="text-reset" title="Reset any font size changes I have made" href="javascript:;">Reset</a></li>
</ul>
</li>
</ul>
</div><div class="winkwink-nudgenudge">
<ul class="navigation menu" aria-label="Social Media Navigation">
<li class="tier-1 last" aria-haspopup="true">
<a href="#" class="action-trigger">Socialize</a>
<ul class="subnav menu">
<li class="tier-2 element-1" role="treeitem"><a href="http://plus.google.com/+Python"><span aria-hidden="true" class="icon-google-plus"></span>Google+</a></li>
<li class="tier-2 element-2" role="treeitem"><a href="http://www.facebook.com/pythonlang?fref=ts"><span aria-hidden="true" class="icon-facebook"></span>Facebook</a></li>
<li class="tier-2 element-3" role="treeitem"><a href="http://twitter.com/ThePSF"><span aria-hidden="true" class="icon-twitter"></span>Twitter</a></li>
<li class="tier-2 element-4" role="treeitem"><a href="/community/irc/"><span aria-hidden="true" class="icon-freenode"></span>Chat on IRC</a></li>
<ul class="subnav menu" role="menu">
<li class="tier-2 element-1" role="menuitem"><a href="http://plus.google.com/+Python"><span aria-hidden="true" class="icon-google-plus"></span>Google+</a></li>
<li class="tier-2 element-2" role="menuitem"><a href="http://www.facebook.com/pythonlang?fref=ts"><span aria-hidden="true" class="icon-facebook"></span>Facebook</a></li>
<li class="tier-2 element-3" role="menuitem"><a href="http://twitter.com/ThePSF"><span aria-hidden="true" class="icon-twitter"></span>Twitter</a></li>
<li class="tier-2 element-4" role="menuitem"><a href="/community/irc/"><span aria-hidden="true" class="icon-freenode"></span>Chat on IRC</a></li>
</ul>
</li>
</ul>
</div><div class="account-signin">
<ul class="navigation menu" aria-label="Social Media Navigation">
<ul class="navigation menu" aria-label="Account Navigation">
<li class="tier-1 last" aria-haspopup="true">
{% if request.user.is_authenticated %}
<a href="{% url 'users:user_detail' slug=request.user.username %}">Your account</a>
<ul class="subnav menu">
<li class="tier-2 element-1" role="treeitem"><a href="{% url 'users:user_profile_edit' %}">Edit your user profile</a></li>
<li class="tier-2 element-2" role="treeitem"><a href="{% url 'users:user_change_password' %}">Change your password</a></li>
<ul class="subnav menu" role="menu">
<li class="tier-2 element-1" role="menuitem"><a href="{% url 'users:user_profile_edit' %}">Edit your user profile</a></li>
<li class="tier-2 element-2" role="menuitem"><a href="{% url 'users:user_change_password' %}">Change your password</a></li>
{% if request.user.has_membership %}
<li class="tier-2 element-3" role="treeitem"><a href="{% url 'users:user_membership_edit' %}">Edit your PSF membership</a></li>
<li class="tier-2 element-3" role="menuitem"><a href="{% url 'users:user_membership_edit' %}">Edit your PSF membership</a></li>
{% if request.user.membership.needs_vote_affirmation %}
<li class="tier-2 element-4" role="treeitem"><a href="{% url 'users:membership_affirm_vote' %}">Re-affirm your desire to be a PSF Voting member</a></li>
<li class="tier-2 element-4" role="menuitem"><a href="{% url 'users:membership_affirm_vote' %}">Re-affirm your desire to be a PSF Voting member</a></li>
{% endif %}
{% else %}
<li class="tier-2 element-3" role="treeitem"><a href="{% url 'users:user_membership_create' %}">Become a PSF member</a></li>
<li class="tier-2 element-3" role="menuitem"><a href="{% url 'users:user_membership_create' %}">Become a PSF member</a></li>
{% endif %}
<li class="tier-2 element-4" role="treeitem"><a href="{% url 'users:user_detail' slug=request.user.username %}">View your public profile</a></li>
<li class="tier-2 element-5"" role=treeitem"><a href="{% url 'account_logout' %}" title="Sign out of Python.org">Sign out</a></li>
<li class="tier-2 element-4" role="menuitem"><a href="{% url 'users:user_detail' slug=request.user.username %}">View your public profile</a></li>
<li class="tier-2 element-5" role="menuitem"><a href="{% url 'account_logout' %}" title="Sign out of Python.org">Sign out</a></li>
</ul>
{% else %}
<a href="{% url 'account_login' %}" title="Sign Up or Sign In to Python.org">Sign In</a>
<ul class="subnav menu">
<li class="tier-2 element-1" role="treeitem"><a href="{% url 'account_signup' %}">Sign Up / Register</a></li>
<li class="tier-2 element-2" role="treeitem"><a href="{% url 'account_login' %}">Sign In</a></li>
<ul class="subnav menu" role="menu">
<li class="tier-2 element-1" role="menuitem"><a href="{% url 'account_signup' %}">Sign Up / Register</a></li>
<li class="tier-2 element-2" role="menuitem"><a href="{% url 'account_login' %}">Sign In</a></li>
</ul>
{% endif %}
</li>
Expand All @@ -249,7 +249,7 @@ <h1 class="site-headline">

</div><!-- end options-bar -->

<nav id="mainnav" class="{% block main-nav_attributes %}python-navigation{% endblock %} main-navigation do-not-print" role="navigation">
<nav id="mainnav" class="{% block main-nav_attributes %}python-navigation{% endblock %} main-navigation do-not-print">
{% block main_navigation %}
{% sitetree_menu from "main" include "python-meta" template "sitetree/submenu.html" %}
{% endblock main_navigation %}
Expand Down Expand Up @@ -299,7 +299,7 @@ <h1 class="site-headline">
</div><!-- end #content .content-wrapper -->

<!-- Footer and social media list -->
<footer id="site-map" class="main-footer" role="contentinfo">
<footer id="site-map" class="main-footer">
<div class="main-footer-links">
<div class="container">

Expand Down
4 changes: 2 additions & 2 deletions templates/components/success-story.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ <h2 class="widget-title"><span aria-hidden="true" class="icon-success-stories"><
<a href="{{ story.get_absolute_url }}">{{ story.pull_quote }}</a>
</blockquote>

<table cellpadding="0" cellspacing="0" border="0" width="100%" class="quote-from">
<table class="quote-from">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for cleaning up this!

<tbody>
<tr>
{% comment %}
This image tag should be for a Company logo, if they have supplied one
Currently this path is for a static logo sample, which no longer exists
<td><a href="{{ story.get_absolute_url }}"><img src="{{ STATIC_URL }}img/ILM_logo.png"></a></td>
{% endcomment %}
<td><p><a href="{{ story.get_absolute_url }}">{{ story.name }}</a> <em>by {{ story.author }}</em></p></td>
<td><p><a href="{{ story.get_absolute_url }}">aaa{{ story.name }}</a> <em>by {{ story.author }}</em></p></td>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks like a leftover from a debugging session.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops.. thanks for catching. I'll make another commit right away. Sorry about this.

</tr>
</tbody>
</table>
Expand Down
14 changes: 7 additions & 7 deletions templates/jobs/base.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,36 +25,36 @@ <h1 class="call-to-action">{% block header_action %}{{ jobs_count }} jobs on the
<a href="{% url 'jobs:job_types' %}">Types</a>
<ul class="subnav menu" role="menu" aria-hidden="true">
{% for t in active_types %}
<li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_list_type' slug=t.slug %}">{{ t.name }}</a></li>
<li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_list_type' slug=t.slug %}">{{ t.name }}</a></li>
{% empty %}
<li class="tier-2" role="treeitem">No Active Types</li>
<li class="tier-2" role="menuitem">No Active Types</li>
{% endfor %}
</ul>
</li>
<li class="tier-1 element-3 {% if view.job_category_view %}current_item selected{% endif %}" aria-haspopup="true">
<a href="{% url 'jobs:job_categories' %}">Categories</a>
<ul class="subnav menu" role="menu" aria-hidden="true">
{% for c in active_categories %}
<li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_list_category' slug=c.slug %}">{{ c.name }}</a></li>
<li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_list_category' slug=c.slug %}">{{ c.name }}</a></li>
{% empty %}
<li class="tier-2" role="treeitem">No Active Categories</li>
<li class="tier-2" role="menuitem">No Active Categories</li>
{% endfor %}
</ul>
</li>
<li class="tier-1 element-4 {% if view.job_location_view %}current_item selected{% endif %}">
<a href="{% url 'jobs:job_locations' %}">Locations</a>
<ul class="subnav menu" role="menu" aria-hidden="true">
<li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_telecommute' %}">Telecommute</a></li>
<li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_telecommute' %}">Telecommute</a></li>
{% for l in active_locations %}
<li class="tier-2" role="treeitem"><a href="{% url 'jobs:job_list_location' slug=l.location_slug %}">
<li class="tier-2" role="menuitem"><a href="{% url 'jobs:job_list_location' slug=l.location_slug %}">
{% if l.region and l.region != l.city %}
{{ l.city }}, {{ l.region }} &ndash; {{ l.country }}
{% else %}
{{ l.city }} &ndash; {{ l.country }}
{% endif %}
</a></li>
{% empty %}
<li class="tier-2" role="treeitem">No Active Locations</li>
<li class="tier-2" role="menuitem">No Active Locations</li>
{% endfor %}
</ul>
</li>
Expand Down
2 changes: 1 addition & 1 deletion templates/minutes/minutes_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ <h1>PSF Meeting Minutes for {{ minutes.date|date }}</h1>
<h2>{{ minutes.date.year }}</h2>
<ul class="section-nav menu" role="menu" aria-hidden="false">
{% for item in same_year_minutes %}
<li class="tier-1 element-1" role="treeitem"><a href="{{ item.get_absolute_url }}">{{ item.date|date }}</a></li>
<li class="tier-1 element-1" role="menuitem"><a href="{{ item.get_absolute_url }}">{{ item.date|date }}</a></li>
{% endfor %}
</ul>

Expand Down
2 changes: 1 addition & 1 deletion templates/sitetree/footer_children.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% load sitetree %}

<ul class="subnav menu">
<ul class="subnav menu" role="tree">
{% for item in sitetree_items %}
<li class="tier-2 element-{{ forloop.counter }}" role="treeitem"><a href="{% sitetree_url for item %}" title="{{ item.hint|default:"" }}">{{ item.title_resolved }}</a></li>
{% endfor %}
Expand Down
2 changes: 1 addition & 1 deletion templates/sitetree/sidebar_menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<ul class="section-nav menu" role="menu" aria-hidden="false">
{% for item in sitetree_items %}
<li class="{{ item.alias }} {% if item.is_current or item.in_current_branch %}{{ item.is_current|yesno:'current_item selected' }} {{ item.in_current_branch|yesno:'current_branch selected' }}{% endif %}" role="treeitem">
<li class="{{ item.alias }} {% if item.is_current or item.in_current_branch %}{{ item.is_current|yesno:'current_item selected' }} {{ item.in_current_branch|yesno:'current_branch selected' }}{% endif %}" role="menuitem">
<a href="{% sitetree_url for item %}" title="{{ item.hint|default:"" }}" class="{{ item.is_current|yesno:'current_item selected' }} {{ item.in_current_branch|yesno:' current_branch' }}">{{ item.title_resolved }}</a>

{% if item.has_children %}
Expand Down
2 changes: 1 addition & 1 deletion templates/sitetree/submenu_children.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

<ul class="subnav menu" role="menu" aria-hidden="true">
{% for item in sitetree_items %}
<li class="tier-2 element-{{ forloop.counter }}" role="treeitem"><a href="{% sitetree_url for item %}" title="{{ item.hint|default:"" }}">{{ item.title_resolved }}</a></li>
<li class="tier-2 element-{{ forloop.counter }}" role="menuitem"><a href="{% sitetree_url for item %}" title="{{ item.hint|default:"" }}">{{ item.title_resolved }}</a></li>
{% endfor %}
</ul>
4 changes: 2 additions & 2 deletions templates/successstories/story_detail.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ <h1>{{ story.name }}</h1>
{# navigation for this section... All Categories for existing Success Stories #}
<ul class="section-nav menu" role="menu" aria-hidden="false">
{% for category in category_list %}
<li class="tier-1" role="treeitem"><a href="{{ category.get_absolute_url }}" title="">{{ category.name }}</a></li>
<li class="tier-1" role="menuitem"><a href="{{ category.get_absolute_url }}" title="">{{ category.name }}</a></li>
{% endfor %}
<li class="tier-1" role="treeitem"><a href="{% url 'success_story_create' %}" title="">Submit Yours!</a></li>
<li class="tier-1" role="menuitem"><a href="{% url 'success_story_create' %}" title="">Submit Yours!</a></li>
</ul>

</div>
Expand Down
Loading