userpaget_get.html and mainpage_gethtml: improve display information.

Reviewed-on: #158

app/templates/mainpage_get.html

@@ -31,7 +31,7 @@
             <p><a href="/login">登录</a>  <a href="/signup">注册</a> <a href="/static/usr/instructions.html">使用说明</a></p >
             <p><b> {{ random_ads }}。 <a href="/signup">试试</a>吧！</b></p>
         {% endif %}
-        <div class="alert alert-success" role="alert">共有文章 <span class="badge bg-success"> {{ number_of_essays }} </span> 篇 &nbsp;&nbsp;&nbsp;&nbsp;其中Oxford单词覆盖率为: <span class="badge bg-success"> {{ (ratio * 100) | int }}%  </span></div>
+        <div class="alert alert-success" role="alert">共有文章 <span class="badge bg-success"> {{ number_of_essays }} </span> 篇，覆盖 <span class="badge bg-success"> {{ (ratio * 100) | int }}%  </span> 的 Oxford5000 单词</div>
         <p>粘贴1篇文章 (English only)</p>
         <form method="post" action="/">
             <textarea name="content" id="article" rows="10" cols="120"></textarea><br/>

app/templates/userpage_get.html

@@ -27,40 +27,30 @@
           animation: shakes 1600ms ease-in-out;
       }
 
-        @keyframes shakes {
+      @keyframes shakes {
-            10%, 90% {
+          10%, 90% { transform: translate3d(-1px, 0, 0); }
-                transform: translate3d(-1px, 0, 0);
+          20%, 50% { transform: translate3d(+2px, 0, 0); }
-            }
+          30%, 70% { transform: translate3d(-4px, 0, 0); }
-            20%, 50% {
+          40%, 60% { transform: translate3d(+4px, 0, 0); }
-                transform: translate3d(+2px, 0, 0);
+          50% { transform: translate3d(-4px, 0, 0); }
-            }
+      }
-            30%, 70% {
-                transform: translate3d(-4px, 0, 0);
-            }
-            40%, 60% {
-                transform: translate3d(+4px, 0, 0);
-            }
-            50% {
-                transform: translate3d(-4px, 0, 0);
-            }
-        }
 
-        .lead {
+      .lead{
-            font-size: 22px;
+          font-size: 22px;
-            font-family: Helvetica, sans-serif;
+          font-family: Helvetica, sans-serif;
-            white-space: pre-wrap;
+          white-space: pre-wrap;
-        }
+      }
 
-        .arrow {
+      .arrow {
-            padding: 0;
+	  padding: 0;
-            font-size: 20px;
+	  font-size: 20px;
-            line-height: 21px;
+	  line-height: 21px;
-            display: inline-block;
+	  display: inline-block;
-        }
+      }
 
-        .arrow:hover {
+      .arrow:hover {
-            cursor: pointer;
+	  cursor: pointer;
-        }
+      }
 
     </style>
 </head>
@@ -69,70 +59,62 @@
     <p><b>English Pal for <font id="username" color="red">{{ username }}</font></b>
 
         {% if username ==  admin_name %}
-            <a class="btn btn-secondary" href="/admin" role="button" onclick="stopRead()">管理</a>
+        <a class="btn btn-secondary" href="/admin" role="button" onclick="stopRead()">管理</a>
         {% endif %}
         <a id="quit" class="btn btn-secondary" href="/logout" role="button" onclick="stopRead()">退出</a>
         <a class="btn btn-secondary" href="/reset" role="button" onclick="stopRead()">重设密码</a>
 
     </p>
     {% for message in get_flashed_messages() %}
-        <div class="alert alert-warning alert-dismissible fade show" role="alert">
+
-            {{ message }}
+    <div class="alert alert-warning alert-dismissible fade show" role="alert">
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+	{{ message }}
-        </div>
+	<button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+    </div>
     {% endfor %}
 
-    <button class="arrow" id="load_next_article" onclick="load_next_article();Reader.stopRead()"
+        <button class="arrow" id="load_next_article" onclick="load_next_article();Reader.stopRead()" title="下一篇 Next Article">⇨</button>
-            title="下一篇 Next Article">⇨
+        <button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" style="display: none" title="上一篇 Previous Article">⇦</button>
-    </button>
-    <button class="arrow" id="load_pre_article" onclick="load_pre_article();Reader.stopRead()" style="display: none"
-            title="上一篇 Previous Article">⇦
-    </button>
 
     <p><b>阅读文章并回答问题</b></p>
     <div id="text-content">
         <div id="found">
-            <div class="alert alert-success" role="alert">According to your word list, your level is <span
+          <div class="alert alert-success" role="alert">According to your word list, your level is <span class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span>  and we have chosen an article with a difficulty level of <span class="text-decoration-underline" id="text_level">{{ today_article["text_level"] }}</span> for you. The Oxford word coverage is <span class="text-decoration-underline" id="ratio">{{ (today_article["ratio"] * 100) | int }}%.</span></div>
-                    class="text-decoration-underline" id="user_level">{{ today_article["user_level"] }}</span> and we
+                <p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
-                have chosen an article with a difficulty level of <span class="text-decoration-underline"
-                                                                        id="text_level">{{ today_article["text_level"] }}</span>
-                for you.The Oxford word coverage is <span class="text-decoration-underline" id="ratio">{{ (today_article["ratio"] * 100) | int }}%</span>
-            </div>
-            <p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
             <div class="p-3 mb-2 bg-light text-dark" style="margin: 0 0.5%;"><br/>
-                <p class="display-6" id="article_title">{{ today_article["article_title"] }}</p><br/>
+            <p class="display-6" id="article_title">{{ today_article["article_title"] }}</p><br/>
-                <p class="lead"><font id="article">{{ today_article["article_body"] }}</font></p><br/>
+            <p class="lead"><font id="article">{{ today_article["article_body"] }}</font></p><br/>
-                <div>
+            <div>
-                    <p><small class="text-muted" id="source">{{ today_article['source'] }}</small></p><br/>
+                <p><small class="text-muted" id="source">{{ today_article['source'] }}</small></p><br/>
-                </div>
+            </div>
+
+            <p><b id="question">{{ today_article['question'] }}</b></p><br/>
 
-                <p><b id="question">{{ today_article['question'] }}</b></p><br/>
                 <script type="text/javascript">
                     function toggle_visibility(id) { {# https://css-tricks.com/snippets/javascript/showhide-element/#}
                         const e = document.getElementById(id);
-                        if (e.style.display === 'block')
+                        if(e.style.display === 'block')
                             e.style.display = 'none';
                         else
                             e.style.display = 'block';
                     }
                 </script>
                 <button onclick="toggle_visibility('answer');">ANSWER</button>
-                <div id="answer" style="display:none;">{{ today_article['answer'] }}</div>
+                <div id="answer" style="display:none;">{{ today_article['answer'] }}</div><br/>
-                <br/>
             </div>
         </div>
         <div class="alert alert-success" role="alert" id="not_found" style="display:none;">
-            <p class="text-muted"><span class="badge bg-success">Notes:</span><br>No article is currently available for
+            <p class="text-muted"><span class="badge bg-success">Notes:</span><br>No article is currently available for you. You can try again a few times or mark new words in the passage to improve your level.</p>
-                you. You can try again a few times or mark new words in the passage to improve your level.</p>
         </div>
         <div class="alert alert-success" role="alert" id="read_all" style="display:none;">
             <p class="text-muted"><span class="badge bg-success">Notes:</span><br>You've read all the articles.</p>
         </div>
     </div>
 
-    <input type="checkbox" id="highlightCheckbox" onclick="toggleHighlighting()"/>生词高亮
+    <input type="checkbox" id="highlightCheckbox" onclick="toggleHighlighting()" />生词高亮
-    <input type="checkbox" id="readCheckbox" onclick="onReadClick()"/>大声朗读
+    <input type="checkbox" id="readCheckbox" onclick="onReadClick()" />大声朗读
-    <input type="checkbox" id="chooseCheckbox" onclick="onChooseClick()"/>划词入库
+    <input type="checkbox" id="chooseCheckbox" onclick="onChooseClick()" />划词入库
+
     <div class="range">
         <div class="field">
             <div class="sliderValue">
@@ -145,7 +127,7 @@
     <form method="post" action="/{{ username }}/userpage">
         <textarea name="content" id="selected-words" rows="10" cols="120"></textarea><br/>
         <button class="btn btn-primary btn-lg" type="submit" onclick="Reader.stopRead()">把生词加入我的生词库</button>
-        <button class="btn btn-primary btn-lg" type="reset" onclick="clearSelectedWords()">清除</button>
+        <button class="btn btn-primary btn-lg" type="reset"  onclick="clearSelectedWords()">清除</button>
     </form>
     {% if session.get['thisWord'] %}
         <script type="text/javascript">
@@ -173,10 +155,9 @@
                 {% set freq = x[1] %}
                 {% if session.get('thisWord') == x[0] and session.get('time') == 1 %}
                 {% endif %}
-                <p id='p_{{ word }}' class="new-word">
+                <p id='p_{{ word }}' class="new-word" >
-                    <a id="word_{{ word }}" class="btn btn-light"
+                    <a id="word_{{ word }}"  class="btn btn-light" href='http://youdao.com/w/eng/{{ word }}/#keyfrom=dict2.index'
-                       href='http://youdao.com/w/eng/{{ word }}/#keyfrom=dict2.index'
+                    role="button">{{ word }}</a>
-                       role="button">{{ word }}</a>
                     ( <a id="freq_{{ word }}" title="{{ word }}">{{ freq }}</a> )
                     <a class="btn btn-success" onclick="familiar('{{ word }}')" role="button">熟悉</a>
                     <a class="btn btn-warning" onclick="unfamiliar('{{ word }}')" role="button">不熟悉</a>
@@ -220,7 +201,8 @@
         elements.chooseCheckbox.checked = settings.chooseChecked;
         elements.rangeComponent.value = settings.rangeValue;
         elements.rangeValueDisplay.textContent = `${settings.rangeValue}x`;
-        elements.selectedWordsInput.value = settings.selectedWords;
+<!--        elements.selectedWordsInput.value = settings.selectedWords;-->
+
 
         // 刷新页面或进入页面时判断，若不是首篇文章，则上一篇按钮可见
         if (sessionStorage.getItem('pre_page_button') !== 'display' && sessionStorage.getItem('pre_page_button')) {
@@ -245,31 +227,35 @@
     }
 
 
+
     function load_next_article() {
         $("#load_next_article").prop("disabled", true)
         $.ajax({
             url: '/get_next_article/{{username}}',
             dataType: 'json',
-            success: function (data) {
+            success: function(data) {
                 // 更新页面内容
-                if (data['today_article']) {
+                if(data['today_article']){
+                    // answer不可见
+                    const e = document.getElementById('answer');
+                    e.style.display = 'none';
                     update(data['today_article']);
                     check_pre(data['visited_articles']);
                     check_next(data['result_of_generate_article']);
                 }
-            }, complete: function (xhr, status) {
-                $("#load_next_article").prop("disabled", false)
             }
         });
     }
-
+    function load_pre_article(){
-    function load_pre_article() {
         $.ajax({
             url: '/get_pre_article/{{username}}',
             dataType: 'json',
-            success: function (data) {
+            success: function(data) {
                 // 更新页面内容
-                if (data['today_article']) {
+                if(data['today_article']){
+                    // answer不可见
+                    const e = document.getElementById('answer');
+                    e.style.display = 'none';
                     update(data['today_article']);
                     check_pre(data['visited_articles']);
                 }
@@ -280,7 +266,7 @@
     function update(today_article) {
         $('#user_level').html(today_article['user_level']);
         $('#text_level').html(today_article["text_level"]);
-        $('#date').html('Article added on: ' + today_article["date"]);
+        $('#date').html('Article added on: '+today_article["date"]);
         $('#article_title').html(today_article["article_title"]);
         $('#article').html(today_article["article_body"]);
         $('#source').html(today_article['source']);
@@ -288,18 +274,13 @@
         $('#answer').html(today_article["answer"]);
         $('#ratio').html(Math.round(today_article["ratio"] * 100) + '%');
         document.querySelector('#text_level').classList.add('mark'); // highlight text difficult level for 2 seconds
-        setTimeout(() => {
+        setTimeout(() => {document.querySelector('#text_level').classList.remove('mark');}, 2000);
-            document.querySelector('#text_level').classList.remove('mark');
-        }, 2000);
         document.querySelector('#user_level').classList.add('mark'); // do the same thing for user difficulty level
-        setTimeout(() => {
+        setTimeout(() => {document.querySelector('#user_level').classList.remove('mark');}, 2000);
-            document.querySelector('#user_level').classList.remove('mark');
-        }, 2000);
     }
-
+<!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
-    <!-- 检查是否存在上一篇或下一篇，不存在则对应按钮隐藏-->
+    function check_pre(visited_articles){
-    function check_pre(visited_articles) {
+        if((visited_articles=='')||(visited_articles['index']<=0)){
-        if ((visited_articles == '') || (visited_articles['index'] <= 0)) {
             $('#load_pre_article').hide();
             sessionStorage.setItem('pre_page_button', 'display')
         } else {
@@ -307,17 +288,15 @@
             sessionStorage.setItem('pre_page_button', 'show')
         }
     }
-
+    function check_next(result_of_generate_article){
-    function check_next(result_of_generate_article) {
+        if(result_of_generate_article == "found"){
-        if (result_of_generate_article == "found") {
+            $('#found').show();$('#not_found').hide();
-            $('#found').show();
-            $('#not_found').hide();
             $('#read_all').hide();
-        } else if (result_of_generate_article == "not found") {
+        }else if(result_of_generate_article == "not found"){
             $('#found').hide();
             $('#not_found').show();
             $('#read_all').hide();
-        } else {
+        }else{
             $('#found').hide();
             $('#not_found').hide();
             $('#read_all').show();