Skip to content

Commit

Permalink
Edited copy in a bunch of templates
Browse files Browse the repository at this point in the history
  • Loading branch information
@adrianholovaty
adrianholovaty committed Nov 28, 2014
1 parent 3f562fd commit f1e60c8
Show file tree
Hide file tree
Showing 6 changed files with 91 additions and 94 deletions.
10 changes: 5 additions & 5 deletions templates/aggregator/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<h2>Mailing lists</h2>
<div class="layout-2col">
<div class="col form-email">
<h3><a href="http://groups.google.com/group/django-users">Django-Users</a></h3>
<h3><a href="http://groups.google.com/group/django-users">django-users</a></h3>
<p class="meta">Get help with Django and follow announcements.</p>
<form class="form-input" action="http://groups.google.com/group/django-users/boxsubscribe">
<input type="email" name="email" placeholder="Enter Email">
Expand All @@ -16,8 +16,8 @@ <h3><a href="http://groups.google.com/group/django-users">Django-Users</a></h3>
</form>
</div>
<div class="col form-email">
<h3><a href="http://groups.google.com/group/django-developers">Django-Developers</a></h3>
<p class="meta">Where Django developers discuss new features.</p>
<h3><a href="http://groups.google.com/group/django-developers">django-developers</a></h3>
<p class="meta">Contribute to the development of Django itself.</p>
<form class="form-input" action="http://groups.google.com/group/django-developers/boxsubscribe">
<input type="email" name="email" placeholder="Enter Email">
<button type="submit">
Expand All @@ -29,7 +29,7 @@ <h3><a href="http://groups.google.com/group/django-developers">Django-Developers
</div>

<div class="list-collapsing-header">
<h2>Django RSS Feeds</h2>
<h2>Django RSS feeds</h2>
</div>

<ul class="list-collapsing">
Expand Down Expand Up @@ -58,7 +58,7 @@ <h2 class="bullet-icon"><i class="icon icon-rss blue"></i> {{ feedtype.name }}</
</div>
</li>
{% endfor %}

</ul>

{% endblock %}
2 changes: 1 addition & 1 deletion templates/blog/news_summary.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@
<h2><a href="{{ object.get_absolute_url }}">{{ object.headline|safe }}</a></h2>
<span class="meta">Posted by <strong>{{ object.author }}</strong> on {{ object.pub_date|date:"F j, Y" }} {% comment %}in <a href="#">Django Software Foundation</a>{% endcomment %}</span>
{{ object.summary_html|safe }}
<a class="link-readmore" href="{{ object.get_absolute_url }}">Read More</a>
<a class="link-readmore" href="{{ object.get_absolute_url }}">Read more</a>
</li>
44 changes: 22 additions & 22 deletions templates/homepage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
{% block header %}
<h1 class="visuallyhidden">Django</h1>
<p>
<em>Django makes it easier to build better Web apps quicker and with less code</em>
<em>Django makes it easier to build better Web apps quicker and with less code.</em>
</p>
<p>
<a href="{% url 'start' %}" class="cta">Get Started with Django</a>
<a href="{% url 'start' %}" class="cta">Get started with Django</a>
</p>
{% comment %}
<p class="small">
Expand All @@ -36,24 +36,24 @@ <h1 class="visuallyhidden">Django</h1>
<h1>Meet Django</h1>
<p>
Django is a high-level Python Web framework that encourages rapid development and clean, pragmatic design.
Developed by a fast-moving online-news operation, Django was designed to handle two challenges: the intensive deadlines of a newsroom and the stringent requirements of the experienced Web developers who wrote it.
Built by experienced developers, it takes care of much of the hassle of Web development, so you can focus
on writing your app without needing to reinvent the wheel. It’s free and open source.
</p>
<dl class="list-features">
<dt><i class="icon icon-bolt"></i> Ridiculously fast.</dt>
<dd>
<p>Django was designed to help developers take web applications from concept to completion as quickly as possible.</p>
<p>Django was designed to help developers take applications from concept to completion as quickly as possible.</p>
</dd>

<dt><i class="icon icon-lock"></i> Reassuringly secure.</dt>
<dd>
<p>Django takes security seriously and helps web developers avoid many of the common security mistakes.</p>
<p>Django takes security seriously and helps developers avoid many common security mistakes.</p>
</dd>

<dt><i class="icon icon-dashboard"></i> Exceedingly scalable.</dt>
<dd>
<p>Some of the busiest websites on the web leverage Django's ability to quickly and flexibly scale.</p>
<p>Some of the busiest sites on the Web leverage Django’s ability to quickly and flexibly scale.</p>
</dd>

</dl>

<a href="{% url 'overview' %}" class="cta outline">Learn more about Django</a>
Expand All @@ -65,7 +65,7 @@ <h1>Meet Django</h1>
<h1>Who is Django for?</h1>

<p>
You’ve probably used a website that uses Django. Find out why Django was the right solution for these organizations, and why you should start building your project with Django today.
You’ve probably used a site that uses Django. Find out why Django was the right solution for these organizations, and why you should start building your project with Django today.
</p>

<ul class="list-case-study">
Expand All @@ -81,7 +81,7 @@ <h3 class="logo" title="Disqus">Disqus</h3>
</li>
<li>
<h3 class="logo" title="Knight Foundation">Knight Foundation</h3>
<p>When the Knight Foundation began redesigning their <a href="http://www.knightfoundation.org">website</a>, they were on multiple content management systems they’d outgrown, with a site that couldn’t handle traffic spikes. Knight needed a future-proof solution.</p>
<p>When the Knight Foundation began redesigning their <a href="http://www.knightfoundation.org">site</a>, they were on multiple content management systems they’d outgrown, with a site that couldn’t handle traffic spikes. Knight needed a future-proof solution.</p>
<a href="{% url 'case_study' %}">Read Case Study</a>
</li>
</ul>
Expand All @@ -96,12 +96,12 @@ <h3 class="logo" title="Knight Foundation">Knight Foundation</h3>
<h1>Stay in the loop</h1>

<p>
If you want to stay up to date with everything that's happening in the lDjango community, subscribe to one of our mailing lists:
Subscribe to one of our mailing lists to stay up to date with everything in the Django community:
</p>

<div class="layout-2col">
<div class="col form-email">
<h3><a href="http://groups.google.com/group/django-users">Django-Users</a></h3>
<h3><a href="http://groups.google.com/group/django-users">django-users</a></h3>
<p class="meta">Get help with Django and follow announcements.</p>
<form class="form-input" action="http://groups.google.com/group/django-users/boxsubscribe">
<input type="email" name="email" placeholder="Enter Email">
Expand All @@ -112,8 +112,8 @@ <h3><a href="http://groups.google.com/group/django-users">Django-Users</a></h3>
</form>
</div>
<div class="col form-email">
<h3><a href="http://groups.google.com/group/django-developers">Django-Developers</a></h3>
<p class="meta">Discussion of the development of Django itself.</p>
<h3><a href="http://groups.google.com/group/django-developers">django-developers</a></h3>
<p class="meta">Contribute to the development of Django itself.</p>
<form class="form-input" action="http://groups.google.com/group/django-developers/boxsubscribe">
<input type="email" name="email" placeholder="Enter Email">
<button type="submit">
Expand All @@ -133,18 +133,18 @@ <h3><a href="http://groups.google.com/group/django-developers">Django-Developers

<div role="complementary">
<a href="{% url 'download' %}" class="cta">
Download <em>Latest Release {{ DJANGO_VERSION }}</em>
Download <em>latest release: {{ DJANGO_VERSION }}</em>
</a>
<a href="https://docs.djangoproject.com{% block doc_url %}/{% endblock %}" class="link-readmore">Django Documentation</a>
<a href="https://docs.djangoproject.com{% block doc_url %}/{% endblock %}" class="link-readmore">Django documentation</a>

<h3>New to Django?</h3>
<ul class="list-links-small docs-list">
<li><a href="https://docs.djangoproject.com/en/stable/intro/install/">Installation guide</a></li>
<li><a href="https://docs.djangoproject.com/en/stable/intro/tutorial01/">Write Your First Django App</a></li>
<li><a href="https://docs.djangoproject.com/en/stable/intro/tutorial01/">Write your first Django app</a></li>
</ul>
<a href="{% url 'start' %}" class="link-readmore">Getting started with Django</a>

<h3>The Power of Django</h3>
<h3>The power of Django</h3>
<ul class="list-links-small docs-list">
<li><a href="https://docs.djangoproject.com/en/stable/topics/db/models/">Object-relational mapper</a></li>
<li><a href="https://docs.djangoproject.com/en/stable/intro/tutorial02/">Automatic admin interface</a></li>
Expand All @@ -153,7 +153,7 @@ <h3>The Power of Django</h3>
</ul>
<a href="{% url 'overview' %}" class="link-readmore">Explore more features</a>

<h3>Get Involved</h3>
<h3>Get involved</h3>
<dl class="list-links-small">
<dt><a href="irc://irc.freenode.net/django">#django IRC channel</a></dt>
<dd>
Expand All @@ -165,13 +165,13 @@ <h3>Get Involved</h3>
Report bugs and make feature requests
</dd>
</dl>
<a href="{% url 'community-index' %}" class="link-readmore">Inside the Djagno Community</a>
<a href="{% url 'community-index' %}" class="link-readmore">Inside the Django community</a>

<h3>The Django Software Foundation</h3>
<dl class="list-links-small">
<dt><a href="/foundation/">About the Foundation</a></dt>
<dd>
Django is open-source &amp; non-profit
Our non-profit supports the project
</dd>

<dt><a href="/foundation/donate/">Support Django</a></dt>
Expand All @@ -196,11 +196,11 @@ <h3>Upcoming Events</h3>
</dl>
<a href="{% url 'blog-index' %}" class="link-readmore">See all Events</a>
{% endcomment %}
<h3>Latest News</h3>
<h3>Latest news</h3>
<dl class="list-links-small news-list">
{% load weblog %}{% render_latest_blog_entries 1 %}
</dl>
<a href="{% url 'blog-index' %}" class="link-readmore">See all News</a>
<a href="{% url 'blog-index' %}" class="link-readmore">See all news</a>
</div>

{% endblock %}
Expand Down
23 changes: 11 additions & 12 deletions templates/overview.html
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,46 @@
{% extends 'base.html' %}{% load url from future %}
{% block title %}Django Overview{% endblock %}
{% block title %}Django overview{% endblock %}
{% block layout_class %}full-width{% endblock %}

{% block header %}
<h1 class="visuallyhidden">Django Overview</h1>
<p><em>Django</em> was invented to meet fast-moving <em>newsroom deadlines</em>, while satisfying the tough requirements of <em>Python web developers</em>.</p>
<p><em>Django</em> was invented to meet fast-moving <em>newsroom deadlines</em>, while satisfying the tough requirements of <em>experienced Web developers</em>.</p>
{% endblock %}

{% block content %}

<h1>Why Django?</h1>

<p>With Django, you can take web applications from concept to launch in a matter of hours. It’s nimble web development that keeps your content fresh and your organization productive.</p>

<p>With Django, you can take Web applications from concept to launch in a matter of hours. Django takes care of much of the hassle of Web development, so you can focus
on writing your app without needing to reinvent the wheel. It’s free and open source.</p>

<dl class="list-features">
<dt><i class="icon icon-bolt"></i> Ridiculously fast.</dt>
<dd>
<p>Django was designed to help developers take web applications from concept to completion as quickly as possible.</p>
<p>Django was designed to help developers take applications from concept to completion as quickly as possible.</p>
<a class="link-readmore" href="{% url 'start' %}">See how fast you can start building</a>
</dd>

<dt class="even"><i class="icon icon-briefcase"></i> Fully loaded.</dt>
<dd class="even">
<p>Django includes dozens of extras that you can use to handle common web development patterns. Django takes care of user authentication, content administration, sitemaps, RSS, user comments, and many more tasks right out of the box.</p>
<a class="link-readmore" href="https://docs.djangoproject.com/en/stable/intro/overview/">See what's included</a>
<p>Django includes dozens of extras you can use to handle common Web development tasks. Django takes care of user authentication, content administration, site maps, RSS feeds, user comments and many more tasks — right out of the box.</p>
<a class="link-readmore" href="https://docs.djangoproject.com/en/stable/intro/overview/">See what’s included</a>
</dd>

<dt><i class="icon icon-lock"></i> Reassuringly secure.</dt>
<dd>
<p>Django takes security seriously and helps web developers avoid many of the common security mistakes, including SQL injection, cross-site scripting, cross-site request forgery, clickjacking, and more. Its user authentication system provides a secure way to manage user accounts and passwords.</p>
<p>Django takes security seriously and helps developers avoid many common security mistakes, such as SQL injection, cross-site scripting, cross-site request forgery and clickjacking. Its user authentication system provides a secure way to manage user accounts and passwords.</p>
<a class="link-readmore" href="https://docs.djangoproject.com/en/stable/topics/security/">Read our security overview</a>
</dd>

<dt class="even"><i class="icon icon-dashboard"></i> Exceedingly scalable.</dt>
<dd class="even">
<p>Some of the busiest websites leverage Django’s ability to quickly and flexibly scale to meet even the heaviest traffic demands.</p>
<p>Some of the busiest sites on the planet use Django’s ability to quickly and flexibly scale to meet the heaviest traffic demands.</p>
<a class="link-readmore" href="https://docs.djangoproject.com/en/stable/faq/general/#does-django-scale">Learn more about scaling Django applications</a>
</dd>

<dt><i class="icon icon-cogs"></i> Incredibly versatile.</dt>
<dd>
<p>Companies, organizations, and governments have used Django to build all sorts of things—from content management systems to social networks to scientific computing platforms.</p>
<p>Companies, organizations and governments have used Django to build all sorts of things — from content management systems to social networks to scientific computing platforms.</p>
{% comment %}{# I'm hiding this link until we enable case studies #}<a class="link-readmore" href="#">Call To Action Relating to Feature</a>{% endcomment %}
</dd>

Expand All @@ -58,7 +57,7 @@ <h1>Why Django?</h1>
<div class="layout-secondary">
<div class="container">
<h1><span>Case Studies</span></h1>
<p>You’ve probably used a website that uses Django. Find out why Django was the right solution for these organizations.</p>
<p>You’ve probably used a site that uses Django. Find out why Django was the right solution for these organizations.</p>


<ul class="list-case-study">
Expand Down

0 comments on commit f1e60c8

Please sign in to comment.