Changeset - f0e7a582262f
[Not reviewed]
! ! !
Sachi King - 7 years ago 2017-04-24 15:31:01
nakato@nakato.io
Asset cleanup

Remove in-app stale resources and their branching of different cons.
Remove dist and move everyting into static/src.
Remove unused stale resouces such as less and hbs, etc.
10 files changed:
0 comments (0 inline, 0 general)
pinaxcon/settings.py
Show inline comments
...
 
@@ -79,10 +79,10 @@ MEDIA_ROOT = os.path.join(PACKAGE_ROOT, "site_media", "media")
 
MEDIA_URL = "/site_media/media/"
 

	
 
STATIC_ROOT = os.path.join(PROJECT_ROOT, "static")
 
STATIC_URL = "/static/dist/"
 
STATIC_URL = "/static/src/"
 

	
 
STATICFILES_DIRS = [
 
    os.path.join(PROJECT_ROOT, "static", "dist"),
 
    os.path.join(PROJECT_ROOT, "static", "src"),
 
]
 

	
 
STATICFILES_FINDERS = [
pinaxcon/templates/site_base.html
Show inline comments
...
 
@@ -56,13 +56,11 @@
 
        {% endblock %}
 

	
 
        {% block scripts %}
 
          <script src="{% static 'pyconau2017/js/app.js' %}" type="text/javascript"></script>
 
          <script src="{{ STATIC_URL }}/js/app.js" type="text/javascript"></script>
 
          <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script>
 
          <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
 
          <script src="{% static 'pyconau2017/js/bootstrap.js' %}" type="text/javascript"></script>
 
          <script src="{% static 'pyconau2017/js/load_editors.js' %}" type="text/javascript"></script>
 
          <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.3/ace.js"></script>
 
          <script src="{{ STATIC_URL }}js/jquery.formset.js"></script>
 
          <script src="{{ STATIC_URL }}/js/bootstrap.min.js" type="text/javascript"></script>
 
          <script src="{{ STATIC_URL }}/js/jquery.formset.js"></script>
 
        {% block scripts_extra %}{% endblock %}
 
      {% endblock %}
 

	
pinaxcon/templates/symposion/schedule/base.html
Show inline comments
...
 
@@ -14,11 +14,10 @@
 
    {% endblock %}
 
{% endblock %}
 
{% block scripts %}
 
    <script src="{% static 'pyconau2017/js/app.js' %}"></script>
 
    <script src="{{ STATIC_URL }}/js/app.js" type="text/javascript"></script>
 
    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.0.0/jquery.min.js"></script>
 
        {% include "_scripts.html" %}
 
    <script src="//cdnjs.cloudflare.com/ajax/libs/ace/1.2.0/ace.js"></script>
 
    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 
    {% include "_scripts.html" %}
 
    <script src="{{ STATIC_URL }}/js/bootstrap.min.js" type="text/javascript"></script>
 
    {% block extra_script %}{% endblock %}
 
{% endblock %}
 

	
pinaxcon/templates/symposion/schedule/schedule_edit.html
Show inline comments
...
 
@@ -10,7 +10,6 @@
 
{% endblock %}
 

	
 
{% block extra_head %}
 
    <link rel="stylesheet" href="{{ STATIC_URL }}chosen/chosen.css" />
 
{% endblock %}
 

	
 
{% block content %}
static/dist/chosen/chosen.css
Show inline comments
 
deleted file
static/dist/chosen/chosen.jquery.js
Show inline comments
 
deleted file
static/dist/chosen/chosen.jquery.min.js
Show inline comments
 
deleted file
static/dist/chosen/chosen.min.css
Show inline comments
 
deleted file
static/dist/chosen/chosen.proto.js
Show inline comments
 
deleted file
static/dist/chosen/chosen.proto.min.js
Show inline comments
 
deleted file

Changeset was too big and was cut off... Show full diff anyway

0 comments (0 inline, 0 general)