Download as
Browse Code »

Commit 60162f36724ac191b0ed9b4da978f73bc128f019

Authored by Sergio Oliveira
1 parent 769f4265
Exists in master and in 39 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, check-port, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_cache_count_spb, fix_header, fixed_gitlab_import, go_to_profile_panel, header_footer, layout-fix, mobile_user_scalable, move_out_plugins, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, spb-release/3.0, split_screen, stable, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd, workin_whoosh_temp

Using static from staticfiles framework

Showing 7 changed files with 11 additions and 7 deletions   Show diff stats
colab/proxy/gitlab/templates/proxy/gitlab.html
  Diff comments   View file @60162f3
1 {% extends 'base.html' %} 1 {% extends 'base.html' %}
2 -{% load static %} 2 +{% load static from staticfiles %}
3 3
4 {% block head_css %} 4 {% block head_css %}
5 <style> 5 <style>
colab/proxy/noosfero/templates/proxy/noosfero.html
  Diff comments   View file @60162f3
1 {% extends 'base.html' %} 1 {% extends 'base.html' %}
2 -{% load static %} 2 +{% load static from staticfiles %}
3 3
4 {% block head_css %} 4 {% block head_css %}
5 <link href="{% static 'noosfero/css/bootstrap-colab-style.css' %}" 5 <link href="{% static 'noosfero/css/bootstrap-colab-style.css' %}"
colab/search/templates/search/search.html
  Diff comments   View file @60162f3
1 {% extends "base.html" %} 1 {% extends "base.html" %}
2 -{% load i18n highlight superarchives static %} 2 +{% load i18n highlight superarchives %}
  3 +{% load static from staticfiles %}
3 4
4 {% block title %}{% trans 'search'|title %}{% endblock %} 5 {% block title %}{% trans 'search'|title %}{% endblock %}
5 6
colab/templates/base.html
  Diff comments   View file @60162f3
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 -{% load i18n static browserid conversejs gravatar %} 2 +{% load i18n browserid conversejs gravatar %}
  3 +{% load static from staticfiles %}
3 4
4 <html> 5 <html>
5 <head> 6 <head>
colab/templates/doughnut-chart.html
  Diff comments   View file @60162f3
1 -{% load i18n static %} 1 +{% load i18n %}
  2 +{% load static from staticfiles %}
2 3
3 <script src="{% static 'third-party/chartjs/js/Chart.min.js' %}"></script> 4 <script src="{% static 'third-party/chartjs/js/Chart.min.js' %}"></script>
4 <script src="{% static 'third-party/chroma/js/chroma.min.js' %}"></script> 5 <script src="{% static 'third-party/chroma/js/chroma.min.js' %}"></script>
colab/templates/dpaste/base.html
  Diff comments   View file @60162f3
1 {% extends 'base.html' %} 1 {% extends 'base.html' %}
2 -{% load static %} 2 +{% load static from staticfiles %}
3 3
4 {% block head_css %} 4 {% block head_css %}
5 <link rel="stylesheet" href="{% static 'dpaste/css/theme.css' %}" type="text/css" media="screen" /> 5 <link rel="stylesheet" href="{% static 'dpaste/css/theme.css' %}" type="text/css" media="screen" />
colab/templates/pizza-chart.html
  Diff comments   View file @60162f3
1 -{% load i18n static %} 1 +{% load i18n %}
  2 +{% load static from staticfiles %}
2 3
3 <script src="{% static 'third-party/highcharts/js/highcharts.js' %}"></script> 4 <script src="{% static 'third-party/highcharts/js/highcharts.js' %}"></script>
4 <script> 5 <script>