/kitsune

Browse files

Update urls to reference new namespaces static paths.

1 parent 87d9347 commit 6bce552ae81f5ca6b25abdcea0288f6fe966ca28 @mythmon mythmon committed May 27, 2015
Unified Split
Showing with 334 additions and 336 deletions.
  1. +1 −1 .gitignore
  2. +3 −3 gulpfile.js
  3. +247 −247 kitsune/bundles.py
  4. +2 −2 kitsune/customercare/templates/customercare/landing.html
  5. +4 −4 kitsune/customercare/templates/customercare/reply_modal.html
  6. +6 −6 kitsune/dashboards/templates/dashboards/includes/macros.html
  7. +2 −2 kitsune/dashboards/templates/dashboards/localization.html
  8. +2 −2 kitsune/forums/templates/forums/includes/forum_macros.html
  9. +1 −1 kitsune/forums/templates/forums/posts.html
  10. +1 −1 kitsune/forums/templates/forums/threads.html
  11. +1 −1 kitsune/kadmin/templates/kadmin/base.html
  12. +1 −1 kitsune/kbforums/templates/kbforums/discussions.html
  13. +1 −1 kitsune/kbforums/templates/kbforums/posts.html
  14. +3 −3 kitsune/kbforums/templates/kbforums/threads.html
  15. +1 −1 kitsune/landings/templates/landings/get-involved-aoa.html
  16. +1 −1 kitsune/landings/templates/landings/get-involved-kb.html
  17. +1 −1 kitsune/landings/templates/landings/get-involved-l10n.html
  18. +1 −1 kitsune/landings/templates/landings/get-involved-questions.html
  19. +2 −2 kitsune/landings/templates/landings/get-involved.html
  20. +2 −2 kitsune/landings/templates/landings/mobile/get-involved-aoa.html
  21. +2 −2 kitsune/landings/templates/landings/mobile/get-involved-kb.html
  22. +2 −2 kitsune/landings/templates/landings/mobile/get-involved-l10n.html
  23. +2 −2 kitsune/landings/templates/landings/mobile/get-involved-questions.html
  24. +2 −2 kitsune/landings/templates/landings/mobile/get-involved.html
  25. +2 −4 kitsune/products/models.py
  26. +2 −2 kitsune/products/templates/products/documents.html
  27. +1 −1 kitsune/products/templates/products/includes/product_macros.html
  28. +2 −2 kitsune/products/templates/products/includes/topic_macros.html
  29. +2 −2 kitsune/products/templates/products/mobile/product.html
  30. +1 −1 kitsune/products/templates/products/mobile/products.html
  31. +1 −1 kitsune/products/templates/products/product.html
  32. +1 −1 kitsune/questions/templates/questions/includes/aaq_macros.html
  33. +1 −1 kitsune/questions/templates/questions/mobile/product_list.html
  34. +1 −1 kitsune/questions/templates/questions/product_list.html
  35. +2 −2 kitsune/settings.py
  36. +10 −10 kitsune/sumo/static/sumo/js/tests/suite.json
  37. +3 −3 kitsune/sumo/templates/base.html
  38. +1 −1 kitsune/sumo/templates/email/base.html
  39. +1 −1 kitsune/sumo/templates/handlers/404.html
  40. +1 −1 kitsune/sumo/templates/includes/common_macros.html
  41. +3 −3 kitsune/sumo/templates/tests/qunit.html
  42. +1 −1 kitsune/sumo/templates/wikiparser/hook_image.html
  43. +1 −1 kitsune/wiki/templates/wiki/document.html
  44. +1 −1 kitsune/wiki/templates/wiki/includes/document_macros.html
  45. +2 −2 kitsune/wiki/templates/wiki/includes/recent_revisions_fragment.html
  46. +1 −1 kitsune/wiki/templates/wiki/includes/sidebar_modules.html
  47. +2 −2 kitsune/wiki/templates/wiki/mobile/includes/document_macros.html
View
2 .gitignore
@@ -1,7 +1,7 @@
*.pyc
*.pyo
kitsune/settings_local.py
-kitsune/sumo/static/js/templates
+kitsune/sumo/static/sumo/js/templates
pip-log.txt
.coverage
coverage.xml
View
6 gulpfile.js
@@ -3,13 +3,13 @@ var nunjucks = require('gulp-nunjucks');
var watch = require('gulp-watch');
gulp.task('nunjucks', function() {
- return gulp.src('kitsune/sumo/static/tpl/*')
+ return gulp.src('kitsune/sumo/static/sumo/tpl/*')
.pipe(nunjucks())
- .pipe(gulp.dest('kitsune/sumo/static/js/templates'));
+ .pipe(gulp.dest('kitsune/sumo/static/sumo/js/templates'));
});
gulp.task('watch', ['nunjucks'], function() {
- return gulp.watch('kitsune/sumo/static/tpl/*', ['nunjucks']);
+ return gulp.watch('kitsune/sumo/static/sumo/tpl/*', ['nunjucks']);
});
gulp.task('default', ['watch']);
View
494 kitsune/bundles.py
@@ -4,107 +4,107 @@
'common': {
'source_filenames': (
'normalize-css/normalize.css',
- 'less/main.less',
- 'less/search.less',
+ 'sumo/less/main.less',
+ 'sumo/less/search.less',
),
- 'output_filename': 'common-min.css'
+ 'output_filename': 'build/common-min.css'
},
'community': {
'source_filenames': (
- 'less/wiki-content.less',
- 'less/community.less',
- 'less/select.less',
+ 'sumo/less/wiki-content.less',
+ 'community/less/community.less',
+ 'community/less/select.less',
),
- 'output_filename': 'community-min.css'
+ 'output_filename': 'build/community-min.css'
},
'community-new': {
'source_filenames': (
'fontawesome/css/font-awesome.css',
'pikaday/css/pikaday.css',
- 'less/wiki-content.less',
- 'less/community-new.less',
+ 'sumo/less/wiki-content.less',
+ 'community/less/community-new.less',
),
- 'output_filename': 'community-new-min.css'
+ 'output_filename': 'build/community-new-min.css'
},
'mobile-common': {
'source_filenames': (
'normalize-css/normalize.css',
- 'less/mobile/main.less',
+ 'sumo/less/mobile/main.less',
),
- 'output_filename': 'mobile-common-min.css'
+ 'output_filename': 'build/mobile-common-min.css'
},
'print': {
'source_filenames': (
- 'css/print.css',
+ 'sumo/css/print.css',
),
- 'output_filename': 'print-min.css',
+ 'output_filename': 'build/print-min.css',
'extra_context': {
'media': 'print',
}
},
# TODO: remove dependency on jquery ui CSS and use our own
'jqueryui': {
'source_filenames': (
- 'css/jqueryui/jqueryui.css',
+ 'sumo/css/jqueryui/jqueryui.css',
),
- 'output_filename': 'jqueryui-min.css'
+ 'output_filename': 'build/jqueryui-min.css'
},
'forums': {
'source_filenames': (
- 'less/forums.less',
- 'less/reportabuse.less',
+ 'sumo/less/forums.less',
+ 'sumo/less/reportabuse.less',
),
- 'output_filename': 'forums-min.css'
+ 'output_filename': 'build/forums-min.css'
},
'questions': {
'source_filenames': (
- 'less/questions.less',
- 'css/cannedresponses.css',
- 'less/reportabuse.less',
+ 'sumo/less/questions.less',
+ 'sumo/css/cannedresponses.css',
+ 'sumo/less/reportabuse.less',
),
- 'output_filename': 'questions-min.css'
+ 'output_filename': 'build/questions-min.css'
},
'questions.metrics': {
'source_filenames': (
- 'less/questions.metrics.less',
+ 'sumo/less/questions.metrics.less',
),
- 'output_filename': 'questions.metrics-min.css'
+ 'output_filename': 'build/questions.metrics-min.css'
},
'mobile-questions': {
'source_filenames': (
- 'less/mobile/questions.less',
+ 'sumo/less/mobile/questions.less',
),
- 'output_filename': 'mobile-questions-min.css'
+ 'output_filename': 'build/mobile-questions-min.css'
},
'mobile-aaq': {
'source_filenames': (
- 'less/mobile/aaq.less',
+ 'sumo/less/mobile/aaq.less',
),
- 'output_filename': 'mobile-aaq-min.css'
+ 'output_filename': 'build/mobile-aaq-min.css'
},
'rickshaw': {
'source_filenames': (
- 'css/jqueryui/jqueryui.css',
- 'css/rickshaw.css',
- 'less/rickshaw.sumo.less',
+ 'sumo/css/jqueryui/jqueryui.css',
+ 'sumo/css/rickshaw.css',
+ 'sumo/less/rickshaw.sumo.less',
),
- 'output_filename': 'rickshaw-min.css'
+ 'output_filename': 'build/rickshaw-min.css'
},
'mobile-search': {
'source_filenames': (
- 'less/mobile/search.less',
+ 'sumo/less/mobile/search.less',
),
- 'output_filename': 'mobile-search-min.css'
+ 'output_filename': 'build/mobile-search-min.css'
},
'wiki': {
'source_filenames': (
- 'css/users.autocomplete.css',
- 'css/users.list.css',
- 'less/wiki.less',
- 'less/wiki-content.less',
- 'css/screencast.css',
+ 'sumo/css/users.autocomplete.css',
+ 'sumo/css/users.list.css',
+ 'sumo/less/wiki.less',
+ 'sumo/less/wiki-content.less',
+ 'sumo/css/screencast.css',
),
- 'output_filename': 'wiki-min.css'
+ 'output_filename': 'build/wiki-min.css'
},
'wiki-editor': {
'source_filenames': (
@@ -114,188 +114,188 @@
},
'mobile-wiki': {
'source_filenames': (
- 'less/mobile/wiki.less',
- 'less/wiki-content.less',
+ 'sumo/less/mobile/wiki.less',
+ 'sumo/less/wiki-content.less',
),
- 'output_filename': 'mobile-wiki-min.css'
+ 'output_filename': 'build/mobile-wiki-min.css'
},
'mobile-wiki-minimal': {
'source_filenames': (
'normalize-css/normalize.css',
- 'less/mobile/main.less',
- 'less/mobile/wiki.less',
- 'less/wiki-content.less',
+ 'sumo/less/mobile/main.less',
+ 'sumo/less/mobile/wiki.less',
+ 'sumo/less/wiki-content.less',
),
- 'output_filename': 'mobile-wiki-minimal-min.css'
+ 'output_filename': 'build/mobile-wiki-minimal-min.css'
},
'home': {
'source_filenames': (
- 'less/home.less',
+ 'sumo/less/home.less',
),
- 'output_filename': 'home-min.css'
+ 'output_filename': 'build/home-min.css'
},
'gallery': {
'source_filenames': (
- 'less/gallery.less',
+ 'sumo/less/gallery.less',
),
- 'output_filename': 'gallery-min.css'
+ 'output_filename': 'build/gallery-min.css'
},
'ie': {
'source_filenames': (
- 'css/ie.css',
- 'css/ie8.css',
+ 'sumo/css/ie.css',
+ 'sumo/css/ie8.css',
),
- 'output_filename': 'ie-min.css'
+ 'output_filename': 'build/ie-min.css'
},
'ie8': {
'source_filenames': ( # IE 8 needs some specific help.
- 'css/ie8.css',
+ 'sumo/css/ie8.css',
),
- 'output_filename': 'ie8-min.css'
+ 'output_filename': 'build/ie8-min.css'
},
'customercare': {
'source_filenames': (
- 'less/customercare.less',
+ 'sumo/less/customercare.less',
),
- 'output_filename': 'customercare-min.css'
+ 'output_filename': 'build/customercare-min.css'
},
'users': {
'source_filenames': (
- 'less/users.less',
- 'less/reportabuse.less',
+ 'sumo/less/users.less',
+ 'sumo/less/reportabuse.less',
),
- 'output_filename': 'users-min.css'
+ 'output_filename': 'build/users-min.css'
},
'mobile-users': {
'source_filenames': (
- 'less/mobile/users.less',
+ 'sumo/less/mobile/users.less',
),
- 'output_filename': 'mobile-users-min.css'
+ 'output_filename': 'build/mobile-users-min.css'
},
'monitor': {
'source_filenames': (
- 'css/monitor.css',
+ 'sumo/css/monitor.css',
),
- 'output_filename': 'monitor-min.css'
+ 'output_filename': 'build/monitor-min.css'
},
'messages': {
'source_filenames': (
- 'css/users.autocomplete.css',
- 'less/messages.less',
+ 'sumo/css/users.autocomplete.css',
+ 'sumo/less/messages.less',
),
- 'output_filename': 'messages-min.css'
+ 'output_filename': 'build/messages-min.css'
},
'mobile-messages': {
'source_filenames': (
- 'less/mobile/messages.less',
+ 'sumo/less/mobile/messages.less',
),
- 'output_filename': 'mobile-messages-min.css'
+ 'output_filename': 'build/mobile-messages-min.css'
},
'products': {
'source_filenames': (
- 'less/products.less',
+ 'sumo/less/products.less',
),
- 'output_filename': 'products-min.css'
+ 'output_filename': 'build/products-min.css'
},
'mobile-products': {
'source_filenames': (
- 'less/mobile/products.less',
+ 'sumo/less/mobile/products.less',
),
- 'output_filename': 'mobile-products-min.css'
+ 'output_filename': 'build/mobile-products-min.css'
},
'groups': {
'source_filenames': (
- 'css/users.autocomplete.css',
- 'css/users.list.css',
- 'css/groups.css',
- 'css/wiki_syntax.css',
+ 'sumo/css/users.autocomplete.css',
+ 'sumo/css/users.list.css',
+ 'sumo/css/groups.css',
+ 'sumo/css/wiki_syntax.css',
),
- 'output_filename': 'groups-min.css'
+ 'output_filename': 'build/groups-min.css'
},
'kpi.dashboard': {
'source_filenames': (
- 'less/kpi.dashboard.less',
+ 'sumo/less/kpi.dashboard.less',
),
- 'output_filename': 'kpi.dashboard-min.css'
+ 'output_filename': 'build/kpi.dashboard-min.css'
},
'locale-switcher': {
'source_filenames': (
- 'less/locale-switcher.less',
+ 'sumo/less/locale-switcher.less',
),
- 'output_filename': 'locale-switcher-min.css'
+ 'output_filename': 'build/locale-switcher-min.css'
},
'mobile-locale-switcher': {
'source_filenames': (
- 'less/mobile/locales.less',
+ 'sumo/less/mobile/locales.less',
),
- 'output_filename': 'mobile-locale-switcher-min.css'
+ 'output_filename': 'build/mobile-locale-switcher-min.css'
},
'kbdashboards': {
'source_filenames': (
- 'less/kbdashboards.less',
+ 'sumo/less/kbdashboards.less',
),
- 'output_filename': 'kbdashboards-min.css'
+ 'output_filename': 'build/kbdashboards-min.css'
},
'landings-get-involved': {
'source_filenames': (
- 'less/landings/get-involved.less',
+ 'sumo/less/landings/get-involved.less',
),
- 'output_filename': 'landings-get-involved-min.css'
+ 'output_filename': 'build/landings-get-involved-min.css'
},
'mobile-landings-get-involved': {
'source_filenames': (
- 'less/mobile/landings/get-involved.less',
+ 'sumo/less/mobile/landings/get-involved.less',
),
- 'output_filename': 'mobile-landings-get-involved-min.css'
+ 'output_filename': 'build/mobile-landings-get-involved-min.css'
},
'badges': {
'source_filenames': (
- 'less/badges.less',
+ 'sumo/less/badges.less',
),
- 'output_filename': 'badges-min.css'
+ 'output_filename': 'build/badges-min.css'
}
}
PIPELINE_JS = {
'common': {
'source_filenames': (
- 'js/i18n.js',
+ 'sumo/js/i18n.js',
'underscore/underscore.js',
'moment/moment.js',
'jquery/jquery.min.js',
'jquery/jquery-migrate.js',
- 'js/libs/jquery.cookie.js',
- 'js/libs/jquery.placeholder.js',
- 'js/templates/macros.js',
- 'js/templates/search-results-list.js',
- 'js/templates/search-results.js',
+ 'sumo/js/libs/jquery.cookie.js',
+ 'sumo/js/libs/jquery.placeholder.js',
+ 'sumo/js/templates/macros.js',
+ 'sumo/js/templates/search-results-list.js',
+ 'sumo/js/templates/search-results.js',
'nunjucks/browser/nunjucks-slim.js',
- 'js/nunjucks.js',
- 'js/cached_xhr.js',
- 'js/search_utils.js',
- 'js/browserdetect.js',
- 'js/libs/uitour.js',
- 'js/kbox.js',
- 'js/main.js',
- 'js/format.js',
+ 'sumo/js/nunjucks.js',
+ 'sumo/js/cached_xhr.js',
+ 'sumo/js/search_utils.js',
+ 'sumo/js/browserdetect.js',
+ 'sumo/js/libs/uitour.js',
+ 'sumo/js/kbox.js',
+ 'sumo/js/main.js',
+ 'sumo/js/format.js',
'modernizr/modernizr.js',
- 'js/geoip-locale.js',
+ 'sumo/js/geoip-locale.js',
'mailcheck/src/mailcheck.js',
- 'js/ui.js',
- 'js/analytics.js',
- 'js/surveygizmo.js',
- 'js/instant_search.js',
+ 'sumo/js/ui.js',
+ 'sumo/js/analytics.js',
+ 'sumo/js/surveygizmo.js',
+ 'sumo/js/instant_search.js',
),
- 'output_filename': 'common-min.js'
+ 'output_filename': 'build/common-min.js'
},
'community': {
'source_filenames': (
'jquery/jquery.min.js',
'jquery/jquery-migrate.js',
- 'js/community.js',
- 'js/select.js',
+ 'community/js/community.js',
+ 'community/js/select.js',
),
- 'output_filename': 'community-min.js'
+ 'output_filename': 'build/community-min.js'
},
'community-new-questions': {
'source_filenames': (
@@ -307,9 +307,9 @@
'react/react.min.js',
# 'react/react.js',
'pikaday/pikaday.js',
- 'js/community-questions.browserify.js',
+ 'community/js/community-questions.browserify.js',
),
- 'output_filename': 'community-questions-min.js'
+ 'output_filename': 'build/community-questions-min.js'
},
'community-new-l10n': {
'source_filenames': (
@@ -321,30 +321,30 @@
'react/react.min.js',
# 'react/react.js',
'pikaday/pikaday.js',
- 'js/community-l10n.browserify.js',
+ 'community/js/community-l10n.browserify.js',
),
- 'output_filename': 'community-l10n-min.js'
+ 'output_filename': 'build/community-l10n-min.js'
},
'mobile-common': {
'source_filenames': (
- 'js/i18n.js',
+ 'sumo/js/i18n.js',
'underscore/underscore.js',
'jquery/jquery.min.js',
'jquery/jquery-migrate.js',
'modernizr/modernizr.js',
- 'js/browserdetect.js',
- 'js/aaq.js',
- 'js/mobile/ui.js',
- 'js/analytics.js',
+ 'sumo/js/browserdetect.js',
+ 'sumo/js/aaq.js',
+ 'sumo/js/mobile/ui.js',
+ 'sumo/js/analytics.js',
),
- 'output_filename': 'mobile-common-min.js'
+ 'output_filename': 'build/mobile-common-min.js'
},
'ie6-8': {
'source_filenames': (
'nwmatcher/src/nwmatcher.js',
- 'js/libs/selectivizr-1.0.2.js',
+ 'sumo/js/libs/selectivizr-1.0.2.js',
),
- 'output_filename': 'ie6-8-min.js'
+ 'output_filename': 'build/ie6-8-min.js'
},
'jqueryui': {
'source_filenames': (
@@ -360,216 +360,216 @@
'jquery-ui/ui/jquery.ui.slider.js',
'jquery-ui/ui/jquery.ui.tabs.js',
),
- 'output_filename': 'jqueryui-min.js'
+ 'output_filename': 'build/jqueryui-min.js'
},
'questions': {
'source_filenames': (
- 'js/markup.js',
- 'js/ajaxvote.js',
- 'js/ajaxpreview.js',
- 'js/remote.js',
- 'js/aaq.js',
- 'js/questions.js',
- 'js/libs/jquery.tokeninput.js',
- 'js/tags.filter.js',
- 'js/tags.js',
- 'js/reportabuse.js',
- 'js/questions.metrics.js',
- 'js/libs/jquery.ajaxupload.js',
- 'js/upload.js',
- ),
- 'output_filename': 'questions-min.js'
+ 'sumo/js/markup.js',
+ 'sumo/js/ajaxvote.js',
+ 'sumo/js/ajaxpreview.js',
+ 'sumo/js/remote.js',
+ 'sumo/js/aaq.js',
+ 'sumo/js/questions.js',
+ 'sumo/js/libs/jquery.tokeninput.js',
+ 'sumo/js/tags.filter.js',
+ 'sumo/js/tags.js',
+ 'sumo/js/reportabuse.js',
+ 'sumo/js/questions.metrics.js',
+ 'sumo/js/libs/jquery.ajaxupload.js',
+ 'sumo/js/upload.js',
+ ),
+ 'output_filename': 'build/questions-min.js'
},
'questions.metrics': {
'source_filenames': (
- 'js/questions.metrics-dashboard.js',
+ 'sumo/js/questions.metrics-dashboard.js',
),
- 'output_filename': 'questions.metrics-min.js'
+ 'output_filename': 'build/questions.metrics-min.js'
},
'mobile-questions': {
'source_filenames': (
- 'js/mobile/questions.js',
- 'js/questions.metrics.js',
+ 'sumo/js/mobile/questions.js',
+ 'sumo/js/questions.metrics.js',
),
- 'output_filename': 'mobile-questions-min.js'
+ 'output_filename': 'build/mobile-questions-min.js'
},
'mobile-aaq': {
'source_filenames': (
- 'js/aaq.js',
- 'js/mobile/aaq.js',
+ 'sumo/js/aaq.js',
+ 'sumo/js/mobile/aaq.js',
),
- 'output_filename': 'mobile-aaq-min.js'
+ 'output_filename': 'build/mobile-aaq-min.js'
},
'products': {
'source_filenames': (
- 'js/compare_versions.js',
- 'js/products.js',
+ 'sumo/js/compare_versions.js',
+ 'sumo/js/products.js',
),
- 'output_filename': 'products-min.js'
+ 'output_filename': 'build/products-min.js'
},
'search': {
'source_filenames': (
- 'js/search.js',
+ 'sumo/js/search.js',
),
- 'output_filename': 'search-min.js'
+ 'output_filename': 'build/search-min.js'
},
'forums': {
'source_filenames': (
- 'js/markup.js',
- 'js/ajaxpreview.js',
- 'js/forums.js',
- 'js/reportabuse.js',
+ 'sumo/js/markup.js',
+ 'sumo/js/ajaxpreview.js',
+ 'sumo/js/forums.js',
+ 'sumo/js/reportabuse.js',
),
- 'output_filename': 'forums-min.js'
+ 'output_filename': 'build/forums-min.js'
},
'gallery': {
'source_filenames': (
- 'js/libs/jquery.ajaxupload.js',
- 'js/gallery.js',
+ 'sumo/js/libs/jquery.ajaxupload.js',
+ 'sumo/js/gallery.js',
),
- 'output_filename': 'gallery-min.js'
+ 'output_filename': 'build/gallery-min.js'
},
'wiki': {
'source_filenames': (
- 'js/markup.js',
- 'js/libs/django/urlify.js',
- 'js/libs/django/prepopulate.js',
- 'js/libs/swfobject.js',
- 'js/libs/jquery.lazyload.js',
- 'js/libs/jquery.tokeninput.js',
- 'js/users.autocomplete.js',
- 'js/screencast.js',
- 'js/showfor.js',
- 'js/ajaxvote.js',
- 'js/ajaxpreview.js',
- 'js/wiki.js',
- 'js/tags.js',
- 'js/dashboards.js',
- 'js/editable.js',
- 'js/wiki.metrics.js',
- 'js/templates/wiki-related-doc.js',
- 'js/templates/wiki-search-results.js',
- 'js/wiki_search.js',
- ),
- 'output_filename': 'wiki-min.js'
+ 'sumo/js/markup.js',
+ 'sumo/js/libs/django/urlify.js',
+ 'sumo/js/libs/django/prepopulate.js',
+ 'sumo/js/libs/swfobject.js',
+ 'sumo/js/libs/jquery.lazyload.js',
+ 'sumo/js/libs/jquery.tokeninput.js',
+ 'sumo/js/users.autocomplete.js',
+ 'sumo/js/screencast.js',
+ 'sumo/js/showfor.js',
+ 'sumo/js/ajaxvote.js',
+ 'sumo/js/ajaxpreview.js',
+ 'sumo/js/wiki.js',
+ 'sumo/js/tags.js',
+ 'sumo/js/dashboards.js',
+ 'sumo/js/editable.js',
+ 'sumo/js/wiki.metrics.js',
+ 'sumo/js/templates/wiki-related-doc.js',
+ 'sumo/js/templates/wiki-search-results.js',
+ 'sumo/js/wiki_search.js',
+ ),
+ 'output_filename': 'build/wiki-min.js'
},
'rickshaw': {
'source_filenames': (
'd3/d3.js',
- 'js/libs/d3.layout.min.js',
- 'js/libs/rickshaw.js',
- 'js/rickshaw_utils.js',
+ 'sumo/js/libs/d3.layout.min.js',
+ 'sumo/js/libs/rickshaw.js',
+ 'sumo/js/rickshaw_utils.js',
),
- 'output_filename': 'rickshaw-min.js'
+ 'output_filename': 'build/rickshaw-min.js'
},
'mobile-wiki': {
'source_filenames': (
'underscore/underscore.js',
- 'js/libs/jquery.cookie.js',
- 'js/libs/jquery.lazyload.js',
- 'js/browserdetect.js',
- 'js/showfor.js',
- 'js/ajaxform.js',
- 'js/mobile/wiki.js',
- 'js/wiki.metrics.js',
+ 'sumo/js/libs/jquery.cookie.js',
+ 'sumo/js/libs/jquery.lazyload.js',
+ 'sumo/js/browserdetect.js',
+ 'sumo/js/showfor.js',
+ 'sumo/js/ajaxform.js',
+ 'sumo/js/mobile/wiki.js',
+ 'sumo/js/wiki.metrics.js',
),
- 'output_filename': 'mobile-wiki-min.js'
+ 'output_filename': 'build/mobile-wiki-min.js'
},
'mobile-wiki-minimal': {
'source_filenames': (
- 'js/i18n.js',
+ 'sumo/js/i18n.js',
'underscore/underscore.js',
'jquery/jquery.min.js',
'jquery/jquery-migrate.js',
'modernizr/modernizr.js',
- 'js/browserdetect.js',
- 'js/mobile/ui.js',
- 'js/analytics.js',
- 'js/libs/jquery.cookie.js',
- 'js/libs/jquery.lazyload.js',
- 'js/showfor.js',
- 'js/ajaxform.js',
- 'js/mobile/wiki.js',
- 'js/wiki.metrics.js',
- ),
- 'output_filename': 'mobile-wiki-minimal-min.js'
+ 'sumo/js/browserdetect.js',
+ 'sumo/js/mobile/ui.js',
+ 'sumo/js/analytics.js',
+ 'sumo/js/libs/jquery.cookie.js',
+ 'sumo/js/libs/jquery.lazyload.js',
+ 'sumo/js/showfor.js',
+ 'sumo/js/ajaxform.js',
+ 'sumo/js/mobile/wiki.js',
+ 'sumo/js/wiki.metrics.js',
+ ),
+ 'output_filename': 'build/mobile-wiki-minimal-min.js'
},
'wiki.history': {
'source_filenames': (
- 'js/historycharts.js',
+ 'sumo/js/historycharts.js',
),
- 'output_filename': 'wiki.history-min.js'
+ 'output_filename': 'build/wiki.history-min.js'
},
'wiki.diff': {
'source_filenames': (
- 'js/libs/diff_match_patch_uncompressed.js',
- 'js/diff.js',
+ 'sumo/js/libs/diff_match_patch_uncompressed.js',
+ 'sumo/js/diff.js',
),
- 'output_filename': 'wiki.diff-min.js'
+ 'output_filename': 'build/wiki.diff-min.js'
},
'wiki.editor': {
'source_filenames': (
'codemirror/lib/codemirror.js',
'codemirror/addon/mode/simple.js',
- 'js/codemirror.sumo-mode.js',
+ 'sumo/js/codemirror.sumo-mode.js',
),
- 'output_filename': 'wiki.editor-min.js'
+ 'output_filename': 'build/wiki.editor-min.js'
},
'wiki.dashboard': {
'source_filenames': (
- 'js/wiki.dashboard.js',
+ 'sumo/js/wiki.dashboard.js',
),
- 'output_filename': 'wiki.dashboard-min.js'
+ 'output_filename': 'build/wiki.dashboard-min.js'
},
'customercare': {
'source_filenames': (
- 'js/libs/jquery.cookie.js',
- 'js/libs/jquery.bullseye-1.0.min.js',
- 'js/libs/twitter-text.js',
- 'js/customercare.js',
- 'js/users.js',
+ 'sumo/js/libs/jquery.cookie.js',
+ 'sumo/js/libs/jquery.bullseye-1.0.min.js',
+ 'sumo/js/libs/twitter-text.js',
+ 'sumo/js/customercare.js',
+ 'sumo/js/users.js',
),
- 'output_filename': 'customercare-min.js'
+ 'output_filename': 'build/customercare-min.js'
},
'users': {
'source_filenames': (
- 'js/users.js',
- 'js/reportabuse.js',
+ 'sumo/js/users.js',
+ 'sumo/js/reportabuse.js',
),
- 'output_filename': 'users-min.js'
+ 'output_filename': 'build/users-min.js'
},
'messages': {
'source_filenames': (
- 'js/markup.js',
- 'js/libs/jquery.autoresize.js',
- 'js/libs/jquery.tokeninput.js',
- 'js/users.autocomplete.js',
- 'js/ajaxpreview.js',
- 'js/messages.js',
+ 'sumo/js/markup.js',
+ 'sumo/js/libs/jquery.autoresize.js',
+ 'sumo/js/libs/jquery.tokeninput.js',
+ 'sumo/js/users.autocomplete.js',
+ 'sumo/js/ajaxpreview.js',
+ 'sumo/js/messages.js',
),
- 'output_filename': 'messages-min.js'
+ 'output_filename': 'build/messages-min.js'
},
'mobile-messages': {
'source_filenames': (
- 'js/libs/jquery.tokeninput.js',
- 'js/users.autocomplete.js',
+ 'sumo/js/libs/jquery.tokeninput.js',
+ 'sumo/js/users.autocomplete.js',
),
- 'output_filename': 'mobile-messages-min.js'
+ 'output_filename': 'build/mobile-messages-min.js'
},
'groups': {
'source_filenames': (
- 'js/libs/jquery.tokeninput.js',
- 'js/users.autocomplete.js',
- 'js/markup.js',
- 'js/groups.js',
- 'js/editable.js',
+ 'sumo/js/libs/jquery.tokeninput.js',
+ 'sumo/js/users.autocomplete.js',
+ 'sumo/js/markup.js',
+ 'sumo/js/groups.js',
+ 'sumo/js/editable.js',
),
- 'output_filename': 'groups-min.js'
+ 'output_filename': 'build/groups-min.js'
},
'kpi.dashboard': {
'source_filenames': (
- 'js/kpi.dashboard.js',
+ 'sumo/js/kpi.dashboard.js',
),
- 'output_filename': 'kpi.dashboard-min.js'
+ 'output_filename': 'build/kpi.dashboard-min.js'
}
}
View
4 kitsune/customercare/templates/customercare/landing.html
@@ -41,7 +41,7 @@
</div>
{% endif %}
<div id="tweet-tools">
- <img id="refresh-busy" src="{{ STATIC_URL }}img/customercare/spinner.gif" alt="{{ _('Loading') }}"/>
+ <img id="refresh-busy" src="{{ STATIC_URL }}sumo/img/customercare/spinner.gif" alt="{{ _('Loading') }}"/>
<select id="show">
{% for value, content in filters.iteritems() %}
<option value="{{ value }}" {% if value == filter %}selected="selected"{% endif %}>{{ content }}</option>
@@ -97,7 +97,7 @@
</div>
<div id="infinite-scroll">
- <img id="scroll-busy" src="{{ STATIC_URL }}img/customercare/spinner.gif" alt="{{ _('Loading') }}" />
+ <img id="scroll-busy" src="{{ STATIC_URL }}sumo/img/customercare/spinner.gif" alt="{{ _('Loading') }}" />
</div>
</div>
View
8 kitsune/customercare/templates/customercare/reply_modal.html
@@ -2,8 +2,8 @@
<div id="reply-container">
<div id="initial-tweet">
- <a href="" class="avatar" target="_blank"><img src="{{ STATIC_URL }}img/product_placeholder.png" alt="" /></a>
- <img src="{{ STATIC_URL }}img/customercare/initial-tweet-arrow.png" alt="" id="arrow" />
+ <a href="" class="avatar" target="_blank"><img src="{{ STATIC_URL }}products/img/product_placeholder.png" alt="" /></a>
+ <img src="{{ STATIC_URL }}sumo/img/customercare/initial-tweet-arrow.png" alt="" id="arrow" />
<span class="box">
<a href="" class="twittername" target="_blank"></a>
<a href="" class="permalink" target="_blank">
@@ -47,13 +47,13 @@
<form action="{{ url('customercare.twitter_post') }}" method="POST">
{{ csrf() }}
<div class="inner-container">
- <img src="{{ STATIC_URL }}img/customercare/reply-arrow.png" alt="{{ _('Reply') }}" id="reply-arrow" />
+ <img src="{{ STATIC_URL }}sumo/img/customercare/reply-arrow.png" alt="{{ _('Reply') }}" id="reply-arrow" />
<textarea id="reply-message"></textarea>
</div>
<span id="submit-message">{{ _('Your message was sent!') }}</span>
<span id="error-message"></span>
- <button type="submit" class="submitButton" id="submit">{{ _('Submit') }} <img id="submit-busy" src="{{ STATIC_URL }}img/customercare/spinner.gif" alt="{{ _('Loading') }}" /></button>
+ <button type="submit" class="submitButton" id="submit">{{ _('Submit') }} <img id="submit-busy" src="{{ STATIC_URL }}sumo/img/customercare/spinner.gif" alt="{{ _('Loading') }}" /></button>
</form>
</div>
</div>
View
12 kitsune/dashboards/templates/dashboards/includes/macros.html
@@ -160,7 +160,7 @@
product=None) %}
<div id="doc-watch">
<button class="btn btn-submit popup-trigger" type="submit">
- <img src="{{ STATIC_URL }}img/blank.png" alt="" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" alt="" />
{{ _('Subscribe...', 'l10n dashboard') }}
</button>
<form class="popup-menu" action="" method="POST">
@@ -208,26 +208,26 @@
{% macro product_choice_list(products, current, url_) %}
<div class="product-picker-dd">
<div class="current">
- <span class="dd-btn"><img src="{{ STATIC_URL }}img/dd-arrow.png" /></span>
+ <span class="dd-btn"><img src="{{ STATIC_URL }}sumo/img/dd-arrow.png" /></span>
{% if current == None %}
- <img src="{{ STATIC_URL }}img/blank.png" class="logo-sprite small sumo">
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" class="logo-sprite small sumo">
<span>{{ _('All Products') }}</span>
{% else %}
- <img src="{{ STATIC_URL }}img/blank.png" class="logo-sprite small" style="{% if current.image %}background-image: url({{ current.sprite_url(retina=False) }}); background-position: -50px -{{ 50 + (current.image_offset * 148) }}px;{% else %}background-image: url({{ current.image_url }}){% endif %}" alt="" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" class="logo-sprite small" style="{% if current.image %}background-image: url({{ current.sprite_url(retina=False) }}); background-position: -50px -{{ 50 + (current.image_offset * 148) }}px;{% else %}background-image: url({{ current.image_url }}){% endif %}" alt="" />
<span>{{ _(current.title, 'DB: products.Product.title') }}</span>
{% endif %}
</div>
<ul>
<li {{ current|class_selected(None) }}>
<a href="{{ url_ }}">
- <img src="{{ STATIC_URL }}img/blank.png" class="logo-sprite small sumo">
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" class="logo-sprite small sumo">
<span>{{ _('All Products') }}</span>
</a>
</li>
{% for p in products %}
<li {{ current|class_selected(p) }}>
<a href="{{ url_|urlparams(product=p.slug) }}">
- <img src="{{ STATIC_URL }}img/blank.png" class="logo-sprite small" style="{% if p.image %}background-image: url({{ p.sprite_url(retina=False) }}); background-position: -50px -{{ 50 + (p.image_offset * 148) }}px;{% else %}background-image: url({{ p.image_url }}){% endif %}" alt="" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" class="logo-sprite small" style="{% if p.image %}background-image: url({{ p.sprite_url(retina=False) }}); background-position: -50px -{{ 50 + (p.image_offset * 148) }}px;{% else %}background-image: url({{ p.image_url }}){% endif %}" alt="" />
<span>{{ _(p.title, 'DB: products.Product.title') }}</span>
</a>
</li>
View
4 kitsune/dashboards/templates/dashboards/localization.html
@@ -34,7 +34,7 @@
{% if user_can_announce %}
<div id="create-announcement">
<button class="btn">
- <img src="{{ STATIC_URL }}img/blank.png" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" />
{{ _('Create announcement') }}
</button>
<span class="success">{{ _('Created successfully') }}</span>
@@ -47,7 +47,7 @@
<button type="submit" class="btn btn-submit" value="Submit">
{{ _('Create') }}
</button>
- <img src="{{ STATIC_URL }}img/wait-trans.gif" class="spinner" />
+ <img src="{{ STATIC_URL }}sumo/img/wait-trans.gif" class="spinner" />
</li>
</ul>
</form>
View
4 kitsune/forums/templates/forums/includes/forum_macros.html
@@ -9,10 +9,10 @@
<li class="cf">
<div class="type">
{% if thread.is_locked %}
- <img src="{{ STATIC_URL }}img/blank.png" alt="{{ _('Locked', 'thread_type') }}" title="{{ _('Locked', 'thread_type') }}" class="icon-locked" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" alt="{{ _('Locked', 'thread_type') }}" title="{{ _('Locked', 'thread_type') }}" class="icon-locked" />
{% endif %}
{% if thread.is_sticky %}
- <img src="{{ STATIC_URL }}img/blank.png" alt="{{ _('Sticky', 'thread_type') }}" title="{{ _('Sticky', 'thread_type') }}" class="icon-sticky" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" alt="{{ _('Sticky', 'thread_type') }}" title="{{ _('Sticky', 'thread_type') }}" class="icon-sticky" />
{% endif %}
</div>
<div class="title"><a href="{{ url('forums.posts', forum_slug=_forum.slug, thread_id=thread.id)|urlparams(last=thread.last_post.id) }}">{{ thread.title }}</a></div>
View
2 kitsune/forums/templates/forums/posts.html
@@ -82,7 +82,7 @@ <h1 class="nomargin">{{ thread.title }}</h1>
{% set watch = _('Watch this thread') %}
<input type="hidden" name="watch" value="yes" />
{% endif %}
- <button type="submit" title="{{ watch }}" class="btn" id="watch-thread-toggle"><img src="{{ STATIC_URL }}img/blank.png" alt="" /> {{ watch }}</button>
+ <button type="submit" title="{{ watch }}" class="btn" id="watch-thread-toggle"><img src="{{ STATIC_URL }}sumo/img/blank.png" alt="" /> {{ watch }}</button>
</form>
{% endif %}
View
2 kitsune/forums/templates/forums/threads.html
@@ -31,7 +31,7 @@
{% set watch = _('Watch this forum') %}
<input type="hidden" name="watch" value="yes" />
{% endif %}
- <button type="submit" title="{{ watch }}" class="btn" id="watch-forum-toggle"><img src="{{ STATIC_URL }}img/blank.png" alt="" /> {{ watch }}</button>
+ <button type="submit" title="{{ watch }}" class="btn" id="watch-forum-toggle"><img src="{{ STATIC_URL }}sumo/img/blank.png" alt="" /> {{ watch }}</button>
</form>
{% endif %}
</div>
View
2 kitsune/kadmin/templates/kadmin/base.html
@@ -2,7 +2,7 @@
{% block extrastyle %}
{{ block.super }}
- <link rel="stylesheet" media="screen,projection,tv" href="{{ STATIC_URL }}css/kadmin.css" />
+ <link rel="stylesheet" media="screen,projection,tv" href="{{ STATIC_URL }}sumo/css/kadmin.css" />
{% endblock %}
{% block breadcrumbs %}
View
2 kitsune/kbforums/templates/kbforums/discussions.html
@@ -18,7 +18,7 @@
{% set watch = _('Watch this locale') %}
<input type="hidden" name="watch" value="yes">
{% endif %}
- <button type="submit" alt="{{ watch }}" title="{{ watch }}" class="btn" id="watch-forum-toggle"><img src="{{ STATIC_URL }}img/blank.png" alt="" /> {{ watch }}</button>
+ <button type="submit" alt="{{ watch }}" title="{{ watch }}" class="btn" id="watch-forum-toggle"><img src="{{ STATIC_URL }}sumo/img/blank.png" alt="" /> {{ watch }}</button>
</form>
{% endif %}
<ol class="threads-columns cf {% if not desc_toggle %}desc{% endif %}">
View
2 kitsune/kbforums/templates/kbforums/posts.html
@@ -58,7 +58,7 @@
{% set watch = _('Watch this thread') %}
<input type="hidden" name="watch" value="yes" />
{% endif %}
- <button type="submit" title="{{ watch }}" class="btn" id="watch-thread-toggle"><img src="{{ STATIC_URL }}img/blank.png" alt="" /> {{ watch }}</button>
+ <button type="submit" title="{{ watch }}" class="btn" id="watch-thread-toggle"><img src="{{ STATIC_URL }}sumo/img/blank.png" alt="" /> {{ watch }}</button>
</form>
{% endif %}
View
6 kitsune/kbforums/templates/kbforums/threads.html
@@ -22,7 +22,7 @@
{% set watch = _('Watch this forum') %}
<input type="hidden" name="watch" value="yes" />
{% endif %}
- <button type="submit" alt="{{ watch }}" title="{{ watch }}" class="btn" id="watch-forum-toggle"><img src="{{ STATIC_URL }}img/blank.png" alt="" /> {{ watch }}</button>
+ <button type="submit" alt="{{ watch }}" title="{{ watch }}" class="btn" id="watch-forum-toggle"><img src="{{ STATIC_URL }}sumo/img/blank.png" alt="" /> {{ watch }}</button>
</form>
{% endif %}
</div>
@@ -39,10 +39,10 @@
<li class="cf">
<div class="type">
{% if thread.is_locked %}
- <img src="{{ STATIC_URL }}img/blank.png" alt="{{ _('Locked', 'thread_type') }}" title="{{ _('Locked', 'thread_type') }}" class="icon-locked" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" alt="{{ _('Locked', 'thread_type') }}" title="{{ _('Locked', 'thread_type') }}" class="icon-locked" />
{% endif %}
{% if thread.is_sticky %}
- <img src="{{ STATIC_URL }}img/blank.png" alt="{{ _('Sticky', 'thread_type') }}" title="{{ _('Sticky', 'thread_type') }}" class="icon-sticky" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" alt="{{ _('Sticky', 'thread_type') }}" title="{{ _('Sticky', 'thread_type') }}" class="icon-sticky" />
{% endif %}
</div>
<div class="title"><a href="{{ url('wiki.discuss.posts', document.slug, thread.id) }}">{{ thread.title }}</a></div>
View
2 kitsune/landings/templates/landings/get-involved-aoa.html
@@ -59,7 +59,7 @@
</div>
</div>
<div class="grid_6 gi-visual">
- <div><img src="{{ STATIC_URL }}img/gi-visual-aoa.png?v=1" alt=""></div>
+ <div><img src="{{ STATIC_URL }}sumo/img/gi-visual-aoa.png?v=1" alt=""></div>
{{ _('1 tweet can save 1 day') }}
</div>
</div>
View
2 kitsune/landings/templates/landings/get-involved-kb.html
@@ -55,7 +55,7 @@
</div>
</div>
<div class="grid_6 gi-visual">
- <div><img src="{{ STATIC_URL }}img/gi-visual-kb.png?v=1" alt=""></div>
+ <div><img src="{{ STATIC_URL }}sumo/img/gi-visual-kb.png?v=1" alt=""></div>
{{ _('1 article can be viewed by 400 million users and translated into 70+ languages') }}
</div>
</div>
View
2 kitsune/landings/templates/landings/get-involved-l10n.html
@@ -50,7 +50,7 @@
<div>{{ _('Just edit articles in your language!') }}</div>
</div>
<div class="grid_6 gi-visual">
- <div><img src="{{ STATIC_URL }}img/gi-visual-l10n.png?v=1" alt=""></div>
+ <div><img src="{{ STATIC_URL }}sumo/img/gi-visual-l10n.png?v=1" alt=""></div>
{{ _("Translating 1 article can help 1,000's of users in your language") }}
</div>
</div>
View
2 kitsune/landings/templates/landings/get-involved-questions.html
@@ -59,7 +59,7 @@
</div>
</div>
<div class="grid_6 gi-visual">
- <div><img src="{{ STATIC_URL }}img/gi-visual-questions.png?v=1" alt=""></div>
+ <div><img src="{{ STATIC_URL }}sumo/img/gi-visual-questions.png?v=1" alt=""></div>
{{ _('Solving 1 issue helps up to 1,000 users a day') }}
</div>
</div>
View
4 kitsune/landings/templates/landings/get-involved.html
@@ -23,7 +23,7 @@
you can do it from the comfort of your couch!
{% endtrans %}
</div>
- <img class="hero-butler" src="{{ STATIC_URL }}img/gi-hero-butler.png" alt="">
+ <img class="hero-butler" src="{{ STATIC_URL }}sumo/img/gi-hero-butler.png" alt="">
</div>
</div>
@@ -66,7 +66,7 @@
adventure!
{% endtrans %}
</div>
- <div class="grid_8"><img class="moz-heroes" src="{{ STATIC_URL }}img/moz-heroes.jpg" alt=""></div>
+ <div class="grid_8"><img class="moz-heroes" src="{{ STATIC_URL }}sumo/img/moz-heroes.jpg" alt=""></div>
</div>
<div class="row cf">
View
4 kitsune/landings/templates/landings/mobile/get-involved-aoa.html
@@ -9,7 +9,7 @@
<div class="padded">
<h3>{{ _('Join our Army of Awesome') }}</h3>
<div class="centered">
- <img class="smart-width" src="{{ STATIC_URL }}img/gi-hero-aoa.png" alt="">
+ <img class="smart-width" src="{{ STATIC_URL }}sumo/img/gi-hero-aoa.png" alt="">
</div>
<h3>{{ _('Love Firefox? Love Twitter?') }}</h3>
<p>
@@ -26,7 +26,7 @@
</p>
<div class="centered">
- <img class="smart-width" src="{{ STATIC_URL }}img/gi-visual-aoa.png" alt="">
+ <img class="smart-width" src="{{ STATIC_URL }}sumo/img/gi-visual-aoa.png" alt="">
</div>
<h4>{{ _('How it works') }}</h4>
View
4 kitsune/landings/templates/landings/mobile/get-involved-kb.html
@@ -9,7 +9,7 @@
<div class="padded">
<h3>{{ _('Help us write help articles!') }}</h3>
<div class="centered">
- <img class="smart-width" src="{{ STATIC_URL }}img/gi-hero-kb.png" alt="">
+ <img class="smart-width" src="{{ STATIC_URL }}sumo/img/gi-hero-kb.png" alt="">
</div>
<h3>{{ _('Share your wisdom with the world.') }}</h3>
<p>
@@ -22,7 +22,7 @@
</p>
<div class="centered">
- <img class="smart-width" src="{{ STATIC_URL }}img/gi-visual-kb.png" alt="">
+ <img class="smart-width" src="{{ STATIC_URL }}sumo/img/gi-visual-kb.png" alt="">
</div>
<h4>{{ _('How it works') }}</h4>
View
4 kitsune/landings/templates/landings/mobile/get-involved-l10n.html
@@ -9,7 +9,7 @@
<div class="padded">
<h3>{{ _('Translate help articles!') }}</h3>
<div class="centered">
- <img class="smart-width" src="{{ STATIC_URL }}img/gi-hero-l10n.png" alt="">
+ <img class="smart-width" src="{{ STATIC_URL }}sumo/img/gi-hero-l10n.png" alt="">
</div>
<h3>{{ _("Let's make Mozilla Support speak your language!") }}</h3>
<p>
@@ -21,7 +21,7 @@
</p>
<div class="centered">
- <img class="smart-width" src="{{ STATIC_URL }}img/gi-visual-l10n.png" alt="">
+ <img class="smart-width" src="{{ STATIC_URL }}sumo/img/gi-visual-l10n.png" alt="">
</div>
<h4>{{ _('How it works') }}</h4>
View
4 kitsune/landings/templates/landings/mobile/get-involved-questions.html
@@ -9,7 +9,7 @@
<div class="padded">
<h3>{{ _('Answer questions in the forum') }}</h3>
<div class="centered">
- <img class="smart-width" src="{{ STATIC_URL }}img/gi-hero-questions.png" alt="">
+ <img class="smart-width" src="{{ STATIC_URL }}sumo/img/gi-hero-questions.png" alt="">
</div>
<h3>{{ _('Where all the action happens') }}</h3>
<p>
@@ -22,7 +22,7 @@
</p>
<div class="centered">
- <img class="smart-width" src="{{ STATIC_URL }}img/gi-visual-questions.png" alt="">
+ <img class="smart-width" src="{{ STATIC_URL }}sumo/img/gi-visual-questions.png" alt="">
</div>
<h4>{{ _('How it works') }}</h4>
View
4 kitsune/landings/templates/landings/mobile/get-involved.html
@@ -10,7 +10,7 @@
<h3>{{ _('Save the world from the comfort of your couch') }}</h3>
<div class="centered">
- <img class="smart-width" src="{{ STATIC_URL }}img/gi-hero-butler.png" alt="">
+ <img class="smart-width" src="{{ STATIC_URL }}sumo/img/gi-hero-butler.png" alt="">
</div>
<h4>{{ _('We need your help!') }}</h4>
@@ -62,7 +62,7 @@
<div class="padded">
<div class="centered about-banner">
- <img class="smart-width" src="{{ STATIC_URL }}img/moz-heroes.jpg" alt="">
+ <img class="smart-width" src="{{ STATIC_URL }}sumo/img/moz-heroes.jpg" alt="">
</div>
<h4>{{ _('About Us') }}</h4>
View
6 kitsune/products/models.py
@@ -48,8 +48,7 @@ def __unicode__(self):
def image_url(self):
if self.image:
return self.image.url
- return os.path.join(
- settings.STATIC_URL, 'img', 'product_placeholder.png')
+ return os.path.join(settings.STATIC_URL, 'products', 'img', 'product_placeholder.png')
def sprite_url(self, retina=True):
fn = 'logo-sprite-2x.png' if retina else 'logo-sprite.png'
@@ -147,8 +146,7 @@ def __unicode__(self):
def image_url(self):
if self.image:
return self.image.url
- return os.path.join(
- settings.STATIC_URL, 'img', 'topic_placeholder.png')
+ return os.path.join(settings.STATIC_URL, 'products', 'img', 'topic_placeholder.png')
@property
def path(self):
View
4 kitsune/products/templates/products/documents.html
@@ -20,7 +20,7 @@
<div class="grid_12">
<h1 class="product-title cf">
{% set prod_url = url('products.product', slug=product.slug) %}
- <img src="{{ STATIC_URL }}img/blank.png" alt="" class="logo-sprite" style="background-image: url('{{ product.image_url }}');" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" alt="" class="logo-sprite" style="background-image: url('{{ product.image_url }}');" />
<a href="{{ prod_url }}">{{ _(product.title, 'DB: products.Product.title') }}</a>
</h1>
</div>
@@ -29,7 +29,7 @@ <h1 class="product-title cf">
</aside>
<div class="grid_9">
<article id="document-list">
- {% if topic.image %}<img src="{{ STATIC_URL }}img/blank.png" alt="" class="logo-sprite" style="background-image: url('{{ topic.image_url }}');" />{% endif %}
+ {% if topic.image %}<img src="{{ STATIC_URL }}sumo/img/blank.png" alt="" class="logo-sprite" style="background-image: url('{{ topic.image_url }}');" />{% endif %}
<h1 class="topic-title {% if topic.image %}has-image{% endif %} {% if not subtopic %}cf{% endif %}">
{% if subtopic %}
<a href="{{ url('products.documents', product_slug=product.slug, topic_slug=topic.slug) }}">
View
2 kitsune/products/templates/products/includes/product_macros.html
@@ -8,7 +8,7 @@
{% set prod_url = url('products.product', slug=product.slug) %}
{% endif %}
<a class="cf" href="{{ prod_url }}">
- <img src="{{ STATIC_URL }}img/blank.png" class="logo-sprite" style="{% if product.image and product.image_offset %}background-image: url({{ product.sprite_url() }}); background-position: -100px -{{ 100 + (product.image_offset * 296) }}px;{% else %}background-image: url({{ product.image_url }}){% endif %}" alt="" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" class="logo-sprite" style="{% if product.image and product.image_offset %}background-image: url({{ product.sprite_url() }}); background-position: -100px -{{ 100 + (product.image_offset * 296) }}px;{% else %}background-image: url({{ product.image_url }}){% endif %}" alt="" />
<span class="title">{{ _(product.title, 'DB: products.Product.title') }}</span>
<span class="description">{{ _(product.description, 'DB: products.Product.description') }}</span>
</a>
View
4 kitsune/products/templates/products/includes/topic_macros.html
@@ -4,15 +4,15 @@
<li>
{% set topic_url = url('products.documents', product_slug=product.slug, topic_slug=topic.slug) %}
<a href="{{ topic_url }}" class="cf">
- <img src="{{ STATIC_URL }}img/blank.png" class="topic-icon" style="background-image: url('{{ topic.image_url }}')" alt="" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" class="topic-icon" style="background-image: url('{{ topic.image_url }}')" alt="" />
<span class="title">{{ _(topic.title, 'DB: products.Topic.title') }}</span>
</a>
</li>
{% if loop.last %}
{% if show_community_support %}
<li class="community-support">
<a href="{{ url('wiki.document', 'get-community-support') }}" class="cf">
- <img src="{{ STATIC_URL }}img/blank.png" class="topic-icon" alt="" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" class="topic-icon" alt="" />
<span class="title">{{ _('Get community support') }}</span>
</a>
</li>
View
4 kitsune/products/templates/products/mobile/product.html
@@ -12,14 +12,14 @@
{% for topic in topics %}
<li>
<a href="{{ url('products.documents', product_slug=product.slug, topic_slug=topic.slug) }}" class="cf">
- <img src="{{ STATIC_URL }}img/blank.png" class="topic-sprite topic-{{ topic.slug }}" alt="">
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" class="topic-sprite topic-{{ topic.slug }}" alt="">
{{ _(topic.title, 'DB: products.Topic.title') }}
</a>
</li>
{% if loop.last %}
<li>
<a href="{{ url('wiki.document', 'get-community-support') }}" class="cf">
- <img src="{{ STATIC_URL }}img/blank.png" class="topic-sprite topic-get-community-support" alt="">
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" class="topic-sprite topic-get-community-support" alt="">
{{ _('Get community support') }}
</a>
</li>
View
2 kitsune/products/templates/products/mobile/products.html
@@ -9,7 +9,7 @@
{% for product in products %}
<li>
<a class="cf" href="{{ url('products.product', slug=product.slug) }}">
- <img src="{{ STATIC_URL }}img/blank.png" class="logo-sprite" {% if product.image and product.image_offset %}style="background-position: -50px -{{ 50 + (product.image_offset * 148) }}px;"{% endif %} alt="">
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" class="logo-sprite" {% if product.image and product.image_offset %}style="background-position: -50px -{{ 50 + (product.image_offset * 148) }}px;"{% endif %} alt="">
<span class="title">{{ _(product.title, 'DB: products.Product.title') }}</span>
{{ _(product.description, 'DB: products.Product.description') }}
</a>
View
2 kitsune/products/templates/products/product.html
@@ -19,7 +19,7 @@
{% block content %}
<div class="grid_12">
<h1 class="product-title cf">
- <img src="{{ STATIC_URL }}img/blank.png" alt="" class="logo-sprite"
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" alt="" class="logo-sprite"
style="{% if product.image and product.image_offset %}background-image: url({{ product.sprite_url() }}); background-position: -100px -{{ 100 + (product.image_offset * 296) }}px;{% else %}background-image: url({{ product.image_url }}){% endif %}" />
{{ _(product.title, 'DB: products.Product.title') }}
</h1>
View
2 kitsune/questions/templates/questions/includes/aaq_macros.html
@@ -23,7 +23,7 @@
{% for key, product in products.iteritems() %}
<li>
<a class="cf" href="{{ url('questions.aaq_step2', product_key=key) }}">
- <img src="{{ STATIC_URL }}img/blank.png" alt="" class="logo-sprite logo-{{ key }}">
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" alt="" class="logo-sprite logo-{{ key }}">
<span class="title">{{ product.name }}</span>
<span class="description">{{ product.subtitle }}</span>
</a>
View
2 kitsune/questions/templates/questions/mobile/product_list.html
@@ -10,7 +10,7 @@
{% for product in products %}
<li>
<a class="cf" href="{{ url('questions.list', product.slug) }}">
- <img src="{{ STATIC_URL }}img/blank.png" class="logo-sprite" {% if product.image and product.image_offset %}style="background-position: -50px -{{ 50 + (product.image_offset * 148) }}px;"{% endif %} alt="">
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" class="logo-sprite" {% if product.image and product.image_offset %}style="background-position: -50px -{{ 50 + (product.image_offset * 148) }}px;"{% endif %} alt="">
<span class="title">{{ _('<strong>{product}</strong> Support Forum')|fe(product=_(product.title, 'DB: products.Product.title')) }}</span>
{{ _(product.description, 'DB: products.Product.description') }}
</a>
View
2 kitsune/questions/templates/questions/product_list.html
@@ -16,7 +16,7 @@
{% for product in products %}
<div class="product grid_5">
<a class="cf" href="{{ url('questions.list', product.slug) }}">
- <img src="{{ STATIC_URL }}img/blank.png" class="logo-sprite" style="{% if product.image and product.image_offset %}background-image: url({{ product.sprite_url() }}); background-position: -100px -{{ 100 + (product.image_offset * 296) }}px;{% else %}background-image: url({{ product.image_url }}){% endif %}" alt="" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" class="logo-sprite" style="{% if product.image and product.image_offset %}background-image: url({{ product.sprite_url() }}); background-position: -100px -{{ 100 + (product.image_offset * 296) }}px;{% else %}background-image: url({{ product.image_url }}){% endif %}" alt="" />
<span class="title">{{ _('<strong>{product}</strong> Support Forum')|fe(product=_(product.title, 'DB: products.Product.title')) }}</span>
<span class="description">{{ _(product.description, 'DB: products.Product.description') }}</span>
</a>
View
4 kitsune/settings.py
@@ -477,7 +477,7 @@
)
AUTH_PROFILE_MODULE = 'users.Profile'
USER_AVATAR_PATH = 'uploads/avatars/'
-DEFAULT_AVATAR = 'img/avatar.png'
+DEFAULT_AVATAR = 'sumo/img/avatar.png'
AVATAR_SIZE = 48 # in pixels
MAX_AVATAR_FILE_SIZE = 131072 # 100k, in bytes
GROUP_AVATAR_PATH = 'uploads/groupavatars/'
@@ -876,7 +876,7 @@ def read_only_mode(env):
MOBILE_COOKIE = 'msumo'
# Directory of JavaScript test files for django_qunit to run
-QUNIT_TEST_DIRECTORY = os.path.join('kitsune', 'sumo', 'static', 'js', 'tests')
+QUNIT_TEST_DIRECTORY = os.path.join('kitsune', 'sumo', 'static', 'sumo', 'js', 'tests')
# Key to access /services/version. Set to None to disallow.
VERSION_CHECK_TOKEN = None
View
20 kitsune/sumo/static/sumo/js/tests/suite.json
@@ -1,15 +1,15 @@
{
"name": "Main Test Suite",
"extra_media_urls": [
- "js/libs/jquery.mockjax.js",
- "js/browserdetect.js",
- "js/markup.js",
- "js/questions.js",
- "js/showfor.js",
- "js/testutils.js",
- "js/ajaxvote.js",
- "js/ajaxpreview.js",
- "js/tags.filter.js",
- "js/libs/jquery.lazyload.js"
+ "sumo/js/libs/jquery.mockjax.js",
+ "sumo/js/browserdetect.js",
+ "sumo/js/markup.js",
+ "sumo/js/questions.js",
+ "sumo/js/showfor.js",
+ "sumo/js/testutils.js",
+ "sumo/js/ajaxvote.js",
+ "sumo/js/ajaxpreview.js",
+ "sumo/js/tags.filter.js",
+ "sumo/js/libs/jquery.lazyload.js"
]
}
View
6 kitsune/sumo/templates/base.html
@@ -58,7 +58,7 @@
<!--[if lt IE 9]>
{# html5-shiv.js must be inside <head/> to work. #}
-<script src="{{ STATIC_URL }}js/libs/html5-shiv.js"></script>
+<script src="{{ STATIC_URL }}sumo/js/libs/html5-shiv.js"></script>
<![endif]-->
</head>
<body class="html-{{ DIR }} logged-{% if user.is_authenticated() %}in{% else %}out{% endif %} {{ classes }} {{ request.LANGUAGE_CODE }}"
@@ -144,7 +144,7 @@
{% if not hide_header_search %}
{{ search_box(settings, id='support-search', params=search_params) }}
{% endif %}
- <a href="{{ url('home') }}" class="logo"><img alt="mozilla support" src="{{ STATIC_URL }}img/mozilla-support.png" /></a>
+ <a href="{{ url('home') }}" class="logo"><img alt="mozilla support" src="{{ STATIC_URL }}sumo/img/mozilla-support.png" /></a>
</div>
</div>
</div>
@@ -182,7 +182,7 @@
<footer>
<div class="container_12 cf">
- <div class="grid_2"><img src="{{ STATIC_URL }}img/mozilla-logo.png" alt="Mozilla" /></div>
+ <div class="grid_2"><img src="{{ STATIC_URL }}sumo/img/mozilla-logo.png" alt="Mozilla" /></div>
<div class="grid_4 suffix_1">
<div class="fineprint">
{% trans %}
View
2 kitsune/sumo/templates/email/base.html
@@ -229,7 +229,7 @@
<thead>
<tr>
<th>
- <img src="{{ STATIC_URL }}email/img/mozilla-support.png" alt="{{ _('Mozilla Support') }}">
+ <img src="{{ STATIC_URL }}sumo/email/img/mozilla-support.png" alt="{{ _('Mozilla Support') }}">
{% block header %}{% endblock %}
</th>
</tr>
View
2 kitsune/sumo/templates/handlers/404.html
@@ -19,7 +19,7 @@
</article>
<div class="footnote">
<a rel="license" href="http://creativecommons.org/licenses/by-sa/2.0/"
- target="_blank"><img src="{{ STATIC_URL }}img/cc-sa.png"
+ target="_blank"><img src="{{ STATIC_URL }}sumo/img/cc-sa.png"
alt="Creative Commons Attribution-Share Alike 2.0 Generic License"
title="Creative Commons Attribution-Share Alike 2.0 Generic License"></a>
by <a href="http://www.flickr.com/people/nukeador/" target="_blank">Nukeador</a>
View
2 kitsune/sumo/templates/includes/common_macros.html
@@ -141,6 +141,6 @@
{% macro favicon() %}
{% set sizes = (512, 256, 128, 64, 32, 16,) %}
{% for s in sizes %}
- <link rel="icon" type="image/png" sizes="{{ s }}x{{ s }}" href="{{ STATIC_URL }}img/firefox-{{ s }}.png?v=1">
+ <link rel="icon" type="image/png" sizes="{{ s }}x{{ s }}" href="{{ STATIC_URL }}sumo/img/firefox-{{ s }}.png?v=1">
{% endfor %}
{% endmacro %}
View
6 kitsune/sumo/templates/tests/qunit.html
@@ -3,12 +3,12 @@
<head>
<title>QUnit Test Suite</title>
<link rel="stylesheet" href="{{ url('qunit_css') }}?v={{ timestamp }}" type="text/css" media="screen">
- <link rel="stylesheet" href="{{ STATIC_URL }}css/kbox.css?v={{ timestamp }}" type="text/css" media="screen">
+ <link rel="stylesheet" href="{{ STATIC_URL }}sumo/css/kbox.css?v={{ timestamp }}" type="text/css" media="screen">
</head>
<body
data-for-os="{&#34;maemo&#34;: 4, &#34;win&#34;: 1, &#34;mac&#34;: 2, &#34;android&#34;: 5, &#34;linux&#34;: 3}"
data-for-version="{&#34;fx9&#34;: 13, &#34;fx8&#34;: 11, &#34;fx5&#34;: 5, &#34;fx4&#34;: 1, &#34;fx7&#34;: 9, &#34;fx6&#34;: 6, &#34;fx3&#34;: 3, &#34;m5&#34;: 7, &#34;m4&#34;: 4, &#34;m7&#34;: 10, &#34;m6&#34;: 8, &#34;fx35&#34;: 2, &#34;m9&#34;: 14, &#34;m8&#34;: 12}"
- data-static-url="http://example.com">
+ data-static-url="http://example.com/">
<h1 id="qunit-header">QUnit Test Suite ({{ suite.name }})</h1>
<h2 id="qunit-banner"></h2>
@@ -194,7 +194,7 @@ <h2 id="qunit-userAgent"></h2>
<script src="{{ STATIC_URL + jsfile }}?v={{ timestamp }}"></script>
{% endfor %}
<script type="text/javascript" src="{{ url('qunit_js') }}?v={{ timestamp }}"></script>
- <script type="text/javascript" src="{{ STATIC_URL }}js/libs/jquery.mockjax.js?v={{ timestamp }}"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}sumo/js/libs/jquery.mockjax.js?v={{ timestamp }}"></script>
{% for url in suite.extra_urls %}
<script type="text/javascript" src="{{ url }}?v={{ timestamp }}"></script>
{% endfor %}
View
2 kitsune/sumo/templates/wikiparser/hook_image.html
@@ -12,7 +12,7 @@
{% macro render_image(lazy=False) -%}
<img class="wiki-image{% if not has_frame %} frameless{% endif %}{% if lazy %} lazy{% endif %}"
- {% if lazy %}src="{{ STATIC_URL }}img/placeholder.gif"
+ {% if lazy %}src="{{ STATIC_URL }}sumo/img/placeholder.gif"
data-original-{% endif %}src="{{ image.file.url }}"
alt="{% if 'alt' in params %}{{ params['alt'] }}{% else %}{{ params['caption'] }}{% endif %}"
{% if 'alt' in params and params['alt'] != params['caption'] %}
View
2 kitsune/wiki/templates/wiki/document.html
@@ -42,7 +42,7 @@
{% block above_main %}
<h1 class="product-title cf">
{% set prod_url = url('products.product', slug=product.slug) %}
- <img src="{{ STATIC_URL }}img/blank.png" alt="" class="logo-sprite" style="background-image: url('{{ product.image_url }}');" />
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" alt="" class="logo-sprite" style="background-image: url('{{ product.image_url }}');" />
<a href="{{ prod_url }}">{{ _(product.title, 'DB: products.Product.title') }}</a>
</h1>
{% endblock %}
View
2 kitsune/wiki/templates/wiki/includes/document_macros.html
@@ -296,7 +296,7 @@ <h1 class="title">{{ document.title }}</h1>
{% endif %}
<input type="submit" class="btn" name="helpful" value="{{ _('Yes') }}" />
<input type="submit" class="btn" name="not-helpful" value="{{ _('No') }}" />
- <img class="wait" src="{{ settings.STATIC_URL }}img/customercare/spinner.gif" alt="{{ _('Please wait...') }}" />
+ <img class="wait" src="{{ settings.STATIC_URL }}sumo/img/customercare/spinner.gif" alt="{{ _('Please wait...') }}" />
</p>
</form>
</div>
View
4 kitsune/wiki/templates/wiki/includes/recent_revisions_fragment.html
@@ -13,11 +13,11 @@
{% set diff_url = url('wiki.compare_revisions', rev.document.slug) %}
{% set diff_url = diff_url|urlparams(from=prev_rev.id, to=rev.id, locale=rev.document.locale) %}
<a class="show-diff" href="{{ diff_url }}">
- <img class="icon-search" src="{{ STATIC_URL }}img/blank.png" alt="{{ _('View Diff') }}" />
+ <img class="icon-search" src="{{ STATIC_URL }}sumo/img/blank.png" alt="{{ _('View Diff') }}" />
</a>
<img class="loading" src="/media/img/wait-trans.gif" alt="" />
<a class="close-diff" href="">
- <img class="icon-back" src="{{ STATIC_URL }}img/blank.png" alt="{{ _('Close Diff') }}" />
+ <img class="icon-back" src="{{ STATIC_URL }}sumo/img/blank.png" alt="{{ _('Close Diff') }}" />
</a>
{% endif %}
</div>
View
2 kitsune/wiki/templates/wiki/includes/sidebar_modules.html
@@ -85,7 +85,7 @@
<li>
<a href="{{ url('products.product', product.slug) }}">
<span>
- <img src="{{ STATIC_URL }}img/blank.png" style="background-image: url('{% if product.image %}{{ product.image.url }}{% else %}{{ STATIC_URL }}img/product_placeholder.png{% endif %}');" >
+ <img src="{{ STATIC_URL }}sumo/img/blank.png" style="background-image: url('{% if product.image %}{{ product.image.url }}{% else %}{{ STATIC_URL }}products/img/product_placeholder.png{% endif %}');" >
{{ product.title }}
</span>
</a>
View
4 kitsune/wiki/templates/wiki/mobile/includes/document_macros.html
@@ -15,9 +15,9 @@
<input type="submit" class="btn" name="helpful" value="{{ _('Yes') }}" />
<input type="submit" class="btn" name="not-helpful" value="{{ _('No') }}" />
</div>
- <img class="wait" src="{{ settings.STATIC_URL }}img/customercare/spinner.gif" alt="{{ _('Please wait...') }}" />
+ <img class="wait" src="{{ settings.STATIC_URL }}sumo/img/customercare/spinner.gif" alt="{{ _('Please wait...') }}" />
</p>
</form>
</div>
{% endif %}
-{%- endmacro %}
+{%- endmacro %}

0 comments on commit 6bce552

Please sign in to comment.