r1127 - in xwiki/trunk: patches src/main/web/skins src/main/web/skins/xwiki10 src/main/web/skins/xwiki10/ajax src/main/web/skins/xwiki10/chw src/main/web/skins/xwiki10/mimetypes src/main/web/skins/xwiki10/mimetypes-alpha src/main/web/skins/xwiki10/rico src/main/web/skins/xwiki10/scriptaculous

Sergiu Dumitriu sdumitriu at users.forge.objectweb.org
Wed Aug 9 23:32:28 CEST 2006


Author: sdumitriu
Date: 2006-08-09 23:32:26 +0200 (Wed, 09 Aug 2006)
New Revision: 1127

Added:
   xwiki/trunk/patches/Headings.patch
   xwiki/trunk/patches/ImageMacro.patch
   xwiki/trunk/src/main/web/skins/xwiki10/
   xwiki/trunk/src/main/web/skins/xwiki10/accessdenied.vm
   xwiki/trunk/src/main/web/skins/xwiki10/ad.vm
   xwiki/trunk/src/main/web/skins/xwiki10/addComment.gif
   xwiki/trunk/src/main/web/skins/xwiki10/addFile.gif
   xwiki/trunk/src/main/web/skins/xwiki10/admin.vm
   xwiki/trunk/src/main/web/skins/xwiki10/adminactions.vm
   xwiki/trunk/src/main/web/skins/xwiki10/adminglobalrights.vm
   xwiki/trunk/src/main/web/skins/xwiki10/admingroups.vm
   xwiki/trunk/src/main/web/skins/xwiki10/adminmodes.vm
   xwiki/trunk/src/main/web/skins/xwiki10/adminprefs.vm
   xwiki/trunk/src/main/web/skins/xwiki10/adminskin.vm
   xwiki/trunk/src/main/web/skins/xwiki10/adminspacerights.vm
   xwiki/trunk/src/main/web/skins/xwiki10/aimoffline.gif
   xwiki/trunk/src/main/web/skins/xwiki10/aimonline.gif
   xwiki/trunk/src/main/web/skins/xwiki10/ajax/
   xwiki/trunk/src/main/web/skins/xwiki10/ajax/Drag.js
   xwiki/trunk/src/main/web/skins/xwiki10/ajax/ieemu.js
   xwiki/trunk/src/main/web/skins/xwiki10/ajax/toolTip.js
   xwiki/trunk/src/main/web/skins/xwiki10/arrow.gif
   xwiki/trunk/src/main/web/skins/xwiki10/attachments.vm
   xwiki/trunk/src/main/web/skins/xwiki10/attachmentsinline.vm
   xwiki/trunk/src/main/web/skins/xwiki10/attachwysiwyg.vm
   xwiki/trunk/src/main/web/skins/xwiki10/box_bottom.gif
   xwiki/trunk/src/main/web/skins/xwiki10/box_bottom2.gif
   xwiki/trunk/src/main/web/skins/xwiki10/box_top.gif
   xwiki/trunk/src/main/web/skins/xwiki10/box_top2.gif
   xwiki/trunk/src/main/web/skins/xwiki10/browserdetect.js
   xwiki/trunk/src/main/web/skins/xwiki10/button_c.gif
   xwiki/trunk/src/main/web/skins/xwiki10/button_d.gif
   xwiki/trunk/src/main/web/skins/xwiki10/button_g.gif
   xwiki/trunk/src/main/web/skins/xwiki10/cancel.vm
   xwiki/trunk/src/main/web/skins/xwiki10/changeavatar.vm
   xwiki/trunk/src/main/web/skins/xwiki10/changemyavatar.vm
   xwiki/trunk/src/main/web/skins/xwiki10/changes.vm
   xwiki/trunk/src/main/web/skins/xwiki10/changesall.vm
   xwiki/trunk/src/main/web/skins/xwiki10/changesdoc.vm
   xwiki/trunk/src/main/web/skins/xwiki10/chw/
   xwiki/trunk/src/main/web/skins/xwiki10/chw/axispage.vm
   xwiki/trunk/src/main/web/skins/xwiki10/chw/colorpicker.vm
   xwiki/trunk/src/main/web/skins/xwiki10/chw/datapage.vm
   xwiki/trunk/src/main/web/skins/xwiki10/chw/navigationimages.vm
   xwiki/trunk/src/main/web/skins/xwiki10/chw/tdwnavigationimages.vm
   xwiki/trunk/src/main/web/skins/xwiki10/chw/tdwwizard.vm
   xwiki/trunk/src/main/web/skins/xwiki10/chw/titlepage.vm
   xwiki/trunk/src/main/web/skins/xwiki10/chw/typepage.vm
   xwiki/trunk/src/main/web/skins/xwiki10/chwSampleBarChart.png
   xwiki/trunk/src/main/web/skins/xwiki10/chwSamplePieChart.png
   xwiki/trunk/src/main/web/skins/xwiki10/chwScripts.js
   xwiki/trunk/src/main/web/skins/xwiki10/chwSkin.css
   xwiki/trunk/src/main/web/skins/xwiki10/chwTaskCompleted.png
   xwiki/trunk/src/main/web/skins/xwiki10/chwTaskCompletedHover.png
   xwiki/trunk/src/main/web/skins/xwiki10/chwTaskCompleting.png
   xwiki/trunk/src/main/web/skins/xwiki10/chwTaskCompletingHover.png
   xwiki/trunk/src/main/web/skins/xwiki10/chwTaskWaiting.png
   xwiki/trunk/src/main/web/skins/xwiki10/chwTaskWaitingHover.png
   xwiki/trunk/src/main/web/skins/xwiki10/chwcolormap.png
   xwiki/trunk/src/main/web/skins/xwiki10/chwempty.png
   xwiki/trunk/src/main/web/skins/xwiki10/chwluminancemoz.png
   xwiki/trunk/src/main/web/skins/xwiki10/chwmain.vm
   xwiki/trunk/src/main/web/skins/xwiki10/chwpointer.png
   xwiki/trunk/src/main/web/skins/xwiki10/classes.css
   xwiki/trunk/src/main/web/skins/xwiki10/code.vm
   xwiki/trunk/src/main/web/skins/xwiki10/collapse.png
   xwiki/trunk/src/main/web/skins/xwiki10/collapseh.png
   xwiki/trunk/src/main/web/skins/xwiki10/colors.css
   xwiki/trunk/src/main/web/skins/xwiki10/comments.vm
   xwiki/trunk/src/main/web/skins/xwiki10/commentsinline.vm
   xwiki/trunk/src/main/web/skins/xwiki10/contentview.vm
   xwiki/trunk/src/main/web/skins/xwiki10/corner.png
   xwiki/trunk/src/main/web/skins/xwiki10/create.vm
   xwiki/trunk/src/main/web/skins/xwiki10/css-valid-vert.png
   xwiki/trunk/src/main/web/skins/xwiki10/css-valid.png
   xwiki/trunk/src/main/web/skins/xwiki10/delete.vm
   xwiki/trunk/src/main/web/skins/xwiki10/deleted.vm
   xwiki/trunk/src/main/web/skins/xwiki10/diff.vm
   xwiki/trunk/src/main/web/skins/xwiki10/diffall.vm
   xwiki/trunk/src/main/web/skins/xwiki10/diffs
   xwiki/trunk/src/main/web/skins/xwiki10/direct.vm
   xwiki/trunk/src/main/web/skins/xwiki10/docalreadyexists.vm
   xwiki/trunk/src/main/web/skins/xwiki10/docdoesnotexist.vm
   xwiki/trunk/src/main/web/skins/xwiki10/ed_about.gif
   xwiki/trunk/src/main/web/skins/xwiki10/ed_format_bold.gif
   xwiki/trunk/src/main/web/skins/xwiki10/ed_format_italic.gif
   xwiki/trunk/src/main/web/skins/xwiki10/ed_hr.gif
   xwiki/trunk/src/main/web/skins/xwiki10/ed_image.gif
   xwiki/trunk/src/main/web/skins/xwiki10/ed_link.gif
   xwiki/trunk/src/main/web/skins/xwiki10/edit.vm
   xwiki/trunk/src/main/web/skins/xwiki10/editPage.gif
   xwiki/trunk/src/main/web/skins/xwiki10/editactions.vm
   xwiki/trunk/src/main/web/skins/xwiki10/editclass.vm
   xwiki/trunk/src/main/web/skins/xwiki10/editinline.vm
   xwiki/trunk/src/main/web/skins/xwiki10/editmodes.vm
   xwiki/trunk/src/main/web/skins/xwiki10/editobject.vm
   xwiki/trunk/src/main/web/skins/xwiki10/editpanels.vm
   xwiki/trunk/src/main/web/skins/xwiki10/editprefs.vm
   xwiki/trunk/src/main/web/skins/xwiki10/editrights.vm
   xwiki/trunk/src/main/web/skins/xwiki10/editwiki.vm
   xwiki/trunk/src/main/web/skins/xwiki10/editwysiwyg.vm
   xwiki/trunk/src/main/web/skins/xwiki10/elements.css
   xwiki/trunk/src/main/web/skins/xwiki10/endpage.vm
   xwiki/trunk/src/main/web/skins/xwiki10/exception.vm
   xwiki/trunk/src/main/web/skins/xwiki10/expand.png
   xwiki/trunk/src/main/web/skins/xwiki10/expandh.png
   xwiki/trunk/src/main/web/skins/xwiki10/fakeleftpanels.vm
   xwiki/trunk/src/main/web/skins/xwiki10/fakerightpanels.vm
   xwiki/trunk/src/main/web/skins/xwiki10/flash.vm
   xwiki/trunk/src/main/web/skins/xwiki10/footer.vm
   xwiki/trunk/src/main/web/skins/xwiki10/fudocs.vm
   xwiki/trunk/src/main/web/skins/xwiki10/getpagedatasources.vm
   xwiki/trunk/src/main/web/skins/xwiki10/gettables.vm
   xwiki/trunk/src/main/web/skins/xwiki10/global.vm
   xwiki/trunk/src/main/web/skins/xwiki10/header.vm
   xwiki/trunk/src/main/web/skins/xwiki10/hiddenobject.vm
   xwiki/trunk/src/main/web/skins/xwiki10/history.gif
   xwiki/trunk/src/main/web/skins/xwiki10/history.vm
   xwiki/trunk/src/main/web/skins/xwiki10/historyinline.vm
   xwiki/trunk/src/main/web/skins/xwiki10/horizontal.gif
   xwiki/trunk/src/main/web/skins/xwiki10/htmlfooter.vm
   xwiki/trunk/src/main/web/skins/xwiki10/htmlheader.vm
   xwiki/trunk/src/main/web/skins/xwiki10/ie.css
   xwiki/trunk/src/main/web/skins/xwiki10/inline.vm
   xwiki/trunk/src/main/web/skins/xwiki10/languages.vm
   xwiki/trunk/src/main/web/skins/xwiki10/layoutvars.vm
   xwiki/trunk/src/main/web/skins/xwiki10/layoutwizard.html
   xwiki/trunk/src/main/web/skins/xwiki10/layoutwizard.vm
   xwiki/trunk/src/main/web/skins/xwiki10/leftpanels.vm
   xwiki/trunk/src/main/web/skins/xwiki10/login.vm
   xwiki/trunk/src/main/web/skins/xwiki10/logo.gif
   xwiki/trunk/src/main/web/skins/xwiki10/logobleu.jpg
   xwiki/trunk/src/main/web/skins/xwiki10/logobordeaux.jpg
   xwiki/trunk/src/main/web/skins/xwiki10/logosahara.jpg
   xwiki/trunk/src/main/web/skins/xwiki10/logovert.jpg
   xwiki/trunk/src/main/web/skins/xwiki10/macros.txt
   xwiki/trunk/src/main/web/skins/xwiki10/macros.vm
   xwiki/trunk/src/main/web/skins/xwiki10/macrowysiwyg.vm
   xwiki/trunk/src/main/web/skins/xwiki10/menuview.vm
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/bin.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/cdempty.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/cdimage.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/cdtrack.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/deb.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/empty.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/encrypted.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/excel.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/exec.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/firefox.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/font_truetype.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/html.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/image.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/jar.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/jpg.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/lnk.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/lnk2.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/make.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/midi.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/openoffice.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/pdf.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/ppt.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/ps.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/quicktime.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/rar.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/real_doc.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/recycled.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/rpm.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/shellscript.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/sound.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/source_c.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/source_cpp.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/source_f.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/source_h.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/source_l.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/source_moc.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/source_o.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/source_p.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/source_s.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/source_y.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/swf.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/tar.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/tar_bz.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/tar_gz.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/tgz.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/txt.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/unknown.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/unknown_debian.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/unknown_mandriva.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/unknown_suse.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/unknown_ubuntu.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/url.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/vectorgfx.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/video.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/video2.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/wav.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/word.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/xml.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/xmms.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes-alpha/zip1.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/bin.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/cdempty.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/cdimage.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/cdtrack.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/deb.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/empty.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/encrypted.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/excel.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/exec.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/firefox.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/font_truetype.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/html.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/image.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/jar.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/jpg.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/lnk.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/lnk2.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/make.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/midi.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/openoffice.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/pdf.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/ppt.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/ps.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/quicktime.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/rar.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/real_doc.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/recycled.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/rpm.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/shellscript.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/sound.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/source_c.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/source_cpp.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/source_f.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/source_h.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/source_l.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/source_moc.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/source_o.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/source_p.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/source_s.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/source_y.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/swf.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/tar.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/tar_bz.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/tar_gz.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/tgz.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/txt.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/unknown.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/unknown_debian.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/unknown_mandriva.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/unknown_suse.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/unknown_ubuntu.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/url.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/vectorgfx.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/video.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/video2.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/wav.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/word.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/xml.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/xmms.png
   xwiki/trunk/src/main/web/skins/xwiki10/mimetypes/zip1.png
   xwiki/trunk/src/main/web/skins/xwiki10/msnoffline.gif
   xwiki/trunk/src/main/web/skins/xwiki10/msnonline.gif
   xwiki/trunk/src/main/web/skins/xwiki10/mysql-vert.png
   xwiki/trunk/src/main/web/skins/xwiki10/noavatar.png
   xwiki/trunk/src/main/web/skins/xwiki10/objects.vm
   xwiki/trunk/src/main/web/skins/xwiki10/page.css
   xwiki/trunk/src/main/web/skins/xwiki10/pdf.gif
   xwiki/trunk/src/main/web/skins/xwiki10/pdf.vm
   xwiki/trunk/src/main/web/skins/xwiki10/pdffooter.vm
   xwiki/trunk/src/main/web/skins/xwiki10/pdfheader.vm
   xwiki/trunk/src/main/web/skins/xwiki10/pixel_clair.gif
   xwiki/trunk/src/main/web/skins/xwiki10/pixel_fonce.gif
   xwiki/trunk/src/main/web/skins/xwiki10/plain.vm
   xwiki/trunk/src/main/web/skins/xwiki10/portletConfig.vm
   xwiki/trunk/src/main/web/skins/xwiki10/presentation.css
   xwiki/trunk/src/main/web/skins/xwiki10/preview.vm
   xwiki/trunk/src/main/web/skins/xwiki10/previewfooter.vm
   xwiki/trunk/src/main/web/skins/xwiki10/previewheader.vm
   xwiki/trunk/src/main/web/skins/xwiki10/print.vm
   xwiki/trunk/src/main/web/skins/xwiki10/printheader.vm
   xwiki/trunk/src/main/web/skins/xwiki10/prototype.js
   xwiki/trunk/src/main/web/skins/xwiki10/rdf.vm
   xwiki/trunk/src/main/web/skins/xwiki10/register.vm
   xwiki/trunk/src/main/web/skins/xwiki10/rico/
   xwiki/trunk/src/main/web/skins/xwiki10/rico/prototype.js
   xwiki/trunk/src/main/web/skins/xwiki10/rico/rico.js
   xwiki/trunk/src/main/web/skins/xwiki10/rico/rico.js.my
   xwiki/trunk/src/main/web/skins/xwiki10/rico/xwrico.js
   xwiki/trunk/src/main/web/skins/xwiki10/rightpanels.vm
   xwiki/trunk/src/main/web/skins/xwiki10/rights.vm
   xwiki/trunk/src/main/web/skins/xwiki10/rollback.vm
   xwiki/trunk/src/main/web/skins/xwiki10/rss-valid-vert.png
   xwiki/trunk/src/main/web/skins/xwiki10/rss-valid.png
   xwiki/trunk/src/main/web/skins/xwiki10/rss.css
   xwiki/trunk/src/main/web/skins/xwiki10/rss.gif
   xwiki/trunk/src/main/web/skins/xwiki10/s5.vm
   xwiki/trunk/src/main/web/skins/xwiki10/s5b.vm
   xwiki/trunk/src/main/web/skins/xwiki10/s5bheader.vm
   xwiki/trunk/src/main/web/skins/xwiki10/s5header.vm
   xwiki/trunk/src/main/web/skins/xwiki10/save.vm
   xwiki/trunk/src/main/web/skins/xwiki10/screenlayout.css
   xwiki/trunk/src/main/web/skins/xwiki10/scriptaculous/
   xwiki/trunk/src/main/web/skins/xwiki10/scriptaculous/controls.js
   xwiki/trunk/src/main/web/skins/xwiki10/scriptaculous/dragdrop.js
   xwiki/trunk/src/main/web/skins/xwiki10/scriptaculous/effects.js
   xwiki/trunk/src/main/web/skins/xwiki10/scriptaculous/prototype.js
   xwiki/trunk/src/main/web/skins/xwiki10/scriptaculous/util.js
   xwiki/trunk/src/main/web/skins/xwiki10/simpleedittoolbar.vm
   xwiki/trunk/src/main/web/skins/xwiki10/skin.js
   xwiki/trunk/src/main/web/skins/xwiki10/skinvariables.vm
   xwiki/trunk/src/main/web/skins/xwiki10/space.vm
   xwiki/trunk/src/main/web/skins/xwiki10/startpage.vm
   xwiki/trunk/src/main/web/skins/xwiki10/status.vm
   xwiki/trunk/src/main/web/skins/xwiki10/style.css
   xwiki/trunk/src/main/web/skins/xwiki10/style1.css
   xwiki/trunk/src/main/web/skins/xwiki10/style2.css
   xwiki/trunk/src/main/web/skins/xwiki10/style3.css
   xwiki/trunk/src/main/web/skins/xwiki10/style_clean.css
   xwiki/trunk/src/main/web/skins/xwiki10/stylesheetlinks.vm
   xwiki/trunk/src/main/web/skins/xwiki10/stylesheets.vm
   xwiki/trunk/src/main/web/skins/xwiki10/stylesheets2.vm
   xwiki/trunk/src/main/web/skins/xwiki10/tdwScripts.js
   xwiki/trunk/src/main/web/skins/xwiki10/tdwSkin.css
   xwiki/trunk/src/main/web/skins/xwiki10/temp.css
   xwiki/trunk/src/main/web/skins/xwiki10/templatedoesnotexist.vm
   xwiki/trunk/src/main/web/skins/xwiki10/textarea_text.vm
   xwiki/trunk/src/main/web/skins/xwiki10/textarea_wysiwyg.vm
   xwiki/trunk/src/main/web/skins/xwiki10/userinactive.vm
   xwiki/trunk/src/main/web/skins/xwiki10/view.vm
   xwiki/trunk/src/main/web/skins/xwiki10/viewattachrev.vm
   xwiki/trunk/src/main/web/skins/xwiki10/viewmodes.vm
   xwiki/trunk/src/main/web/skins/xwiki10/viewobject.vm
   xwiki/trunk/src/main/web/skins/xwiki10/wiki.css
   xwiki/trunk/src/main/web/skins/xwiki10/wikibits.js
   xwiki/trunk/src/main/web/skins/xwiki10/wml.vm
   xwiki/trunk/src/main/web/skins/xwiki10/xhtml-valid-vert.png
   xwiki/trunk/src/main/web/skins/xwiki10/xhtml-valid.png
   xwiki/trunk/src/main/web/skins/xwiki10/xml.vm
   xwiki/trunk/src/main/web/skins/xwiki10/xwiki-power-vert.png
   xwiki/trunk/src/main/web/skins/xwiki10/xwiki-power.png
   xwiki/trunk/src/main/web/skins/xwiki10/xwiki.css
   xwiki/trunk/src/main/web/skins/xwiki10/xwiki.js
   xwiki/trunk/src/main/web/skins/xwiki10/xwiki.js.bk
   xwiki/trunk/src/main/web/skins/xwiki10/xwikivars.vm
   xwiki/trunk/src/main/web/skins/xwiki10/xwlogoblack.png
   xwiki/trunk/src/main/web/skins/xwiki10/xwlogoblack0.png
   xwiki/trunk/src/main/web/skins/xwiki10/xwlogoblack1.png
   xwiki/trunk/src/main/web/skins/xwiki10/xwlogoblack2.png
   xwiki/trunk/src/main/web/skins/xwiki10/xwlogoblue.png
Log:


Added: xwiki/trunk/patches/Headings.patch
===================================================================
--- xwiki/trunk/patches/Headings.patch	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/patches/Headings.patch	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,107 @@
+--- src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java	2006-07-12 14:09:57.000000000 +0300
++++ src/main/java/com/xpn/xwiki/render/filter/XWikiHeadingFilter.java	2006-07-31 10:37:37.000000000 +0300
+@@ -65,34 +65,45 @@
+     formatter.applyPattern(outputTemplate);
+  }
+ 
+-  public String handleMatch(MatchResult result, FilterContext context) {
+-    String id = null;
+-    String level = result.group(1);
+-    String text = result.group(3);
+-    String numbering = "";
+-    
+-    RenderContext rcontext = context.getRenderContext();
+-    XWikiContext xcontext  = ((XWikiRadeoxRenderEngine) rcontext.getRenderEngine()).getContext();
+-    
++ public String handleMatch(MatchResult result, FilterContext context) {
++   String id = null;
++   String level = result.group(1);
++   int level_i = (level.length()+3)/2;
++   String hlevel = (level_i <= 6 ? level_i : 6)+ "";
++   String text = result.group(3);
++   String numbering = "";
++
++   RenderContext rcontext = context.getRenderContext();
++   XWikiContext xcontext  = ((XWikiRadeoxRenderEngine) rcontext.getRenderEngine()).getContext();
++
+     // generate unique ID of the heading  
+-    List processedHeadings = (List) rcontext.get("processedHeadings");
+-    if (processedHeadings == null) {
+-      processedHeadings = new ArrayList();
+-      rcontext.set("processedHeadings", processedHeadings);
+-    }
+-    int occurence = 0;
+-    for (Iterator iter = processedHeadings.iterator(); iter.hasNext();) if (iter.next().equals(text)) occurence++;
+-    id = TOCGenerator.makeHeadingID(text, occurence, xcontext);
+-    processedHeadings.add(text);
+-    
++   List processedHeadings = (List) rcontext.get("processedHeadings");
++   if (processedHeadings == null) {
++     processedHeadings = new ArrayList();
++     rcontext.set("processedHeadings", processedHeadings);
++   }
++   boolean isIdOk = false;
++   id = TOCGenerator.makeHeadingID(text, 0, xcontext);
++   while(!isIdOk){
++     int occurence = 0;
++     for (Iterator iter = processedHeadings.iterator(); iter.hasNext();){
++       if (iter.next().equals(id)) occurence++;
++     }
++     id = TOCGenerator.makeHeadingID(id, occurence, xcontext);
++     if(occurence == 0){
++       isIdOk = true;
++     }
++   }
++   processedHeadings.add(id);
++
+     //  add numbering if the flag is set
+-    if (xcontext.containsKey(TOC_NUMBERED) && ((Boolean)xcontext.get(TOC_NUMBERED)).booleanValue()) {
+-      if (xcontext.containsKey(TOC_DATA)) {
+-        Map tocEntry = (Map) ((Map) xcontext.get(TOC_DATA)).get(id);
+-        if (tocEntry != null) numbering = (String) tocEntry.get(TOCGenerator.TOC_DATA_NUMBERING) + " ";
+-      }
+-    }
+-    
+-    return formatter.format(new Object[]{id, level.replace('.', '-'), numbering, text});
+-  } 
++   if (xcontext.containsKey(TOC_NUMBERED) && ((Boolean)xcontext.get(TOC_NUMBERED)).booleanValue()) {
++     if (xcontext.containsKey(TOC_DATA)) {
++       Map tocEntry = (Map) ((Map) xcontext.get(TOC_DATA)).get(id);
++       if (tocEntry != null) numbering = (String) tocEntry.get(TOCGenerator.TOC_DATA_NUMBERING) + " ";
++     }
++   }
++
++   return formatter.format(new Object[]{id, level.replace('.', '-'), numbering, text, hlevel});
++ } 
+ }
+--- src/main/java/com/xpn/xwiki/util/TOCGenerator.java	2006-07-12 14:09:59.000000000 +0300
++++ src/main/java/com/xpn/xwiki/util/TOCGenerator.java	2006-07-31 10:40:27.000000000 +0300
+@@ -33,6 +33,7 @@
+ import org.apache.commons.collections.OrderedMap;
+ import org.apache.commons.collections.map.ListOrderedMap;
+ 
++import com.xpn.xwiki.XWiki;
+ import com.xpn.xwiki.XWikiContext;
+ import com.xpn.xwiki.web.Utils;
+ 
+@@ -115,7 +116,9 @@
+   public static String makeHeadingID (String text, int occurence, XWikiContext context) {
+     // Encode to convert unsafe chars
+     text = Utils.encode(text.trim(), context);
+-        
++    text = "H" + XWiki.getURLEncoded(text);
++    text = text.replaceAll("[\\+|%]", "");
++
+     if (occurence > 0) {
+       return text + "-" + occurence;
+     } else {
+--- src/main/resources/radeox_markup_xwiki.properties	2006-07-12 14:10:01.000000000 +0300
++++ src/main/resources/radeox_markup_xwiki.properties	2006-07-31 10:43:46.000000000 +0300
+@@ -22,4 +22,4 @@
+ 
+ # Add anchor and optional TOC numbering into headings
+ filter.heading.match=^[\\p{Space}]*(1(\\.1)*)[\\p{Space}]+(.*?)$
+-filter.heading.print=<h3 class=\"heading-{1}\"><a id="{0}" name="{0}">{2}{3}</a></h3> 
+\ No newline at end of file
++filter.heading.print=<h{4} class=\"heading-{1}\"><span id="{0}">{2}{3}</span></h{4}> 
+\ No newline at end of file

Added: xwiki/trunk/patches/ImageMacro.patch
===================================================================
--- xwiki/trunk/patches/ImageMacro.patch	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/patches/ImageMacro.patch	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,17 @@
+--- src/main/java/com/xpn/xwiki/render/macro/ImageMacro.java	2006-07-12 14:09:57.000000000 +0300
++++ src/main/java/com/xpn/xwiki/render/macro/ImageMacro.java	2006-07-27 12:13:51.000000000 +0300
+@@ -56,10 +56,10 @@
+     str.append("<img src=\"");
+     str.append(doc.getAttachmentURL(img, "download", xcontext));
+     str.append("\" ");
+-    if ((!"none".equals(height))&&(height!=null))
+-     str.append("height=\"" + height + "\" ");
+-    if ((!"none".equals(width))&&(width!=null))
+-           str.append("width=\"" + width + "\" ");
++    if ((!"none".equals(height))&&(height!=null)&&(!"".equals(height.trim())))
++     str.append("height=\"" + height.trim() + "\" ");
++    if ((!"none".equals(width))&&(width!=null)&&(!"".equals(width.trim())))
++           str.append("width=\"" + width.trim() + "\" ");
+     str.append("alt=\"");
+     str.append(img);
+     str.append("\" />");

Added: xwiki/trunk/src/main/web/skins/xwiki10/accessdenied.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/accessdenied.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/accessdenied.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,13 @@
+###
+### Access denied messge
+###
+###
+#template("startpage.vm")
+#if ($xwiki.isReadOnly())
+#xwikimessageboxstart($msg.get("error") $msg.get("readonly"))
+#else
+#xwikimessageboxstart($msg.get("error") $msg.get("notallowed"))
+#end
+$!exception
+#xwikimessageboxend()
+#template("endpage.vm")
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/ad.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/ad.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/ad.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,23 @@
+###
+### Ads
+###
+### Google ads - not used for the moment
+###
+#if($xwiki.getAdType().equals("google"))
+#set($googleclientid = $xwiki.getAdClientId())
+<script type="text/javascript"><!--
+google_ad_client = "${googleclientid}";
+google_ad_width = 234;
+google_ad_height = 60;
+google_ad_format = "234x60_as";
+google_ad_channel ="";
+google_color_border = "336699";
+google_color_bg = "FFFFFF";
+google_color_link = "0000FF";
+google_color_url = "008000";
+google_color_text = "000000";
+//--></script>
+<script type="text/javascript"
+  src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
+</script>
+#end

Added: xwiki/trunk/src/main/web/skins/xwiki10/addComment.gif
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/skins/xwiki10/addComment.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/skins/xwiki10/addFile.gif
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/skins/xwiki10/addFile.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/skins/xwiki10/admin.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/admin.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/admin.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,84 @@
+###
+### Main "admin" template
+###
+### General wrapper for administration actions
+###
+#template("xwikivars.vm")
+#set($global = $request.getParameter("global"))
+##
+## Determine what editor to show
+##
+#if((!$editor) || ($editor == ""))
+#set($editor = $request.getParameter("editor"))
+#if((!$editor) || ($editor == ""))
+#if($doc.fullName == "XWiki.XWikiPreferences")
+#set($editor = "prefs")
+#elseif($doc.name == "WebPreferences")
+#set($editor = "spacerights")
+#elseif($doc.fullName == "XWiki.XWikiGroups")
+#set($editor = "groups")
+#elseif($doc.fullName == "XWiki.XWikiUsers")
+#set($editor = "users")
+#elseif($doc.name == $xwiki.getXWikiPreference("skin"))
+#set($editor = "skin")
+#else
+#set($editor = "spacerights")
+#end
+#end
+#end
+#set($redirecturl = "")
+#if($editor == "prefs" && ($doc.fullName != "XWiki.XWikiPreferences" || $global != 1))
+#set($redirecturl = $xwiki.getDocument("XWiki.XWikiPreferences").getURL("admin", "editor=prefs&global=1"))
+#elseif($editor == "globalrights" && (($doc.fullName != "XWiki.XWikiPreferences") || $global != 1))
+#set($redirecturl = $xwiki.getDocument("XWiki.XWikiPreferences").getURL("admin", "editor=globalrights&global=1"))
+#elseif($editor == "spacerights" && $doc.name != "WebPreferences")
+#set($redirecturl = $xwiki.getDocument("${doc.web}.WebPreferences").getURL("admin", "editor=spacerights"))
+#elseif($editor == "groups" && $doc.fullName != "XWiki.XWikiGroups")
+#set($redirecturl = $xwiki.getDocument("XWiki.XWikiGroups").getURL("admin", "editor=groups"))
+#elseif($editor == "users" && $doc.fullName != "XWiki.XWikiUsers")
+#set($redirecturl = $xwiki.getDocument("XWiki.XWikiUsers").getURL("admin", "editor=users"))
+#elseif($editor == "skin" && $doc.fullName != $xwiki.getXWikiPreference("skin"))
+#set($redirecturl = $xwiki.getDocument($xwiki.getXWikiPreference("skin")).getURL("admin", "editor=skin"))
+#end
+#if($redirecturl != "")
+$response.sendRedirect($redirecturl)
+#end
+##
+## Header
+##
+#template("layoutvars.vm")
+#template("htmlheader.vm")
+#template("header.vm")
+<div class="layoutsection">
+##
+## Content
+##
+#set($force = $!request.get("force"))
+#if(!$hasadmin)
+#xwikimessageboxstart($msg.get("error") $msg.get('notallowed'))
+#xwikimessageboxend()
+#elseif (($tdoc.getLocked()==true)&&(!$force))
+#xwikimessageboxstart($msg.get("notice") "$msg.get('doclockedby') $xwiki.getLocalUserName($doc.getLockingUser())")
+<a href="$doc.getURL("edit", "$!{request.getQueryString().replace('&', '&amp;').replace('&amp;amp;', '&amp;')}&amp;force=1")">$msg.get("forcelock")</a>
+#xwikimessageboxend()
+#else
+<h4 id="xwikieditorstitles">$msg.get("chooseeditor")</h4>
+#template("adminmodes.vm")
+</div>
+<div id="xwikieditor" class="layoutsection">
+<div id="editcolumn" class="editor">
+##<div>#template("adminactions.vm")</div>
+#set($formname = "update")
+#set($saveaction = "save")
+#template("admin${editor}.vm")
+<div>#template("adminactions.vm")</div>
+</div>
+#template("adminpanels.vm")
+<div class="clearfloats"></div>
+##
+## Footer
+##
+#end
+</div>
+#template("footer.vm")
+#template("htmlfooter.vm")
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/adminactions.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/adminactions.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/adminactions.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,24 @@
+###
+### @deprecated
+###
+###
+<script type="text/javascript">
+function checkDocumentContent() {
+  if (document.forms.${formname}.content) {
+    var content = document.forms.${formname}.content.value;
+    if (content == null || content == "") {
+      alert("$msg.get('wikicontentcannotbeempty')");
+      return false ;
+}
+}
+  return true;
+}
+</script>
+<div class="layoutsubsection editactions">
+##<button type="submit" name="actionbtn" value="
+  <a href="$doc.getURL("cancel")" onclick="document.forms.${formname}.action=this.href; if (document.forms.${formname}.onsubmit) document.forms.${formname}.onsubmit(); document.forms.${formname}.submit(); return false;" >$msg.get("cancel")</a>
+  <span> | </span>
+  <a style="cursor:pointer;" onclick="document.forms.${formname}.action='$doc.getURL("preview")'; if (document.forms.${formname}.onsubmit) document.forms.${formname}.onsubmit();if (checkDocumentContent()) document.forms.${formname}.submit(); return false;" >$msg.get("preview")</a>
+  <span> | </span>
+  <a href="$doc.getURL("${saveaction}")" onclick="document.forms.${formname}.action=this.href; if (document.forms.${formname}.onsubmit) document.forms.${formname}.onsubmit();if (checkDocumentContent()) document.forms.${formname}.submit(); return false;" >$msg.get("save")</a>
+</div>
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/adminglobalrights.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/adminglobalrights.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/adminglobalrights.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,33 @@
+#set($formname = "update")
+#set($saveaction = "save")
+<div class="layoutsubsection">
+#set ($classname = "XWiki.XWikiGlobalRights")
+#set( $class = $xwiki.getDocument($classname).xWikiClass)
+#set( $redirect = "$xwiki.getRequestURL()&amp;editor=rights")
+<div style="overflow:auto">
+<form id="update" method="post" action="$doc.getURL("save")" onsubmit="cancelCancelEdit()">
+<div>
+<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
+#set ($first = 1)
+#set($nb = $doc.getObjectNumbers("${class.name}"))
+<input type="hidden" name="${class.name}_nb" value="$nb" />
+<table id="xwikirightstable">
+ <tr>
+#*<th>$msg.get("Right")</th>*#<th>$msg.get("Users")</th><th>$msg.get("Groups")</th><th>$msg.get("Level")</th><th>$msg.get("Allow-Deny")</th><th>$msg.get("Remove")</th>
+ </tr>
+#foreach ($obj in $doc.getObjects($class.name))
+#set($class = $obj.xWikiClass)
+    <tr>
+##        <td align="center">$!{obj.number}</td>
+        <td>$!doc.displayEdit($class.users,"${class.name}_${obj.number}_",$obj)</td>
+        <td>$!doc.displayEdit($class.groups,"${class.name}_${obj.number}_",$obj)</td>
+        <td>$!doc.displayEdit($class.levels,"${class.name}_${obj.number}_",$obj)</td>
+        <td>$!doc.displayEdit($class.allow,"${class.name}_${obj.number}_",$obj)</td>
+        <td class="xwikibuttonlink"><a href="$doc.getURL("objectremove", "classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${xwiki.getURLEncoded($redirect)}")" onclick="return confirm('$msg.get("confirmobjectremove")')">$msg.get("Remove")</a></td>
+    </tr>
+#end
+  </table>
+ </div>
+</form>
+</div>
+</div>
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/admingroups.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/admingroups.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/admingroups.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,33 @@
+#set($formname = "update")
+#set($saveaction = "save")
+<div class="layoutsubsection">
+#set ($classname = "XWiki.XWikiRights")
+#set( $class = $xwiki.getDocument($classname).xWikiClass)
+#set( $redirect = "$xwiki.getRequestURL()&amp;editor=rights")
+<div style="overflow:auto">
+<form id="update" method="post" action="$doc.getURL("save")" onsubmit="cancelCancelEdit()">
+<div>
+<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
+#set ($first = 1)
+#set($nb = $doc.getObjectNumbers("${class.name}"))
+<input type="hidden" name="${class.name}_nb" value="$nb" />
+<table id="xwikirightstable">
+ <tr>
+#*<th>$msg.get("Right")</th>*#<th>$msg.get("Users")</th><th>$msg.get("Groups")</th><th>$msg.get("Level")</th><th>$msg.get("Allow-Deny")</th><th>$msg.get("Remove")</th>
+ </tr>
+#foreach ($obj in $doc.getObjects($class.name))
+#set($class = $obj.xWikiClass)
+    <tr>
+##        <td align="center">$!{obj.number}</td>
+        <td>$!doc.displayEdit($class.users,"${class.name}_${obj.number}_",$obj)</td>
+        <td>$!doc.displayEdit($class.groups,"${class.name}_${obj.number}_",$obj)</td>
+        <td>$!doc.displayEdit($class.levels,"${class.name}_${obj.number}_",$obj)</td>
+        <td>$!doc.displayEdit($class.allow,"${class.name}_${obj.number}_",$obj)</td>
+        <td class="xwikibuttonlink"><a href="$doc.getURL("objectremove", "classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${xwiki.getURLEncoded($redirect)}")" onclick="return confirm('$msg.get("confirmobjectremove")')">$msg.get("Remove")</a></td>
+    </tr>
+#end
+  </table>
+ </div>
+</form>
+</div>
+</div>
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/adminmodes.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/adminmodes.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/adminmodes.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,7 @@
+###
+### Admin mode tabs
+###
+###
+<ul class="xwikitabbar">
+<li id="xwikiadminprefs"#if($editor == "prefs") class="active"#end><a href="$xwiki.getDocument("XWiki.XWikiPreferences").getURL("admin", "editor=prefs&amp;global=1")">$msg.get("adminprefs")</a></li><li id="xwikiadminglobalrights"#if($editor == "globalrights") class="active"#end><a href="$xwiki.getDocument("XWiki.XWikiPreferences").getURL("admin", "editor=globalrights&amp;global=1")">$msg.get("adminglobalrights")</a></li><li id="xwikiadminspacerights"#if($editor == "spacerights") class="active"#end><a href="$xwiki.getDocument("${doc.web}.WebPreferences").getURL("admin", "editor=spacerights")">$msg.get("adminspacerights")</a></li><li id="xwikiadmingroups"#if($editor == "groups") class="active"#end><a href="$xwiki.getDocument("XWiki.XWikiGroups").getURL("admin", "editor=groups")">$msg.get("admingroups")</a></li><li id="xwikiadminusers"#if($editor == "users") class="active"#end><a href="$xwiki.getDocument("XWiki.XWikiUsers").getURL("admin", "editor=users")">$msg.get("adminusers")</a></li><li id="xwikiadminskin"#if($editor == "skin") class="active"#end><a href="$xwiki.getDocument($xwiki.getXWikiPreference("skin")).getURL("admin", "editor=skin")">$msg.get("adminskin")</a></li>
+</ul>
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/adminprefs.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/adminprefs.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/adminprefs.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,197 @@
+###
+### Global preferences page in the "admin" mode
+###
+###
+##
+## Define sections
+##
+#set($class = $obj.xWikiClass)
+#set($sections = ["params", "skin", "presentation", "editing", "advanced", "registration"])
+#set($sectionitemsmap = $xwiki.hashMap)
+#set($sectionitemsmap.params = ["multilingual", "languages" , "default_language", "authenticate_view", "authenticate_edit", "auth_active_check" ])
+#set($sectionitemsmap.skin = ["skin", "stylesheet", "stylesheets"])
+#set($sectionitemsmap.presentation = [ "title", "version", "webcopyright", "menu", "meta" ])
+#set($sectionitemsmap.editing = ["editor", "editbox_width","editbox_height"])
+#set($sectionitemsmap.advanced = ["macros_languages", "macros_velocity","macros_groovy", "macros_mapping", "notification_pages" ])
+#set($sectionitemsmap.registration = [ "use_email_verification", "admin_email", "smtp_server", "validation_email_content",  "confirmation_email_content"])
+##
+## Define the macro that displays the 
+##
+#macro(showsection $section $sectionitemsmap)
+  <div id="xwikiprefs${section}">
+    <div id="xwikiprefs${section}Header" class="accordionTabTitleBar"><h6>$msg.get($section)</h6></div>
+    <div id="xwikiprefs${section}Content" class="accordionTabContentBox">
+      <div class="padded">
+<table>
+#set($sectionitems = $sectionitemsmap.get($section))
+#foreach($item in $sectionitems)
+#set($prop = $obj.xWikiClass.get($item))
+#set($title = $msg.get($item))
+#if($title == $item)
+#if($prop != $xwiki.null)
+#set($title = $!prop.prettyName)
+#end
+#end
+<tr><td>$title</td>
+<td>
+#if($prop)
+$doc.displayEdit($prop, "${class.name}_${obj.number}_",  $obj)
+#if($item=="skin")
+#set($skin = $xwiki.skin)
+#if($skin.indexOf(".")!=-1)
+#set($skindoc = $xwiki.getDocument($skin))
+<a href="$skindoc.getURL()">Customize</a>
+#end
+#end
+#end
+</td></tr>
+#end
+</table>
+      </div>
+    </div>
+  </div>
+#end
+##
+## Content
+##
+#set($formname = "update")
+#set($saveaction = "save")
+<div class="layoutsubsection">
+#set ($classname = "XWiki.XWikiPreferences")
+#set($class = $xwiki.getDocument($classname).xWikiClass)
+#set($obj = $doc.getObject($classname, 0))
+#set($redirect = "$xwiki.getRequestURL()")
+<div style="overflow:auto;">
+<form id="update" method="post" action="$doc.getURL("save")" onsubmit="cancelCancelEdit()">
+<div>
+<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
+<input type="hidden" name="classname" value="XWiki.XWikiPreferences" />
+<input type="hidden" name="global" value="1" />
+<div id="xwikiprefs">
+#foreach($section in $sections)
+#showsection($section $sectionitemsmap)
+#end
+</div>
+<script type="text/javascript">new Rico.Accordion( 'xwikiprefs', {panelHeight:'max'} );</script>
+</div>
+</form>
+</div>
+</div>
+
+
+#*
+#set( $redirect = $xwiki.getRequestURL())
+<script type="text/javascript">
+<!--
+var currentfield = "params";
+function show(fieldname) {
+  if (currentfield!="")
+    document.getElementById(currentfield).style.display="none";
+  document.getElementById(fieldname).style.display="block";
+  currentfield = fieldname;
+}
+// -->
+</script>
+#set($obj = $doc.getObject("XWiki.XWikiPreferences"))
+
+#if(!$obj)
+<form id="objectadd" method="post" action="$doc.getURL("objectadd")">
+<p>
+<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
+<input type="hidden" name="classname" value="XWiki.XWikiPreferences" />
+</p>
+</form>
+<script type="text/javascript">
+<!--
+document.forms.objectadd.submit();
+-->
+</script>
+#else
+#set($class = $obj.xWikiClass)
+#set($sections = ["params", "skin", "presentation", "editing", "advanced", "registration"])
+#set($sectionitemsmap = $xwiki.hashMap)
+#set($sectionitemsmap.params = ["multilingual", "language" , "default_language", "authenticate_view", "authenticate_edit", "auth_active_check" ])
+#set($sectionitemsmap.skin = ["skin", "stylesheet", "stylesheets"])
+#set($sectionitemsmap.presentation = [ "title", "version", "webcopyright", "menu", "meta" ])
+#set($sectionitemsmap.editing = ["editor", "editbox_width","editbox_height"])
+#set($sectionitemsmap.advanced = ["macros_languages", "macros_velocity","macros_groovy", "macros_mapping", "notification_pages" ])
+#set($sectionitemsmap.registration = [ "use_email_verification", "admin_email", "smtp_server", "validation_email_content",  "confirmation_email_content"])
+#macro(showsection $section $sectionitemsmap)
+<h3>$msg.get($section)</h3>
+<br>
+<table border="0">
+#set($sectionitems = $sectionitemsmap.get($section))
+#foreach($item in $sectionitems)
+#set($prop = $obj.xWikiClass.get($item))
+#set($title = $msg.get($item))
+#if($title!=$item)
+#if($prop!=$xwiki.null)
+#set($title = $!prop.prettyName)
+#end
+#end
+<tr><td>$title</td>
+<td>
+#if($prop)
+$doc.displayEdit($prop, "${class.name}_${obj.number}_",  $obj)
+#if($item=="skin")
+#set($skin = $xwiki.skin)
+#if($skin.indexOf(".")!=-1)
+#set($skindoc = $xwiki.getDocument($skin))
+<a href="$skindoc.getURL()">Customize</a>
+#end
+#end
+#end
+</td></tr>
+#end
+</table>
+#end
+<div id="xwikicontent" class="large">
+       <div id="columns">
+        <div class="cols-wrapper">
+          <div class="float-wrapper">
+            <div id="col-a">
+              <div class="main-content">
+<form id="update" method="post" action="$doc.getURL("save")" onsubmit="cancelCancelEdit()">
+<p>
+<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
+</p>
+#set($first = 1)
+#foreach($section in $sections)
+<div id="${section}" style="display: #if ($first==1) block #else none #end;">
+#if ($first==1)
+<script type="text/javascript">
+<!--
+currentfield = "${section}";
+// -->
+</script>
+#set ($first = 0)
+#end
+#showsection($section $sectionitemsmap)
+</div>
+#end
+1</form>
+#includeHelp("EditPrefsHelp")
+         </div>
+            </div>
+            <div id="col-b" class="sidecol">
+              <div class="box">
+              </div>
+            </div>
+          </div>
+          <div id="col-c" class="sidecol">
+         <div class="box">
+<h3>$msg.get("preferences")</h3>
+<br />
+<p style="text-align: center">
+<input type="button" value="$msg.get("saveprefs")" onclick="cancelCancelEdit(); document.forms.update.submit()" />
+</p>
+<br />
+<h3>$msg.get("sections")</h3>
+<br />
+<p style="text-align: center">
+#foreach ($section in $sections)
+<a href="" onclick="show('${section}'); return false;">$msg.get($section)</a>
+<br />
+#end
+#end
+*#
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/adminskin.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/adminskin.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/adminskin.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,39 @@
+<div class="layoutsubsection">
+#set($classname = "XWiki.XWikiSkin")
+#set($class = $xwiki.getDocument($classname).xWikiClass)
+#set($redirect = "$xwiki.getRequestURL()&amp;editor=skin")
+<div class="overflowcontainer">
+<form id="update" method="post" action="$doc.getURL("save")" onsubmit="cancelCancelEdit()">
+<div>
+<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
+#set($nb = $doc.getObjectNumbers("${class.name}"))
+<input type="hidden" name="${class.name}_nb" value="$nb" />
+#set($obj = $doc.getObject(${class.name}, 0))
+#if(!$obj)
+$response.sendRedirect($doc.getURL("objectadd", "classname=XWiki.XWikiSkin&xredirect=$redirect"))
+#end
+#set($class = $obj.xWikiClass)
+<table summary="">
+#foreach($prop in $class.properties)
+<tr><td class="label"><label for="${class.name}_${obj.number}_${prop.name}">$prop.prettyName:</label></td>
+<td>$doc.displayEdit($prop, "${class.name}_${obj.number}_" , $obj)
+<script type="text/javascript">
+//<!--
+//document.write("<a href=\"#\" onclick=\"openColorPicker(); return false\">$msg.get("colorpicker")<"+"/a>");
+document.write("<span class=\"chwColorPickerInvoker\" title=\"$msg.get("chwinvokecolorpickertitle")\" onclick=\"window.colorPicker.show(document.getElementById('${class.name}_${obj.number}_${prop.name}'));\">$msg.get("chwinvokecolorpicker")<"+"/span>");
+//-->
+</script>
+</td>
+</tr>
+#end
+<!--tr>
+<td><label for="${class.name}_0_textcolor">$msg.get("textcolor")</label></td>
+<td><input size='30' value='$obj.get("textcolor")' id='${class.name}_0_textcolor' name='${class.name}_0_textcolor' type='text'/>
+</td>
+ </tr-->
+</table>
+</div>
+</form>
+#template("chw/colorpicker.vm")
+</div>
+</div>

Added: xwiki/trunk/src/main/web/skins/xwiki10/adminspacerights.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/adminspacerights.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/adminspacerights.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,33 @@
+#set($formname = "update")
+#set($saveaction = "save")
+<div class="layoutsubsection">
+#set ($classname = "XWiki.XWikiRights")
+#set( $class = $xwiki.getDocument($classname).xWikiClass)
+#set( $redirect = "$xwiki.getRequestURL()&amp;editor=rights")
+<div style="overflow:auto">
+<form id="update" method="post" action="$doc.getURL("save")" onsubmit="cancelCancelEdit()">
+<div>
+<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)" />
+#set ($first = 1)
+#set($nb = $doc.getObjectNumbers("${class.name}"))
+<input type="hidden" name="${class.name}_nb" value="$nb" />
+<table id="xwikirightstable">
+ <tr>
+#*<th>$msg.get("Right")</th>*#<th>$msg.get("Users")</th><th>$msg.get("Groups")</th><th>$msg.get("Level")</th><th>$msg.get("Allow-Deny")</th><th>$msg.get("Remove")</th>
+ </tr>
+#foreach ($obj in $doc.getObjects($class.name))
+#set($class = $obj.xWikiClass)
+    <tr>
+##        <td align="center">$!{obj.number}</td>
+        <td>$!doc.displayEdit($class.users,"${class.name}_${obj.number}_",$obj)</td>
+        <td>$!doc.displayEdit($class.groups,"${class.name}_${obj.number}_",$obj)</td>
+        <td>$!doc.displayEdit($class.levels,"${class.name}_${obj.number}_",$obj)</td>
+        <td>$!doc.displayEdit($class.allow,"${class.name}_${obj.number}_",$obj)</td>
+        <td class="xwikibuttonlink"><a href="$doc.getURL("objectremove", "classname=${class.name}&amp;classid=${obj.number}&amp;xredirect=${xwiki.getURLEncoded($redirect)}")" onclick="return confirm('$msg.get("confirmobjectremove")')">$msg.get("Remove")</a></td>
+    </tr>
+#end
+  </table>
+ </div>
+</form>
+</div>
+</div>
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/aimoffline.gif
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/skins/xwiki10/aimoffline.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/skins/xwiki10/aimonline.gif
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/skins/xwiki10/aimonline.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/skins/xwiki10/ajax/Drag.js
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/ajax/Drag.js	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/ajax/Drag.js	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,53 @@
+var Drag={
+        "obj":null,
+	"init":function(a, aRoot){
+			a.onmousedown=Drag.start;
+			a.root = aRoot;
+			if(isNaN(parseInt(a.root.style.left)))a.root.style.left="0px";
+			if(isNaN(parseInt(a.root.style.top)))a.root.style.top="0px";
+			a.root.onDragStart=new Function();
+			a.root.onDragEnd=new Function();
+			a.root.onDrag=new Function();
+		},
+	"start":function(a){	
+			var b=Drag.obj=this;
+			a=Drag.fixE(a);
+			var c=parseInt(b.root.style.top);
+			var d=parseInt(b.root.style.left);
+			b.root.onDragStart(d,c,a.clientX,a.clientY);
+			b.lastMouseX=a.clientX;
+			b.lastMouseY=a.clientY;
+			document.onmousemove=Drag.drag;
+			document.onmouseup=Drag.end;
+			return false;
+		},	
+	"drag":function(a){
+			a=Drag.fixE(a);
+			var b=Drag.obj;
+			var c=a.clientY;
+			var d=a.clientX;
+			var e=parseInt(b.root.style.top);
+			var f=parseInt(b.root.style.left);
+			var h,g;
+			h=f+d-b.lastMouseX;
+			g=e+c-b.lastMouseY;
+			b.root.style.left=h+"px";
+			b.root.style.top=g+"px";			
+			b.lastMouseX=d;
+			b.lastMouseY=c;
+			b.root.onDrag(h,g,a.clientX,a.clientY);
+			return false;
+		},
+	"end":function(){			
+			document.onmousemove=null;
+			document.onmouseup=null;
+			Drag.obj.root.onDragEnd(parseInt(Drag.obj.root.style.left),parseInt(Drag.obj.root.style.top));
+			Drag.obj=null;
+		},
+	"fixE":function(a){
+			if(typeof a=="undefined")a=window.event;
+			if(typeof a.layerX=="undefined")a.layerX=a.offsetX;
+			if(typeof a.layerY=="undefined")a.layerY=a.offsetY;
+			return a;
+		}
+};
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/ajax/ieemu.js
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/ajax/ieemu.js	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/ajax/ieemu.js	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,304 @@
+/*----------------------------------------------------------------------------\
+|                                   IE Emu                                    |
+|-----------------------------------------------------------------------------|
+|                         Created by Erik Arvidsson                           |
+|                  (http://webfx.eae.net/contact.html#erik)                   |
+|                      For WebFX (http://webfx.eae.net/)                      |
+|-----------------------------------------------------------------------------|
+| A emulation of Internet Explorer DHTML Object Model for Mozilla  |
+|-----------------------------------------------------------------------------|
+|                  Copyright (c) 1999 - 2004 Erik Arvidsson                   |
+|-----------------------------------------------------------------------------|
+*/
+
+if (Browser.isMozilla) { // set up ie environment for Moz
+	
+	extendEventObject();
+	emulateAttachEvent();
+	emulateEventHandlers(["click", "dblclick", "mouseover", "mouseout",
+							"mousedown", "mouseup", "mousemove",
+							"keydown", "keypress", "keyup"]);
+	emulateCurrentStyle();
+	emulateHTMLModel();
+	/*emulateDocumentAll();
+	emulateElement()
+	*/
+
+	// It is better to use a constant for event.button
+	Event.LEFT = 0;
+	Event.MIDDLE = 1;
+	Event.RIGHT = 2;
+}
+else {
+	Event = {};
+	// IE is returning wrong button number
+	Event.LEFT = 1;
+	Event.MIDDLE = 4;
+	Event.RIGHT = 2;
+}
+
+
+
+/*
+ * Extends the event object with srcElement, cancelBubble, returnValue,
+ * fromElement and toElement
+ */
+function extendEventObject() {
+	Event.prototype.__defineSetter__("returnValue", function (b) {
+		if (!b) this.preventDefault();
+		return b;
+	});
+
+	Event.prototype.__defineSetter__("cancelBubble", function (b) {
+		if (b) this.stopPropagation();
+		return b;
+	});
+
+	Event.prototype.__defineGetter__("srcElement", function () {
+		var node = this.target;
+		while (node.nodeType != 1) node = node.parentNode;
+		return node;
+	});
+
+	Event.prototype.__defineGetter__("fromElement", function () {
+		var node;
+		if (this.type == "mouseover")
+			node = this.relatedTarget;
+		else if (this.type == "mouseout")
+			node = this.target;
+		if (!node) return;
+		while (node.nodeType != 1) node = node.parentNode;
+		return node;
+	});
+
+	Event.prototype.__defineGetter__("toElement", function () {
+		var node;
+		if (this.type == "mouseout")
+			node = this.relatedTarget;
+		else if (this.type == "mouseover")
+			node = this.target;
+		if (!node) return;
+		while (node.nodeType != 1) node = node.parentNode;
+		return node;
+	});
+
+	Event.prototype.__defineGetter__("offsetX", function () {
+		return this.layerX;
+	});
+	Event.prototype.__defineGetter__("offsetY", function () {
+		return this.layerY;
+	});
+}
+
+/*
+ * Emulates element.attachEvent as well as detachEvent
+ */
+function emulateAttachEvent() {
+	HTMLDocument.prototype.attachEvent =
+	HTMLElement.prototype.attachEvent = function (sType, fHandler) {
+		var shortTypeName = sType.replace(/on/, "");
+		fHandler._ieEmuEventHandler = function (e) {
+			window.event = e;
+			return fHandler();
+		};
+		this.addEventListener(shortTypeName, fHandler._ieEmuEventHandler, false);
+	};
+
+	HTMLDocument.prototype.detachEvent =
+	HTMLElement.prototype.detachEvent = function (sType, fHandler) {
+		var shortTypeName = sType.replace(/on/, "");
+		if (typeof fHandler._ieEmuEventHandler == "function")
+			this.removeEventListener(shortTypeName, fHandler._ieEmuEventHandler, false);
+		else
+			this.removeEventListener(shortTypeName, fHandler, true);
+	};
+}
+
+/*
+ * This function binds the event object passed along in an
+ * event to window.event
+ */
+function emulateEventHandlers(eventNames) {
+	for (var i = 0; i < eventNames.length; i++) {
+		document.addEventListener(eventNames[i], function (e) {
+			window.event = e;
+		}, true);	// using capture
+	}
+}
+
+/*
+ * Simple emulation of document.all
+ * this one is far from complete. Be cautious
+ */
+
+function emulateAllModel() {
+	var allGetter = function () {
+		var a = this.getElementsByTagName("*");
+		var node = this;
+		a.tags = function (sTagName) {
+			return node.getElementsByTagName(sTagName);
+		};
+		return a;
+	};
+	HTMLDocument.prototype.__defineGetter__("all", allGetter);
+	HTMLElement.prototype.__defineGetter__("all", allGetter);
+}
+
+function extendElementModel() {
+	HTMLElement.prototype.__defineGetter__("parentElement", function () {
+		if (this.parentNode == this.ownerDocument) return null;
+		return this.parentNode;
+	});
+
+	HTMLElement.prototype.__defineGetter__("children", function () {
+		var tmp = [];
+		var j = 0;
+		var n;
+		for (var i = 0; i < this.childNodes.length; i++) {
+			n = this.childNodes[i];
+			if (n.nodeType == 1) {
+				tmp[j++] = n;
+				if (n.name) {	// named children
+					if (!tmp[n.name])
+						tmp[n.name] = [];
+					tmp[n.name][tmp[n.name].length] = n;
+				}
+				if (n.id)		// child with id
+					tmp[n.id] = n
+			}
+		}
+		return tmp;
+	});
+
+	HTMLElement.prototype.contains = function (oEl) {
+		if (oEl == this) return true;
+		if (oEl == null) return false;
+		return this.contains(oEl.parentNode);
+	};
+}
+
+function emulateCurrentStyle() {
+	HTMLElement.prototype.__defineGetter__("currentStyle", function () {
+		return this.ownerDocument.defaultView.getComputedStyle(this, null);
+		/*
+		var cs = {};
+		var el = this;
+		for (var i = 0; i < properties.length; i++) {
+			cs.__defineGetter__(properties[i], encapsulateObjects(el, properties[i]));
+		}
+		return cs;
+		*/
+	});
+}
+
+function emulateHTMLModel() {
+
+	// This function is used to generate a html string for the text properties/methods
+	// It replaces '\n' with "<BR"> as well as fixes consecutive white spaces
+	// It also repalaces some special characters
+	function convertTextToHTML(s) {
+		s = s.replace(/\&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<BR>");
+		while (/\s\s/.test(s))
+			s = s.replace(/\s\s/, "&nbsp; ");
+		return s.replace(/\s/g, " ");
+	}
+
+	HTMLElement.prototype.insertAdjacentHTML = function (sWhere, sHTML) {
+		var df;	// : DocumentFragment
+		var r = this.ownerDocument.createRange();
+
+		switch (String(sWhere).toLowerCase()) {
+			case "beforebegin":
+				r.setStartBefore(this);
+				df = r.createContextualFragment(sHTML);
+				this.parentNode.insertBefore(df, this);
+				break;
+
+			case "afterbegin":
+				r.selectNodeContents(this);
+				r.collapse(true);
+				df = r.createContextualFragment(sHTML);
+				this.insertBefore(df, this.firstChild);
+				break;
+
+			case "beforeend":
+				r.selectNodeContents(this);
+				r.collapse(false);
+				df = r.createContextualFragment(sHTML);
+				this.appendChild(df);
+				break;
+
+			case "afterend":
+				r.setStartAfter(this);
+				df = r.createContextualFragment(sHTML);
+				this.parentNode.insertBefore(df, this.nextSibling);
+				break;
+		}
+	};
+
+	HTMLElement.prototype.__defineSetter__("outerHTML", function (sHTML) {
+	   var r = this.ownerDocument.createRange();
+	   r.setStartBefore(this);
+	   var df = r.createContextualFragment(sHTML);
+	   this.parentNode.replaceChild(df, this);
+
+	   return sHTML;
+	});
+
+	HTMLElement.prototype.__defineGetter__("canHaveChildren", function () {
+		switch (this.tagName) {
+			case "AREA":
+			case "BASE":
+			case "BASEFONT":
+			case "COL":
+			case "FRAME":
+			case "HR":
+			case "IMG":
+			case "BR":
+			case "INPUT":
+			case "ISINDEX":
+			case "LINK":
+			case "META":
+			case "PARAM":
+				return false;
+		}
+		return true;
+	});
+
+	HTMLElement.prototype.__defineGetter__("outerHTML", function () {
+		var attr, attrs = this.attributes;
+		var str = "<" + this.tagName;
+		for (var i = 0; i < attrs.length; i++) {
+			attr = attrs[i];
+			if (attr.specified)
+				str += " " + attr.name + '="' + attr.value + '"';
+		}
+		if (!this.canHaveChildren)
+			return str + ">";
+
+		return str + ">" + this.innerHTML + "</" + this.tagName + ">";
+	});
+
+
+	HTMLElement.prototype.__defineSetter__("innerText", function (sText) {
+		this.innerHTML = convertTextToHTML(sText);
+		return sText;
+	});
+
+	var tmpGet;
+	HTMLElement.prototype.__defineGetter__("innerText", tmpGet = function () {
+		var r = this.ownerDocument.createRange();
+		r.selectNodeContents(this);
+		return r.toString();
+	});
+
+	HTMLElement.prototype.__defineSetter__("outerText", function (sText) {
+		this.outerHTML = convertTextToHTML(sText);
+		return sText;
+	});
+	HTMLElement.prototype.__defineGetter__("outerText", tmpGet);
+
+	HTMLElement.prototype.insertAdjacentText = function (sWhere, sText) {
+		this.insertAdjacentHTML(sWhere, convertTextToHTML(sText));
+	};
+}

Added: xwiki/trunk/src/main/web/skins/xwiki10/ajax/toolTip.js
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/ajax/toolTip.js	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/ajax/toolTip.js	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,70 @@
+/***********************************************
+* Cool DHTML tooltip script- © Dynamic Drive DHTML code library (www.dynamicdrive.com)
+* This notice MUST stay intact for legal use
+* Visit Dynamic Drive at http://www.dynamicdrive.com/ for full source code
+***********************************************/
+
+var offsetxpoint=-60 //Customize x offset of tooltip
+var offsetypoint=20 //Customize y offset of tooltip
+var ie=document.all
+var ns6=document.getElementById && !document.all
+var enabletip=false
+if (ie||ns6)
+var tipobj=document.all? document.all["dhtmltooltip"] : document.getElementById? document.getElementById("dhtmltooltip") : ""
+
+function ietruebody(){
+	return (document.compatMode && document.compatMode!="BackCompat")? document.documentElement : document.body
+}
+
+function showtip(node, txt, w, align){
+	document.onmousemove=positiontip;
+	node.onmouseout = hideddrivetip;
+	//node.onclick = hideddrivetip;
+	if (ns6||ie){		
+		tipobj.style.textAlign=align;
+		tipobj.innerHTML=txt;
+		if (tipobj.offsetWidth>w) tipobj.style.width=w+"px";
+		enabletip=true;
+		return false
+	}
+}
+
+function positiontip(e){
+	if (enabletip){
+		var curX=(ns6)?e.pageX : event.x+ietruebody().scrollLeft;
+		var curY=(ns6)?e.pageY : event.y+ietruebody().scrollTop;
+		//Find out how close the mouse is to the corner of the window
+		var rightedge=ie&&!window.opera? ietruebody().clientWidth-event.clientX-offsetxpoint : window.innerWidth-e.clientX-offsetxpoint-20
+		var bottomedge=ie&&!window.opera? ietruebody().clientHeight-event.clientY-offsetypoint : window.innerHeight-e.clientY-offsetypoint-20
+		
+		var leftedge=(offsetxpoint<0)? offsetxpoint*(-1) : -1000
+		
+		//if the horizontal distance isn't enough to accomodate the width of the context menu
+		if (rightedge<tipobj.offsetWidth)
+		//move the horizontal position of the menu to the left by it's width
+		tipobj.style.left=ie? ietruebody().scrollLeft+event.clientX-tipobj.offsetWidth+"px" : window.pageXOffset+e.clientX-tipobj.offsetWidth+"px"
+		else if (curX<leftedge)
+		tipobj.style.left="5px"
+		else
+		//position the horizontal position of the menu where the mouse is positioned
+		tipobj.style.left=curX+offsetxpoint+"px"
+		
+		//same concept with the vertical position
+		if (bottomedge<tipobj.offsetHeight)
+		tipobj.style.top=ie? ietruebody().scrollTop+event.clientY-tipobj.offsetHeight-offsetypoint+"px" : window.pageYOffset+e.clientY-tipobj.offsetHeight-offsetypoint+"px"
+		else
+		tipobj.style.top=curY+offsetypoint+"px"
+		tipobj.style.visibility="visible"
+	}
+}
+
+function hideddrivetip(){
+	document.onmousemove=null;
+	if (ns6||ie){
+		enabletip=false
+		tipobj.style.visibility="hidden"
+		tipobj.style.left="-1000px"
+		tipobj.style.backgroundColor=''
+		tipobj.style.width=''
+	}
+}

Added: xwiki/trunk/src/main/web/skins/xwiki10/arrow.gif
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/skins/xwiki10/arrow.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/skins/xwiki10/attachments.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/attachments.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/attachments.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,6 @@
+###
+### Attachments page in the "view" mode
+###
+###
+<h2>$xwiki.parseMessage("viewattachmentstitle")</h2>
+#template("attachmentsinline.vm")
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/attachmentsinline.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/attachmentsinline.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/attachmentsinline.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,75 @@
+###
+### List document attachments
+###
+### TODO: web service?
+###
+## #if(!$showattachments)
+## #set($showattachments = $xwiki.getWebPreference("showattachments"))
+## #end
+## #if($showattachments!="no")
+#set($attachments = $doc.attachmentList)
+#set($counter = 0)
+    <div id="attachmentscontent" class="xwikiintracontent">
+    <h4 class="xwikiintratitle">$msg.get("attachments")</h4>
+#if($attachments.size()>0)
+      <table class="xwikidatatable" summary="$msg.get(document) ${doc.displayTitle} &mdash; $msg.get("attachments")">
+        <col class="attachmenttype"/>
+        <col class="attachmentname"/>
+        <col class="attachmentauthor"/>
+        <col class="attachmentversion"/>
+        <col class="attachmentdate"/>
+        <col class="attachmentsize"/>
+#if($hasedit || $hasadmin)
+        <col class="attachmentdelete"/>
+#end
+        <tr>
+          <th></th>
+          <th>$msg.get("filename")</th>
+          <th>$msg.get("author")</th>
+          <th>$msg.get("version")</th>
+          <th>$msg.get("date")</th>
+          <th>$msg.get("size")</th>
+#if($hasedit || $hasadmin)
+          <th></th>
+#end
+        </tr>
+#foreach ($attach in $attachments)
+        <tr class="row#if($counter % 2 == 0) even #else odd #end">
+          <td>#mimetypeimg($attach.getMimeType().toLowerCase() $attach.getFilename().toLowerCase())</td>
+          <td><a href="$doc.getAttachmentURL("${attach.filename}", "download")" title="$msg.get("downloadthisattachment")">#packName($attach.filename)</a></td>
+          <td>$xwiki.getLocalUserName($attach.author)</td>
+          <td><a href="$doc.getAttachmentURL("${attach.filename}", "viewattachrev")" title="$msg.get("viewattachmenthistory")">$attach.version</a></td>
+          <td>$!xwiki.formatDate($attach.date, "dd/MM/yyyy")</td>
+          <td>$attach.filesize</td>
+#if($hasedit || $hasadmin)
+          <td class="xwikibuttonlink"><a href="$doc.getAttachmentURL("${attach.filename}", "delattachment")" onclick="return confirm('$msg.get("confirmdelattachment")');" title="$msg.get("deletethisattachment")">$msg.get("delete")</a></td>
+#end
+        </tr>
+#set($counter = $counter + 1)
+#end
+      </table>
+#else
+$msg.get("noattachments")
+#end
+#if($hasedit || $hasadmin)
+      <form action="$doc.getURL("upload")" enctype="multipart/form-data" method="post">
+        <fieldset class="expanded" id="attachform">
+        <legend onclick="toggleForm(this.form)">$msg.get("addattachment")<span class="expands">...</span></legend>
+        <div><label id="xwikiuploadnamelabel" for="xwikiuploadname">$msg.get("choosetargetfilename"):</label></div>
+        <div><input id="xwikiuploadname" type="text" name="filename" value="" size="40"/></div>
+        <div><label id="xwikiuploadfilelabel" for="xwikiuploadfile">$msg.get("choosefiletoupload"):</label></div>
+        <div><input id="xwikiuploadfile" type="file" name="filepath" value="" size="40"/></div>
+        <div>
+        <input type="submit" value="$msg.get("attachthisfile")" onclick="return updateAttachName(this.form, '$msg.get("doyouwanttoreplace")')" class="button"/>
+        <input type="reset" value="$msg.get("cancel")" onclick="hideForm(this.form);" class="button"/>
+        </div>
+        </fieldset>
+      </form>
+      <script type="text/javascript">
+//<!--
+document.getElementById("attachform").className = "collapsed";
+//-->
+      </script>
+#end
+    </div>
+## #end
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/attachwysiwyg.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/attachwysiwyg.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/attachwysiwyg.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,44 @@
+#set($attachments = $doc.attachmentList)
+<div id="xwikiattachmentscontent" class="xwikidatacontent">
+#set($counter=0)
+#foreach ($attach in $attachments)
+#if((!$request.images)||$attach.isImage())
+#if($counter==0)
+<table>
+<tr><th></th><th> <b>$msg.get("filename")</b> </th><th> <b>$msg.get("version")</b> </th>
+<th> <b>$msg.get("author")</b> </th></tr>
+#end
+<tr>
+<td>
+#if ($attach.isImage())
+<a href="$doc.getAttachmentURL("${attach.filename}", "download")" onclick="document.forms[0].href.value='$attach.filename'; return false;" >
+<img src="$doc.getAttachmentURL("${attach.filename}", "download", "width=80")" alt="${attach.filename}" width="80" border="0" />
+</a>
+#end
+</td><td><a href="$doc.getAttachmentURL("${attach.filename}", "download")" onclick="document.forms[0].href.value='$attach.filename'; return false;" >$attach.filename</a></td>
+<td>$attach.version</td><td>$xwiki.getLocalUserName($attach.author)</td>
+</tr>
+#end
+#set( $counter = $counter + 1)
+#end
+</table>
+<br />
+<form id="attach" action="$doc.getURL("upload")" enctype="multipart/form-data" method="post"
+      onsubmit="return updateAttachName(this)" >
+<input type="hidden" name="xredirect" value="" />
+<p>
+$msg.get("choosetargetfilename"):
+<input type="text" name="filename" value="" size="20" />
+<br /><br />
+$msg.get("choosefiletoupload"):
+<input type="file" name="filepath" value="" size="40"  />
+<br /><br />
+<input type="submit" value="$msg.get("attachthisfile")" />
+</p>
+</form>
+</div>
+<div class="xwikidatafooter2">
+<div class="xwikidatafooter1">&nbsp;</div>
+<div class="xwikidatafooter">&nbsp;</div>
+</div>
+</div>
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/box_bottom.gif
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/skins/xwiki10/box_bottom.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/skins/xwiki10/box_bottom2.gif
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/skins/xwiki10/box_bottom2.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/skins/xwiki10/box_top.gif
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/skins/xwiki10/box_top.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/skins/xwiki10/box_top2.gif
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/skins/xwiki10/box_top2.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/skins/xwiki10/browserdetect.js
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/browserdetect.js	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/browserdetect.js	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,97 @@
+// Browser Detect Lite  v2.1.4
+// http://www.dithered.com/javascript/browser_detect/index.html
+// modified by Chris Nott (chris at NOSPAMdithered.com - remove NOSPAM)
+
+
+function BrowserDetectLite() {
+  var ua = navigator.userAgent.toLowerCase(); 
+
+  // browser name
+  this.isGecko     = (ua.indexOf('gecko') != -1 && ua.indexOf('safari') == -1);
+  this.isMozilla   = (this.isGecko && ua.indexOf('gecko/') + 14 == ua.length);
+  this.isNS        = ( (this.isGecko) ? (ua.indexOf('netscape') != -1) : ( (ua.indexOf('mozilla') != -1) && (ua.indexOf('spoofer') == -1) && (ua.indexOf('compatible') == -1) && (ua.indexOf('opera') == -1) && (ua.indexOf('webtv') == -1) && (ua.indexOf('hotjava') == -1) ) );
+  this.isIE        = ( (ua.indexOf('msie') != -1) && (ua.indexOf('opera') == -1) && (ua.indexOf('webtv') == -1) ); 
+  this.isSafari    = (ua.indexOf('safari') != - 1);
+  this.isOpera     = (ua.indexOf('opera') != -1); 
+  this.isKonqueror = (ua.indexOf('konqueror') != -1 && !this.isSafari); 
+  this.isIcab      = (ua.indexOf('icab') != -1); 
+  this.isAol       = (ua.indexOf('aol') != -1); 
+
+  // spoofing and compatible browsers
+  this.isIECompatible = ( (ua.indexOf('msie') != -1) && !this.isIE);
+  this.isNSCompatible = ( (ua.indexOf('mozilla') != -1) && !this.isNS && !this.isMozilla);
+
+  // browser version
+  this.versionMinor = parseFloat(navigator.appVersion); 
+
+  // correct version number
+  if (this.isNS && this.isGecko) {
+    this.versionMinor = parseFloat( ua.substring( ua.lastIndexOf('/') + 1 ) );
+  }
+  else if (this.isIE && this.versionMinor >= 4) {
+    this.versionMinor = parseFloat( ua.substring( ua.indexOf('msie ') + 5 ) );
+  }
+  else if (this.isMozilla) {
+    this.versionMinor = parseFloat( ua.substring( ua.indexOf('rv:') + 3 ) );
+  }
+  else if (this.isSafari) {
+    this.versionMinor = parseFloat( ua.substring( ua.lastIndexOf('/') + 1 ) );
+  }
+  else if (this.isOpera) {
+    if (ua.indexOf('opera/') != -1) {
+      this.versionMinor = parseFloat( ua.substring( ua.indexOf('opera/') + 6 ) );
+    }
+    else {
+      this.versionMinor = parseFloat( ua.substring( ua.indexOf('opera ') + 6 ) );
+    }
+  }
+  else if (this.isKonqueror) {
+    this.versionMinor = parseFloat( ua.substring( ua.indexOf('konqueror/') + 10 ) );
+  }
+  else if (this.isIcab) {
+    if (ua.indexOf('icab/') != -1) {
+      this.versionMinor = parseFloat( ua.substring( ua.indexOf('icab/') + 6 ) );
+    }
+    else {
+      this.versionMinor = parseFloat( ua.substring( ua.indexOf('icab ') + 6 ) );
+    }
+  }
+
+  this.versionMajor = parseInt(this.versionMinor); 
+  this.geckoVersion = ( (this.isGecko) ? ua.substring( (ua.lastIndexOf('gecko/') + 6), (ua.lastIndexOf('gecko/') + 14) ) : -1 );
+
+  // dom support
+  this.isDOM1 = (document.getElementById);
+  this.isDOM2Event = (document.addEventListener && document.removeEventListener);
+
+  // css compatibility mode
+  this.mode = document.compatMode ? document.compatMode : 'BackCompat';
+
+  // platform
+  this.isWin   = (ua.indexOf('win') != -1);
+  this.isWin32 = (this.isWin && ( ua.indexOf('95') != -1 || ua.indexOf('98') != -1 || ua.indexOf('nt') != -1 || ua.indexOf('win32') != -1 || ua.indexOf('32bit') != -1 || ua.indexOf('xp') != -1) );
+  this.isMac   = (ua.indexOf('mac') != -1);
+  this.isUnix  = (ua.indexOf('unix') != -1 || ua.indexOf('sunos') != -1 || ua.indexOf('bsd') != -1 || ua.indexOf('x11') != -1)
+    this.isLinux = (ua.indexOf('linux') != -1);
+
+  // specific browser shortcuts
+  this.isNS4x = (this.isNS && this.versionMajor == 4);
+  this.isNS40x = (this.isNS4x && this.versionMinor < 4.5);
+  this.isNS47x = (this.isNS4x && this.versionMinor >= 4.7);
+  this.isNS4up = (this.isNS && this.versionMinor >= 4);
+  this.isNS6x = (this.isNS && this.versionMajor == 6);
+  this.isNS6up = (this.isNS && this.versionMajor >= 6);
+  this.isNS7x = (this.isNS && this.versionMajor == 7);
+  this.isNS7up = (this.isNS && this.versionMajor >= 7);
+
+  this.isIE4x = (this.isIE && this.versionMajor == 4);
+  this.isIE4up = (this.isIE && this.versionMajor >= 4);
+  this.isIE5x = (this.isIE && this.versionMajor == 5);
+  this.isIE55 = (this.isIE && this.versionMinor == 5.5);
+  this.isIE5up = (this.isIE && this.versionMajor >= 5);
+  this.isIE6x = (this.isIE && this.versionMajor == 6);
+  this.isIE6up = (this.isIE && this.versionMajor >= 6);
+
+  this.isIE4xMac = (this.isIE4x && this.isMac);
+}
+var browser = new BrowserDetectLite();

Added: xwiki/trunk/src/main/web/skins/xwiki10/button_c.gif
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/skins/xwiki10/button_c.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/skins/xwiki10/button_d.gif
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/skins/xwiki10/button_d.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/skins/xwiki10/button_g.gif
===================================================================
(Binary files differ)


Property changes on: xwiki/trunk/src/main/web/skins/xwiki10/button_g.gif
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: xwiki/trunk/src/main/web/skins/xwiki10/cancel.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/cancel.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/cancel.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,7 @@
+###
+### Cancel action
+###
+### This should NOT be displayed
+###
+#set($message=$msg.get("changescanceled"))
+#template("view.vm")

Added: xwiki/trunk/src/main/web/skins/xwiki10/changeavatar.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/changeavatar.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/changeavatar.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,20 @@
+###
+### Change a user's avatar
+###
+### Set the "avatar" property of the XWikiUsers object to the most recent attachment and forward to "view"
+### TODO: Check dimensions
+### TODO: Document version to return to? (rev and language)
+###
+#if($doc.getObject("XWikiUsers", 0) && ($context.user == $doc.fullName || $hasadmin))
+#set($date = $doc.attachmentList.get(0).date)
+#set($name = $doc.attachmentList.get(0).filename)
+#foreach($attachment in $doc.attachmentList)
+#if($date.getTime().longValue().compareTo($attachment.date.getTime().longValue()) == -1)
+#set($date = $attachment.date)
+#set($name = $attachment.filename)
+#end
+#end
+$response.sendRedirect($doc.getURL("save", "XWiki.XWikiUsers_0_avatar=$name"))
+#else
+$response.sendRedirect($doc.getURL("view"))
+#end
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/changemyavatar.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/changemyavatar.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/changemyavatar.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,29 @@
+###
+### Change a user's avatar
+###
+### Upload file form
+### TODO: Check extension
+###
+#template("startpage.vm")
+#if($doc.getObject("XWikiUsers", 0))
+#if($context.user == $doc.fullName || $hasadmin)
+  <form action="$doc.getURL("upload")" enctype="multipart/form-data" method="post" onsubmit="if(this.filepath.value == ''){ return false; }">
+#xwikimessageboxstart("Avatar" $msg.get("changephoto"))
+    <input type="hidden" name="xredirect" value="$doc.getURL("view", "xpage=changeavatar")"/>
+    <div><label id="xwikiuploadfilelabel" for="xwikiuploadfile">$msg.get("uploadavatarfile"):</label></div>
+    <div><input id="xwikiuploadfile" type="file" name="filepath" value="" size="40"/></div>
+    <div class="padded">
+    <input type="submit" value="$msg.get("setthisavatar")" class="button"/>
+    <input type="reset" value="$msg.get("cancel")" onclick="hideForm(this.form);" class="button"/>
+    </div>
+#xwikimessageboxend()
+  </form>
+#else
+#xwikimessageboxstart($msg.get("error") $msg.get("notallowed"))
+#xwikimessageboxend()
+#end
+#else
+#xwikimessageboxstart($msg.get("avatar") $msg.get("notauser"))
+#xwikimessageboxend()
+#end
+#template("endpage.vm")
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/changes.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/changes.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/changes.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,30 @@
+#template("xwiki.vm")
+#template("httpheader.vm")
+#template("header.vm")
+#template("viewheader.vm")
+<div id="xwikicontent">
+#set($rev1= $request.get("rev1"))
+#set($rev2= $request.get("rev2"))
+#if($request.get("type"))
+#set($type= $request.get("type"))
+#else
+#set($type = "html")
+#end
+#if ($tdoc.realLanguage!="")
+#set($lang = "&language=${tdoc.realLanguage}")
+#else
+#set($lang = "")
+#end
+#set($params="xpage=changes&rev1=${rev1}&rev2=${rev2}$lang")
+$msg.get("currentdifftype"): $type (
+<a href="$doc.getURL("view", "$params&type=wiki")">$msg.get("wikidiff")</a>
+<a href="$doc.getURL("view", "$params&type=source")">$msg.get("sourcediff")</a>
+<a href="$doc.getURL("view", "$params&type=html")">$msg.get("htmldiff")</a>
+)
+#set($origdoc = $xwiki.getDocument($tdoc, $rev1))
+#set($newdoc = $xwiki.getDocument($tdoc, $rev2))
+#template("changesdoc.vm")
+<br /><br />
+</div>
+#template("basefooter.vm")
+#template("footer.vm")

Added: xwiki/trunk/src/main/web/skins/xwiki10/changesall.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/changesall.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/changesall.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,38 @@
+#template("xwiki.vm")
+#template("httpheader.vm")
+#template("header.vm")
+#template("viewheader.vm")
+<div id="xwikicontent">
+#if($request.get("type"))
+#set($type= $request.get("type"))
+#else
+#set($type = "html")
+#end
+#if ($tdoc.realLanguage!="")
+#set($lang = "&language=${tdoc.realLanguage}")
+#else
+#set($lang = "")
+#end
+$msg.get("currentdifftype"): $type (
+<a href="$doc.getURL("view", "xpage=changesall&type=wiki$lang")">$msg.get("wikidiff")</a>
+<a href="$doc.getURL("view", "xpage=changesall&type=source$lang")">$msg.get("sourcediff")</a>
+<a href="$doc.getURL("view", "xpage=changesall&type=html$lang")">$msg.get("htmldiff")</a>
+)
+#set($firstrev = $tdoc.getVersion())
+#set($nextversion = $firstrev)
+#foreach ($version in $tdoc.getRecentRevisions(0))
+#if($version != $firstrev)
+#set($origdoc = "")
+#set($newdoc = "")
+#set($origdoc = $xwiki.getDocument($tdoc, $version))
+#set($newdoc = $xwiki.getDocument($tdoc, $nextversion))
+#template("changesdoc.vm")
+#set($nextversion = $version)
+#end
+#end
+#set($newdoc = $origdoc)
+#set($origdoc = $xwiki.getDocument($tdoc,"1.0"))
+#template("changesdoc.vm")
+</div>
+#template("basefooter.vm")
+#template("footer.vm")

Added: xwiki/trunk/src/main/web/skins/xwiki10/changesdoc.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/changesdoc.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/changesdoc.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,74 @@
+<div style="width: 100%; background-color: #DDDDDD">
+#if($origdoc.getVersion().equals("1"))
+<h3>$msg.get("initialversion") $newdoc.version
+#else
+<h3>$msg.get("From") $msg.get("version") $origdoc.version $msg.get("to") $newdoc.version
+#end
+#if(($origdoc=="")||($newdoc==""))
+#if($newdoc!="")
+$msg.get("editedby") $xwiki.renderText($xwiki.getLocalUserName($newdoc.author),$doc) $msg.get("on") $xwiki.formatDate($newdoc.date)
+#end
+ ($msg.get("cannotreaddocumentversion") $newdoc.version)</h3>
+</div>
+#else
+$msg.get("editedby") $xwiki.renderText($xwiki.getLocalUserName($newdoc.author), $doc) $msg.get("on") $xwiki.formatDate($newdoc.date)
+</h3>
+</div>
+
+<ul>
+#foreach($item in $doc.getMetaDataDiff($origdoc, $newdoc))
+<li>$item</li>
+#end
+</ul>
+
+<ul>
+#foreach($item in $doc.getClassDiff($origdoc, $newdoc))
+<li>$item</li>
+#end
+</ul>
+
+<ul>
+#foreach($item in $doc.getObjectDiff($origdoc, $newdoc))
+<li>$item</li>
+#end
+</ul>
+
+
+#if($type=="wiki")
+#set($deltas= $tdoc.getRenderedContentDiff($origdoc, $newdoc))
+#end
+
+#if($type=="xml")
+#set($deltas= $tdoc.getXMLDiff($origdoc, $newdoc))
+#else
+#set($deltas= $tdoc.getContentDiff($origdoc, $newdoc))
+#end
+
+#foreach($delta in $deltas)
+#set($chunk = $delta.revised)
+#if ($chunk.size()>0)
+<div style="border-left: 8px solid #00FF00">
+#if (($type == "source")||($type == "xml"))
+<pre>
+$xwiki.renderChunk($chunk, true, $tdoc)
+</pre>
+#else
+$xwiki.renderChunk($chunk, $tdoc)
+#end
+</div>
+#end
+
+#set($chunk = $delta.original)
+#if ($chunk.size()>0)
+<div style="border-left: 8px solid #FF0000">
+#if (($type == "source")||($type == "xml"))
+<pre>
+$xwiki.renderChunk($chunk, true, $tdoc)
+</pre>
+#else
+$xwiki.renderChunk($chunk, $tdoc)
+#end
+</div>
+#end
+#end
+#end
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/chw/axispage.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/chw/axispage.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/chw/axispage.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,47 @@
+        <div id="chwAxesWizard" class="chwInactivePage">
+          <div id="chwXAxisTitleDiv" class="chwHidden">
+            <fieldset>
+              <legend>Category Axis</legend>
+              <input id="chwXAxisTitleEnabled" name="axis_domain_visible" type="checkbox" onchange="window.wizard.flipEnabled('XAxisTitle');" checked="checked" value="true"/>
+              <label for="chwXAxisTitleEnabled">Show category axis label</label><br/>
+              <label for="chwXAxisTitleInput">Label:</label>
+              <input type="text" id="chwXAxisTitleInput" name="axis_domain_label"/>
+              <div id="chwXAxisTitleAdvancedDiv" class="chwHidden">
+                <label for="chwXAxisTitlePositionInput">Position:</label>
+                <select id="chwXAxisTitlePositionInput" name="axis_domain_position">
+                  <option selected="selected" value="top">Top</otpion>
+                  <option value="left">Left</otpion>
+                  <option value="bottom">Bottom</otpion>
+                  <option value="right">Right</otpion>
+                </select>
+                <br/>
+                <label for="chwXAxisTitleHorizontalAlignmentInput">Horizontal Alignment:</label>
+                <select id="chwXAxisTitleHorizontalAlignmentInput" name="title_horizontal_alignment">
+                  <option value="left">Left</otpion>
+                  <option selected="selected" value="center">Center</otpion>
+                  <option value="right">Right</otpion>
+                </select>
+                <br/>
+                <label for="chwXAxisTitleVerticalAlignmentInput">Vertical Alignment:</label>
+                <select id="chwXAxisTitleVerticalAlignmentInput" name="title_vertical_alignment">
+                  <option value="top">Top</otpion>
+                  <option selected="selected" value="center">Center</otpion>
+                  <option value="bottom">Bottom</otpion>
+                </select>
+                <label for="chwXAxisTitle"/>
+              </div>
+            </fieldset>
+          </div>
+          <div id="chwYAxisTitleDiv" class="chwHidden">
+            <label for="chwYAxisTitleInput">Y-axis name:</label>
+            <input type="text" id="axis_range_label"/>
+          </div>
+          <div id="chwXAxisDiv" class="chwHidden">
+            <input type="checkbox" id="chwXAxisInput"/>
+            <label for="chwXAxisInput">Show X-axis</label>
+          </div>
+          <div id="chwYAxisDiv" class="chwHidden">
+            <input type="checkbox" id="chwYAxisInput"/>
+            <label for="chwYAxisInput">Show Y-axis</label>
+          </div>
+        </div>

Added: xwiki/trunk/src/main/web/skins/xwiki10/chw/colorpicker.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/chw/colorpicker.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/chw/colorpicker.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,69 @@
+<div id="chwColorPicker">
+  <img src="$xwiki.getSkinFile("chwempty.png")" id="chwColorPickerScreen"/>
+  <fieldset id="chwColorPickerFieldset" class="chwLargeFieldset">
+    <legend id="chwColorPickerLegend" class="chwLargeLegend">Color picker</legend>
+    <table summary="Color picker maps layout" id="chwColorpickerTable">
+      <tbody>
+        <tr>
+          <td class="chwColorpickerHSTd">
+            <div class="chwColorpickerHSDiv">
+            <img src="$xwiki.getSkinFile("chwcolormap.png")" title="" alt="" class="chwColorpickerHSImg" id="chwColorpickerHSMap"
+            onclick="window.colorPicker.hsChanged(event, this)"
+            onmousedown="return window.colorPicker.mouseDown(event, this)"
+            onmouseup="return window.colorPicker.mouseUp(event, this)"
+            onmousemove="window.colorPicker.mouseMove(event, this);"/>
+            </div>
+          </td>
+          <td>
+            <div class="chwColorpickerLDiv">
+            <img src="$xwiki.getSkinFile("chwluminancemoz.png")" title="" alt="" class="chwColorpickerLImg" id="chwColorpickerLMap"
+            onclick="window.colorPicker.lChanged(event, this)"
+            onmousedown="window.colorPicker.mouseDown(event, this)"
+            onmouseup="window.colorPicker.mouseUp(event, this)"
+            onmousemove="window.colorPicker.mouseMove(event, this)"/>
+            </div>
+          </td>
+          <td class="chwColorpickerLPointerContainer" id="chwColorpickerLPointerContainer" style="background-image: url($xwiki.getSkinFile("chwpointer.png"));">
+            <img src="$xwiki.getSkinFile("chwempty.png")" title="" alt="" class="chwColorpickerLPointerImg" id="chwColorpickerLPointer"
+            onclick="window.colorPicker.lChanged(event, this)"
+            onmousedown="window.colorPicker.mouseDown(event, this)"
+            onmouseup="window.colorPicker.mouseUp(event, this)"
+            onmousemove="window.colorPicker.mouseMove(event, this)"/>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+    <table summary="Color picker output controls layout" id="chwColorpickerControlsTable">
+      <tbody>
+        <tr>
+          <td class="chwColorpickerComponents" id="chwColorpickerShowContainer">
+            <div class="chwColorpickerShow" id="chwColorPickerShow"></div>
+            <input type="text" value="#5252ad" id="chwColorCodeDisplay" onkeyup="window.colorPicker.htmlCodeChanged();" class="chwColorpickerHtmlCode"/>
+          </td>
+          <td class="chwColorpickerComponents">
+            <label for="chwColorpickerRed">R</label>
+            <input type="text" id="chwColorpickerRed" class="chwColorInput" value="82" onkeyup="window.colorPicker.rgbCodeChanged();"/><br/>
+            <label for="chwColorpickerGreen">G</label>
+            <input type="text" id="chwColorpickerGreen" class="chwColorInput" value="82" onkeyup="window.colorPicker.rgbCodeChanged();"/><br/>
+            <label for="chwColorpickerBlue">B</label>
+            <input type="text" id="chwColorpickerBlue" class="chwColorInput" value="173" onkeyup="window.colorPicker.rgbCodeChanged();"/><br/>
+          </td>
+          <td class="chwColorpickerComponents">
+            <label for="chwColorpickerHue">H</label>
+            <input type="text" id="chwColorpickerHue" class="chwColorInput" value="160" onkeyup="window.colorPicker.hslCodeChanged();"/><br/>
+            <label for="chwColorpickerSaturation">S</label>
+            <input type="text" id="chwColorpickerSaturation" class="chwColorInput" value="85" onkeyup="window.colorPicker.hslCodeChanged();"/><br/>
+            <label for="chwColorpickerLighness">L</label>
+            <input type="text" id="chwColorpickerLightness" class="chwColorInput" value="120" onkeyup="window.colorPicker.hslCodeChanged();"/><br/>
+          </td>
+        </tr>
+        <tr>
+          <td colspan="3" class="chwColorpickerButton">
+            <a href="#" onclick="window.colorPicker.OK(event); return false;" title="Use this color" class="chwButton">&nbsp;&nbsp;&nbsp;OK&nbsp;&nbsp;&nbsp;</a>
+            <a href="#" onclick="window.colorPicker.Cancel(event); return false;" title="Cancel" class="chwButton">Cancel</a>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </fieldset>
+</div>
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/chw/datapage.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/chw/datapage.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/chw/datapage.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,65 @@
+#set($definedDS = "")
+#foreach($docName in $xwiki.searchDocuments(""))
+ #set($document = $xwiki.getDocument($docName))
+ #set($hasSources = "false")
+ #set($objects = $document.getxWikiObjects())
+ #foreach($className in $objects.keySet())
+  #if($className.endsWith("DataSource") && $className.startsWith("XWiki."))
+   #set($objectSet = $objects.get($className))
+   #if($objectSet.size() != 0)
+    #foreach($i in [1 .. $objectSet.size()])
+     #set($j = $i - 1)
+     #set($object = $objectSet.get($j))
+     #set($value = "type:object;")
+     #set($value = $value.concat("doc:").concat($docName).concat(";"))
+     #set($value = $value.concat("class:").concat($className.substring(6)).concat(";"))
+     #set($value = $value.concat("object_number:").concat("$j"))
+     #if($object.get("datasource_name").trim() == "")
+                   #set($definedDS = $definedDS.concat("<option value='$value'>$className.substring(6) #$j from $docName</option>"))
+     #else
+                   #set($definedDS = $definedDS.concat("<option value='$value'>").concat($object.get("datasource_name")).concat("</option>"))
+     #end
+    #end
+   #end
+  #end
+ #end
+#end
+        <div id="chwDataWizard" class="chwInactivePage">
+          <fieldset id="chwDataWizardFieldset" class="chwLargeFieldset">
+            <legend id="chwDataOptionsLegend" class="chwLargeLegend" onclick="window.wizard.flipAdvanced('DataOptions');" title="$msg.get("chwdatasourcetitle")">$msg.get("chwdatasourcelegend") &lt;&lt;</legend>
+            <div id="chwDataOptionsDiv" class="chwVisible">
+              <fieldset class="chwSmallFieldset">
+                <legend class="chwSmallLegend"><input type="radio" id="chwDataDefineLegend" checked="checked" name="sourcetype" onclick="if(this.checked){window.wizard.changeSourceType('Define');}" onchange="if(this.checked){window.wizard.changeSourceType('Define');}"/><label for="chwDataDefineLegend" class="chwAction">$msg.get("chwdatadefinelegend")</label></legend>
+                <div id="chwDataDefineDiv">
+                  <label for="chwDataCreateTypeInput">$msg.get("chwdatadefinetypelable")</input>
+                  <select id="chwDataDefineTypeInput" title="$msg.get("chwdatadefinetypetitle")" onchange="window.wizard.defineTypeChanged()">
+                    <option value="table" title="$msg.get("chwdatatypetabletitle")" selected="selected">$msg.get("chwdatatypetable")</option>
+                  </select>
+                  <div id="chwDataTypeTableDiv" class="chwInline">
+                    <span class="chwDatSourceWizardInvoker" title="$msg.get("chwinvoketablewizardtitle")" onclick="window.open('$doc.getURL("chartwizard", "xpage=chw/tdwwizard")', 'chwDatasourceWizard', 'location=0,scrollbars=0,menubar=0,toolbar=0,statusbar=0,directories=0,height=470,width=700');">$msg.get("chwinvoketablewizard")</span>
+                    <input id="chwDataSourceInput" type="hidden" name="source"/>
+                  </div>
+                  <span class="chwHidden" id="chwDefineHasDatasource">$msg.get("chwsourcedefined")</span>
+                </div>
+              </fieldset>
+              <fieldset class="chwSmallFieldset">
+                <legend class="chwSmallLegend"><input type="radio" id="chwDataReuseLegend" name="sourcetype" onclick="if(this.checked){window.wizard.changeSourceType('Reuse');}" onchange="if(this.checked){window.wizard.changeSourceType('Reuse');}" #if($definedDS == "") disabled="disabled" #end/><label for="chwDataReuseLegend" class="chwAction">$msg.get("chwdatareuselegend")</label></legend>
+                <div id="chwDataReuseDiv" class="chwHidden">
+                  <select id="chwDataReuseDocInput" name="source" class="chwLimited">
+                    $definedDS
+                  </select>
+                </div>
+              </fieldset>
+              <fieldset class="chwSmallFieldset">
+                <legend class="chwSmallLegend" id="chwDataOrientationLegend" title="$msg.get("chwdataorientationtitle")" class="chwExpander" onclick="window.wizard.flipAdvanced('DataOrientation'); return false;">$msg.get("chwdataorientationlegend") &lt;&lt;</legend>
+                <div id="chwDataOrientationDiv" class="chwVisible">
+                  <label for="chwDataOrientationInput">$msg.get("chwdataorientationlabel")</label>
+                  <select id="chwDataOrientationInput" name="series">
+                    <option value="rows" #if($chartDefaults.get("series") == "rows") selected="selected" #end>$msg.get("chwdataorientationrows")</option>
+                    <option value="columns" #if($chartDefaults.get("series") == "columns") selected="selected" #end>$msg.get("chwdataorientationcolumns")</option>
+                  </select>
+                </div>
+              </fieldset>
+            </div>
+          </fieldset>
+        </div>

Added: xwiki/trunk/src/main/web/skins/xwiki10/chw/navigationimages.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/chw/navigationimages.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/chw/navigationimages.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1 @@
+<div id="chwNavigationButtons"><img src="$xwiki.getSkinFile("chwTaskCompleting.png")" id="chwDataWizardButton" alt="$msg.get("chwimgdata")"    title="$msg.get("chwimgdata")"    class="chwNavigationImage"         onclick="window.wizard.showWizardPage('Data');"   onmouseover="window.wizard.enterButton('Data');"   onmouseout="window.wizard.leaveButton('Data');"/><img src="$xwiki.getSkinFile("chwTaskWaiting.png")" id="chwTypeWizardButton"    alt="$msg.get("chwimgtype")"    title="$msg.get("chwimgtype")"    class="chwNavigationImageDisabled" onclick="window.wizard.showWizardPage('Type');"   onmouseover="window.wizard.enterButton('Type');"   onmouseout="window.wizard.leaveButton('Type');"/><img src="$xwiki.getSkinFile("chwTaskWaiting.png")" id="chwTitlesWizardButton"  alt="$msg.get("chwimgtitle")"   title="$msg.get("chwimgtitle")"   class="chwNavigationImageHidden"   onclick="window.wizard.showWizardPage('Titles');" onmouseover="window.wizard.enterButton('Titles');" onmouseout="window.wizard.leaveButton('Titles');"/><img src="$xwiki.getSkinFile("chwTaskWaiting.png")" id="chwAxesWizardButton"    alt="$msg.get("chwimgaxes")"    title="$msg.get("chwimgaxes")"    class="chwNavigationImageHidden"   onclick="window.wizard.showWizardPage('Axes');"   onmouseover="window.wizard.enterButton('Axes');"   onmouseout="window.wizard.leaveButton('Axes');"/><img src="$xwiki.getSkinFile("chwTaskWaiting.png")" id="chwLabelsWizardButton"  alt="$msg.get("chwimglabel")"   title="$msg.get("chwimglabel")"   class="chwNavigationImageHidden"   onclick="window.wizard.showWizardPage('Labels');" onmouseover="window.wizard.enterButton('Labels');" onmouseout="window.wizard.leaveButton('Labels');"/><img src="$xwiki.getSkinFile("chwTaskWaiting.png")" id="chwGridWizardButton"    alt="$msg.get("chwimggrid")"    title="$msg.get("chwimggrid")"    class="chwNavigationImageHidden"   onclick="window.wizard.showWizardPage('Grid');"   onmouseover="window.wizard.enterButton('Grid');"   onmouseout="window.wizard.leaveButton('Grid');"/><img src="$xwiki.getSkinFile("chwTaskWaiting.png")" id="chwLegendWizardButton"  alt="$msg.get("chwimglegend")"  title="$msg.get("chwimglegend")"  class="chwNavigationImageHidden"   onclick="window.wizard.showWizardPage('Legend');" onmouseover="window.wizard.enterButton('Legend');" onmouseout="window.wizard.leaveButton('Legend');"/><img src="$xwiki.getSkinFile("chwTaskWaiting.png")" id="chwSpaceWizardButton"   alt="$msg.get("chwimgspacing")" title="$msg.get("chwimgspacing")" class="chwNavigationImageHidden"   onclick="window.wizard.showWizardPage('Space');"  onmouseover="window.wizard.enterButton('Legend');" onmouseout="window.wizard.leaveButton('Space');"/><img src="$xwiki.getSkinFile("chwTaskWaiting.png")" id="chwColorsWizardButton"  alt="$msg.get("chwimgcolors")"  title="$msg.get("chwimgcolors")"  class="chwNavigationImageHidden"   onclick="window.wizard.showWizardPage('Colors');" onmouseover="window.wizard.enterButton('Colors');" onmouseout="window.wizard.leaveButton('Colors');"/><img src="$xwiki.getSkinFile("chwTaskWaiting.png")" id="chwInsertWizardButton"  alt="$msg.get("chwimginsert")"  title="$msg.get("chwimginsert")"  class="chwNavigationImageHidden"   onclick="window.wizard.showWizardPage('Insert');" onmouseover="window.wizard.enterButton('Insert');" onmouseout="window.wizard.leaveButton('Insert');"/></div>
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/chw/tdwnavigationimages.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/chw/tdwnavigationimages.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/chw/tdwnavigationimages.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1 @@
+<div id="tdwNavigationButtons"><img src="$xwiki.getSkinFile("chwTaskCompleting.png")" id="tdwDocWizardButton"   alt="$msg.get("tdwimgdoc")"   title="$msg.get("tdwimgdoc")"   class="tdwNavigationImageDisabled"  onclick="window.wizard.showWizardPage('Doc');"   onmouseover="window.wizard.enterButton('Doc');"   onmouseout="window.wizard.leaveButton('Doc');"/><img src="$xwiki.getSkinFile("chwTaskWaiting.png")"    id="tdwRangeWizardButton" alt="$msg.get("tdwimgrange")" title="$msg.get("tdwimgrange")" class="tdwNavigationImageDisabled"  onclick="window.wizard.showWizardPage('Range');" onmouseover="window.wizard.enterButton('Range');" onmouseout="window.wizard.leaveButton('Range');"/><img src="$xwiki.getSkinFile("chwTaskWaiting.png")"    id="tdwExtraWizardButton" alt="$msg.get("tdwimgextra")" title="$msg.get("tdwimgextra")" class="tdwNavigationImageDisabled"  onclick="window.wizard.showWizardPage('Extra');" onmouseover="window.wizard.enterButton('Extra');" onmouseout="window.wizard.leaveButton('Extra');"/></div>
\ No newline at end of file

Added: xwiki/trunk/src/main/web/skins/xwiki10/chw/tdwwizard.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/chw/tdwwizard.vm	2006-08-09 07:55:42 UTC (rev 1126)
+++ xwiki/trunk/src/main/web/skins/xwiki10/chw/tdwwizard.vm	2006-08-09 21:32:26 UTC (rev 1127)
@@ -0,0 +1,114 @@
+#template("xwiki.vm")
+<?xml version="1.0" encoding="$xwiki.encoding" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
+<head>
+<title>Table data source wizard</title>
+<meta http-equiv="Content-Type" content="text/xhtml+xml; charset=$xwiki.encoding" />
+<meta http-equiv="imagetoolbar" content="no"/>
+$!xwiki.getWebPreference("meta") 
+<link href="$xwiki.getSkinFile("tdwSkin.css")" rel="stylesheet" type="text/css"/>
+#template("stylesheets.vm")
+<script type="text/javascript" src="$xwiki.getSkinFile("tdwScripts.js")"></script>
+</head>
+#set($saveAddress = $xwiki.getURL("Main.WebHome", "objectadd"))
+#set($saveAddress = $saveAddress.substring(0, $saveAddress.indexOf("Main/WebHome")))
+#set($baseAddress = $xwiki.getURL("Main.WebHome", "gettables"))
+#set($baseAddress = $baseAddress.substring(0, $baseAddress.indexOf("Main/WebHome")))
+<body onload="window.wizard.initialize('$baseAddress', '$xwiki.getSkinFile("")', '$saveAddress');">
+<div id="tableWizard">
+  <table id="tdwWizard" summary="Table Datasource Wizard Content">
+    <tbody>
+      <tr>
+        <td id="tdwNavigation">
+#template("chw/tdwnavigationimages.vm")
+      </td>
+    </tr>
+    <tr>
+      <td id="tdwOptions">
+        <div id="tdwDocWizard" class="tdwInactivePage">
+          <fieldset id="tdwDocWizardFieldset" class="tdwLargeFieldset">
+            <legend id="tdwDocOptionsLegend" class="tdwLargeLegend">$msg.get("tdwdoclegend")</legend>
+            <div id="tdwDocOptionsDiv" class="tdwVisible">
+              <label for="tdwPageInput">$msg.get("tdwdocselectlabel")</label>
+              <select id="tdwPageInput" class="tdwListbox" size="16" onchange="window.wizard.change()">
+#set($currentPage = $doc.getFullName())
+#foreach($page in $xwiki.searchDocuments("where doc.content like '%{table}%'"))
+#if($currentPage == "$page")
+                <option value="$page" selected="selected">$page</option>
+#else
+                <option value="$page">$page</option>
+#end
+#end
+              </select>
+            </div>
+          </fieldset>
+        </div>
+        <div id="tdwRangeWizard" class="tdwInactivePage">
+          <fieldset id="tdwRangeWizardFieldset" class="tdwLargeFieldset">
+            <legend id="tdwRangeOptionsLegend" class="tdwLargeLegend">$msg.get("tdwrangelegend")</legend>
+            <span id="tdwWaiting