Using png instead of svg to support more browsersHEAD master

author: Agustin Zubiaga <aguz@sugarlabs.org> 2013-02-27 15:28:45 (GMT)
committer: Agustin Zubiaga <aguz@sugarlabs.org> 2013-02-27 15:28:45 (GMT)
commit: 28dd53c6bb2d0c7d69aede38291e5b8e7e6b8879 (patch)
tree: 793b9b5fb021bf32eb80ec72cfb37991972ffa22
parent: f886426954d345463f9fd4c74941d886f555a435 (diff)
25 files changed, 30 insertions, 329 deletions
diff --git a/.gitignore b/.gitignore
index fe08b94..032b4f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 *.pyc
 *.xo
 *~
+web/files
diff --git a/templates b/templates
index 9a8b9ee..7194592 100644
--- a/templates
+++ b/templates
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <title>Journal Share - {nick}</title>
     <link href="style.css" rel="stylesheet" type="text/css"></link>
-    <link rel="icon" type="image/svg" href="images/journalshare-icon.svg"></link>
+    <link rel="icon" type="image/png" href="images/journalshare-icon.png"></link>
   </head>
   <body>
     <table id="toolbar">
@@ -13,7 +13,7 @@
         <tr>
           <td>
             <a href="index.html">
-              <img src="images/journalshare-icon.svg"></img>
+              <img src="images/journalshare-icon.png"></img>
             </a>
           </td>
           <td>
diff --git a/utils.py b/utils.py
index c0a6216..5626ac7 100644
--- a/utils.py
+++ b/utils.py
@@ -41,11 +41,11 @@ def fill_out_template(template, content):
 
 def find_icon(mime_type):
     generic_name = mime_type.split('/')[0]
-    if generic_name + '.svg' in os.listdir(ICONS_DIR):
-        return '%s.svg' % generic_name
+    if generic_name + '.png' in os.listdir(ICONS_DIR):
+        return '%s.png' % generic_name
 
     else:
-        return 'unknown.svg'
+        return 'unknown.png'
 
 
 def link_file(file_path):
diff --git a/web/files/f9ba5ac1-3f2a-4e71-a43d-6ebee8f1dd83_Vh_qS5.wsgi b/web/files/f9ba5ac1-3f2a-4e71-a43d-6ebee8f1dd83_Vh_qS5.wsgi
deleted file mode 100644
index 95d0cd4..0000000
--- a/web/files/f9ba5ac1-3f2a-4e71-a43d-6ebee8f1dd83_Vh_qS5.wsgi
+++ /dev/null
@@ -1,41 +0,0 @@
-import time
-
-
-def factorial_recursive(number):
-    """ Define a factorial function in recursive flavor """
-    result = 1
-    if number > 0:
-        result = number * factorial_recursive(number - 1)
-        print 'factorizing: ', number, ' result: ', result
-    return result
-
-
-def factorial_iterative(number):
-    """ Define a factorial function in iterative flavor """
-    result = 1
-    for i in range(1, number + 1):
-        result = result * i
-        print 'factorizing: ', i, ' result: ', result
-    return result
-
-
-def calculate(number, type):
-    """ Calculate factorial using recursive and iterative methods """
-    start = time.time()
-    if type == 0:
-        type_s = 'recursive'
-        factorial_recursive(number)
-    else:
-        type_s = 'iterative'
-        factorial_iterative(number)
-    delta = time.time() - start
-    if delta > 0:
-        print 'Type: ', type_s, ' in: ', 1 / delta
-    else:
-        print 'Type: ', type_s
-
-# ask for a number to compute the factorial of
-number = input('Please input a number:')
-print 'Calculating...'
-calculate(number, 0)
-calculate(number, 1)
diff --git a/web/files/ff6fbb53-0568-46d1-84b1-c2c85a9b6753_nqpsl1.png b/web/files/ff6fbb53-0568-46d1-84b1-c2c85a9b6753_nqpsl1.png
deleted file mode 100644
index 32cca3f..0000000
--- a/web/files/ff6fbb53-0568-46d1-84b1-c2c85a9b6753_nqpsl1.png
+++ /dev/null
diff --git a/web/images/audio.png b/web/images/audio.png
new file mode 100644
index 0000000..3613715
--- /dev/null
+++ b/web/images/audio.png
diff --git a/web/images/audio.svg b/web/images/audio.svg
deleted file mode 100644
index 5a3756b..0000000
--- a/web/images/audio.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	<!ENTITY stroke_color "#010101">
-	<!ENTITY fill_color "#FFFFFF">
-]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="clipping-audio">
-	<g display="inline">
-		<g>
-			<polygon fill="&fill_color;" points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914      10.932,48.914    " stroke="&stroke_color;" stroke-width="3.5"/>
-			<polyline fill="none" points="43.818,18.027 31.874,18.027 31.874,6.088    " stroke="&stroke_color;" stroke-width="3.5"/>
-		</g>
-	</g>
-	<path d="M28.325,39.697c-0.511-1.457-3.21-1.073-4.41-0.07   c-2.4,2.009-0.424,4.396,2.324,3.277C27.803,42.266,28.835,41.156,28.325,39.697z" display="inline" fill="&stroke_color;" stroke="&stroke_color;" stroke-width="3.5"/>
-	<line display="inline" fill="none" stroke="&stroke_color;" stroke-width="2.25" x1="28.941" x2="28.941" y1="39.806" y2="26.967"/>
-	<polygon display="inline" fill="&stroke_color;" points="35.047,25.036 27.838,28.595 27.838,24.728 35.047,21.166  "/>
-</g></svg>
-\ No newline at end of file
diff --git a/web/images/coso.py b/web/images/coso.py
new file mode 100644
index 0000000..5b31bce
--- /dev/null
+++ b/web/images/coso.py
@@ -0,0 +1,16 @@
+import os, sys
+
+if len(sys.argv) <= 1:
+  raise SystemExit(__doc__)
+
+for input in sys.argv[1:]:
+  if not input.endswith('.svg'):
+      print 'skipping "%s": it is not an svg file' % input
+      continue
+
+  output = input.replace('.svg', '.png')
+  # Convert using inkscape
+  if os.system('inkscape --export-png="%s"  --file="%s"' % (output, input)) != 0:
+    print 'inkscape png conversion fails'
+    sys.exit(1)
+
diff --git a/web/images/document.png b/web/images/document.png
new file mode 100644
index 0000000..8121dff
--- /dev/null
+++ b/web/images/document.png
diff --git a/web/images/document.svg b/web/images/document.svg
deleted file mode 100644
index a724766..0000000
--- a/web/images/document.svg
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  
-	  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	  <!ENTITY stroke_color "#010101">
-	  <!ENTITY fill_color "#FFFFFF">
-	  ]>
-
-<svg enable-background="new 0 0 55 55" height="55px" version="1.1" 
-     viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" 
-     xmlns="http://www.w3.org/2000/svg" 
-     xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
-
-  <g display="block" id="activity-write">
-    <g display="inline">
-      <g>
-	<path
-	   d="M 43.82,6.088 L 22.876,6.088 L 10.932,18.027 L 
-	      10.932,48.914 L 43.819,48.914 L 43.82,6.088 z"
-	   fill="&fill_color;" stroke="&stroke_color;" stroke-width="3.5" />
-      </g>
-      <polyline fill="none" points="10.932,18.027 22.876,18.027 22.876,6.088" 
-		stroke="&stroke_color;" stroke-width="3.5"/>
-    </g>
-  </g>
-</svg>
diff --git a/web/images/image.png b/web/images/image.png
new file mode 100644
index 0000000..8d5505f
--- /dev/null
+++ b/web/images/image.png
diff --git a/web/images/image.svg b/web/images/image.svg
deleted file mode 100644
index ac387f2..0000000
--- a/web/images/image.svg
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	<!ENTITY stroke_color "#010101">
-	<!ENTITY fill_color "#FFFFFF">
-]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="clipping-image">
-	<g display="inline">
-		<g>
-			<polygon fill="&fill_color;" points="48.788,43.944 48.788,23.002 36.849,11.058 5.962,11.058      5.962,43.944    " stroke="&stroke_color;" stroke-width="3.5"/>
-			<polyline fill="none" points="36.849,11.058 36.849,23.002 48.788,23.002    " stroke="&stroke_color;" stroke-width="3.5"/>
-		</g>
-	</g>
-	<path d="M27.504,23.342c-6.258,0-11.471,6.241-11.471,6.241s5.213,6.271,11.471,6.267   c6.259-0.005,11.475-6.274,11.475-6.274S33.763,23.338,27.504,23.342z M27.504,33.984c-2.423,0-4.387-1.966-4.387-4.389   c0-2.419,1.964-4.388,4.387-4.388c2.42,0,4.386,1.969,4.386,4.388C31.89,32.019,29.924,33.984,27.504,33.984z" display="inline" fill="&stroke_color;"/>
-	<circle cx="27.504" cy="29.597" display="inline" fill="&stroke_color;" r="1.991"/>
-</g></svg>
-\ No newline at end of file
diff --git a/web/images/journalshare-icon.png b/web/images/journalshare-icon.png
new file mode 100644
index 0000000..d027330
--- /dev/null
+++ b/web/images/journalshare-icon.png
diff --git a/web/images/journalshare-icon.svg b/web/images/journalshare-icon.svg
deleted file mode 100644
index 2a59986..0000000
--- a/web/images/journalshare-icon.svg
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   enable-background="new 0 0 55 55"
-   height="55px"
-   id="Layer_1"
-   version="1.1"
-   viewBox="0 0 55 55"
-   width="55px"
-   x="0px"
-   xml:space="preserve"
-   y="0px"
-   inkscape:version="0.48.3.1 r9886"
-   sodipodi:docname="journal-share-icon.svg"><metadata
-     id="metadata3072"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs3070" /><sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1024"
-     inkscape:window-height="541"
-     id="namedview3068"
-     showgrid="false"
-     inkscape:zoom="6.2181818"
-     inkscape:cx="4.2970532"
-     inkscape:cy="27.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="Layer_1" /><g
-     display="block"
-     id="activity-journal"
-     style="stroke:#78e600;stroke-opacity:1;fill:#033cd2;fill-opacity:1"><path
-       d="M45.866,44.669   c0,2.511-1.528,4.331-4.332,4.331H12.077V6h29.458c2.15,0,4.332,2.154,4.332,4.33L45.866,44.669L45.866,44.669z"
-       fill="#ffffff"
-       stroke="#666666"
-       stroke-linecap="round"
-       stroke-linejoin="round"
-       stroke-width="3.5"
-       id="path3058"
-       style="stroke:#78e600;stroke-opacity:1;fill:#033cd2;fill-opacity:1" /><line
-       fill="none"
-       stroke="#666666"
-       stroke-linecap="round"
-       stroke-linejoin="round"
-       stroke-width="3.5"
-       x1="21.341"
-       x2="21.341"
-       y1="6.121"
-       y2="48.881"
-       id="line3060"
-       style="stroke:#78e600;stroke-opacity:1;fill:#033cd2;fill-opacity:1" /><path
-       d="M7.384,14.464   c0,0,2.084,0.695,4.17,0.695c2.086,0,4.173-0.695,4.173-0.695"
-       fill="none"
-       stroke="#666666"
-       stroke-linecap="round"
-       stroke-linejoin="round"
-       stroke-width="3.5"
-       id="path3062"
-       style="stroke:#78e600;stroke-opacity:1;fill:#033cd2;fill-opacity:1" /><path
-       d="M7.384,28.021   c0,0,1.912,0.695,4.345,0.695s3.999-0.695,3.999-0.695"
-       fill="none"
-       stroke="#666666"
-       stroke-linecap="round"
-       stroke-linejoin="round"
-       stroke-width="3.5"
-       id="path3064"
-       style="stroke:#78e600;stroke-opacity:1;fill:#033cd2;fill-opacity:1" /><path
-       d="M7.384,41.232   c0,0,1.736,0.695,4.518,0.695c2.781,0,3.825-0.695,3.825-0.695"
-       fill="none"
-       stroke="#666666"
-       stroke-linecap="round"
-       stroke-linejoin="round"
-       stroke-width="3.5"
-       id="path3066"
-       style="stroke:#78e600;stroke-opacity:1;fill:#033cd2;fill-opacity:1" /></g><g
-     transform="matrix(0.56922896,0,0,0.54105698,47.285258,23.809361)"
-     style="display:block;stroke:#78e600;stroke-opacity:1;fill:#033cd2;fill-opacity:1"
-     display="block"
-     id="activity-browse"><circle
-       d="m 47.278,27.5 c 0,10.992123 -8.910877,19.903 -19.903,19.903 -10.992123,0 -19.9029999,-8.910877 -19.9029999,-19.903 0,-10.992123 8.9108769,-19.9029999 19.9029999,-19.9029999 10.992123,0 19.903,8.9108769 19.903,19.9029999 z"
-       style="fill:#033cd2;stroke:#78e600;stroke-width:3.50000000000000000;display:inline;stroke-opacity:1;fill-opacity:1"
-       sodipodi:ry="19.903"
-       sodipodi:rx="19.903"
-       sodipodi:cy="27.5"
-       sodipodi:cx="27.375"
-       cx="27.375"
-       cy="27.5"
-       display="inline"
-       r="19.903"
-       id="circle3158"
-       transform="translate(-38.596491,6.4327485)" /><g
-       style="display:inline;stroke:#78e600;stroke-opacity:1;fill:#033cd2;fill-opacity:1"
-       display="inline"
-       id="g3160"
-       transform="translate(-38.596491,6.4327485)"><path
-         style="fill:#033cd2;stroke:#78e600;stroke-width:3.50000000000000000;stroke-opacity:1;fill-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 27.376,7.598 c 0,0 -11.205,8.394 -11.205,19.976 0,11.583 11.205,19.829 11.205,19.829"
-         id="path3162" /><path
-         style="fill:#033cd2;stroke:#78e600;stroke-width:3.50000000000000000;stroke-opacity:1;fill-opacity:1"
-         inkscape:connector-curvature="0"
-         d="m 27.376,7.598 c 0,0 11.066,9.141 11.066,19.976 0,10.839 -11.066,19.829 -11.066,19.829"
-         id="path3164" /><line
-         style="fill:#033cd2;stroke:#78e600;stroke-width:3.50000000000000000;stroke-opacity:1;fill-opacity:1"
-         x1="27.375999"
-         x2="27.375999"
-         y1="7.598"
-         y2="47.402"
-         id="line3166" /><line
-         style="fill:#033cd2;stroke:#78e600;stroke-width:3.50000000000000000;stroke-opacity:1;fill-opacity:1"
-         x1="27.375999"
-         x2="27.375999"
-         y1="7.598"
-         y2="47.402"
-         id="line3168" /><line
-         style="fill:#033cd2;stroke:#78e600;stroke-width:3.50000000000000000;stroke-opacity:1;fill-opacity:1"
-         x1="27.375999"
-         x2="27.375999"
-         y1="7.598"
-         y2="47.402"
-         id="line3170" /><line
-         style="fill:#033cd2;stroke:#78e600;stroke-width:3.50000000000000000;stroke-opacity:1;fill-opacity:1"
-         x1="7.4720001"
-         x2="47.278"
-         y1="27.5"
-         y2="27.5"
-         id="line3172" /></g></g></svg>
-\ No newline at end of file
diff --git a/web/images/mime_ascii.png b/web/images/mime_ascii.png
new file mode 100644
index 0000000..edcfe3d
--- /dev/null
+++ b/web/images/mime_ascii.png
diff --git a/web/images/mime_ascii.svg b/web/images/mime_ascii.svg
deleted file mode 100644
index ae37e77..0000000
--- a/web/images/mime_ascii.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	<!ENTITY stroke_color "#010101">
-	<!ENTITY fill_color "#FFFFFF">
-]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="clipping-text">
-	<g display="inline">
-		<g>
-			<polygon fill="&fill_color;" points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914      10.932,48.914    " stroke="&stroke_color;" stroke-width="3.5"/>
-			<polyline fill="none" points="43.818,18.027 31.874,18.027 31.874,6.088    " stroke="&stroke_color;" stroke-width="3.5"/>
-		</g>
-	</g>
-	<line display="inline" fill="none" stroke="&stroke_color;" stroke-width="3.5" x1="17.875" x2="36.875" y1="26.25" y2="26.25"/>
-	<line display="inline" fill="none" stroke="&stroke_color;" stroke-width="3.5" x1="17.875" x2="36.875" y1="33.25" y2="33.25"/>
-	<line display="inline" fill="none" stroke="&stroke_color;" stroke-width="3.5" x1="17.875" x2="36.875" y1="40.25" y2="40.25"/>
-</g></svg>
-\ No newline at end of file
diff --git a/web/images/sound.png b/web/images/sound.png
new file mode 100644
index 0000000..3613715
--- /dev/null
+++ b/web/images/sound.png
diff --git a/web/images/sound.svg b/web/images/sound.svg
deleted file mode 100644
index 5a3756b..0000000
--- a/web/images/sound.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	<!ENTITY stroke_color "#010101">
-	<!ENTITY fill_color "#FFFFFF">
-]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="clipping-audio">
-	<g display="inline">
-		<g>
-			<polygon fill="&fill_color;" points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914      10.932,48.914    " stroke="&stroke_color;" stroke-width="3.5"/>
-			<polyline fill="none" points="43.818,18.027 31.874,18.027 31.874,6.088    " stroke="&stroke_color;" stroke-width="3.5"/>
-		</g>
-	</g>
-	<path d="M28.325,39.697c-0.511-1.457-3.21-1.073-4.41-0.07   c-2.4,2.009-0.424,4.396,2.324,3.277C27.803,42.266,28.835,41.156,28.325,39.697z" display="inline" fill="&stroke_color;" stroke="&stroke_color;" stroke-width="3.5"/>
-	<line display="inline" fill="none" stroke="&stroke_color;" stroke-width="2.25" x1="28.941" x2="28.941" y1="39.806" y2="26.967"/>
-	<polygon display="inline" fill="&stroke_color;" points="35.047,25.036 27.838,28.595 27.838,24.728 35.047,21.166  "/>
-</g></svg>
-\ No newline at end of file
diff --git a/web/images/text-uri-list.png b/web/images/text-uri-list.png
new file mode 100644
index 0000000..03a2247
--- /dev/null
+++ b/web/images/text-uri-list.png
diff --git a/web/images/text-uri-list.svg b/web/images/text-uri-list.svg
deleted file mode 100644
index fbd5276..0000000
--- a/web/images/text-uri-list.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	<!ENTITY stroke_color "#010101">
-	<!ENTITY fill_color "#FFFFFF">
-]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="clipping-url_1_">
-	<g display="inline">
-		<g>
-			<polygon fill="&fill_color;" points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914      10.932,48.914    " stroke="&stroke_color;" stroke-width="3.5"/>
-			<polyline fill="none" points="43.818,18.027 31.874,18.027 31.874,6.088    " stroke="&stroke_color;" stroke-width="3.5"/>
-		</g>
-	</g>
-	<g display="inline">
-		<circle cx="27.375" cy="33.5" fill="&stroke_color;" r="9.951"/>
-		<g>
-			<path d="M27.376,23.549c0,0-5.603,4.197-5.603,9.988s5.603,9.914,5.603,9.914" fill="none" stroke="&fill_color;" stroke-width="1.5"/>
-			<path d="M27.376,23.549c0,0,5.532,4.57,5.532,9.988     c0,5.419-5.532,9.914-5.532,9.914" fill="none" stroke="&fill_color;" stroke-width="1.5"/>
-			<line fill="none" stroke="&fill_color;" stroke-width="1.5" x1="27.376" x2="27.376" y1="23.549" y2="43.451"/>
-			<line fill="none" stroke="&fill_color;" stroke-width="1.5" x1="27.376" x2="27.376" y1="23.549" y2="43.451"/>
-			<line fill="none" stroke="&fill_color;" stroke-width="1.5" x1="27.376" x2="27.376" y1="23.549" y2="43.451"/>
-			<line fill="none" stroke="&fill_color;" stroke-width="1.5" x1="17.423" x2="37.326" y1="33.5" y2="33.5"/>
-		</g>
-	</g>
-</g></svg>
-\ No newline at end of file
diff --git a/web/images/unknown.png b/web/images/unknown.png
new file mode 100644
index 0000000..1715b61
--- /dev/null
+++ b/web/images/unknown.png
diff --git a/web/images/unknown.svg b/web/images/unknown.svg
deleted file mode 100644
index c094044..0000000
--- a/web/images/unknown.svg
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	<!ENTITY stroke_color "#010101">
-	<!ENTITY fill_color "#FFFFFF">
-]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="clipping-data">
-	<g>
-		<g>
-			<polygon fill="&fill_color;" points="10.932,6.088 31.874,6.088 43.818,18.027 43.818,48.914      10.932,48.914    " stroke="&stroke_color;" stroke-width="3.5"/>
-			<polyline fill="none" points="43.818,18.027 31.874,18.027 31.874,6.088    " stroke="&stroke_color;" stroke-width="3.5"/>
-		</g>
-	</g>
-	<rect fill="&stroke_color;" height="5.5" width="5.5" x="16.441" y="34.625"/>
-	<rect fill="&stroke_color;" height="5.5" width="5.5" x="21.941" y="29.125"/>
-	<rect fill="&stroke_color;" height="5.5" width="5.5" x="27.441" y="34.625"/>
-	<rect fill="&stroke_color;" height="5.5" width="5.5" x="32.941" y="29.125"/>
-</g></svg>
-\ No newline at end of file
diff --git a/web/images/video.png b/web/images/video.png
new file mode 100644
index 0000000..7b29bb3
--- /dev/null
+++ b/web/images/video.png
diff --git a/web/images/video.svg b/web/images/video.svg
deleted file mode 100644
index a20349c..0000000
--- a/web/images/video.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	<!ENTITY stroke_color "#010101">
-	<!ENTITY fill_color "#FFFFFF">
-]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="clipping-video">
-	<g display="inline">
-		<g>
-			<polygon fill="&fill_color;" points="48.788,43.944 48.788,23.002 36.849,11.058 5.962,11.058      5.962,43.944    " stroke="&stroke_color;" stroke-width="3.5"/>
-			<polyline fill="none" points="36.849,11.058 36.849,23.002 48.788,23.002    " stroke="&stroke_color;" stroke-width="3.5"/>
-		</g>
-	</g>
-	<path d="M27.504,24.842c-4.757,0-8.72,4.744-8.72,4.744s3.963,4.767,8.72,4.764   c4.757-0.004,8.722-4.77,8.722-4.77S32.262,24.839,27.504,24.842z M27.504,32.932c-1.842,0-3.335-1.494-3.335-3.336   c0-1.839,1.493-3.336,3.335-3.336c1.839,0,3.333,1.497,3.333,3.336C30.838,31.438,29.344,32.932,27.504,32.932z" display="inline" fill="&stroke_color;"/>
-	<circle cx="27.505" cy="29.597" display="inline" fill="&stroke_color;" r="1.514"/>
-	<circle cx="14.875" cy="29.597" display="inline" fill="&stroke_color;" r="1.514"/>
-	<circle cx="10.375" cy="29.597" display="inline" fill="&stroke_color;" r="1.514"/>
-	<circle cx="43.875" cy="29.597" display="inline" fill="&stroke_color;" r="1.514"/>
-	<circle cx="39.375" cy="29.597" display="inline" fill="&stroke_color;" r="1.514"/>
-</g></svg>
-\ No newline at end of file
diff --git a/web/index.html b/web/index.html
index a82d204..91b7308 100644
--- a/web/index.html
+++ b/web/index.html
@@ -4,7 +4,7 @@
     <meta charset="utf-8">
     <title>Journal Share - Agustin Zubiaga</title>
     <link href="style.css" rel="stylesheet" type="text/css"></link>
-    <link rel="icon" type="image/svg" href="images/journalshare-icon.svg"></link>
+    <link rel="icon" type="image/png" href="images/journalshare-icon.png"></link>
   </head>
   <body>
     <table id="toolbar">
@@ -12,7 +12,7 @@
         <tr>
           <td>
             <a href="index.html">
-              <img src="images/journalshare-icon.svg"></img>
+              <img src="images/journalshare-icon.png"></img>
             </a>
           </td>
           <td>
@@ -30,12 +30,12 @@
       <tbody>
         <tr>
           <td>
-            <a href="files/ff6fbb53-0568-46d1-84b1-c2c85a9b6753_nqpsl1.png">
-              <img src="images/image.svg" height="40" width="40" style="margin-right: 5px;">
+            <a href="files/ff6fbb53-0568-46d1-84b1-c2c85a9b6753_WgCiZT.png">
+              <img src="images/image.png" height="40" width="40" style="margin-right: 5px;">
             </a>
           </td>
           <td>
-            <a href="files/ff6fbb53-0568-46d1-84b1-c2c85a9b6753_nqpsl1.png">
+            <a href="files/ff6fbb53-0568-46d1-84b1-c2c85a9b6753_WgCiZT.png">
               fondo.png
             </a>
           </td>
@@ -46,12 +46,12 @@
       <tbody>
         <tr>
           <td>
-            <a href="files/f9ba5ac1-3f2a-4e71-a43d-6ebee8f1dd83_Vh_qS5.wsgi">
-              <img src="images/unknown.svg" height="40" width="40" style="margin-right: 5px;">
+            <a href="files/f9ba5ac1-3f2a-4e71-a43d-6ebee8f1dd83_us0sEb.wsgi">
+              <img src="images/unknown.png" height="40" width="40" style="margin-right: 5px;">
             </a>
           </td>
           <td>
-            <a href="files/f9ba5ac1-3f2a-4e71-a43d-6ebee8f1dd83_Vh_qS5.wsgi">
+            <a href="files/f9ba5ac1-3f2a-4e71-a43d-6ebee8f1dd83_us0sEb.wsgi">
               Pippy Activity
             </a>
           </td>
author	Agustin Zubiaga <aguz@sugarlabs.org>	2013-02-27 15:28:45 (GMT)
committer	Agustin Zubiaga <aguz@sugarlabs.org>	2013-02-27 15:28:45 (GMT)
commit	28dd53c6bb2d0c7d69aede38291e5b8e7e6b8879 (patch)
tree	793b9b5fb021bf32eb80ec72cfb37991972ffa22
parent	f886426954d345463f9fd4c74941d886f555a435 (diff)