r***@apache.org
2017-12-22 03:25:10 UTC
Repository: mahout
Updated Branches:
refs/heads/master d53d44437 -> 36da4cf3d
WEBSITE-NOJIRA Added Fn for news
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/36da4cf3
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/36da4cf3
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/36da4cf3
Branch: refs/heads/master
Commit: 36da4cf3d4982e246191a3ec7eac2495a25f8a86
Parents: d53d444
Author: Trevor a.k.a @rawkintrevo <***@gmail.com>
Authored: Thu Dec 21 21:24:39 2017 -0600
Committer: Trevor a.k.a @rawkintrevo <***@gmail.com>
Committed: Thu Dec 21 21:24:39 2017 -0600
----------------------------------------------------------------------
website/_includes/doc-navbar.html | 2 +-
website/_includes/posts/post-preview.html | 6 +++++-
website/_posts/2017-12-20-new-website.md | 7 ++-----
website/build_site.sh | 13 +++++++------
website/index.md | 5 +++--
5 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/36da4cf3/website/_includes/doc-navbar.html
----------------------------------------------------------------------
diff --git a/website/_includes/doc-navbar.html b/website/_includes/doc-navbar.html
index c2fc4eb..43e1292 100644
--- a/website/_includes/doc-navbar.html
+++ b/website/_includes/doc-navbar.html
@@ -92,7 +92,7 @@
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">API /docs</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
- <a class="dropdown-item" href="/docs/0.13.0/api/docs/">0.13.0</a>
+ <a class="dropdown-item" href="/docs/0.13.0/api/docs/">0.13.0</a>
</div>
</li>
http://git-wip-us.apache.org/repos/asf/mahout/blob/36da4cf3/website/_includes/posts/post-preview.html
----------------------------------------------------------------------
diff --git a/website/_includes/posts/post-preview.html b/website/_includes/posts/post-preview.html
index 7733acc..62fc4d8 100644
--- a/website/_includes/posts/post-preview.html
+++ b/website/_includes/posts/post-preview.html
@@ -2,7 +2,11 @@
<div class="card-body">
<div class="row no-gutters">
<div class="col-3 d-none d-md-flex my-auto card-post-img">
- <img class="rounded-circle img-fluid d-flex mx-auto" src="{{ post.image }}">
+ {% if post.image %}
+ <img class="rounded-circle img-fluid d-flex mx-auto" src="{{ post.image }}">
+ {% else %}
+ <img class="rounded-circle img-fluid d-flex mx-auto" src="/assets/mahout-logo-blue.svg">
+ {% endif %}
</div>
<div class="col-12 col-md-9 card-post-text">
<div class="clearfix mb-3">
http://git-wip-us.apache.org/repos/asf/mahout/blob/36da4cf3/website/_posts/2017-12-20-new-website.md
----------------------------------------------------------------------
diff --git a/website/_posts/2017-12-20-new-website.md b/website/_posts/2017-12-20-new-website.md
index 2eceb1d..e0bb94f 100644
--- a/website/_posts/2017-12-20-new-website.md
+++ b/website/_posts/2017-12-20-new-website.md
@@ -5,14 +5,11 @@ date: 2017-12-20 16:16:01 -0600
category: news
---
-
-# New Website Released
-
-We've launced a new website, (a YUUUGE special thanks to David Miller from [StartBootstrap](http://startbootstrap.com)).
+We've launced a new website, (a HUUUGE special thanks to David Miller from [StartBootstrap.com](http://startbootstrap.com)).
It looks great but there's lots to do as we migrate and clean up content from the old site. If you see anything broken,
please let us know via either:
- drop a lint to ***@mahout.apache.org
- fix it yourself and [open a PR](/developers/githubPRs)!
-
\ No newline at end of file
+
http://git-wip-us.apache.org/repos/asf/mahout/blob/36da4cf3/website/build_site.sh
----------------------------------------------------------------------
diff --git a/website/build_site.sh b/website/build_site.sh
index b4d889d..8f0a029 100755
--- a/website/build_site.sh
+++ b/website/build_site.sh
@@ -18,7 +18,13 @@ export PATH=${GEM_HOME}/bin:$PATH
# Set env for docs
MAHOUT_VERSION=0.13.0
-if [ ! -d "$WORKDIR/docs/$MAHOUT_VERSION/api" ]; then
+
+
+
+git checkout asf-site
+git clean -f -d
+git pull origin asf-site
+if [ ! -d "/docs/$MAHOUT_VERSION/api" ]; then
echo "API docs for $MAHOUT_VERSION not found, downloading them"
DISTFILE=apache-mahout-distribution-$MAHOUT_VERSION.tar.gz
DISTPATH=https://dist.apache.org/repos/dist/release/mahout/$MAHOUT_VERSION/$DISTFILE
@@ -32,11 +38,6 @@ if [ ! -d "$WORKDIR/docs/$MAHOUT_VERSION/api" ]; then
rm -f $WORKDIR/$DISTFILE
"done."
fi
-
-
-git checkout asf-site
-git clean -f -d
-git pull origin asf-site
# rm -rf *
#cp -a $WORKDIR/* .
cp -r $WORKDIR/* .
http://git-wip-us.apache.org/repos/asf/mahout/blob/36da4cf3/website/index.md
----------------------------------------------------------------------
diff --git a/website/index.md b/website/index.md
index 9102024..80fb4ca 100644
--- a/website/index.md
+++ b/website/index.md
@@ -11,6 +11,7 @@ Apache Mahout(TM) is a <strong>distributed linear algebra framework</strong> and
- Modular Native Solvers for CPU/GPU/CUDA Acceleration
<h2 class="section-heading">Recent News</h2>
-{% for post in posts limit: 5 %}
+{% for post in site.posts limit: 5 %}
{% include posts/post-preview.html %}
-{% endfor %}
\ No newline at end of file
+{% endfor %}
+
Updated Branches:
refs/heads/master d53d44437 -> 36da4cf3d
WEBSITE-NOJIRA Added Fn for news
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo
Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/36da4cf3
Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/36da4cf3
Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/36da4cf3
Branch: refs/heads/master
Commit: 36da4cf3d4982e246191a3ec7eac2495a25f8a86
Parents: d53d444
Author: Trevor a.k.a @rawkintrevo <***@gmail.com>
Authored: Thu Dec 21 21:24:39 2017 -0600
Committer: Trevor a.k.a @rawkintrevo <***@gmail.com>
Committed: Thu Dec 21 21:24:39 2017 -0600
----------------------------------------------------------------------
website/_includes/doc-navbar.html | 2 +-
website/_includes/posts/post-preview.html | 6 +++++-
website/_posts/2017-12-20-new-website.md | 7 ++-----
website/build_site.sh | 13 +++++++------
website/index.md | 5 +++--
5 files changed, 18 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mahout/blob/36da4cf3/website/_includes/doc-navbar.html
----------------------------------------------------------------------
diff --git a/website/_includes/doc-navbar.html b/website/_includes/doc-navbar.html
index c2fc4eb..43e1292 100644
--- a/website/_includes/doc-navbar.html
+++ b/website/_includes/doc-navbar.html
@@ -92,7 +92,7 @@
<li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="" id="navbarDropdownMenuLink" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">API /docs</a>
<div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
- <a class="dropdown-item" href="/docs/0.13.0/api/docs/">0.13.0</a>
+ <a class="dropdown-item" href="/docs/0.13.0/api/docs/">0.13.0</a>
</div>
</li>
http://git-wip-us.apache.org/repos/asf/mahout/blob/36da4cf3/website/_includes/posts/post-preview.html
----------------------------------------------------------------------
diff --git a/website/_includes/posts/post-preview.html b/website/_includes/posts/post-preview.html
index 7733acc..62fc4d8 100644
--- a/website/_includes/posts/post-preview.html
+++ b/website/_includes/posts/post-preview.html
@@ -2,7 +2,11 @@
<div class="card-body">
<div class="row no-gutters">
<div class="col-3 d-none d-md-flex my-auto card-post-img">
- <img class="rounded-circle img-fluid d-flex mx-auto" src="{{ post.image }}">
+ {% if post.image %}
+ <img class="rounded-circle img-fluid d-flex mx-auto" src="{{ post.image }}">
+ {% else %}
+ <img class="rounded-circle img-fluid d-flex mx-auto" src="/assets/mahout-logo-blue.svg">
+ {% endif %}
</div>
<div class="col-12 col-md-9 card-post-text">
<div class="clearfix mb-3">
http://git-wip-us.apache.org/repos/asf/mahout/blob/36da4cf3/website/_posts/2017-12-20-new-website.md
----------------------------------------------------------------------
diff --git a/website/_posts/2017-12-20-new-website.md b/website/_posts/2017-12-20-new-website.md
index 2eceb1d..e0bb94f 100644
--- a/website/_posts/2017-12-20-new-website.md
+++ b/website/_posts/2017-12-20-new-website.md
@@ -5,14 +5,11 @@ date: 2017-12-20 16:16:01 -0600
category: news
---
-
-# New Website Released
-
-We've launced a new website, (a YUUUGE special thanks to David Miller from [StartBootstrap](http://startbootstrap.com)).
+We've launced a new website, (a HUUUGE special thanks to David Miller from [StartBootstrap.com](http://startbootstrap.com)).
It looks great but there's lots to do as we migrate and clean up content from the old site. If you see anything broken,
please let us know via either:
- drop a lint to ***@mahout.apache.org
- fix it yourself and [open a PR](/developers/githubPRs)!
-
\ No newline at end of file
+
http://git-wip-us.apache.org/repos/asf/mahout/blob/36da4cf3/website/build_site.sh
----------------------------------------------------------------------
diff --git a/website/build_site.sh b/website/build_site.sh
index b4d889d..8f0a029 100755
--- a/website/build_site.sh
+++ b/website/build_site.sh
@@ -18,7 +18,13 @@ export PATH=${GEM_HOME}/bin:$PATH
# Set env for docs
MAHOUT_VERSION=0.13.0
-if [ ! -d "$WORKDIR/docs/$MAHOUT_VERSION/api" ]; then
+
+
+
+git checkout asf-site
+git clean -f -d
+git pull origin asf-site
+if [ ! -d "/docs/$MAHOUT_VERSION/api" ]; then
echo "API docs for $MAHOUT_VERSION not found, downloading them"
DISTFILE=apache-mahout-distribution-$MAHOUT_VERSION.tar.gz
DISTPATH=https://dist.apache.org/repos/dist/release/mahout/$MAHOUT_VERSION/$DISTFILE
@@ -32,11 +38,6 @@ if [ ! -d "$WORKDIR/docs/$MAHOUT_VERSION/api" ]; then
rm -f $WORKDIR/$DISTFILE
"done."
fi
-
-
-git checkout asf-site
-git clean -f -d
-git pull origin asf-site
# rm -rf *
#cp -a $WORKDIR/* .
cp -r $WORKDIR/* .
http://git-wip-us.apache.org/repos/asf/mahout/blob/36da4cf3/website/index.md
----------------------------------------------------------------------
diff --git a/website/index.md b/website/index.md
index 9102024..80fb4ca 100644
--- a/website/index.md
+++ b/website/index.md
@@ -11,6 +11,7 @@ Apache Mahout(TM) is a <strong>distributed linear algebra framework</strong> and
- Modular Native Solvers for CPU/GPU/CUDA Acceleration
<h2 class="section-heading">Recent News</h2>
-{% for post in posts limit: 5 %}
+{% for post in site.posts limit: 5 %}
{% include posts/post-preview.html %}
-{% endfor %}
\ No newline at end of file
+{% endfor %}
+