Menu
▾
▴
[TWiki-Dev] [SVN] r7842 - in twiki/branches/DEVELOP: locale twikiplugins/PatternSkin/pub/TWiki/PatternSkin twikiplugins/PatternSkin/templates twikiplugins/TablePlugin/data/TWiki twikiplugins/TablePlugin/lib/TWiki/Plugins/TablePlugin
Author: ArthurClemens
Date: 2005-12-13 14:20:12 -0800 (Tue, 13 Dec 2005)
New Revision: 7842
Modified:
twiki/branches/DEVELOP/locale/TWiki.pot
twiki/branches/DEVELOP/locale/da.po
twiki/branches/DEVELOP/locale/de.po
twiki/branches/DEVELOP/locale/es.po
twiki/branches/DEVELOP/locale/nl.po
twiki/branches/DEVELOP/locale/pt.po
twiki/branches/DEVELOP/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css
twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/attachtables.pattern.tmpl
twiki/branches/DEVELOP/twikiplugins/TablePlugin/data/TWiki/TablePlugin.txt
twiki/branches/DEVELOP/twikiplugins/TablePlugin/lib/TWiki/Plugins/TablePlugin/Core.pm
Log:
Item1178: adding summary and caption (and id) to TablePlugin
Modified: twiki/branches/DEVELOP/locale/TWiki.pot
===================================================================
--- twiki/branches/DEVELOP/locale/TWiki.pot 2005-12-13 20:27:41 UTC (rev 7841)
+++ twiki/branches/DEVELOP/locale/TWiki.pot 2005-12-13 22:20:12 UTC (rev 7842)
@@ -2658,6 +2658,10 @@
msgid "view"
msgstr ""
+#: templates/attachtables.pattern.tmpl:11
+msgid "Topic attachments"
+msgstr ""
+
#: templates/attachtables.pattern.tmpl:22
msgid "Show attachments"
msgstr ""
Modified: twiki/branches/DEVELOP/locale/da.po
===================================================================
--- twiki/branches/DEVELOP/locale/da.po 2005-12-13 20:27:41 UTC (rev 7841)
+++ twiki/branches/DEVELOP/locale/da.po 2005-12-13 22:20:12 UTC (rev 7842)
@@ -2910,6 +2910,10 @@
msgid "view"
msgstr "vis"
+#: templates/attachtables.pattern.tmpl:11
+msgid "Topic attachments"
+msgstr ""
+
#: templates/attachtables.pattern.tmpl:22
msgid "Show attachments"
msgstr ""
Modified: twiki/branches/DEVELOP/locale/de.po
===================================================================
--- twiki/branches/DEVELOP/locale/de.po 2005-12-13 20:27:41 UTC (rev 7841)
+++ twiki/branches/DEVELOP/locale/de.po 2005-12-13 22:20:12 UTC (rev 7842)
@@ -2919,6 +2919,10 @@
msgid "view"
msgstr "Ansehen"
+#: templates/attachtables.pattern.tmpl:11
+msgid "Topic attachments"
+msgstr ""
+
#: templates/attachtables.pattern.tmpl:22
msgid "Show attachments"
msgstr ""
Modified: twiki/branches/DEVELOP/locale/es.po
===================================================================
--- twiki/branches/DEVELOP/locale/es.po 2005-12-13 20:27:41 UTC (rev 7841)
+++ twiki/branches/DEVELOP/locale/es.po 2005-12-13 22:20:12 UTC (rev 7842)
@@ -2762,6 +2762,10 @@
msgid "view"
msgstr "vea"
+#: templates/attachtables.pattern.tmpl:11
+msgid "Topic attachments"
+msgstr ""
+
#: templates/attachtables.pattern.tmpl:22
msgid "Show attachments"
msgstr ""
Modified: twiki/branches/DEVELOP/locale/nl.po
===================================================================
--- twiki/branches/DEVELOP/locale/nl.po 2005-12-13 20:27:41 UTC (rev 7841)
+++ twiki/branches/DEVELOP/locale/nl.po 2005-12-13 22:20:12 UTC (rev 7842)
@@ -459,22 +459,23 @@
#: data/TWiki/WebSearch.txt:33 data/TWiki/WebSearchAdvanced.txt:43
msgid "All public webs"
-msgstr ""
+msgstr "Alle publieke webs"
#: data/TWiki/WebSearchAdvanced.txt:89
msgid "All topics in %1"
-msgstr ""
+msgstr "Alle pagina's in %1"
#: templates/renamebase.pattern.tmpl:20
#: templates/renamewebbase.pattern.tmpl:20
msgid "Allow non <nop>WikiWord for the new topic name"
-msgstr ""
+msgstr "Een niet-<nop>WikiWord mag gebruikt worden als paginanaam"
#: templates/oopsattention.tmpl:194
msgid ""
"Alternatively hit back to go back to TWiki.TWikiRegistration and choose a "
"different username."
-msgstr ""
+msgstr "Of klik op Terug naar TWiki.TWikiRegistration en kies een "
+"andere gebruikersnaam."
#: templates/oopsattention.tmpl:184
msgid ""
@@ -506,30 +507,27 @@
#: templates/view.pattern.tmpl:50
msgid "Attach an image or document to this topic"
-msgstr ""
+msgstr "Voeg een afbeelding of document toe aan deze pagina"
#: templates/attachnew.pattern.tmpl:9
msgid "Attach file to topic %1"
-msgstr ""
+msgstr "Voeg bestand to aan pagina %1"
#: templates/attach.pattern.tmpl:24
msgid "Attach image or document on %1"
-msgstr ""
+msgstr "Voeg afbeelding of document to aan %1"
#: templates/attachnew.pattern.tmpl:14 templates/attachnew.pattern.tmpl:18
-#, fuzzy
msgid "Attach new file"
-msgstr "De bijlage bestaat niet."
+msgstr "Voeg nieuw bestand toe"
#: templates/attachtables.pattern.tmpl:7
-#, fuzzy
msgid "Attachment"
-msgstr "&Bijlage toevoegen"
+msgstr "Bijlage"
#: templates/oopsaccessdenied.tmpl:45
-#, fuzzy
msgid "Attachment '%1' does not exist"
-msgstr "De bijlage bestaat niet."
+msgstr "Bijlage '%1' bestaat niet"
#: lib/TWiki/UI/Manage.pm:341
msgid "Attachment already exists in new topic"
@@ -538,16 +536,15 @@
#: templates/oopsattention.tmpl:57
#, fuzzy
msgid "Attachment delete failed"
-msgstr "De bijlage bestaat niet."
+msgstr "Verwijderen van bijlage is niet gelukt"
#: lib/TWiki/UI/Manage.pm:321
-#, fuzzy
msgid "Attachment does not exist"
-msgstr "De bijlage bestaat niet."
+msgstr "De bijlage bestaat niet"
#: templates/oopsattention.tmpl:49
msgid "Attachment move failed"
-msgstr ""
+msgstr "Verplaatsen van bijlage is niet gelukt"
#: templates/attach.pattern.tmpl:109
msgid "Attachments will not be shown in topic view page."
@@ -556,24 +553,23 @@
#: templates/oopsaccessdenied.tmpl:4 templates/oopsattention.tmpl:4
#: templates/oopsleaseconflict.tmpl:4 templates/oopssaveerr.tmpl:3
msgid "Attention"
-msgstr ""
+msgstr "Let op"
#: templates/attachtables.pattern.tmpl:30
msgid "Attribute"
-msgstr ""
+msgstr "Kenmerk"
#: data/_default/WebHome.txt:4
msgid "Available Information"
-msgstr ""
+msgstr "Beschikbare informatie"
#: data/Main/PatternSkinUserViewTemplate.txt:24 templates/view.pattern.tmpl:89
msgid "Back to top"
-msgstr ""
+msgstr "Terug naar boven"
#: templates/twiki.pattern.tmpl:16
-#, fuzzy
msgid "Back to topic"
-msgstr "Eind van de pagina"
+msgstr "Terug naar pagina"
#: templates/oopsmore.pattern.tmpl:19 templates/oopsmore.tmpl:19
#: templates/view.pattern.tmpl:98
@@ -583,12 +579,12 @@
#: templates/backlinksweb.pattern.tmpl:10
#, fuzzy
msgid "Backlinks to %1 in %2 Web"
-msgstr "(teruglinks in web %1)"
+msgstr "(links naar pagina in web %1)"
#: templates/backlinksallwebs.pattern.tmpl:10
#, fuzzy
msgid "Backlinks to %1 in all Webs"
-msgstr "(teruglinks in alle webs)"
+msgstr "(links naar pagina in alle webs)"
#: templates/oopsattention.tmpl:111
msgid "Base web %1 is missing or does not exist"
@@ -648,9 +644,8 @@
#: templates/moveattachment.pattern.tmpl:59
#: templates/renamebase.pattern.tmpl:32
#: templates/renamewebbase.pattern.tmpl:34
-#, fuzzy
msgid "Change from:"
-msgstr "(wijzig formulier)"
+msgstr "Wijzig formulier:"
#: data/TWiki/WebLeftBarSearch.txt:13 templates/oopschangelanguage.tmpl:21
#: templates/oopschangelanguage.tmpl:4 templates/oopslanguagechanged.tmpl:4
@@ -2706,8 +2701,12 @@
#: templates/attachtables.pattern.tmpl:50
msgid "view"
-msgstr ""
+msgstr "bekijken"
+#: templates/attachtables.pattern.tmpl:11
+msgid "Topic attachments"
+msgstr "Bijlagen bij deze pagina"
+
#: templates/attachtables.pattern.tmpl:22
msgid "Show attachments"
msgstr "Toon bijlagen"
Modified: twiki/branches/DEVELOP/locale/pt.po
===================================================================
--- twiki/branches/DEVELOP/locale/pt.po 2005-12-13 20:27:41 UTC (rev 7841)
+++ twiki/branches/DEVELOP/locale/pt.po 2005-12-13 22:20:12 UTC (rev 7842)
@@ -2915,6 +2915,10 @@
msgid "view"
msgstr "ver"
+#: templates/attachtables.pattern.tmpl:11
+msgid "Topic attachments"
+msgstr ""
+
#: templates/attachtables.pattern.tmpl:22
msgid "Show attachments"
msgstr "Exibir anexos"
Modified: twiki/branches/DEVELOP/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css 2005-12-13 20:27:41 UTC (rev 7841)
+++ twiki/branches/DEVELOP/twikiplugins/PatternSkin/pub/TWiki/PatternSkin/style.css 2005-12-13 22:20:12 UTC (rev 7842)
@@ -366,6 +366,9 @@
width:26px;
text-align:center;
}
+.twikiAttachments caption {
+ display:none;
+}
table.twikiFormTable th.twikiFormTableHRow a:link,
table.twikiFormTable th.twikiFormTableHRow a:visited {
text-decoration:none;
Modified: twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/attachtables.pattern.tmpl
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/attachtables.pattern.tmpl 2005-12-13 20:27:41 UTC (rev 7841)
+++ twiki/branches/DEVELOP/twikiplugins/PatternSkin/templates/attachtables.pattern.tmpl 2005-12-13 22:20:12 UTC (rev 7842)
@@ -8,7 +8,7 @@
%{ Header definition for topic attachments and top table in attach screen }%
%TMPL:DEF{ATTACH:files:header(basic)}%
<div class="twikiAttachments">
-<!--%TABLE{tableborder="0" cellpadding="0" cellspacing="0" databg="#FFFFFF"}%-->
+<!-- %TABLE{tableborder="0" cellpadding="0" cellspacing="0" databg="#FFFFFF" id="twikiAttachmentsTable" summary="%MAKETEXT{"Topic attachments"}%" caption="%MAKETEXT{"Topic attachments"}%" }%-->
%TMPL:P{ATTACH:files:header(toprow)}%%TMPL:END%
%{ A basic row definition, for attachment table and attach screen }%
@@ -18,7 +18,7 @@
%{ Header for topic attachment table }%
%TMPL:DEF{ATTACH:files:header}%
<div class="twikiAttachments">
-<!--%TABLE{tableborder="0" cellpadding="0" cellspacing="0" databg="#FFFFFF"}%-->
+<!-- %TABLE{tableborder="0" cellpadding="0" cellspacing="0" databg="#FFFFFF" id="twikiAttachmentsTable" summary="%MAKETEXT{"Topic attachments"}%" caption="%MAKETEXT{"Topic attachments"}%" }%-->
<span id="attachmentsshow" class="twistyMakeOpaque"><a href="#" class="twistyTrigger">%ICON{toggleopen}%<span class="twikiLinkLabel">%MAKETEXT{"Show attachments"}%</span></a></span><span id="attachmentshide" class="twistyHidden twistyMakeOpaque"><a href="#" class="twistyTrigger">%ICON{toggleclose}%<span class="twikiLinkLabel">%MAKETEXT{"Hide attachments"}%</span></a></span>
<div id="attachmentstoggle" class="twistyMakeHidden twistyRememberSetting">
%TMPL:P{ATTACH:files:header(toprow)}%
@@ -61,4 +61,4 @@
%{ Footer for versions table in attach screen }%
%TMPL:DEF{ATTACH:versions:footer}%
-%TMPL:END%
\ No newline at end of file
+%TMPL:END%
Modified: twiki/branches/DEVELOP/twikiplugins/TablePlugin/data/TWiki/TablePlugin.txt
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/TablePlugin/data/TWiki/TablePlugin.txt 2005-12-13 20:27:41 UTC (rev 7841)
+++ twiki/branches/DEVELOP/twikiplugins/TablePlugin/data/TWiki/TablePlugin.txt 2005-12-13 22:20:12 UTC (rev 7842)
@@ -81,10 +81,13 @@
| =valign= | Vertical alignment of cells, set to ="top"=, ="middle"=, ="bottom"= or ="baseline"= | =valign="top"= |
| =headeralign= | Header cell alignment, one value for all columns, or a comma separated list for different alignment of individual columns. Set to ="left"=, ="center"=, ="right"= or ="justify"=. Overrides individual cell settings | =headeralign="left, right"= |
| =dataalign= | Data cell alignment, one value for all columns, or a comma separated list for different alignment of individual columns. Set to ="left"=, ="center"=, ="right"= or ="justify"=. Overrides individual cell settings | =dataalign="center"= |
-| =tablewidth= | Table width: Percentage of window width, or absolute pixel value. Default is unspecified | =tablewidth="100%"= |
-| =columnwidths= | Column widths: Comma delimited list of column widths, percentage or absolute pixel value. Default is unspecified | =columnwidths="80%, 20%"= |
+| =tablewidth= | Table width: Percentage of window width, or absolute pixel value. Default is unspecified. | =tablewidth="100%"= |
+| =columnwidths= | Column widths: Comma delimited list of column widths, percentage or absolute pixel value. Default is unspecified. | =columnwidths="80%, 20%"= |
| =headerrows= | Number of header rows to exclude from sort; default ="1"= | =headerrows="1"= |
| =footerrows= | Number of footer rows to exclude from sort; default ="0"= | =footerrows="1"= |
+| =id= | Table identifier string. Default is unspecified. | =id="userTable"= |
+| =summary= | Table summary used by screenreaders: A summary of what the table presents. It should provide an orientation for someone who listens to the table. Default is unspecified. | =summary="List of subscribed users"= |
+| =caption= | Table caption: A title that will be displayed just above the table. Default is unspecified. | =caption="Users"= |
The =%<nop>TABLE{...}%= settings override =TABLEATTRIBUTES= preferences settings, which override the =TABLEATTRIBUTES= Plugin settings.
@@ -133,6 +136,7 @@
| Plugin Author: | TWiki:Main/JohnTalintyre, TWiki:Main/PeterThoeny |
| Plugin Version: | 1.014 |
| Change History: | <!-- specify latest version first --> |
+| 13 Dec 2005 | AC: Added support for id, summary and caption |
| 5 Mar 2005 | 1.014: Crawford Currie eliminated deprecated handlers for Dakar |
| 01 Aug 2004: | AC: Added CSS support for first column and ascending/descending table headers |
| 21 Mar 2004: | PTh: Internal change: Fixed reference to unofficial variable |
Modified: twiki/branches/DEVELOP/twikiplugins/TablePlugin/lib/TWiki/Plugins/TablePlugin/Core.pm
===================================================================
--- twiki/branches/DEVELOP/twikiplugins/TablePlugin/lib/TWiki/Plugins/TablePlugin/Core.pm 2005-12-13 20:27:41 UTC (rev 7841)
+++ twiki/branches/DEVELOP/twikiplugins/TablePlugin/lib/TWiki/Plugins/TablePlugin/Core.pm 2005-12-13 22:20:12 UTC (rev 7842)
@@ -33,7 +33,7 @@
$headerRows $footerRows
$upchar $downchar $diamondchar $url
@isoMonth %mon2num $initSort $initDirection
- @rowspan $pluginAttrs $prefsAttrs );
+ @rowspan $pluginAttrs $prefsAttrs $tableId $tableSummary $tableCaption );
BEGIN {
$translationToken = "\0";
@@ -68,6 +68,9 @@
$headerColor = '';
@dataBg = ( "#FFFFCC", "#FFFFFF" );
@dataColor = ( );
+ $tableId = '';
+ $tableSummary = '';
+ $tableCaption = '';
undef $initSort;
_parseParameters( $pluginAttrs );
@@ -146,7 +149,16 @@
$tmp = $params{datacolor};
@dataColor = split( /,\s*/, $tmp ) if( defined $tmp );
+
+ $tmp = $params{id};
+ $tableId = $tmp if( defined $tmp );
+ $tmp = $params{summary};
+ $tableSummary = $tmp if( defined $tmp );
+
+ $tmp = $params{caption};
+ $tableCaption = $tmp if( defined $tmp );
+
return $currTablePre.'<nop>';
}
@@ -278,9 +290,11 @@
my( $header ) = @_;
# Attachments table?
- if( $header->[0]->{text} =~ /FileAttachment/ ) {
- return $sortAttachments;
- }
+ # This code is no longer used since attachment table formatting is
+ # done in template attachtables.tmpl -- Arthur Clemens 13 Dec 2005
+ #if( $header->[0]->{text} =~ /FileAttachment/ ) {
+ # return $sortAttachments;
+ #}
return 0 unless $sortAllTables;
@@ -341,10 +355,13 @@
border => $tableBorder,
cellspacing => $cellSpacing,
cellpadding => $cellPadding };
+ $tattrs->{id} = $tableId if( $tableId );
+ $tattrs->{summary} = $tableSummary if( $tableSummary );
$tattrs->{frame} = $tableFrame if( $tableFrame );
$tattrs->{rules} = $tableRules if( $tableRules );
$tattrs->{width} = $tableWidth if( $tableWidth );
my $text = $currTablePre.CGI::start_table( $tattrs );
+ $text .= $currTablePre.CGI::caption( $tableCaption ) if( $tableCaption );
my $stype = '';
#Flush out any remaining rowspans
|