# HG changeset patch # User Patrick PIERRE # Date 1361280749 -3600 # Node ID ca43d2c3a2c245200c481f415ea232c4cf05af11 # Parent d2b8386ab9a2a7b12ac4004791f8607257e06a0e Ajout des blanks-select/tooltips + intrus dans catégories diff -r d2b8386ab9a2 -r ca43d2c3a2c2 RelaxNG/Examples/Quiz/Images/blanks-select_tooltipsi01.jpg Binary file RelaxNG/Examples/Quiz/Images/blanks-select_tooltipsi01.jpg has changed diff -r d2b8386ab9a2 -r ca43d2c3a2c2 RelaxNG/Examples/Quiz/blanks-select_tooltips.xml --- /dev/null jeu. janv. 01 00:00:00 1970 +0000 +++ b/RelaxNG/Examples/Quiz/blanks-select_tooltips.xml mar. févr. 19 14:32:29 2013 +0100 @@ -0,0 +1,25 @@ + + + + + + Exercice à trous avec placement sur image + + + +

Placez correctement chaque élément de la voiture.

+ + + + + + le volant + le pare-brise + le siège + le levier de vitesse + le rétroviseur + + + + + diff -r d2b8386ab9a2 -r ca43d2c3a2c2 RelaxNG/Examples/Quiz/categories.xml --- a/RelaxNG/Examples/Quiz/categories.xml jeu. févr. 14 17:42:32 2013 +0100 +++ b/RelaxNG/Examples/Quiz/categories.xml mar. févr. 19 14:32:29 2013 +0100 @@ -11,6 +11,7 @@ + assez Verbes du premier groupe diff -r d2b8386ab9a2 -r ca43d2c3a2c2 RelaxNG/publiquiz.rnc --- a/RelaxNG/publiquiz.rnc jeu. févr. 14 17:42:32 2013 +0100 +++ b/RelaxNG/publiquiz.rnc mar. févr. 19 14:32:29 2013 +0100 @@ -193,6 +193,7 @@ multiple.attribute? categories.content = + category.item*, category, category+ @@ -261,7 +262,7 @@ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ block ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ blanks.block = - (blanks.p | speech | blanks.list | blockquote | blanks.table | media) + (blanks.p | speech | blanks.list | blockquote | blanks.table | blanks.media) point.block = (point.p | speech | point.list | blockquote | point.table | media) @@ -355,6 +356,31 @@ point.inlines | (p | media)+ +# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ media ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +# ~~~~~~ blanks.media +blanks.media = element media { blanksmedia.content } + +blanksmedia.content = + block.head?, + (blanks.image | audio | video)+, + media.caption?, + link? + +# ~~~~~~ blanks.image +blanks.image = element image { image.attributes, blanks.image.content } + +blanks.image.content = + copyright?, + hotspot*, + blanks.tooltip* + +# ~~~~~~ blanks.tooltip +blanks.tooltip = element tooltip { tooltip.attributes, blanks.tooltip.content } + +blanks.tooltip.content = + (p+ | image | blank) + # ~~~~~~~~~~~~~~~~~~~~~~~~ choices.right, choices.wrong ~~~~~~~~~~~~~~~~~~~~~~~ choices.right = element right { choices.right.content } @@ -435,6 +461,7 @@ & term* & link* & anchor* + & image* & blank* } point.inlines = mixed { @@ -454,6 +481,7 @@ & term* & link* & anchor* + & image* & blank* & point.right* & point.wrong* diff -r d2b8386ab9a2 -r ca43d2c3a2c2 Xxe/Css/publidoc.css --- a/Xxe/Css/publidoc.css jeu. févr. 14 17:42:32 2013 +0100 +++ b/Xxe/Css/publidoc.css mar. févr. 19 14:32:29 2013 +0100 @@ -504,7 +504,7 @@ font-style: italic; } -/* Hotspot */ +/* hotspot ~~~~~~~~~~~~~~~~~~~~~~~~~ */ hotspot { display: block; @@ -513,7 +513,7 @@ border-radius: 1.5em; } -/* Tooltip */ +/* tooltip ~~~~~~~~~~~~~~~~~~~~~~~~~ */ tooltip image:before { content: ""; @@ -524,15 +524,27 @@ tooltip { display: block; - padding: .5em; + padding: .4em; + margin: 0 1em .1em 0; background-color: #eaffe9; border-radius: 1.5em; } + tooltip > p { font-family: sans-serif; font-size: 85%; } +tooltip > blank { + background-color: transparent; +} + +tooltip:after { + display: marker; + padding-bottom: .7em; + content: insert-after-button(color, #7f7f7f, icon, icon(right-half-disc)); +} + /* audio ~~~~~~~~~~~~~~~~~~~~~~~~~~~ */ audio { @@ -632,5 +644,4 @@ smil { background-color: #ffffc0; - } diff -r d2b8386ab9a2 -r ca43d2c3a2c2 Xxe/Css/publiquiz.css --- a/Xxe/Css/publiquiz.css jeu. févr. 14 17:42:32 2013 +0100 +++ b/Xxe/Css/publiquiz.css mar. févr. 19 14:32:29 2013 +0100 @@ -490,6 +490,11 @@ /* category ~~~~~~~~~~~~~~~~~~~~~~~~ */ +category:before { + color: #7f7f7f; + content: " " insert-before-button(); +} + category { display: block; margin-bottom: .3em;