You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mxnet.apache.org by GitBox <gi...@apache.org> on 2018/10/09 19:33:27 UTC
[GitHub] sandeep-krishnamurthy closed pull request #11921: [MXNET-711] Added
updated logos to the powered by page and iot select fix
sandeep-krishnamurthy closed pull request #11921: [MXNET-711] Added updated logos to the powered by page and iot select fix
URL: https://github.com/apache/incubator-mxnet/pull/11921
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/docs/_static/js/options.js b/docs/_static/js/options.js
index eb82b113c63..0a30706d0ab 100644
--- a/docs/_static/js/options.js
+++ b/docs/_static/js/options.js
@@ -2,12 +2,22 @@ var versionSelect = defaultVersion = 'v1.2.0';
var platformSelect = 'Linux';
var languageSelect = 'Python';
var processorSelect = 'CPU';
+var iotSelect = 'raspberry-pi';
var environSelect = 'Pip';
$(document).ready(function () {
function label(lbl) {
return lbl.replace(/[ .]/g, '-').toLowerCase();
}
+
+ function unlabel(lbl) {
+ if (lbl === "raspberry-pi") {
+ return "Raspberry Pi";
+ } else if (lbl === "nvidia-jetson-tx2") {
+ return "NVIDIA Jetson TX2";
+ }
+ return lbl;
+ }
function urlSearchParams(searchString) {
let urlDict = new Map();
@@ -38,16 +48,25 @@ $(document).ready(function () {
processorSelect = urlParams.get('processor');
$('button:contains(' + processorSelect + ')').siblings().removeClass('active');
$('button:contains(' + processorSelect + ')').addClass('active');
+ if (urlParams.get('iot')) {
+ iotSelect = urlParams.get('iot');
+ $('button:contains(' + unlabel(iotSelect) + ')').siblings().removeClass('active');
+ $('button:contains(' + unlabel(iotSelect) + ')').addClass('active');
+ }
if (urlParams.get('environ'))
environSelect = urlParams.get('environ');
$('button:contains(' + environSelect + ')').siblings().removeClass('active');
$('button:contains(' + environSelect + ')').addClass('active');
showContent();
if (window.location.href.indexOf("/install/index.html") >= 0) {
+ let iotString = "";
+ if (urlParams.get('iot')) {
+ iotString = '&iot=' + iotSelect ;
+ }
if (versionSelect.indexOf(defaultVersion) >= 0) {
- history.pushState(null, null, '/install/index.html?platform=' + platformSelect + '&language=' + languageSelect + '&processor=' + processorSelect);
+ history.pushState(null, null, '/install/index.html?platform=' + platformSelect + '&language=' + languageSelect + '&processor=' + processorSelect + iotString);
} else {
- history.pushState(null, null, '/install/index.html?version=' + versionSelect + '&platform=' + platformSelect + '&language=' + languageSelect + '&processor=' + processorSelect);
+ history.pushState(null, null, '/install/index.html?version=' + versionSelect + '&platform=' + platformSelect + '&language=' + languageSelect + '&processor=' + processorSelect + iotString);
}
}
}
@@ -90,8 +109,14 @@ $(document).ready(function () {
else if ($(this).hasClass("processors")) {
history.pushState(null, null, '/install/index.html' + window.location.search.replace( urlParams.get('processor'), $(this).text() ));
}
+ else if ($(this).hasClass("iots")) {
+ if (window.location.search.indexOf("iot=") < 0) {
+ history.pushState(null, null, '/install/index.html' + window.location.search.concat( '&iot=' + label($(this).text()) ));
+ } else {
+ history.pushState(null, null, '/install/index.html' + window.location.search.replace( urlParams.get('iot'), label($(this).text() )));
+ }
+ }
showContent();
- //window.location.search = window.location.search.replace( urlParams.get('version'), $(this).text() );
}
$('.opt-group').on('click', '.opt', setContent);
});
diff --git a/docs/_static/mxnet-theme/navbar.html b/docs/_static/mxnet-theme/navbar.html
index 05ec5c42ce3..d37d308ea64 100644
--- a/docs/_static/mxnet-theme/navbar.html
+++ b/docs/_static/mxnet-theme/navbar.html
@@ -20,6 +20,7 @@ <h1 id="logo-wrap">
<ul id="package-dropdown-menu" class="dropdown-menu navbar-menu">
<li><a class="main-nav-link" href="{{url_root}}api/python/index.html">Python</a></li>
<li><a class="main-nav-link" href="{{url_root}}api/c++/index.html">C++</a></li>
+ <li><a class="main-nav-link" href="{{url_root}}api/clojure/index.html">Clojure</a></li>
<li><a class="main-nav-link" href="{{url_root}}api/scala/index.html">Scala</a></li>
<li><a class="main-nav-link" href="{{url_root}}api/julia/index.html">Julia</a></li>
<li><a class="main-nav-link" href="{{url_root}}api/perl/index.html">Perl</a></li>
@@ -68,7 +69,7 @@ <h1 id="logo-wrap">
<li class="dropdown-submenu">
<a href="#" tabindex="-1" role="button" aria-haspopup="true" class="dropdown-toggle burger-link" data-toggle="dropdown">{{name}}</a>
<ul class="dropdown-menu">
- {% for lang in ['Python', 'Scala', 'R', 'Julia', 'C++', 'Perl'] %}
+ {% for lang in ['Python', 'Scala', 'Clojure', 'R', 'Julia', 'C++', 'Perl'] %}
<li><a tabindex="-1" href="{{url_root}}{{name.lower()|replace(" ", "_")}}/{{lang.lower()}}/index.html">{{lang}}</a>
</li>
{% endfor %}
diff --git a/docs/_static/mxnet.css b/docs/_static/mxnet.css
index d949f7fd5ba..de3ba007ec0 100644
--- a/docs/_static/mxnet.css
+++ b/docs/_static/mxnet.css
@@ -816,7 +816,7 @@ li.dropdown-submenu ul.dropdown-menu a {
.section-inst .row div {
text-align: center;
- margin-bottom: 30px;
+ margin-bottom: 50px;
height: 80px;
}
@@ -848,10 +848,25 @@ li.dropdown-submenu ul.dropdown-menu a {
}
}
+.section-inst .divit {
+ height: 150px;
+ line-height: 150px;
+}
+
+@media only screen and (max-width: 1200px) {
+ div.nomobile {
+ display: none;
+ }
+}
+
.section-inst img {
- -webkit-filter: grayscale(90%); /* Chrome, Safari, Opera */
- filter: grayscale(90%);
- margin-bottom:2em
+ -webkit-filter: grayscale(0%); /* Chrome, Safari, Opera */
+ filter: grayscale(0%);
+ vertical-align: middle;
+ margin-bottom:4em;
+ margin-left: auto;
+ margin-right: auto;
+ max-width: 75%;
}
.section-inst img:hover {
-webkit-filter: grayscale(0%); /* Chrome, Safari, Opera */
diff --git a/docs/community/powered_by.md b/docs/community/powered_by.md
index 82748ef7df2..fa7e7df885c 100644
--- a/docs/community/powered_by.md
+++ b/docs/community/powered_by.md
@@ -3,60 +3,100 @@
<div class="section-inst">
<div class="container">
<div class="row">
-<div class="col-lg-4 col-sm-6">
- <img height="60px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/aws-logo.png">
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Amazon.png">
</div>
-<div class="col-lg-4 col-sm-6">
- <img height="55px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/baidu-logo.jpg">
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Banjo.png">
</div>
-<div class="col-lg-4 col-sm-6">
- <img height="70px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/cmu-logo.png">
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Borealis_AI.png">
</div>
-<div class="col-lg-4 col-sm-6">
- <img height="70px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/dato-logo.png">
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Celgene.png">
</div>
-<div class="col-lg-4 col-sm-6">
- <img height="70px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/intel-logo.png">
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Curalate.png">
</div>
-<div class="col-lg-4 col-sm-6">
- <img height="45px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/ms-logo.png">
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Gum_Gum.png">
</div>
-
-<div class="col-lg-4 col-sm-6">
- <img height="45px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/mit-logo.png">
+
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Intel.png">
+</div>
+
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Jam_City.png">
+</div>
+
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Julia_Computing.png">
+</div>
+
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Lohika.png">
+</div>
+
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/NTT_Docomo.png">
+</div>
+
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/PIXM.png">
+</div>
+
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Samsung_SDS.png">
+</div>
+
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/SKT.png">
+</div>
+
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Sigopt.png">
+</div>
+
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Teamwork.png">
</div>
-
-<div class="col-lg-4 col-sm-6">
- <img height="40px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/nvidia-logo.png">
+
+<div class="col-lg-3 divit nomobile col-sm-6">
+ <br/>
+</div>
+
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Tusimple.png">
</div>
-<div class="col-lg-4 col-sm-6">
- <img height="55px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/nyu-logo.jpg">
+<div class="col-lg-3 divit col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Wolfram.png">
</div>
-<div class="col-lg-4 col-sm-6">
- <img height="55px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/hkust-logo.png">
+<div class="col-lg-3 divit nomobile col-sm-6">
+ <br/>
</div>
-<div class="col-lg-4 col-sm-6">
- <img height="45px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/tusimple-logo.png">
+<div class="col-lg-3 col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/CMU.png">
</div>
-<div class="col-lg-4 col-sm-6">
- <img height="45px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/university-alberta-logo.png">
+<div class="col-lg-3 col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/Emory_NLP.png">
</div>
-<div class="col-lg-4 col-sm-6">
- <img height="45px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/university-washington-logo.jpg">
+<div class="col-lg-3 col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/MNLAB_KAIST.png">
</div>
-<div class="col-lg-4 col-sm-6">
- <img height="45px" src="https://raw.githubusercontent.com/dmlc/dmlc.github.io/master/img/logo/wolfram-logo.png">
+<div class="col-lg-3 col-sm-6">
+ <img src="https://raw.githubusercontent.com/dmlc/web-data/master/mxnet/powered-by/SPL_Seoul_National_University.png">
</div>
</div>
<p>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services