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 | |||
| @@ -88,7 +88,8 @@ class FrontendBuilder(object): | |||
| 88 | def template (self): | 88 | def template (self): |
| 89 | processedFile = 'html_template' | 89 | processedFile = 'html_template' |
| 90 | if not self.processedFiles.has_key(processedFile): | 90 | if not self.processedFiles.has_key(processedFile): |
| 91 | self.processedFiles[processedFile] = self.loadFilesContent('html', ['index_template.html']) | 91 | #self.processedFiles[processedFile] = self.loadFilesContent('html', ['index_template.html']) |
| 92 | self.processedFiles[processedFile] = self.loadFilesContent('html', [self.settings['html.template']]) | ||
| 92 | 93 | ||
| 93 | return self.processedFiles[processedFile] | 94 | return self.processedFiles[processedFile] |
| 94 | 95 | ||
| @@ -319,7 +320,7 @@ class FrontendBuilder(object): | |||
| 319 | 320 | ||
| 320 | def scriptTagsForFiles (self, basePath, files): | 321 | def scriptTagsForFiles (self, basePath, files): |
| 321 | #<script type='text/javascript' src='./js/src/bookmarklet.js'></script> | 322 | #<script type='text/javascript' src='./js/src/bookmarklet.js'></script> |
| 322 | return '\n'.join(map(lambda file: '<script type="text/javascript" src="' + basePath + '/' + file + '"></script>', files)) | 323 | return '\n'.join(map(lambda file: '<script type="text/javascript" src="' + basePath + '/' + file + '" charset="utf-8"></script>', files)) |
| 323 | 324 | ||
| 324 | 325 | ||
| 325 | def scriptTagForContent (self, content): | 326 | def scriptTagForContent (self, content): |