Skip to content
This repository was archived by the owner on Feb 26, 2024. It is now read-only.

Commit 92edc46

Browse files
markfingermarkfinger
committed
Redirecting bower_component deps to icekit's vendored deps - re #286 
1 parent 1095319 commit 92edc46

File tree

11 files changed

+27
-27
lines changed

11 files changed

+27
-27
lines changed

‎icekit/admin_tools/templates/admin/base_site.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
{% compress css %}
1919
{# Bootstrap, then default admin styles, then our styles. #}
2020
{# This avoids overriding the admin with Bootstrap, and allows us to override anything. #}
21-
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.css' %}" />
21+
<link rel="stylesheet" href="{% static 'icekit/bower_components/bootstrap/dist/css/bootstrap.css' %}" />
2222
<link rel="stylesheet" href="{% static 'admin/css/base.css' %}" />
2323
<link type="text/less" rel="stylesheet" href="{% static 'admin/css/icekit_dashboard.less' %}" />
2424
<link type="text/less" rel="stylesheet" href="{% static 'admin/css/override.less' %}" />
@@ -28,8 +28,8 @@
2828

2929
{% block extrahead %}
3030
{% compress js %}
31-
<script src="{% static 'jquery/dist/jquery.js' %}"></script>
32-
<script src="{% static 'bootstrap/dist/js/bootstrap.js' %}"></script>
31+
<script src="{% static 'icekit/bower_components/jquery/dist/jquery.js' %}"></script>
32+
<script src="{% static 'icekit/bower_components/bootstrap/dist/js/bootstrap.js' %}"></script>
3333
{% endcompress %}
3434
{% endblock %}
3535

‎icekit/plugins/location/templates/icekit/plugins/location/location.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ <h2>Upcoming Events</h2>
6868

6969
{% block base_js %}
7070
{{ block.super }}
71-
<script src="{% static 'lodash/lodash.js' %}"></script>
72-
<script src="{% static 'icekit/js/google_map.js' %}"></script>
71+
<script src="{% static 'icekit/bower_components/lodash/lodash.js' %}"></script>
72+
<script src="{% static 'icekit/bower_components/icekit/js/google_map.js' %}"></script>
7373
{% endblock %}
7474
{% endblock body %}

‎icekit/project/settings/_base.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@
513513
# DJANGO_WYSIWYG_MEDIA_URL = '/' # See redirects in `icekit.project.urls`
514514

515515
DJANGO_WYSIWYG_FLAVOR = 'alloyeditor'
516-
DJANGO_WYSIWYG_MEDIA_URL = STATIC_URL + 'alloyeditor/dist/alloy-editor/'
516+
DJANGO_WYSIWYG_MEDIA_URL = STATIC_URL + 'icekit/bower_components/alloyeditor/dist/alloy-editor/'
517517

518518
BASIC_PLUGINS = [
519519
'RawHtmlPlugin',

‎icekit/templates/icekit/base.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
{# Base CSS files #}
4444
{% compress css file %}
4545
{% block icekit_css %}
46-
<link rel="stylesheet" href="{% static 'bootstrap/dist/css/bootstrap.css' %}">
47-
<link rel="stylesheet" href="{% static 'font-awesome/css/font-awesome.css' %}">
46+
<link rel="stylesheet" href="{% static 'icekit/bower_components/bootstrap/dist/css/bootstrap.css' %}">
47+
<link rel="stylesheet" href="{% static 'icekit/bower_components/font-awesome/css/font-awesome.css' %}">
4848
<link rel="stylesheet" type="text/x-scss" href="{% static 'icekit/styles/icekit.scss' %}">
4949
{% endblock %}
5050
{# Default styling for a project, designed to be overridden once a build is underway #}
@@ -86,8 +86,8 @@
8686
{# Base JS files #}
8787
{% compress js file %}
8888
{% block base_js %}
89-
<script src="{% static 'jquery/dist/jquery.min.js' %}"></script>
90-
<script src="{% static 'icekit/js/link_share.js' %}"></script>
89+
<script src="{% static 'icekit/bower_components/jquery/dist/jquery.min.js' %}"></script>
90+
<script src="{% static 'icekit/bower_components/icekit/js/link_share.js' %}"></script>
9191
{% endblock %}
9292
{% endcompress %}
9393
{# Extra JS files - section/page specific, etc #}

‎icekit_events/admin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ class EventAdmin(ChildModelPluginPolymorphicParentModelAdmin,
193193

194194
class Media:
195195
css = {
196-
'all': ('font-awesome/css/font-awesome.css',),
196+
'all': ('icekit/bower_components/font-awesome/css/font-awesome.css',),
197197
}
198198

199199
def get_queryset(self, request):

‎icekit_events/forms.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ class Media:
2626
'all': ('icekit_events/css/recurrence_rule_widget.css', ),
2727
}
2828
js = (
29-
'lodash/lodash.js',
30-
'skveege-rrule/lib/rrule.js',
31-
'skveege-rrule/lib/nlp.js',
29+
'icekit/bower_components/lodash/lodash.js',
30+
'icekit/bower_components/skveege-rrule/lib/rrule.js',
31+
'icekit/bower_components/skveege-rrule/lib/nlp.js',
3232
)
3333

3434
def __init__(self, *args, **kwargs):

‎icekit_events/page_types/advancedeventlisting/templates/advancedeventlisting/layouts/default.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
{% block css %}
88
{{ block.super }}
9-
<link rel="stylesheet" href="{% static 'jquery-ui/themes/base/jquery-ui.css' %}">
9+
<link rel="stylesheet" href="{% static 'icekit/bower_components/jquery-ui/themes/base/jquery-ui.css' %}">
1010
{% endblock %}
1111

1212
{% block content %}
@@ -74,7 +74,7 @@ <h2>Occurrences</h2>
7474
{% block js %}
7575
{{ block.super }}
7676
<script src="{% static 'icekit_events/js/jquery-querystring.js' %}"></script>
77-
<script src="{% static 'jquery-ui/jquery-ui.min.js' %}"></script>
77+
<script src="{% static 'icekit/bower_components/jquery-ui/jquery-ui.min.js' %}"></script>
7878

7979
{# Configure behaviour of start/end field datepicker widgets #}
8080
<script>

‎icekit_events/page_types/eventlistingfordate/templates/eventlistingfordate/layouts/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ <h2>{{ start|date }}</h2>
3636
{% block js %}
3737
{{ block.super }}
3838
<script src="{% static 'icekit_events/js/jquery-querystring.js' %}"></script>
39-
<script src="{% static 'jquery-ui/jquery-ui.min.js' %}"></script>
39+
<script src="{% static 'icekit/bower_components/jquery-ui/jquery-ui.min.js' %}"></script>
4040
<script src="{% static 'icekit_events/js/events_datepicker.js' %}"></script>
4141
{% endblock %}
4242

‎icekit_events/templates/admin/icekit_events/eventbase/calendar.html

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<html>
66
<head>
7-
<link rel='stylesheet' href='{% static "fullcalendar/dist/fullcalendar.css" %}' />
7+
<link rel='stylesheet' href='{% static "icekit/bower_components/fullcalendar/dist/fullcalendar.css" %}' />
88
<style>
99
html, body {
1010
/*height: 100%;*/
@@ -44,11 +44,11 @@
4444
opacity: 0.4;
4545
}
4646
</style>
47-
<script src='{% static "jquery/dist/jquery.js" %}'></script>
48-
<script src='{% static "moment/moment.js" %}'></script>
49-
<script src='{% static "fullcalendar/dist/fullcalendar.min.js" %}'></script>
50-
<script src='{% static "iframe-resizer/src/iframeResizer.contentWindow.js" %}'></script>
51-
<script src='{% static "js-cookie/src/js.cookie.js" %}'></script>
47+
<script src='{% static "icekit/bower_components/jquery/dist/jquery.js" %}'></script>
48+
<script src='{% static "icekit/bower_components/moment/moment.js" %}'></script>
49+
<script src='{% static "icekit/bower_components/fullcalendar/dist/fullcalendar.min.js" %}'></script>
50+
<script src='{% static "icekit/bower_components/iframe-resizer/src/iframeResizer.contentWindow.js" %}'></script>
51+
<script src='{% static "icekit/bower_components/js-cookie/src/js.cookie.js" %}'></script>
5252

5353
<script>
5454
var icekit_events = icekit_events || {};

‎icekit_events/templates/admin/icekit_events/eventbase/change_form.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
}
2121

2222
</style>
23-
<script src='{% static "iframe-resizer/src/iframeResizer.js" %}'></script>
24-
<script src='{% static "js-cookie/src/js.cookie.js" %}'></script>
23+
<script src='{% static "icekit/bower_components/iframe-resizer/src/iframeResizer.js" %}'></script>
24+
<script src='{% static "icekit/bower_components/js-cookie/src/js.cookie.js" %}'></script>
2525

2626
<div id="calendar-container">
2727

‎icekit_events/templates/admin/icekit_events/eventbase/change_list.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
width: 100%;
2121
}
2222
</style>
23-
<script src='{% static "iframe-resizer/src/iframeResizer.js" %}'></script>
24-
<script src='{% static "js-cookie/src/js.cookie.js" %}'></script>
23+
<script src='{% static "icekit/bower_components/iframe-resizer/src/iframeResizer.js" %}'></script>
24+
<script src='{% static "icekit/bower_components/js-cookie/src/js.cookie.js" %}'></script>
2525
<div class="results">
2626
<iframe id="calendar" src="{% url "admin:icekit_events_eventbase_calendar" %}?{{ request.GET.urlencode }}" scrolling="no"></iframe>
2727
<script>

0 commit comments

Comments
 (0)