This is an automated email from the ASF dual-hosted git repository.
rawkintrevo pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/mahout.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6f18f3f [HOTFIX] Website issues
new 487cc35 Merge pull request #406 from rawkintrevo/website-hotfix
6f18f3f is described below
commit 6f18f3fde4e16a223a84c275b9d95d6d142ead69
Author: rawkintrevo <[email protected]>
AuthorDate: Sat Oct 10 10:26:56 2020 -0500
[HOTFIX] Website issues
---
website/_config.yml | 2 +-
website/_includes/analytics.html | 18 +-------
website/_includes/doc-navbar.html | 16 -------
website/_includes/footer.html | 18 +-------
website/_includes/head.html | 20 +--------
website/_includes/navbar.html | 16 -------
website/_includes/sidebar.html | 18 +-------
website/_layouts/default.html | 16 -------
website/_layouts/doc-default.html | 16 -------
website/_layouts/doc-page.html | 17 --------
website/_layouts/home.html | 71 +++++++++++--------------------
website/_layouts/page.html | 16 -------
website/_layouts/post.html | 16 -------
website/_posts/2017-12-20-new-website.md | 16 -------
website/_posts/2018-06-18-preping-014.md | 16 -------
website/_posts/2019-12-14-version-14-1.md | 16 -------
website/assets/css/main.scss | 17 --------
website/index.md | 2 -
18 files changed, 32 insertions(+), 295 deletions(-)
diff --git a/website/_config.yml b/website/_config.yml
index 1a2f684..486af43 100644
--- a/website/_config.yml
+++ b/website/_config.yml
@@ -20,7 +20,7 @@
title : Apache Mahout
description: Distributed Linear Algebra
-mahout-version: 0.14.0
+mahout-version: 14.1
author :
name : The Apache Software Foundation
diff --git a/website/_includes/analytics.html b/website/_includes/analytics.html
index 46280d4..dce406d 100644
--- a/website/_includes/analytics.html
+++ b/website/_includes/analytics.html
@@ -1,19 +1,3 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new
Date();a=s.createElement(o),
@@ -22,4 +6,4 @@
ga('create', 'UA-98314020-1', 'auto');
ga('send', 'pageview');
-</script>
\ No newline at end of file
+</script>
diff --git a/website/_includes/doc-navbar.html
b/website/_includes/doc-navbar.html
index 4da17c9..cc52668 100644
--- a/website/_includes/doc-navbar.html
+++ b/website/_includes/doc-navbar.html
@@ -1,19 +1,3 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
<div class="container">
diff --git a/website/_includes/footer.html b/website/_includes/footer.html
index 47b71b2..7ba9cd7 100644
--- a/website/_includes/footer.html
+++ b/website/_includes/footer.html
@@ -1,21 +1,5 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<footer class="footer bg-light">
<div class="container text-center small">
Copyright © 2014-{{ site.time | date: '%Y' }} The Apache Software
Foundation, Licensed under the Apache License, Version 2.0.
</div>
-</footer>
\ No newline at end of file
+</footer>
diff --git a/website/_includes/head.html b/website/_includes/head.html
index c352695..ef474ce 100644
--- a/website/_includes/head.html
+++ b/website/_includes/head.html
@@ -1,19 +1,3 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -27,7 +11,7 @@
<meta name="description" content="{{ page.excerpt | default:
site.description | strip_html | normalize_whitespace | truncate: 160 | escape
}}">
- <link rel="stylesheet" href="{{"/assets/css/main.css" | relative_url }}">
+ <link rel="stylesheet" href="{{'/assets/css/main.css' | relative_url }}">
<!-- Font Awesome -->
<link
href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css";
rel="stylesheet"
integrity="sha384-wvfXpqpZZVQGK6TAh5PVlGOfQNHSoD2xbE+QkPxCAFlNEevoEH3Sl0sibVcOQVnN"
crossorigin="anonymous">
@@ -37,7 +21,7 @@
<link href="https://fonts.googleapis.com/css?family=Muli:400,400i,700,700i";
rel="stylesheet">
<link rel="canonical" href="{{ page.url | replace:'index.html','' |
absolute_url }}">
- <link rel="alternate" type="application/rss+xml" title="{{ site.title |
escape }}" href="{{ " /feed.xml " | relative_url }}">
+ <link rel="alternate" type="application/rss+xml" title="{{ site.title |
escape }}" href="{{'/feed.xml' | relative_url }}">
</head>
diff --git a/website/_includes/navbar.html b/website/_includes/navbar.html
index 695cf31..7827837 100644
--- a/website/_includes/navbar.html
+++ b/website/_includes/navbar.html
@@ -1,19 +1,3 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<nav class="navbar navbar-expand-lg navbar-light bg-light navbar-mahout">
<div class="container">
diff --git a/website/_includes/sidebar.html b/website/_includes/sidebar.html
index 9d843a0..5032a90 100644
--- a/website/_includes/sidebar.html
+++ b/website/_includes/sidebar.html
@@ -1,19 +1,3 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<!-- Apache Software Foundation Links -->
<div class="card mb-4">
<div class="card-header">
@@ -43,4 +27,4 @@
<a class="twitter-timeline" data-height="500"
href="https://twitter.com/ApacheMahout";>Tweets by ApacheMahout</a>
<script async src="//platform.twitter.com/widgets.js"
charset="utf-8"></script>
</div>
-</div>
\ No newline at end of file
+</div>
diff --git a/website/_layouts/default.html b/website/_layouts/default.html
index 3640a6d..eaa9b7d 100644
--- a/website/_layouts/default.html
+++ b/website/_layouts/default.html
@@ -1,20 +1,4 @@
<!DOCTYPE html>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<html lang="{{ page.lang | default: site.lang | default: " en " }}">
{% include head.html %}
diff --git a/website/_layouts/doc-default.html
b/website/_layouts/doc-default.html
index d5e9cbb..63fa5f5 100644
--- a/website/_layouts/doc-default.html
+++ b/website/_layouts/doc-default.html
@@ -1,20 +1,4 @@
<!DOCTYPE html>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<html lang="{{ page.lang | default: site.lang | default: " en " }}">
{% include head.html %}
diff --git a/website/_layouts/doc-page.html b/website/_layouts/doc-page.html
index 52606df..e6c997f 100644
--- a/website/_layouts/doc-page.html
+++ b/website/_layouts/doc-page.html
@@ -1,23 +1,6 @@
---
layout: doc-default
---
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
<div class="container mt-5 pb-4">
<div class="row">
diff --git a/website/_layouts/home.html b/website/_layouts/home.html
index 22c94f9..1499e86 100644
--- a/website/_layouts/home.html
+++ b/website/_layouts/home.html
@@ -1,56 +1,37 @@
---
layout: default
---
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<header class="mahout-header">
- <div class="mahout-header-upper">
- <div class="container mt-auto">
- <div class="row">
- <div class="col-12">
- <img src="/assets/mahout-logo-white.svg" alt="Apache Mahout">
- <img class="asf-logo float-right" src="/assets/asf_logo_white.svg"
alt="Apache Software Foundation">
+<div>
+ <header class="mahout-header">
+ <div class="mahout-header-upper">
+ <div class="container mt-auto">
+ <div class="row">
+ <div class="col-12">
+ <img src="/assets/mahout-logo-white.svg" alt="Apache Mahout">
+ <img class="asf-logo float-right" src="/assets/asf_logo_white.svg"
alt="Apache Software Foundation">
+ </div>
</div>
</div>
</div>
- </div>
- <div class="mahout-header-lower">
- <div class="container position-relative mb-auto">
- <h2 class="mb-4">For Creating Scalable Performant Machine Learning
Applications</h2>
- <a class="btn btn-lg btn-light btn-download mb-3"
href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=mahout/{{
site.mahout-version }}/mahout-{{ site.mahout-version }}-source-release.zip"><i
class="fa fa-download"></i> Download Mahout</a>
- <div class="small text-white mx-auto">Currently v{{ site.mahout-version
}}</div>
- </div>
- </div>
- <canvas id="waves"></canvas>
-</header>
-
-<div class="container mt-5 pb-4">
-
- <div class="row">
-
- <div class="col-lg-8">
- {{ content }}
+ <div class="mahout-header-lower">
+ <div class="container position-relative mb-auto">
+ <h2 class="mb-4">For Creating Scalable Performant Machine Learning
Applications</h2>
+ <a class="btn btn-lg btn-light btn-download mb-3"
href="https://www.apache.org/dyn/mirrors/mirrors.cgi?action=download&filename=mahout/{{
site.mahout-version }}/mahout-{{ site.mahout-version }}-source-release.zip"><i
class="fa fa-download"></i> Download Mahout</a>
+ <div class="small text-white mx-auto">Currently v{{
site.mahout-version }}</div>
+ </div>
</div>
+ <canvas id="waves"></canvas>
+ </header>
- <div class="col-lg-4">
- <h2 class="section-heading">Sidebar Home</h2>
- {% include sidebar.html %}
+ <div class="container mt-5 pb-4">
+ <div class="row">
+ <div class="col-lg-8">
+ {{ content }}
+ </div>
+ <div class="col-lg-4">
+ <h2 class="section-heading">Sidebar Home</h2>
+ {% include sidebar.html %}
+ </div>
</div>
-
</div>
-
</div>
diff --git a/website/_layouts/page.html b/website/_layouts/page.html
index 7041409..958a91b 100644
--- a/website/_layouts/page.html
+++ b/website/_layouts/page.html
@@ -1,22 +1,6 @@
---
layout: default
---
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<div class="container mt-5 pb-4">
<div class="row">
diff --git a/website/_layouts/post.html b/website/_layouts/post.html
index ed6ada6..03aff2d 100644
--- a/website/_layouts/post.html
+++ b/website/_layouts/post.html
@@ -1,22 +1,6 @@
---
layout: default
---
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
<div class="container mt-5 pb-4">
<article class="post" itemscope="itemscope"
itemtype="http://schema.org/BlogPosting";>
diff --git a/website/_posts/2017-12-20-new-website.md
b/website/_posts/2017-12-20-new-website.md
index b906f61..70486e1 100644
--- a/website/_posts/2017-12-20-new-website.md
+++ b/website/_posts/2017-12-20-new-website.md
@@ -1,19 +1,3 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
---
layout: post
title: New Website
diff --git a/website/_posts/2018-06-18-preping-014.md
b/website/_posts/2018-06-18-preping-014.md
index 115ee84..90b902f 100644
--- a/website/_posts/2018-06-18-preping-014.md
+++ b/website/_posts/2018-06-18-preping-014.md
@@ -1,19 +1,3 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
---
layout: post
title: Preparing for version 14.1
diff --git a/website/_posts/2019-12-14-version-14-1.md
b/website/_posts/2019-12-14-version-14-1.md
index 2bd2864..d048fea 100644
--- a/website/_posts/2019-12-14-version-14-1.md
+++ b/website/_posts/2019-12-14-version-14-1.md
@@ -1,19 +1,3 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
---
layout: post
title: Code Freeze and Wierd Numbering
diff --git a/website/assets/css/main.scss b/website/assets/css/main.scss
index 4d8d3f1..487f890 100644
--- a/website/assets/css/main.scss
+++ b/website/assets/css/main.scss
@@ -1,21 +1,4 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
---
-# Only the main Sass file needs front matter (the dashes are enough)
---
@import "mahout";
diff --git a/website/index.md b/website/index.md
index f5efc70..f9a51d8 100644
--- a/website/index.md
+++ b/website/index.md
@@ -2,8 +2,6 @@
layout: home
---
-
-
Apache Mahout(TM) is a <strong>distributed linear algebra framework</strong>
and <strong>mathematically expressive Scala DSL</strong> designed to let
mathematicians, statisticians, and data scientists quickly <em>implement their
own algorithms</em>. Apache Spark is the recommended out-of-the-box distributed
back-end, <em>or can be extended to other distributed backends.</em>
- Mathematically Expressive Scala DSL
