del: 移除ECO导航链接(属于个性化的内容,不通用)

yangrunkang · Jan 30, 2023 · 1a234c9 · 1a234c9
1 parent dd1377e
commit 1a234c9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/upupor-web/src/main/resources/templates/layout/navbar.html b/upupor-web/src/main/resources/templates/layout/navbar.html
@@ -67,11 +67,11 @@
                         <img class="lazyload cv-icon" th:data-src="${ossStatic} + @{/icons/todo.svg}"/> 待办
                     </a>
                 </div>
-                <div class="nav-item d-md-none d-none d-xl-block">
-                    <a class="nav-link cv-link fw-bolder text-black-50 fs-6" href="https://eco.upupor.com">
-                        <img class="lazyload cv-icon-30" th:data-src="${ossStatic} + @{/icons/eco-leaf-svgrepo-com.svg}"/>
-                    </a>
-                </div>
+<!--                <div class="nav-item d-md-none d-none d-xl-block">-->
+<!--                    <a class="nav-link cv-link fw-bolder text-black-50 fs-6" href="https://eco.upupor.com">-->
+<!--                        <img class="lazyload cv-icon-30" th:data-src="${ossStatic} + @{/icons/eco-leaf-svgrepo-com.svg}"/>-->
+<!--                    </a>-->
+<!--                </div>-->
                 <ul class="navbar-nav ms-auto my-1">
                     <li class="nav-item dropdown d-none d-xl-block">
                         <a class="nav-link cv-link dropdown-toggle" href="#" id="navbarDropdown" role="button"
@@ -145,11 +145,11 @@
                         <img class="lazyload cv-icon" th:data-src="${ossStatic} + @{/icons/todo.svg}"/> 待办
                     </a>
                 </div>
-                <div class="nav-item">
-                    <a class="nav-link cv-link fw-bolder text-black-50 fs-6" href="https://eco.upupor.com">
-                        <img class="lazyload cv-icon-30" th:data-src="${ossStatic} + @{/icons/eco-leaf-svgrepo-com.svg}"/>
-                    </a>
-                </div>
+<!--                <div class="nav-item">-->
+<!--                    <a class="nav-link cv-link fw-bolder text-black-50 fs-6" href="https://eco.upupor.com">-->
+<!--                        <img class="lazyload cv-icon-30" th:data-src="${ossStatic} + @{/icons/eco-leaf-svgrepo-com.svg}"/>-->
+<!--                    </a>-->
+<!--                </div>-->
             </div>
         </nav>
         <nav class="navbar navbar-expand-lg bg-white d-xl-none border-top"

diff --git a/upupor-web/src/main/resources/templates/radio-station/index.html b/upupor-web/src/main/resources/templates/radio-station/index.html
@@ -80,7 +80,6 @@ <h5 class="mt-2">[[${radioIndexDto.radioEnhance.radio.radioIntro}]]</h5>
             </div>
             <div class="col-lg-3">
                 <div th:include="fragments/index::create_radio"></div>
-                <div th:include="fragments/index::global_search"></div>
                 <div class="card border-0 rounded-3 p-2 mb-2">
                     <p style="text-align: center" class="m-0 p-1" th:if="!${#strings.isEmpty(radioIndexDto.radioEnhance.memberEnhance.member.via)}">
                         <a th:href="'/profile/'+${radioIndexDto.radioEnhance.memberEnhance.member.userId}+'/content'">
@@ -105,6 +104,7 @@ <h5 class="mt-2">[[${radioIndexDto.radioEnhance.radio.radioIntro}]]</h5>
                 <div th:include="fragments/index::viewList(${radioIndexDto.radioEnhance.viewHistoryEnhanceList})"></div>
                 <!--社交模板-->
                 <div th:include="fragments/social::social_box('r/','电台',${radioIndexDto.radioEnhance.radio.radioId},${radioIndexDto.radioEnhance.radio.radioIntro})" th:if="${radioIndexDto.radioEnhance.radio.status.name() == 'NORMAL'}"></div>
+                <div th:include="fragments/index::global_search"></div>
                 <div th:replace="fragments/index::user_manage_fragment(true)"></div>
                 <div  th:include="fragments/index::google_right_ad"></div>
             </div>