Merge pull request openedx#3 from HHH-Disguiser/fixui

Fixui
xavierchan · May 16, 2019 · 5a9efb5 · 5a9efb5
2 parents 93e68d1 + 3522ace
commit 5a9efb5
Show file tree

Hide file tree

Showing 11 changed files with 2,517 additions and 4 deletions.
diff --git a/lms/static/js/imgcache-qq-tcplayer-min.js b/lms/static/js/imgcache-qq-tcplayer-min.js
diff --git a/lms/templates/static_templates/server-error.html b/lms/templates/static_templates/server-error.html
@@ -8,6 +8,8 @@
 
 <main id="main" aria-label="Content" tabindex="-1">
     <section class="outside-app">
+        <img class="error_img_pc"  src='${static.url("images/500_pc.png")}' />
+        <img class="error_img_phone" src='${static.url("images/500_phone.png")}'  />
         <h1>
             <%block name="pageheader">
                 % if page_header:

diff --git a/openedx/core/djangoapps/ace_common/template_context.py b/openedx/core/djangoapps/ace_common/template_context.py
@@ -36,6 +36,6 @@ def get_base_template_context(site):
             'CONTACT_MAILING_ADDRESS', site=site, site_config_name='contact_mailing_address'),
         'social_media_urls': get_config_value_from_site_or_settings('SOCIAL_MEDIA_FOOTER_URLS', site=site),
         'mobile_store_urls': get_config_value_from_site_or_settings('MOBILE_STORE_URLS', site=site),
-        'elite_filing_website': getattr(settings, 'ELITE_FILING_WEBSITE', None),
-        'elite_case_number': getattr(settings, 'ELITE_CASE_NUMBER', None),
+        'elite_filing_website': getattr(settings, 'ELITE_FILING_WEBSITE', ""),
+        'elite_case_number': getattr(settings, 'ELITE_CASE_NUMBER', ""),
     }
diff --git a/themes/normal-theme/lms/static/images/404_pc.png b/themes/normal-theme/lms/static/images/404_pc.png
diff --git a/themes/normal-theme/lms/static/images/404_phone.png b/themes/normal-theme/lms/static/images/404_phone.png
diff --git a/themes/normal-theme/lms/static/images/500_pc.png b/themes/normal-theme/lms/static/images/500_pc.png
diff --git a/themes/normal-theme/lms/static/images/500_phone.png b/themes/normal-theme/lms/static/images/500_phone.png
diff --git a/themes/normal-theme/lms/static/sass/imgcache-qq-tcplayer.scss b/themes/normal-theme/lms/static/sass/imgcache-qq-tcplayer.scss
diff --git a/themes/normal-theme/lms/static/sass/lms-main-v1.scss b/themes/normal-theme/lms/static/sass/lms-main-v1.scss
@@ -10,6 +10,8 @@
 @import './modify/lms/page/search';
 @import './modify/lms/page/dashboard';
 @import './modify/lms/page/professor';
+@import './modify/lms/page/error';
+
 
 @import './modify/lms/course/about';
 

diff --git a/themes/normal-theme/lms/static/sass/modify/lms/page/_error.scss b/themes/normal-theme/lms/static/sass/modify/lms/page/_error.scss
@@ -0,0 +1,72 @@
+.main-container{
+  .outside-app{
+    width: 875px;
+    background-color: #ffffff;
+	  box-shadow: 0px 1px 4px 0px  #b6dcfe;
+    border-radius: 3px;
+    margin-top: 66px;
+    padding: 98px 0;
+    .error_img_pc{
+      width: 315px;
+      margin: 0 auto;
+      display: block;
+      margin-bottom: 24px;
+    }
+
+    .error_img_phone{
+      display: none;
+    }
+    h1{
+      color: $title;
+      font-family: $font-family;
+      margin-bottom: 11px;
+    }
+  }
+}
+
+@media screen and (max-width:768px){
+  .main-container{
+    .outside-app{
+      width: 90%;
+      background-color: #ffffff;
+      box-shadow: 0px 1px 4px 0px #b6dcfe;
+      border-radius: 3px;
+      box-sizing: border-box;
+      margin: 0 auto;
+      padding: 80px 10px;
+      margin-top: 10%;
+      min-width: 90%;
+      .error_img_phone{
+        width: 40%;
+        margin: 0 auto;
+        display: block;
+        margin-bottom: 24px;
+      }
+
+      .error_img_pc{
+        display: none;
+      }
+      h1{
+        color: $title;
+        font-family: $font-family;
+        margin-bottom: 11px;
+      }
+    }
+  }
+}
+
+@media screen and (max-width:500px){
+  .main-container{
+    .outside-app{
+      .error_img_phone{
+        width: 60%;
+        margin: 0 auto;
+        display: block;
+        margin-bottom: 24px;
+      }
+      .error_img_pc{
+        display: none;
+      }
+    }
+  }
+}
diff --git a/themes/normal-theme/lms/templates/courseware/course_about.html b/themes/normal-theme/lms/templates/courseware/course_about.html
@@ -298,8 +298,8 @@ <h1>
       <script src="//oss.elitemba.cn/gtm/membership.js"></script>
 
       <!-- video player-->
-      <link href="//imgcache.qq.com/open/qcloud/video/tcplayer/tcplayer.css" rel="stylesheet">
-      <script src="//imgcache.qq.com/open/qcloud/video/tcplayer/tcplayer.min.js"></script>
+      <link href="${static.url('normal-theme/css/imgcache-qq-tcplayer.css')}" rel="stylesheet">
+      <script src="${static.url('js/imgcache-qq-tcplayer-min.js')}"></script>
       <div class="about-cover" onclick="closeVideo()" style="display: none">
         <span class="fa-my fa-my-close"></span>
       </div>