diff options
| -rw-r--r-- | core/admin.py | 2 | ||||
| -rw-r--r-- | localsettingsserver.py | 2 | ||||
| -rw-r--r-- | templates/base.html | 2 | ||||
| -rw-r--r-- | templates/cavebase.html | 6 | ||||
| -rw-r--r-- | templates/editcave.html | 4 | ||||
| -rw-r--r-- | templates/editcave2.html | 4 | ||||
| -rw-r--r-- | templates/editentrance.html | 4 | ||||
| -rw-r--r-- | templates/editfile.html | 5 | ||||
| -rw-r--r-- | templates/newlogbookentry.html | 4 | ||||
| -rw-r--r-- | templates/svxfile.html | 4 |
10 files changed, 19 insertions, 18 deletions
diff --git a/core/admin.py b/core/admin.py index 0c8b605..6e9d058 100644 --- a/core/admin.py +++ b/core/admin.py @@ -16,7 +16,7 @@ class TroggleModelAdmin(admin.ModelAdmin): obj.save() class Media: - js = ('js/jquery.js','js/QM_helper.js') + js = ('jquery/jquery.min.js','js/QM_helper.js') class RoleInline(admin.TabularInline): model = SurvexPersonRole diff --git a/localsettingsserver.py b/localsettingsserver.py index 0ac8fed..61f5252 100644 --- a/localsettingsserver.py +++ b/localsettingsserver.py @@ -42,7 +42,7 @@ MEDIA_URL = URL_ROOT + DIR_ROOT + 'site_media/' MEDIA_ROOT = REPOS_ROOT_PATH + '/troggle/media/' MEDIA_ADMIN_DIR = '/usr/lib/python2.7/site-packages/django/contrib/admin/media/' -JSLIB_PATH = /usr/share/javascript/ +JSLIB_URL = "URL_ROOT + javascript/" TINY_MCE_MEDIA_ROOT = '/usr/share/tinymce/www/' TINY_MCE_MEDIA_URL = URL_ROOT + DIR_ROOT + 'tinymce_media/' diff --git a/templates/base.html b/templates/base.html index fda3617..63724ee 100644 --- a/templates/base.html +++ b/templates/base.html @@ -6,7 +6,7 @@ <link rel="alternate stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/mainplain.css" title="plain"/> <link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/dropdownNavStyle.css" /> <title>{% block title %}Troggle{% endblock %}</title> -<script src="{{ settings.MEDIA_URL }}js/jquery.js" type="text/javascript"></script> +<script src="{{ settings.JSLIB_URL }}jquery/jquery.min.js" type="text/javascript"></script> <script src="{{ settings.MEDIA_URL }}js/jquery.quicksearch.js" type="text/javascript"></script> <script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script> <script src="{{ settings.MEDIA_URL }}js/jquery.dropdownPlain.js" type="text/javascript"></script> diff --git a/templates/cavebase.html b/templates/cavebase.html index b3505a7..4b7c3b9 100644 --- a/templates/cavebase.html +++ b/templates/cavebase.html @@ -5,9 +5,9 @@ <title>{% block title %}{{ cave.official_name|safe }}{% endblock %} </title> <link rel="stylesheet" type="text/css" href="/css/main2.css" /> -<link rel="stylesheet" type="text/css" href="{{ settings.MEDIA_URL }}css/redmond/jquery-ui-1.8.14.custom.css" /> -<script src="{{ settings.MEDIA_URL }}js/jquery.js" type="text/javascript"></script> -<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.14.custom.min.js" type="text/javascript"></script> +<link rel="stylesheet" type="text/css" href="{{ settings.JSLIB_URL }}jquery-ui/css/redmond/jquery-ui.css" /> +<script src="{{ settings.JSLIB_URL }}jquery/jquery.min.js" type="text/javascript"></script> +<script src="{{ settings.JSLIB_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script> <script type="text/javascript"> $(function() { $( "#tabs" ).tabs(); diff --git a/templates/editcave.html b/templates/editcave.html index d7bdf37..7336ca1 100644 --- a/templates/editcave.html +++ b/templates/editcave.html @@ -3,8 +3,8 @@ {% block title %}Logbook {{logbookentry.id}}{% endblock %} {% block head %} -<link rel="stylesheet" href="{{ settings.MEDIA_URL }}css/ui-lightness/jquery-ui-1.8.12.custom.css" type="text/css" media="all" /> -<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.12.custom.min.js" type="text/javascript"></script> +<link rel="stylesheet" href="{{ settings.JSLIB_URL }}jquery-ui/css/lightness/jquery-ui.css" type="text/css" media="all" /> +<script src="{{ settings.JSLIB_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script> <script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script> <script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script> {{ tripForm.media }} diff --git a/templates/editcave2.html b/templates/editcave2.html index edac202..85df6e7 100644 --- a/templates/editcave2.html +++ b/templates/editcave2.html @@ -3,8 +3,8 @@ {% block title %}Edit Cave{% endblock %} {% block extraheaders %} -<link rel="stylesheet" href="{{ settings.MEDIA_URL }}css/ui-lightness/jquery-ui-1.8.12.custom.css" type="text/css" media="all" /> -<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.12.custom.min.js" type="text/javascript"></script> +<link rel="stylesheet" href="{{ settings.JSLIB_URL }}jquery-ui/css/lightness/jquery-ui.css" type="text/css" media="all" /> +<script src="{{ settings.JSLIB_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script> <script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script> <script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script> {% endblock %} diff --git a/templates/editentrance.html b/templates/editentrance.html index e772a11..250bfb0 100644 --- a/templates/editentrance.html +++ b/templates/editentrance.html @@ -3,8 +3,8 @@ {% block title %}Edit Entrance{% endblock %} {% block extraheaders %} -<link rel="stylesheet" href="{{ settings.MEDIA_URL }}css/ui-lightness/jquery-ui-1.8.12.custom.css" type="text/css" media="all" /> -<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.12.custom.min.js" type="text/javascript"></script> +<link rel="stylesheet" href="{{ settings.JSLIB_URL }}jquery-ui/css/lightness/jquery-ui.css" type="text/css" media="all" /> +<script src="{{ settings.JSLIB_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script> <script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script> <script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script> {% endblock %} diff --git a/templates/editfile.html b/templates/editfile.html index b9ae115..c420654 100644 --- a/templates/editfile.html +++ b/templates/editfile.html @@ -20,8 +20,9 @@ }); </script> -<link rel="stylesheet" href="{{ settings.MEDIA_URL }}css/ui-lightness/jquery-ui-1.8.12.custom.css" type="text/css" media="all" /> -<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.12.custom.min.js" type="text/javascript"></script> + +<link rel="stylesheet" href="{{ settings.JSLIB_URL }}jquery-ui/css/lightness/jquery-ui.css" type="text/css" media="all" /> +<script src="{{ settings.JSLIB_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script> <script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script> <script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script> {{ fileForm.media }} diff --git a/templates/newlogbookentry.html b/templates/newlogbookentry.html index 36e8591..a5ac387 100644 --- a/templates/newlogbookentry.html +++ b/templates/newlogbookentry.html @@ -17,8 +17,8 @@ }); </script> -<link rel="stylesheet" href="{{ settings.MEDIA_URL }}css/ui-lightness/jquery-ui-1.8.12.custom.css" type="text/css" media="all" /> -<script src="{{ settings.MEDIA_URL }}js/jquery-ui-1.8.12.custom.min.js" type="text/javascript"></script> +<link rel="stylesheet" href="{{ settings.JSLIB_URL }}jquery-ui/css/lightness/jquery-ui.css" type="text/css" media="all" /> +<script src="{{ settings.JSLIB_URL }}jquery/jquery-ui.min.js" type="text/javascript"></script> <script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script> <script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script> {{ tripForm.media }} diff --git a/templates/svxfile.html b/templates/svxfile.html index bf9f1c3..fbaacdd 100644 --- a/templates/svxfile.html +++ b/templates/svxfile.html @@ -5,8 +5,8 @@ {% block head %} <script src="{{ settings.MEDIA_URL }}js/base.js" type="text/javascript"></script> -<script type="text/javascript" src="{{settings.MEDIA_URL}}js/jquery.form.js"></script> -<script type="text/javascript" src="{{settings.MEDIA_URL}}CodeMirror-0.62/js/codemirror.js"></script> +<script type="text/javascript" src="{{settings.JSLIB_URL}}jquery-form/jquery.form.min.js"></script> +<script type="text/javascript" src="{{settings.JSLIB_URL}}codemirror/codemirror.min.js"></script> <script type="text/javascript"> var codeeditor; |