Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/docs/templates/docs.html b/docs/templates/docs.html
new file mode 100644
index 0000000..ef3cf8e
--- /dev/null
+++ b/docs/templates/docs.html
@@ -0,0 +1,51 @@
+{% extends "lib/core/doctype/documentation_tool/docs.html" %}
+
+{% block navbar %}
+<div class="navbar navbar-default" style="border-bottom: 2px solid #c0392b">
+ <div class="container">
+ <button type="button" class="navbar-toggle"
+ data-toggle="collapse" data-target=".navbar-responsive-collapse">
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <a class="navbar-brand" href="index.html">
+ <object data="img/splash.svg" class="erpnext-logo"
+ type="image/svg+xml"></object> erpnext.org</a>
+ <div class="collapse navbar-collapse navbar-responsive-collapse">
+ <ul class="nav navbar-nav">
+ <li><a href="docs.user.html">User</a></li>
+ <li><a href="docs.dev.html">Developer</a></li>
+ <li><a href="docs.user.help.html">Help</a></li>
+ <li><a href="docs.download.html">Download</a></li>
+ <li><a href="https://erpnext.com" target="_blank">Cloud</a></li>
+ </ul>
+ <ul class="nav navbar-nav pull-right">
+ <li><a href="docs.about.html">About</a></li>
+ </ul>
+ </div>
+ </div>
+</div>
+{% endblock %}
+
+{% block footer %}
+<hr />
+<div class="footer text-muted" style="font-size: 80%;">
+ <div class="content row">
+ <div class="col-md-12">
+ © <a href="https://erpnext.com">Web Notes</a> |
+ <a href="docs.user.help.html">Help</a> |
+ <a href="https://github.com/webnotes/erpnext" target="_blank">Code</a> |
+ <a href="docs.attributions.html">Attributions</a> |
+ <a href="https://erpnext.com">ERPNext Cloud</a> |
+ <a href="https://erpnext.com/partners">Find a Partner</a> |
+ <a href="https://erpnext.com/donate">Donate</a>
+ <br>
+ <p>
+ Code License: <a href="https://www.gnu.org/licenses/gpl.html">GNU/GPL 3</a>.
+ Documentation License: <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA-3.0</a>.
+ </p>
+ </div>
+ </div>
+</div>
+{% endblock %}
\ No newline at end of file
diff --git a/public/js/toolbar.js b/public/js/toolbar.js
index d2ca512..2566fcb 100644
--- a/public/js/toolbar.js
+++ b/public/js/toolbar.js
@@ -20,20 +20,6 @@
<i class="icon-fixed-width icon-comments"></i> '+wn._('Live Chat')+'</a></li>');
}
- erpnext.toolbar.set_new_comments();
-
$("#toolbar-tools").append('<li><a href="#latest-updates">\
<i class="icon-fixed-width icon-rss"></i> Latest Updates</li>');
-}
-
-erpnext.toolbar.set_new_comments = function(new_comments) {
- return;
- var navbar_nc = $('.navbar-new-comments');
- if(cint(new_comments)) {
- navbar_nc.addClass('navbar-new-comments-true')
- navbar_nc.text(new_comments);
- } else {
- navbar_nc.removeClass('navbar-new-comments-true');
- navbar_nc.text(0);
- }
}
\ No newline at end of file