| author | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 14:26:08 (UTC) |
|---|---|---|
| committer | Giulio Cesare Solaroli <giulio.cesare@clipperz.com> | 2012-03-17 14:26:08 (UTC) |
| commit | 65a7a7be3feb846d6b1062a0b858a7660e8f99fa (patch) (side-by-side diff) | |
| tree | 475e4f7492b54bcf2ab10464e8013da70fa52ec3 /scripts/builder/frontendBuilder.py | |
| parent | cf9c0c34e1358452e0c7276c5b3ec6598f0c089d (diff) | |
| download | clipperz-65a7a7be3feb846d6b1062a0b858a7660e8f99fa.zip clipperz-65a7a7be3feb846d6b1062a0b858a7660e8f99fa.tar.gz clipperz-65a7a7be3feb846d6b1062a0b858a7660e8f99fa.tar.bz2 | |
Some fixes to build scripts getting ready to handle the mobile version
Signed-off-by: Giulio Cesare Solaroli <giulio.cesare@clipperz.com>
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 @@ -87,9 +87,10 @@ class FrontendBuilder(object): 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] @@ -318,9 +319,9 @@ class FrontendBuilder(object): 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>' |