From: Bernie Innocenti Date: Wed, 27 Oct 2010 18:46:43 +0000 (-0400) Subject: Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=7734400a4d9dd9f824cf5145bd59326d937e853d;hp=9e7061a83dcc7105bb9cec8ff69a785cca9ca0be;p=wiki.git Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki --- diff --git a/MicrosoftTactics b/MicrosoftTactics index 445e079..186faf9 100644 --- a/MicrosoftTactics +++ b/MicrosoftTactics @@ -29,7 +29,7 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg * "Get the Facts!" (AKA "Get the FUD!") campaign - * "We have the way out!" campaign with Unisys + * $25M spent for "[[http://news.cnet.com/2100-1001-870805.html | We have the way out!]]" anti-Unix campaign with Unisys === Targeting Linux distributors === @@ -84,6 +84,7 @@ steve_ballmer_bill_gates_i_wish_i_knew_how_to_quit_you.jpg * The [[http://www.microsoft.com/uk/servers/winclientshearts/ | Windows loves PHP]] campaign to promote the WAMP platform (2008) + * [[http://arstechnica.com/microsoft/news/2010/10/microsoft-posts-video-of-customers-criticizing-openoffice.ars Video against OpenOffice]] and OpenSource in general (2010) === Targeting OpenSource licenses and development model === diff --git a/TrueHeroes b/TrueHeroes index 0250c59..b973448 100644 --- a/TrueHeroes +++ b/TrueHeroes @@ -1,9 +1,5 @@ == True Heroes == - * General Executive Board Report and Proceedings [of The] Biennial Convention, Amalgamated Clothing Workers of America, 1914 - - "First they ignore you. Then they ridicule you. And then they attack you and want to burn you. And then they build monuments to you" - * Gandhi - http://en.wikipedia.org/wiki/Gandhi "There are many causes that I am prepared to die for but no causes that I am prepared to kill for." diff --git a/blog/2010/03 b/blog/2010/03 index 9d0d2aa..f133236 100644 --- a/blog/2010/03 +++ b/blog/2010/03 @@ -98,90 +98,90 @@ OLPC and Sugar were created. (photos courtesy of Carla Crosa) -|| {{ pictures/sugar/deployment/paraguay/caacupe/scratcheros/00008.jpg | maxwidth=480 | The "Scratcheros": Nadia, Benedicto and Alberto}} || {{ pictures/sugar/deployment/paraguay/caacupe/scratcheros/1.00011.jpg | maxwidth=480 | Albertito, our youngest volunteer, helping one of our trainers }} || +|| {{ pictures/sugar/deployment/paraguay/caacupe/scratcheros/00008.jpg | maxwidth=480 | The "Scratcheros": Sofia, Jose and Aldo}} || {{ pictures/sugar/deployment/paraguay/caacupe/scratcheros/1.00011.jpg | maxwidth=480 | Albertito, our youngest volunteer, helping one of our trainers }} || Today I spent some time with three siblings of Caacupé who has impressed me and the educators very much with their original creations in Scratch. Scratch is not a school subject, these kids are learning it on their own driven by their own passion. * **What's your name?** - * B: Benedicto - * N: Nadia - * A: Alberto + * J: Jose + * S: Sofia + * A: Aldo * **How old are you?** - * B: 12 - * N: 11 + * J: 12 + * S: 11 * A: 9 * **How did you learn Scratch?** - * B: We tried all the functions. First, we'll try one function, and see what it does. - * N: Like he said, we experimented with all the functions and check the results. + * J: We tried all the functions. First, we'll try one function, and see what it does. + * S: Like he said, we experimented with all the functions and check the results. * A: By looking at the animations of the games bundled with Scratch * **What job would you like to do when you're done with school?** - * B: Software engineer - * N: Paediatrician + * J: Software engineer + * S: Paediatrician * A: Nada... ;-) * **Do you like Turtle Art? What can you do with it?** - * B: Si. I can create rectangles and other geometrical shapes. - * N: Mostly geometric shapes + * J: Si. I can create rectangles and other geometrical shapes. + * S: Mostly geometric shapes * A: Only basic shapes: square, triangle... * **How much time do you spend with your laptop every day?** - * B: A few hours. - * N: 6 hours, more or less. + * J: A few hours. + * S: 6 hours, more or less. * A: Same for me. * (Mother's note: they don't use the laptop enough in school!) * **Nobody is teaching you, yeah? You're learning everything on your own?** - * B: No, with my sister. We try all activities, and when we find one we like, we spend some time on it together. - * N: I learned the basics of Turtle Art at the trainer's course. + * J: No, with my sister. We try all activities, and when we find one we like, we spend some time on it together. + * S: I learned the basics of Turtle Art at the trainer's course. * A: Yes, I learned it there too. * **What other activities do you like besides Scratch and Turtle Art?** - * B: //Hablar con Sara// [Speak] and //Super Vampire Ninja Zero//, //Máquina de discos// (Jukebox). - * N: //eToys//, to edit photos. I need someone to teach me all the rest. + * J: //Hablar con Sara// [Speak] and //Super Vampire Ninja Zero//, //Máquina de discos// (Jukebox). + * S: //eToys//, to edit photos. I need someone to teach me all the rest. * A: //Grabar// (Record), to take videos, interview people... * **What would you like to add to Sugar?** - * B: The "Snake" game - * N: Strategic games + * J: The "Snake" game + * S: Strategic games * A: ...hmm... * (Mom: They need an automatic spell checker... and a **screensaver**, of course). * **What's the most annoying problem for you with Sugar?** - * B: Can't use the "robot" function in //Hablar con Sara// ( - * N: I want bigger fonts in //Pintar// (Paint). + * J: Can't use the "robot" function in //Hablar con Sara// ( + * S: I want bigger fonts in //Pintar// (Paint). * A: //Escribir// (Write ;-) * **Would you like to learn a little bit of Python with Pippy?** - * B: Very well! + * J: Very well! -Then Benedicto and I got started. Python is easy, you can explain the basics to a smart kid in less than 30 minutes. +Then Jose and I got started. Python is easy, you can explain the basics to a smart kid in less than 30 minutes. I've shown him a few Pippy examples, describing the code briefly before running it, then making small changes to make -Benedicto grasp the possibilities. From his questions and comments, I'm pretty sure that he could figure out the +Jose grasp the possibilities. From his questions and comments, I'm pretty sure that he could figure out the concepts despite my very poor Spanish fluency and my usual disorganized style. -Nadia shows plenty of design talent: she uses Sugar to create short stories featuring her friends. She +Sofia shows plenty of design talent: she uses Sugar to create short stories featuring her friends. She cookie-cuts their photos and uses Scratch to animate them on fantasy backgrounds with music, sound effects and text. Recently, she started creating line-art versions of the photos using eToys, so her -new creations look more like cartoons. At this point, Benedicto mentioned the [[http://htf.atom.com/ | Happy Tree Friends]], +new creations look more like cartoons. At this point, Jose mentioned the [[http://htf.atom.com/ | Happy Tree Friends]], an innocently named Internet series which makes even South Park seem politically correct in comparison! HTF is Flash-only and doesn't seem to work with Gnash -- at least, we should be above any bigot criticism for conveying "inapprorpiate content" to young hack^Wchildren. -Nadia also created a platform videogame in which a dog needs to jump around to find the way out from +Sofia also created a platform videogame in which a dog needs to jump around to find the way out from each level, while a bouncing arrow chases him. Technically simple, but shows sensitive use of game-design principles. I'm not sure if the code is entirely new or comes in part from pre-existing Scratch games. It doesn't matter: in Free Software, remixing other people's work is the rule. -We updated Benedicto's and Nadia's laptops to [[http://oficina.paraguayeduca.org/~bernie/py-xo1/ | F11-XO1 Paraguay, build 65]], -which contains the latest release of [[http://wiki.sugarlabs.org/go/0.84/Notes | Sugar 0.84]]. Benedicto had been previously +We updated Jose's and Sofia's laptops to [[http://oficina.paraguayeduca.org/~bernie/py-xo1/ | F11-XO1 Paraguay, build 65]], +which contains the latest release of [[http://wiki.sugarlabs.org/go/0.84/Notes | Sugar 0.84]]. Jose had been previously testing my build 45, revealing some bugs in networking and activities. -|| {{ pictures/sugar/deployment/paraguay/caacupe/scratcheros/00005-game-written-in-scratch.jpg | maxwidth=480 | Perro Bros }} || {{ pictures/sugar/deployment/paraguay/caacupe/scratcheros/00016-nadias-work-in-etoys.jpg | maxwidth=480 | Nadia's line-art image }} || +|| {{ pictures/sugar/deployment/paraguay/caacupe/scratcheros/00005-game-written-in-scratch.jpg | maxwidth=480 | Perro Bros }} || {{ pictures/sugar/deployment/paraguay/caacupe/scratcheros/00016-nadias-work-in-etoys.jpg | maxwidth=480 | Sofia's line-art image }} || == Mon, Mar 8 - Children want Sugar 0.84, for the wrong reasons == diff --git a/blog/2010/08 b/blog/2010/08 new file mode 100644 index 0000000..32fa1c8 --- /dev/null +++ b/blog/2010/08 @@ -0,0 +1,9 @@ +== August 2010 == + +=== Fri, Sep 28 -- Arrival in Mozambique === + +{{pictures/sugar/deployment/mozambique/maputo/20100830_002.jpg|maxwidth=800|Praça dos Trabalhadores in Maputo}} +{{pictures/sugar/deployment/mozambique/ifp-matola/DSCN0223.JPG|maxwidth=800|Instituto de Formação de Professores de Matola}} +{{pictures/sugar/deployment/mozambique/ifp-matola/20100828_002.jpg|maxwidth=800|Our home at the Matola IFP}} + +See the photo gallery from [[pictures/sugar/deployment/mozambique/ifp-matola|IFP Matola]] and [[pictures/sugar/deployment/mozambique/maputo|Maputo]]. diff --git a/blog/2010/09 b/blog/2010/09 new file mode 100644 index 0000000..9bddf31 --- /dev/null +++ b/blog/2010/09 @@ -0,0 +1,32 @@ +== September 2010 == + +=== Sun, Sep 19 - Kruger Park === + +This week-end I rent a small car and headed to the [[http://www.krugerpark.co.za/|Kruger National Park]] +for a one-day visit, dawn to dusk (6am to 6pm). + +Highly recommended if you like seeing wild animals and nature. + +{{pictures/vacation/south_africa_2010/kruger-park/IMG_1418.JPG | maxwidth=640}} +{{pictures/vacation/south_africa_2010/kruger-park/IMG_1512.JPG | maxwidth=640}} + +{{pictures/vacation/south_africa_2010/kruger-park/IMG_1334.JPG | maxwidth=640}} +{{pictures/vacation/south_africa_2010/kruger-park/IMG_1302.JPG | maxwidth=640}} + +See [[pictures/vacation/south_africa_2010/kruger-park | all the photos]]. + +=== Mon, Sep 13 - OLPC Tech Training === + +{{pictures/sugar/deployment/mozambique/tech-training/DSCN0237.JPG|maxwidth=800}} + +See [[pictures/sugar/deployment/mozambique/tech-training|all the photos]]. + +=== Mon, Sep 6 - Schools survey === + +Today we visited 5 candidate schools in the province of Maputo to check the status of their +infrastructure. All the schools have some electric wiring, but none of them have outlets +in the classrooms. + +{{pictures/sugar/deployment/mozambique/schools/Matola%20C/IMG_1117.JPG|maxwidth=800}} + +See [[pictures/sugar/deployment/mozambique/schools|all the photos]]. \ No newline at end of file diff --git a/blog/2010/10 b/blog/2010/10 new file mode 100644 index 0000000..47006de --- /dev/null +++ b/blog/2010/10 @@ -0,0 +1,39 @@ +== October 2010 == + +=== Fri, Oct 15 -- First classroom sessions === + +Young children really do learn fast. I can hardly believe that how fast some +of them went from using a computer for the first time to browsing the Internet. + +See [[pictures/sugar/deployment/mozambique/classroom-sessions | all the photos]]. + +{{pictures/sugar/deployment/mozambique/classroom-sessions/IMG_1920.JPG | maxwidth=480}} +{{pictures/sugar/deployment/mozambique/classroom-sessions/IMG_1898.JPG | maxwidth=480}} + +{{pictures/sugar/deployment/mozambique/classroom-sessions/IMG_2083.JPG | maxwidth=480}} +{{pictures/sugar/deployment/mozambique/classroom-sessions/IMG_2042.JPG | maxwidth=480}} + +=== Mon, Oct 11 -- Laptops handout! === + +Finally, the long awaited day has come. + +Our team distributed laptops to 3rd, 4th and 5th grade children of the pilot school annex to +the [[http://www.mec.gov.mz/dep.php?p=504|Instituto de Formaçao de Professores de Matola]]. + +Considering that this was the first experience for everyone in the national OLPC team, today's +operations went remarkably smoothly. We organized an assembly line with multiple stages: +box opening, firmware upgrades, labeling, inventorying and checkout. + +Tomorrow the school will be closed for teacher's day. On Wednesday, we'll start to see some +action in the classrooms! + +See [[pictures/sugar/deployment/mozambique/laptops-handout | all the photos]]. + +{{pictures/sugar/deployment/mozambique/laptops-handout/IMG_1729.JPG | maxwidth=480}} +{{pictures/sugar/deployment/mozambique/laptops-handout/IMG_1765.JPG | maxwidth=480}} + +{{pictures/sugar/deployment/mozambique/laptops-handout/IMG_1751.JPG | maxwidth=480}} +{{pictures/sugar/deployment/mozambique/laptops-handout/IMG_1772.JPG | maxwidth=480}} + +{{pictures/sugar/deployment/mozambique/laptops-handout/IMG_1766.JPG | maxwidth=480}} +{{pictures/sugar/deployment/mozambique/laptops-handout/IMG_1864.JPG | maxwidth=480}} diff --git a/memo/benchmark/compression b/memo/benchmark/compression index 9e5ae47..8a08760 100644 --- a/memo/benchmark/compression +++ b/memo/benchmark/compression @@ -2,6 +2,13 @@ === Lossless compression algorithms === +{{{ +time lzop /dev/null +time gzip /dev/null +time bzip2 /dev/null +time xz /dev/null +}}} + || **Hostname** || **System** || ** CPU Brand** || **CPU** ||**Clock**||**Arch**|| || r2d2 || PowerEdge R410 || Intel(R) Xeon(R) CPU || E5520 || 2.27GHz || x86_64 || || ummak || Lenovo Laptop || Intel(R) Core(TM)2 Duo CPU || T9300 || 2.50GHz || x86_64 || diff --git a/sys/EditPage b/sys/EditPage index b33b583..47ab7d1 100644 --- a/sys/EditPage +++ b/sys/EditPage @@ -1,12 +1,12 @@ -**Editing <> for <> from <>** +Editing **<>** for **<>** from **<>**:
-
+ - + \\ - +  \\ diff --git a/sys/geekigeeki.css b/sys/geekigeeki.css index 2776738..f061a4f 100644 --- a/sys/geekigeeki.css +++ b/sys/geekigeeki.css @@ -15,7 +15,10 @@ body { a { color: #1010FF; } a:visited { color: #501080; } a.nonexistent { color: #D04040; } -a.navlink { color: #000088; font-size: smaller; font-weight: bold} +a.navlink, a.login { font-size: smaller; font-weight: bold; text-decoration: none; } +a.navlink:hover, a.login:hover { text-decoration: underline; } +a.navlink { color: #000088; } +a.login { color: #bb0000; } a.external { font-style: italic; } a.heading { text-decoration: none; color: #aaaaaa; font-size: smaller; } @@ -167,7 +170,7 @@ div.nav { background-color: #aaccee;*/ border-color: #888888; background-color: #cccccc; - border-style: solid; + border-style: solid border-top-width: 0px; border-bottom-width: 2px; border-left-width: 0px; @@ -182,13 +185,22 @@ div.nav { margin-right: 0px; } -.nav hr { - display: none; +.nav li { + display: inline; } -.nav .login { - font-size: small; - color: red; +.nav ul +{ + list-style-type: none; + margin: 0; + padding: 0; + padding-top: 6px; + padding-bottom: 6px; +} + + +.nav hr { + display: none; } #footer div { @@ -337,13 +349,14 @@ pre.notice { margin: 0px; } -#editor { +.editor input[type='text'], .editor textarea { font-family: monospace; - width: 100%; color: black; background-color: white; border: 1px solid #8cacbb; } +.editor textarea.editor { width: 100%; } +.editor input.changelog { width: 50%; } /* thumbnails */ diff --git a/sys/macros/CgiVar.py b/sys/macros/CgiVar.py index b29f5d4..807662c 100644 --- a/sys/macros/CgiVar.py +++ b/sys/macros/CgiVar.py @@ -6,8 +6,9 @@ def _macro_CgiVar(*args, **kvargs): if args[1].startswith('HTTP_'): return os.environ.get(args[1], '') return { + 'SCRIPT_NAME': script_name(), 'REMOTE_USER': remote_user(), 'REMOTE_HOST': get_hostname(remote_host()), 'REMOTE_ADDR': remote_host(), - 'QUERY_STRING': relative_url(query_string()), + 'QUERY_STRING': query_string(), }[args[1]]