Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

media -> static

  • Loading branch information...
commit 117eb6955876af5c897f8c88ae18b2d4807f3c5f 1 parent 822e8a9
@trey0 trey0 authored
View
2  geocamLens/ViewKml.py
@@ -82,7 +82,7 @@ def kmlGetInitialKml(self, request, sessionId=None):
allFeaturesFolder = self.kmlGetAllFeaturesFolder(request, query, newUtime)
global CACHED_CSS
if not CACHED_CSS:
- cssPath = '%sgeocamCore/css/share.css' % settings.MEDIA_ROOT
+ cssPath = '%sgeocamCore/css/share.css' % settings.STATIC_ROOT
CACHED_CSS = file(cssPath, 'r').read()
result = ("""
<Document id="allFeatures">
View
1  geocamLens/ViewLensAbstract.py
@@ -96,7 +96,6 @@ def galleryDebug(self, request):
def getExportSettings(self):
exportedVars = ['SCRIPT_NAME',
'STATIC_URL',
- 'MEDIA_URL',
'DATA_URL',
'GEOCAM_AWARE_GALLERY_PAGE_COLS',
'GEOCAM_AWARE_GALLERY_PAGE_ROWS',
View
8 geocamLens/management/appCommands/prep.py
@@ -27,7 +27,7 @@ def handle_noargs(self, **options):
builder = Builder()
# render svg to png
- svgOutput = '%s/build/media/geocamLens/icons/map/' % appDir
+ svgOutput = '%s/build/static/geocamLens/icons/map/' % appDir
if settings.GEOCAM_LENS_RENDER_SVG_ICONS:
svgGlob = '%s/media_src/icons/*.svg' % appDir
logging.debug('svgIcons %s %s', svgGlob, svgOutput)
@@ -37,7 +37,7 @@ def handle_noargs(self, **options):
# link static stuff into build/media
inst = Installer(builder)
inst.installRecurseGlob('%s/static/*' % appDir,
- '%s/build/media' % appDir)
+ '%s/build/static' % appDir)
# make highlighted versions of icons
dstGlob = svgOutput + '*.png'
@@ -49,8 +49,8 @@ def handle_noargs(self, **options):
halo.addHalo(builder, dst, dstHighlighted)
# rotate pngs
- rotGlob = '%s/build/media/geocamLens/icons/map/*Point*.png' % appDir
- rotOutput = '%s/build/media/geocamLens/icons/mapr' % appDir
+ rotGlob = '%s/build/static/geocamLens/icons/map/*Point*.png' % appDir
+ rotOutput = '%s/build/static/geocamLens/icons/mapr' % appDir
logging.debug('rotateIcons %s %s', rotGlob, rotOutput)
for imPath in glob(rotGlob):
rotate.buildAllDirections(builder, imPath, outputDir=rotOutput)
Please sign in to comment.
Something went wrong with that request. Please try again.