phpwiki-checkins Mailing List for PhpWiki (Page 2)

Revision: 9669
 http://sourceforge.net/p/phpwiki/code/9669
Author: vargenau
Date: 2015年04月14日 16:41:51 +0000 (2015年4月14日)
Log Message:
-----------
jscalendar: remove useless files
Removed Paths:
-------------
 trunk/themes/blog/jscalendar/ChangeLog
 trunk/themes/blog/jscalendar/calendar-system.css
 trunk/themes/blog/jscalendar/calendar-tas.css
 trunk/themes/blog/jscalendar/doc/
 trunk/themes/blog/jscalendar/simple-1.html
 trunk/themes/blog/jscalendar/simple-2.html
Deleted: trunk/themes/blog/jscalendar/ChangeLog
===================================================================
--- trunk/themes/blog/jscalendar/ChangeLog	2015年04月14日 16:31:05 UTC (rev 9668)
+++ trunk/themes/blog/jscalendar/ChangeLog	2015年04月14日 16:41:51 UTC (rev 9669)
@@ -1,761 +0,0 @@
-2005年03月07日 Mihai Bazon <mih...@ya...>
-
-	* skins/aqua/theme.css: *** empty log message ***
-
-	* release-notes.html: updated release notes
-
-	* calendar-setup.js:
-	use a better approach to initialize the calendar--don't call _init twice,
-	it's the most time consuming function in the calendar. Instead, determine
-	the date beforehand if possible and pass it to the calendar at constructor.
-
-	* calendar.js:
-	avoid keyboard operation when 'multiple dates' is set (very buggy for now)
-
-	* calendar.js:
-	fixed keyboard handling problems: now it works fine when "showsOtherMonths"
-	is passed; it also seems to be fine with disabled dates (won't normally
-	allow selection)--however this area is still likely to be buggy, i.e. in a
-	month that has all the dates disabled.
-
-	* calendar.js:
-	some trivial performance improvements in the _init function
-	Added Date.parseDate (old Calendar.prototype.parseDate now calls this one)
-
-2005年03月05日 Mihai Bazon <mih...@ya...>
-
-	* release-notes.html: updated release notes
-
-	* dayinfo.html: *** empty log message ***
-
-	* calendar-setup.js:
-	bugfix--update an inputField even if flat calendar is selected
-
-	* calendar.js:
-	fixed bugs in parseDate function (if for some reason the input string is
-	totally broken, then check numbers for NaN and use values from the current
-	date instead)
-
-	* make-release.pl: copy the skins subdirectory and all skins
-
-	* index.html: added Aqua skin
-
-	* skins/aqua/active-bg.gif, skins/aqua/dark-bg.gif, skins/aqua/hover-bg.gif, skins/aqua/menuarrow.gif, skins/aqua/normal-bg.gif, skins/aqua/rowhover-bg.gif, skins/aqua/status-bg.gif, skins/aqua/theme.css, skins/aqua/title-bg.gif, skins/aqua/today-bg.gif:
-	in the future, skins will go to this directory, each in a separate subdir; for now there's only Aqua, an excellent new skin
-
-	* calendar.js: workaround IE bug, needed in the Aqua theme
-	don't hide select elements unless browser is IE or Opera
-
-	* lang/calendar-bg.js, lang/calendar-big5-utf8.js, lang/calendar-big5.js, lang/calendar-br.js, lang/calendar-ca.js, lang/calendar-cs-utf8.js, lang/calendar-cs-win.js, lang/calendar-da.js, lang/calendar-de.js, lang/calendar-el.js, lang/calendar-en.js, lang/calendar-es.js, lang/calendar-fi.js, lang/calendar-fr.js, lang/calendar-he-utf8.js, lang/calendar-hu.js, lang/calendar-it.js, lang/calendar-ko-utf8.js, lang/calendar-ko.js, lang/calendar-lt-utf8.js, lang/calendar-lt.js, lang/calendar-lv.js, lang/calendar-nl.js, lang/calendar-no.js, lang/calendar-pl-utf8.js, lang/calendar-pl.js, lang/calendar-pt.js, lang/calendar-ro.js, lang/calendar-ru.js, lang/calendar-ru_win_.js, lang/calendar-si.js, lang/calendar-sk.js, lang/calendar-sp.js, lang/calendar-sv.js, lang/calendar-zh.js, lang/cn_utf8.js:
-	updated urls, copyright notices
-
-	* doc/reference.tex: updated documentation
-
-	* calendar.js, index.html:
-	renamed the global variable to _dynarch_popupCalendar to avoid name clashes
-
-	* multiple-dates.html: start with an empty array
-
-	* calendar.js:
-	fixed bugs in the time selector (12:XX pm was wrongfully understood as 12:XX am)
-
-	* calendar.js:
-	using innerHTML instead of text nodes; works better in Safari and also makes
-	a smaller, cleaner code
-
-2005年03月04日 Mihai Bazon <mih...@ya...>
-
-	* calendar.js:
-	fixed a performance regression that occurred after adding support for multiple dates
-	fixed the time selection bug (now it keeps time correctly)
-	clicking today will close the calendar if "today" is already selected
-
-	* lang/cn_utf8.js: new translation
-
-2005年02月17日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-ar-utf8.zip: Added arabic translation
-
-2004年10月19日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-zh.js: updated
-
-2004年09月20日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-no.js: updated (Daniel Holmen)
-
-2004年09月20日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-no.js: updated (Daniel Holmen)
-
-2004年08月11日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-nl.js: updated language file (thanks to Arjen Duursma)
-
-	* lang/calendar-sp.js: updated (thanks to Rafael Velasco)
-
-2004年07月21日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-br.js: updated
-
-	* calendar-setup.js: fixed bug (dateText)
-
-2004年07月21日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-br.js: updated
-
-	* calendar-setup.js: fixed bug (dateText)
-
-2004年07月04日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-lv.js:
-	added LV translation (thanks to Juris Valdovskis)
-
-2004年06月25日 Mihai Bazon <mih...@ya...>
-
-	* calendar.js:
-	fixed bug in IE (el.calendar.tooltips is null or not an object)
-
-2004年06月24日 Mihai Bazon <mih...@ya...>
-
-	* doc/reference.tex: fixed latex compilation
-
-	* index.html: linking other sample files
-
-	* calendar-setup.js, calendar.js, dayinfo.html:
-	ability to display day info (dateText parameter) + sample file
-
-2004年06月23日 Mihai Bazon <mih...@ya...>
-
-	* doc/reference.tex, lang/calendar-bg.js, lang/calendar-br.js, lang/calendar-ca.js, lang/calendar-en.js, lang/calendar-es.js, lang/calendar-fr.js, lang/calendar-it.js, lang/calendar-ko-utf8.js, lang/calendar-ko.js, lang/calendar-nl.js, lang/calendar-sv.js, README, calendar.js, index.html:
-	email address changed
-
-2004年06月14日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-cs-utf8.js, lang/calendar-cs-win.js:
-	updated translations
-
-	* calendar-system.css: added z-index to drop downs
-
-	* lang/calendar-en.js:
-	first day of week can now be part of the language file
-
-	* lang/calendar-es.js:
-	updated language file (thanks to Servilio Afre Puentes)
-
-	* calendar-blue2.css, calendar-brown.css, calendar-green.css, calendar-tas.css, calendar-win2k-1.css, calendar-win2k-2.css, calendar-win2k-cold-1.css, calendar-win2k-cold-2.css, calendar-blue.css:
-	added z-index property to drop downs (fixes bug)
-
-2004年06月13日 Mihai Bazon <mih...@ya...>
-
-	* calendar-setup.js: fixed bug (apply showOthers to flat calendars too)
-
-2004年06月06日 Mihai Bazon <mih...@ya...>
-
-	* calendar-setup.js:
-	firstDay defaults to "null", in which case the value in the language file
-	will be used
-
-	* calendar.js:
-	firstDayOfWeek can now default to a value specified in the language definition file
-
-	* index.html: first day of week is now numeric
-
-2004年06月02日 Mihai Bazon <mih...@ya...>
-
-	* calendar.js: added date tooltip function
-
-2004年05月28日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-br.js: updated (thanks to Marcos Pont)
-
-	* calendar-setup.js: fixed small bug
-
-2004年05月01日 Mihai Bazon <mih...@ya...>
-
-	* calendar-setup.js: returns the calendar object
-
-2004年04月28日 Mihai Bazon <mih...@ya...>
-
-	* calendar-setup.js:
-	patch to read the date value from the inputField, according to ifFormat (if
-	both are passed), for flat calendars. (thanks Colin T. Hill)
-
-2004年04月20日 Mihai Bazon <mih...@ya...>
-
-	* calendar-setup.js, calendar.js, multiple-dates.html:
-	added support for multiple dates selection
-
-	* lang/calendar-nl.js:
-	updated Dutch translation, thanks to Jeroen Wolsink
-
-	* lang/calendar-big5-utf8.js, lang/calendar-big5.js:
-	Traditional Chinese language (thanks GaryFu)
-
-2004年03月26日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-fr.js, lang/calendar-pt.js: updated
-
-	* lang/calendar-ru_win_.js, lang/calendar-ru.js:
-	updated, thanks to Sly Golovanov
-
-2004年03月25日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-fr.js: updated (thanks to David Duret)
-
-2004年03月24日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-da.js: updated (thanks to Michael Thingmand Henriksen)
-
-2004年03月21日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-ca.js: updated (thanks to David Valls)
-
-2004年03月17日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-de.js: updated to UTF8 (thanks to Jack (tR))
-
-2004年03月09日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-bg.js: Bulgarian translation
-
-2004年03月08日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-he-utf8.js: Hebrew translation (thanks to Idan Sofer)
-
-	* lang/calendar-hu.js: updated (thanks to Istvan Karaszi)
-
-2004年02月27日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-it.js: updated (thanks to Fabio Di Bernardini)
-
-2004年02月25日 Mihai Bazon <mih...@ya...>
-
-	* calendar.js: fix for Safari (thanks to Olivier Chirouze / XPWeb)
-
-2004年02月22日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-al.js: Albanian language file
-
-2004年02月17日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-fr.js: fixed
-
-	* lang/calendar-fr.js:
-	FR translation updated (thanks to SIMON Alexandre)
-
-	* lang/calendar-es.js: ES translation updated, thanks to David Gonzales
-
-2004年02月10日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-pt.js:
-	updated Portugese translation, thanks to Elcio Ferreira
-
-2004年02月09日 Mihai Bazon <mih...@ya...>
-
-	* TODO: updated
-
-2004年02月06日 Mihai Bazon <mih...@ya...>
-
-	* README: describe the PHP files
-
-	* make-release.pl: includes php files
-
-	* make-release.pl: ChangeLog included in the distribution (if found)
-
-	* calendar.js, doc/reference.tex, index.html: switched to version 0.9.6
-
-	* doc/Calendar.setup.tex, doc/reference.tex: updated documentation
-
-	* release-notes.html: updated release notes
-
-	* calendar.js: Fixed bug: Feb/29 and year change now keeps Feb in view
-
-	* calendar.js: fixed the "ESC" problem (call the close handler)
-
-	* calendar.js: fixed day of year range (1 to 366 instead of 0 to 365)
-
-	* calendar.js: fixed week number calculations
-
-	* doc/reference.tex: fixed (date input format)
-
-	* calendar.php: removed comment
-
-	* calendar-blue.css, calendar-blue2.css, calendar-brown.css, calendar-green.css, calendar-system.css, calendar-tas.css, calendar-win2k-1.css, calendar-win2k-2.css, calendar-win2k-cold-1.css, calendar-win2k-cold-2.css, calendar.js:
-	workaround for IE bug (you can't normally specify through CSS the style for
-	an element having two classes or more; we had to change a classname)
-
-	* calendar-blue.css, calendar-blue2.css, calendar-brown.css, calendar-green.css, calendar-system.css, calendar-tas.css, calendar-win2k-1.css, calendar-win2k-2.css, calendar-win2k-cold-1.css, calendar-win2k-cold-2.css:
-	smaller fonts on days that are in neighbor months
-
-2004年02月04日 Mihai Bazon <mih...@ya...>
-
-	* index.html: first demo shows the "showOtherMonths" capability
-
-	* calendar-setup.js: support new parameters in the calendar.
-	added: firstDay, showOthers, cache.
-
-	* calendar-blue.css, calendar-blue2.css, calendar-brown.css, calendar-green.css, calendar-system.css, calendar-win2k-1.css, calendar-win2k-2.css, calendar-win2k-cold-1.css, calendar-win2k-cold-2.css, calendar.js, lang/calendar-en.js, lang/calendar-ro.js:
-	new parameters: firstDayOfWeek, showsOtherMonths; removed mondayFirst.
-	This adds support for setting any day to be the first day of week (by just
-	clicking the day name in the display); also, if showsOtherMonths is enabled
-	then dates belonging to adjacent months that are in the current view will be
-	displayed and the calendar will have a fixed height.
-
-	all themes updated.
-
-	* test.php: test for calendar.php
-
-	* calendar.php: fixed bug (pass numeric values as numbers)
-
-2004年02月01日 Mihai Bazon <mih...@ya...>
-
-	* calendar.php: added PHP wrapper
-
-	* img.gif: icon updated
-
-	* TODO: updated TODO list
-
-2004年01月27日 Mihai Bazon <mih...@ya...>
-
-	* calendar.js:
-	Janusz Piwowarski sent over a patch for IE5 compatibility which is much more
-	elegant than the atrocities that I had wrote :-D I'm gettin' old.. Thanks Janusz!
-
-	* lang/calendar-fi.js: updated
-
-2004年01月15日 Mihai Bazon <mih...@ya...>
-
-	* TODO: updated TODO list
-
-	* calendar-setup.js: default align changed to "Br"
-
-	* doc/reference.tex: changed default value for "align"
-
-	* calendar-setup.js: calling onchange event handler, if available
-
-	* calendar-setup.js: added "position" option
-
-	* simple-1.html: demonstrates "step" option
-
-	* calendar-setup.js: added "step" option
-
-	* calendar.js: added yearStep config parameter
-
-	* calendar.js:
-	fixed parseDate routine (the NaN bug which occurred when there was a space
-	after the date and no time)
-
-2004年01月14日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-en.js: added "Time:"
-
-	* test-position.html: test for the new position algorithm
-
-	* index.html: do not destroy() the calendar
-	avoid bug in parseDate (%p must be separated by non-word characters)
-
-	* menuarrow2.gif: for calendar-blue2.css
-
-	* calendar-setup.js: honor "date" parameter if passed
-
-	* calendar.js: IE5 support is back
-	performance improvements in IE6 (mouseover combo boxes)
-	display "Time:" beside the clock area, if defined in the language file
-	new positioning algorithm (try to keep the calendar in page)
-	rewrote parseDate a little cleaner
-
-	* lang/calendar-el.js:
-	updated Greek translation (thanks Alexandros Pappas)
-
-2004年01月13日 Mihai Bazon <mih...@ya...>
-
-	* index.html: added style blue2, using utf-8 instead of iso-8859-2
-
-	* calendar.js: performance under IE (which sucks, by the way)
-
-	* doc/reference.tex: Sunny added to sponsor list
-
-	* doc/Calendar.setup.tex: documenting parameter 'electric'
-
-	* calendar-blue.css, calendar-blue2.css, calendar-brown.css, calendar-green.css, calendar-system.css, calendar-win2k-1.css, calendar-win2k-2.css, calendar-win2k-cold-1.css, calendar-win2k-cold-2.css:
-	fixed IE text size problems
-
-2004年01月08日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-pl.js:
-	Polish translation updated to UTF-8 (thanks to Artur Filipiak)
-
-2004年01月07日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-si.js: updated (David Milost)
-
-	* lang/calendar-si.js: Slovenian translation (thanks to David Milost)
-
-2003年12月21日 Mihai Bazon <mih...@ya...>
-
-	* TODO: updated TODO list
-
-	* lang/calendar-de.js: German translation (thanks to Peter Strotmann)
-
-2003年12月19日 Mihai Bazon <mih...@ya...>
-
-	* doc/reference.tex: Thank you, Ian Barrak
-
-2003年12月18日 Mihai Bazon <mih...@ya...>
-
-	* doc/reference.tex: fixed documentation bug (thanks Mike)
-
-2003年12月05日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-ko-utf8.js:
-	UTF8 version of the Korean language (hopefully correct)
-
-	* lang/calendar-pl-utf8.js, lang/calendar-pl.js:
-	updated Polish translation (thanks to Janusz Piwowarski)
-
-2003年12月04日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-fr.js:
-	French translation updated (thanks to Angiras Rama)
-
-2003年11月22日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-da.js: updated (thanks to Jesper M. Christensen)
-
-2003年11月20日 Mihai Bazon <mih...@ya...>
-
-	* calendar-blue2.css, calendar-tas.css:
-	new styles (thanks to Wendall Mosemann for blue2, Mark Lynch for tas)
-
-	* lang/calendar-lt-utf8.js, lang/calendar-lt.js:
-	Lithuanian translation (thanks to Martynas Majeris)
-
-	* lang/calendar-sp.js: updated
-
-2003年11月17日 Mihai Bazon <mih...@ya...>
-
-	* TODO: added TODO list
-
-2003年11月14日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-ko.js: Korean translation (thanks to Yourim Yi)
-
-2003年11月12日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-jp.js: small bug fixed (thanks to TAHARA Yusei)
-
-2003年11月10日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-fr.js: translation updated, thanks to Florent Ramiere
-
-	* calendar-setup.js:
-	added new parameter: electric (if false then the field will not get updated on each move)
-
-	* index.html: fixed DOCTYPE
-
-2003年11月07日 Mihai Bazon <mih...@ya...>
-
-	* calendar-setup.js:
-	fixed minor problem (maybe we're passing object reference instead of ID for
-	the flat calendar parent)
-
-2003年11月06日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-fi.js:
-	added Finnish translation (thanks to Antti Tuppurainen)
-
-2003年11月05日 Mihai Bazon <mih...@ya...>
-
-	* release-notes.html: fixed typo
-
-	* doc/reference.tex, index.html, calendar.js: 0.9.5
-
-	* README: fixed license statement
-
-	* release-notes.html: updated release notes (0.9.5)
-
-2003年11月03日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-de.js:
-	updated German translation (thanks to Gerhard Neiner)
-
-	* calendar-setup.js: fixed license statement
-
-	* calendar.js: whitespace
-
-	* calendar.js: fixed license statement
-
-	* calendar.js:
-	fixed positioning problem when input field is inside scrolled divs
-
-2003年11月01日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-af.js: Afrikaan language (thanks to Derick Olivier)
-
-2003年10月31日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-it.js:
-	updated IT translation (thanks to Christian Blaser)
-
-	* lang/calendar-es.js: updated ES translation, thanks to Raul
-
-2003年10月30日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-hu.js: updated thanks to Istvan Karaszi
-
-	* index.html, simple-1.html, simple-2.html, simple-3.html:
-	switched to utf-8 all encodings
-
-	* lang/calendar-sk.js:
-	added Slovak translation (thanks to Peter Valach)
-
-	* lang/calendar-ro.js: switched to utf-8
-
-2003年10月29日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-es.js:
-	updated translation, thanks to Jose Ma. Martinez Miralles
-
-	* doc/reference.tex:
-	fixed the footnote problem (thanks Dominique de Waleffe for the tip)
-
-	* lang/calendar-ro.js: fixed typo
-
-	* lang/calendar-sv.js: oops, license should be LGPL
-
-	* lang/calendar-sw.js: new swedish translation is calendar-sv.js
-
-	* menuarrow.gif, menuarrow.png:
-	oops, forgot little drop-down menu arrows
-
-	* lang/calendar-sv.js: swedish translation thanks to Leonard Norrgard
-
-	* index.html: oops, some other minor changes
-
-	* index.html, release-notes.html:
-	latest changes in release-notes and index page for 0.9.4
-
-	* doc/reference.tex, calendar.js:
-	added %s date format (# of seconds since Epoch)
-
-	* calendar.js:
-	A click on TODAY will not close the calendar, even in single-click mode
-
-2003年10月28日 Mihai Bazon <mih...@ya...>
-
-	* index.html: previous cal.html
-
-	* cal.html: moved to index.html
-
-	* README, cal.html, doc/reference.tex, lang/calendar-de.js, lang/calendar-en.js, lang/calendar-ro.js, release-notes.html:
-	LGPL license, forever.
-
-	* doc/Calendar.setup.tex, simple-1.html:
-	doc updated for the onUpdate parameter to Calendar.setup
-
-2003年10月26日 Mihai Bazon <mih...@ya...>
-
-	* calendar.js: fixed bug (correct display of the dropdown menus)
-
-	* doc/Calendar.setup.tex, doc/reference.tex, lang/calendar-de.js, lang/calendar-en.js, lang/calendar-ro.js, README, cal.html, calendar-blue.css, calendar-brown.css, calendar-green.css, calendar-setup.js, calendar-system.css, calendar-win2k-1.css, calendar-win2k-2.css, calendar-win2k-cold-1.css, calendar-win2k-cold-2.css, calendar.js, release-notes.html, simple-1.html, simple-3.html:
-	lots of changes for the 0.9.4 release (see the release-notes.html)
-
-2003年10月15日 Mihai Bazon <mih...@ya...>
-
-	* doc/reference.tex:
-	documentation updated for 0.9.4 (not yet finished though)
-
-2003年10月07日 Mihai Bazon <mih...@ya...>
-
-	* calendar.js, doc/reference.tex, release-notes.html, README, cal.html, calendar-setup.js:
-	modified project website
-
-2003年10月06日 Mihai Bazon <mih...@ya...>
-
-	* calendar-setup.js:
-	added some properties (onSelect, onClose, date) (thanks altblue)
-
-2003年09月24日 Mihai Bazon <mih...@ya...>
-
-	* simple-3.html: dateIsSpecial does not need the "date" argument ;-)
-
-2003年09月24日 fsoft <fsoft@mishoo>
-
-	* calendar.js, simple-3.html:
-	added year, month, day to getDateStatus() function
-
-2003年09月24日 Mihai Bazon <mih...@ya...>
-
-	* simple-3.html: example on how to use special dates
-
-	* calendar-setup.js, calendar.js, simple-1.html:
-	support for special dates (thanks fabio)
-
-2003年09月17日 Mihai Bazon <mih...@ya...>
-
-	* doc/reference.tex: fixed error in section 3.
-
-2003年08月01日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-jp.js: added Japanese translation
-
-2003年07月16日 Mihai Bazon <mih...@ya...>
-
-	* simple-1.html: fixed problem with first example [IE,Opera]
-
-2003年07月09日 Mihai Bazon <mih...@ya...>
-
-	* doc/Calendar.setup.tex: fixed typo (closing parenthesis)
-
-	* lang/calendar-de.js:
-	added German translation, thanks to Hartwig Weinkauf
-
-2003年07月08日 Mihai Bazon <mih...@ya...>
-
-	* cal.html: added link to release-notes
-
-	* release-notes.html: 0.9.3 release notes
-
-	* make-release.pl:
-	Script to create distribution archive. It needs some additional packages:
-
-	 - LaTeX
-	 - tex2page
-	 - jscrunch (JS compressor)
-
-	* doc/html/makedoc.sh, doc/html/reference.css, doc/reference.tex, doc/makedoc.sh:
-	documentation updates...
-
-	* calendar.js: added semicolon to make the code "compressible"
-
-2003年07月06日 Mihai Bazon <mih...@ya...>
-
-	* doc/reference.tex: spell checked
-
-	* doc/reference.tex: [minor] changed credits order
-
-	* doc/reference.tex: various improvements and additions
-
-	* doc/html/reference.css: minor eye-candy tweaks
-
-2003年07月05日 Mihai Bazon <mih...@ya...>
-
-	* doc/html/Calendar.setup.html.tex, doc/html/makedoc.sh, doc/html/reference.css, doc/html/reference.t2p, doc/hyperref.cfg, doc/makedoc.sh, doc/reference.tex, doc/Calendar.setup.tex, doc/Calendar.setup.pdf.tex:
-	full documentation in LaTeX, for PDF and HTML formats
-
-	* simple-2.html:
-	added demonstration of flat calendar with Calendar.setup
-
-	* simple-1.html:
-	modified some links, added link to documentation, added demonstration of
-	disableFunc property
-
-	* calendar-setup.js: added the ability to create flat calendar too
-
-	* cal.html: added links to documentation and simple-[12].html pages
-
-	* README: up-to-date...
-
-	* calendar-setup.html: removed: the documentation is unified
-
-2003年07月03日 Mihai Bazon <mih...@ya...>
-
-	* cal.html: some links to newly added files
-
-	* calendar-setup.html, calendar-setup.js, img.gif, simple-1.html:
-	added some files to simplify calendar creation for non-(JS)-programmers
-
-	* lang/calendar-zh.js: added simplified chinese (thanks ATang)
-
-2003年07月02日 Mihai Bazon <mih...@ya...>
-
-	* calendar.js: * "yy"-related... [small fix]
-
-	* calendar.js:
-	* #721833 fixed (yy format will understand years prior to 29 as 20xx)
-
-	* calendar.js: * added refresh() function
-
-	* calendar.js: * fixed bug when in single click mode
-	* added alignment options to "showAtElement" member function
-
-2003年06月25日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-pt.js:
-	added portugese translation (thanks Nuno Barreto)
-
-2003年06月24日 Mihai Bazon <mih...@ya...>
-
-	* calendar.js:
-	call user handler when the date was changed using the keyboard
-
-	* bugtest-hidden-selects.html:
-	file to test bug with hidden select-s (thanks Ying Zhang for reporting and for this test file)
-
-	* lang/calendar-hr-utf8.js:
-	added croatian translation in utf8 (thanks Krunoslav Zubrinic)
-
-2003年06月23日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-hu.js: added hungarian translation
-
-	* lang/calendar-hr.js:
-	added croatian translation (thanks to Krunoslav Zubrinic)
-
-2003年06月22日 Mihai Bazon <mih...@ya...>
-
-	* calendar.js:
-	* #723335 fixed (clicking TODAY will not select the today date if the
-	 disabledHandler rejects it)
-
-	* cal.html: * new code for to work with fix for bug #703238
-	* switch to new version
-
-	* calendar.js:
-	* some patches to make code compatible with Opera 7 (well, almost compatible)
-	* bug #703238 fixed (fix breaks compatibility with older code that uses
-	 calendar in single-click mode)
-	* bug #703814 fixed
-
-2003年04月09日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-tr.js: added turkish lang file
-
-2003年03月19日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-ru.js: russian translation added
-
-	* lang/calendar-no.js: norwegian translation added
-
-2003年03月15日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-no.js: norwegian translation
-
-2003年03月12日 Mihai Bazon <mih...@ya...>
-
-	* lang/calendar-pl.js: added polish translation
-
-2003年03月11日 Mihai Bazon <mih...@ya...>
-
-	* calendar.js:
-	bugfix in parseDate (added base to parseInt, thanks Alan!)
-
-2003年03月05日 Mihai Bazon <mih...@ya...>
-
-	* calendar.js, lang/calendar-br.js, lang/calendar-ca.js, lang/calendar-cs-win.js, lang/calendar-da.js, lang/calendar-du.js, lang/calendar-el.js, lang/calendar-en.js, lang/calendar-es.js, lang/calendar-fr.js, lang/calendar-it.js, lang/calendar-nl.js, lang/calendar-ro.js, lang/calendar-sp.js, lang/calendar-sw.js:
-	New file.
-
-	* calendar.js, lang/calendar-br.js, lang/calendar-ca.js, lang/calendar-cs-win.js, lang/calendar-da.js, lang/calendar-du.js, lang/calendar-el.js, lang/calendar-en.js, lang/calendar-es.js, lang/calendar-fr.js, lang/calendar-it.js, lang/calendar-nl.js, lang/calendar-ro.js, lang/calendar-sp.js, lang/calendar-sw.js:
-	moved to CVS at sourceforge.net
-	release: 0.9.2 + new language packs
-
-
-	* README, cal.html, calendar-blue.css, calendar-brown.css, calendar-green.css, calendar-system.css, calendar-win2k-1.css, calendar-win2k-2.css, calendar-win2k-cold-1.css, calendar-win2k-cold-2.css:
-	New file.
-
-	* README, cal.html, calendar-blue.css, calendar-brown.css, calendar-green.css, calendar-system.css, calendar-win2k-1.css, calendar-win2k-2.css, calendar-win2k-cold-1.css, calendar-win2k-cold-2.css:
-	moved to CVS at sourceforge.net
-	release: 0.9.2 + new language packs
-
-
Deleted: trunk/themes/blog/jscalendar/calendar-system.css
===================================================================
--- trunk/themes/blog/jscalendar/calendar-system.css	2015年04月14日 16:31:05 UTC (rev 9668)
+++ trunk/themes/blog/jscalendar/calendar-system.css	2015年04月14日 16:41:51 UTC (rev 9669)
@@ -1,251 +0,0 @@
-/* The main calendar widget. DIV containing a table. */
-
-.calendar {
- position: relative;
- display: none;
- border: 1px solid;
- border-color: #fff #000 #000 #fff;
- font-size: 11px;
- cursor: default;
- background: Window;
- color: WindowText;
- font-family: tahoma,verdana,sans-serif;
-}
-
-.calendar table {
- border: 1px solid;
- border-color: #fff #000 #000 #fff;
- font-size: 11px;
- cursor: default;
- background: Window;
- color: WindowText;
- font-family: tahoma,verdana,sans-serif;
-}
-
-/* Header part -- contains navigation buttons and day names. */
-
-.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
- text-align: center;
- padding: 1px;
- border: 1px solid;
- border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
- background: ButtonFace;
-}
-
-.calendar .nav {
- background: ButtonFace url(menuarrow.gif) no-repeat 100% 100%;
-}
-
-.calendar thead .title { /* This holds the current "month, year" */
- font-weight: bold;
- padding: 1px;
- border: 1px solid #000;
- background: ActiveCaption;
- color: CaptionText;
- text-align: center;
-}
-
-.calendar thead .headrow { /* Row <TR> containing navigation buttons */
-}
-
-.calendar thead .daynames { /* Row <TR> containing the day names */
-}
-
-.calendar thead .name { /* Cells <TD> containing the day names */
- border-bottom: 1px solid ButtonShadow;
- padding: 2px;
- text-align: center;
- background: ButtonFace;
- color: ButtonText;
-}
-
-.calendar thead .weekend { /* How a weekend day name shows in header */
- color: #f00;
-}
-
-.calendar thead .hilite { /* How do the buttons in header appear when hover */
- border: 2px solid;
- padding: 0px;
- border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-}
-
-.calendar thead .active { /* Active (pressed) buttons in header */
- border-width: 1px;
- padding: 2px 0px 0px 2px;
- border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-
-/* The body part -- contains all the days in month. */
-
-.calendar tbody .day { /* Cells <TD> containing month days dates */
- width: 2em;
- text-align: right;
- padding: 2px 4px 2px 2px;
-}
-.calendar tbody .day.othermonth {
- font-size: 80%;
- color: #aaa;
-}
-.calendar tbody .day.othermonth.oweekend {
- color: #faa;
-}
-
-.calendar table .wn {
- padding: 2px 3px 2px 2px;
- border-right: 1px solid ButtonShadow;
- background: ButtonFace;
- color: ButtonText;
-}
-
-.calendar tbody .rowhilite td {
- background: Highlight;
- color: HighlightText;
-}
-
-.calendar tbody td.hilite { /* Hovered cells <TD> */
- padding: 1px 3px 1px 1px;
- border-top: 1px solid #fff;
- border-right: 1px solid #000;
- border-bottom: 1px solid #000;
- border-left: 1px solid #fff;
-}
-
-.calendar tbody td.active { /* Active (pressed) cells <TD> */
- padding: 2px 2px 0px 2px;
- border: 1px solid;
- border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
-}
-
-.calendar tbody td.selected { /* Cell showing selected date */
- font-weight: bold;
- border: 1px solid;
- border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
- padding: 2px 2px 0px 2px;
- background: ButtonFace;
- color: ButtonText;
-}
-
-.calendar tbody td.weekend { /* Cells showing weekend days */
- color: #f00;
-}
-
-.calendar tbody td.today { /* Cell showing today date */
- font-weight: bold;
- color: #00f;
-}
-
-.calendar tbody td.disabled { color: GrayText; }
-
-.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
- visibility: hidden;
-}
-
-.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
- display: none;
-}
-
-/* The footer part -- status bar and "Close" button */
-
-.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
-}
-
-.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
- background: ButtonFace;
- padding: 1px;
- border: 1px solid;
- border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
- color: ButtonText;
- text-align: center;
-}
-
-.calendar tfoot .hilite { /* Hover style for buttons in footer */
- border-top: 1px solid #fff;
- border-right: 1px solid #000;
- border-bottom: 1px solid #000;
- border-left: 1px solid #fff;
- padding: 1px;
- background: #e4e0d8;
-}
-
-.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
- padding: 2px 0px 0px 2px;
- border-top: 1px solid #000;
- border-right: 1px solid #fff;
- border-bottom: 1px solid #fff;
- border-left: 1px solid #000;
-}
-
-/* Combo boxes (menus that display months/years for direct selection) */
-
-.calendar .combo {
- position: absolute;
- display: none;
- width: 4em;
- top: 0px;
- left: 0px;
- cursor: default;
- border: 1px solid;
- border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
- background: Menu;
- color: MenuText;
- font-size: 90%;
- padding: 1px;
- z-index: 100;
-}
-
-.calendar .combo .label,
-.calendar .combo .label-IEfix {
- text-align: center;
- padding: 1px;
-}
-
-.calendar .combo .label-IEfix {
- width: 4em;
-}
-
-.calendar .combo .active {
- padding: 0px;
- border: 1px solid #000;
-}
-
-.calendar .combo .hilite {
- background: Highlight;
- color: HighlightText;
-}
-
-.calendar td.time {
- border-top: 1px solid ButtonShadow;
- padding: 1px 0px;
- text-align: center;
- background-color: ButtonFace;
-}
-
-.calendar td.time .hour,
-.calendar td.time .minute,
-.calendar td.time .ampm {
- padding: 0px 3px 0px 4px;
- border: 1px solid #889;
- font-weight: bold;
- background-color: Menu;
-}
-
-.calendar td.time .ampm {
- text-align: center;
-}
-
-.calendar td.time .colon {
- padding: 0px 2px 0px 3px;
- font-weight: bold;
-}
-
-.calendar td.time span.hilite {
- border-color: #000;
- background-color: Highlight;
- color: HighlightText;
-}
-
-.calendar td.time span.active {
- border-color: #f00;
- background-color: #000;
- color: #0f0;
-}
Deleted: trunk/themes/blog/jscalendar/calendar-tas.css
===================================================================
--- trunk/themes/blog/jscalendar/calendar-tas.css	2015年04月14日 16:31:05 UTC (rev 9668)
+++ trunk/themes/blog/jscalendar/calendar-tas.css	2015年04月14日 16:41:51 UTC (rev 9669)
@@ -1,239 +0,0 @@
-/* The main calendar widget. DIV containing a table. */
-
-div.calendar { position: relative; }
-
-.calendar, .calendar table {
- border: 1px solid #655;
- font-size: 11px;
- color: #000;
- cursor: default;
- background: #ffd;
- font-family: tahoma,verdana,sans-serif;
- filter:
-progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#DDDCCC,EndColorStr=#FFFFFF);
-}
-
-/* Header part -- contains navigation buttons and day names. */
-
-.calendar .button { /* "<<", "<", ">", ">>" buttons have this class */
- text-align: center; /* They are the navigation buttons */
- padding: 2px; /* Make the buttons seem like they're pressing */
- color:#363636;
-}
-
-.calendar .nav {
- background: #edc url(menuarrow.gif) no-repeat 100% 100%;
-}
-
-.calendar thead .title { /* This holds the current "month, year" */
- font-weight: bold; /* Pressing it will take you to the current date */
- text-align: center;
- background: #654;
- color: #363636;
- padding: 2px;
- filter:
-progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#ffffff,EndColorStr=#dddccc);
-}
-
-.calendar thead .headrow { /* Row <TR> containing navigation buttons */
- /*background: #3B86A0;*/
- color: #363636;
- font-weight: bold; 	
-filter:
-progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#ffffff,EndColorStr=#3b86a0);
-}
-
-.calendar thead .name { /* Cells <TD> containing the day names */
- border-bottom: 1px solid #655;
- padding: 2px;
- text-align: center;
- color: #363636;
- filter:
-progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#DDDCCC,EndColorStr=#FFFFFF);
-}
-
-.calendar thead .weekend { /* How a weekend day name shows in header */
- color: #f00;
-}
-
-.calendar thead .hilite { /* How do the buttons in header appear when hover */
- background-color: #ffcc86;
- color: #000;
- border: 1px solid #b59345;
- padding: 1px;
-}
-
-.calendar thead .active { /* Active (pressed) buttons in header */
- background-color: #c77;
- padding: 2px 0px 0px 2px;
-}
-
-.calendar thead .daynames { /* Row <TR> containing the day names */
- background: #fed;
-}
-
-/* The body part -- contains all the days in month. */
-
-.calendar tbody .day { /* Cells <TD> containing month days dates */
- width: 2em;
- text-align: right;
- padding: 2px 4px 2px 2px;
-}
-.calendar tbody .day.othermonth {
- font-size: 80%;
- color: #aaa;
-}
-.calendar tbody .day.othermonth.oweekend {
- color: #faa;
-}
-
-.calendar table .wn {
- padding: 2px 3px 2px 2px;
- border-right: 1px solid #000;
- background: #fed;
-}
-
-.calendar tbody .rowhilite td {
- background: #ddf;
- 
-}
-
-.calendar tbody .rowhilite td.wn {
- background: #efe;
-}
-
-.calendar tbody td.hilite { /* Hovered cells <TD> */
- background: #ffe;
- padding: 1px 3px 1px 1px;
- border: 1px solid #bbb;
-}
-
-.calendar tbody td.active { /* Active (pressed) cells <TD> */
- background: #ddc;
- padding: 2px 2px 0px 2px;
-}
-
-.calendar tbody td.selected { /* Cell showing today date */
- font-weight: bold;
- border: 1px solid #000;
- padding: 1px 3px 1px 1px;
- background: #fea;
-}
-
-.calendar tbody td.weekend { /* Cells showing weekend days */
- color: #f00;
-}
-
-.calendar tbody td.today { font-weight: bold; }
-
-.calendar tbody .disabled { color: #999; }
-
-.calendar tbody .emptycell { /* Empty cells (the best is to hide them) */
- visibility: hidden;
-}
-
-.calendar tbody .emptyrow { /* Empty row (some months need less than 6 rows) */
- display: none;
-}
-
-/* The footer part -- status bar and "Close" button */
-
-.calendar tfoot .footrow { /* The <TR> in footer (only one right now) */
- text-align: center;
- background: #988;
- color: #000;
- 
-}
-
-.calendar tfoot .ttip { /* Tooltip (status bar) cell <TD> */
- border-top: 1px solid #655;
- background: #dcb;
- color: #363636;
- font-weight: bold;
-	filter:
-progid:DXImageTransform.Microsoft.Gradient(GradientType=0,StartColorStr=#FFFFFF,EndColorStr=#DDDCCC);
-}
-.calendar tfoot .hilite { /* Hover style for buttons in footer */
- background: #faa;
- border: 1px solid #f40;
- padding: 1px;
-}
-
-.calendar tfoot .active { /* Active (pressed) style for buttons in footer */
- background: #c77;
- padding: 2px 0px 0px 2px;
-}
-
-/* Combo boxes (menus that display months/years for direct selection) */
-
-.combo {
- position: absolute;
- display: none;
- top: 0px;
- left: 0px;
- width: 4em;
- cursor: default;
- border: 1px solid #655;
- background: #ffe;
- color: #000;
- font-size: smaller;
- z-index: 100;
-}
-
-.combo .label,
-.combo .label-IEfix {
- text-align: center;
- padding: 1px;
-}
-
-.combo .label-IEfix {
- width: 4em;
-}
-
-.combo .hilite {
- background: #fc8;
-}
-
-.combo .active {
- border-top: 1px solid #a64;
- border-bottom: 1px solid #a64;
- background: #fee;
- font-weight: bold;
-}
-
-.calendar td.time {
- border-top: 1px solid #a88;
- padding: 1px 0px;
- text-align: center;
- background-color: #fed;
-}
-
-.calendar td.time .hour,
-.calendar td.time .minute,
-.calendar td.time .ampm {
- padding: 0px 3px 0px 4px;
- border: 1px solid #988;
- font-weight: bold;
- background-color: #fff;
-}
-
-.calendar td.time .ampm {
- text-align: center;
-}
-
-.calendar td.time .colon {
- padding: 0px 2px 0px 3px;
- font-weight: bold;
-}
-
-.calendar td.time span.hilite {
- border-color: #000;
- background-color: #866;
- color: #fff;
-}
-
-.calendar td.time span.active {
- border-color: #f00;
- background-color: #000;
- color: #0f0;
-}
Deleted: trunk/themes/blog/jscalendar/simple-1.html
===================================================================
--- trunk/themes/blog/jscalendar/simple-1.html	2015年04月14日 16:31:05 UTC (rev 9668)
+++ trunk/themes/blog/jscalendar/simple-1.html	2015年04月14日 16:41:51 UTC (rev 9669)
@@ -1,244 +0,0 @@
-<html style="background-color: buttonface; color: buttontext;">
-
-<head>
-<meta http-equiv="content-type" content="text/xml; charset=utf-8" />
-
-<title>Simple calendar setups [popup calendar]</title>
-
- <!-- calendar stylesheet -->
- <link rel="stylesheet" type="text/css" media="all" href="calendar-win2k-cold-1.css" title="win2k-cold-1" />
-
- <!-- main calendar program -->
- <script type="text/javascript" src="calendar.js"></script>
-
- <!-- language for the calendar -->
- <script type="text/javascript" src="lang/calendar-en.js"></script>
-
- <!-- the following script defines the Calendar.setup helper function, which makes
- adding a calendar a matter of 1 or 2 lines of code. -->
- <script type="text/javascript" src="calendar-setup.js"></script>
-
-</head>
-
-<body>
-
-<h2>DHTML Calendar &mdash; for the impatient</h2>
-
- <blockquote>
- <p>
- This page lists some common setups for the popup calendar. In
- order to see how to do any of them please see the source of this
- page. For each example it's structured like this: there's the
- &lt;form&gt; that contains the input field, and following there is
- the JavaScript snippet that setups that form. An example of
- <em>flat</em> calendar is available in <a
- href="simple-2.html">another page</a>.
- </p>
- <p>
- The code in this page uses a helper function defined in
- "calendar-setup.js". With it you can setup the calendar in
- minutes. If you're not <em>that</em> impatient, ;-) <a
- href="doc/html/reference.html">complete documenation</a> is
- available.
- </p>
- </blockquote>
-
-
-
-<hr />
-
-<p><b>Basic setup: one input per calendar.</b> Clicking in the input field
-activates the calendar. The date format is "%m/%d/%Y %I:%M %p". The
-calendar defaults to "single-click mode".</p>
-
-<p>The example below has been updated to show you how to create "linked"
-fields. Basically, when some field is filled with a date, the other
-is updated so that the difference between them remains one week. The
-property useful here is "onUpdate".</p>
-
-<form action="#" method="get">
-<input type="text" name="date" id="f_date_a" />
-<input type="text" name="date" id="f_calcdate" />
-</form>
-
-<script type="text/javascript">
- function catcalc(cal) {
- var date = cal.date;
- var time = date.getTime()
- // use the _other_ field
- var field = document.getElementById("f_calcdate");
- if (field == cal.params.inputField) {
- field = document.getElementById("f_date_a");
- time -= Date.WEEK; // substract one week
- } else {
- time += Date.WEEK; // add one week
- }
- var date2 = new Date(time);
- field.value = date2.print("%Y-%m-%d %H:%M");
- }
- Calendar.setup({
- inputField : "f_date_a", // id of the input field
- ifFormat : "%Y-%m-%d %H:%M", // format of the input field
- showsTime : true,
- timeFormat : "24",
- onUpdate : catcalc
- });
- Calendar.setup({
- inputField : "f_calcdate",
- ifFormat : "%Y-%m-%d %H:%M",
- showsTime : true,
- timeFormat : "24",
- onUpdate : catcalc
- });
-</script>
-
-
-
-<hr />
-
-<p><b>Input field with a trigger button.</b> Clicking the button activates
-the calendar. Note that this one needs double-click (singleClick parameter
-is explicitely set to false). Also demonstrates the "step" parameter
-introduced in 0.9.6 (show all years in drop-down boxes, instead of every
-other year as default).</p>
-
-<form action="#" method="get">
-<input type="text" name="date" id="f_date_b" /><button type="reset" id="f_trigger_b">...</button>
-</form>
-
-<script type="text/javascript">
- Calendar.setup({
- inputField : "f_date_b", // id of the input field
- ifFormat : "%m/%d/%Y %I:%M %p", // format of the input field
- showsTime : true, // will display a time selector
- button : "f_trigger_b", // trigger for the calendar (button ID)
- singleClick : false, // double-click mode
- step : 1 // show all years in drop-down boxes (instead of every other year as default)
- });
-</script>
-
-
-
-<hr />
-
-<p><b>Input field with a trigger image.</b> Note that the Calendar.setup
-function doesn't care if the trigger is a button, image, or anything else.
-Also in this example we setup a different alignment, just to show how it's
-done. The input field is read-only (that is set from HTML).</p>
-
-<form action="#" method="get">
-<table cellspacing="0" cellpadding="0" style="border-collapse: collapse"><tr>
- <td><input type="text" name="date" id="f_date_c" readonly="1" /></td>
- <td><img src="img.gif" id="f_trigger_c" style="cursor: pointer; border: 1px solid red;" title="Date selector"
- onmouseover="this.style.background='red';" onmouseout="this.style.background=''" /></td>
-</table>
-</form>
-
-<script type="text/javascript">
- Calendar.setup({
- inputField : "f_date_c", // id of the input field
- ifFormat : "%B %e, %Y", // format of the input field
- button : "f_trigger_c", // trigger for the calendar (button ID)
- align : "Tl", // alignment (defaults to "Bl")
- singleClick : true
- });
-</script>
-
-
-
-<hr />
-
-<p><b>Hidden field, display area.</b> The calendar now puts the date into 2
-elements: one is an input field of type "hidden"&mdash;so that the user
-can't directly see or modify it&mdash; and one is a &lt;span&gt; element in
-which the date is displayed. Note that if the trigger is not specified the
-calendar will use the displayArea (or inputField as in the first example).
-The display area can have it's own format. This is useful if, for instance,
-we need to store one format in the database (thus pass it in the input
-field) but we wanna show a friendlier format to the end-user.</p>
-
-<form action="#" method="get" style="visibility: hidden">
-<input type="hidden" name="date" id="f_date_d" />
-</form>
-
-<p>Your birthday:
- <span style="background-color: #ff8; cursor: default;"
- onmouseover="this.style.backgroundColor='#ff0';"
- onmouseout="this.style.backgroundColor='#ff8';"
- id="show_d"
- >Click to open date selector</span>.</p>
-
-<script type="text/javascript">
- Calendar.setup({
- inputField : "f_date_d", // id of the input field
- ifFormat : "%Y/%d/%m", // format of the input field (even if hidden, this format will be honored)
- displayArea : "show_d", // ID of the span where the date is to be shown
- daFormat : "%A, %B %d, %Y",// format of the displayed date
- align : "Tl", // alignment (defaults to "Bl")
- singleClick : true
- });
-</script>
-
-
-
-<hr />
-
-<p><b>Hidden field, display area, trigger image.</b> Very similar to the
-previous example. The difference is that we also have a trigger image.</p>
-
-<form action="#" method="get" style="visibility: hidden">
-<input type="hidden" name="date" id="f_date_e" />
-</form>
-
-<p>Your birthday: <span id="show_e">-- not entered --</span> <img
-src="img.gif" id="f_trigger_e" style="cursor: pointer; border: 1px solid
-red;" title="Date selector" onmouseover="this.style.background='red';"
-onmouseout="this.style.background=''" />.</p>
-
-<script type="text/javascript">
- Calendar.setup({
- inputField : "f_date_e", // id of the input field
- ifFormat : "%Y/%d/%m", // format of the input field (even if hidden, this format will be honored)
- displayArea : "show_e", // ID of the span where the date is to be shown
- daFormat : "%A, %B %d, %Y",// format of the displayed date
- button : "f_trigger_e", // trigger button (well, IMG in our case)
- align : "Tl", // alignment (defaults to "Bl")
- singleClick : true
- });
-</script>
-
-
-
-<hr />
-
-<p><b>Hidden field, display area.</b> Very much like the previous examples,
-but we now disable some dates (all weekends, that is, Saturdays and
-Sundays).</p>
-
-<form action="#" method="get" style="visibility: hidden">
-<input type="hidden" name="date" id="f_date_f" />
-</form>
-
-<p>Your birthday:
- <span style="background-color: #ff8; cursor: default;"
- onmouseover="this.style.backgroundColor='#ff0';"
- onmouseout="this.style.backgroundColor='#ff8';"
- id="show_f"
- >Click to open date selector</span>.</p>
-
-<script type="text/javascript">
- Calendar.setup({
- inputField : "f_date_f", // id of the input field
- ifFormat : "%Y/%d/%m", // format of the input field (even if hidden, this format will be honored)
- displayArea : "show_f", // ID of the span where the date is to be shown
- daFormat : "%A, %B %d, %Y",// format of the displayed date
- align : "Tl", // alignment (defaults to "Bl")
- dateStatusFunc : function (date) { // disable weekend days (Saturdays == 6 and Subdays == 0)
- return (date.getDay() == 6 || date.getDay() == 0) ? true : false;
- }
- });
-</script>
-
-
-</body>
-</html>
Deleted: trunk/themes/blog/jscalendar/simple-2.html
===================================================================
--- trunk/themes/blog/jscalendar/simple-2.html	2015年04月14日 16:31:05 UTC (rev 9668)
+++ trunk/themes/blog/jscalendar/simple-2.html	2015年04月14日 16:41:51 UTC (rev 9669)
@@ -1,108 +0,0 @@
-<html style="background-color: buttonface; color: buttontext;">
-
-<head>
-<meta http-equiv="content-type" content="text/xml; charset=utf-8" />
-
-<title>Simple calendar setup [flat calendar]</title>
-
- <!-- calendar stylesheet -->
- <link rel="stylesheet" type="text/css" media="all" href="calendar-win2k-cold-1.css" title="win2k-cold-1" />
-
- <!-- main calendar program -->
- <script type="text/javascript" src="calendar.js"></script>
-
- <!-- language for the calendar -->
- <script type="text/javascript" src="lang/calendar-en.js"></script>
-
- <!-- the following script defines the Calendar.setup helper function, which makes
- adding a calendar a matter of 1 or 2 lines of code. -->
- <script type="text/javascript" src="calendar-setup.js"></script>
-
-</head>
-
-<body>
-
-<h2>DHTML Calendar &mdash; for the impatient</h2>
-
- <blockquote>
- <p>
- This page demonstrates how to setup a flat calendar. Examples of
- <em>popup</em> calendars are available in <a
- href="simple-1.html">another page</a>.
- </p>
- <p>
- The code in this page uses a helper function defined in
- "calendar-setup.js". With it you can setup the calendar in
- minutes. If you're not <em>that</em> impatient, ;-) <a
- href="doc/html/reference.html">complete documenation</a> is
- available.
- </p>
- </blockquote>
-
-
-
-<hr />
-
-<div style="float: right; margin-left: 1em; margin-bottom: 1em;"
-id="calendar-container"></div>
-
-<script type="text/javascript">
- function dateChanged(calendar) {
- // Beware that this function is called even if the end-user only
- // changed the month/year. In order to determine if a date was
- // clicked you can use the dateClicked property of the calendar:
- if (calendar.dateClicked) {
- // OK, a date was clicked, redirect to /yyyy/mm/dd/index.php
- var y = calendar.date.getFullYear();
- var m = calendar.date.getMonth(); // integer, 0..11
- var d = calendar.date.getDate(); // integer, 1..31
- // redirect...
- window.location = "/" + y + "/" + m + "/" + d + "/index.php";
- }
- };
-
- Calendar.setup(
- {
- flat : "calendar-container", // ID of the parent element
- flatCallback : dateChanged // our callback function
- }
- );
-</script>
-
-<p>The positioning of the DIV that contains the calendar is entirely your
-job. For instance, the "calendar-container" DIV from this page has the
-following style: "float: right; margin-left: 1em; margin-bottom: 1em".</p>
-
-<p>Following there is the code that has been used to create this calendar.
-You can find the full description of the <tt>Calendar.setup()</tt> function
-in the <a href="doc/html/reference.html">calendar documenation</a>.</p>
-
-<pre
->&lt;div style="float: right; margin-left: 1em; margin-bottom: 1em;"
-id="calendar-container"&gt;&lt;/div&gt;
-
-&lt;script type="text/javascript"&gt;
- function dateChanged(calendar) {
- // Beware that this function is called even if the end-user only
- // changed the month/year. In order to determine if a date was
- // clicked you can use the dateClicked property of the calendar:
- if (calendar.dateClicked) {
- // OK, a date was clicked, redirect to /yyyy/mm/dd/index.php
- var y = calendar.date.getFullYear();
- var m = calendar.date.getMonth(); // integer, 0..11
- var d = calendar.date.getDate(); // integer, 1..31
- // redirect...
- window.location = "/" + y + "/" + m + "/" + d + "/index.php";
- }
- };
-
- Calendar.setup(
- {
- flat : "calendar-container", // ID of the parent element
- flatCallback : dateChanged // our callback function
- }
- );
-&lt;/script&gt;</pre>
-
-</body>
-</html>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9668
 http://sourceforge.net/p/phpwiki/code/9668
Author: vargenau
Date: 2015年04月14日 16:31:05 +0000 (2015年4月14日)
Log Message:
-----------
Display Search&Replace icons only if JS_SEARCHREPLACE is true
Modified Paths:
--------------
 trunk/lib/editpage.php
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2015年04月14日 16:30:28 UTC (rev 9667)
+++ trunk/lib/editpage.php	2015年04月14日 16:31:05 UTC (rev 9668)
@@ -774,17 +774,19 @@
 if (defined('TOOLBAR_IMAGE_PULLDOWN') and TOOLBAR_IMAGE_PULLDOWN) {
 $toolbar->pushContent($this->imagePulldown());
 }
- $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_replace.png"),
- 'class' => 'toolbar',
- 'alt' => _('Search & Replace'),
- 'title' => _('Search & Replace'),
- 'onclick' => "replace();")));
- $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_undo_d.png"),
- 'class' => 'toolbar',
- 'id' => 'sr_undo',
- 'alt' => _('Undo Search & Replace'),
- 'title' => _('Undo Search & Replace'),
- 'onclick' => "do_undo();")));
+ if (defined('JS_SEARCHREPLACE') and JS_SEARCHREPLACE) {
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_replace.png"),
+ 'class' => 'toolbar',
+ 'alt' => _('Search & Replace'),
+ 'title' => _('Search & Replace'),
+ 'onclick' => "replace();")));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_undo_d.png"),
+ 'class' => 'toolbar',
+ 'id' => 'sr_undo',
+ 'alt' => _('Undo Search & Replace'),
+ 'title' => _('Undo Search & Replace'),
+ 'onclick' => "do_undo();")));
+ }
 return HTML($toolbar, $textarea);
 } else {
 return $textarea;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9667
 http://sourceforge.net/p/phpwiki/code/9667
Author: vargenau
Date: 2015年04月14日 16:30:28 +0000 (2015年4月14日)
Log Message:
-----------
Align toolbar icons for Fusionforge
Modified Paths:
--------------
 trunk/themes/fusionforge/fusionforge.css
Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2015年04月10日 17:36:55 UTC (rev 9666)
+++ trunk/themes/fusionforge/fusionforge.css	2015年04月14日 16:30:28 UTC (rev 9667)
@@ -418,6 +418,10 @@
 cursor: pointer;
 }
 
+input.toolbar {
+ margin: 0;
+}
+
 input.button {
 font-family: Verdana, Arial, Helvetica, sans-serif;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9666
 http://sourceforge.net/p/phpwiki/code/9666
Author: vargenau
Date: 2015年04月10日 17:36:55 +0000 (2015年4月10日)
Log Message:
-----------
msg_replfound and msg_replnot are globals
Modified Paths:
--------------
 trunk/themes/default/toolbar.js
Modified: trunk/themes/default/toolbar.js
===================================================================
--- trunk/themes/default/toolbar.js	2015年04月10日 17:12:45 UTC (rev 9665)
+++ trunk/themes/default/toolbar.js	2015年04月10日 17:36:55 UTC (rev 9666)
@@ -201,8 +201,8 @@
 var z_repl=txt.match(searchinput)? txt.match(searchinput).length : 0;
 txt=txt.replace(searchinput,replaceinput);
 searchinput=searchinput.toString().substring(1,searchinput.toString().length-2);
- var msg_replfound = msg_replfound.replace('1円', searchinput).replace('2円', z_repl).replace('3円', replaceinput);
- var msg_replnot = msg_replnot.replace('%s', searchinput);
+ msg_replfound = msg_replfound.replace('1円', searchinput).replace('2円', z_repl).replace('3円', replaceinput);
+ msg_replnot = msg_replnot.replace('%s', searchinput);
 result(z_repl, msg_replfound, txt, msg_replnot);
 replacewin.window.focus();
 replacewin.window.document.forms[0].searchinput.focus();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9665
 http://sourceforge.net/p/phpwiki/code/9665
Author: vargenau
Date: 2015年04月10日 17:12:45 +0000 (2015年4月10日)
Log Message:
-----------
Declare Javascript variables
Modified Paths:
--------------
 trunk/themes/default/toolbar.js
Modified: trunk/themes/default/toolbar.js
===================================================================
--- trunk/themes/default/toolbar.js	2015年04月10日 16:52:16 UTC (rev 9664)
+++ trunk/themes/default/toolbar.js	2015年04月10日 17:12:45 UTC (rev 9665)
@@ -45,7 +45,7 @@
 pullwin.window.document.writeln('</head>\n<body>');
 pullwin.window.document.writeln('<p>\nYou can double-click to insert.\n</p>');
 pullwin.window.document.writeln('<form><div id=\"buttons\"><input type=\"button\" value=\"'+okbutton+'\" onclick=\"if(self.opener)self.opener.do_pulldown(document.forms[0].select.value,\''+fromid+'\'); return false;\" /><input type=\"button\" value=\"'+closebutton+'\" onclick=\"self.close(); return false;\" /></div>\n<div>\n<select style=\"margin-top:10px;width:190px;\" name=\"select\" size=\"'+((pages.length>20)?'20':new String(pages.length))+'\" ondblclick=\"if(self.opener)self.opener.do_pulldown(document.forms[0].select.value,\''+fromid+'\'); return false;\">');
- for (i=0; i<pages.length; i++){
+ for (var i=0; i<pages.length; i++){
 if (typeof pages[i] == 'string')
 pullwin.window.document.write('<option value="'+pages[i]+'">'+escapeQuotes(pages[i])+'</option>\n');
 else // array=object
@@ -78,19 +78,19 @@
 // IE
 var re=new RegExp('%0A',"g");
 text = text.replace(re,'\n');
- var re=new RegExp('%22',"g");
+ re=new RegExp('%22',"g");
 text = text.replace(re,'"');
- var re=new RegExp('%27',"g");
+ re=new RegExp('%27',"g");
 text = text.replace(re,'\'');
- var re=new RegExp('%09',"g");
+ re=new RegExp('%09',"g");
 text = text.replace(re,' ');
- var re=new RegExp('%7C',"g");
+ re=new RegExp('%7C',"g");
 text = text.replace(re,'|');
- var re=new RegExp('%5B',"g");
+ re=new RegExp('%5B',"g");
 text = text.replace(re,'[');
- var re=new RegExp('%5D',"g");
+ re=new RegExp('%5D',"g");
 text = text.replace(re,']');
- var re=new RegExp('%5C',"g");
+ re=new RegExp('%5C',"g");
 text = text.replace(re,'\\');
 return text;
 }
@@ -121,6 +121,7 @@
 var scrollTop=txtarea.scrollTop;
 var myText = (txtarea.value).substring(startPos, endPos);
 if(!myText) { myText=sampleText;}
+ var subst;
 if(myText.charAt(myText.length - 1) == " "){ // exclude ending space char, if any
 subst = tagOpen + myText.substring(0, (myText.length - 1)) + tagClose + " ";
 } else {
@@ -200,8 +201,8 @@
 var z_repl=txt.match(searchinput)? txt.match(searchinput).length : 0;
 txt=txt.replace(searchinput,replaceinput);
 searchinput=searchinput.toString().substring(1,searchinput.toString().length-2);
- msg_replfound = msg_replfound.replace('1円', searchinput).replace('2円', z_repl).replace('3円', replaceinput);
- msg_replnot = msg_replnot.replace('%s', searchinput);
+ var msg_replfound = msg_replfound.replace('1円', searchinput).replace('2円', z_repl).replace('3円', replaceinput);
+ var msg_replnot = msg_replnot.replace('%s', searchinput);
 result(z_repl, msg_replfound, txt, msg_replnot);
 replacewin.window.focus();
 replacewin.window.document.forms[0].searchinput.focus();
@@ -219,8 +220,7 @@
 }
 }
 function do_undo() {
- if(undo_buffer_index==0) return;
- else if(undo_buffer_index>0) {
+ if(undo_buffer_index>0) {
 f.editarea.value=undo_buffer[undo_buffer_index-1];
 undo_buffer[undo_buffer_index]=null;
 undo_buffer_index--;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9664
 http://sourceforge.net/p/phpwiki/code/9664
Author: vargenau
Date: 2015年04月10日 16:52:16 +0000 (2015年4月10日)
Log Message:
-----------
Fix toolbar alignment
Modified Paths:
--------------
 trunk/themes/MonoBook/monobook.css
Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css	2015年04月10日 16:41:15 UTC (rev 9663)
+++ trunk/themes/MonoBook/monobook.css	2015年04月10日 16:52:16 UTC (rev 9664)
@@ -1690,6 +1690,10 @@
 cursor: pointer;
 }
 
+input.toolbar[type=image] {
+ vertical-align: top;
+}
+
 #editform .editOptions {
 display: inline;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9663
 http://sourceforge.net/p/phpwiki/code/9663
Author: vargenau
Date: 2015年04月10日 16:41:15 +0000 (2015年4月10日)
Log Message:
-----------
Fix toolbar alignment
Modified Paths:
--------------
 trunk/themes/MacOSX/MacOSX.css
Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css	2015年04月10日 16:31:41 UTC (rev 9662)
+++ trunk/themes/MacOSX/MacOSX.css	2015年04月10日 16:41:15 UTC (rev 9663)
@@ -150,10 +150,6 @@
 padding: 0.4ex 0.3ex;
 }
 
-div.toolbar {
- margin: 1ex 0;
-}
-
 /**
 * PageTypes
 */
@@ -1106,6 +1102,10 @@
 cursor: pointer;
 }
 
+input.toolbar[type=image] {
+ vertical-align: top;
+}
+
 /* Link icons */
 img.linkicon {
 vertical-align: middle;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9662
 http://sourceforge.net/p/phpwiki/code/9662
Author: vargenau
Date: 2015年04月10日 16:31:41 +0000 (2015年4月10日)
Log Message:
-----------
Fix margin for toolbar
Modified Paths:
--------------
 trunk/themes/SpaceWiki/SpaceWiki.css
Modified: trunk/themes/SpaceWiki/SpaceWiki.css
===================================================================
--- trunk/themes/SpaceWiki/SpaceWiki.css	2015年04月10日 16:25:12 UTC (rev 9661)
+++ trunk/themes/SpaceWiki/SpaceWiki.css	2015年04月10日 16:31:41 UTC (rev 9662)
@@ -453,8 +453,8 @@
 margin: 0;
 }
 
-div.toolbar {
- margin-top: 1ex;
+input.toolbar {
+ border-width: 0;
 }
 
 #navbuttons {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9661
 http://sourceforge.net/p/phpwiki/code/9661
Author: vargenau
Date: 2015年04月10日 16:25:12 +0000 (2015年4月10日)
Log Message:
-----------
Fix margin for toolbar
Modified Paths:
--------------
 trunk/themes/Hawaiian/Hawaiian.css
 trunk/themes/MacOSX/MacOSX.css
Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css	2015年04月10日 16:20:19 UTC (rev 9660)
+++ trunk/themes/Hawaiian/Hawaiian.css	2015年04月10日 16:25:12 UTC (rev 9661)
@@ -592,10 +592,6 @@
 background-color: #f0f0f0;
 }
 
-.toolbar, div.toolbar {
- margin: 0.5ex 0;
-}
-
 /* Link icons */
 img.linkicon {
 vertical-align: middle;
Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css	2015年04月10日 16:20:19 UTC (rev 9660)
+++ trunk/themes/MacOSX/MacOSX.css	2015年04月10日 16:25:12 UTC (rev 9661)
@@ -1102,10 +1102,6 @@
 clear: both;
 }
 
-.toolbar, div.toolbar {
- margin: 0.5ex 0;
-}
-
 img.toolbar:hover {
 cursor: pointer;
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9660
 http://sourceforge.net/p/phpwiki/code/9660
Author: vargenau
Date: 2015年04月10日 16:20:19 +0000 (2015年4月10日)
Log Message:
-----------
Fix margin for toolbar
Modified Paths:
--------------
 trunk/themes/default/phpwiki.css
Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css	2015年04月10日 16:15:44 UTC (rev 9659)
+++ trunk/themes/default/phpwiki.css	2015年04月10日 16:20:19 UTC (rev 9660)
@@ -333,7 +333,7 @@
 font-family: Arial, Helvetica, sans-serif;
 }
 
-.toolbar {
+.toolbar, .edit-toolbar {
 padding: 0;
 margin: 0;
 }
@@ -342,11 +342,6 @@
 cursor: pointer;
 }
 
-.edit-toolbar {
- padding: 0;
- margin: 0;
-}
-
 .edit-toolbar img, .edit-toolbar input {
 background-color: #fff;
 border: 1px solid ButtonFace;
@@ -1126,10 +1121,6 @@
 vertical-align: top;
 }
 
-.toolbar, div.toolbar {
- margin: 0.5ex 0;
-}
-
 /**
 * General
 */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9659
 http://sourceforge.net/p/phpwiki/code/9659
Author: vargenau
Date: 2015年04月10日 16:15:44 +0000 (2015年4月10日)
Log Message:
-----------
Wordpress theme: put Preview and Save buttons under text area
Modified Paths:
--------------
 trunk/themes/Wordpress/templates/editpage.tmpl
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2015年04月10日 16:08:33 UTC (rev 9658)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2015年04月10日 16:15:44 UTC (rev 9659)
@@ -14,10 +14,6 @@
 <?php } ?>
 </td>
 <td>
- <?php echo $PREVIEW_B ?>
- <?php if ($SAVE_B) { ?>
- <?php echo $SEP?><?php echo $SAVE_B ?>
- <?php } ?>
 </td>
 </tr>
 </table>
@@ -25,9 +21,15 @@
 <?php echo $EDIT_TOOLBAR ?>
 <?php } ?>
 <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
-<br /><small>
+<p>
 <?php echo _("Summary")._(":") ?><?php echo $SUMMARY_INPUT ?>
-<br />
+</p>
+<p>
+<?php echo $PREVIEW_B ?>
+<?php if ($SAVE_B) { ?>
+ <?php echo $SEP?><?php echo $SAVE_B ?>
+<?php } ?>
+</p>
 <?php if (ENABLE_CAPTCHA) { ?>
 <?php echo $CAPTCHA_IMAGE ?><br/>
 <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?><br/>
@@ -42,7 +44,6 @@
 <?php if ($user->isAdmin()) { ?>
 <?php echo $SEP?><?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label>
 <?php } ?>
-</small>
 <br />
 <?php if (isset($PREVIEW_CONTENT)) { ?>
 <hr />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9658
 http://sourceforge.net/p/phpwiki/code/9658
Author: vargenau
Date: 2015年04月10日 16:08:33 +0000 (2015年4月10日)
Log Message:
-----------
Remove unused Javascript functions addTagButton and escapeQuotesHTML
Modified Paths:
--------------
 trunk/themes/MonoBook/wikibits.js
 trunk/themes/default/toolbar.js
Modified: trunk/themes/MonoBook/wikibits.js
===================================================================
--- trunk/themes/MonoBook/wikibits.js	2015年04月10日 15:59:32 UTC (rev 9657)
+++ trunk/themes/MonoBook/wikibits.js	2015年04月10日 16:08:33 UTC (rev 9658)
@@ -264,12 +264,6 @@
 	return text;
 }
 
-function escapeQuotesHTML(text) {
-	var re=new RegExp('"',"g");
-	text=text.replace(re,""");
-	return text;
-}
-
 // apply tagOpen/tagClose to selection in textarea,
 // use sampleText instead of selection if there is none
 // copied and adapted from phpBB
Modified: trunk/themes/default/toolbar.js
===================================================================
--- trunk/themes/default/toolbar.js	2015年04月10日 15:59:32 UTC (rev 9657)
+++ trunk/themes/default/toolbar.js	2015年04月10日 16:08:33 UTC (rev 9658)
@@ -22,17 +22,10 @@
 document.write(");\"><img src=\""+imageFile+"\" alt=\""+speedTip+"\" title=\""+speedTip+"\">");
 document.write("</a>");
 }
-function addTagButton(imageFile, speedTip, tagOpen, tagClose, sampleText) {
- addButton(imageFile, speedTip, "insertTags", [tagOpen, tagClose, sampleText]);
-}
 
 // This function generates a popup list to select from.
 // plugins, pagenames, categories, templates.
 // Not with document.write because we cannot use self.opener then.
-//function addPulldown(imageFile, speedTip, pages) {
-// addButton(imageFile, speedTip, "showPulldown", pages);
-// return;
-//}
 // pages is either an array of strings or an array of array(name,value)
 function showPulldown(title, pages, okbutton, closebutton, fromid) {
 var height = new String(Math.min(315, 80 + (pages.length * 12))); // 270 or smaller
@@ -81,11 +74,6 @@
 text=text.replace(re,"\\n");
 return text;
 }
-function escapeQuotesHTML(text) {
- var re=new RegExp('"',"g");
- text=text.replace(re,"&quot;");
- return text;
-}
 function unescapeSpecial(text) {
 // IE
 var re=new RegExp('%0A',"g");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9657
 http://sourceforge.net/p/phpwiki/code/9657
Author: vargenau
Date: 2015年04月10日 15:59:32 +0000 (2015年4月10日)
Log Message:
-----------
Remove unused Javascript function addInfobox
Modified Paths:
--------------
 trunk/themes/MonoBook/wikibits.js
 trunk/themes/default/toolbar.js
Modified: trunk/themes/MonoBook/wikibits.js
===================================================================
--- trunk/themes/MonoBook/wikibits.js	2015年04月10日 15:35:00 UTC (rev 9656)
+++ trunk/themes/MonoBook/wikibits.js	2015年04月10日 15:59:32 UTC (rev 9657)
@@ -254,25 +254,6 @@
 	return;
 }
 
-function addInfobox(infoText,text_alert) {
-	alertText=text_alert;
-	var clientPC = navigator.userAgent.toLowerCase(); // Get client info
-
-	var re=new RegExp("\\\\n","g");
-	alertText=alertText.replace(re,"\n");
-
-	// if no support for changing selection, add a small copy & paste field
-	// document.selection is an IE-only property. The full toolbar works in IE and
-	// Gecko-based browsers.
-	if(!document.selection && !is_gecko) {
- 		infoText=escapeQuotesHTML(infoText);
-	 	document.write("<form name='infoform' id='infoform'>"+
-			"<input size=80 id='infobox' name='infobox' value=\""+
-			infoText+"\" READONLY></form>");
- 	}
-
-}
-
 function escapeQuotes(text) {
 	var re=new RegExp("'","g");
 	text=text.replace(re,"\\'");
Modified: trunk/themes/default/toolbar.js
===================================================================
--- trunk/themes/default/toolbar.js	2015年04月10日 15:35:00 UTC (rev 9656)
+++ trunk/themes/default/toolbar.js	2015年04月10日 15:59:32 UTC (rev 9657)
@@ -72,18 +72,6 @@
 insertTags(text, '', '\n');
 }
 }
-function addInfobox(infoText) {
- // if no support for changing selection, add a small copy & paste field
- var clientPC = navigator.userAgent.toLowerCase(); // Get client info
- var is_nav = ((clientPC.indexOf('gecko')!=-1) && (clientPC.indexOf('spoofer')==-1)
- && (clientPC.indexOf('khtml') == -1));
- if(!document.selection && !is_nav) {
- infoText=escapeQuotesHTML(infoText);
- document.write("<form name='infoform' id='infoform'>"+
- "<input size=80 id='infobox' name='infobox' value=\""+
- infoText+"\" readonly=\"readonly\"></form>");
- }
-}
 function escapeQuotes(text) {
 var re=new RegExp("'","g");
 text=text.replace(re,"\\'");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9656
 http://sourceforge.net/p/phpwiki/code/9656
Author: vargenau
Date: 2015年04月10日 15:35:00 +0000 (2015年4月10日)
Log Message:
-----------
Remove WIDTH_PREF and HEIGHT_PREF
Modified Paths:
--------------
 trunk/lib/editpage.php
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2015年04月10日 15:05:23 UTC (rev 9655)
+++ trunk/lib/editpage.php	2015年04月10日 15:35:00 UTC (rev 9656)
@@ -1031,13 +1031,10 @@
 $el['WYSIWYG_B'] = Button(array("action" => "edit", "mode" => "wysiwyg"), "Wysiwyg Editor");
 }
 }
-
 $el['PREVIEW_B'] = Button('submit:edit[preview]', _("Preview"),
 'wikiaction',
 array('accesskey' => 'p',
 'title' => _('Preview the current content [alt-p]')));
-
- //if (!$this->isConcurrentUpdate() && $this->canEdit())
 $el['SAVE_B'] = Button('submit:edit[save]',
 _("Save"), 'wikiaction',
 array('accesskey' => 's',
@@ -1053,25 +1050,6 @@
 _("Spell Check"), 'wikiaction',
 array('title' => _('Check the spelling')));
 $el['IS_CURRENT'] = $this->version == $this->current->getVersion();
-
- $el['WIDTH_PREF']
- = HTML::input(array('type' => 'text',
- 'size' => 3,
- 'maxlength' => 4,
- 'class' => "numeric",
- 'name' => 'pref[editWidth]',
- 'id' => 'pref-editWidth',
- 'value' => $request->getPref('editWidth'),
- 'onchange' => 'this.form.submit();'));
- $el['HEIGHT_PREF']
- = HTML::input(array('type' => 'text',
- 'size' => 3,
- 'maxlength' => 4,
- 'class' => "numeric",
- 'name' => 'pref[editHeight]',
- 'id' => 'pref-editHeight',
- 'value' => $request->getPref('editHeight'),
- 'onchange' => 'this.form.submit();'));
 $el['SEP'] = $WikiTheme->getButtonSeparator();
 $el['AUTHOR_MESSAGE'] = fmt("Author will be logged as %s.",
 HTML::em($this->user->getId()));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9655
 http://sourceforge.net/p/phpwiki/code/9655
Author: vargenau
Date: 2015年04月10日 15:05:23 +0000 (2015年4月10日)
Log Message:
-----------
Update translations
Modified Paths:
--------------
 trunk/locale/de/LC_MESSAGES/phpwiki.mo
 trunk/locale/es/LC_MESSAGES/phpwiki.mo
 trunk/locale/fr/LC_MESSAGES/phpwiki.mo
 trunk/locale/it/LC_MESSAGES/phpwiki.mo
 trunk/locale/ja/LC_MESSAGES/phpwiki.mo
 trunk/locale/nl/LC_MESSAGES/phpwiki.mo
 trunk/locale/po/de.po
 trunk/locale/po/es.po
 trunk/locale/po/fr.po
 trunk/locale/po/it.po
 trunk/locale/po/ja.po
 trunk/locale/po/nl.po
 trunk/locale/po/phpwiki.pot
 trunk/locale/po/sv.po
 trunk/locale/po/zh.po
 trunk/locale/sv/LC_MESSAGES/phpwiki.mo
 trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2015年04月10日 15:01:02 UTC (rev 9654)
+++ trunk/locale/po/de.po	2015年04月10日 15:05:23 UTC (rev 9655)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
+"POT-Creation-Date: 2015年04月10日 17:01+0200\n"
 "PO-Revision-Date: 2000年10月31日 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -357,15 +357,27 @@
 msgid "Link to page"
 msgstr "Link auf Seite"
 
+msgid "PageName|optional label"
+msgstr "SeitenName|optionaler Name"
+
 msgid "External link (remember http:// prefix)"
 msgstr "Externer Link (http:// prefix)"
 
+msgid "http://www.example.com|optional label"
+msgstr "http://www.example.com|optionaler Name"
+
 msgid "Level 1 headline"
 msgstr "H1 Überschrift"
 
+msgid "Headline text"
+msgstr "Überschrift"
+
 msgid "Ignore wiki formatting"
 msgstr "Keine Wiki Formatierung"
 
+msgid "Insert non-formatted text here"
+msgstr "Füge unformatierten Text hier ein"
+
 msgid "Your signature"
 msgstr "Deine Signatur"
 
@@ -387,9 +399,15 @@
 msgid "Redirect"
 msgstr "Weiterleiten"
 
+msgid "Page Name"
+msgstr "Seitenname"
+
 msgid "Template"
 msgstr "Vorlage"
 
+msgid "Template Name"
+msgstr "Vorlagenname"
+
 msgid "Undo Search & Replace"
 msgstr "Suchen & Ersetzen rückgängig machen"
 
@@ -1005,9 +1023,6 @@
 msgid ""%s" not found"
 msgstr "»%s« nicht gefunden"
 
-msgid "Page Name"
-msgstr "Seitenname"
-
 #, php-format
 msgid "page permission inherited from %s"
 msgstr "Zugriffsrecht geerbt von %s"
@@ -6077,21 +6092,6 @@
 #~ msgid "Italic text [alt-i]"
 #~ msgstr "Kursiver Text [alt-k]"
 
-#~ msgid "PageName|optional label"
-#~ msgstr "SeitenName|optionaler Name"
-
-#~ msgid "http://www.example.com|optional label"
-#~ msgstr "http://www.example.com|optionaler Name"
-
-#~ msgid "Headline text"
-#~ msgstr "Überschrift"
-
-#~ msgid "Insert non-formatted text here"
-#~ msgstr "Füge unformatierten Text hier ein"
-
-#~ msgid "Template Name"
-#~ msgstr "Vorlagenname"
-
 #~ msgid "H"
 #~ msgstr "H."
 
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015年04月10日 15:01:02 UTC (rev 9654)
+++ trunk/locale/po/es.po	2015年04月10日 15:05:23 UTC (rev 9655)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
+"POT-Creation-Date: 2015年04月10日 17:01+0200\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -354,15 +354,27 @@
 msgid "Link to page"
 msgstr "Acoplamiento a la página"
 
+msgid "PageName|optional label"
+msgstr ""
+
 msgid "External link (remember http:// prefix)"
 msgstr "Acoplamiento externo (recuerde http:// prefijo)"
 
+msgid "http://www.example.com|optional label"
+msgstr ""
+
 msgid "Level 1 headline"
 msgstr "Título del nivel 1"
 
+msgid "Headline text"
+msgstr "Texto del título"
+
 msgid "Ignore wiki formatting"
 msgstr "No haga caso del formato del wiki"
 
+msgid "Insert non-formatted text here"
+msgstr "Inserte el texto sin formatear aquí"
+
 msgid "Your signature"
 msgstr "Su firma"
 
@@ -386,9 +398,16 @@
 msgid "Redirect"
 msgstr ""
 
+msgid "Page Name"
+msgstr "Nombre de la Página"
+
 msgid "Template"
 msgstr "Plantilla"
 
+#, fuzzy
+msgid "Template Name"
+msgstr "Plantilla"
+
 msgid "Undo Search & Replace"
 msgstr "Deshaga La Búsqueda Y Substitúyala"
 
@@ -988,9 +1007,6 @@
 msgid ""%s" not found"
 msgstr ""%s" no encontrado"
 
-msgid "Page Name"
-msgstr "Nombre de la Página"
-
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
@@ -5898,12 +5914,6 @@
 #~ msgid "Italic text [alt-i]"
 #~ msgstr "Texto del itálico [alt-i]"
 
-#~ msgid "Headline text"
-#~ msgstr "Texto del título"
-
-#~ msgid "Insert non-formatted text here"
-#~ msgstr "Inserte el texto sin formatear aquí"
-
 #~ msgid "Click a button to get an example text"
 #~ msgstr "Chasque un botón para conseguir un texto del ejemplo"
 
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015年04月10日 15:01:02 UTC (rev 9654)
+++ trunk/locale/po/fr.po	2015年04月10日 15:05:23 UTC (rev 9655)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
+"POT-Creation-Date: 2015年04月10日 17:01+0200\n"
 "PO-Revision-Date: 2004年06月22日 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -356,15 +356,27 @@
 msgid "Link to page"
 msgstr "Lien vers une page"
 
+msgid "PageName|optional label"
+msgstr "Page|label optionnel"
+
 msgid "External link (remember http:// prefix)"
 msgstr "Lien externe (le préfixe http:// est obligatoire)"
 
+msgid "http://www.example.com|optional label"
+msgstr "http://www.example.com|label facultatif"
+
 msgid "Level 1 headline"
 msgstr "Titre de niveau 1"
 
+msgid "Headline text"
+msgstr "Titre"
+
 msgid "Ignore wiki formatting"
 msgstr "Ignorer la syntaxe wiki"
 
+msgid "Insert non-formatted text here"
+msgstr "Insérer le texte préformaté ici"
+
 msgid "Your signature"
 msgstr "Votre signature"
 
@@ -386,9 +398,15 @@
 msgid "Redirect"
 msgstr "Redirection"
 
+msgid "Page Name"
+msgstr "Nom de la page"
+
 msgid "Template"
 msgstr "Modèle"
 
+msgid "Template Name"
+msgstr "Nom du modèle"
+
 msgid "Undo Search & Replace"
 msgstr "Annuler « Rechercher & Remplacer »"
 
@@ -985,9 +1003,6 @@
 msgid ""%s" not found"
 msgstr "« %s » non trouvé"
 
-msgid "Page Name"
-msgstr "Nom de la page"
-
 #, php-format
 msgid "page permission inherited from %s"
 msgstr "permissions héritées de %s"
@@ -5989,21 +6004,6 @@
 #~ msgid "Italic text [alt-i]"
 #~ msgstr "Italique [alt-i]"
 
-#~ msgid "PageName|optional label"
-#~ msgstr "Page|label optionnel"
-
-#~ msgid "http://www.example.com|optional label"
-#~ msgstr "http://www.example.com|label facultatif"
-
-#~ msgid "Headline text"
-#~ msgstr "Titre"
-
-#~ msgid "Insert non-formatted text here"
-#~ msgstr "Insérer le texte préformaté ici"
-
-#~ msgid "Template Name"
-#~ msgstr "Nom du modèle"
-
 #~ msgid "Click a button to get an example text"
 #~ msgstr "Cliquer sur un bouton pour obtenir une exemple de texte"
 
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015年04月10日 15:01:02 UTC (rev 9654)
+++ trunk/locale/po/it.po	2015年04月10日 15:05:23 UTC (rev 9655)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
+"POT-Creation-Date: 2015年04月10日 17:01+0200\n"
 "PO-Revision-Date: 2005年02月12日 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -344,15 +344,27 @@
 msgid "Link to page"
 msgstr "Pagine Simili"
 
+msgid "PageName|optional label"
+msgstr ""
+
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
+msgid "http://www.example.com|optional label"
+msgstr ""
+
 msgid "Level 1 headline"
 msgstr ""
 
+msgid "Headline text"
+msgstr ""
+
 msgid "Ignore wiki formatting"
 msgstr ""
 
+msgid "Insert non-formatted text here"
+msgstr ""
+
 #, fuzzy
 msgid "Your signature"
 msgstr "La versione corrente"
@@ -375,9 +387,16 @@
 msgid "Redirect"
 msgstr ""
 
+msgid "Page Name"
+msgstr "Nome della Pagina"
+
 msgid "Template"
 msgstr ""
 
+#, fuzzy
+msgid "Template Name"
+msgstr "Nome della Pagina"
+
 msgid "Undo Search & Replace"
 msgstr ""
 
@@ -971,9 +990,6 @@
 msgid ""%s" not found"
 msgstr ""%s" non trovato"
 
-msgid "Page Name"
-msgstr "Nome della Pagina"
-
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015年04月10日 15:01:02 UTC (rev 9654)
+++ trunk/locale/po/ja.po	2015年04月10日 15:05:23 UTC (rev 9655)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
+"POT-Creation-Date: 2015年04月10日 17:01+0200\n"
 "PO-Revision-Date: 2003年06月07日 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -332,15 +332,27 @@
 msgid "Link to page"
 msgstr "ページロック"
 
+msgid "PageName|optional label"
+msgstr ""
+
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
+msgid "http://www.example.com|optional label"
+msgstr ""
+
 msgid "Level 1 headline"
 msgstr ""
 
+msgid "Headline text"
+msgstr ""
+
 msgid "Ignore wiki formatting"
 msgstr ""
 
+msgid "Insert non-formatted text here"
+msgstr ""
+
 msgid "Your signature"
 msgstr ""
 
@@ -363,9 +375,16 @@
 msgid "Redirect"
 msgstr "転送"
 
+msgid "Page Name"
+msgstr "ページ名"
+
 msgid "Template"
 msgstr ""
 
+#, fuzzy
+msgid "Template Name"
+msgstr "ページ名"
+
 msgid "Undo Search & Replace"
 msgstr ""
 
@@ -969,9 +988,6 @@
 msgid ""%s" not found"
 msgstr ""
 
-msgid "Page Name"
-msgstr "ページ名"
-
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015年04月10日 15:01:02 UTC (rev 9654)
+++ trunk/locale/po/nl.po	2015年04月10日 15:05:23 UTC (rev 9655)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
+"POT-Creation-Date: 2015年04月10日 17:01+0200\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -338,15 +338,27 @@
 msgid "Link to page"
 msgstr "Zoek Pagina"
 
+msgid "PageName|optional label"
+msgstr ""
+
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
+msgid "http://www.example.com|optional label"
+msgstr ""
+
 msgid "Level 1 headline"
 msgstr ""
 
+msgid "Headline text"
+msgstr ""
+
 msgid "Ignore wiki formatting"
 msgstr ""
 
+msgid "Insert non-formatted text here"
+msgstr ""
+
 msgid "Your signature"
 msgstr ""
 
@@ -368,9 +380,15 @@
 msgid "Redirect"
 msgstr ""
 
+msgid "Page Name"
+msgstr "Pagina Naam"
+
 msgid "Template"
 msgstr ""
 
+msgid "Template Name"
+msgstr "Template Naam"
+
 #, fuzzy
 msgid "Undo Search & Replace"
 msgstr "Zoek & Vervangt"
@@ -962,9 +980,6 @@
 msgid ""%s" not found"
 msgstr ""
 
-msgid "Page Name"
-msgstr "Pagina Naam"
-
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
@@ -5822,9 +5837,6 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
-#~ msgid "Template Name"
-#~ msgstr "Template Naam"
-
 #~ msgid "H"
 #~ msgstr "H"
 
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015年04月10日 15:01:02 UTC (rev 9654)
+++ trunk/locale/po/phpwiki.pot	2015年04月10日 15:05:23 UTC (rev 9655)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
+"POT-Creation-Date: 2015年04月10日 17:01+0200\n"
 "PO-Revision-Date: 2002年12月14日 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -331,15 +331,27 @@
 msgid "Link to page"
 msgstr ""
 
+msgid "PageName|optional label"
+msgstr ""
+
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
+msgid "http://www.example.com|optional label"
+msgstr ""
+
 msgid "Level 1 headline"
 msgstr ""
 
+msgid "Headline text"
+msgstr ""
+
 msgid "Ignore wiki formatting"
 msgstr ""
 
+msgid "Insert non-formatted text here"
+msgstr ""
+
 msgid "Your signature"
 msgstr ""
 
@@ -361,9 +373,15 @@
 msgid "Redirect"
 msgstr ""
 
+msgid "Page Name"
+msgstr ""
+
 msgid "Template"
 msgstr ""
 
+msgid "Template Name"
+msgstr ""
+
 msgid "Undo Search & Replace"
 msgstr ""
 
@@ -954,9 +972,6 @@
 msgid ""%s" not found"
 msgstr ""
 
-msgid "Page Name"
-msgstr ""
-
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015年04月10日 15:01:02 UTC (rev 9654)
+++ trunk/locale/po/sv.po	2015年04月10日 15:05:23 UTC (rev 9655)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
+"POT-Creation-Date: 2015年04月10日 17:01+0200\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -333,15 +333,27 @@
 msgid "Link to page"
 msgstr "Sök Efter Sida"
 
+msgid "PageName|optional label"
+msgstr ""
+
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
+msgid "http://www.example.com|optional label"
+msgstr ""
+
 msgid "Level 1 headline"
 msgstr ""
 
+msgid "Headline text"
+msgstr ""
+
 msgid "Ignore wiki formatting"
 msgstr ""
 
+msgid "Insert non-formatted text here"
+msgstr ""
+
 msgid "Your signature"
 msgstr ""
 
@@ -363,9 +375,15 @@
 msgid "Redirect"
 msgstr ""
 
+msgid "Page Name"
+msgstr "Namn på Sidan"
+
 msgid "Template"
 msgstr ""
 
+msgid "Template Name"
+msgstr "Namn på Template"
+
 msgid "Undo Search & Replace"
 msgstr ""
 
@@ -956,9 +974,6 @@
 msgid ""%s" not found"
 msgstr ""%s" ingen funna"
 
-msgid "Page Name"
-msgstr "Namn på Sidan"
-
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
@@ -5814,9 +5829,6 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
-#~ msgid "Template Name"
-#~ msgstr "Namn på Template"
-
 #~ msgid "H"
 #~ msgstr "H"
 
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015年04月10日 15:01:02 UTC (rev 9654)
+++ trunk/locale/po/zh.po	2015年04月10日 15:05:23 UTC (rev 9655)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
+"POT-Creation-Date: 2015年04月10日 17:01+0200\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -345,15 +345,27 @@
 msgid "Link to page"
 msgstr "解除鎖定此頁面"
 
+msgid "PageName|optional label"
+msgstr ""
+
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
+msgid "http://www.example.com|optional label"
+msgstr ""
+
 msgid "Level 1 headline"
 msgstr ""
 
+msgid "Headline text"
+msgstr ""
+
 msgid "Ignore wiki formatting"
 msgstr ""
 
+msgid "Insert non-formatted text here"
+msgstr ""
+
 #, fuzzy
 msgid "Your signature"
 msgstr "你的版本"
@@ -379,11 +391,18 @@
 msgid "Redirect"
 msgstr "重導向"
 
+msgid "Page Name"
+msgstr "頁面名稱"
+
 #, fuzzy
 msgid "Template"
 msgstr "佈景主題"
 
 #, fuzzy
+msgid "Template Name"
+msgstr "佈景主題"
+
+#, fuzzy
 msgid "Undo Search & Replace"
 msgstr "搜尋與取代"
 
@@ -993,9 +1012,6 @@
 msgid ""%s" not found"
 msgstr ""%s" 找不到"
 
-msgid "Page Name"
-msgstr "頁面名稱"
-
 #, php-format
 msgid "page permission inherited from %s"
 msgstr "由 %s 繼承而來的頁面"
@@ -6133,10 +6149,6 @@
 #~ msgid "Strike"
 #~ msgstr "大小"
 
-#, fuzzy
-#~ msgid "Template Name"
-#~ msgstr "佈景主題"
-
 #~ msgid "H"
 #~ msgstr "高"
 
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9654
 http://sourceforge.net/p/phpwiki/code/9654
Author: vargenau
Date: 2015年04月10日 15:01:02 +0000 (2015年4月10日)
Log Message:
-----------
Translate strings
Modified Paths:
--------------
 trunk/lib/editpage.php
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2015年04月10日 14:34:25 UTC (rev 9653)
+++ trunk/lib/editpage.php	2015年04月10日 15:01:02 UTC (rev 9654)
@@ -683,42 +683,42 @@
 'class' => 'toolbar',
 'alt' => _('Bold text'),
 'title' => _('Bold text'),
- 'onclick' => "insertTags('**','**','Bold text'); return true;")));
+ 'onclick' => "insertTags('**','**','"._('Bold text')."'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_format_italic.png"),
 'class' => 'toolbar',
 'alt' => _('Italic text'),
 'title' => _('Italic text'),
- 'onclick' => "insertTags('//','//','Italic text'); return true;")));
+ 'onclick' => "insertTags('//','//','"._('Italic text')."'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_format_strike.png"),
 'class' => 'toolbar',
 'alt' => _('Strike-through text'),
 'title' => _('Strike-through text'),
- 'onclick' => "insertTags('<s>','</s>','Strike-through text'); return true;")));
+ 'onclick' => "insertTags('<s>','</s>','"._('Strike-through text')."'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_format_color.png"),
 'class' => 'toolbar',
 'alt' => _('Color text'),
 'title' => _('Color text'),
- 'onclick' => "insertTags('%color=green%','%%','Color text'); return true;")));
+ 'onclick' => "insertTags('%color=green%','%%','"._('Color text')."'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_pagelink.png"),
 'class' => 'toolbar',
 'alt' => _('Link to page'),
 'title' => _('Link to page'),
- 'onclick' => "insertTags('[[',']]','PageName|optional label'); return true;")));
+ 'onclick' => "insertTags('[[',']]','"._('PageName|optional label')."'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_link.png"),
 'class' => 'toolbar',
 'alt' => _('External link (remember http:// prefix)'),
 'title' => _('External link (remember http:// prefix)'),
- 'onclick' => "insertTags('[[',']]','http://www.example.com|optional label'); return true;")));
+ 'onclick' => "insertTags('[[',']]','"._('http://www.example.com|optional label')."'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_headline.png"),
 'class' => 'toolbar',
 'alt' => _('Level 1 headline'),
 'title' => _('Level 1 headline'),
- 'onclick' => 'insertTags("\n==","==\n","Headline text"); return true;')));
+ 'onclick' => 'insertTags("\n== "," ==\n","'._("Headline text").'"); return true;')));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_nowiki.png"),
 'class' => 'toolbar',
 'alt' => _('Ignore wiki formatting'),
 'title' => _('Ignore wiki formatting'),
- 'onclick' => 'insertTags("<verbatim>\n","\n</verbatim>","Insert non-formatted text here"); return true;')));
+ 'onclick' => 'insertTags("<verbatim>\n","\n</verbatim>","'._("Insert non-formatted text here").'"); return true;')));
 global $request;
 $username = $request->_user->UserName();
 $signature = " ––[[" . $username . "]] " . CTime() . '\n';
@@ -756,12 +756,13 @@
 'class' => 'toolbar',
 'alt' => _('Redirect'),
 'title' => _('Redirect'),
- 'onclick' => "insertTags('<<RedirectTo page=&quot;','&quot;>>','Page Name'); return true;")));
+ 'onclick' => "insertTags('<<RedirectTo page=&quot;','&quot;>>','"._('Page Name')."'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_templateplugin.png"),
 'class' => 'toolbar',
 'alt' => _('Template'),
 'title' => _('Template'),
- 'onclick' => "insertTags('{{','}}','Template Name'); return true;")));
+ 'onclick' => "insertTags('{{','}}','"._('Template Name')."'); return true;")));
+
 $toolbar->pushContent($this->categoriesPulldown());
 $toolbar->pushContent($this->pluginPulldown());
 if (defined('TOOLBAR_PAGELINK_PULLDOWN') and TOOLBAR_PAGELINK_PULLDOWN) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9653
 http://sourceforge.net/p/phpwiki/code/9653
Author: vargenau
Date: 2015年04月10日 14:34:25 +0000 (2015年4月10日)
Log Message:
-----------
Translate strings
Modified Paths:
--------------
 trunk/lib/editpage.php
 trunk/locale/de/LC_MESSAGES/phpwiki.mo
 trunk/locale/es/LC_MESSAGES/phpwiki.mo
 trunk/locale/fr/LC_MESSAGES/phpwiki.mo
 trunk/locale/it/LC_MESSAGES/phpwiki.mo
 trunk/locale/ja/LC_MESSAGES/phpwiki.mo
 trunk/locale/nl/LC_MESSAGES/phpwiki.mo
 trunk/locale/po/de.po
 trunk/locale/po/es.po
 trunk/locale/po/fr.po
 trunk/locale/po/it.po
 trunk/locale/po/ja.po
 trunk/locale/po/nl.po
 trunk/locale/po/phpwiki.pot
 trunk/locale/po/sv.po
 trunk/locale/po/zh.po
 trunk/locale/sv/LC_MESSAGES/phpwiki.mo
 trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2015年04月10日 14:07:54 UTC (rev 9652)
+++ trunk/lib/editpage.php	2015年04月10日 14:34:25 UTC (rev 9653)
@@ -668,99 +668,99 @@
 }
 $toolbar = HTML::div(array('class' => 'edit-toolbar', 'id' => 'toolbar'));
 $toolbar->pushContent(HTML::input(array('src' => $WikiTheme->getImageURL("ed_save.png"),
- 'alt' => 'Save',
 'name' => 'edit[save]',
 'class' => 'toolbar',
- 'title' => 'Save',
+ 'alt' => _('Save'),
+ 'title' => _('Save'),
 'type' => 'image')));
 $toolbar->pushContent(HTML::input(array('src' => $WikiTheme->getImageURL("ed_preview.png"),
- 'alt' => 'Preview',
 'name' => 'edit[preview]',
 'class' => 'toolbar',
- 'title' => 'Preview',
+ 'alt' => _('Preview'),
+ 'title' => _('Preview'),
 'type' => 'image')));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_format_bold.png"),
 'class' => 'toolbar',
- 'alt' => 'Bold text',
- 'title' => 'Bold text',
+ 'alt' => _('Bold text'),
+ 'title' => _('Bold text'),
 'onclick' => "insertTags('**','**','Bold text'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_format_italic.png"),
 'class' => 'toolbar',
- 'alt' => 'Italic text',
- 'title' => 'Italic text',
+ 'alt' => _('Italic text'),
+ 'title' => _('Italic text'),
 'onclick' => "insertTags('//','//','Italic text'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_format_strike.png"),
 'class' => 'toolbar',
- 'alt' => 'Strike',
- 'title' => 'Strike',
+ 'alt' => _('Strike-through text'),
+ 'title' => _('Strike-through text'),
 'onclick' => "insertTags('<s>','</s>','Strike-through text'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_format_color.png"),
 'class' => 'toolbar',
- 'alt' => 'Color',
- 'title' => 'Color',
+ 'alt' => _('Color text'),
+ 'title' => _('Color text'),
 'onclick' => "insertTags('%color=green%','%%','Color text'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_pagelink.png"),
 'class' => 'toolbar',
- 'alt' => 'Link to page',
- 'title' => 'Link to page',
+ 'alt' => _('Link to page'),
+ 'title' => _('Link to page'),
 'onclick' => "insertTags('[[',']]','PageName|optional label'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_link.png"),
 'class' => 'toolbar',
- 'alt' => 'External link (remember http:// prefix)',
- 'title' => 'External link (remember http:// prefix)',
+ 'alt' => _('External link (remember http:// prefix)'),
+ 'title' => _('External link (remember http:// prefix)'),
 'onclick' => "insertTags('[[',']]','http://www.example.com|optional label'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_headline.png"),
 'class' => 'toolbar',
- 'alt' => 'Level 1 headline',
- 'title' => 'Level 1 headline',
+ 'alt' => _('Level 1 headline'),
+ 'title' => _('Level 1 headline'),
 'onclick' => 'insertTags("\n==","==\n","Headline text"); return true;')));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_nowiki.png"),
 'class' => 'toolbar',
- 'alt' => 'Ignore wiki formatting',
- 'title' => 'Ignore wiki formatting',
+ 'alt' => _('Ignore wiki formatting'),
+ 'title' => _('Ignore wiki formatting'),
 'onclick' => 'insertTags("<verbatim>\n","\n</verbatim>","Insert non-formatted text here"); return true;')));
 global $request;
 $username = $request->_user->UserName();
 $signature = " ––[[" . $username . "]] " . CTime() . '\n';
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_sig.png"),
 'class' => 'toolbar',
- 'alt' => 'Your signature',
- 'title' => 'Your signature',
+ 'alt' => _('Your signature'),
+ 'title' => _('Your signature'),
 'onclick' => "insertTags('".$signature."','',''); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_hr.png"),
 'class' => 'toolbar',
- 'alt' => 'Horizontal line',
- 'title' => 'Horizontal line',
+ 'alt' => _('Horizontal line'),
+ 'title' => _('Horizontal line'),
 'onclick' => 'insertTags("\n----\n","",""); return true;')));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_table.png"),
 'class' => 'toolbar',
- 'alt' => 'Sample table',
- 'title' => 'Sample table',
+ 'alt' => _('Sample table'),
+ 'title' => _('Sample table'),
 'onclick' => 'insertTags("\n{| class=\"bordered\"\n|+ This is the table caption\n|-\n! Header A !! Header B !! Header C\n|-\n| Cell A1 || Cell B1 || Cell C1\n|-\n| Cell A2 || Cell B2 || Cell C2\n|-\n| Cell A3 || Cell B3 || Cell C3\n|}\n","",""); return true;')));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_enumlist.png"),
 'class' => 'toolbar',
- 'alt' => 'Enumeration',
- 'title' => 'Enumeration',
+ 'alt' => _('Enumeration'),
+ 'title' => _('Enumeration'),
 'onclick' => 'insertTags("\n# Item 1\n# Item 2\n# Item 3\n","",""); return true;')));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_list.png"),
 'class' => 'toolbar',
- 'alt' => 'List',
- 'title' => 'List',
+ 'alt' => _('List'),
+ 'title' => _('List'),
 'onclick' => 'insertTags("\n* Item 1\n* Item 2\n* Item 3\n","",""); return true;')));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_toc.png"),
 'class' => 'toolbar',
- 'alt' => 'Table of Contents',
- 'title' => 'Table of Contents',
+ 'alt' => _('Table of Contents'),
+ 'title' => _('Table of Contents'),
 'onclick' => 'insertTags("<<CreateToc with_toclink||=1>>\n","",""); return true;')));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_redirect.png"),
 'class' => 'toolbar',
- 'alt' => 'Redirect',
- 'title' => 'Redirect',
+ 'alt' => _('Redirect'),
+ 'title' => _('Redirect'),
 'onclick' => "insertTags('<<RedirectTo page=&quot;','&quot;>>','Page Name'); return true;")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_templateplugin.png"),
 'class' => 'toolbar',
- 'alt' => 'Template',
- 'title' => 'Template',
+ 'alt' => _('Template'),
+ 'title' => _('Template'),
 'onclick' => "insertTags('{{','}}','Template Name'); return true;")));
 $toolbar->pushContent($this->categoriesPulldown());
 $toolbar->pushContent($this->pluginPulldown());
@@ -775,14 +775,14 @@
 }
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_replace.png"),
 'class' => 'toolbar',
- 'alt' => 'Search & Replace',
- 'title' => 'Search & Replace',
+ 'alt' => _('Search & Replace'),
+ 'title' => _('Search & Replace'),
 'onclick' => "replace();")));
 $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_undo_d.png"),
 'class' => 'toolbar',
 'id' => 'sr_undo',
- 'alt' => 'Undo Search & Replace',
- 'title' => 'Undo Search & Replace',
+ 'alt' => _('Undo Search & Replace'),
+ 'title' => _('Undo Search & Replace'),
 'onclick' => "do_undo();")));
 return HTML($toolbar, $textarea);
 } else {
@@ -814,7 +814,7 @@
 'id' => 'tb-categories',
 'src' => $WikiTheme->getImageURL("ed_category.png"),
 'title' => _("Insert Categories"),
- 'alt' => "Insert Categories", // to detect this at js
+ 'alt' => _("Insert Categories"), // to detect this at js
 'onclick' => "showPulldown('" .
 _("Insert Categories")
 . "',[" . join(",", $categories) . "],'"
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2015年04月10日 14:07:54 UTC (rev 9652)
+++ trunk/locale/po/de.po	2015年04月10日 14:34:25 UTC (rev 9653)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
+"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
 "PO-Revision-Date: 2000年10月31日 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -305,52 +305,6 @@
 "überschrieben. Deshalb sind Ihre und die Änderungen des anderen Autors "
 "miteinander kombiniert worden. Das Ergebnis sehen Sie unten."
 
-msgid "Preview"
-msgstr "Vorschau"
-
-msgid "Preview the current content [alt-p]"
-msgstr "Die aktuelle Version vorschauen [alt-p]"
-
-msgid "Save"
-msgstr "Speichern"
-
-msgid "Save the current content as wikipage [alt-s]"
-msgstr ""
-
-msgid "Changes"
-msgstr "Änderungen"
-
-msgid "Preview the current changes as diff [alt-c]"
-msgstr ""
-
-msgid "Upload"
-msgstr "Hochladen"
-
-msgid "Select a local file and press Upload to attach into this page"
-msgstr ""
-
-msgid "Spell Check"
-msgstr ""
-
-msgid "Check the spelling"
-msgstr ""
-
-#, php-format
-msgid "Author will be logged as %s."
-msgstr "%s wird als Autor aufgenommen."
-
-msgid "Keep old"
-msgstr ""
-
-msgid "Overwrite with new"
-msgstr ""
-
-# (Wrong Translation; sorry, but the German term for edit is NOT
-# editieren, but e d i e r e n).
-#, php-format
-msgid "Merge and Edit: %s"
-msgstr "Zusammenfügen und Bearbeiten: %s"
-
 msgid "Undo"
 msgstr "Rückgängig"
 
@@ -382,51 +336,33 @@
 msgid "Close"
 msgstr "Schließen"
 
+msgid "Save"
+msgstr "Speichern"
+
+msgid "Preview"
+msgstr "Vorschau"
+
 msgid "Bold text"
 msgstr "Fetter Text"
 
-msgid "Bold text [alt-b]"
-msgstr "Fetter Text [alt-f]"
-
 msgid "Italic text"
 msgstr "Kursiver Text"
 
-msgid "Italic text [alt-i]"
-msgstr "Kursiver Text [alt-k]"
-
 msgid "Strike-through text"
 msgstr "Durchgestrichen"
 
-msgid "Strike"
-msgstr "Durchstreichen"
-
 msgid "Color text"
 msgstr "Farbiger Text"
 
-msgid "Color"
-msgstr "Farbe"
-
-msgid "PageName|optional label"
-msgstr "SeitenName|optionaler Name"
-
 msgid "Link to page"
 msgstr "Link auf Seite"
 
-msgid "http://www.example.com|optional label"
-msgstr "http://www.example.com|optionaler Name"
-
 msgid "External link (remember http:// prefix)"
 msgstr "Externer Link (http:// prefix)"
 
-msgid "Headline text"
-msgstr "Überschrift"
-
 msgid "Level 1 headline"
 msgstr "H1 Überschrift"
 
-msgid "Insert non-formatted text here"
-msgstr "Füge unformatierten Text hier ein"
-
 msgid "Ignore wiki formatting"
 msgstr "Keine Wiki Formatierung"
 
@@ -448,21 +384,12 @@
 msgid "Table of Contents"
 msgstr "Inhaltsverzeichnis"
 
-msgid "Page Name"
-msgstr "Seitenname"
-
 msgid "Redirect"
 msgstr "Weiterleiten"
 
-msgid "Template Name"
-msgstr "Vorlagenname"
-
 msgid "Template"
 msgstr "Vorlage"
 
-msgid "Click a button to get an example text"
-msgstr ""
-
 msgid "Undo Search & Replace"
 msgstr "Suchen & Ersetzen rückgängig machen"
 
@@ -478,13 +405,53 @@
 msgid "Insert PageLink"
 msgstr "SeitenLink einfügen"
 
+msgid "Insert Template"
+msgstr "Vorlage einfügen"
+
 msgid "Insert Image or Video"
 msgstr "Bild oder Video einfügen"
 
-msgid "Insert Template"
-msgstr "Vorlage einfügen"
+msgid "Preview the current content [alt-p]"
+msgstr "Die aktuelle Version vorschauen [alt-p]"
 
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
+msgid "Changes"
+msgstr "Änderungen"
+
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
+msgid "Upload"
+msgstr "Hochladen"
+
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
+msgid "Spell Check"
+msgstr ""
+
+msgid "Check the spelling"
+msgstr ""
+
 #, php-format
+msgid "Author will be logged as %s."
+msgstr "%s wird als Autor aufgenommen."
+
+msgid "Keep old"
+msgstr ""
+
+msgid "Overwrite with new"
+msgstr ""
+
+# (Wrong Translation; sorry, but the German term for edit is NOT
+# editieren, but e d i e r e n).
+#, php-format
+msgid "Merge and Edit: %s"
+msgstr "Zusammenfügen und Bearbeiten: %s"
+
+#, php-format
 msgid "%s: error while handling error:"
 msgstr "%s: Fehler während der Fehlerbehandlung von:"
 
@@ -1038,6 +1005,9 @@
 msgid ""%s" not found"
 msgstr "»%s« nicht gefunden"
 
+msgid "Page Name"
+msgstr "Seitenname"
+
 #, php-format
 msgid "page permission inherited from %s"
 msgstr "Zugriffsrecht geerbt von %s"
@@ -6095,6 +6065,33 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "Strike"
+#~ msgstr "Durchstreichen"
+
+#~ msgid "Color"
+#~ msgstr "Farbe"
+
+#~ msgid "Bold text [alt-b]"
+#~ msgstr "Fetter Text [alt-f]"
+
+#~ msgid "Italic text [alt-i]"
+#~ msgstr "Kursiver Text [alt-k]"
+
+#~ msgid "PageName|optional label"
+#~ msgstr "SeitenName|optionaler Name"
+
+#~ msgid "http://www.example.com|optional label"
+#~ msgstr "http://www.example.com|optionaler Name"
+
+#~ msgid "Headline text"
+#~ msgstr "Überschrift"
+
+#~ msgid "Insert non-formatted text here"
+#~ msgstr "Füge unformatierten Text hier ein"
+
+#~ msgid "Template Name"
+#~ msgstr "Vorlagenname"
+
 #~ msgid "H"
 #~ msgstr "H."
 
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015年04月10日 14:07:54 UTC (rev 9652)
+++ trunk/locale/po/es.po	2015年04月10日 14:34:25 UTC (rev 9653)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
+"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -301,51 +301,6 @@
 "sobreescribirían los cambios del otro autor. Así pues, se han combinado sus "
 "cambios y los del otro autor. El resultado se demuestra abajo."
 
-msgid "Preview"
-msgstr "Previsualizar"
-
-#, fuzzy
-msgid "Preview the current content [alt-p]"
-msgstr "Vea la versión actual"
-
-msgid "Save"
-msgstr "Guardar"
-
-msgid "Save the current content as wikipage [alt-s]"
-msgstr ""
-
-msgid "Changes"
-msgstr "Cambios"
-
-msgid "Preview the current changes as diff [alt-c]"
-msgstr ""
-
-msgid "Upload"
-msgstr ""
-
-msgid "Select a local file and press Upload to attach into this page"
-msgstr ""
-
-msgid "Spell Check"
-msgstr ""
-
-msgid "Check the spelling"
-msgstr ""
-
-#, php-format
-msgid "Author will be logged as %s."
-msgstr "Registrarán al autor como %s."
-
-msgid "Keep old"
-msgstr ""
-
-msgid "Overwrite with new"
-msgstr ""
-
-#, php-format
-msgid "Merge and Edit: %s"
-msgstr "Fusión y Editar: %s"
-
 msgid "Undo"
 msgstr "Deshaga"
 
@@ -377,51 +332,34 @@
 msgid "Close"
 msgstr "Cierre"
 
+msgid "Save"
+msgstr "Guardar"
+
+msgid "Preview"
+msgstr "Previsualizar"
+
 msgid "Bold text"
 msgstr "Texto en negrilla"
 
-msgid "Bold text [alt-b]"
-msgstr "Texto en negrilla [alt-b]"
-
 msgid "Italic text"
 msgstr "Texto del itálico"
 
-msgid "Italic text [alt-i]"
-msgstr "Texto del itálico [alt-i]"
-
 msgid "Strike-through text"
 msgstr ""
 
-msgid "Strike"
-msgstr ""
-
+#, fuzzy
 msgid "Color text"
-msgstr ""
+msgstr "Texto en negrilla"
 
-msgid "Color"
-msgstr ""
-
-msgid "PageName|optional label"
-msgstr ""
-
 msgid "Link to page"
 msgstr "Acoplamiento a la página"
 
-msgid "http://www.example.com|optional label"
-msgstr ""
-
 msgid "External link (remember http:// prefix)"
 msgstr "Acoplamiento externo (recuerde http:// prefijo)"
 
-msgid "Headline text"
-msgstr "Texto del título"
-
 msgid "Level 1 headline"
 msgstr "Título del nivel 1"
 
-msgid "Insert non-formatted text here"
-msgstr "Inserte el texto sin formatear aquí"
-
 msgid "Ignore wiki formatting"
 msgstr "No haga caso del formato del wiki"
 
@@ -434,30 +372,23 @@
 msgid "Sample table"
 msgstr ""
 
+#, fuzzy
 msgid "Enumeration"
-msgstr ""
+msgstr "Relación"
 
+#, fuzzy
 msgid "List"
-msgstr ""
+msgstr "ListaPáginas"
 
 msgid "Table of Contents"
 msgstr "Tabla de contenidos"
 
-msgid "Page Name"
-msgstr "Nombre de la Página"
-
 msgid "Redirect"
 msgstr ""
 
-msgid "Template Name"
-msgstr ""
-
 msgid "Template"
 msgstr "Plantilla"
 
-msgid "Click a button to get an example text"
-msgstr "Chasque un botón para conseguir un texto del ejemplo"
-
 msgid "Undo Search & Replace"
 msgstr "Deshaga La Búsqueda Y Substitúyala"
 
@@ -473,13 +404,52 @@
 msgid "Insert PageLink"
 msgstr "Inserte el AcoplamientoDeLaPágina"
 
+msgid "Insert Template"
+msgstr "Inserte la plantilla"
+
 msgid "Insert Image or Video"
 msgstr ""
 
-msgid "Insert Template"
-msgstr "Inserte la plantilla"
+#, fuzzy
+msgid "Preview the current content [alt-p]"
+msgstr "Vea la versión actual"
 
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
+msgid "Changes"
+msgstr "Cambios"
+
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
+msgid "Upload"
+msgstr ""
+
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
+msgid "Spell Check"
+msgstr ""
+
+msgid "Check the spelling"
+msgstr ""
+
 #, php-format
+msgid "Author will be logged as %s."
+msgstr "Registrarán al autor como %s."
+
+msgid "Keep old"
+msgstr ""
+
+msgid "Overwrite with new"
+msgstr ""
+
+#, php-format
+msgid "Merge and Edit: %s"
+msgstr "Fusión y Editar: %s"
+
+#, php-format
 msgid "%s: error while handling error:"
 msgstr "%s: error mientras que maneja error:"
 
@@ -1018,6 +988,9 @@
 msgid ""%s" not found"
 msgstr ""%s" no encontrado"
 
+msgid "Page Name"
+msgstr "Nombre de la Página"
+
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
@@ -5919,6 +5892,21 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "Bold text [alt-b]"
+#~ msgstr "Texto en negrilla [alt-b]"
+
+#~ msgid "Italic text [alt-i]"
+#~ msgstr "Texto del itálico [alt-i]"
+
+#~ msgid "Headline text"
+#~ msgstr "Texto del título"
+
+#~ msgid "Insert non-formatted text here"
+#~ msgstr "Inserte el texto sin formatear aquí"
+
+#~ msgid "Click a button to get an example text"
+#~ msgstr "Chasque un botón para conseguir un texto del ejemplo"
+
 #~ msgid "H"
 #~ msgstr "Al"
 
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015年04月10日 14:07:54 UTC (rev 9652)
+++ trunk/locale/po/fr.po	2015年04月10日 14:34:25 UTC (rev 9653)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
+"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
 "PO-Revision-Date: 2004年06月22日 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -302,50 +302,6 @@
 "celles de l'autre utilisateur. Ainsi donc, vos modifications et celles de "
 "l'autre auteur ont été combinées. Le résultat est affiché ci-dessous."
 
-msgid "Preview"
-msgstr "Prévisualiser"
-
-msgid "Preview the current content [alt-p]"
-msgstr "Prévisualiser le contenu actuel [alt-p]"
-
-msgid "Save"
-msgstr "Enregistrer"
-
-msgid "Save the current content as wikipage [alt-s]"
-msgstr "Enregistrer le contenu actuel dans la page wiki [alt-s]"
-
-msgid "Changes"
-msgstr "Modifications"
-
-msgid "Preview the current changes as diff [alt-c]"
-msgstr "Prévisualiser les modifications actuelles en tant que diff [alt-c]"
-
-msgid "Upload"
-msgstr "Télécharger"
-
-msgid "Select a local file and press Upload to attach into this page"
-msgstr ""
-
-msgid "Spell Check"
-msgstr "Vérifier l'orthographe"
-
-msgid "Check the spelling"
-msgstr "Vérifier l'orthographe"
-
-#, php-format
-msgid "Author will be logged as %s."
-msgstr "L'auteur sera enregistré sous le nom %s."
-
-msgid "Keep old"
-msgstr "Garder l'ancien"
-
-msgid "Overwrite with new"
-msgstr "Écraser avec le nouveau"
-
-#, php-format
-msgid "Merge and Edit: %s"
-msgstr "Fusionner et modifier : %s"
-
 msgid "Undo"
 msgstr "Annuler"
 
@@ -379,51 +335,33 @@
 msgid "Close"
 msgstr "Fermer"
 
+msgid "Save"
+msgstr "Enregistrer"
+
+msgid "Preview"
+msgstr "Prévisualiser"
+
 msgid "Bold text"
 msgstr "Gras"
 
-msgid "Bold text [alt-b]"
-msgstr "Gras [alt-b]"
-
 msgid "Italic text"
 msgstr "Italique"
 
-msgid "Italic text [alt-i]"
-msgstr "Italique [alt-i]"
-
 msgid "Strike-through text"
 msgstr "Biffé"
 
-msgid "Strike"
-msgstr "Biffé"
-
 msgid "Color text"
 msgstr "Texte en couleur"
 
-msgid "Color"
-msgstr "Couleur"
-
-msgid "PageName|optional label"
-msgstr "Page|label optionnel"
-
 msgid "Link to page"
 msgstr "Lien vers une page"
 
-msgid "http://www.example.com|optional label"
-msgstr "http://www.example.com|label facultatif"
-
 msgid "External link (remember http:// prefix)"
 msgstr "Lien externe (le préfixe http:// est obligatoire)"
 
-msgid "Headline text"
-msgstr "Titre"
-
 msgid "Level 1 headline"
 msgstr "Titre de niveau 1"
 
-msgid "Insert non-formatted text here"
-msgstr "Insérer le texte préformaté ici"
-
 msgid "Ignore wiki formatting"
 msgstr "Ignorer la syntaxe wiki"
 
@@ -445,21 +383,12 @@
 msgid "Table of Contents"
 msgstr "Table des matières"
 
-msgid "Page Name"
-msgstr "Nom de la page"
-
 msgid "Redirect"
 msgstr "Redirection"
 
-msgid "Template Name"
-msgstr "Nom du modèle"
-
 msgid "Template"
 msgstr "Modèle"
 
-msgid "Click a button to get an example text"
-msgstr "Cliquer sur un bouton pour obtenir une exemple de texte"
-
 msgid "Undo Search & Replace"
 msgstr "Annuler « Rechercher & Remplacer »"
 
@@ -475,13 +404,51 @@
 msgid "Insert PageLink"
 msgstr "Insérer un lien"
 
+msgid "Insert Template"
+msgstr "Ajouter un modèle"
+
 msgid "Insert Image or Video"
 msgstr "Ajouter une image ou une vidéo"
 
-msgid "Insert Template"
-msgstr "Ajouter un modèle"
+msgid "Preview the current content [alt-p]"
+msgstr "Prévisualiser le contenu actuel [alt-p]"
 
+msgid "Save the current content as wikipage [alt-s]"
+msgstr "Enregistrer le contenu actuel dans la page wiki [alt-s]"
+
+msgid "Changes"
+msgstr "Modifications"
+
+msgid "Preview the current changes as diff [alt-c]"
+msgstr "Prévisualiser les modifications actuelles en tant que diff [alt-c]"
+
+msgid "Upload"
+msgstr "Télécharger"
+
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
+msgid "Spell Check"
+msgstr "Vérifier l'orthographe"
+
+msgid "Check the spelling"
+msgstr "Vérifier l'orthographe"
+
 #, php-format
+msgid "Author will be logged as %s."
+msgstr "L'auteur sera enregistré sous le nom %s."
+
+msgid "Keep old"
+msgstr "Garder l'ancien"
+
+msgid "Overwrite with new"
+msgstr "Écraser avec le nouveau"
+
+#, php-format
+msgid "Merge and Edit: %s"
+msgstr "Fusionner et modifier : %s"
+
+#, php-format
 msgid "%s: error while handling error:"
 msgstr "%s : erreur pendant la gestion de l'erreur :"
 
@@ -1018,6 +985,9 @@
 msgid ""%s" not found"
 msgstr "« %s » non trouvé"
 
+msgid "Page Name"
+msgstr "Nom de la page"
+
 #, php-format
 msgid "page permission inherited from %s"
 msgstr "permissions héritées de %s"
@@ -6007,6 +5977,36 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "Strike"
+#~ msgstr "Biffé"
+
+#~ msgid "Color"
+#~ msgstr "Couleur"
+
+#~ msgid "Bold text [alt-b]"
+#~ msgstr "Gras [alt-b]"
+
+#~ msgid "Italic text [alt-i]"
+#~ msgstr "Italique [alt-i]"
+
+#~ msgid "PageName|optional label"
+#~ msgstr "Page|label optionnel"
+
+#~ msgid "http://www.example.com|optional label"
+#~ msgstr "http://www.example.com|label facultatif"
+
+#~ msgid "Headline text"
+#~ msgstr "Titre"
+
+#~ msgid "Insert non-formatted text here"
+#~ msgstr "Insérer le texte préformaté ici"
+
+#~ msgid "Template Name"
+#~ msgstr "Nom du modèle"
+
+#~ msgid "Click a button to get an example text"
+#~ msgstr "Cliquer sur un bouton pour obtenir une exemple de texte"
+
 #~ msgid "H"
 #~ msgstr "H"
 
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015年04月10日 14:07:54 UTC (rev 9652)
+++ trunk/locale/po/it.po	2015年04月10日 14:34:25 UTC (rev 9653)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
+"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
 "PO-Revision-Date: 2005年02月12日 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -291,51 +291,6 @@
 "cambiamenti e quelli dell'altro autore sono stati uniti. Il risultato è "
 "indicato sotto."
 
-msgid "Preview"
-msgstr "Anteprima"
-
-#, fuzzy
-msgid "Preview the current content [alt-p]"
-msgstr "Mostra il versione corrente"
-
-msgid "Save"
-msgstr "Registra"
-
-msgid "Save the current content as wikipage [alt-s]"
-msgstr ""
-
-msgid "Changes"
-msgstr ""
-
-msgid "Preview the current changes as diff [alt-c]"
-msgstr ""
-
-msgid "Upload"
-msgstr ""
-
-msgid "Select a local file and press Upload to attach into this page"
-msgstr ""
-
-msgid "Spell Check"
-msgstr ""
-
-msgid "Check the spelling"
-msgstr ""
-
-#, php-format
-msgid "Author will be logged as %s."
-msgstr "L'autore sarà annotato come %s."
-
-msgid "Keep old"
-msgstr ""
-
-msgid "Overwrite with new"
-msgstr ""
-
-#, php-format
-msgid "Merge and Edit: %s"
-msgstr "Fondasi e pubblichi: %s"
-
 msgid "Undo"
 msgstr ""
 
@@ -367,56 +322,40 @@
 msgid "Close"
 msgstr ""
 
+msgid "Save"
+msgstr "Registra"
+
+msgid "Preview"
+msgstr "Anteprima"
+
 msgid "Bold text"
 msgstr ""
 
-msgid "Bold text [alt-b]"
-msgstr ""
-
 msgid "Italic text"
 msgstr ""
 
-msgid "Italic text [alt-i]"
-msgstr ""
-
 msgid "Strike-through text"
 msgstr ""
 
-msgid "Strike"
-msgstr ""
-
 msgid "Color text"
 msgstr ""
 
-msgid "Color"
-msgstr ""
-
-msgid "PageName|optional label"
-msgstr ""
-
+#, fuzzy
 msgid "Link to page"
-msgstr ""
+msgstr "Pagine Simili"
 
-msgid "http://www.example.com|optional label"
-msgstr ""
-
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
-msgid "Headline text"
-msgstr ""
-
 msgid "Level 1 headline"
 msgstr ""
 
-msgid "Insert non-formatted text here"
-msgstr ""
-
 msgid "Ignore wiki formatting"
 msgstr ""
 
+#, fuzzy
 msgid "Your signature"
-msgstr ""
+msgstr "La versione corrente"
 
 msgid "Horizontal line"
 msgstr ""
@@ -433,21 +372,12 @@
 msgid "Table of Contents"
 msgstr "Indice"
 
-msgid "Page Name"
-msgstr "Nome della Pagina"
-
 msgid "Redirect"
 msgstr ""
 
-msgid "Template Name"
-msgstr ""
-
 msgid "Template"
 msgstr ""
 
-msgid "Click a button to get an example text"
-msgstr ""
-
 msgid "Undo Search & Replace"
 msgstr ""
 
@@ -463,13 +393,52 @@
 msgid "Insert PageLink"
 msgstr "Inserto Pagina"
 
+msgid "Insert Template"
+msgstr "Inserto Mascherina"
+
 msgid "Insert Image or Video"
 msgstr ""
 
-msgid "Insert Template"
-msgstr "Inserto Mascherina"
+#, fuzzy
+msgid "Preview the current content [alt-p]"
+msgstr "Mostra il versione corrente"
 
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
+msgid "Changes"
+msgstr ""
+
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
+msgid "Upload"
+msgstr ""
+
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
+msgid "Spell Check"
+msgstr ""
+
+msgid "Check the spelling"
+msgstr ""
+
 #, php-format
+msgid "Author will be logged as %s."
+msgstr "L'autore sarà annotato come %s."
+
+msgid "Keep old"
+msgstr ""
+
+msgid "Overwrite with new"
+msgstr ""
+
+#, php-format
+msgid "Merge and Edit: %s"
+msgstr "Fondasi e pubblichi: %s"
+
+#, php-format
 msgid "%s: error while handling error:"
 msgstr ""
 
@@ -1002,6 +971,9 @@
 msgid ""%s" not found"
 msgstr ""%s" non trovato"
 
+msgid "Page Name"
+msgstr "Nome della Pagina"
+
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015年04月10日 14:07:54 UTC (rev 9652)
+++ trunk/locale/po/ja.po	2015年04月10日 14:34:25 UTC (rev 9653)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
+"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
 "PO-Revision-Date: 2003年06月07日 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -279,51 +279,6 @@
 "have been combined. The result is shown below."
 msgstr ""
 
-msgid "Preview"
-msgstr "プレビューする"
-
-#, fuzzy
-msgid "Preview the current content [alt-p]"
-msgstr "現在のバージョンを表示する"
-
-msgid "Save"
-msgstr "保存する"
-
-msgid "Save the current content as wikipage [alt-s]"
-msgstr ""
-
-msgid "Changes"
-msgstr ""
-
-msgid "Preview the current changes as diff [alt-c]"
-msgstr ""
-
-msgid "Upload"
-msgstr "アップロード"
-
-msgid "Select a local file and press Upload to attach into this page"
-msgstr ""
-
-msgid "Spell Check"
-msgstr ""
-
-msgid "Check the spelling"
-msgstr ""
-
-#, php-format
-msgid "Author will be logged as %s."
-msgstr ""
-
-msgid "Keep old"
-msgstr ""
-
-msgid "Overwrite with new"
-msgstr ""
-
-#, php-format
-msgid "Merge and Edit: %s"
-msgstr ""
-
 msgid "Undo"
 msgstr ""
 
@@ -355,51 +310,34 @@
 msgid "Close"
 msgstr ""
 
+msgid "Save"
+msgstr "保存する"
+
+msgid "Preview"
+msgstr "プレビューする"
+
 msgid "Bold text"
 msgstr ""
 
-msgid "Bold text [alt-b]"
-msgstr ""
-
 msgid "Italic text"
 msgstr ""
 
-msgid "Italic text [alt-i]"
-msgstr ""
-
 msgid "Strike-through text"
 msgstr ""
 
-msgid "Strike"
-msgstr ""
-
 msgid "Color text"
 msgstr ""
 
-msgid "Color"
-msgstr ""
-
-msgid "PageName|optional label"
-msgstr ""
-
+#, fuzzy
 msgid "Link to page"
-msgstr ""
+msgstr "ページロック"
 
-msgid "http://www.example.com|optional label"
-msgstr ""
-
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
-msgid "Headline text"
-msgstr ""
-
 msgid "Level 1 headline"
 msgstr ""
 
-msgid "Insert non-formatted text here"
-msgstr ""
-
 msgid "Ignore wiki formatting"
 msgstr ""
 
@@ -415,27 +353,19 @@
 msgid "Enumeration"
 msgstr ""
 
+#, fuzzy
 msgid "List"
-msgstr ""
+msgstr "サブページ"
 
 msgid "Table of Contents"
 msgstr ""
 
-msgid "Page Name"
-msgstr "ページ名"
-
 msgid "Redirect"
 msgstr "転送"
 
-msgid "Template Name"
-msgstr ""
-
 msgid "Template"
 msgstr ""
 
-msgid "Click a button to get an example text"
-msgstr ""
-
 msgid "Undo Search & Replace"
 msgstr ""
 
@@ -451,13 +381,52 @@
 msgid "Insert PageLink"
 msgstr ""
 
+msgid "Insert Template"
+msgstr ""
+
 msgid "Insert Image or Video"
 msgstr ""
 
-msgid "Insert Template"
+#, fuzzy
+msgid "Preview the current content [alt-p]"
+msgstr "現在のバージョンを表示する"
+
+msgid "Save the current content as wikipage [alt-s]"
 msgstr ""
 
+msgid "Changes"
+msgstr ""
+
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
+msgid "Upload"
+msgstr "アップロード"
+
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
+msgid "Spell Check"
+msgstr ""
+
+msgid "Check the spelling"
+msgstr ""
+
 #, php-format
+msgid "Author will be logged as %s."
+msgstr ""
+
+msgid "Keep old"
+msgstr ""
+
+msgid "Overwrite with new"
+msgstr ""
+
+#, php-format
+msgid "Merge and Edit: %s"
+msgstr ""
+
+#, php-format
 msgid "%s: error while handling error:"
 msgstr ""
 
@@ -1000,6 +969,9 @@
 msgid ""%s" not found"
 msgstr ""
 
+msgid "Page Name"
+msgstr "ページ名"
+
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015年04月10日 14:07:54 UTC (rev 9652)
+++ trunk/locale/po/nl.po	2015年04月10日 14:34:25 UTC (rev 9653)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
+"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -285,50 +285,6 @@
 "have been combined. The result is shown below."
 msgstr ""
 
-msgid "Preview"
-msgstr "Voorvertonig"
-
-msgid "Preview the current content [alt-p]"
-msgstr ""
-
-msgid "Save"
-msgstr "Bewaar"
-
-msgid "Save the current content as wikipage [alt-s]"
-msgstr ""
-
-msgid "Changes"
-msgstr "Veranderingen"
-
-msgid "Preview the current changes as diff [alt-c]"
-msgstr ""
-
-msgid "Upload"
-msgstr ""
-
-msgid "Select a local file and press Upload to attach into this page"
-msgstr ""
-
-msgid "Spell Check"
-msgstr ""
-
-msgid "Check the spelling"
-msgstr ""
-
-#, php-format
-msgid "Author will be logged as %s."
-msgstr ""
-
-msgid "Keep old"
-msgstr ""
-
-msgid "Overwrite with new"
-msgstr ""
-
-#, php-format
-msgid "Merge and Edit: %s"
-msgstr ""
-
 msgid "Undo"
 msgstr ""
 
@@ -360,51 +316,34 @@
 msgid "Close"
 msgstr ""
 
+msgid "Save"
+msgstr "Bewaar"
+
+msgid "Preview"
+msgstr "Voorvertonig"
+
 msgid "Bold text"
 msgstr ""
 
-msgid "Bold text [alt-b]"
-msgstr ""
-
 msgid "Italic text"
 msgstr ""
 
-msgid "Italic text [alt-i]"
-msgstr ""
-
 msgid "Strike-through text"
 msgstr ""
 
-msgid "Strike"
-msgstr ""
-
 msgid "Color text"
 msgstr ""
 
-msgid "Color"
-msgstr ""
-
-msgid "PageName|optional label"
-msgstr ""
-
+#, fuzzy
 msgid "Link to page"
-msgstr ""
+msgstr "Zoek Pagina"
 
-msgid "http://www.example.com|optional label"
-msgstr ""
-
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
-msgid "Headline text"
-msgstr ""
-
 msgid "Level 1 headline"
 msgstr ""
 
-msgid "Insert non-formatted text here"
-msgstr ""
-
 msgid "Ignore wiki formatting"
 msgstr ""
 
@@ -426,23 +365,15 @@
 msgid "Table of Contents"
 msgstr ""
 
-msgid "Page Name"
-msgstr "Pagina Naam"
-
 msgid "Redirect"
 msgstr ""
 
-msgid "Template Name"
-msgstr "Template Naam"
-
 msgid "Template"
 msgstr ""
 
-msgid "Click a button to get an example text"
-msgstr ""
-
+#, fuzzy
 msgid "Undo Search & Replace"
-msgstr ""
+msgstr "Zoek & Vervangt"
 
 msgid "Insert Categories"
 msgstr ""
@@ -456,13 +387,51 @@
 msgid "Insert PageLink"
 msgstr ""
 
+msgid "Insert Template"
+msgstr ""
+
 msgid "Insert Image or Video"
 msgstr ""
 
-msgid "Insert Template"
+msgid "Preview the current content [alt-p]"
 msgstr ""
 
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
+msgid "Changes"
+msgstr "Veranderingen"
+
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
+msgid "Upload"
+msgstr ""
+
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
+msgid "Spell Check"
+msgstr ""
+
+msgid "Check the spelling"
+msgstr ""
+
 #, php-format
+msgid "Author will be logged as %s."
+msgstr ""
+
+msgid "Keep old"
+msgstr ""
+
+msgid "Overwrite with new"
+msgstr ""
+
+#, php-format
+msgid "Merge and Edit: %s"
+msgstr ""
+
+#, php-format
 msgid "%s: error while handling error:"
 msgstr ""
 
@@ -993,6 +962,9 @@
 msgid ""%s" not found"
 msgstr ""
 
+msgid "Page Name"
+msgstr "Pagina Naam"
+
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
@@ -5850,6 +5822,9 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "Template Name"
+#~ msgstr "Template Naam"
+
 #~ msgid "H"
 #~ msgstr "H"
 
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015年04月10日 14:07:54 UTC (rev 9652)
+++ trunk/locale/po/phpwiki.pot	2015年04月10日 14:34:25 UTC (rev 9653)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
+"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
 "PO-Revision-Date: 2002年12月14日 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -279,50 +279,6 @@
 "have been combined. The result is shown below."
 msgstr ""
 
-msgid "Preview"
-msgstr ""
-
-msgid "Preview the current content [alt-p]"
-msgstr ""
-
-msgid "Save"
-msgstr ""
-
-msgid "Save the current content as wikipage [alt-s]"
-msgstr ""
-
-msgid "Changes"
-msgstr ""
-
-msgid "Preview the current changes as diff [alt-c]"
-msgstr ""
-
-msgid "Upload"
-msgstr ""
-
-msgid "Select a local file and press Upload to attach into this page"
-msgstr ""
-
-msgid "Spell Check"
-msgstr ""
-
-msgid "Check the spelling"
-msgstr ""
-
-#, php-format
-msgid "Author will be logged as %s."
-msgstr ""
-
-msgid "Keep old"
-msgstr ""
-
-msgid "Overwrite with new"
-msgstr ""
-
-#, php-format
-msgid "Merge and Edit: %s"
-msgstr ""
-
 msgid "Undo"
 msgstr ""
 
@@ -354,51 +310,33 @@
 msgid "Close"
 msgstr ""
 
-msgid "Bold text"
+msgid "Save"
 msgstr ""
 
-msgid "Bold text [alt-b]"
+msgid "Preview"
 msgstr ""
 
-msgid "Italic text"
+msgid "Bold text"
 msgstr ""
 
-msgid "Italic text [alt-i]"
+msgid "Italic text"
 msgstr ""
 
 msgid "Strike-through text"
 msgstr ""
 
-msgid "Strike"
-msgstr ""
-
 msgid "Color text"
 msgstr ""
 
-msgid "Color"
-msgstr ""
-
-msgid "PageName|optional label"
-msgstr ""
-
 msgid "Link to page"
 msgstr ""
 
-msgid "http://www.example.com|optional label"
-msgstr ""
-
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
-msgid "Headline text"
-msgstr ""
-
 msgid "Level 1 headline"
 msgstr ""
 
-msgid "Insert non-formatted text here"
-msgstr ""
-
 msgid "Ignore wiki formatting"
 msgstr ""
 
@@ -420,21 +358,12 @@
 msgid "Table of Contents"
 msgstr ""
 
-msgid "Page Name"
-msgstr ""
-
 msgid "Redirect"
 msgstr ""
 
-msgid "Template Name"
-msgstr ""
-
 msgid "Template"
 msgstr ""
 
-msgid "Click a button to get an example text"
-msgstr ""
-
 msgid "Undo Search & Replace"
 msgstr ""
 
@@ -450,13 +379,51 @@
 msgid "Insert PageLink"
 msgstr ""
 
+msgid "Insert Template"
+msgstr ""
+
 msgid "Insert Image or Video"
 msgstr ""
 
-msgid "Insert Template"
+msgid "Preview the current content [alt-p]"
 msgstr ""
 
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
+msgid "Changes"
+msgstr ""
+
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
+msgid "Upload"
+msgstr ""
+
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
+msgid "Spell Check"
+msgstr ""
+
+msgid "Check the spelling"
+msgstr ""
+
 #, php-format
+msgid "Author will be logged as %s."
+msgstr ""
+
+msgid "Keep old"
+msgstr ""
+
+msgid "Overwrite with new"
+msgstr ""
+
+#, php-format
+msgid "Merge and Edit: %s"
+msgstr ""
+
+#, php-format
 msgid "%s: error while handling error:"
 msgstr ""
 
@@ -987,6 +954,9 @@
 msgid ""%s" not found"
 msgstr ""
 
+msgid "Page Name"
+msgstr ""
+
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015年04月10日 14:07:54 UTC (rev 9652)
+++ trunk/locale/po/sv.po	2015年04月10日 14:34:25 UTC (rev 9653)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
+"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -280,50 +280,6 @@
 "have been combined. The result is shown below."
 msgstr ""
 
-msgid "Preview"
-msgstr "Översikt"
-
-msgid "Preview the current content [alt-p]"
-msgstr ""
-
-msgid "Save"
-msgstr "Spara"
-
-msgid "Save the current content as wikipage [alt-s]"
-msgstr ""
-
-msgid "Changes"
-msgstr "Ändringar"
-
-msgid "Preview the current changes as diff [alt-c]"
-msgstr ""
-
-msgid "Upload"
-msgstr ""
-
-msgid "Select a local file and press Upload to attach into this page"
-msgstr ""
-
-msgid "Spell Check"
-msgstr ""
-
-msgid "Check the spelling"
-msgstr ""
-
-#, php-format
-msgid "Author will be logged as %s."
-msgstr ""
-
-msgid "Keep old"
-msgstr ""
-
-msgid "Overwrite with new"
-msgstr ""
-
-#, php-format
-msgid "Merge and Edit: %s"
-msgstr ""
-
 msgid "Undo"
 msgstr ""
 
@@ -355,51 +311,34 @@
 msgid "Close"
 msgstr ""
 
+msgid "Save"
+msgstr "Spara"
+
+msgid "Preview"
+msgstr "Översikt"
+
 msgid "Bold text"
 msgstr ""
 
-msgid "Bold text [alt-b]"
-msgstr ""
-
 msgid "Italic text"
 msgstr ""
 
-msgid "Italic text [alt-i]"
-msgstr ""
-
 msgid "Strike-through text"
 msgstr ""
 
-msgid "Strike"
-msgstr ""
-
 msgid "Color text"
 msgstr ""
 
-msgid "Color"
-msgstr ""
-
-msgid "PageName|optional label"
-msgstr ""
-
+#, fuzzy
 msgid "Link to page"
-msgstr ""
+msgstr "Sök Efter Sida"
 
-msgid "http://www.example.com|optional label"
-msgstr ""
-
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
-msgid "Headline text"
-msgstr ""
-
 msgid "Level 1 headline"
 msgstr ""
 
-msgid "Insert non-formatted text here"
-msgstr ""
-
 msgid "Ignore wiki formatting"
 msgstr ""
 
@@ -421,21 +360,12 @@
 msgid "Table of Contents"
 msgstr "Innehåll"
 
-msgid "Page Name"
-msgstr "Namn på Sidan"
-
 msgid "Redirect"
 msgstr ""
 
-msgid "Template Name"
-msgstr "Namn på Template"
-
 msgid "Template"
 msgstr ""
 
-msgid "Click a button to get an example text"
-msgstr ""
-
 msgid "Undo Search & Replace"
 msgstr ""
 
@@ -451,13 +381,51 @@
 msgid "Insert PageLink"
 msgstr ""
 
+msgid "Insert Template"
+msgstr ""
+
 msgid "Insert Image or Video"
 msgstr ""
 
-msgid "Insert Template"
+msgid "Preview the current content [alt-p]"
 msgstr ""
 
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
+msgid "Changes"
+msgstr "Ändringar"
+
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
+msgid "Upload"
+msgstr ""
+
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
+msgid "Spell Check"
+msgstr ""
+
+msgid "Check the spelling"
+msgstr ""
+
 #, php-format
+msgid "Author will be logged as %s."
+msgstr ""
+
+msgid "Keep old"
+msgstr ""
+
+msgid "Overwrite with new"
+msgstr ""
+
+#, php-format
+msgid "Merge and Edit: %s"
+msgstr ""
+
+#, php-format
 msgid "%s: error while handling error:"
 msgstr ""
 
@@ -988,6 +956,9 @@
 msgid ""%s" not found"
 msgstr ""%s" ingen funna"
 
+msgid "Page Name"
+msgstr "Namn på Sidan"
+
 #, php-format
 msgid "page permission inherited from %s"
 msgstr ""
@@ -5843,6 +5814,9 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "Template Name"
+#~ msgstr "Namn på Template"
+
 #~ msgid "H"
 #~ msgstr "H"
 
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015年04月10日 14:07:54 UTC (rev 9652)
+++ trunk/locale/po/zh.po	2015年04月10日 14:34:25 UTC (rev 9653)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
+"POT-Creation-Date: 2015年04月10日 16:32+0200\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -291,51 +291,6 @@
 "無法儲存你所變更的部份,在你編輯的這段時間,已經有其他作者變更了.所以你所變更的"
 "部份已經和其他作者變更的部份合併.結果顯示在下面."
 
-msgid "Preview"
-msgstr "預覽"
-
-#, fuzzy
-msgid "Preview the current content [alt-p]"
-msgstr "查看目前版本"
-
-msgid "Save"
-msgstr "儲存"
-
-msgid "Save the current content as wikipage [alt-s]"
-msgstr ""
-
-msgid "Changes"
-msgstr ""
-
-msgid "Preview the current changes as diff [alt-c]"
-msgstr ""
-
-msgid "Upload"
-msgstr "上傳"
-
-msgid "Select a local file and press Upload to attach into this page"
-msgstr ""
-
-msgid "Spell Check"
-msgstr ""
-
-msgid "Check the spelling"
-msgstr ""
-
-#, php-format
-msgid "Author will be logged as %s."
-msgstr "作者將登入為 %s."
-
-msgid "Keep old"
-msgstr ""
-
-msgid "Overwrite with new"
-msgstr ""
-
-#, php-format
-msgid "Merge and Edit: %s"
-msgstr "合併並離開: %s"
-
 msgid "Undo"
 msgstr ""
 
@@ -368,53 +323,34 @@
 msgid "Close"
 msgstr ""
 
+msgid "Save"
+msgstr "儲存"
+
+msgid "Preview"
+msgstr "預覽"
+
 msgid "Bold text"
 msgstr ""
 
-msgid "Bold text [alt-b]"
-msgstr ""
-
 msgid "Italic text"
 msgstr ""
 
-msgid "Italic text [alt-i]"
-msgstr ""
-
 msgid "Strike-through text"
 msgstr ""
 
-#, fuzzy
-msgid "Strike"
-msgstr "大小"
-
 msgid "Color text"
 msgstr ""
 
-msgid "Color"
-msgstr ""
-
-msgid "PageName|optional label"
-msgstr ""
-
 #, fuzzy
 msgid "Link to page"
 msgstr "解除鎖定此頁面"
 
-msgid "http://www.example.com|optional label"
-msgstr ""
-
 msgid "External link (remember http:// prefix)"
 msgstr ""
 
-msgid "Headline text"
-msgstr ""
-
 msgid "Level 1 headline"
 msgstr ""
 
-msgid "Insert non-formatted text here"
-msgstr ""
-
 msgid "Ignore wiki formatting"
 msgstr ""
 
@@ -428,8 +364,9 @@
 msgid "Sample table"
 msgstr ""
 
+#, fuzzy
 msgid "Enumeration"
-msgstr ""
+msgstr "相關連結"
 
 #, fuzzy
 msgid "List"
@@ -439,23 +376,13 @@
 msgid "Table of Contents"
 msgstr "目錄"
 
-msgid "Page Name"
-msgstr "頁面名稱"
-
 msgid "Redirect"
 msgstr "重導向"
 
 #, fuzzy
-msgid "Template Name"
-msgstr "佈景主題"
-
-#, fuzzy
 msgid "Template"
 msgstr "佈景主題"
 
-msgid "Click a button to get an example text"
-msgstr ""
-
 #, fuzzy
 msgid "Undo Search & Replace"
 msgstr "搜尋與取代"
@@ -473,14 +400,53 @@
 msgid "Insert PageLink"
 msgstr ""
 
+#, fuzzy
+msgid "Insert Template"
+msgstr "佈景主題"
+
 msgid "Insert Image or Video"
 msgstr ""
 
 #, fuzzy
-msgid "Insert Template"
-msgstr "佈景主題"
+msgid "Preview the current content [alt-p]"
+msgstr "查看目前版本"
 
+msgid "Save the current content as wikipage [alt-s]"
+msgstr ""
+
+msgid "Changes"
+msgstr ""
+
+msgid "Preview the current changes as diff [alt-c]"
+msgstr ""
+
+msgid "Upload"
+msgstr "上傳"
+
+msgid "Select a local file and press Upload to attach into this page"
+msgstr ""
+
+msgid "Spell Check"
+msgstr ""
+
+msgid "Check the spelling"
+msgstr ""
+
 #, php-format
+msgid "Author will be logged as %s."
+msgstr "作者將登入為 %s."
+
+msgid "Keep old"
+msgstr ""
+
+msgid "Overwrite with new"
+msgstr ""
+
+#, php-format
+msgid "Merge and Edit: %s"
+msgstr "合併並離開: %s"
+
+#, php-format
 msgid "%s: error while handling error:"
 msgstr "%s: 處理錯誤時發生錯誤:"
 
@@ -1027,6 +993,9 @@
 msgid ""%s" not found"
 msgstr ""%s" 找不到"
 
+msgid "Page Name"
+msgstr "頁面名稱"
+
 #, php-format
 msgid "page permission inherited from %s"
 msgstr "由 %s 繼承而來的頁面"
@@ -6160,6 +6129,14 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Strike"
+#~ msgstr "大小"
+
+#, fuzzy
+#~ msgid "Template Name"
+#~ msgstr "佈景主題"
+
 #~ msgid "H"
 #~ msgstr "高"
 
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9652
 http://sourceforge.net/p/phpwiki/code/9652
Author: vargenau
Date: 2015年04月10日 14:07:54 +0000 (2015年4月10日)
Log Message:
-----------
New Edit Toolbar
Modified Paths:
--------------
 trunk/lib/editpage.php
 trunk/lib/plugin/WikiBlog.php
 trunk/locale/Makefile
Removed Paths:
-------------
 trunk/lib/EditToolbar.php
Deleted: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2015年04月10日 13:12:21 UTC (rev 9651)
+++ trunk/lib/EditToolbar.php	2015年04月10日 14:07:54 UTC (rev 9652)
@@ -1,509 +0,0 @@
-<?php
-
-/* Copyright 2004-2010 $ThePhpWikiProgrammingTeam
- * Copyright 2008-2009 Marc-Etienne Vargenau, Alcatel-Lucent
- *
- * This file is part of PhpWiki.
- *
- * PhpWiki is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * PhpWiki is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with PhpWiki; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-/**
- * EDIT Toolbar Initialization.
- * The default/themes/toolbar.js is from Mediawiki, this PHP is written from scratch.
- *
- * Features:
- * - save-preview and formatting buttons from mediawiki
- * - Search&Replace from walterzorn.de
- * - pageinsert popup by Reini Urban (TODO: should be a pulldown)
- */
-
-class EditToolbar
-{
- function __construct()
- {
- global $WikiTheme;
- /**
- * @var WikiRequest $request
- */
- global $request;
-
- $this->tokens = array();
-
- //FIXME: enable Undo button for all other buttons also, not only the search/replace button
- if (defined('JS_SEARCHREPLACE') and JS_SEARCHREPLACE) {
- $this->tokens['JS_SEARCHREPLACE'] = 1;
- $undo_btn = $WikiTheme->getImageURL("ed_undo.png");
- $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png");
- // JS_SEARCHREPLACE from walterzorn.de
- $js = Javascript("
-uri_undo_btn = '" . $undo_btn . "'
-msg_undo_alt = '" . _("Undo") . "'
-uri_undo_d_btn = '" . $undo_d_btn . "'
-msg_undo_d_alt = '" . _("Undo disabled") . "'
-msg_do_undo = '" . _("Operation undone") . "'
-msg_replfound = '" . _("Substring "\1円" found \2円 times. Replace with "\3円"?") . "'
-msg_replnot = '" . _("String "%s" not found.") . "'
-msg_repl_title = '" . _("Search & Replace") . "'
-msg_repl_search = '" . _("Search for") . "'
-msg_repl_replace_with = '" . _("Replace with") . "'
-msg_repl_ok = '" . _("OK") . "'
-msg_repl_close = '" . _("Close") . "'
-");
- if (empty($WikiTheme->_headers_printed)) {
- $WikiTheme->addMoreHeaders($js);
- $WikiTheme->addMoreAttr('body', "SearchReplace", " onload='define_f()'");
- } else { // from an actionpage: WikiBlog, AddComment, WikiForum
- printXML($js);
- }
- } else {
- $WikiTheme->addMoreAttr('body', "editfocus", "document.getElementById('edit-content]').editarea.focus()");
- }
-
- if (defined('ENABLE_EDIT_TOOLBAR') and ENABLE_EDIT_TOOLBAR) {
- $init = JavaScript("var data_path = '" . javascript_quote_string(DATA_PATH) . "';\n");
- $js = JavaScript('', array('src' => $WikiTheme->_findData("toolbar.js")));
- if (empty($WikiTheme->_headers_printed)) {
- $WikiTheme->addMoreHeaders($init);
- $WikiTheme->addMoreHeaders($js);
- } else { // from an actionpage: WikiBlog, AddComment, WikiForum
- printXML($init);
- printXML($js);
- printXML(JavaScript('define_f()'));
- }
- }
-
- require_once 'lib/WikiPluginCached.php';
- $cache = WikiPluginCached::newCache();
- $dbi = $request->getDbh();
- // regenerate if number of pages changes (categories, pages, templates, images uploaded)
- $key = $dbi->numPages();
- $key .= '+categories+plugin' . (isBrowserSafari() ? '+safari' : '');
- if (defined('TOOLBAR_PAGELINK_PULLDOWN') and TOOLBAR_PAGELINK_PULLDOWN) {
- $key .= "+pages";
- }
- if (defined('TOOLBAR_TEMPLATE_PULLDOWN') and TOOLBAR_TEMPLATE_PULLDOWN) {
- $key .= "+templates_" . $dbi->getTimestamp();
- }
- if (defined('TOOLBAR_IMAGE_PULLDOWN') and TOOLBAR_IMAGE_PULLDOWN) {
- if (file_exists(getUploadFilePath())) {
- $key .= "+images_" . filemtime(getUploadFilePath());
- }
- }
- $id = $cache->generateId($key);
- $content = $cache->get($id, 'toolbarcache');
-
- if (!empty($content)) {
- $this->tokens['EDIT_TOOLBAR'] =& $content;
- } else {
- $content = $this->_generate();
- // regenerate buttons every 1 hr/6 hrs
- $cache->save($id, $content, DEBUG ? '+3600' : '+21600', 'toolbarcache');
- $this->tokens['EDIT_TOOLBAR'] =& $content;
- }
- }
-
- public function getTokens()
- {
- return $this->tokens;
- }
-
- private function _generate()
- {
- global $WikiTheme, $request;
-
- $toolbar = "document.writeln(\"<div class=\\\"edit-toolbar\\\" id=\\\"toolbar\\\">\");\n";
-
- if (defined('ENABLE_EDIT_TOOLBAR') and ENABLE_EDIT_TOOLBAR) {
- $username = $request->_user->UserName();
- if ((defined('FUSIONFORGE') && FUSIONFORGE) or DISABLE_MARKUP_WIKIWORD or (!isWikiWord($username))) {
- $username = '[[' . $username . ']]';
- }
- $signature = " ––" . $username . " " . CTime();
- $toolarray = array(
- array(
- "image" => "ed_format_bold.png",
- "open" => "**",
- "close" => "**",
- "sample" => _("Bold text"),
- "title" => _("Bold text [alt-b]")),
- array("image" => "ed_format_italic.png",
- "open" => "//",
- "close" => "//",
- "sample" => _("Italic text"),
- "title" => _("Italic text [alt-i]")),
- array("image" => "ed_format_strike.png",
- "open" => "<s>",
- "close" => "</s>",
- "sample" => _("Strike-through text"),
- "title" => _("Strike")),
- array("image" => "ed_format_color.png",
- "open" => "%color=green% ",
- "close" => " %%",
- "sample" => _("Color text"),
- "title" => _("Color")),
- array("image" => "ed_pagelink.png",
- "open" => "[[",
- "close" => "]]",
- "sample" => _("PageName|optional label"),
- "title" => _("Link to page")),
- array("image" => "ed_link.png",
- "open" => "[[",
- "close" => "]]",
- "sample" => _("http://www.example.com|optional label"),
- "title" => _("External link (remember http:// prefix)")),
- array("image" => "ed_headline.png",
- "open" => "\\n== ",
- "close" => " ==\\n",
- "sample" => _("Headline text"),
- "title" => _("Level 1 headline")),
- array("image" => "ed_nowiki.png",
- "open" => "\\<verbatim\\>\\n",
- "close" => "\\n\\</verbatim\\>",
- "sample" => _("Insert non-formatted text here"),
- "title" => _("Ignore wiki formatting")),
- array("image" => "ed_sig.png",
- "open" => $signature,
- "close" => "",
- "sample" => "",
- "title" => _("Your signature")),
- array("image" => "ed_hr.png",
- "open" => "\\n----\\n",
- "close" => "",
- "sample" => "",
- "title" => _("Horizontal line")),
- array("image" => "ed_table.png",
- "open" => "\\n{| class=\"bordered\"\\n|+ This is the table caption\\n|-\\n! Header A !! Header B !! Header C\\n|-\\n| Cell A1 || Cell B1 || Cell C1\\n|-\\n| Cell A2 || Cell B2 || Cell C2\\n|-\\n| Cell A3 || Cell B3 || Cell C3\\n|}\\n",
- "close" => "",
- "sample" => "",
- "title" => _("Sample table")),
- array("image" => "ed_enumlist.png",
- "open" => "\\n# Item 1\\n# Item 2\\n# Item 3\\n",
- "close" => "",
- "sample" => "",
- "title" => _("Enumeration")),
- array("image" => "ed_list.png",
- "open" => "\\n* Item 1\\n* Item 2\\n* Item 3\\n",
- "close" => "",
- "sample" => "",
- "title" => _("List")),
- array("image" => "ed_toc.png",
- "open" => "<<CreateToc with_toclink||=1>>\\n",
- "close" => "",
- "sample" => "",
- "title" => _("Table of Contents")),
- array("image" => "ed_redirect.png",
- "open" => "<<RedirectTo page=\"",
- "close" => "\">>",
- "sample" => _("Page Name"),
- "title" => _("Redirect")),
- array("image" => "ed_templateplugin.png",
- "open" => "{{",
- "close" => "}}",
- "sample" => _("Template Name"),
- "title" => _("Template"))
- );
- $btn = new SubmitImageButton(_("Save"), "edit[save]", 'toolbar',
- $WikiTheme->getImageURL("ed_save.png"));
- $btn->addTooltip(_("Save"));
- $btn->setAccesskey("s");
- $toolbar .= ('document.writeln("' . addslashes($btn->asXml()) . '");' . "\n");
- // preview not supported yet on Wikiblog
- if (empty($WikiTheme->_headers_printed)) {
- $btn = new SubmitImageButton(_("Preview"), "edit[preview]", 'toolbar',
- $WikiTheme->getImageURL("ed_preview.png"));
- $btn->addTooltip(_("Preview"));
- $btn->setAccesskey("p");
- $toolbar .= ('document.writeln("' . addslashes($btn->asXml()) . '");' . "\n");
- }
-
- foreach ($toolarray as $tool) {
- $image = $WikiTheme->getImageURL($tool["image"]);
- $open = $tool["open"];
- $close = $tool["close"];
- $sample = addslashes($tool["sample"]);
- // Note that we use the title both for the ALT tag and the TITLE tag of the image.
- // Older browsers show a "speedtip" type message only for ALT.
- // Ideally these should be different, realistically they
- // probably don't need to be.
- $tool = $WikiTheme->fixAccesskey($tool);
- $title = addslashes($tool["title"]);
- $toolbar .= ("addTagButton('$image','$title','$open','$close','$sample');\n");
- }
- /* Fails with Chrome */
- if (!isBrowserSafari()) {
- $toolbar .= ("addInfobox('"
- . addslashes(_("Click a button to get an example text"))
- . "');\n");
- }
- }
-
- if (defined('JS_SEARCHREPLACE') and JS_SEARCHREPLACE) {
- $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png");
- $sr_btn = $WikiTheme->getImageURL("ed_replace.png");
- //TODO: generalize the UNDO button and fix it for Search & Replace
- $sr_html = HTML(HTML::img
- (array('class' => "toolbar",
- 'id' => "sr_undo",
- 'src' => $undo_d_btn,
- 'title' => _("Undo Search & Replace"),
- 'alt' => _("Undo Search & Replace"),
- 'onclick' => "do_undo()")),
- HTML::img
- (array('class' => "toolbar",
- 'src' => $sr_btn,
- 'alt' => _("Search & Replace"),
- 'title' => _("Search & Replace"),
- 'onclick' => "replace()")));
- } else {
- $sr_html = '';
- }
-
- //TODO: Delegate this to run-time with showing an hidden input at the right
-
- // Button to generate categories, display in extra window as popup and insert
- $sr_html = HTML($sr_html, $this->categoriesPulldown());
- // Button to generate plugins, display in extra window as popup and insert
- $sr_html = HTML($sr_html, $this->pluginPulldown());
-
- // Button to generate pagenames, display in extra window as popup and insert
- if (defined('TOOLBAR_PAGELINK_PULLDOWN') and TOOLBAR_PAGELINK_PULLDOWN)
- $sr_html = HTML($sr_html, $this->pagesPulldown(TOOLBAR_PAGELINK_PULLDOWN));
- // Button to insert from an template, display pagename in extra window as popup and insert
- if (defined('TOOLBAR_TEMPLATE_PULLDOWN') and TOOLBAR_TEMPLATE_PULLDOWN)
- $sr_html = HTML($sr_html, $this->templatePulldown(TOOLBAR_TEMPLATE_PULLDOWN));
-
- // Button to add images, display in extra window as popup and insert
- if (defined('TOOLBAR_IMAGE_PULLDOWN') and TOOLBAR_IMAGE_PULLDOWN)
- $sr_html = HTML($sr_html, $this->imagePulldown());
-
- // don't use document.write for replace, otherwise self.opener is not defined.
- $toolbar_end = "document.writeln(\"</div>\");";
- if ($sr_html)
- return HTML(Javascript($toolbar),
- "\n", $sr_html, "\n",
- Javascript($toolbar_end));
- else
- return HTML(Javascript($toolbar . $toolbar_end));
- }
-
- //result is cached
- private function categoriesPulldown()
- {
- /**
- * @var WikiRequest $request
- */
- global $request;
- global $WikiTheme;
-
- require_once 'lib/TextSearchQuery.php';
- $dbi =& $request->_dbi;
- // KEYWORDS formerly known as $KeywordLinkRegexp
- $pages = $dbi->titleSearch(new TextSearchQuery(KEYWORDS, true));
- if ($pages) {
- $categories = array();
- while ($p = $pages->next()) {
- $page = $p->getName();
- if ((defined('FUSIONFORGE') && FUSIONFORGE)) {
- $categories[] = "['$page', '%0A----%0A%5B%5B" . $page . "%5D%5D']";
- } elseif (DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page))) {
- $categories[] = "['$page', '%0A%5B" . $page . "%5D']";
- } else {
- $categories[] = "['$page', '%0A" . $page . "']";
- }
- }
- if (!$categories) return '';
- // Ensure this to be inserted at the very end. Hence we added the id to the function.
- $more_buttons = HTML::img(array('class' => "toolbar",
- 'id' => 'tb-categories',
- 'src' => $WikiTheme->getImageURL("ed_category.png"),
- 'title' => _("Insert Categories"),
- 'alt' => "Insert Categories", // to detect this at js
- 'onclick' => "showPulldown('" .
- _("Insert Categories")
- . "',[" . join(",", $categories) . "],'"
- . _("Insert") . "','"
- . _("Close") . "','tb-categories')"));
- return HTML("\n", $more_buttons);
- }
- return '';
- }
-
- // result is cached. Esp. the args are expensive
- private function pluginPulldown()
- {
- global $WikiTheme;
- global $AllAllowedPlugins;
-
- $plugin_dir = 'lib/plugin';
- if (defined('PHPWIKI_DIR'))
- $plugin_dir = PHPWIKI_DIR . "/$plugin_dir";
- $pd = new fileSet($plugin_dir, '*.php');
- $plugins = $pd->getFiles();
- unset($pd);
- sort($plugins);
- if (!empty($plugins)) {
- $plugin_js = '';
- require_once 'lib/WikiPlugin.php';
- $w = new WikiPluginLoader();
- foreach ($plugins as $plugin) {
- $pluginName = str_replace(".php", "", $plugin);
- if (in_array($pluginName, $AllAllowedPlugins)) {
- $p = $w->getPlugin($pluginName, false); // second arg?
- // trap php files which aren't WikiPlugin~s
- if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
- $plugin_args = '';
- $desc = $p->getArgumentsDescription();
- $src = array("\n", '"', "'", '|', '[', ']', '\\');
- $replace = array('%0A', '%22', '%27', '%7C', '%5B', '%5D', '%5C');
- $desc = str_replace("<br />", ' ', $desc->asXML());
- if ($desc)
- $plugin_args = ' ' . str_replace($src, $replace, $desc);
- $toinsert = "%0A<<" . $pluginName . $plugin_args . ">>"; // args?
- $plugin_js .= ",['$pluginName','$toinsert']";
- }
- }
- }
- $plugin_js = substr($plugin_js, 1);
- $more_buttons = HTML::img(array('class' => "toolbar",
- 'id' => 'tb-plugins',
- 'src' => $WikiTheme->getImageURL("ed_plugins.png"),
- 'title' => _("Insert Plugin"),
- 'alt' => _("Insert Plugin"),
- 'onclick' => "showPulldown('" .
- _("Insert Plugin")
- . "',[" . $plugin_js . "],'"
- . _("Insert") . "','"
- . _("Close") . "','tb-plugins')"));
- return HTML("\n", $more_buttons);
- }
- return '';
- }
-
- // result is cached. Esp. the args are expensive
- private function pagesPulldown($query, $case_exact = false, $regex = 'auto')
- {
- /**
- * @var WikiRequest $request
- */
- global $request;
-
- require_once 'lib/TextSearchQuery.php';
- $dbi =& $request->_dbi;
- $page_iter = $dbi->titleSearch(new TextSearchQuery($query, $case_exact, $regex));
- if ($page_iter->count() > 0) {
- global $WikiTheme;
- $pages = array();
- while ($p = $page_iter->next()) {
- $page = $p->getName();
- if (defined('DISABLE_MARKUP_WIKIWORD') and DISABLE_MARKUP_WIKIWORD or (!isWikiWord($page)))
- $pages[] = "['$page', '%5B" . $page . "%5D']";
- else
- $pages[] = "['$page', '$page']";
- }
- return HTML("\n", HTML::img(array('class' => "toolbar",
- 'id' => 'tb-pages',
- 'src' => $WikiTheme->getImageURL("ed_pages.png"),
- 'title' => _("Insert PageLink"),
- 'alt' => _("Insert PageLink"),
- 'onclick' => "showPulldown('" .
- _("Insert PageLink")
- . "',[" . join(",", $pages) . "],'"
- . _("Insert") . "','"
- . _("Close") . "','tb-pages')")));
- }
- return '';
- }
-
- // result is cached. Esp. the args are expensive
- private function imagePulldown()
- {
- global $WikiTheme, $request;
-
- $image_dir = getUploadFilePath();
- $pd = new imageOrVideoSet($image_dir, '*');
- $images = $pd->getFiles();
- unset($pd);
- if (defined('UPLOAD_USERDIR') and UPLOAD_USERDIR) {
- $image_dir .= "/" . $request->_user->_userid;
- $pd = new imageOrVideoSet($image_dir, '*');
- $images = array_merge($images, $pd->getFiles());
- unset($pd);
- }
- sort($images);
- if (!empty($images)) {
- $image_js = '';
- foreach ($images as $image) {
- $image_js .= ",['$image','{{" . $image . "}}']";
- }
- $image_js = substr($image_js, 1);
- $more_buttons = HTML::img(array('class' => "toolbar",
- 'id' => 'tb-images',
- 'src' => $WikiTheme->getImageURL("ed_image.png"),
- 'title' => _("Insert Image or Video"),
- 'alt' => _("Insert Image or Video"),
- 'onclick' => "showPulldown('" .
- _("Insert Image or Video")
- . "',[" . $image_js . "],'"
- . _("Insert") . "','"
- . _("Close") . "','tb-images')"));
- return HTML("\n", $more_buttons);
- }
- return '';
- }
-
- // result is cached. Esp. the args are expensive
- // FIXME!
- private function templatePulldown($query, $case_exact = false, $regex = 'auto')
- {
- global $request;
- require_once 'lib/TextSearchQuery.php';
- $dbi =& $request->_dbi;
- $page_iter = $dbi->titleSearch(new TextSearchQuery($query, $case_exact, $regex));
- if ($page_iter->count()) {
- global $WikiTheme;
- $pages_js = '';
- while ($p = $page_iter->next()) {
- $rev = $p->getCurrentRevision();
- $toinsert = str_replace(array("\n", '"'), array('_nl', '_quot'), $rev->_get_content());
- //$toinsert = str_replace("\n",'\n',addslashes($rev->_get_content()));
- $pages_js .= ",['" . $p->getName() . "','_nl$toinsert']";
- }
- $pages_js = substr($pages_js, 1);
- if (!empty($pages_js))
- return HTML("\n", HTML::img
- (array('class' => "toolbar",
- 'id' => 'tb-templates',
- 'src' => $WikiTheme->getImageURL("ed_template.png"),
- 'title' => _("Insert Template"),
- 'alt' => _("Insert Template"),
- 'onclick' => "showPulldown('" .
- _("Insert Template")
- . "',[" . $pages_js . "],'"
- . _("Insert") . "','"
- . _("Close") . "','tb-templates')")));
- }
- return '';
- }
-
-}
-
-// Local Variables:
-// mode: php
-// tab-width: 8
-// c-basic-offset: 4
-// c-hanging-comment-ender-p: nil
-// indent-tabs-mode: nil
-// End:
Modified: trunk/lib/editpage.php
===================================================================
--- trunk/lib/editpage.php	2015年04月10日 13:12:21 UTC (rev 9651)
+++ trunk/lib/editpage.php	2015年04月10日 14:07:54 UTC (rev 9652)
@@ -16,7 +16,6 @@
 public $public;
 public $external;
 public $_currentVersion;
-
 /**
 * @var UserPreferences $_prefs
 */
@@ -199,14 +198,6 @@
 // FIXME: NOT_CURRENT_MESSAGE?
 $tokens = array_merge($tokens, $this->getFormElements());
 
- if (ENABLE_EDIT_TOOLBAR and !ENABLE_WYSIWYG) {
- require_once 'lib/EditToolbar.php';
- $toolbar = new EditToolbar();
- $tokens = array_merge($tokens, $toolbar->getTokens());
- } else {
- $tokens['EDIT_TOOLBAR'] = '';
- }
-
 return $this->output('editpage', _("Edit: %s"));
 }
 
@@ -610,6 +601,8 @@
 
 private function getTextArea()
 {
+ global $WikiTheme;
+
 $request = &$this->request;
 
 $readonly = !$this->canEdit(); // || $this->isConcurrentUpdate();
@@ -629,13 +622,357 @@
 'cols' => $request->getPref('editWidth'),
 'readonly' => (bool)$readonly),
 $this->_content);
+
+ if (defined('JS_SEARCHREPLACE') and JS_SEARCHREPLACE) {
+ $this->tokens['JS_SEARCHREPLACE'] = 1;
+ $undo_btn = $WikiTheme->getImageURL("ed_undo.png");
+ $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png");
+ // JS_SEARCHREPLACE from walterzorn.de
+ $js = Javascript("
+uri_undo_btn = '" . $undo_btn . "'
+msg_undo_alt = '" . _("Undo") . "'
+uri_undo_d_btn = '" . $undo_d_btn . "'
+msg_undo_d_alt = '" . _("Undo disabled") . "'
+msg_do_undo = '" . _("Operation undone") . "'
+msg_replfound = '" . _("Substring "\1円" found \2円 times. Replace with "\3円"?") . "'
+msg_replnot = '" . _("String "%s" not found.") . "'
+msg_repl_title = '" . _("Search & Replace") . "'
+msg_repl_search = '" . _("Search for") . "'
+msg_repl_replace_with = '" . _("Replace with") . "'
+msg_repl_ok = '" . _("OK") . "'
+msg_repl_close = '" . _("Close") . "'
+");
+ if (empty($WikiTheme->_headers_printed)) {
+ $WikiTheme->addMoreHeaders($js);
+ $WikiTheme->addMoreAttr('body', "SearchReplace", " onload='define_f()'");
+ } else { // from an actionpage: WikiBlog, AddComment, WikiForum
+ printXML($js);
+ }
+ } else {
+ $WikiTheme->addMoreAttr('body', "editfocus", "document.getElementById('edit-content]').editarea.focus()");
+ }
+
 if (defined('ENABLE_WYSIWYG') and ENABLE_WYSIWYG) {
 return $this->WysiwygEdit->Textarea($textarea, $this->_wikicontent,
 $textarea->getAttr('name'));
- } else
+ } elseif (defined('ENABLE_EDIT_TOOLBAR') and ENABLE_EDIT_TOOLBAR) {
+ $init = JavaScript("var data_path = '" . javascript_quote_string(DATA_PATH) . "';\n");
+ $js = JavaScript('', array('src' => $WikiTheme->_findData("toolbar.js")));
+ if (empty($WikiTheme->_headers_printed)) {
+ $WikiTheme->addMoreHeaders($init);
+ $WikiTheme->addMoreHeaders($js);
+ } else { // from an actionpage: WikiBlog, AddComment, WikiForum
+ printXML($init);
+ printXML($js);
+ printXML(JavaScript('define_f()'));
+ }
+ $toolbar = HTML::div(array('class' => 'edit-toolbar', 'id' => 'toolbar'));
+ $toolbar->pushContent(HTML::input(array('src' => $WikiTheme->getImageURL("ed_save.png"),
+ 'alt' => 'Save',
+ 'name' => 'edit[save]',
+ 'class' => 'toolbar',
+ 'title' => 'Save',
+ 'type' => 'image')));
+ $toolbar->pushContent(HTML::input(array('src' => $WikiTheme->getImageURL("ed_preview.png"),
+ 'alt' => 'Preview',
+ 'name' => 'edit[preview]',
+ 'class' => 'toolbar',
+ 'title' => 'Preview',
+ 'type' => 'image')));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_format_bold.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Bold text',
+ 'title' => 'Bold text',
+ 'onclick' => "insertTags('**','**','Bold text'); return true;")));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_format_italic.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Italic text',
+ 'title' => 'Italic text',
+ 'onclick' => "insertTags('//','//','Italic text'); return true;")));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_format_strike.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Strike',
+ 'title' => 'Strike',
+ 'onclick' => "insertTags('<s>','</s>','Strike-through text'); return true;")));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_format_color.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Color',
+ 'title' => 'Color',
+ 'onclick' => "insertTags('%color=green%','%%','Color text'); return true;")));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_pagelink.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Link to page',
+ 'title' => 'Link to page',
+ 'onclick' => "insertTags('[[',']]','PageName|optional label'); return true;")));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_link.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'External link (remember http:// prefix)',
+ 'title' => 'External link (remember http:// prefix)',
+ 'onclick' => "insertTags('[[',']]','http://www.example.com|optional label'); return true;")));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_headline.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Level 1 headline',
+ 'title' => 'Level 1 headline',
+ 'onclick' => 'insertTags("\n==","==\n","Headline text"); return true;')));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_nowiki.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Ignore wiki formatting',
+ 'title' => 'Ignore wiki formatting',
+ 'onclick' => 'insertTags("<verbatim>\n","\n</verbatim>","Insert non-formatted text here"); return true;')));
+ global $request;
+ $username = $request->_user->UserName();
+ $signature = " ––[[" . $username . "]] " . CTime() . '\n';
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_sig.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Your signature',
+ 'title' => 'Your signature',
+ 'onclick' => "insertTags('".$signature."','',''); return true;")));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_hr.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Horizontal line',
+ 'title' => 'Horizontal line',
+ 'onclick' => 'insertTags("\n----\n","",""); return true;')));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_table.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Sample table',
+ 'title' => 'Sample table',
+ 'onclick' => 'insertTags("\n{| class=\"bordered\"\n|+ This is the table caption\n|-\n! Header A !! Header B !! Header C\n|-\n| Cell A1 || Cell B1 || Cell C1\n|-\n| Cell A2 || Cell B2 || Cell C2\n|-\n| Cell A3 || Cell B3 || Cell C3\n|}\n","",""); return true;')));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_enumlist.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Enumeration',
+ 'title' => 'Enumeration',
+ 'onclick' => 'insertTags("\n# Item 1\n# Item 2\n# Item 3\n","",""); return true;')));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_list.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'List',
+ 'title' => 'List',
+ 'onclick' => 'insertTags("\n* Item 1\n* Item 2\n* Item 3\n","",""); return true;')));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_toc.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Table of Contents',
+ 'title' => 'Table of Contents',
+ 'onclick' => 'insertTags("<<CreateToc with_toclink||=1>>\n","",""); return true;')));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_redirect.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Redirect',
+ 'title' => 'Redirect',
+ 'onclick' => "insertTags('<<RedirectTo page=&quot;','&quot;>>','Page Name'); return true;")));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_templateplugin.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Template',
+ 'title' => 'Template',
+ 'onclick' => "insertTags('{{','}}','Template Name'); return true;")));
+ $toolbar->pushContent($this->categoriesPulldown());
+ $toolbar->pushContent($this->pluginPulldown());
+ if (defined('TOOLBAR_PAGELINK_PULLDOWN') and TOOLBAR_PAGELINK_PULLDOWN) {
+ $toolbar->pushContent($this->pagesPulldown(TOOLBAR_PAGELINK_PULLDOWN));
+ }
+ if (defined('TOOLBAR_TEMPLATE_PULLDOWN') and TOOLBAR_TEMPLATE_PULLDOWN) {
+ $toolbar->pushContent($this->templatePulldown(TOOLBAR_TEMPLATE_PULLDOWN));
+ }
+ if (defined('TOOLBAR_IMAGE_PULLDOWN') and TOOLBAR_IMAGE_PULLDOWN) {
+ $toolbar->pushContent($this->imagePulldown());
+ }
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_replace.png"),
+ 'class' => 'toolbar',
+ 'alt' => 'Search & Replace',
+ 'title' => 'Search & Replace',
+ 'onclick' => "replace();")));
+ $toolbar->pushContent(HTML::img(array('src' => $WikiTheme->getImageURL("ed_undo_d.png"),
+ 'class' => 'toolbar',
+ 'id' => 'sr_undo',
+ 'alt' => 'Undo Search & Replace',
+ 'title' => 'Undo Search & Replace',
+ 'onclick' => "do_undo();")));
+ return HTML($toolbar, $textarea);
+ } else {
 return $textarea;
+ }
 }
 
+ private function categoriesPulldown()
+ {
+ /**
+ * @var WikiRequest $request
+ */
+ global $request;
+ global $WikiTheme;
+
+ require_once 'lib/TextSearchQuery.php';
+ $dbi =& $request->_dbi;
+ // KEYWORDS formerly known as $KeywordLinkRegexp
+ $pages = $dbi->titleSearch(new TextSearchQuery(KEYWORDS, true));
+ if ($pages) {
+ $categories = array();
+ while ($p = $pages->next()) {
+ $page = $p->getName();
+ $categories[] = "['$page', '%0A----%0A%5B%5B" . $page . "%5D%5D']";
+ }
+ if (!$categories) return '';
+ // Ensure this to be inserted at the very end. Hence we added the id to the function.
+ $more_buttons = HTML::img(array('class' => "toolbar",
+ 'id' => 'tb-categories',
+ 'src' => $WikiTheme->getImageURL("ed_category.png"),
+ 'title' => _("Insert Categories"),
+ 'alt' => "Insert Categories", // to detect this at js
+ 'onclick' => "showPulldown('" .
+ _("Insert Categories")
+ . "',[" . join(",", $categories) . "],'"
+ . _("Insert") . "','"
+ . _("Close") . "','tb-categories')"));
+ return $more_buttons;
+ }
+ return '';
+ }
+
+ private function pluginPulldown()
+ {
+ global $WikiTheme;
+ global $AllAllowedPlugins;
+
+ $plugin_dir = 'lib/plugin';
+ if (defined('PHPWIKI_DIR'))
+ $plugin_dir = PHPWIKI_DIR . "/$plugin_dir";
+ $pd = new fileSet($plugin_dir, '*.php');
+ $plugins = $pd->getFiles();
+ unset($pd);
+ sort($plugins);
+ if (!empty($plugins)) {
+ $plugin_js = '';
+ require_once 'lib/WikiPlugin.php';
+ $w = new WikiPluginLoader();
+ foreach ($plugins as $plugin) {
+ $pluginName = str_replace(".php", "", $plugin);
+ if (in_array($pluginName, $AllAllowedPlugins)) {
+ $p = $w->getPlugin($pluginName, false); // second arg?
+ // trap php files which aren't WikiPlugin~s
+ if (strtolower(substr(get_parent_class($p), 0, 10)) == 'wikiplugin') {
+ $plugin_args = '';
+ $desc = $p->getArgumentsDescription();
+ $src = array("\n", '"', "'", '|', '[', ']', '\\');
+ $replace = array('%0A', '%22', '%27', '%7C', '%5B', '%5D', '%5C');
+ $desc = str_replace("<br />", ' ', $desc->asXML());
+ if ($desc)
+ $plugin_args = ' ' . str_replace($src, $replace, $desc);
+ $toinsert = "%0A<<" . $pluginName . $plugin_args . ">>"; // args?
+ $plugin_js .= ",['$pluginName','$toinsert']";
+ }
+ }
+ }
+ $plugin_js = substr($plugin_js, 1);
+ $more_buttons = HTML::img(array('class' => "toolbar",
+ 'id' => 'tb-plugins',
+ 'src' => $WikiTheme->getImageURL("ed_plugins.png"),
+ 'title' => _("Insert Plugin"),
+ 'alt' => _("Insert Plugin"),
+ 'onclick' => "showPulldown('" .
+ _("Insert Plugin")
+ . "',[" . $plugin_js . "],'"
+ . _("Insert") . "','"
+ . _("Close") . "','tb-plugins')"));
+ return $more_buttons;
+ }
+ return '';
+ }
+
+ private function pagesPulldown($query)
+ {
+ /**
+ * @var WikiRequest $request
+ */
+ global $request;
+
+ require_once 'lib/TextSearchQuery.php';
+ $dbi =& $request->_dbi;
+ $page_iter = $dbi->titleSearch(new TextSearchQuery($query, false, 'auto'));
+ if ($page_iter->count() > 0) {
+ global $WikiTheme;
+ $pages = array();
+ while ($p = $page_iter->next()) {
+ $page = $p->getName();
+ $pages[] = "['$page', '%5B%5B" . $page . "%5D%5D']";
+ }
+ return HTML::img(array('class' => "toolbar",
+ 'id' => 'tb-pages',
+ 'src' => $WikiTheme->getImageURL("ed_pages.png"),
+ 'title' => _("Insert PageLink"),
+ 'alt' => _("Insert PageLink"),
+ 'onclick' => "showPulldown('" .
+ _("Insert PageLink")
+ . "',[" . join(",", $pages) . "],'"
+ . _("Insert") . "','"
+ . _("Close") . "','tb-pages')"));
+ }
+ return '';
+ }
+
+ private function templatePulldown($query)
+ {
+ global $request;
+ require_once 'lib/TextSearchQuery.php';
+ $dbi =& $request->_dbi;
+ $page_iter = $dbi->titleSearch(new TextSearchQuery($query, false, 'auto'));
+ if ($page_iter->count()) {
+ global $WikiTheme;
+ $pages_js = '';
+ while ($p = $page_iter->next()) {
+ $rev = $p->getCurrentRevision();
+ $toinsert = str_replace(array("\n", '"'), array('_nl', '_quot'), $rev->_get_content());
+ $pages_js .= ",['" . $p->getName() . "','_nl$toinsert']";
+ }
+ $pages_js = substr($pages_js, 1);
+ if (!empty($pages_js))
+ return HTML::img
+ (array('class' => "toolbar",
+ 'id' => 'tb-templates',
+ 'src' => $WikiTheme->getImageURL("ed_template.png"),
+ 'title' => _("Insert Template"),
+ 'alt' => _("Insert Template"),
+ 'onclick' => "showPulldown('" .
+ _("Insert Template")
+ . "',[" . $pages_js . "],'"
+ . _("Insert") . "','"
+ . _("Close") . "','tb-templates')"));
+ }
+ return '';
+ }
+
+ private function imagePulldown()
+ {
+ global $WikiTheme, $request;
+
+ $image_dir = getUploadFilePath();
+ $pd = new imageOrVideoSet($image_dir, '*');
+ $images = $pd->getFiles();
+ unset($pd);
+ if (defined('UPLOAD_USERDIR') and UPLOAD_USERDIR) {
+ $image_dir .= "/" . $request->_user->_userid;
+ $pd = new imageOrVideoSet($image_dir, '*');
+ $images = array_merge($images, $pd->getFiles());
+ unset($pd);
+ }
+ sort($images);
+ if (!empty($images)) {
+ $image_js = '';
+ foreach ($images as $image) {
+ $image_js .= ",['$image','{{" . $image . "}}']";
+ }
+ $image_js = substr($image_js, 1);
+ $more_buttons = HTML::img(array('class' => "toolbar",
+ 'id' => 'tb-images',
+ 'src' => $WikiTheme->getImageURL("ed_image.png"),
+ 'title' => _("Insert Image or Video"),
+ 'alt' => _("Insert Image or Video"),
+ 'onclick' => "showPulldown('" .
+ _("Insert Image or Video")
+ . "',[" . $image_js . "],'"
+ . _("Insert") . "','"
+ . _("Close") . "','tb-images')"));
+ return $more_buttons;
+ }
+ return '';
+ }
+
 protected function getFormElements()
 {
 global $WikiTheme;
@@ -896,12 +1233,6 @@
 $tokens['SEP'],
 $tokens['PREVIEW_B']);
 }
- if (ENABLE_EDIT_TOOLBAR and !ENABLE_WYSIWYG) {
- include_once 'lib/EditToolbar.php';
- $toolbar = new EditToolbar();
- $tokens = array_merge($tokens, $toolbar->getTokens());
- }
-
 return $this->output('editpage', _("Merge and Edit: %s"));
 }
 
Modified: trunk/lib/plugin/WikiBlog.php
===================================================================
--- trunk/lib/plugin/WikiBlog.php	2015年04月10日 13:12:21 UTC (rev 9651)
+++ trunk/lib/plugin/WikiBlog.php	2015年04月10日 14:07:54 UTC (rev 9652)
@@ -383,11 +383,6 @@
 $args = array('PAGENAME' => $args['pagename'],
 'HIDDEN_INPUTS' =>
 HiddenInputs($request->getArgs()));
- if (ENABLE_EDIT_TOOLBAR and !ENABLE_WYSIWYG and ($template != 'addcomment')) {
- include_once 'lib/EditToolbar.php';
- $toolbar = new EditToolbar();
- $args = array_merge($args, $toolbar->getTokens());
- }
 return new Template($template, $request, $args);
 }
 
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2015年04月10日 13:12:21 UTC (rev 9651)
+++ trunk/locale/Makefile	2015年04月10日 14:07:54 UTC (rev 9652)
@@ -95,7 +95,6 @@
 ${POT_FILE}: .././lib/diff.php
 ${POT_FILE}: .././lib/display.php
 ${POT_FILE}: .././lib/editpage.php
-${POT_FILE}: .././lib/EditToolbar.php
 ${POT_FILE}: .././lib/ErrorManager.php
 ${POT_FILE}: .././lib/ExternalReferrer.php
 ${POT_FILE}: .././lib/FileFinder.php
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9651
 http://sourceforge.net/p/phpwiki/code/9651
Author: vargenau
Date: 2015年04月10日 13:12:21 +0000 (2015年4月10日)
Log Message:
-----------
Update translations
Modified Paths:
--------------
 trunk/locale/Makefile
 trunk/locale/de/LC_MESSAGES/phpwiki.mo
 trunk/locale/es/LC_MESSAGES/phpwiki.mo
 trunk/locale/fr/LC_MESSAGES/phpwiki.mo
 trunk/locale/it/LC_MESSAGES/phpwiki.mo
 trunk/locale/ja/LC_MESSAGES/phpwiki.mo
 trunk/locale/nl/LC_MESSAGES/phpwiki.mo
 trunk/locale/po/de.po
 trunk/locale/po/es.po
 trunk/locale/po/fr.po
 trunk/locale/po/it.po
 trunk/locale/po/ja.po
 trunk/locale/po/nl.po
 trunk/locale/po/phpwiki.pot
 trunk/locale/po/sv.po
 trunk/locale/po/zh.po
 trunk/locale/sv/LC_MESSAGES/phpwiki.mo
 trunk/locale/zh/LC_MESSAGES/phpwiki.mo
Modified: trunk/locale/Makefile
===================================================================
--- trunk/locale/Makefile	2015年04月10日 13:09:11 UTC (rev 9650)
+++ trunk/locale/Makefile	2015年04月10日 13:12:21 UTC (rev 9651)
@@ -392,12 +392,15 @@
 ${POT_FILE}: .././RPC2.php
 ${POT_FILE}: .././SOAP.php
 ${POT_FILE}: .././themes/alphatest.php
+${POT_FILE}: .././themes/blog/jscalendar/calendar.php
+${POT_FILE}: .././themes/blog/jscalendar/test.php
 ${POT_FILE}: .././themes/blog/lib/RecentChanges.php
 ${POT_FILE}: .././themes/blog/templates/actionbar.tmpl
 ${POT_FILE}: .././themes/blog/templates/body.tmpl
 ${POT_FILE}: .././themes/blog/templates/bottom.tmpl
 ${POT_FILE}: .././themes/blog/templates/browse-footer.tmpl
 ${POT_FILE}: .././themes/blog/templates/browse.tmpl
+${POT_FILE}: .././themes/blog/templates/calendar.tmpl
 ${POT_FILE}: .././themes/blog/templates/debug.tmpl
 ${POT_FILE}: .././themes/blog/templates/info.tmpl
 ${POT_FILE}: .././themes/blog/templates/navbar.tmpl
@@ -507,7 +510,6 @@
 ${POT_FILE}: .././themes/Sidebar/hyperwiki.php
 ${POT_FILE}: .././themes/Sidebar/templates/actionbar.tmpl
 ${POT_FILE}: .././themes/Sidebar/templates/body.tmpl
-${POT_FILE}: .././themes/Sidebar/templates/calendar.tmpl
 ${POT_FILE}: .././themes/Sidebar/templates/content.tmpl
 ${POT_FILE}: .././themes/Sidebar/templates/debug.tmpl
 ${POT_FILE}: .././themes/Sidebar/templates/dump-footer.tmpl
Modified: trunk/locale/de/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/es/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/fr/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/it/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/ja/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/nl/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/po/de.po
===================================================================
--- trunk/locale/po/de.po	2015年04月10日 13:09:11 UTC (rev 9650)
+++ trunk/locale/po/de.po	2015年04月10日 13:12:21 UTC (rev 9651)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
+"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
 "PO-Revision-Date: 2000年10月31日 02:23+0200\n"
 "Last-Translator: Reini Urban <ru...@x-...>, Carsten Klapp "
 "<car...@us...>, Helmer Pardun <pardunpress@t-online."
@@ -5300,15 +5300,6 @@
 "Wenn Sie diese Seite jetzt speichern, wird die aktuelle Version "
 "überschrieben."
 
-msgid "H"
-msgstr "H."
-
-msgid "W"
-msgstr "Br."
-
-msgid "Adjust"
-msgstr "Justieren"
-
 msgid "Page Content: "
 msgstr "Inhalt: "
 
@@ -6104,6 +6095,15 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "H"
+#~ msgstr "H."
+
+#~ msgid "W"
+#~ msgstr "Br."
+
+#~ msgid "Adjust"
+#~ msgstr "Justieren"
+
 #~ msgid "PgsrcTranslation"
 #~ msgstr "PgsrcTranslation"
 
Modified: trunk/locale/po/es.po
===================================================================
--- trunk/locale/po/es.po	2015年04月10日 13:09:11 UTC (rev 9650)
+++ trunk/locale/po/es.po	2015年04月10日 13:12:21 UTC (rev 9651)
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
+"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
 "PO-Revision-Date: 2000年02月01日 00:50-0500\n"
 "Last-Translator: Pablo Roca <pr...@cl...>\n"
 "Language-Team: \n"
@@ -5175,15 +5175,6 @@
 msgid "Saving this page will overwrite the current version."
 msgstr "Ahorrando esta página sobreescribirá la versión actual."
 
-msgid "H"
-msgstr "Al"
-
-msgid "W"
-msgstr "An"
-
-msgid "Adjust"
-msgstr ""
-
 msgid "Page Content: "
 msgstr "Contenido De la Página: "
 
@@ -5928,6 +5919,12 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "H"
+#~ msgstr "Al"
+
+#~ msgid "W"
+#~ msgstr "An"
+
 #~ msgid "Columns: %s."
 #~ msgstr "Columnas: %s."
 
Modified: trunk/locale/po/fr.po
===================================================================
--- trunk/locale/po/fr.po	2015年04月10日 13:09:11 UTC (rev 9650)
+++ trunk/locale/po/fr.po	2015年04月10日 13:12:21 UTC (rev 9651)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
+"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
 "PO-Revision-Date: 2004年06月22日 21:10+0200\n"
 "Last-Translator: Pierrick Meignen <mei...@wa...>, Roland "
 "Trique <rol...@fr...>, Stéphane Gourichon <stephane.gourichon@lip6."
@@ -5244,15 +5244,6 @@
 msgid "Saving this page will overwrite the current version."
 msgstr "Enregistrer cette page écrasera la version actuelle."
 
-msgid "H"
-msgstr "H"
-
-msgid "W"
-msgstr "L"
-
-msgid "Adjust"
-msgstr "Ajuster"
-
 msgid "Page Content: "
 msgstr "Contenu de la page : "
 
@@ -6016,6 +6007,15 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "H"
+#~ msgstr "H"
+
+#~ msgid "W"
+#~ msgstr "L"
+
+#~ msgid "Adjust"
+#~ msgstr "Ajuster"
+
 #~ msgid "PgsrcTranslation"
 #~ msgstr "TraductionPgsrc"
 
Modified: trunk/locale/po/it.po
===================================================================
--- trunk/locale/po/it.po	2015年04月10日 13:09:11 UTC (rev 9650)
+++ trunk/locale/po/it.po	2015年04月10日 13:12:21 UTC (rev 9651)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
+"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
 "PO-Revision-Date: 2005年02月12日 16:23+0100\n"
 "Last-Translator: Antonio Bonifati ant[(at)]monitor.deis.unical.it\n"
 "Language-Team: \n"
@@ -5120,15 +5120,6 @@
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
-msgid "H"
-msgstr "A"
-
-msgid "W"
-msgstr "L"
-
-msgid "Adjust"
-msgstr ""
-
 msgid "Page Content: "
 msgstr ""
 
@@ -5869,6 +5860,12 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "H"
+#~ msgstr "A"
+
+#~ msgid "W"
+#~ msgstr "L"
+
 #~ msgid "Columns: %s."
 #~ msgstr "Caratteri: %s."
 
Modified: trunk/locale/po/ja.po
===================================================================
--- trunk/locale/po/ja.po	2015年04月10日 13:09:11 UTC (rev 9650)
+++ trunk/locale/po/ja.po	2015年04月10日 13:12:21 UTC (rev 9651)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
+"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
 "PO-Revision-Date: 2003年06月07日 09:01+0900\n"
 "Last-Translator: Tadashi Jokagi <web...@el...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5277,15 +5277,6 @@
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
-msgid "H"
-msgstr "高さ"
-
-msgid "W"
-msgstr "幅"
-
-msgid "Adjust"
-msgstr "調整"
-
 msgid "Page Content: "
 msgstr ""
 
@@ -6065,6 +6056,15 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "H"
+#~ msgstr "高さ"
+
+#~ msgid "W"
+#~ msgstr "幅"
+
+#~ msgid "Adjust"
+#~ msgstr "調整"
+
 #~ msgid "Count"
 #~ msgstr "カウント"
 
Modified: trunk/locale/po/nl.po
===================================================================
--- trunk/locale/po/nl.po	2015年04月10日 13:09:11 UTC (rev 9650)
+++ trunk/locale/po/nl.po	2015年04月10日 13:12:21 UTC (rev 9651)
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
+"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
 "PO-Revision-Date: 2000年09月30日 02:23+0200\n"
 "Last-Translator: Jan Nieuwenhuizen <ja...@gn...>\n"
 "Language-Team: Dutch <nl...@li...>\n"
@@ -5112,15 +5112,6 @@
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
-msgid "H"
-msgstr "H"
-
-msgid "W"
-msgstr "B"
-
-msgid "Adjust"
-msgstr ""
-
 msgid "Page Content: "
 msgstr ""
 
@@ -5859,6 +5850,12 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "H"
+#~ msgstr "H"
+
+#~ msgid "W"
+#~ msgstr "B"
+
 #~ msgid "Wanted Pages in this wiki (%d total):"
 #~ msgstr "De %d meestbezochte pagina's van deze Wiki:"
 
Modified: trunk/locale/po/phpwiki.pot
===================================================================
--- trunk/locale/po/phpwiki.pot	2015年04月10日 13:09:11 UTC (rev 9650)
+++ trunk/locale/po/phpwiki.pot	2015年04月10日 13:12:21 UTC (rev 9651)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki-1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
+"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
 "PO-Revision-Date: 2002年12月14日 17:51-0500\n"
 "Last-Translator: Reini Urban <ru...@us...>\n"
 "Language-Team: LANGUAGE <LL...@li...>\n"
@@ -5104,15 +5104,6 @@
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
-msgid "H"
-msgstr ""
-
-msgid "W"
-msgstr ""
-
-msgid "Adjust"
-msgstr ""
-
 msgid "Page Content: "
 msgstr ""
 
Modified: trunk/locale/po/sv.po
===================================================================
--- trunk/locale/po/sv.po	2015年04月10日 13:09:11 UTC (rev 9650)
+++ trunk/locale/po/sv.po	2015年04月10日 13:12:21 UTC (rev 9651)
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
+"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
 "PO-Revision-Date: 2001年01月27日 01:58+0200\n"
 "Last-Translator: Jon Åslund <jo...@he...>\n"
 "Language-Team: \n"
@@ -5105,15 +5105,6 @@
 msgid "Saving this page will overwrite the current version."
 msgstr ""
 
-msgid "H"
-msgstr "H"
-
-msgid "W"
-msgstr "B"
-
-msgid "Adjust"
-msgstr "Justera"
-
 msgid "Page Content: "
 msgstr ""
 
@@ -5851,3 +5842,12 @@
 
 msgid "Y-m-d H:i"
 msgstr ""
+
+#~ msgid "H"
+#~ msgstr "H"
+
+#~ msgid "W"
+#~ msgstr "B"
+
+#~ msgid "Adjust"
+#~ msgstr "Justera"
Modified: trunk/locale/po/zh.po
===================================================================
--- trunk/locale/po/zh.po	2015年04月10日 13:09:11 UTC (rev 9650)
+++ trunk/locale/po/zh.po	2015年04月10日 13:12:21 UTC (rev 9651)
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: PhpWiki 1.5.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015年03月11日 16:01+0100\n"
+"POT-Creation-Date: 2015年04月10日 15:10+0200\n"
 "PO-Revision-Date: 2004年04月21日 10:08+0800\n"
 "Last-Translator: DruryL <dr...@us...>\n"
 "Language-Team: DruryL <dr...@us...>\n"
@@ -5367,15 +5367,6 @@
 msgid "Saving this page will overwrite the current version."
 msgstr "儲存此頁面將會覆寫掉目前版本."
 
-msgid "H"
-msgstr "高"
-
-msgid "W"
-msgstr "寬"
-
-msgid "Adjust"
-msgstr "調整"
-
 #, fuzzy
 msgid "Page Content: "
 msgstr "內容: "
@@ -6169,6 +6160,15 @@
 msgid "Y-m-d H:i"
 msgstr ""
 
+#~ msgid "H"
+#~ msgstr "高"
+
+#~ msgid "W"
+#~ msgstr "寬"
+
+#~ msgid "Adjust"
+#~ msgstr "調整"
+
 #~ msgid "Wanted Pages for %s (%d total):"
 #~ msgstr "%s 所需要的頁面 (共 %d):"
 
Modified: trunk/locale/sv/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
Modified: trunk/locale/zh/LC_MESSAGES/phpwiki.mo
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9650
 http://sourceforge.net/p/phpwiki/code/9650
Author: vargenau
Date: 2015年04月10日 13:09:11 +0000 (2015年4月10日)
Log Message:
-----------
Remove unused icon ed_redo.png
Modified Paths:
--------------
 trunk/lib/EditToolbar.php
Removed Paths:
-------------
 trunk/themes/default/images/ed_redo.png
Modified: trunk/lib/EditToolbar.php
===================================================================
--- trunk/lib/EditToolbar.php	2015年04月10日 13:07:49 UTC (rev 9649)
+++ trunk/lib/EditToolbar.php	2015年04月10日 13:09:11 UTC (rev 9650)
@@ -252,7 +252,6 @@
 
 if (defined('JS_SEARCHREPLACE') and JS_SEARCHREPLACE) {
 $undo_d_btn = $WikiTheme->getImageURL("ed_undo_d.png");
- //$redo_btn = $WikiTheme->getImageURL("ed_redo.png");
 $sr_btn = $WikiTheme->getImageURL("ed_replace.png");
 //TODO: generalize the UNDO button and fix it for Search & Replace
 $sr_html = HTML(HTML::img
@@ -261,8 +260,6 @@
 'src' => $undo_d_btn,
 'title' => _("Undo Search & Replace"),
 'alt' => _("Undo Search & Replace"),
- //'disabled'=>"disabled", //non-XHTML conform
- //'onfocus' =>"if(this.blur && undo_buffer_index==0) this.blur()",
 'onclick' => "do_undo()")),
 HTML::img
 (array('class' => "toolbar",
Deleted: trunk/themes/default/images/ed_redo.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9649
 http://sourceforge.net/p/phpwiki/code/9649
Author: vargenau
Date: 2015年04月10日 13:07:49 +0000 (2015年4月10日)
Log Message:
-----------
Better icons
Modified Paths:
--------------
 trunk/themes/default/images/ed_pages.png
 trunk/themes/default/images/ed_replace.png
 trunk/themes/default/images/ed_template.png
 trunk/themes/default/images/ed_undo.png
 trunk/themes/default/images/ed_undo_d.png
Modified: trunk/themes/default/images/ed_pages.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_replace.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_template.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_undo.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_undo_d.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9648
 http://sourceforge.net/p/phpwiki/code/9648
Author: vargenau
Date: 2015年04月10日 09:42:17 +0000 (2015年4月10日)
Log Message:
-----------
Remove Width and Height preferences modification in Edit Toolbar
Modified Paths:
--------------
 trunk/pgsrc/ReleaseNotes
 trunk/themes/Crao/templates/editpage.tmpl
 trunk/themes/Portland/templates/editpage.tmpl
 trunk/themes/Wordpress/templates/editpage.tmpl
 trunk/themes/default/templates/editpage.tmpl
 trunk/themes/fusionforge/templates/editpage.tmpl
Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015年04月09日 09:16:25 UTC (rev 9647)
+++ trunk/pgsrc/ReleaseNotes	2015年04月10日 09:42:17 UTC (rev 9648)
@@ -1,4 +1,4 @@
-Date: Wed, 1 Apr 2015 18:29:22 +0000
+Date: 2015年4月10日 11:29:22 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.3)
 Content-Type: application/x-phpwiki;
 pagename=ReleaseNotes;
@@ -14,6 +14,7 @@
 * Remove ~WantedPagesOld (use ~WantedPages instead)
 * Add WebM format in Video plugin
 * Update jscalendar to 1.0
+* Remove Width and Height preferences modification in Edit Toolbar
 
 == 1.5.3 2015年03月04日 Marc-Etienne Vargenau ==
 
Modified: trunk/themes/Crao/templates/editpage.tmpl
===================================================================
--- trunk/themes/Crao/templates/editpage.tmpl	2015年04月09日 09:16:25 UTC (rev 9647)
+++ trunk/themes/Crao/templates/editpage.tmpl	2015年04月10日 09:42:17 UTC (rev 9648)
@@ -20,19 +20,9 @@
 accept-charset="UTF-8">
 <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
 <br class="clear-floats" />
- <table class="fullwidth">
- <tr>
- <td>
- <?php if (isset($EDIT_TOOLBAR)) { ?>
- <?php echo $EDIT_TOOLBAR ?>
- <?php } ?>
- </td>
- <td class="align-right"><div id="editarea-size">
- <?php echo _("Size")._(":") ?>
- <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
- <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
- <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
- </div></td></tr></table>
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
 <fieldset class="editarea">
 <legend><?php echo _("Page Content: ")?></legend>
 <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
Modified: trunk/themes/Portland/templates/editpage.tmpl
===================================================================
--- trunk/themes/Portland/templates/editpage.tmpl	2015年04月09日 09:16:25 UTC (rev 9647)
+++ trunk/themes/Portland/templates/editpage.tmpl	2015年04月10日 09:42:17 UTC (rev 9648)
@@ -29,12 +29,6 @@
 <?php echo fmt("I'm just doing minor edits. Please divert the usual logging to %s instead.",
 WikiLink(_("RecentEdits"))) ?>
 <br />
-<p>
- <?php echo _("Edit Area Size")?>: <b><?php echo _("H")?></b> <?php echo $HEIGHT_PREF?>
- <b><?php echo _("W")?></b> <?php echo $WIDTH_PREF?>
- <?php echo Button("submit:", _("Adjust"), 'wikiaction')?>
-</p>
-
 <?php if (isset($PREVIEW_CONTENT)) { ?>
 <hr />
 <p><strong><?php echo _("Preview only! Changes not saved.")?></strong></p>
Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2015年04月09日 09:16:25 UTC (rev 9647)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2015年04月10日 09:42:17 UTC (rev 9648)
@@ -21,19 +21,9 @@
 </td>
 </tr>
 </table>
-<table class="fullwidth">
- <tr>
- <td>
- <?php if (isset($EDIT_TOOLBAR)) { ?>
- <?php echo $EDIT_TOOLBAR ?>
- <?php } ?>
- </td>
- <td class="align-right"><div id="editarea-size">
- <?php echo _("Size")._(":") ?>
- <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
- <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
- <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
- </div></td></tr></table>
+<?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+<?php } ?>
 <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
 <br /><small>
 <?php echo _("Summary")._(":") ?><?php echo $SUMMARY_INPUT ?>
Modified: trunk/themes/default/templates/editpage.tmpl
===================================================================
--- trunk/themes/default/templates/editpage.tmpl	2015年04月09日 09:16:25 UTC (rev 9647)
+++ trunk/themes/default/templates/editpage.tmpl	2015年04月10日 09:42:17 UTC (rev 9648)
@@ -20,19 +20,9 @@
 accept-charset="UTF-8">
 <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
 <br class="clear-floats" />
- <table class="fullwidth">
- <tr>
- <td>
- <?php if (isset($EDIT_TOOLBAR)) { ?>
- <?php echo $EDIT_TOOLBAR ?>
- <?php } ?>
- </td>
- <td class="align-right"><div id="editarea-size">
- <?php echo _("Size")._(":") ?>
- <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
- <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
- <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
- </div></td></tr></table>
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
 <?php if (!empty($WYSIWYG_B)) { ?>
 <br /><div class="hint"><strong>Warning:</strong> Switching to the Wysiwyg editor will not keep your changes.</div>
 <?php } ?>
Modified: trunk/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/themes/fusionforge/templates/editpage.tmpl	2015年04月09日 09:16:25 UTC (rev 9647)
+++ trunk/themes/fusionforge/templates/editpage.tmpl	2015年04月10日 09:42:17 UTC (rev 9648)
@@ -63,19 +63,9 @@
 accept-charset="UTF-8">
 <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?>
 <br class="clear-floats" />
- <table class="fullwidth">
- <tr>
- <td>
- <?php if (isset($EDIT_TOOLBAR)) { ?>
- <?php echo $EDIT_TOOLBAR ?>
- <?php } ?>
- </td>
- <td class="align-right"><div id="editarea-size">
- <?php echo _("Size")._(":") ?>
- <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
- <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
- <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
- </div></td></tr></table>
+ <?php if (isset($EDIT_TOOLBAR)) { ?>
+ <?php echo $EDIT_TOOLBAR ?>
+ <?php } ?>
 <a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
 <div style="text-align: center;">
 <label for="edit-summary"><?php echo _("Summary")._(":") ?></label> <?php echo $SUMMARY_INPUT ?>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9647
 http://sourceforge.net/p/phpwiki/code/9647
Author: vargenau
Date: 2015年04月09日 09:16:25 +0000 (2015年4月09日)
Log Message:
-----------
JS_SEARCHREPLACE is false for Fusionforge
Modified Paths:
--------------
 trunk/g
Modified: trunk/g
===================================================================
--- trunk/g	2015年04月09日 08:15:42 UTC (rev 9646)
+++ trunk/g	2015年04月09日 09:16:25 UTC (rev 9647)
@@ -67,6 +67,7 @@
 // Disable Toolbar for tests
 define('ENABLE_EDIT_TOOLBAR', false);
 }
+define('JS_SEARCHREPLACE', false);
 
 if (defined('WIKI_SOAP')) {
 $help = group_get_object_by_name('help');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9646
 http://sourceforge.net/p/phpwiki/code/9646
Author: vargenau
Date: 2015年04月09日 08:15:42 +0000 (2015年4月09日)
Log Message:
-----------
cursor: pointer for toolbar
Modified Paths:
--------------
 trunk/themes/Crao/crao.css
 trunk/themes/Hawaiian/Hawaiian.css
 trunk/themes/MacOSX/MacOSX.css
 trunk/themes/MonoBook/monobook.css
 trunk/themes/Portland/portland.css
 trunk/themes/Sidebar/sidebar.css
 trunk/themes/SpaceWiki/SpaceWiki.css
 trunk/themes/Wordpress/Wordpress.css
 trunk/themes/blog/Kubrick.css
 trunk/themes/default/phpwiki-modern.css
 trunk/themes/default/phpwiki.css
 trunk/themes/fusionforge/fusionforge.css
 trunk/themes/shamino_com/shamino_com.css
 trunk/themes/wikilens/wikilens.css
Modified: trunk/themes/Crao/crao.css
===================================================================
--- trunk/themes/Crao/crao.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/Crao/crao.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -377,6 +377,10 @@
 margin: 0;
 }
 
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 .edit-toolbar {
 padding: 0;
 margin: 0;
Modified: trunk/themes/Hawaiian/Hawaiian.css
===================================================================
--- trunk/themes/Hawaiian/Hawaiian.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/Hawaiian/Hawaiian.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -296,6 +296,10 @@
 margin: 0;
 }
 
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 /* Prevent buttons from overlapping when wrapped */
 #navbar, #actionbar {
 line-height: 140%;
Modified: trunk/themes/MacOSX/MacOSX.css
===================================================================
--- trunk/themes/MacOSX/MacOSX.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/MacOSX/MacOSX.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -1106,6 +1106,10 @@
 margin: 0.5ex 0;
 }
 
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 /* Link icons */
 img.linkicon {
 vertical-align: middle;
Modified: trunk/themes/MonoBook/monobook.css
===================================================================
--- trunk/themes/MonoBook/monobook.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/MonoBook/monobook.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -1165,8 +1165,8 @@
 }
 
 /*
-** the personal toolbar
-*/
+ ** the personal toolbar
+ */
 
 #p-personal {
 position: absolute;
@@ -1686,6 +1686,10 @@
 margin-right: 0.33em;
 }
 
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 #editform .editOptions {
 display: inline;
 }
Modified: trunk/themes/Portland/portland.css
===================================================================
--- trunk/themes/Portland/portland.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/Portland/portland.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -77,6 +77,10 @@
 
 /* --------------------------------------------------------------- */
 
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 /*
 * "DL tables"
 */
Modified: trunk/themes/Sidebar/sidebar.css
===================================================================
--- trunk/themes/Sidebar/sidebar.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/Sidebar/sidebar.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -1220,8 +1220,8 @@
 }
 
 /*
-** the personal toolbar
-*/
+ ** the personal toolbar
+ */
 
 #p-personal {
 width: 100%;
@@ -1717,6 +1717,10 @@
 margin-right: 0.33em;
 }
 
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 #editform .editOptions {
 display: inline;
 }
Modified: trunk/themes/SpaceWiki/SpaceWiki.css
===================================================================
--- trunk/themes/SpaceWiki/SpaceWiki.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/SpaceWiki/SpaceWiki.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -296,6 +296,10 @@
 color: #5791ff;
 }
 
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 h2, h3, h4, h5, h6 {
 display: inline;
 padding-top: 0.25ex;
Modified: trunk/themes/Wordpress/Wordpress.css
===================================================================
--- trunk/themes/Wordpress/Wordpress.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/Wordpress/Wordpress.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -328,6 +328,10 @@
 margin: 0;
 }
 
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 .edit-toolbar {
 padding: 0;
 margin: 0;
Modified: trunk/themes/blog/Kubrick.css
===================================================================
--- trunk/themes/blog/Kubrick.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/blog/Kubrick.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -930,6 +930,10 @@
 font-size: 11px
 }
 
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 .wikiwyg_toolbar {
 background: #D3D3D3;
 border: 1px outset;
Modified: trunk/themes/default/phpwiki-modern.css
===================================================================
--- trunk/themes/default/phpwiki-modern.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/default/phpwiki-modern.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -237,6 +237,10 @@
 font-family: Arial, Helvetica, sans-serif;
 }
 
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 #navbuttons, #actionbar {
 color: black;
 background: #ddd; /* dark gray */
Modified: trunk/themes/default/phpwiki.css
===================================================================
--- trunk/themes/default/phpwiki.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/default/phpwiki.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -338,6 +338,10 @@
 margin: 0;
 }
 
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 .edit-toolbar {
 padding: 0;
 margin: 0;
Modified: trunk/themes/fusionforge/fusionforge.css
===================================================================
--- trunk/themes/fusionforge/fusionforge.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/fusionforge/fusionforge.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -413,6 +413,11 @@
 /**
 * Toolbar
 */
+
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 input.button {
 font-family: Verdana, Arial, Helvetica, sans-serif;
 }
Modified: trunk/themes/shamino_com/shamino_com.css
===================================================================
--- trunk/themes/shamino_com/shamino_com.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/shamino_com/shamino_com.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -254,6 +254,10 @@
 font-size: 8pt;
 }
 
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 .debug {
 padding: 2px;
 margin-left: 10px;
Modified: trunk/themes/wikilens/wikilens.css
===================================================================
--- trunk/themes/wikilens/wikilens.css	2015年04月03日 16:14:20 UTC (rev 9645)
+++ trunk/themes/wikilens/wikilens.css	2015年04月09日 08:15:42 UTC (rev 9646)
@@ -42,6 +42,10 @@
 margin: 1.5ex 1em 0 1em;
 }
 
+img.toolbar:hover {
+ cursor: pointer;
+}
+
 table.sortable th.header {
 background-image: url(../default/buttons/sort_none.gif);
 cursor: pointer;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 9645
 http://sourceforge.net/p/phpwiki/code/9645
Author: vargenau
Date: 2015年04月03日 16:14:20 +0000 (2015年4月03日)
Log Message:
-----------
Better icons for toolbar
Modified Paths:
--------------
 trunk/themes/default/images/ed_category.png
 trunk/themes/default/images/ed_enumlist.png
 trunk/themes/default/images/ed_format_bold.png
 trunk/themes/default/images/ed_format_color.png
 trunk/themes/default/images/ed_format_italic.png
 trunk/themes/default/images/ed_format_strike.png
 trunk/themes/default/images/ed_headline.png
 trunk/themes/default/images/ed_hr.png
 trunk/themes/default/images/ed_image.png
 trunk/themes/default/images/ed_link.png
 trunk/themes/default/images/ed_list.png
 trunk/themes/default/images/ed_pagelink.png
 trunk/themes/default/images/ed_plugins.png
 trunk/themes/default/images/ed_preview.png
 trunk/themes/default/images/ed_redirect.png
 trunk/themes/default/images/ed_save.png
 trunk/themes/default/images/ed_table.png
 trunk/themes/default/images/ed_templateplugin.png
 trunk/themes/default/images/ed_toc.png
Modified: trunk/themes/default/images/ed_category.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_enumlist.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_format_bold.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_format_color.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_format_italic.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_format_strike.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_headline.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_hr.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_image.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_link.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_list.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_pagelink.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_plugins.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_preview.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_redirect.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_save.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_table.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_templateplugin.png
===================================================================
(Binary files differ)
Modified: trunk/themes/default/images/ed_toc.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.