Merge pull request #821 from visuddhinanda/laravel

🐛 经验值图顺序错乱

public/app/term/note.js

@@ -1266,12 +1266,14 @@ function renderNissayaPreview(str){
         const word =  iterator.split("=");
         if(iterator.indexOf('=')>=0){
             html += "<span class='nsy_word'>"
-            html += "<span class='org'>";
+            html += "<span class='org' lang=";
             switch (getCookie('language')) {
                 case 'my':
+                    html += "'my' >";
                     html +=  $.trim(word[0]) + "၊";
                     break;
                 default:
+                    html += "'en' >";
                     html += my_to_roman(word[0]);
                     break;
             }

public/app/term/term.css

@@ -1138,10 +1138,27 @@ pali>p {
 .preview .nissaya .nsy_word{
     padding-right:10px;
 }
-.nsy_word .org{
+.nsy_word{
+    padding-right:10px;
+    color: var(--main-color1);
+}
+.nsy_word>.org{
     display:inline;
     font-weight: 700;
     padding-right: 0.5em;
+    font-size: unset;
+    color: #9f3a01;
+}
+.nsy_word>.org:lang(en){
+    font-weight: unset;
+}
+.nsy_word>.org>strong {
+    color: black;
+    font-weight:900;
+}
+.nsy_word>.org>strong:lang(en) {
+    color: black;
+    font-weight:700;
 }
 .nsy_word .meaning{
     display:inline;

public/app/ucenter/active_get.php

@@ -16,7 +16,7 @@ if (isset($_GET["userid"])) {
     $dns = _FILE_DB_USER_ACTIVE_;
     $dbh = new PDO($dns, _DB_USERNAME_, _DB_PASSWORD_, array(PDO::ATTR_PERSISTENT => true));
     $dbh->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_WARNING);
-    $query = "SELECT date_int,duration,hit  FROM "._TABLE_USER_OPERATION_DAILY_." WHERE user_id = ? ";
+    $query = "SELECT date_int,duration,hit  FROM "._TABLE_USER_OPERATION_DAILY_." WHERE user_id = ? order by date_int asc";
     $sth = $dbh->prepare($query);
     $sth->execute(array($userid));
     $last = 0;