!33 1.隐藏versions 2.修改下载页面 3.增加代码仓库切换

Merge pull request !33 from ZhengyuhangHans/master

!33 1.隐藏versions 2.修改下载页面 3.增加代码仓库切换
Merge pull request !33 from ZhengyuhangHans/master
b7be36de · openeuler-ci-bot · Gitee · becf319c · 5b6a8fed · b7be36de
9 changed file
--- a/config.toml
+++ b/config.toml
@@ -30,32 +30,6 @@ paginate = 10
    url  = "/en"
    weight = 1

-# [[menu.main]]
-#     identifier = "user"
-#     name = "User"
-#     url = "/en/introduction.html"
-#     weight = 2
-#
-# [[menu.main]]
-#     identifier = "intro"
-#     name = "Brief Introduction"
-#     url = "/en/introduction.html"
-#     parent = "user"
-#     weight = 1
-#
-# [[menu.main]]
-#     identifier = "story"
-#     name = "User Story"
-#     url = "/en/story.html"
-#     parent = "user"
-#     weight = 2
-# [[menu.main]]
-#     identifier = "contribution"
-#     name = "Contribution"
-#     url = "/en/contribution.html"
-#     weight = 1
-#     parent = "developer"
-
 [[menu.main]]
    identifier = "community"
    name = "Community"
@@ -124,11 +98,11 @@ paginate = 10
    url  = "/en/news.html"
    weight = 1

-[[menu.main]]
-    identifier = "versions"
-    name = "Versions"
-    url  = "/en/versions.html"
-    weight = 4
+#[[menu.main]]
+#   identifier = "versions"
+#    name = "Versions"
+#    url  = "/en/versions.html"
+#    weight = 4

 [[menu.main]]
    identifier = "docs"
@@ -140,7 +114,7 @@ paginate = 10
 [[menu.main]]
    identifier = "download"
    name = "Download"
-    url  = "/en/building/download.html"
+    url  = "/en/download.html"
    weight = 6

 [[menu.main]]
@@ -161,35 +135,6 @@ paginate = 10
    url  = "/zh"
    weight = 1

-# [[languages.zh.menu.main]]
-#     identifier = "user"
-#     name = "用户"
-#     url = "/zh/introduction.html"
-#     weight = 2
-#
-# [[languages.zh.menu.main]]
-#     identifier = "intro"
-#     name = "软件介绍"
-#     url = "/zh/introduction.html"
-#     parent = "user"
-#     weight = 1
-#
-# [[languages.zh.menu.main]]
-#     identifier = "story"
-#     name = "用户故事"
-#     url = "/zh/story.html"
-#     parent = "user"
-#     weight = 2
-
-
-
-# [[languages.zh.menu.main]]
-#     identifier = "contribution"
-#     name = "如何贡献"
-#     url = "/zh/contribution.html"
-#     weight = 1
-#     parent = "developer"
-
 [[languages.zh.menu.main]]
    identifier = "community"
    name = "社区"
@@ -260,11 +205,11 @@ paginate = 10
    url  = "/zh/news.html"
    weight = 2

-[[languages.zh.menu.main]]
-    identifier = "versions"
-    name = "版本"
-    url  = "/zh/versions.html"
-    weight = 4
+#[[languages.zh.menu.main]]
+#    identifier = "versions"
+#    name = "版本"
+#    url  = "/zh/versions.html"
+#    weight = 4

 [[languages.zh.menu.main]]
    identifier = "docs"
@@ -312,7 +257,7 @@ paginate = 10
 [[languages.zh.menu.main]]
    identifier = "download"
    name = "下载"
-    url  = "/zh/building/download.html"
+    url  = "/zh/download.html"
    weight = 6

 [[languages.zh.menu.main]]

--- a/i18n/en.toml
+++ b/i18n/en.toml
@@ -20,6 +20,15 @@ other = "openEuler builds an innovative platform and a unified and open OS that
 [main_cards_title_second]
 other = "iSula"

+[main_cards_title_enter_repository]
+other = ">>More"
+
+[main_nav_repository]
+other = "Repository"
+
+[main_nav_packageSources]
+other = "Package Sources"
+
 [main_cards_description_second]
 other = "A cloud-native lightweight container solution that can meet the needs of device, edge, and cloud scenarios in ICT domain with a unified and flexible architecture."

@@ -80,3 +89,12 @@ other = "Back to Home"

 [docs_nav_menu_name]
 other = "MENU"
+
+[download_title]
+other = "Download ISO"
+
+[download_issues]
+other = "Submit issues: "
+
+[download_iso_button]
+other = "Get openEuler ISO"
--- a/i18n/zh.toml
+++ b/i18n/zh.toml
@@ -20,6 +20,15 @@ other = "openEuler通过社区合作，打造创新平台，构建支持多处
 [main_cards_title_second]
 other = "iSula"

+[main_cards_title_enter_repository]
+other = ">>更多"
+
+[main_nav_repository]
+other = "代码仓"
+
+[main_nav_packageSources]
+other = "软件包仓"
+
 [main_cards_description_second]
 other = "iSula是一种云原生轻量级容器解决方案，可通过统一、灵活的架构满足ICT领域端、边、云场景的多种需求。"

@@ -79,3 +88,13 @@ other = "返回首页"

 [docs_nav_menu_name]
 other = "目录"
+
+[download_title]
+other = "下载ISO"
+
+[download_issues]
+other = "如果您遇到问题，请在此提交问题："
+
+[download_iso_button]
+other = "下载openEuler ISO"
+
--- a/themes/project/layouts/download/list.html
+++ b/themes/project/layouts/download/list.html
 <!DOCTYPE html>
 <html lang="{{ .Site.LanguageCode }}">
-
-  {{ partial "head.html" . }}
-
-  <body>
-
+{{ partial "head.html" . }}
+<body>
    <div id="all">
-
        <header>
-
            {{ partial "nav.html" . }}
-
        </header>
-
            {{ partial "breadcrumbs.html" . }}
            
        <div id="content">
            <div class="container">
                <div class="row">
-                    <!-- *** LEFT COLUMN *** -->
-
-                    <div class="col-md-9" id="blog-listing-medium">
-
-                        {{ $paginator := .Paginate (where .Data.Pages "Type" "download") }}
-                        {{ range $paginator.Pages }}
-                        <section class="post" style="margin-bottom: 10px;">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <p class="intro">{{ .Content }}</p>
-                                    <p class="read-more"><a href="{{ .Params.imageUrl }}" class="btn btn-template-main">{{ i18n "downloadImage" }}</a>
-                                    </p>
+                    <div class="col-md-12"  class="downloadWholeBlock">
+                        <div id="downloadBlock">
+                            <div class="downloadContentBlock">
+                                <h3>{{ i18n "download_title"}}</h3>
+                                <h5>{{ i18n "download_issues"}}</h5>
+                                <h5><a href="https://gitee.com/openeuler/community-issue">https://gitee.com/openeuler/community-issue</a></h5>
                            </div>
+                            <div class="downloadButtonBlock">
+                                <a href="https://"><button type="button" class="btn btn-primary btn-lg btn-download" >{{ i18n "download_iso_button"}}</button></a>
                            </div>
-                            <hr style="margin-top: 5px; margin-bottom: 5px">
-                        </section>
-                        {{ end }}
-
-                        <ul class="pager">
-                            {{ if .Paginator.HasPrev }}
-                            <li class="previous"><a href="{{ .Site.BaseURL }}{{ .Paginator.Prev.URL }}">&larr; {{ i18n "newer" }}</a></li>
-                            {{ else }}
-                            <li class="previous disabled"><a href="#">&larr; {{ i18n "newer" }}</a></li>
-                            {{ end }}
-
-                            {{ if .Paginator.HasNext }}
-                            <li class="next"><a href="{{ .Site.BaseURL }}{{ .Paginator.Next.URL }}">{{ i18n "older" }} &rarr;</a></li>
-                            {{ else }}
-                            <li class="next disabled"><a href="#">{{ i18n "older" }} &rarr;</a></li>
-                            {{ end }}
-                        </ul>
                        </div>
-                    <!-- /.col-md-9 -->
-
-                    <!-- *** LEFT COLUMN END *** -->
-
-                    <!-- *** RIGHT COLUMN ***
-       _________________________________________________________ -->
-
-                    <div class="col-md-3">
-
-                        <!-- *** MENUS AND WIDGETS *** -->
-
-                        {{ partial "sidebar.html" (dict "context" . "downloadPage" "true") }}
-
-                        <!-- *** MENUS AND FILTERS END *** -->
                        
                    </div>
-                    <!-- /.col-md-3 -->
-
-                    <!-- *** RIGHT COLUMN END *** -->
-
+                    <!-- /.col-md-9 -->
                </div>
                <!-- /.row -->
            </div>
            <!-- /.container -->
        </div>
-        <!-- /#content -->
-
        {{ partial "footer.html" . }}

    </div>
@@ -84,5 +37,8 @@

    {{ partial "scripts.html" . }}

-  </body>
+
+
+</body>
+
 </html>
--- a/themes/project/layouts/partials/cards.html
+++ b/themes/project/layouts/partials/cards.html
@@ -25,14 +25,14 @@
                <div class="item">
                    <img src="../img/2.jpg">
                    <div class="carousel-caption">
-                        <p>{{ i18n "main_cards_title_second" }}</p>
+                        <p>{{ i18n "main_cards_title_second" }}&nbsp;<a style="font-size:17px;color:white"href="https://gitee.com/openeuler/iSulad">{{ i18n "main_cards_title_enter_repository"}}</a></p>
                        <p>{{ i18n "main_cards_description_second" }}</p>
                    </div>
                </div>
                <div class="item">
                    <img src="../img/3.jpg">
                    <div class="carousel-caption">
-                        <p>{{ i18n "main_cards_title_third" }}</p>
+                        <p>{{ i18n "main_cards_title_third" }}&nbsp;<a style="font-size:17px;color:white"href="https://gitee.com/openeuler/A-Tune">{{ i18n "main_cards_title_enter_repository"}}</a></p>
                        <p>{{ i18n "main_cards_description_third" }}</p>
                    </div>
                </div>

--- a/themes/project/layouts/partials/nav.html
+++ b/themes/project/layouts/partials/nav.html
@@ -41,6 +41,18 @@
    {{ end  }}
    {{ end  }}
    {{ end  }}
+    <p class="second_menu" onclick="getList('#second_menu_repository')">
+      <img style="width:19px;"src="{{ .Site.BaseURL }}/img/gitee-logo.ico"><i></i>
+    </p>
+    <div class="menu_list" id="second_menu_repository" >
+      <a class="list" href="https://gitee.com/openeuler">
+        <p>{{i18n "main_nav_repository"}}</p>
+      </a>
+      <a class="list" href="https://gitee.com/src-openeuler">
+        <p>{{i18n "main_nav_packageSources"}}</p>
+      </a>
+    </div>
+    </p>
  </div>
 </div>

@@ -76,6 +88,7 @@
          {{ $isChildren = true }}
          {{ end }}
          {{ end }}
+          {{ if ne .Identifier "lang" }}
          <li
            class="dropdown{{ if eq $current.RelPermalink .URL | or $isChildren | or (eq (trim $current.RelPermalink "/") $topLevel) | or (eq $current.Type .Identifier) | or (eq $current.Type $topLevel) | or (and (eq (default (trim .URL "/") .Identifier) "blog") (in (slice "taxonomy" "taxonomyTerm") $current.Kind)) }} active{{ end }}">
            {{ if .HasChildren }}
@@ -91,6 +104,23 @@
            {{ end  }}
          </li>
          {{ end }}
+          {{ if eq .Identifier "lang" }}
+          <li style="width:67px;text-align: center;"
+          class=" dropdown{{ if eq $current.RelPermalink .URL | or $isChildren | or (eq (trim $current.RelPermalink "/") $topLevel) | or (eq $current.Type .Identifier) | or (eq $current.Type $topLevel) | or (and (eq (default (trim .URL "/") .Identifier) "blog") (in (slice "taxonomy" "taxonomyTerm") $current.Kind)) }} active{{ end }}">
+          <a href="{{ .URL }}">{{ .Name }}</a>  
+          </li>
+          {{ end }}
+          {{ end }}
+          <li style="width:67px;text-align: center;"class=""> 
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"><img style="width:19px;"src="{{ .Site.BaseURL }}/img/gitee-logo.ico"><span class="caret"></span></a>
+          <ul class="dropdown-menu">
+            <li><a href="https://gitee.com/openeuler">{{i18n "main_nav_repository"}}</a></li>
+            <li><a href="https://gitee.com/src-openeuler">{{i18n "main_nav_packageSources"}}</a></li>
+          </ul>
+        </li>
+            
+          </li>
+          
        </ul>
      </div>
      <!--/.nav-collapse -->

--- a/themes/project/static/css/custom.css
+++ b/themes/project/static/css/custom.css
@@ -94,9 +94,6 @@
  position: relative;
  top: -160px;
  line-height: 120%;
-  /* margin-left: 0; */
-  /* margin-right: 0 !important; */
-  /* text-align: center; */
  width: 100%;
 }

@@ -144,6 +141,9 @@
    font-size: 20px !important;
    top: -40px;
  }
+  .wrapper>div>div>p:nth-child(1)>a {
+    font-size: 10px !important;
+  }
  .wrapper>div>div>p:nth-child(2) {
    font-size: 12px !important;
    top: -30px;
@@ -1078,4 +1078,23 @@ html,body {
 .cards a{
  width:25%;
 }
-
+#downloadBlock{
+  border-radius:10px;
+  border:1px solid rgba(221,221,221,2);
+  min-height:290px;
+}
+.downloadButtonBlock{
+  width:100%;
+  height:70px;
+  background-color:rgba(242,242,242,2.5);
+  text-align: center;
+}
+.downloadContentBlock{
+  min-height:220px;
+  text-align: left;
+  padding:10px;
+  padding-left:40px;
+}
+.downloadWholeBlock{
+  margin-bottom: 30px;
+}
--- a/themes/project/static/css/style.blue.css
+++ b/themes/project/static/css/style.blue.css
@@ -523,6 +523,10 @@ body.boxed .navbar-affixed-top.affix {
  line-height: 1.42857143;
  border-radius: 0;
 }
+.btn-download {
+  text-transform: none;
+  margin-top:15px;
+}
 .input-group .btn {
  font-size: 14px;
 }

--- a/themes/project/static/img/gitee-logo.ico
+++ b/themes/project/static/img/gitee-logo.ico