Commit 74b5e4bc315323f70d80ee4e60545c89feae6090
1 parent
e4f76b94
Exists in
master
and in
39 other branches
Fixing merge
Showing
2 changed files
with
11 additions
and
39 deletions
Show diff stats
src/colab/deprecated/templates/base.html
| @@ -3,28 +3,23 @@ | @@ -3,28 +3,23 @@ | ||
| 3 | <html> | 3 | <html> |
| 4 | <head> | 4 | <head> |
| 5 | 5 | ||
| 6 | - <!-- Framework CSS --> | ||
| 7 | - | ||
| 8 | <link rel="stylesheet" href="{{ STATIC_URL }}third-party/dist/css/bootstrap.css" type="text/css" media="screen, projection" /> | 6 | <link rel="stylesheet" href="{{ STATIC_URL }}third-party/dist/css/bootstrap.css" type="text/css" media="screen, projection" /> |
| 9 | 7 | ||
| 10 | <link rel="stylesheet" href="{{ STATIC_URL }}third-party/dist/css/bootstrap-glyphicons.css" type="text/css" media="screen, projection" /> | 8 | <link rel="stylesheet" href="{{ STATIC_URL }}third-party/dist/css/bootstrap-glyphicons.css" type="text/css" media="screen, projection" /> |
| 11 | 9 | ||
| 12 | - <link rel="stylesheet" href="{{ STATIC_URL }}third-party/converse.js/converse.css" type="text/css" media="screen, projection" /> | ||
| 13 | - | ||
| 14 | <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css" | 10 | <link rel="stylesheet" href="{{ STATIC_URL }}css/screen.css" |
| 15 | type="text/css" media="screen" charset="utf-8"/> | 11 | type="text/css" media="screen" charset="utf-8"/> |
| 12 | + | ||
| 16 | <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script> | 13 | <script type="text/javascript" src="{{ STATIC_URL }}third-party/jquery-2.0.3.min.js"></script> |
| 17 | - <script type="text/javascript" src="{{ STATIC_URL }}js/base.js"></script> | ||
| 18 | <script src="{{ STATIC_URL }}third-party/dist/js/bootstrap.js"></script> | 14 | <script src="{{ STATIC_URL }}third-party/dist/js/bootstrap.js"></script> |
| 19 | 15 | ||
| 16 | + <script type="text/javascript" src="{{ STATIC_URL }}js/base.js"></script> | ||
| 17 | + | ||
| 20 | {% conversejs_static %} | 18 | {% conversejs_static %} |
| 21 | 19 | ||
| 22 | - <script data-main="{{ STATIC_URL }}third-party/converse.js/main" src="{{ STATIC_URL }}third-party/converse.js/Libraries/require-jquery.js"></script> | ||
| 23 | 20 | ||
| 24 | - {% block head_js %} | ||
| 25 | - {% endblock %} | ||
| 26 | - {% block head_css %} | ||
| 27 | - {% endblock %} | 21 | + {% block head_js %}{% endblock %} |
| 22 | + {% block head_css %}{% endblock %} | ||
| 28 | 23 | ||
| 29 | {% block google_analytics %} | 24 | {% block google_analytics %} |
| 30 | <script type="text/javascript"> | 25 | <script type="text/javascript"> |
| @@ -127,31 +122,9 @@ | @@ -127,31 +122,9 @@ | ||
| 127 | {% endblock %} | 122 | {% endblock %} |
| 128 | </div> | 123 | </div> |
| 129 | 124 | ||
| 130 | - <div id="chatpanel"> | ||
| 131 | - <div id="collective-xmpp-chat-data"></div> | ||
| 132 | - <div id="toggle-controlbox"> | ||
| 133 | - <a href="#" class="chat toggle-online-users"> | ||
| 134 | - <strong class="conn-feedback">Mensageiro</strong> <strong style="display: none" id="online-count">(0)</strong> | ||
| 135 | - </a> | ||
| 136 | - </div> | ||
| 137 | - </div> | ||
| 138 | - | ||
| 139 | -<script> | ||
| 140 | - require(["jquery", "converse"], function ($, converse) { | ||
| 141 | - converse.initialize({ | ||
| 142 | - auto_list_rooms: false, | ||
| 143 | - auto_subscribe: false, | ||
| 144 | - bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes | ||
| 145 | - hide_muc_server: false, | ||
| 146 | - i18n: locales['{{ request.LANGUAGE_CODE }}'], // Refer to ./locale/locales.js to see which locales are supported | ||
| 147 | - prebind: false, | ||
| 148 | - show_controlbox_by_default: true, | ||
| 149 | - xhr_user_search: false | ||
| 150 | - }); | ||
| 151 | - }); | ||
| 152 | -</script> | ||
| 153 | - {% browserid_js %} | 125 | + {% conversejs_chatpanel %} |
| 126 | + {% conversejs_initialize %} | ||
| 154 | 127 | ||
| 155 | - </div> | 128 | + {% browserid_js %} |
| 156 | </body> | 129 | </body> |
| 157 | </html> | 130 | </html> |
src/planet/templates/feedzilla/base.html
| 1 | {% extends 'base.html' %} | 1 | {% extends 'base.html' %} |
| 2 | -{% load i18n %} | ||
| 3 | -{% load feedzilla_tags %} | 2 | +{% load i18n feedzilla_tags taggit_extras %} |
| 4 | 3 | ||
| 5 | {% block main-content %} | 4 | {% block main-content %} |
| 6 | <h2>{% trans 'Planet' %}</h2> | 5 | <h2>{% trans 'Planet' %}</h2> |
| 7 | <hr/> | 6 | <hr/> |
| 8 | 7 | ||
| 9 | <div class="row"> | 8 | <div class="row"> |
| 10 | - {% block feedzilla_content %}{% endblock %} | 9 | + {% block feedzilla_content %}{% endblock %} |
| 11 | 10 | ||
| 12 | <div class="col-lg-3"> | 11 | <div class="col-lg-3"> |
| 13 | <div class="well"> | 12 | <div class="well"> |
| @@ -15,7 +14,7 @@ | @@ -15,7 +14,7 @@ | ||
| 15 | </div> | 14 | </div> |
| 16 | <div class="well"> | 15 | <div class="well"> |
| 17 | <h3>{% trans 'Tags' %}</h3> | 16 | <h3>{% trans 'Tags' %}</h3> |
| 18 | - {% feedzilla_tag_cloud %} | 17 | + {% include_tagcloud 'feedzilla.post' %} |
| 19 | </div> | 18 | </div> |
| 20 | <div class="well"> | 19 | <div class="well"> |
| 21 | <h3>{% trans 'Source Blogs' %}</h3> | 20 | <h3>{% trans 'Source Blogs' %}</h3> |