Skip to content

Commit 1ac6ba2

Browse files
logologicalaniav
authored andcommitted
Copy-editing of the English version (DjangoGirls#797)
* Issue DjangoGirls#1. Copy-edit Chromebook instructions. * Issue DjangoGirls#1. Copy-edit up to and including django_start_project. * Issue DjangoGirls#1. Copy-edit new Windows 10 instructions. * Issue DjangoGirls/tutorial/DjangoGirls#793. Americanize spellings. * Issue DjangoGirls#1. Copy-edit Django models. * Issue DjangoGirls#1. Copy-edit to Deploy section. * Copy-edit for English usage * Copy-edit for English usage * Fix grammar and remove unneeded colour channels * Copy corrected image to translations * Copy-edit Introduction to HTML * Copy-editing up to and including 'Django templates' * Copy-editing up to and including 'Template extending' * Copy-editing up to end of tutorial
1 parent 0da70b8 commit 1ac6ba2

File tree

37 files changed

+264
-280
lines changed

37 files changed

+264
-280
lines changed
-223 KB
Loading

en/SUMMARY.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414
* [Django admin](django_admin/README.md)
1515
* [Deploy!](deploy/README.md)
1616
* [Django urls](django_urls/README.md)
17-
* [Django views - time to create!](django_views/README.md)
17+
* [Django views time to create!](django_views/README.md)
1818
* [Introduction to HTML](html/README.md)
1919
* [Django ORM (Querysets)](django_orm/README.md)
2020
* [Dynamic data in templates](dynamic_data_in_templates/README.md)
2121
* [Django templates](django_templates/README.md)
22-
* [CSS - make it pretty](css/README.md)
22+
* [CSS make it pretty](css/README.md)
2323
* [Template extending](template_extending/README.md)
2424
* [Extend your application](extend_your_application/README.md)
2525
* [Django Forms](django_forms/README.md)

en/chromebook_setup/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Chromebook setup
22

3-
> **Note** If you already worked through the Installation steps, no need to do this again - you can skip straight ahead to [Introduction to Python](../python_introduction/README.md).
3+
> **Note** If you already worked through the Installation steps, no need to do this again you can skip straight ahead to [Introduction to Python](../python_introduction/README.md).
44
55
{% include "/chromebook_setup/instructions.md" %}

en/chromebook_setup/instructions.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ rest of the installation instructions.
55
### Cloud 9
66

77
Cloud 9 is a tool that gives you a code editor and access to a computer running
8-
on the internet where you can install, write, and run software. For the duration
8+
on the Internet where you can install, write, and run software. For the duration
99
of the tutorial, Cloud 9 will act as your _local machine_. You'll still be
1010
running commands in a terminal interface just like your classmates on OS X,
1111
Ubuntu, or Windows, but your terminal will be connected to a computer running
@@ -19,7 +19,7 @@ somewhere else that Cloud 9 sets up for you.
1919
6. Select the _Blank_ (second from the right on the bottom row with orange logo)
2020

2121
Now you should see an interface with a sidebar, a big main window with some
22-
text, and a small window at the bottom that looks something like:
22+
text, and a small window at the bottom that looks something like this:
2323

2424
{% filename %}Cloud 9{% endfilename %}
2525
```
@@ -71,11 +71,11 @@ and moving it to a publicly accessible computer (called a server) so other
7171
people can see your work.
7272

7373
This part is a little odd when doing the tutorial on a Chromebook since we're
74-
already using a computer that is on the internet (as opposed to, say, a laptop).
74+
already using a computer that is on the Internet (as opposed to, say, a laptop).
7575
However, it's still useful, as we can think of our Cloud 9 workspace as a place
7676
or our "in progress" work and Python Anywhere as a place to show off our stuff
7777
as it becomes more complete.
7878

7979
Thus, sign up for a new Python Anywhere account at
80-
[www.pythonanywhere.com](http://www.pythonanywhere.com).
80+
[www.pythonanywhere.com](https://www.pythonanywhere.com).
8181

en/code_editor/instructions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ You might be wondering why we are installing this special code editor software,
2727

2828
The first reason is that code needs to be **plain text**, and the problem with programs like Word and Textedit is that they don't actually produce plain text, they produce rich text (with fonts and formatting), using custom formats like [RTF (Rich Text Format)](https://en.wikipedia.org/wiki/Rich_Text_Format).
2929

30-
The second reason is that code editors are specialised for editing code, so they can provide helpful features like highlighting code with colour according to its meaning, or automatically closing quotes for you.
30+
The second reason is that code editors are specialized for editing code, so they can provide helpful features like highlighting code with color according to its meaning, or automatically closing quotes for you.
3131

32-
We'll see all this in action later. Soon, you'll come to think of your trusty old code editor as one of your favourite tools. :)
32+
We'll see all this in action later. Soon, you'll come to think of your trusty old code editor as one of your favorite tools. :)
3333

en/css/README.md

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# CSS - make it pretty!
1+
# CSS make it pretty!
22

33
Our blog still looks pretty ugly, right? Time to make it nice! We will use CSS for that.
44

55
## What is CSS?
66

7-
Cascading Style Sheets (CSS) is a language used for describing the look and formatting of a website written in markup language (like HTML). Treat it as make-up for our webpage ;).
7+
Cascading Style Sheets (CSS) is a language used for describing the look and formatting of a website written in a markup language (like HTML). Treat it as make-up for our web page. ;)
88

9-
But we don't want to start from scratch again, right? Once more, we'll use something that programmers released on the Internet for free. You know, reinventing the wheel is no fun.
9+
But we don't want to start from scratch again, right? Once more, we'll use something that programmers released on the Internet for free. Reinventing the wheel is no fun, you know.
1010

1111
## Let's use Bootstrap!
1212

@@ -24,8 +24,7 @@ To install Bootstrap, you need to add this to your `<head>` in your `.html` file
2424
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.2.0/css/bootstrap-theme.min.css">
2525
```
2626

27-
This doesn't add any files to your project. It just points to files that exist on the internet.
28-
Just go ahead, open your website and refresh the page. Here it is!
27+
This doesn't add any files to your project. It just points to files that exist on the Internet. Just go ahead, open your website and refresh the page. Here it is!
2928

3029
![Figure 14.1](images/bootstrap1.png)
3130

@@ -51,13 +50,12 @@ djangogirls
5150
└── mysite
5251
```
5352

54-
Django will automatically find any folders called "static" inside any of your apps' folders. Then, it will be able to use their contents as static files.
55-
53+
Django will automatically find any folders called "static" inside any of your apps' folders. Then it will be able to use their contents as static files.
5654

5755

5856
## Your first CSS file!
5957

60-
Let's create a CSS file now, to add your own style to your web-page. Create a new directory called `css` inside your `static` directory. Then create a new file called `blog.css` inside this `css` directory. Ready?
58+
Let's create a CSS file now, to add your own style to your web page. Create a new directory called `css` inside your `static` directory. Then create a new file called `blog.css` inside this `css` directory. Ready?
6159

6260
```
6361
djangogirls
@@ -72,7 +70,7 @@ Time to write some CSS! Open up the `blog/static/css/blog.css` file in your code
7270
We won't be going too deep into customizing and learning about CSS here. It's pretty easy and you can learn it on your own after this workshop. There is a recommendation for a free course to learn more at the end of this page.
7371

7472
But let's do at least a little. Maybe we could change the color of our header?
75-
To understand colors, computers use special codes. These codes start with `#` followed by 6 letters (A-F) and numbers (0-9). For example, the code for blue is `#0000FF`. You can find the color codes for many colors here: http://www.colorpicker.com/. You may also use [predefined colors](http://www.w3schools.com/colors/colors_names.asp), such as `red` and `green`.
73+
To understand colors, computers use special codes. These codes start with `#` followed by 6 letters (AF) and numbers (09). For example, the code for blue is `#0000FF`. You can find the color codes for many colors here: http://www.colorpicker.com/. You may also use [predefined colors](http://www.w3schools.com/colors/colors_names.asp), such as `red` and `green`.
7674

7775
In your `blog/static/css/blog.css` file you should add the following code:
7876

@@ -83,7 +81,7 @@ h1 a {
8381
}
8482
```
8583

86-
`h1 a` is a CSS Selector. This means we're applying our styles to any `a` element inside of an `h1` element. So when we have something like: `<h1><a href="">link</a></h1>` the `h1 a` style will apply. In this case, we're telling it to change its color to `#FCA205`, which is orange. Of course, you can put your own color here!
84+
`h1 a` is a CSS Selector. This means we're applying our styles to any `a` element inside of an `h1` element. So when we have something like `<h1><a href="">link</a></h1>`, the `h1 a` style will apply. In this case, we're telling it to change its color to `#FCA205`, which is orange. Of course, you can put your own color here!
8785

8886
In a CSS file we determine styles for elements in the HTML file. The first way we identify elements is with the element name. You might remember these as tags from the HTML section. Things like `a`, `h1`, and `body` are all examples of element names.
8987
We also identify elements by the attribute `class` or the attribute `id`. Class and id are names you give the element by yourself. Classes define groups of elements, and ids point to specific elements. For example, you could identify the following tag by using the tag name `a`, the class `external_link`, or the id `link_to_wiki_page`:
@@ -92,17 +90,17 @@ We also identify elements by the attribute `class` or the attribute `id`. Class
9290
<a href="https://en.wikipedia.org/wiki/Django" class="external_link" id="link_to_wiki_page">
9391
```
9492

95-
Read about [CSS Selectors in w3schools](http://www.w3schools.com/cssref/css_selectors.asp).
93+
You can read more about [CSS Selectors at w3schools](http://www.w3schools.com/cssref/css_selectors.asp).
9694

97-
Then, we need to also tell our HTML template that we added some CSS. Open the `blog/templates/blog/post_list.html` file and add this line at the very beginning of it:
95+
We also need to tell our HTML template that we added some CSS. Open the `blog/templates/blog/post_list.html` file and add this line at the very beginning of it:
9896

9997
{% filename %}blog/templates/blog/post_list.html{% endfilename %}
10098
```html
10199
{% load staticfiles %}
102100
```
103101

104-
We're just loading static files here :).
105-
Between the `<head>` and `</head>`, after the links to the Bootstrap CSS files add this line:
102+
We're just loading static files here. :)
103+
Between the `<head>` and `</head>` tags, after the links to the Bootstrap CSS files, add this line:
106104

107105
{% filename %}blog/templates/blog/post_list.html{% endfilename %}
108106
```html
@@ -152,7 +150,7 @@ body {
152150
}
153151
```
154152

155-
Add this to your CSS, save the file and see how it works!
153+
Add that to your CSS, save the file and see how it works!
156154

157155
![Figure 14.3](images/margin2.png)
158156

@@ -202,7 +200,7 @@ And now add a class `post` to your `div` containing a blog post.
202200
</div>
203201
```
204202

205-
We will now add declaration blocks to different selectors. Selectors starting with `.` relate to classes. There are many great tutorials and explanations about CSS on the Web to help you understand the following code. For now, just copy and paste it into your `blog/static/css/blog.css` file:
203+
We will now add declaration blocks to different selectors. Selectors starting with `.` relate to classes. There are many great tutorials and explanations about CSS on the Web that can help you understand the following code. For now, just copy and paste it into your `blog/static/css/blog.css` file:
206204

207205
{% filename %}blog/static/css/blog.css{% endfilename %}
208206
```css
@@ -295,7 +293,7 @@ Save those files and refresh your website.
295293
Woohoo! Looks awesome, right?
296294
Look at the code we just pasted to find the places where we added classes in the HTML and used them in the CSS. Where would you make the change if you wanted the date to be turquoise?
297295

298-
Don't be afraid to tinker with this CSS a little bit and try to change some things. Playing with the CSS can help you understand what the different things are doing. If you break something, don't worry, you can always undo it!
296+
Don't be afraid to tinker with this CSS a little bit and try to change some things. Playing with the CSS can help you understand what the different things are doing. If you break something, don't worry you can always undo it!
299297

300298
We really recommend taking this free online [Codeacademy HTML & CSS course](https://www.codecademy.com/tracks/web). It can help you learn all about making your websites prettier with CSS.
301299

0 commit comments

Comments
 (0)