Home Explore Help
Sign In
bux
/
tracim
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

Merge pull request #486 from tracim/fix/485/utf8_pages_threads_webdav

Damien Accorsi 7 years ago
parent
1bece0dfdf e94a252e07
commit
96f6836867
No account linked to committer's email
1 changed files with 6 additions and 4 deletions
Unified View Show Diff Stats
  1. 6 4
      tracim/tracim/lib/webdav/design.py

+ 6 - 4
tracim/tracim/lib/webdav/design.py View File

173 
                    )
 173 
                    )
174 
     histHTML += '</table>'
 174 
     histHTML += '</table>'
175
175
176 
-    file = '''
176 
+    page = '''
177 
 <html>
 177 
 <html>
178 
 <head>
 178 
 <head>
179 
+	<meta charset="utf-8" />
179 
 	<title>%s</title>
 180 
 	<title>%s</title>
180 
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
 181 
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
181 
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
 182 
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.6.3/css/font-awesome.min.css">
233 
                content_revision.description,
 234 
                content_revision.description,
234 
                histHTML)
 235 
                histHTML)
235
236
236 
-    return file
237 
+    return page
237
238
238 
 def designThread(content: data.Content, content_revision: data.ContentRevisionRO, comments) -> str:
 239 
 def designThread(content: data.Content, content_revision: data.ContentRevisionRO, comments) -> str:
239 
         hist = content.get_history()
 240 
         hist = content.get_history()
291 
                                # t.ref_object.label) if t.type.id in ['revision', 'creation', 'edition'] else '')
 292 
                                # t.ref_object.label) if t.type.id in ['revision', 'creation', 'edition'] else '')
292 
                            )
 293 
                            )
293
294
294 
-        page = '''
295 
+        thread = '''
295 
 <html>
 296 
 <html>
296 
 <head>
 297 
 <head>
298 
+	<meta charset="utf-8" />
297 
 	<title>%s</title>
 299 
 	<title>%s</title>
298 
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
 300 
 	<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
299 
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
 301 
 	<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
379 
                content_revision.description,
 381 
                content_revision.description,
380 
                disc)
 382 
                disc)
381
383
382 
-        return page
384 
+        return thread