UI Style Improving

HomePlaza-Of-PCL2 · Aug 19, 2024 · edffc18 · edffc18
1 parent fee7364
commit edffc18
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/JMBuilder.js b/JMBuilder.js
@@ -73,8 +73,19 @@ const main = async () => {
     // <end> 1.ii.b
     // <begin> 1.iii
     const hash = process.env.HASH || "Unknown";
+    const result = [];
+    if (hash === "Unknown") {
+        result.push("Unknown");
+        result.push("弹出窗口");
+        result.push("提示|未获取到提交哈希\\n如果你是普通用户，请向主页作者报告此问题");
+    }
+    else {
+        result.push(hash);
+        result.push("打开网页");
+        result.push(`https://github.com/HomePlaza-Of-PCL2/Homepage-Market/commit/${hash}`);
+    }
     console.log("(1.iii): 开始生成 Footer");
-    const Footer = await (await new Generator().initalize()).generateXaml("Footer", hash === "Unknown" ? hash : hash.slice(0, 7), hash === "Unknown" ? "" : `EventType="打开网页"`, `https://github.com/HomePlaza-Of-PCL2/Homepage-Market/commit/${hash}`);
+    const Footer = await (await new Generator().initalize()).generateXaml("Footer", result[0], result[1], result[2]);
     // <end> 1.iii
     // <begin> 1
     console.log("(1): 开始生成完整主页");

diff --git a/templates/xaml/components/Footer.xaml b/templates/xaml/components/Footer.xaml
@@ -17,28 +17,28 @@
                                                 Margin="4,-2,4,0"
                                                 Text="%s"
                                                 ToolTip="当前 Commit 版本"
-                                                %s
+                                                EventType="%s"
                                                 EventData="%s"
                                                 LogoScale="1.1"
                                                 Logo="M11.93 8.5a4.002 4.002 0 0 1-7.86 0H.75a.75.75 0 0 1 0-1.5h3.32a4.002 4.002 0 0 1 7.86 0h3.32a.75.75 0 0 1 0 1.5Zm-1.43-.75a2.5 2.5 0 1 0-5 0 2.5 2.5 0 0 0 5 0Z" />
                     </StackPanel>
-                    <WrapPanel Orientation="Horizontal"
+                    <StackPanel Orientation="Horizontal"
                                VerticalAlignment="Center"
                                Margin="-4,0,0,10"
-                               Height="56">
+                               Height="48">
                         <Image Margin="2"
                                Source="https://s3.bmp.ovh/imgs/2024/08/18/5454ae7566fc802d.png" />
                         <Image Margin="2"
                                Source="https://s3.bmp.ovh/imgs/2024/08/18/db681f5ee25b47c7.png" />
-                    </WrapPanel>
+                    </StackPanel>
                     <StackPanel Orientation="Horizontal"
                                 VerticalAlignment="Center"
                                 Margin="-8,0,0,10">
                         <local:MyIconTextButton HorizontalAlignment="Left"
                                                 Text="GitHub"
                                                 ToolTip="前往主页广场 GitHub 页面"
                                                 EventType="打开网页"
-                                                EventData="https://github.com/MFn233/PCL-Mainpage-Market"
+                                                EventData="https://github.com/HomePlaza-Of-PCL2/Homepage-Market"
                                                 LogoScale="1"
                                                 Logo="M512 42.666667A464.64 464.64 0 0 0 42.666667 502.186667 460.373333 460.373333 0 0 0 363.52 938.666667c23.466667 4.266667 32-9.813333 32-22.186667v-78.08c-130.56 27.733333-158.293333-61.44-158.293333-61.44a122.026667 122.026667 0 0 0-52.053334-67.413333c-42.666667-28.16 3.413333-27.733333 3.413334-27.733334a98.56 98.56 0 0 1 71.68 47.36 101.12 101.12 0 0 0 136.533333 37.973334 99.413333 99.413333 0 0 1 29.866667-61.44c-104.106667-11.52-213.333333-50.773333-213.333334-226.986667a177.066667 177.066667 0 0 1 47.36-124.16 161.28 161.28 0 0 1 4.693334-121.173333s39.68-12.373333 128 46.933333a455.68 455.68 0 0 1 234.666666 0c89.6-59.306667 128-46.933333 128-46.933333a161.28 161.28 0 0 1 4.693334 121.173333A177.066667 177.066667 0 0 1 810.666667 477.866667c0 176.64-110.08 215.466667-213.333334 226.986666a106.666667 106.666667 0 0 1 32 85.333334v125.866666c0 14.933333 8.533333 26.88 32 22.186667A460.8 460.8 0 0 0 981.333333 502.186667 464.64 464.64 0 0 0 512 42.666667" />
                         <local:MyIconTextButton Text="WTFPL license"
@@ -54,7 +54,7 @@
                                             Text="反馈"
                                             ToolTip="反馈主页广场问题"
                                             EventType="打开网页"
-                                            EventData="https://github.com/MFn233/PCL-Mainpage-Market/issues/new/choose"
+                                            EventData="https://github.com/HomePlaza-Of-PCL2/Homepage-Market/issues/new/choose"
                                             LogoScale="1"
                                             Logo="M8 9.5a1.5 1.5 0 1 0 0-3 1.5 1.5 0 0 0 0 3z M8 0a8 8 0 1 1 0 16A8 8 0 0 1 8 0z M1.5 8a6.5 6.5 0 1 0 13 0 6.5 6.5 0 0 0-13 0z" />
                     <local:MyIconTextButton HorizontalAlignment="Left"