Почетна Преглед Помоћ
Пријавите се
TC
/
arozos
1
0
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

Final push before dinner

Toby Chui пре 2 година
родитељ
a1b1478984
комит
aa8685ac3c
2 измењених фајлова са 18 додато и 14 уклоњено
Подељен поглед Покажи статистику Diff
  1. 9 1
      web/SystemAO/advance/switchAccount.html
  2. 9 13
      web/desktop.system

+ 9 - 1
web/SystemAO/advance/switchAccount.html
Прегледај датотеку 

@@ -78,6 +78,14 @@
 
             background-color: #1B1C1D;

             color: rgba(255, 255, 255, 0.9);

         }

+

+        body.darkTheme #isAdminLogo{

+            color: var(--text_color) !important;

+        }

+

+        body.darkTheme .alternativeAccount .content i.isAdminIcon{

+            color: var(--text_color) !important;

+        }

     </style>

     </head>

     <body> 

@@ -310,7 +318,7 @@
 
                                             <div class="ui header">

                                                 <img class="usericon" src="${userIcon}">

                                                 <div class="content" style="font-size: 95% !important;">

-                                                    <span class="username">${account.Username}</span> ${(data.IsAdmin)?'<i style="margin-left: 0.4em; color: rgb(38, 50, 56);" title="Admin" class="small shield alternate icon themed text"></i>':""}

+                                                    <span class="username">${account.Username}</span> ${(data.IsAdmin)?'<i style="margin-left: 0.4em; color: rgb(38, 50, 56);" class="small shield alternate icon themed text isAdminIcon"></i>':""}

                                                     <div class="sub header usergroup">${!account.IsExpired?"<i class='ui green check circle icon' style='margin-right: 0px;'></i> " + applocale.getString("desc/sessionValid", "Session Valid"):"<i class='ui red times circle icon' style='margin-right: 0px;'></i> " + applocale.getString("desc/sessionExpired", "Session Expired")}</div>

                                                 </div>

                                             </div>

+ 9 - 13
web/desktop.system
Прегледај датотеку 

@@ -7268,19 +7268,16 @@
 
             $("#alternativeAccountList").empty();

             if (getBrowserAccountPoolUUID() == undefined){

                  //Empty or no stored accounts

-                 $("#alternativeAccountList").append(`<div class="ui message">

-                    <i class="ui green check circle icon"></i> ${applocale.getString("account/switch/noAlternative", "No other account stored on this browser")}

-                </div>`);

-                $("#signoutAllButton").addClass('disabled');

-                return;

+                 $("#alternativeAccountList").append(`<i class="ui green check circle icon"></i> ${applocale.getString("account/switch/noAlternative", "No other account stored on this browser")}`);

+                 $("#alternativeAccountList").css("padding-top", "8px");

+                 $("#signoutAllButton").addClass('disabled');

+                 return;

             }else{

                 //Request server side for the account pool

                 $.get("system/auth/u/list?pid=" + getBrowserAccountPoolUUID(), function(data){

                     if (data.error != undefined){

-                        $("#alternativeAccountList").append(`<div class="ui message">

-                            <i class="ui green check circle icon"></i> ${applocale.getString("account/switch/noAlternative", "No other account stored on this browser")}

-                        </div>`);

-

+                        $("#alternativeAccountList").append(`<i class="ui green check circle icon"></i> ${applocale.getString("account/switch/noAlternative", "No other account stored on this browser")}`);

+                        $("#alternativeAccountList").css("padding-top", "8px");

                         //This uuid no longer exists or it has been expired and removed by backend server/

                         localStorage.removeItem("ao_acc");

                     }else{

@@ -7290,7 +7287,7 @@
 
                                     //Skip

                                     return;

                                 }

-                               

+                                $("#alternativeAccountList").css("padding-top", "0px");

                                 $.get("system/desktop/user?target=" + account.Username, function(data){

                                     let userIcon = data.UserIcon;

                                     if (userIcon == ""){

@@ -7312,9 +7309,8 @@
 
                             $("#signoutAllButton").removeClass('disabled');

                         }else{

                             $("#signoutAllButton").addClass('disabled');

-                            $("#alternativeAccountList").append(`<div class="ui message">

-                                <i class="ui green check circle icon"></i> ${applocale.getString("account/switch/noAlternative", "No other account stored on this browser")}

-                            </div>`);

+                            $("#alternativeAccountList").css("padding-top", "8px");

+                            $("#alternativeAccountList").append(`<i class="ui green check circle icon"></i> ${applocale.getString("account/switch/noAlternative", "No other account stored on this browser")}`);

                             return;

                         }

                     }