Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Anand Doshi 2013-09-02 15:39:35 +05:30
commit 3be9e909d1
2 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
docs/templates/docs.html vendored Normal file
View File

@ -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">
&copy; <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 %}

14
public/js/toolbar.js
View File

@ -20,20 +20,6 @@ erpnext.toolbar.setup = function() {
<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);
}
}