Journal Share - {nick}

From 28dd53c6bb2d0c7d69aede38291e5b8e7e6b8879 Mon Sep 17 00:00:00 2001 From: Agustin Zubiaga Date: Wed, 27 Feb 2013 15:28:45 +0000 Subject: Using png instead of svg to support more browsers --- 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 @@ Journal Share - {nick} - + @@ -13,7 +13,7 @@

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 Binary files differ 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 Binary files differ 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 @@ - - -]> \ 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 Binary files differ 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 @@ - - - - ]> - - 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 Binary files differ 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 @@ - - -]> \ 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 Binary files differ 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 @@ - - \ 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 Binary files differ 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 @@ - - -]> \ 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 Binary files differ 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 @@ - - -]> \ 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 Binary files differ 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 @@ - - -]> \ 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 Binary files differ 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 @@ - - -]> \ 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 Binary files differ 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 @@ - - -]> \ 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 @@ Journal Share - Agustin Zubiaga - + @@ -12,7 +12,7 @@ @@ -46,12 +46,12 @@ -- cgit v0.9.1