| author | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-17 14:43:30 (UTC) |
|---|---|---|
| committer | Giulio Cesare Solaroli <giulio.cesare@solaroli.it> | 2012-03-17 14:43:30 (UTC) |
| commit | 58ec03cc3dba43ccd9826148b99bf3d7b8e97d8a (patch) (side-by-side diff) | |
| tree | c12d695420bb6281708b367d52970eac5615ef1c /scripts/builder/frontendBuilder.py | |
| parent | e7e021141d7906b537b3622ed706017f31222dfd (diff) | |
| parent | e61e994abb9738d98447b203b9908793da6f560a (diff) | |
| download | clipperz-58ec03cc3dba43ccd9826148b99bf3d7b8e97d8a.zip clipperz-58ec03cc3dba43ccd9826148b99bf3d7b8e97d8a.tar.gz clipperz-58ec03cc3dba43ccd9826148b99bf3d7b8e97d8a.tar.bz2 | |
Merge pull request #31 from gcsolaroli/master
Updated build scripts
Diffstat (limited to 'scripts/builder/frontendBuilder.py') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | scripts/builder/frontendBuilder.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/builder/frontendBuilder.py b/scripts/builder/frontendBuilder.py index dae837b..1f0f92f 100644 --- a/scripts/builder/frontendBuilder.py +++ b/scripts/builder/frontendBuilder.py @@ -85,13 +85,14 @@ class FrontendBuilder(object): return result def template (self): processedFile = 'html_template' if not self.processedFiles.has_key(processedFile): - self.processedFiles[processedFile] = self.loadFilesContent('html', ['index_template.html']) + # self.processedFiles[processedFile] = self.loadFilesContent('html', ['index_template.html']) + self.processedFiles[processedFile] = self.loadFilesContent('html', [self.settings['html.template']]) return self.processedFiles[processedFile] def cssminCompressor (self, css): # package found here: @@ -316,13 +317,13 @@ class FrontendBuilder(object): def cssTagForContent (self, content): return '<style type="text/css">' + content + '</style>' def scriptTagsForFiles (self, basePath, files): #<script type='text/javascript' src='./js/src/bookmarklet.js'></script> - return '\n'.join(map(lambda file: '<script type="text/javascript" src="' + basePath + '/' + file + '"></script>', files)) + return '\n'.join(map(lambda file: '<script type="text/javascript" src="' + basePath + '/' + file + '" charset="utf-8"></script>', files)) def scriptTagForContent (self, content): return '<script>' + content + '</script>' |