Fix oppia#7197: Address review comments from oppia#7068 (oppia#7269)

* address review comments * fix lint issues * revert constants
aishacodes · Aug 4, 2019 · 23b7132 · 23b7132
1 parent 041f148
commit 23b7132
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 100 deletions.
diff --git a/core/templates/dev/head/pages/collection-player-page/collection-player-page.mainpage.html b/core/templates/dev/head/pages/collection-player-page/collection-player-page.mainpage.html
@@ -61,8 +61,8 @@
         width: 250px;
       }
       .mobile-lesson-icon {
-        position: absolute;
         left: 50%;
+        position: absolute;
         transform: translate(-50%, -50%);
         width: 100px;
       }

diff --git a/core/templates/dev/head/pages/exploration-editor-page/exploration-editor-page.mainpage.html b/core/templates/dev/head/pages/exploration-editor-page/exploration-editor-page.mainpage.html
@@ -48,7 +48,7 @@
 {% endblock content %}
 
 {% block footer_js %}
-{{ super() }}
+  {{ super() }}
   <script src="/third_party/static/ckeditor-4.9.2/ckeditor.js"></script>
   <script src="/third_party/static/d3js-5.9.2/d3.min.js"></script>
   <script src="/templates/dev/head/mathjaxConfig.js"></script>

diff --git a/feconf.py b/feconf.py
@@ -814,9 +814,6 @@ def get_empty_ratings():
     'Discover top-rated or recently-published explorations on Oppia. Learn '
     'from these explorations or help improve an existing one for the '
     'community.')
-SEARCH_PAGE_DESCRIPTION = (
-    'Discover a new exploration to learn from, or help improve an existing '
-    'one for the community.')
 
 # The type of the response returned by a handler when an exception is raised.
 HANDLER_TYPE_HTML = 'html'

diff --git a/webpack.config.ts b/webpack.config.ts
@@ -28,6 +28,11 @@ var htmlMinifyConfig = {
 };
 
 var commonPrefix = './core/templates/dev/head';
+var defaultMeta = {
+  name: 'Personalized Online Learning from Oppia',
+  description: 'Oppia is a free, open-source learning platform. Join ' +
+    'the community to create or try an exploration today!'
+};
 
 module.exports = {
   entries: {
@@ -111,7 +116,7 @@ module.exports = {
       chunks: ['admin'],
       filename: 'admin-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         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.'
@@ -130,7 +135,7 @@ module.exports = {
       chunks: ['about'],
       filename: 'about-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         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.'
@@ -143,7 +148,7 @@ module.exports = {
       chunks: ['collection_editor'],
       filename: 'collection-editor-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         description: 'Contact the Oppia team, submit feedback, and learn ' +
           'how to get involved with the Oppia project.'
       },
@@ -157,7 +162,7 @@ module.exports = {
       chunks: ['collection_player'],
       filename: 'collection-player-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         description: 'Contact the Oppia team, submit feedback, and learn ' +
           'how to get involved with the Oppia project.'
       },
@@ -177,7 +182,7 @@ module.exports = {
       chunks: ['contact'],
       filename: 'contact-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         description: 'Contact the Oppia team, submit feedback, and learn ' +
           'how to get involved with the Oppia project.'
       },
@@ -188,11 +193,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['creator_dashboard'],
       filename: 'creator-dashboard-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. Join ' +
-          'the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template:
         commonPrefix + '/pages/creator-dashboard-page/' +
         'creator-dashboard-page.mainpage.html',
@@ -203,7 +204,7 @@ module.exports = {
       chunks: ['donate'],
       filename: 'donate-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         description: 'Donate to The Oppia Foundation.'
       },
       template: commonPrefix + '/pages/donate-page/donate-page.mainpage.html',
@@ -213,11 +214,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['email_dashboard'],
       filename: 'email-dashboard-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. ' +
-          'Join the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template: (
         commonPrefix +
         '/pages/email-dashboard-pages/email-dashboard-page.mainpage.html'),
@@ -227,11 +224,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['email_dashboard_result'],
       filename: 'email-dashboard-result.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. ' +
-          'Join the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template:
         commonPrefix +
         '/pages/email-dashboard-pages/email-dashboard-result.mainpage.html',
@@ -257,11 +250,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['exploration_player'],
       filename: 'exploration-player-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. Join ' +
-          'the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template:
         commonPrefix + '/pages/exploration-player-page/' +
         'exploration-player-page.mainpage.html',
@@ -272,7 +261,7 @@ module.exports = {
       chunks: ['get_started'],
       filename: 'get-started-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         description: 'Learn how to get started using Oppia.'
       },
       template:
@@ -283,11 +272,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['landing'],
       filename: 'topic-landing-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. ' +
-          'Join the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template:
         commonPrefix + '/pages/landing-pages/topic-landing-page/' +
         'topic-landing-page.mainpage.html',
@@ -297,11 +282,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['learner_dashboard'],
       filename: 'learner-dashboard-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. ' +
-          'Join the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template:
         commonPrefix + '/pages/learner-dashboard-page/' +
         'learner-dashboard-page.mainpage.html',
@@ -312,7 +293,7 @@ module.exports = {
       chunks: ['library'],
       filename: 'library-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         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!'
@@ -332,11 +313,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['moderator'],
       filename: 'moderator-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. ' +
-          'Join the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template:
         commonPrefix + '/pages/moderator-page/moderator-page.mainpage.html',
       minify: htmlMinifyConfig,
@@ -345,11 +322,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['privacy'],
       filename: 'privacy-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. Join ' +
-          'the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template: commonPrefix + '/pages/privacy-page/privacy-page.mainpage.html',
       minify: htmlMinifyConfig,
       inject: false
@@ -358,7 +331,7 @@ module.exports = {
       chunks: ['notifications_dashboard'],
       filename: 'notifications-dashboard-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         description: 'Keep track of the lessons you have created, as well ' +
           'as feedback from learners.'
       },
@@ -383,7 +356,7 @@ module.exports = {
       chunks: ['preferences'],
       filename: 'preferences-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         description: 'Change your Oppia profile settings and preferences'
       },
       template:
@@ -394,23 +367,15 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['profile'],
       filename: 'profile-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. Join ' +
-          'the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template: commonPrefix + '/pages/profile-page/profile-page.mainpage.html',
       minify: htmlMinifyConfig,
       inject: false
     }),
     new HtmlWebpackPlugin({
       chunks: ['review_test'],
       filename: 'review-test-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. ' +
-          'Join the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template:
         commonPrefix + '/pages/review-test-page/review-test-page.mainpage.html',
       minify: htmlMinifyConfig,
@@ -420,7 +385,7 @@ module.exports = {
       chunks: ['signup'],
       filename: 'signup-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         description: 'Sign up for Oppia and begin exploring a new subject.'
       },
       template: commonPrefix + '/pages/signup-page/signup-page.mainpage.html',
@@ -430,11 +395,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['skill_editor'],
       filename: 'skill-editor-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. Join ' +
-          'the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template:
         commonPrefix + '/pages/skill-editor-page/' +
         'skill-editor-page.mainpage.html',
@@ -445,7 +406,7 @@ module.exports = {
       chunks: ['splash'],
       filename: 'splash-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         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.'
@@ -457,11 +418,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['stewards'],
       filename: 'stewards-landing-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. ' +
-          'Join the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template:
         commonPrefix +
         '/pages/landing-pages/stewards-landing-page/' +
@@ -472,11 +429,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['story_editor'],
       filename: 'story-editor-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. Join ' +
-          'the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template:
         commonPrefix + '/pages/story-editor-page/' +
         'story-editor-page.mainpage.html',
@@ -496,7 +449,7 @@ module.exports = {
       chunks: ['teach'],
       filename: 'teach-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         description: 'The Oppia library is full of user-created lessons ' +
         'called \'explorations\'. Read about how to participate in the ' +
         'community and begin creating explorations.'
@@ -509,7 +462,7 @@ module.exports = {
       chunks: ['terms'],
       filename: 'terms-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         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.'
@@ -522,7 +475,7 @@ module.exports = {
       chunks: ['thanks'],
       filename: 'thanks-page.mainpage.html',
       meta: {
-        name: 'Personalized Online Learning from Oppia',
+        name: defaultMeta.name,
         description: 'Thank you for donating to The Oppia Foundation.'
       },
       template: commonPrefix + '/pages/thanks-page/thanks-page.mainpage.html',
@@ -532,11 +485,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['topic_editor'],
       filename: 'topic-editor-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. ' +
-          'Join the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template:
         commonPrefix + '/pages/topic-editor-page/' +
         'topic-editor-page.mainpage.html',
@@ -546,11 +495,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['topics_and_skills_dashboard'],
       filename: 'topics-and-skills-dashboard-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. ' +
-          'Join the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template: (
         commonPrefix +
         '/pages/topics-and-skills-dashboard-page/' +
@@ -562,11 +507,7 @@ module.exports = {
     new HtmlWebpackPlugin({
       chunks: ['topic_viewer'],
       filename: 'topic-viewer-page.mainpage.html',
-      meta: {
-        name: 'Personalized Online Learning from Oppia',
-        description: 'Oppia is a free, open-source learning platform. Join ' +
-          'the community to create or try an exploration today!'
-      },
+      meta: defaultMeta,
       template:
         commonPrefix + '/pages/topic-viewer-page/' +
         'topic-viewer-page.mainpage.html',