From ec84bf09840e6258b49caab7bac17068e4d83305 Mon Sep 17 00:00:00 2001 From: AndrewJones Date: Tue, 31 May 2011 15:50:36 +0000 Subject: [PATCH] Item10812: Replace potentially offensive example git-svn-id: http://svn.foswiki.org/trunk/EasyTimelinePlugin@11803 0b4bb1d4-4e5a-0410-9cc4-b2b747904278 --- data/System/EasyTimelinePlugin.txt | 105 +++++++++--------- .../Plugins/EasyTimelinePlugin/MANIFEST | 2 +- .../KurdistanWorkersPartyExample.png | Bin 1442 -> 0 bytes .../EasyTimelinePlugin/LifeOnEarthExample.png | Bin 0 -> 1349 bytes 4 files changed, 51 insertions(+), 56 deletions(-) delete mode 100644 pub/System/EasyTimelinePlugin/KurdistanWorkersPartyExample.png create mode 100644 pub/System/EasyTimelinePlugin/LifeOnEarthExample.png diff --git a/data/System/EasyTimelinePlugin.txt b/data/System/EasyTimelinePlugin.txt index 764f4e9..41bd0a7 100644 --- a/data/System/EasyTimelinePlugin.txt +++ b/data/System/EasyTimelinePlugin.txt @@ -357,11 +357,11 @@ PlotData= %ENDTWISTY% ----+++ Kurdistan Workers Party Example +---+++ Life On Earth Example Very condensed timeline. Not taking up much space, but very informative in it's layered telling. View Raw Text of this topic to see source. -KurdistanWorkersPartyExample.png +LifeOnEarthExample.png %TWISTY{ showlink="Show source..." @@ -370,57 +370,51 @@ Very condensed timeline. Not taking up much space, but very informative in it's hideimgleft="%ICONURLPATH{toggleclose-small}%" }% -%TIMELINE% -ImageSize = width:600px height:70px -PlotArea = width:570px height:20px left:20px bottom:20px -AlignBars = late -DateFormat = dd/mm/yyyy -Period = from:01/01/1968 till:01/01/2006 -TimeAxis = orientation:horizontal -BarData = - bar:apo - -Colors = - id:grid1 value:rgb(0.4,0.6,0.4) # major grid - id:grid2 value:rgb(0.80,0.80,1) # minor grid - id:canvas value:gray(0.95) # background for whole image - id:barcol value:gray(0.85) # background for bars - id:gray value:gray(0.6) # for colophon - -ScaleMajor = gridcolor:grid1 unit:year increment:5 start:01/01/1970 -ScaleMinor = gridcolor:grid2 unit:year increment:1 start:01/01/1968 - -BackgroundColors = canvas:canvas bars:barcol - -Define $center0 = align:center shift:( 0, 14) -Define $center2 = align:center shift:( -18, 14) -Define $center1 = align:center shift:( 0, 24) -Define $large = width:0.15in -Define $broad = width:0.11in -Define $narrow = width:0.07in -Define $small = width:0.03in -TextData = - fontsize:L - textcolor:ORANGE - pos:(10,65) - text:"Life Time" -LineData= - at:12/09/1980 color:purple width:1px - at:15/02/1999 color:purple width:1px -PlotData = - fontsize:S width:0.15in align:center - bar:apo - from:start till:12/09/1980 $narrow $center1 color:lightorange textcolor:lightorange text:Origins - from:01/04/1973 till:27/10/1978 $small $center0 color:drabgreen textcolor:drabgreen text:APOcus - from:27/10/1978 till:12/09/1980 $small $center0 color:teal textcolor:teal text:Urban - from:12/09/1980 till:15/07/1984 $small $center0 color:green textcolor:green text:Syria - from:15/07/1984 till:17/03/1993 $small $center0 color:brightgreen textcolor:brightgreen text:Gerilla - from:08/06/1993 till:15/12/1995 $small $center0 color:brightgreen - from:16/08/1996 till:02/07/1999 $small $center0 color:brightgreen - from:01/12/1984 till:end $narrow $center2 color:pink textcolor:pink text:Vacuum at N-Iraq - from:01/01/1996 till:01/04/1999 $broad $center1 color:blue textcolor:blue text:Undecleared War - from:01/08/1998 till:01/04/1999 $large $center0 color:red textcolor:red text:Capture -%ENDTIMELINE% +%TIMELINE% +# Source: http://en.wikipedia.org/wiki/Timeline_of_evolution +ImageSize = width:600px height:70px +PlotArea = width:570px height:20px left:20px bottom:20px +AlignBars = late +DateFormat = yyyy +Period = from:-4500 till:0 +TimeAxis = orientation:horizontal +BarData = + bar:apo + +Colors = + id:grid1 value:rgb(0.4,0.6,0.4) # major grid + id:grid2 value:rgb(0.80,0.80,1) # minor grid + id:canvas value:gray(0.95) # background for whole image + id:barcol value:gray(0.85) # background for bars + id:gray value:gray(0.6) # for colophon + +ScaleMajor = gridcolor:grid1 unit:year increment:500 start:-4500 + +BackgroundColors = canvas:canvas bars:barcol + +Define $center0 = align:center shift:( 0, 14) +Define $center2 = align:center shift:( -18, 14) +Define $center1 = align:center shift:( 0, 24) +Define $large = width:0.15in +Define $broad = width:0.11in +Define $narrow = width:0.07in +Define $small = width:0.03in +TextData = + fontsize:L + textcolor:ORANGE + pos:(10,65) + text:"Life on Earth" +PlotData = + fontsize:S width:0.15in align:center + bar:apo + from:start till:-4000 $large $center1 color:lightorange textcolor:lightorange text:Formation + from:-4000 till:-3000 $large $center0 color:drabgreen textcolor:drabgreen text:Life + from:-3000 till:-2000 $large $center0 color:drabgreen textcolor:drabgreen text:Photosynthesis + from:-2000 till:end $large $center1 color:teal textcolor:teal text:Eukaryotes + from:-1500 till:end $broad $center2 color:green textcolor:green text:Multicellular life + from:-300 till:-100 $narrow $center1 color:blue textcolor:blue text:Dinosaurs + from:-250 till:end $small $center2 color:red textcolor:red text:Mammals +%ENDTIMELINE% %ENDTWISTY% @@ -912,11 +906,12 @@ You should also check your =warnings.txt= log file, and %SYSTEMWEB%.InstalledPlu | Plugin Author(s): | Foswiki:Main.AndrewJones | | Previous Author(s): | Foswiki:Main.SteffenPoulsen, TWiki:Main.MikeMarion | -| Copyright: | © 2009 - 2010, Andrew Jones, © 2006, Mike Marion | +| Copyright: | © 2009 - 2011, Andrew Jones, © 2006, Mike Marion | | License: | [[http://www.gnu.org/licenses/gpl.html][GPL (Gnu General Public License)]] | | Plugin Release: | %$RELEASE% | | Plugin Version: | %$VERSION% | | Change History: |   | +| 31 May 2011 | Foswiki:Tasks.Item10812: Replace potentially offensive example - Foswiki:Main.AndrewJones | | 10 Dec 2010 | v1.4 - Foswiki:Tasks.Item10141 - Provide warnings in =configure= when the path's to the scripts are incorrect; Doc updates - Foswiki:Main.AndrewJones | | 09 Dec 2010 | v1.3 - Foswiki:Tasks.Item10114 - Fixes for Windows; Foswiki:Tasks.Item9927 - =umask= fixes - Foswiki:Main.AndrewJones | | 11 Feb 2010 | v1.2 - Foswiki:Tasks.Item8484 - Missing screenshot; Foswiki:Tasks.Item8487 - Set NOWYSIWYG for plugin topic; Foswiki:Tasks.Item8488 - Update =pl= dependency. Thanks to Foswiki:Main.BryanThale. - Foswiki:Main.AndrewJones | @@ -941,6 +936,6 @@ For syntax highlighting, if installed %META:FILEATTACHMENT{name="KurdistanWorkersPartyExample.png" attr="h" autoattached="1" comment="Kurdistan Workers Party Example" date="1145658236" path="KurdistanWorkersPartyExample.png" size="1442" user="Main.ProjectContributor" version="1"}% %META:FILEATTACHMENT{name="FreecivTimelineExample.png" attr="h" autoattached="1" comment="Freeciv Timeline Example" date="1145658275" path="FreecivTimelineExample.png" size="1777" user="Main.ProjectContributor" version="1"}% %META:FILEATTACHMENT{name="BinaryLogicExample.png" attr="h" autoattached="1" comment="Binary Logic Example" date="1145658197" path="BinaryLogicExample.png" size="493" user="Main.ProjectContributor" version="1"}% -%META:FILEATTACHMENT{name="NewKingdomExample.png" attr="h" autoattached="1" comment="New Kingdom Example" date="1145658255" path="NewKingdomExample.png" size="4963" user="Main.ProjectContributor" version="1"}% +%META:FILEATTACHMENT{name="LifeOnEarthExample.png" attr="h" autoattached="1" comment="Life On Earth Example" date="1145658255" path="LifeOnEarthExample.png" size="4963" user="Main.ProjectContributor" version="1"}% %META:FILEATTACHMENT{name="WindowsVersionsExample.png" attr="h" autoattached="1" comment="Windows Versions Example" date="1145658178" path="WindowsVersionsExample.png" size="2682" user="Main.ProjectContributor" version="1"}% %META:FILEATTACHMENT{name="Timeline_of_Conquests_of_the_Ottoman_Empire_Example.png" attr="h" autoattached="1" comment="Timeline of Conquests of the Ottoman Empire Example" date="1145658328" path="Timeline_of_Conquests_of_the_Ottoman_Empire_Example.png" size="3565" user="Main.ProjectContributor" version="1"}% diff --git a/lib/Foswiki/Plugins/EasyTimelinePlugin/MANIFEST b/lib/Foswiki/Plugins/EasyTimelinePlugin/MANIFEST index bbfedae..a4eacbf 100644 --- a/lib/Foswiki/Plugins/EasyTimelinePlugin/MANIFEST +++ b/lib/Foswiki/Plugins/EasyTimelinePlugin/MANIFEST @@ -6,7 +6,7 @@ lib/Foswiki/Configure/Checkers/Plugins/EasyTimelinePlugin/EasyTimelineScript.pm pub/System/EasyTimelinePlugin/BinaryLogicExample.png Example rendered image pub/System/EasyTimelinePlugin/FreecivTimelineExample.png Example rendered image pub/System/EasyTimelinePlugin/IcelandicHeritageExample.png Example rendered image -pub/System/EasyTimelinePlugin/KurdistanWorkersPartyExample.png Example rendered image +pub/System/EasyTimelinePlugin/LifeOnEarthExample.png Example rendered image pub/System/EasyTimelinePlugin/NewKingdomExample.png Example rendered image pub/System/EasyTimelinePlugin/Timeline_of_Conquests_of_the_Ottoman_Empire_Example.png Example rendered image pub/System/EasyTimelinePlugin/UNIXVersionsExample.png Example rendered image diff --git a/pub/System/EasyTimelinePlugin/KurdistanWorkersPartyExample.png b/pub/System/EasyTimelinePlugin/KurdistanWorkersPartyExample.png deleted file mode 100644 index 38e5f25fe32cdf36f145d9b4f0e7add52eb01280..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1442 zcmV;T1zq}yP)SMvn9P^}e=`8G00930|IEz)007L)|Jc~rW|(Go0CxZY06qU&O#lD|FiAu~ zRCt{2mphB&RuspN?HOAW5@COUfN&cY4E_Qx`~lod8JNoTbWRg+7c~L5A_TVIF4eM| zK>9QxMINNlC(viedEAF=%lArtXqB1!*ImthX#YC;aqf`}5EK*?6ciNHP?Is8dtlF9 zQ-X*5W%ZMzb$iWi)w6`UiRuW}5tam6gw^YfVZtdk0q&1mxNid?h-8WhmGtpErLlAp zKI1%H!>c%RQxU9j56m&{^}3c~2|+*@2~h)m$Ry7L!;+bsMnbUUk2xkcynGJ2`s3O> ztIi1f+_WM*Dzz=GrdvDzkm-*9wr=TdI6x=^onLAj&IZ)>a?Wb8KwQ`=7b{^6>p)T( z5hOb(k36upkz8c8!-I7-ScIerEFnd(mJ2zTR}t3g5wP9!Su|u`!{HOGOIcPeg0p!Z zjh-o|1eVSt$n_WaFicE_niz1a-k%mRoaF9w~A)?&_ zXBl=(t~Jy_X4y%bS(Un5F7KAI6M-{pZtu!z^nVmd2!D!J@osU`f-{NNO#xeD#ac%H)%z zSt+v^(;lqIWEQ598mkKk7BjN2&O;?zkBa-@+mPl6)~UB)2^O~H@is(4xB*x978U_o z4>c@bW*x)QnZ-qmL8R0aEX*w30RtI@4zYtNez%Q+T!-QlJ)3o)dTD&A?NzZIxTLFv;Wl1Xe>&JhvP0_nin1-@-PwS7bV z5z%%wU9O>f^W8%KUsypwK|xp0yN|37^5^4k`@?sY!=Ih2WvgHQy_(e}QDs^7<3B$% zw|X03)wg=_uzs3W>dhZtHGjYWtHA>v!kXMvUwUA@PutS>f1mN6wgFasoe67MTaRUZ z{pZ@D&87P0yNXGA%H#QO|H8`ytN<&(dM&Wd)axwp0ao}Z4PWp9)zufxnURtT65UR^BJHndPwJNAp_6wXCQ* z6dIW$thf*#hZkGbctW(2P3?<{-F#LQ*!8%(KlWqo=kWrl1FKe8;15fps$~TptGo`Z z7;3}v7w;U@ZuLE3?yJgT@} zD#}$+kJsT);=LSqCi7}lnMyntdu zm7;)6E2mEu(~U zSyFn|Z0%)S3{EGm1JwuZS6Ol>R`vlJdShv0rtRW0%VWnp}YP!t12v$Rr8@{KF^pMBd9x}MtRVQju>|U1( zJJf}Wfn_diw#J)UaX^{?*Xwovj>xEB1!2*Bs%5Zt1gr9fA^XK5&o~nkbgpwMUUoJ; zDTT5$<+@7)EE9%!ndSfsh*ir|#R0h&Ve##1DsoLlp+`yl!`l#s1Ycpwswft{uo`lW zMaOFzVPs&X=TQ@lU=Pv1Hzo%<78bf#JN7J`AXAM4(gZ@Ye-~I-Au5H6r9n&c`UtCqQ5fJ}3&D=C2YwM_)rJ%A|8Jd8(2A^wxim3=PWJ7s>9o!u@Zp zz>-dz;DK4Of9*Nh&n5Wp*S!(<8@24k5ET^_6?K;iUH>-Us>AoHjIe$ytjlxNMpzNn z<2t#Dup+F_g!Mkr^p6h_R)iH{MOZ%xR!r~_))QdOD8l-+u%4_k!nz;Uf1v6geK@rI z#ms;4cI!6(#oMjh{1{iiV&-4#G*34FTBmuk`PVwllg+=@ zX};EcR8&+{RMc-%2K4`*&ijt+=;fPvU%`Es^}T;Q>p^VKn-46-sx^5nC*V(gr z3}#v1Y2(AgdVcqT<(ayD*Qrm>%hab=&(1rzL-?fHX)*}F$^zrPY92!7L*t!pJ_t*H zIB;QM#CEqZ_^<%ei3*F-4JQQ8IR7!o?^%+qRP)+tCEw`gHCXQR%?z_fLxBa%OAkZ; zY0YlxFONEP&k1>!dfcFA{T(dGZb{fTJCxuv|9CLLgSy;tdruVWPoISoymoe&BzSt* z;q^XmF7WAad%e%?rGGk5sOZakb^D$^J#_Q>r-OcW5)b_k2SqR^V_j