🎨 b3log#12706

APOLLO2333 · Mar 17, 2019 · 862f4dc · 862f4dc
1 parent de87596
commit 862f4dc
Show file tree

Hide file tree

Showing 10 changed files with 22 additions and 14 deletions.
diff --git a/CHANGE_LOGS.html b/CHANGE_LOGS.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1" media="(device-height: 568px)">
     <title>Solo Change Logs</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <link rel="apple-touch-icon" href="/favicon.png">
+    <link rel="apple-touch-icon" href="https://static.b3log.org/images/brand/solo-32.png">
     <style>
         a {
             color: #4285f4;

diff --git a/src/main/java/org/b3log/solo/processor/IndexProcessor.java b/src/main/java/org/b3log/solo/processor/IndexProcessor.java
@@ -176,8 +176,15 @@ public void showStart(final RequestContext context) {
         dataModel.put(Common.REFERER, referer);
         Keys.fillRuntime(dataModel);
         dataModelService.fillMinified(dataModel);
-
         Solos.addGoogleNoIndex(context);
+        try {
+            final JSONObject preference = optionQueryService.getPreference();
+            dataModelService.fillCommon(context, dataModel, preference);
+        } catch (final Exception e) {
+            LOGGER.log(Level.ERROR, e.getMessage(), e);
+
+            context.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
+        }
     }
 
     /**

diff --git a/src/main/java/org/b3log/solo/processor/console/AdminConsole.java b/src/main/java/org/b3log/solo/processor/console/AdminConsole.java
@@ -41,7 +41,10 @@
 import org.b3log.latke.util.Execs;
 import org.b3log.latke.util.Strings;
 import org.b3log.solo.SoloServletListener;
-import org.b3log.solo.model.*;
+import org.b3log.solo.model.Common;
+import org.b3log.solo.model.Option;
+import org.b3log.solo.model.Skin;
+import org.b3log.solo.model.UserExt;
 import org.b3log.solo.service.DataModelService;
 import org.b3log.solo.service.ExportService;
 import org.b3log.solo.service.OptionQueryService;
@@ -142,7 +145,6 @@ public void showAdminIndex(final RequestContext context) {
             dataModel.put(Common.YEAR, String.valueOf(Calendar.getInstance().get(Calendar.YEAR)));
             dataModel.put(Option.ID_C_ARTICLE_LIST_DISPLAY_COUNT, preference.getInt(Option.ID_C_ARTICLE_LIST_DISPLAY_COUNT));
             dataModel.put(Option.ID_C_ARTICLE_LIST_PAGINATION_WINDOW_SIZE, preference.getInt(Option.ID_C_ARTICLE_LIST_PAGINATION_WINDOW_SIZE));
-            dataModel.put(Option.ID_C_LOCALE_STRING, preference.getString(Option.ID_C_LOCALE_STRING));
             dataModel.put(Skin.SKIN_DIR_NAME, preference.getString(Skin.SKIN_DIR_NAME));
             Keys.fillRuntime(dataModel);
             dataModelService.fillMinified(dataModel);
@@ -158,6 +160,7 @@ public void showAdminIndex(final RequestContext context) {
                 dataModel.put(Common.UPLOAD_URL, upload.optString(Common.UPLOAD_URL));
                 dataModel.put(Common.UPLOAD_MSG, upload.optString(Common.UPLOAD_MSG));
             }
+            dataModelService.fillCommon(context, dataModel, preference);
         } catch (final Exception e) {
             LOGGER.log(Level.ERROR, "Admin index render failed", e);
         }

diff --git a/src/main/java/org/b3log/solo/service/DataModelService.java b/src/main/java/org/b3log/solo/service/DataModelService.java
@@ -545,8 +545,7 @@ public void fillRecentComments(final Map<String, Object> dataModel, final JSONOb
      * @param preference the specified preference
      * @throws ServiceException service exception
      */
-    public void fillCommon(final RequestContext context, final Map<String, Object> dataModel, final JSONObject preference)
-            throws ServiceException {
+    public void fillCommon(final RequestContext context, final Map<String, Object> dataModel, final JSONObject preference) throws ServiceException {
         fillSide(context, dataModel, preference);
         fillBlogHeader(context, dataModel, preference);
         fillBlogFooter(context, dataModel, preference);

diff --git a/src/main/webapp/CHANGE_LOGS.html b/src/main/webapp/CHANGE_LOGS.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="initial-scale=1.0,user-scalable=no,maximum-scale=1" media="(device-height: 568px)">
     <title>Solo Change Logs</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <link rel="apple-touch-icon" href="/favicon.png">
+    <link rel="apple-touch-icon" href="https://static.b3log.org/images/brand/solo-32.png">
     <style>
         a {
             color: #4285f4;

diff --git a/src/main/webapp/WEB-INF/static-resources.xml b/src/main/webapp/WEB-INF/static-resources.xml
@@ -27,7 +27,6 @@
 <static-files>
     <!-- Uses the STANDARD Ant Path Pattern to configure these paths!  -->
 
-    <include path="/favicon.png"/>
     <include path="/robots.txt"/>
     <include path="/sw.js"/>
     <include path="/manifest.json"/>

diff --git a/src/main/webapp/admin/admin-index.ftl b/src/main/webapp/admin/admin-index.ftl
@@ -31,7 +31,7 @@
         <title>${adminConsoleLabel} - ${blogTitle}</title>
         <link type="text/css" rel="stylesheet" href="${staticServePath}/scss/admin.css?${staticResourceVersion}" />
         <link type="text/css" rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/styles/atom-one-light.min.css" />
-        <link rel="icon" type="image/png" href="${staticServePath}/favicon.png" />
+        <link rel="icon" type="image/png" href="${faviconURL}" />
         <link rel="manifest" href="${servePath}/manifest.json">
     </head>
     <body onhashchange="admin.setCurByHash();">

diff --git a/src/main/webapp/favicon.png b/src/main/webapp/favicon.png
diff --git a/src/main/webapp/macro-common-page.ftl b/src/main/webapp/macro-common-page.ftl
@@ -28,8 +28,8 @@
     <title>${title}<#if blogTitle??> - ${blogTitle}</#if></title>
     <link type="text/css" rel="stylesheet"
           href="${staticServePath}/scss/start.css?${staticResourceVersion}" charset="utf-8"/>
-    <link rel="icon" type="image/png" href="${staticServePath}/favicon.png"/>
-    <link rel="apple-touch-icon" href="${staticServePath}/favicon.png">
+    <link rel="icon" type="image/png" href="${faviconURL}"/>
+    <link rel="apple-touch-icon" href="${faviconURL}">
 </head>
 <body>
 <div class="wrap">

diff --git a/src/main/webapp/search.ftl b/src/main/webapp/search.ftl
@@ -26,12 +26,12 @@
     <title>${searchLabel} - ${blogTitle}${searchLabel}</title>
     <link type="text/css" rel="stylesheet"
           href="${staticServePath}/scss/start.css?${staticResourceVersion}" charset="utf-8"/>
-    <link rel="icon" type="image/png" href="${staticServePath}/favicon.png"/>
-    <link rel="apple-touch-icon" href="${staticServePath}/favicon.png">
+    <link rel="icon" type="image/png" href="${faviconURL}"/>
+    <link rel="apple-touch-icon" href="${faviconURL}">
 </head>
 <body class="search__body">
 <div class="search__header fn-clear">
-    <a href="${servePath}"><img width="44" border="0" alt="Solo" title="Solo" src="${staticServePath}/favicon.png"/></a>
+    <a href="${servePath}"><img width="32" border="0" alt="Solo" title="Solo" src="${faviconURL}"/></a>
     <div class="search__input">
         <input value="${keyword}" id="keyword" type="text" onkeypress="if(event.keyCode===13){document.getElementById('searchBtn').click()}">
         <button id="searchBtn" onclick="window.location.href='${servePath}/search?keyword=' + document.getElementById('keyword').value">搜索</button>