Skip to content

Commit

Permalink
Reword seo content
Browse files Browse the repository at this point in the history
  • Loading branch information
kevinlee12 committed Jun 6, 2016
1 parent 0a401d6 commit 2daf4b5
Show file tree
Hide file tree
Showing 11 changed files with 53 additions and 32 deletions.
4 changes: 2 additions & 2 deletions core/controllers/editor_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,15 +80,15 @@ def test_editor_page(self):
# Check that non-editors can access, but not edit, the editor page.
response = self.testapp.get('/create/0')
self.assertEqual(response.status_int, 200)
self.assertIn('Create an Exploration -- Oppia', response.body)
self.assertIn('Help others learn new things.', response.body)
self.assert_cannot_edit(response.body)

# Log in as an editor.
self.login(self.EDITOR_EMAIL)

# Check that it is now possible to access and edit the editor page.
response = self.testapp.get('/create/0')
self.assertIn('Create an Exploration -- Oppia', response.body)
self.assertIn('Help others learn new things.', response.body)
self.assertEqual(response.status_int, 200)
self.assert_can_edit(response.body)
self.assertIn('Stats', response.body)
Expand Down
10 changes: 4 additions & 6 deletions core/controllers/library.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,12 @@ class LibraryPage(base.BaseHandler):

def get(self):
"""Handles GET requests."""
search_mode = (self.request.route.name == 'library_search_page')

meta_description = feconf.LIBRARY_PAGE_DESCRIPTION
if search_mode:
meta_description = feconf.SEARCH_PAGE_DESCRIPTION
search_mode = 'search' in self.request.url

self.values.update({
'meta_description': meta_description,
'meta_description': (
feconf.SEARCH_PAGE_DESCRIPTION if search_mode
else feconf.LIBRARY_PAGE_DESCRIPTION),
'nav_mode': feconf.NAV_MODE_LIBRARY,
'has_fully_registered': bool(
self.user_id and
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
{% block maintitle %}
Find your learning exploration -- Oppia
{% endblock maintitle %}

<script type="text/ng-template" id="components/searchResults">
<div>
<div ng-if="!someResultsExist" class="oppia-search-results-intro" ng-cloak>
Expand Down
2 changes: 1 addition & 1 deletion core/templates/dev/head/dashboard/dashboard.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "base.html" %}

{% block maintitle %}
Creator Dashboard -- Oppia
Creator Dashboard - Oppia
{% endblock maintitle %}

{% block navbar_breadcrumb %}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
{% extends "base.html" %}

{% block maintitle %}
Create an Exploration -- Oppia
{% if title %}
{{ title }} - Oppia Editor
{% else %}
Untitled Exploration - Oppia Editor
{% endif %}
{% endblock maintitle %}

{% block header_js %}
Expand Down
2 changes: 1 addition & 1 deletion core/templates/dev/head/library/library.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

{% block maintitle %}
{% if search_mode %}
Find your learning exploration -- Oppia
Find explorations to learn from - Oppia
{% else %}
I18N_LIBRARY_PAGE_TITLE
{% endif %}
Expand Down
2 changes: 1 addition & 1 deletion core/templates/dev/head/pages/participate.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "base.html" %}

{% block maintitle %}
Get involved with the community -- Oppia
Join the community - Oppia
{% endblock maintitle %}

{% block header_js %}
Expand Down
2 changes: 1 addition & 1 deletion core/templates/dev/head/pages/terms.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends "base.html" %}

{% block maintitle %}
Terms and conditions -- Oppia
Terms of Use - Oppia
{% endblock maintitle %}

{% block header_js %}
Expand Down
45 changes: 34 additions & 11 deletions feconf.py
Original file line number Diff line number Diff line change
Expand Up @@ -644,16 +644,39 @@ def get_empty_ratings():
CSRF_PAGE_NAME_CREATE_EXPLORATION = 'create_exploration'
CSRF_PAGE_NAME_I18N = 'i18n'

# pylint: disable=line-too-long
# The following are all page descriptions for the meta tag.
ABOUT_PAGE_DESCRIPTION = 'Oppia is an open source learning platform that connects a community of teachers and learners. You can use this site to create 1-1 learning scenarios for others on thare created through modules or explorations.'
CREATE_PAGE_DESCRIPTION = 'Let us learn from you. Create lessons through explorations and share your knowledge with the community.'
DASHBOARD_PAGE_DESCRIPTION = 'Keep track of the lessons you have created, as well as feedback from learners.'
FORUM_PAGE_DESCRIPTION = 'Engage with the Oppia community and discuss questions, bugs, explorations;, and make requests.'
LIBRARY_PAGE_DESCRIPTION = 'Looking to learn something new? Find explorations created by professors, teachers and Oppia users in a subject you are interested in, and start exploring!'
PARTICIPATE_PAGE_DESCRIPTION = 'The Oppia library is full of user-created lessons called explorations. Read about how to participate in the community and begin creating explorations.'
PREFERENCES_PAGE_DESCRIPTION = 'Change your Oppia profile settings and preferences.'
SEARCH_PAGE_DESCRIPTION = 'Discover an exploration to learn from, or improve one or contribute and help improve explorations for the community.'
ABOUT_PAGE_DESCRIPTION = (
'Oppia is an open source learning platform that connects a community of '
'teachers and learners. You can use this site to create 1-1 learning '
'scenarios for others.')
CREATE_PAGE_DESCRIPTION = (
'Help others learn new things. Create lessons through explorations and '
'share your knowledge with the community.')
DASHBOARD_PAGE_DESCRIPTION = (
'Keep track of the lessons you have created, as well as feedback from '
'learners.')
FORUM_PAGE_DESCRIPTION = (
'Engage with the Oppia community by discussing questions, bugs and '
'explorations in the forum.')
LIBRARY_PAGE_DESCRIPTION = (
'Looking to learn something new? Find explorations created by professors, '
'teachers and Oppia users in a subject you\'re interested in, and start '
'exploring!')
PARTICIPATE_PAGE_DESCRIPTION = (
'The Oppia library is full of user-created lessons called \'explorations\'.'
' Read about how to participate in the community and begin creating '
'explorations.')
PREFERENCES_PAGE_DESCRIPTION = (
'Change your Oppia profile settings and preferences')
SEARCH_PAGE_DESCRIPTION = (
'Discover a new exploration to learn from, or help improve an existing '
'one for the community.')
SIGNUP_PAGE_DESCRIPTION = 'Sign up for Oppia and begin exploring a new subject.'
SPLASH_PAGE_DESCRIPTION = 'Oppia is a free open-source learning platform with learning modules called explorations. Learn from user-created explorations, or teach and create your own.'
TERMS_PAGE_DESCRIPTION = 'Oppia is a 501(c)(3) registered non-profit open-source e-learning platform. Learn about our terms and conditions for creating and distributing learning material.content creation and distribution.'
SPLASH_PAGE_DESCRIPTION = (
'Oppia is a free site for sharing knowledge via interactive lessons '
'called \'explorations\'. Learn from user-created explorations, or teach '
'and create your own.')
TERMS_PAGE_DESCRIPTION = (
'Oppia is a 501(c)(3) registered non-profit open-source e-learning '
'platform. Learn about our terms and conditions for creating and '
'distributing learning material.')
6 changes: 3 additions & 3 deletions i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"I18N_SPLASH_JAVASCRIPT_ERROR_DESCRIPTION": "Oppia is a free, open-source learning platform full of interactive activities called 'explorations'. Sadly, Oppia requires JavaScript to be enabled in your web browser in order to function properly and your web browser has JavaScript disabled. If you need help enabling JavaScript, <a href=\"<[hrefUrl]>\">click here.</a>",
"I18N_SPLASH_JAVASCRIPT_ERROR_THANKS": "Thank you.",
"I18N_SPLASH_SITE_FEEDBACK": "Site Feedback",
"I18N_LIBRARY_PAGE_TITLE": "Exploration Library -- Oppia",
"I18N_LIBRARY_PAGE_TITLE": "Exploration Library - Oppia",
"I18N_LIBRARY_SEARCH_PLACEHOLDER": "What are you curious about?",
"I18N_LIBRARY_ALL_CATEGORIES": "All Categories",
"I18N_LIBRARY_ALL_CATEGORIES_SELECTED": "All categories selected",
Expand Down Expand Up @@ -150,7 +150,7 @@
"I18N_CREATE_NEITHER_THANKS": "Neither, Thanks",
"I18N_CREATE_YES_PLEASE": "Yes, please!",
"I18N_CREATE_NO_THANKS": "No, Thanks",
"I18N_SIGNUP_PAGE_TITLE": "Join the community -- Oppia",
"I18N_SIGNUP_PAGE_TITLE": "Join the community - Oppia",
"I18N_SIGNUP_REGISTRATION": "Registration",
"I18N_SIGNUP_COMPLETE_REGISTRATION": "Complete Your Registration",
"I18N_SIGNUP_EMAIL": "Email",
Expand Down Expand Up @@ -272,7 +272,7 @@
"I18N_ERROR_MESSAGE_404": "Sorry, we looked and looked but we just couldn't find that page.",
"I18N_ERROR_MESSAGE_500": "Something went horribly wrong. But it wasn't your fault. An internal error occurred.",
"I18N_LANGUAGE_FOOTER_VIEW_IN": "View Oppia in:",
"I18N_PREFERENCES_PAGE_TITLE": "Change your profile preferences -- Oppia",
"I18N_PREFERENCES_PAGE_TITLE": "Change your profile preferences - Oppia",
"I18N_PREFERENCES_BREADCRUMB": "Preferences",
"I18N_PREFERENCES_HEADING": "Preferences",
"I18N_PREFERENCES_HEADING_SUBTEXT": "Any changes that you make on this page will be auto-saved.",
Expand Down
2 changes: 1 addition & 1 deletion i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"I18N_SPLASH_JAVASCRIPT_ERROR_DESCRIPTION": "Oppia es una plataforma de aprendizaje gratuita, libre y de código abierto Oppia llena de actividades interactivas llamadas exploraciones. Lamentablemente, Oppia requiere que JavaScript esté activado en tu navegador para funcionar apropiadamente y tu navegador ha desactivado JavaScript. Si necesitas ayuda activando JavaScript, <a href=\"<[hrefUrl]>\">haz click aquí.</a>",
"I18N_SPLASH_SITE_FEEDBACK": "Comentarios al sitio",
"I18N_SPLASH_JAVASCRIPT_ERROR_THANKS": "Thank you.",
"I18N_LIBRARY_PAGE_TITLE": "Librería -- Oppia",
"I18N_LIBRARY_PAGE_TITLE": "Librería - Oppia",
"I18N_LIBRARY_SEARCH_PLACEHOLDER": "¿Sobre qué tienes curiosidad?",
"I18N_LIBRARY_ALL_CATEGORIES": "Todas las áreas",
"I18N_LIBRARY_ALL_CATEGORIES_SELECTED": "Todas las áreas están seleccionadas",
Expand Down

0 comments on commit 2daf4b5

Please sign in to comment.