From 31a7511fb1c36089afaa18c9e13a9f3d2aba2019 Mon Sep 17 00:00:00 2001
From: xaoxuu <xaoxuu@gmail.com>
Date: Tue, 25 Feb 2020 00:35:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 layout/_partial/side.ejs         | 36 +++++++-------------------------
 layout/_pre.ejs                  | 17 +++++++++++----
 layout/_widget/_pre.ejs          | 17 +++++++++++++++
 layout/_widget/blogger.ejs       | 13 ++----------
 layout/_widget/category.ejs      | 13 ++----------
 layout/_widget/copyright.ejs     | 13 ++----------
 layout/_widget/grid.ejs          | 13 ++----------
 layout/_widget/list.ejs          | 13 ++----------
 layout/_widget/qrcode.ejs        | 13 ++----------
 layout/_widget/related_posts.ejs | 13 ++----------
 layout/_widget/tagcloud.ejs      | 13 ++----------
 layout/_widget/text.ejs          | 13 ++----------
 layout/_widget/toc.ejs           | 13 ++----------
 layout/index.ejs                 |  1 -
 14 files changed, 57 insertions(+), 144 deletions(-)
 create mode 100755 layout/_widget/_pre.ejs

diff --git a/layout/_partial/side.ejs b/layout/_partial/side.ejs
index 148f04e..7c03634 100755
--- a/layout/_partial/side.ejs
+++ b/layout/_partial/side.ejs
@@ -1,32 +1,10 @@
+<%console.log('sidebar: ', page.sidebar);%>
 <aside class='l_side'>
-  <% if (page.sidebar) { %>
-    <% page.sidebar.forEach(function(widget_id){ %>
-      <% theme.widget.forEach(function(widget){ %>
-        <% if (widget.id == widget_id){ %>
-          <%- partial('../_widget/' + widget.class, {item: widget}) %>
-        <% } %>
-      <% }) %>
+  <% page.sidebar.forEach(function(widget_id){ %>
+    <% theme.widget.forEach(function(widget){ %>
+      <% if (widget.id == widget_id){ %>
+        <%- partial('../_widget/' + widget.class, {item: widget}) %>
+      <% } %>
     <% }) %>
-  <% } else { %>
-    <%
-    var ids = [];
-    if(is_home() || is_category() || is_archive() || is_tag() || page.layout == 'list') {
-      var isPostList = true;
-    } else {
-      var isPostList = false;
-    }
-    if (isPostList) {
-      ids = theme.layout.on_list.sidebar;
-    } else {
-      ids = theme.layout.on_page.sidebar;
-    }
-    %>
-    <% ids.forEach(function(widget_id){ %>
-      <% theme.widget.forEach(function(widget){ %>
-        <% if (widget.id == widget_id){ %>
-          <%- partial('../_widget/' + widget.class, {item: widget}) %>
-        <% } %>
-      <% }) %>
-    <% }) %>
-  <% } %>
+  <% }) %>
 </aside>
diff --git a/layout/_pre.ejs b/layout/_pre.ejs
index 907e56f..683cd98 100755
--- a/layout/_pre.ejs
+++ b/layout/_pre.ejs
@@ -1,11 +1,20 @@
 <%
 if (is_home() || is_category() || is_archive() || is_tag() || page.layout == 'list') {
-  if (theme.layout.on_list.sidebar.length == 0) {
-    page.sidebar = false;
+  if (page.sidebar == undefined) {
+    if (theme.layout.on_list.sidebar.length == 0) {
+      page.sidebar = [];
+    } else {
+      page.sidebar = theme.layout.on_list.sidebar;
+    }
   }
+
 } else {
-  if (theme.layout.on_page.sidebar.length == 0) {
-    page.sidebar = false;
+  if (page.sidebar == undefined) {
+    if (theme.layout.on_page.sidebar.length == 0) {
+      page.sidebar = [];
+    } else {
+      page.sidebar = theme.layout.on_page.sidebar;
+    }
   }
 }
 %>
diff --git a/layout/_widget/_pre.ejs b/layout/_widget/_pre.ejs
new file mode 100755
index 0000000..b0fb42a
--- /dev/null
+++ b/layout/_widget/_pre.ejs
@@ -0,0 +1,17 @@
+<%
+var pf = [];
+if (item.display) {
+  item.display.forEach(function(p){
+    pf.push(p);
+  });
+} else {
+  pf = ['desktop', 'mobile'];
+}
+
+page.widget_style = (theme.style.shadow.card ? ' card-shadow' : '') + ((theme.style.blur && theme.style.blur.widget) ? ' widget-blur' : '');
+page.widget_platform = pf.join(' ');
+
+console.log(page.widget_style);
+console.log(page.widget_platform);
+
+%>
diff --git a/layout/_widget/blogger.ejs b/layout/_widget/blogger.ejs
index 5b15e28..c6e66f4 100755
--- a/layout/_widget/blogger.ejs
+++ b/layout/_widget/blogger.ejs
@@ -1,14 +1,5 @@
-<%
-var plats = [];
-if (item.display) {
-  item.display.forEach(function(plat){
-    plats.push(plat);
-  });
-} else {
-  plats = ['desktop', 'mobile'];
-}
-%>
-<section class="widget <%- theme.style.shadow.card ? 'card-shadow' : '' %> <%- theme.style.blur && theme.style.blur.widget ? 'widget-blur' : '' %> <%- item.class %> <%- plats.join(' ') %>">
+<%- partial('_pre') %>
+<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
   <div class='content'>
     <% if(item.avatar) { %>
       <div class='avatar'>
diff --git a/layout/_widget/category.ejs b/layout/_widget/category.ejs
index a851b52..25abcdf 100755
--- a/layout/_widget/category.ejs
+++ b/layout/_widget/category.ejs
@@ -1,15 +1,6 @@
 <% if (site.categories.length){ %>
-  <%
-  var plats = [];
-  if (item.display) {
-    item.display.forEach(function(plat){
-      plats.push(plat);
-    });
-  } else {
-    plats = ['desktop', 'mobile'];
-  }
-  %>
-  <section class="widget <%- theme.style.shadow.card ? 'card-shadow' : '' %> <%- theme.style.blur && theme.style.blur.widget ? 'widget-blur' : '' %> <%- item.class %> <%- plats.join(' ') %>">
+  <%- partial('_pre') %>
+  <section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
     <%- partial('header', {item: item}) %>
     <div class='content'>
       <ul class="entry navigation">
diff --git a/layout/_widget/copyright.ejs b/layout/_widget/copyright.ejs
index 9802c21..2e3ffae 100755
--- a/layout/_widget/copyright.ejs
+++ b/layout/_widget/copyright.ejs
@@ -1,14 +1,5 @@
-<%
-var plats = [];
-if (item.display) {
-  item.display.forEach(function(plat){
-    plats.push(plat);
-  });
-} else {
-  plats = ['desktop', 'mobile'];
-}
-%>
-<section class="widget <%- theme.style.shadow.card ? 'card-shadow' : '' %> <%- theme.style.blur && theme.style.blur.widget ? 'widget-blur' : '' %> <%- item.class %> <%- plats.join(' ') %>">
+<%- partial('_pre') %>
+<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
   <div class='content'>
     <% if (item.blockquote == true) { %>
       <blockquote>
diff --git a/layout/_widget/grid.ejs b/layout/_widget/grid.ejs
index 2a15de3..00d04f8 100755
--- a/layout/_widget/grid.ejs
+++ b/layout/_widget/grid.ejs
@@ -1,14 +1,5 @@
-<%
-var plats = [];
-if (item.display) {
-  item.display.forEach(function(plat){
-    plats.push(plat);
-  });
-} else {
-  plats = ['desktop', 'mobile'];
-}
-%>
-<section class="widget <%- theme.style.shadow.card ? 'card-shadow' : '' %> <%- theme.style.blur && theme.style.blur.widget ? 'widget-blur' : '' %> <%- item.class %> <%- plats.join(' ') %>">
+<%- partial('_pre') %>
+<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
   <%- partial('header', {item: item}) %>
   <div class='content'>
     <ul class="grid navigation">
diff --git a/layout/_widget/list.ejs b/layout/_widget/list.ejs
index dea38d6..e52c3d5 100755
--- a/layout/_widget/list.ejs
+++ b/layout/_widget/list.ejs
@@ -1,14 +1,5 @@
-<%
-var plats = [];
-if (item.display) {
-  item.display.forEach(function(plat){
-    plats.push(plat);
-  });
-} else {
-  plats = ['desktop', 'mobile'];
-}
-%>
-<section class="widget <%- theme.style.shadow.card ? 'card-shadow' : '' %> <%- theme.style.blur && theme.style.blur.widget ? 'widget-blur' : '' %> <%- item.class %> <%- plats.join(' ') %>">
+<%- partial('_pre') %>
+<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
   <%- partial('header', {item: item}) %>
   <div class='content'>
     <ul class="list entry navigation">
diff --git a/layout/_widget/qrcode.ejs b/layout/_widget/qrcode.ejs
index ebc1d69..ef7e7a1 100755
--- a/layout/_widget/qrcode.ejs
+++ b/layout/_widget/qrcode.ejs
@@ -1,14 +1,5 @@
-<%
-var plats = [];
-if (item.display) {
-  item.display.forEach(function(plat){
-    plats.push(plat);
-  });
-} else {
-  plats = ['desktop', 'mobile'];
-}
-%>
-<section class="widget <%- theme.style.shadow.card ? 'card-shadow' : '' %> <%- theme.style.blur && theme.style.blur.widget ? 'widget-blur' : '' %> <%- item.class %> <%- plats.join(' ') %>">
+<%- partial('_pre') %>
+<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
   <%- partial('header', {item: item}) %>
   <div class='content article-entry'>
     <% (item.images||[]).forEach(function(url){ %>
diff --git a/layout/_widget/related_posts.ejs b/layout/_widget/related_posts.ejs
index dfdf15b..50832d3 100755
--- a/layout/_widget/related_posts.ejs
+++ b/layout/_widget/related_posts.ejs
@@ -1,15 +1,6 @@
 <% if(page.layout == 'post' && page.content && page.path != undefined){ %>
-  <%
-  var plats = [];
-  if (item.display) {
-    item.display.forEach(function(plat){
-      plats.push(plat);
-    });
-  } else {
-    plats = ['desktop', 'mobile'];
-  }
-  %>
-  <section class="widget <%- theme.style.shadow.card ? 'card-shadow' : '' %> <%- theme.style.blur && theme.style.blur.widget ? 'widget-blur' : '' %> <%- item.class %> <%- plats.join(' ') %>">
+  <%- partial('_pre') %>
+  <section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
     <%- partial('header', {item: item}) %>
     <div class="content">
       <%- popular_posts( { maxCount: 10 , ulClass: 'popular-posts' , PPMixingRate: 0.2 } , page ) %>
diff --git a/layout/_widget/tagcloud.ejs b/layout/_widget/tagcloud.ejs
index b305fb6..e693e8f 100755
--- a/layout/_widget/tagcloud.ejs
+++ b/layout/_widget/tagcloud.ejs
@@ -1,15 +1,6 @@
 <% if (site.tags.length){ %>
-  <%
-  var plats = [];
-  if (item.display) {
-    item.display.forEach(function(plat){
-      plats.push(plat);
-    });
-  } else {
-    plats = ['desktop', 'mobile'];
-  }
-  %>
-  <section class="widget <%- theme.style.shadow.card ? 'card-shadow' : '' %> <%- theme.style.blur && theme.style.blur.widget ? 'widget-blur' : '' %> <%- item.class %> <%- plats.join(' ') %>">
+  <%- partial('_pre') %>
+  <section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
     <%- partial('header', {item: item}) %>
     <div class='content'>
       <%- tagcloud(site.tags, {
diff --git a/layout/_widget/text.ejs b/layout/_widget/text.ejs
index a322e48..6ad310e 100755
--- a/layout/_widget/text.ejs
+++ b/layout/_widget/text.ejs
@@ -1,14 +1,5 @@
-<%
-var plats = [];
-if (item.display) {
-  item.display.forEach(function(plat){
-    plats.push(plat);
-  });
-} else {
-  plats = ['desktop', 'mobile'];
-}
-%>
-<section class="widget <%- theme.style.shadow.card ? 'card-shadow' : '' %> <%- theme.style.blur && theme.style.blur.widget ? 'widget-blur' : '' %> <%- item.class %> <%- plats.join(' ') %>">
+<%- partial('_pre') %>
+<section class="widget <%- item.class %> <%- page.widget_style %> <%- page.widget_platform %>">
   <%- partial('header', {item: item}) %>
   <div class='content'>
     <% (item.content||[]).forEach(function(row){ %>
diff --git a/layout/_widget/toc.ejs b/layout/_widget/toc.ejs
index c0b2345..2f36aab 100755
--- a/layout/_widget/toc.ejs
+++ b/layout/_widget/toc.ejs
@@ -1,15 +1,6 @@
+<%- partial('_pre') %>
 <% if(page.content && page.toc != false && toc(page.content).length > 0){ %>
-  <%
-  var plats = [];
-  if (item.display) {
-    item.display.forEach(function(plat){
-      plats.push(plat);
-    });
-  } else {
-    plats = ['desktop', 'mobile'];
-  }
-  %>
-  <section class="widget <%- theme.style.shadow.card ? 'card-shadow' : '' %> <%- theme.style.blur && theme.style.blur.widget ? 'widget-blur' : '' %> toc-wrapper <%- plats.join(' ') %>">
+  <section class="widget toc-wrapper <%- page.widget_style %> <%- page.widget_platform %>">
     <%- partial('header', {item: item}) %>
     <div class='content'>
       <%- toc(page.content, {list_number: item.list_number, min_depth: item.min_depth, max_depth: item.max_depth}) %>
diff --git a/layout/index.ejs b/layout/index.ejs
index b3d854a..eeda40f 100755
--- a/layout/index.ejs
+++ b/layout/index.ejs
@@ -1,5 +1,4 @@
 <%- partial('_pre') %>
-<% console.log('index: page.sidebar', page.sidebar); %>
 <div class='l_main<%- page.sidebar == false ? ' no_sidebar' : '' %>'>
   <%- partial('_partial/archive') %>
 </div>