Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/static file handling #34

Merged
merged 84 commits into from Jan 2, 2012
Merged

Feature/static file handling #34

merged 84 commits into from Jan 2, 2012

Commits on Oct 27, 2011

  1. Remove Django 1.1.1.

    chris-allan committed Oct 27, 2011
    Copy the full SHA
    099fb43 View commit details
    Browse the repository at this point in the history
  2. Add Django 1.3.1.

    chris-allan committed Oct 27, 2011
    Copy the full SHA
    c029ac5 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    fe6c125 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    376d242 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2011

  1. Update license README.

    chris-allan committed Nov 7, 2011
    Copy the full SHA
    dafb20e View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2011

  1. Webadmin Template adjustments, see #7222

    Custom template tag support for static prefix in webadmin, see #7220
    Configuring statics in settings.py, see #7219
    atarkowska committed Nov 22, 2011
    Copy the full SHA
    c39a012 View commit details
    Browse the repository at this point in the history
  2. Feedback Template adjustments, see #7231

    Custom template tag support for static prefix in feedback, see #7233
    Configuring statics in settings.py, see #7219
    atarkowska committed Nov 22, 2011
    Copy the full SHA
    803c8e8 View commit details
    Browse the repository at this point in the history
  3. Webclient Template adjustments, see #7223

    Custom template tag support for static prefix in webadmin, see #7221
    Configuring statics in settings.py, see #7219
    atarkowska committed Nov 22, 2011
    Copy the full SHA
    a3f3ab2 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    73eb919 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    026c6b9 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    fbf7553 View commit details
    Browse the repository at this point in the history
  7. Removing hardcoded new Databases settings, see #7255.

    That will become configurable in the standard manner.
    Accidentally committed while running web unittests
    atarkowska committed Nov 22, 2011
    Copy the full SHA
    cb22e56 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    98e1c5a View commit details
    Browse the repository at this point in the history
  9. New 'common' Django app for common templates

    Will Moore authored and atarkowska committed Nov 22, 2011
    Copy the full SHA
    7201eca View commit details
    Browse the repository at this point in the history
  10. Copy the full SHA
    673a1ea View commit details
    Browse the repository at this point in the history
  11. Copy the full SHA
    d3cb75e View commit details
    Browse the repository at this point in the history
  12. Copy the full SHA
    961ee5c View commit details
    Browse the repository at this point in the history
  13. Copy the full SHA
    ae77029 View commit details
    Browse the repository at this point in the history
  14. Copy the full SHA
    38ce43c View commit details
    Browse the repository at this point in the history
  15. Updated logo.png used by base templates

    This was the thinner logo without the text at the bottom, as was already being
    used in 'feature/django_templates' branch.
    Will Moore authored and atarkowska committed Nov 22, 2011
    Copy the full SHA
    c202330 View commit details
    Browse the repository at this point in the history
  16. Moving 'logout' down to weclient template. See #7263

    Will Moore committed Nov 22, 2011
    Copy the full SHA
    06ddda5 View commit details
    Browse the repository at this point in the history
  17. Adding text content to webtest common templates

    Will Moore committed Nov 22, 2011
    Copy the full SHA
    ec96c75 View commit details
    Browse the repository at this point in the history
  18. Copy the full SHA
    901d03a View commit details
    Browse the repository at this point in the history
  19. open_astex_viewer.html extends common base_html.html

    Will Moore committed Nov 22, 2011
    Copy the full SHA
    4123c52 View commit details
    Browse the repository at this point in the history
  20. script_ui.html extends common base_html.html

    Will Moore committed Nov 22, 2011
    Copy the full SHA
    3d237f0 View commit details
    Browse the repository at this point in the history
  21. Footer content moved to webclient.

    Footer separated out: links and copywrite. Webclient links in webclient.
    Will Moore committed Nov 22, 2011
    Copy the full SHA
    69b66e1 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2011

  1. Including footer links in webclient base templates

    Will Moore committed Nov 23, 2011
    Copy the full SHA
    b35eae3 View commit details
    Browse the repository at this point in the history
  2. Removing print statement

    Will Moore committed Nov 23, 2011
    Copy the full SHA
    e33a140 View commit details
    Browse the repository at this point in the history
  3. Moving container templates up to common

    Webclient templates base_container.html and base.html now extend common container3.html
    and container2.html respectively. nav.js moved to common static.
    TODO: split images.css and layout.css into styles needed by common vv webclient
    Will Moore committed Nov 23, 2011
    Copy the full SHA
    5476860 View commit details
    Browse the repository at this point in the history
  4. Adding container examples to webtest

    Will Moore committed Nov 23, 2011
    Copy the full SHA
    b32ce88 View commit details
    Browse the repository at this point in the history
  5. Adding copywrite header to webtest common examples

    Will Moore committed Nov 23, 2011
    Copy the full SHA
    25be46f View commit details
    Browse the repository at this point in the history
  6. Refactoring nav.js. Simply add/remove required classes

    Will Moore committed Nov 23, 2011
    Copy the full SHA
    126b595 View commit details
    Browse the repository at this point in the history
  7. Moving container styles up to common

    Will Moore committed Nov 23, 2011
    Copy the full SHA
    48a3ff3 View commit details
    Browse the repository at this point in the history
  8. Removing tabindex=0 from trayhandles in containers

    This tabindex causes a selection border to be displayed
    around the image when clicked in Safari. Looks bad.
    Will Moore committed Nov 23, 2011
    Copy the full SHA
    72f72f7 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2011

  1. Moved container pngs and styles to common

    Added copyright header to javascript files, minor change to nav.js
    Will Moore committed Nov 24, 2011
    Copy the full SHA
    353b455 View commit details
    Browse the repository at this point in the history
  2. Fixing typos and icons in search results

    Will Moore committed Nov 24, 2011
    Copy the full SHA
    25a6692 View commit details
    Browse the repository at this point in the history
  3. Fixing common / webclient static links to icon

    Will Moore committed Nov 24, 2011
    Copy the full SHA
    c85bddb View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2011

  1. Copy the full SHA
    2972c25 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    f5b3ad5 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    2e1d8f1 View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    44a7046 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    5a4175d View commit details
    Browse the repository at this point in the history
  6. Style Sheets cleanup

    promoting most common html style used accross webappd
    atarkowska committed Nov 25, 2011
    Copy the full SHA
    f9eca1e View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    6cf37f9 View commit details
    Browse the repository at this point in the history
  8. Copy the full SHA
    8cd231c View commit details
    Browse the repository at this point in the history

Commits on Nov 28, 2011

  1. Refactored container layout to use divs

    This allows left, center and right panels to contain full-sized divs with 'overflow:auto'
    to support individual scrolling of panels.
    Will Moore committed Nov 28, 2011
    Copy the full SHA
    542b77f View commit details
    Browse the repository at this point in the history
  2. Fixing webclient pages for new container layout

    Will Moore committed Nov 28, 2011
    Copy the full SHA
    fdcb8fd View commit details
    Browse the repository at this point in the history
  3. Fix new container layout for history and search pages.

    Will Moore committed Nov 28, 2011
    Copy the full SHA
    4340d2b View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    4c2cf29 View commit details
    Browse the repository at this point in the history
  5. More fixes to webclient layouts.

    Since the base_header and container3 templates now have overflow:auto by default in
    their various panels, extending templates don't need to add this for simple
    content.
    Will Moore committed Nov 28, 2011
    Copy the full SHA
    5b85707 View commit details
    Browse the repository at this point in the history
  6. Fixing webadmin templates with new container layouts

    Removing resizes by javascript and updating based on recent changes to base templates
    Will Moore committed Nov 28, 2011
    Copy the full SHA
    4036bdf View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2011

  1. Remove 'web syncmedia'.

    The functionality previously provided as part of 'web syncmedia' is now
    provided by the Django 1.3 static file infrastructure.  Specifically,
    'manage.py collectfiles'.  Furthermore this is now embedded as part of
    'web start' which removes the requirement for a seperate command and as
    such 'web syncmedia' is now deprecated, a no-op and prints out such a
    message to STDOUT upon execution.
    chris-allan committed Nov 29, 2011
    Copy the full SHA
    fa50f0c View commit details
    Browse the repository at this point in the history
  2. Move from 'media' and 'appmedia' to 'static' directory.

    This ports from the existing 'media' and 'appmedia' directories, as far
    as "production" deployments are concerned, to the single 'static'
    directory.  Updated templates for nginx and Apache.
    chris-allan committed Nov 29, 2011
    Copy the full SHA
    3c8cf89 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2011

  1. Fixing new container layout in share page

    Will Moore committed Nov 30, 2011
    Copy the full SHA
    af9d1e0 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    7637652 View commit details
    Browse the repository at this point in the history
  3. Added confirm dialog to popup.js. See #7082

    Will Moore committed Nov 30, 2011
    Copy the full SHA
    a3f122a View commit details
    Browse the repository at this point in the history
  4. Copy the full SHA
    c340f16 View commit details
    Browse the repository at this point in the history
  5. Replace confirm() with dialog in metadata_general

    Will Moore committed Nov 30, 2011
    Copy the full SHA
    d688447 View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    c01f207 View commit details
    Browse the repository at this point in the history
  7. Copy the full SHA
    b434236 View commit details
    Browse the repository at this point in the history
  8. Replace confirm() with dialog in public. Needs testing

    Will Moore committed Nov 30, 2011
    Copy the full SHA
    5a9a3d7 View commit details
    Browse the repository at this point in the history
  9. Fixing static links to several png icons

    Will Moore committed Nov 30, 2011
    Copy the full SHA
    3289d83 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2011

  1. Revert changes made to the media prefix on the metadata preview panel.

    In a3f3ab2 changes were made to the
    media prefix (going from /appmedia/webgateway/ to
    /webgateway/appmedia/).  This ends up breaking the production deployment
    and while we need to port the webgateway application to use the new
    static file handling logic reverting these changes will at least allow
    the current implementation to work correctly.
    chris-allan committed Dec 1, 2011
    Copy the full SHA
    2d5d6a4 View commit details
    Browse the repository at this point in the history
  2. Revert changes made to the media prefix on the plate view.

    A detailed description of the rationale for this change is included as
    part of the commit message on 2d5d6a4.
    chris-allan committed Dec 1, 2011
    Copy the full SHA
    46d5201 View commit details
    Browse the repository at this point in the history
  3. Copy the full SHA
    fe6d2d6 View commit details
    Browse the repository at this point in the history
  4. Fix hiding of script-launch toolbar

    Will Moore committed Dec 1, 2011
    Copy the full SHA
    0769e37 View commit details
    Browse the repository at this point in the history
  5. Copy the full SHA
    937995e View commit details
    Browse the repository at this point in the history
  6. Copy the full SHA
    3cc9eea View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2011

  1. moving webgateway media to the new location /static

    adjusting templates, see #7362
    atarkowska committed Dec 5, 2011
    Copy the full SHA
    4789c96 View commit details
    Browse the repository at this point in the history
  2. adding mediaroot to WeblitzViewport options

    see #7362, removing missed appmedia from urls.py
    atarkowska committed Dec 5, 2011
    Copy the full SHA
    d679ca1 View commit details
    Browse the repository at this point in the history
  3. adding custom template tag 'static' to built in tags

    see #7369, that change allows to remove custom processors
    atarkowska committed Dec 5, 2011
    Copy the full SHA
    976df64 View commit details
    Browse the repository at this point in the history
  4. adding custom template tag 'static' to built in tags

    see #7369, that change allows to remove custom processors
    atarkowska committed Dec 5, 2011
    Copy the full SHA
    9f42c6e View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2011

  1. Copy the full SHA
    e963691 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    0c1c1e7 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2011

  1. Copy the full SHA
    147f2e3 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2011

  1. Copy the full SHA
    973ef63 View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    c772773 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2011

  1. Copy the full SHA
    78204d3 View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2011

  1. Fixing static file links in open_astex_viewer.html

    Will Moore committed Dec 17, 2011
    Copy the full SHA
    02d01d5 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2011

  1. Adding docs to webclient/views.py

    Will Moore committed Dec 19, 2011
    Copy the full SHA
    3d0c664 View commit details
    Browse the repository at this point in the history
  2. Fix bug in switching user. See #7692

    Will Moore committed Dec 19, 2011
    Copy the full SHA
    ad4086b View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2011

  1. Big Image link to viewport location. Closes #7693

    Will Moore committed Dec 20, 2011
    Copy the full SHA
    d06c0fe View commit details
    Browse the repository at this point in the history
  2. Copy the full SHA
    bbcc483 View commit details
    Browse the repository at this point in the history
  3. Minor tweak to webtest common template example

    Will Moore committed Dec 20, 2011
    Copy the full SHA
    15742cc View commit details
    Browse the repository at this point in the history