userpaget_get.html: Resolve conflict
commit
92a1af4222
|
@ -43,6 +43,17 @@
|
|||
white-space: pre-wrap;
|
||||
}
|
||||
|
||||
.arrow {
|
||||
padding: 0;
|
||||
font-size: 20px;
|
||||
line-height: 21px;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.arrow:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
|
@ -75,7 +86,7 @@
|
|||
<div id="text-content">
|
||||
<div id="found">
|
||||
<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>
|
||||
<p class="text-muted" id="date">Article added on: {{ today_article["date"] }}</p><br/>
|
||||
<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="lead"><font id="article">{{ today_article["article_body"] }}</font></p><br/>
|
||||
|
@ -219,7 +230,7 @@
|
|||
}
|
||||
|
||||
|
||||
function load_next_article() {
|
||||
function load_next_article(){
|
||||
$.ajax({
|
||||
url: '/get_next_article/{{username}}',
|
||||
dataType: 'json',
|
||||
|
@ -252,9 +263,7 @@
|
|||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
function update(today_article) {
|
||||
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"]);
|
||||
|
@ -269,7 +278,6 @@
|
|||
document.querySelector('#user_level').classList.add('mark'); // do the same thing for user difficulty level
|
||||
setTimeout(() => {document.querySelector('#user_level').classList.remove('mark');}, 2000);
|
||||
}
|
||||
<!-- 检查是否存在上一篇或下一篇,不存在设上一篇按钮为灰色-->
|
||||
function check_pre(visited_articles){
|
||||
if((visited_articles=='')||(visited_articles['index']<=0)){
|
||||
$('#load_pre_article').addClass('gray-background'); // 设置为灰色
|
||||
|
|
|
@ -46,5 +46,7 @@
|
|||
{% endfor %}
|
||||
{% endif %}
|
||||
</div>
|
||||
<script>window.history.replaceState(null, null, window.location.href);
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
|
|
Loading…
Reference in New Issue