# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1446591416 -3600
# Node ID 50ef36dc64215d74aafab93557c891ab91964926
# Parent  00cdc167314c60986725df36f29e25bebfe1df55# Parent  47610f1b9ad0caa508e3a1b8db16c439b2305b5e
Merged temporary branches.

diff -r 00cdc167314c -r 50ef36dc6421 htdocs/styles.css
--- a/htdocs/styles.css	Tue Nov 03 23:56:13 2015 +0100
+++ b/htdocs/styles.css	Tue Nov 03 23:56:56 2015 +0100
@@ -301,6 +301,12 @@
     display: block;
 }
 
+/* Separate the ignore control. */
+
+input.ignore {
+    margin-left: 2em;
+}
+
 /* Make calendar labels occupy cells completely.
    See: http://stackoverflow.com/questions/2841484/how-can-a-label-completely-fill-its-parent-td
 */
diff -r 00cdc167314c -r 50ef36dc6421 imiptools/profile.py
--- a/imiptools/profile.py	Tue Nov 03 23:56:13 2015 +0100
+++ b/imiptools/profile.py	Tue Nov 03 23:56:56 2015 +0100
@@ -24,6 +24,7 @@
 from imiptools.filesys import fix_permissions, FileBase
 from os.path import exists, isdir
 from os import listdir, makedirs
+import codecs
 import pytz
 
 def identity_dict(l):
@@ -191,7 +192,7 @@
         if not filename or not exists(filename):
             raise KeyError, name
 
-        f = open(filename)
+        f = codecs.open(filename, encoding="utf-8")
         try:
             return f.read().strip()
         finally:
@@ -205,7 +206,7 @@
         if not filename:
             return False
 
-        f = open(filename, "w")
+        f = codecs.open(filename, "w", encoding="utf-8")
         try:
             f.write(value)
         finally:
diff -r 00cdc167314c -r 50ef36dc6421 imipweb/event.py
--- a/imipweb/event.py	Tue Nov 03 23:56:13 2015 +0100
+++ b/imipweb/event.py	Tue Nov 03 23:56:56 2015 +0100
@@ -157,7 +157,7 @@
             page.add(" ")
             self.control("discard", "submit", "Discard event")
             page.add(" ")
-            self.control("ignore", "submit", "Do nothing for now")
+            self.control("ignore", "submit", "Return to the calendar", class_="ignore")
             page.p.close()
 
         if self.is_organiser():
@@ -177,7 +177,7 @@
                 self.control("discard", "submit", "Discard event")
 
             page.add(" ")
-            self.control("ignore", "submit", "Do nothing for now")
+            self.control("ignore", "submit", "Return to the calendar", class_="ignore")
             page.add(" ")
             self.control("save", "submit", "Save without sending")
             page.p.close()