Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Tidy up static assets

  • Loading branch information...
commit 1a23b97e89c839bb583a1af11e5a7b22fef91cbf 1 parent 2f9ce17
@oldpatricka oldpatricka authored
View
2  phantomweb/static/css/phantom_common.css
@@ -1,6 +1,6 @@
body {
- background: url(http://www.nimbusproject.org/images/body_bg.jpg) repeat-x;
+ background: url(/static/img/body_bg.jpg) repeat-x;
}
/* Phone-specific CSS */
View
BIN  phantomweb/static/images/glyphicons-halflings-white.png
Deleted file not rendered
View
BIN  phantomweb/static/images/glyphicons-halflings.png
Deleted file not rendered
View
0  phantomweb/static/images/1.png → phantomweb/static/img/1.png
File renamed without changes
View
0  phantomweb/static/images/2.png → phantomweb/static/img/2.png
File renamed without changes
View
0  phantomweb/static/images/3.png → phantomweb/static/img/3.png
File renamed without changes
View
BIN  phantomweb/static/img/body_bg.jpg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
0  phantomweb/static/images/favicon.ico → phantomweb/static/img/favicon.ico
File renamed without changes
View
0  phantomweb/static/images/loading0.gif → phantomweb/static/img/loading0.gif
File renamed without changes
View
0  phantomweb/static/images/loading1.gif → phantomweb/static/img/loading1.gif
File renamed without changes
View
0  phantomweb/static/images/loading4.gif → phantomweb/static/img/loading4.gif
File renamed without changes
View
0  phantomweb/static/images/loading_bar.gif → phantomweb/static/img/loading_bar.gif
File renamed without changes
View
0  phantomweb/static/images/nimbus_logo.png → phantomweb/static/img/nimbus_logo.png
File renamed without changes
View
2  phantomweb/templates/base.html
@@ -52,7 +52,7 @@
<div id="nimbus_logo" class="hidden-phone outer-container">
<!--NIMBUS-->
- <img src="/static/images/nimbus_logo.png" />
+ <img src="/static/img/nimbus_logo.png" />
</div>
<div class="container-fluid outer-container">
<div class="row-fluid">
View
4 phantomweb/templates/error.html
@@ -1,7 +1,5 @@
{% extends "../templates/base.html" %}
-{% block headscripts %}
- <script src="/static/js/phantom.js"></script>
-{% endblock %}
+{% block headscripts %}{% endblock %}
{% block bodytag %}onload="loadPage();"{% endblock %}
{% block nimbus_body %}
View
2  phantomweb/templates/phantom_domain.html
@@ -164,7 +164,7 @@ <h5 class="phantom_area_header magic-underline">Configuration for <span id="phan
<option>TERMINATING</option>
<option>FAILED</option>
</select>
- <img src="/static/images/loading0.gif" id="phantom_details_loading_image"/>
+ <img src="/static/img/loading0.gif" id="phantom_details_loading_image"/>
</div>
<div id="details_table_container">
<table class="table table-bordered table-hover table-white" id="details_table">
View
4 phantomweb/templates/registration/login.html
@@ -1,8 +1,6 @@
{% extends "../templates/base.html" %}
{% load url from future %}
-{% block headscripts %}
- <script src="/static/js/phantom.js"></script>
-{% endblock %}
+{% block headscripts %} {% endblock %}
{% block nimbus_body %}
View
2  phantomweb/urls.py
@@ -9,7 +9,7 @@
urlpatterns = patterns('',
url(r'^accounts/password/reset/confirm/(?P<uidb36>[0-9A-Za-z]+)-(?P<token>.+)/$', password_reset_confirm),
- url(r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/images/favicon.ico'}),
+ url(r'^favicon\.ico$', 'django.views.generic.simple.redirect_to', {'url': '/static/img/favicon.ico'}),
url(r'^accounts/ajax_change_password/$', 'phantomweb.views.django_change_password'),
url(r'^accounts/change_password/$', password_change, {
'post_change_redirect' : '/accounts/change_password/done/'}) ,
Please sign in to comment.
Something went wrong with that request. Please try again.