diff options
| author | gnowgi <nagarjun@gnowledge.org> | 2012-07-13 03:27:22 -0700 |
|---|---|---|
| committer | gnowgi <nagarjun@gnowledge.org> | 2012-07-13 03:27:22 -0700 |
| commit | d4ac04e190a9aa45e8bd0f9a89dd1ebaddd63037 (patch) | |
| tree | aade34552216e94820c49aab0f52ad94316b8ec7 /gstudio/templates/gstudio/skeleton.html | |
| parent | 25261ae70442eabc1b26ddfbbd923b04a3ffb9f1 (diff) | |
| parent | 253a7a23f71fd90e9f70a89b6a0aad6312ef4d40 (diff) | |
| download | gnowsys-d4ac04e190a9aa45e8bd0f9a89dd1ebaddd63037.tar.gz | |
Merge pull request #71 from horntail/master
This merge includes BITS Pilani students contributions: ankita, shreya, shruti, prateek, divya, deepthi, harshdeep, sahil, nihar, and akash, who worked on talk pages, groups, syndication, and multi-media resources.
Diffstat (limited to 'gstudio/templates/gstudio/skeleton.html')
| -rw-r--r-- | gstudio/templates/gstudio/skeleton.html | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/gstudio/templates/gstudio/skeleton.html b/gstudio/templates/gstudio/skeleton.html index d60dccfe..5820701a 100644 --- a/gstudio/templates/gstudio/skeleton.html +++ b/gstudio/templates/gstudio/skeleton.html @@ -271,16 +271,23 @@ <script src="{% admin_media_prefix %}js/grappelli/jquery.grp_autocomplete_generic.js" type="text/javascript"></script> <script type="text/javascript" src="https://apis.google.com/js/plusone.js"></script> + + <script src="{{STATIC_URL}}gstudio/js/gstudio.js" type="text/javascript"></script> + <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/diasporaSyndicate.js"></script> + <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/twitterSyndicate.js" ></script> + + -<!-- orgitdowm css,js --> - <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script> - <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/sets/org/set.js"></script> - - <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/jquery.orgitdown.js"></script> - - <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/sets/savedata.js"></script> + <!-- orgitdown css,js --> + <script type="text/javascript" src="http://code.jquery.com/jquery-1.7.2.min.js"></script> + <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/sets/org/set.js"></script> + + <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/jquery.orgitdown.js"></script> + + <script type="text/javascript" src="{{STATIC_URL}}gstudio/js/orgitdown/orgitdown/sets/savedata.js"></script> - <!-- EXTRAHEAD --> + <!-- EXTRAHEAD --> + {% block extrahead %}{% endblock %} {% endblock %} <!-- the header lines from gstudio --> |