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

Conversation

atarkowska
Copy link
Member

That includes:

  • Django 1.3.1
  • New application 'Common' with new hierarchy of templates and common media files
  • Webadmin 2.0 based on the new templates.

We need to test and merge it.

chris-allan and others added 30 commits October 27, 2011 16:53
Custom template tag support for static prefix in webadmin, see #7220
Configuring statics in settings.py, see #7219
Custom template tag support for static prefix in feedback, see #7233
Configuring statics in settings.py, see #7219
Custom template tag support for static prefix in webadmin, see #7221
Configuring statics in settings.py, see #7219
That will become configurable in the standard manner.
Accidentally committed while running web unittests
This was the thinner logo without the text at the bottom, as was already being
used in 'feature/django_templates' branch.
Footer separated out: links and copywrite. Webclient links in webclient.
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
@jburel
Copy link
Member

jburel commented Dec 7, 2011

@aleksandra-tarkowska, @chris-allan conflict in omero_image.html
This line is in develop not in branch. I have locally kept develop so I can do a merge-blue.
<script type="text/javascript" src="/appmedia/webgateway/js/3rdparty/panojs/control_roi.js"></script>

@atarkowska
Copy link
Member Author

I understand that HEAD is now on top of @will-moore ROI changes. In that case every links which starts from "/appmedia/webgateway/..." has to be replaced by {% static "webgateway/..." %}. It might make sense to close this PR and open new one where we fix those links and then we will push to merge-blue.

@joshmoore
Copy link
Member

@chris-allan: there was some discussion in devteam about this merge commit. Looks like everything worked out fine to me, but you may want to take a look before work progresses too much further.

@chris-allan
Copy link
Member

@joshmoore, @aleksandra-tarkowska: Looks like this will take some discussion to figure out what's what which we can have tomorrow afternoon.

@chris-allan
Copy link
Member

@will-moore, @aleksandra-tarkowska, @cneves: Been playing with this some more over the last few days and I think we're now at a point where it's more dangerous to not merge than it is to wait.

@aleksandra-tarkowska: I Can't get sub-directories to work properly when running in "production" mode apart from the static URLs but we can deal with that problem once this is merged in.

chris-allan added a commit that referenced this pull request Jan 2, 2012
@chris-allan chris-allan merged commit a794385 into ome:develop Jan 2, 2012
jburel pushed a commit to jburel/openmicroscopy that referenced this pull request Aug 21, 2013
Rename configuration variables
joshmoore added a commit to snoopycrimecop/openmicroscopy that referenced this pull request May 19, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants