[hadoop] 03/04: HDDS-2156. Fix alignment issues in HDDS doc pages

[na...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

nanda pushed a commit to branch ozone-0.4.1
in repository https://gitbox.apache.org/repos/asf/hadoop.git

commit 3dafc786bb5dd9f2f19a3d5c2c44e992bd1ab2f6
Author: Vivek Ratnavel Subramanian <vi...@gmail.com>
AuthorDate: Thu Sep 19 16:41:00 2019 -0700

    HDDS-2156. Fix alignment issues in HDDS doc pages
    
    Signed-off-by: Anu Engineer <ae...@apache.org>
    (cherry picked from commit 9be448b3368088967064305e78ec17ffaaeaedb2)
---
 hadoop-hdds/docs/content/security/SecurityAcls.md  |  3 +-
 hadoop-hdds/docs/content/security/_index.md        |  2 +-
 .../themes/ozonedoc/layouts/_default/section.html  | 69 +++++++++++++---------
 .../themes/ozonedoc/layouts/_default/single.html   |  2 +
 .../docs/themes/ozonedoc/static/css/ozonedoc.css   |  3 +
 5 files changed, 48 insertions(+), 31 deletions(-)

diff --git a/hadoop-hdds/docs/content/security/SecurityAcls.md b/hadoop-hdds/docs/content/security/SecurityAcls.md
index b010233..dd9f893 100644
--- a/hadoop-hdds/docs/content/security/SecurityAcls.md
+++ b/hadoop-hdds/docs/content/security/SecurityAcls.md
@@ -2,7 +2,8 @@
 title: "Ozone ACLs"
 date: "2019-April-03"
 weight: 6
-summary: Native ACL support provides ACL functionality without Ranger integration.
+summary: Native Ozone Authorizer provides Access Control List (ACL) support for Ozone without Ranger integration.
+icon: transfer
 ---
 <!---
   Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/hadoop-hdds/docs/content/security/_index.md b/hadoop-hdds/docs/content/security/_index.md
index 35a7013..20967e3 100644
--- a/hadoop-hdds/docs/content/security/_index.md
+++ b/hadoop-hdds/docs/content/security/_index.md
@@ -23,7 +23,7 @@ weight: 5
     -->
 
 {{<jumbotron title="Securing Ozone">}}
-          Ozone is an enterprise class, secure storage system. There many
+          Ozone is an enterprise class, secure storage system. There are many
           optional security features in Ozone. Following pages discuss how
           you can leverage the security features of Ozone.
 {{</jumbotron>}}
diff --git a/hadoop-hdds/docs/themes/ozonedoc/layouts/_default/section.html b/hadoop-hdds/docs/themes/ozonedoc/layouts/_default/section.html
index 4150d07..5c01241 100644
--- a/hadoop-hdds/docs/themes/ozonedoc/layouts/_default/section.html
+++ b/hadoop-hdds/docs/themes/ozonedoc/layouts/_default/section.html
@@ -18,42 +18,53 @@
 
 <body>
 
-  {{ partial "navbar.html" . }}
+{{ partial "navbar.html" . }}
 
-  <div class="container-fluid">
+<div class="container-fluid">
     <div class="row">
-      {{ partial "sidebar.html" . }}
-      <div class="col-sm-10 col-sm-offset-2 col-md-10 col-md-offset-2 main">
-        <h1>{{ .Title }}</h1>
-        <div class="col-md-9">
-          {{ .Content }}
-{{.Params.card}}
-          {{ if not (eq .Params.cards "false")}}
-          {{ range .Pages }}
-
-          <div class="col-sm-6">
-            <div class="card">
-              <div class="card-body">
-                <h2 class="card-title">
-                  {{ with .Params.Icon}}
-                    <span class="glyphicon glyphicon-{{.}}" aria-hidden="true"></span>
-                    {{end}}
-                  {{ .LinkTitle }}
-                </h2>
-                <p class="card-text">{{.Summary}}</p>
-                <a href="{{.Permalink}}" class=" btn btn-primary btn-lg">{{.LinkTitle}}</a>
-              </div>
+        {{ partial "sidebar.html" . }}
+        <div class="col-sm-10 col-sm-offset-2 col-md-10 col-md-offset-2 main">
+            <div class="col-md-9">
+                <h1>{{ .Title }}</h1>
             </div>
-          </div>
+            <div class="col-md-9">
+                {{ .Content }}
+                {{.Params.card}}
+                {{ if not (eq .Params.cards "false")}}
+                {{ range $page_index, $page_val := .Pages }}
+
+                {{ $page_count := len .Pages }}
+                {{if (eq (mod $page_index 2) 0)}}
+                <div class="row">
+                    {{end}}
+                    <div class="col-sm-6">
+                        <div class="card">
+                            <div class="card-body">
+                                <h2 class="card-title">
+                                    {{ with .Params.Icon}}
+                                    <span class="glyphicon glyphicon-{{.}}"
+                                          aria-hidden="true"></span>
+                                    {{end}}
+                                    {{ .LinkTitle }}
+                                </h2>
+                                <p class="card-text">{{.Summary}}</p>
+                                <a href="{{.Permalink}}"
+                                   class=" btn btn-primary btn-lg">{{.LinkTitle}}</a>
+                            </div>
+                        </div>
+                    </div>
 
-          {{ end }}
-          {{end}}
+                    {{if (or (eq (mod $page_index 2) 1) (eq $page_index (sub $page_count 1)))}}
+                        </div>
+                    {{end}}
+                {{ end }}
+                {{end}}
+            </div>
         </div>
-      </div>
     </div>
-  </div>
+</div>
 
-  {{ partial "footer.html" . }}
+{{ partial "footer.html" . }}
 
 </body>
 
diff --git a/hadoop-hdds/docs/themes/ozonedoc/layouts/_default/single.html b/hadoop-hdds/docs/themes/ozonedoc/layouts/_default/single.html
index 31125ba..3679ddb 100644
--- a/hadoop-hdds/docs/themes/ozonedoc/layouts/_default/single.html
+++ b/hadoop-hdds/docs/themes/ozonedoc/layouts/_default/single.html
@@ -36,7 +36,9 @@
                 </ol>
               </nav>
 
+          <div class="col-md-9">
             <h1>{{.Title}}</h1>
+          </div>
 
           {{ .Content }}
 
diff --git a/hadoop-hdds/docs/themes/ozonedoc/static/css/ozonedoc.css b/hadoop-hdds/docs/themes/ozonedoc/static/css/ozonedoc.css
index e004da0..6f812c8 100644
--- a/hadoop-hdds/docs/themes/ozonedoc/static/css/ozonedoc.css
+++ b/hadoop-hdds/docs/themes/ozonedoc/static/css/ozonedoc.css
@@ -160,6 +160,9 @@ h4 {
   padding: 30px;
 }
 
+h1 {
+  margin-bottom: 20px;
+}
 
 .card {
   padding: 20px;


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org