From f7f49055fb88e5dfa03c43d91f3c29f7a48aca76 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@sugarlabs.org>
Date: Mon, 08 Mar 2010 19:48:32 +0000
Subject: cleaned up export HTML logic

---
(limited to 'TurtleArtActivity.py')

diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 355c44c..3ce2359 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -109,7 +109,12 @@ class TurtleArtActivity(activity.Activity):
         # save the html code to the instance directory
         datapath = get_path(activity, 'instance')
 
-        html_file = os.path.join(datapath, "portfolio.html")
+        save_type = '.html'
+        if len(self.tw.saved_pictures) > 0:
+            if self.tw.saved_pictures[0].endswith(('.svg')):
+                save_type = '.xml'
+
+        html_file = os.path.join(datapath, "portfolio" + save_type)
         f = file(html_file, "w")
         f.write(html)
         f.close()
@@ -136,7 +141,10 @@ class TurtleArtActivity(activity.Activity):
                                      _("presentation")
         dsobject.metadata['icon-color'] = profile.get_color().to_string()
         if embed_flag == True:
-            dsobject.metadata['mime_type'] = 'text/html'
+            if save_type == '.xml':
+                dsobject.metadata['mime_type'] = 'text/xhtml'
+            else:
+                dsobject.metadata['mime_type'] = 'text/html'
             dsobject.set_file_path(html_file)
         else:
             dsobject.metadata['mime_type'] = 'application/x-tar'
@@ -146,6 +154,8 @@ class TurtleArtActivity(activity.Activity):
         datastore.write(dsobject)
         dsobject.destroy()
         gobject.timeout_add(250,self.save_as_html.set_icon, "htmloff")
+
+        self.tw.saved_pictures = []
         return
 
     def _do_save_as_logo_cb(self, button):
--
cgit v0.9.1