Skip to content

Commit 25f0b37

Browse files
mMolieremMoliere
authored
Merge pull request majlis-erc#720 from majlis-erc/719-refresh-mss
refreshed mss
2 parents 5f7de06 + 000883f commit 25f0b37

15 files changed

Lines changed: 995 additions & 392 deletions

‎forms/formGenerator/config.xml‎

Lines changed: 632 additions & 29 deletions
Large diffs are not rendered by default.

‎forms/msSimple/bibliography.xhtml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,12 @@
9393
<xf:setvalue ref="instance('i-availableElements')/*" value="''"></xf:setvalue>
9494
</xf:trigger>
9595
</xf:group>
96-
<xf:trigger appearance="minimal" ref=".[instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography'][@formURL != ''][1]]" class="btn btn-outline-secondary btn-sm controls add showLookup"><xf:label><i class="bi bi-search"></i> Lookup </xf:label><xf:action ev:event="DOMActivate">
96+
<xf:trigger appearance="minimal" ref=".[instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography' or @form=''][@formURL != ''][1]]" class="btn btn-outline-secondary btn-sm controls add showLookup"><xf:label><i class="bi bi-search"></i> Lookup </xf:label><xf:action ev:event="DOMActivate">
9797
<xf:toggle case="bibliographyGrpRepeatLevel11LookupUnHide" ev:event="DOMActivate"></xf:toggle>
9898
<xf:load show="embed" targetid="bibliographyGrpRepeatLevel11subformLookup">
99-
<xf:resource value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())][1]/*:lookup[@form='bibliography'][@formURL != ''][1]/@formURL"></xf:resource>
99+
<xf:resource value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())][1]/*:lookup[@form='bibliography' or @form=''][@formURL != ''][1]/@formURL"></xf:resource>
100100
</xf:load>
101-
<xf:setvalue ref="instance('i-lookup-uri')//uri" value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())][1]/*:lookup[@form='bibliography'][@formURL != ''][1]/@api"></xf:setvalue>
101+
<xf:setvalue ref="instance('i-lookup-uri')//uri" value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())][1]/*:lookup[@form='bibliography' or @form=''][@formURL != ''][1]/@api"></xf:setvalue>
102102
</xf:action>
103103
</xf:trigger>
104104
<xf:trigger appearance="minimal" ref=".[instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())][1]/*:popup[@formURL != '']]" class="btn btn-outline-secondary btn-sm controls add"><xf:label><i class="bi bi-plus"></i> New <xf:output value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/@elementLabel"></xf:output></xf:label><xf:action ev:event="DOMActivate">
@@ -199,12 +199,12 @@
199199
<xf:setvalue ref="instance('i-availableElements')/*" value="''"></xf:setvalue>
200200
</xf:trigger>
201201
</xf:group>
202-
<xf:trigger appearance="minimal" ref=".[instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography'][@formURL != '']]" class="btn btn-outline-secondary btn-sm controls add showLookup"><xf:label><i class="bi bi-search"></i> Lookup </xf:label><xf:action ev:event="DOMActivate">
202+
<xf:trigger appearance="minimal" ref=".[instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography' or @form=''][@formURL != '']]" class="btn btn-outline-secondary btn-sm controls add showLookup"><xf:label><i class="bi bi-search"></i> Lookup </xf:label><xf:action ev:event="DOMActivate">
203203
<xf:toggle case="bibliographyGrpRepeatLevel11GrpRepeatLevel1LookupUnHide" ev:event="DOMActivate"></xf:toggle>
204204
<xf:load show="embed" targetid="bibliographyGrpRepeatLevel11GrpRepeatLevel1subformLookup">
205-
<xf:resource value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography'][@formURL != '']/@formURL"></xf:resource>
205+
<xf:resource value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography' or @form=''][@formURL != '']/@formURL"></xf:resource>
206206
</xf:load>
207-
<xf:setvalue ref="instance('i-lookup-uri')//uri" value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography'][@formURL != '']/@api"></xf:setvalue>
207+
<xf:setvalue ref="instance('i-lookup-uri')//uri" value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography' or @form=''][@formURL != '']/@api"></xf:setvalue>
208208
</xf:action>
209209
</xf:trigger>
210210
<xf:trigger appearance="minimal" ref=".[instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())][1]/*:popup[@formURL != '']]" class="btn btn-outline-secondary btn-sm controls add"><xf:label><i class="bi bi-plus"></i> New <xf:output value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/@elementLabel"></xf:output></xf:label><xf:action ev:event="DOMActivate">
@@ -305,12 +305,12 @@
305305
<xf:setvalue ref="instance('i-availableElements')/*" value="''"></xf:setvalue>
306306
</xf:trigger>
307307
</xf:group>
308-
<xf:trigger appearance="minimal" ref=".[instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography'][@formURL != '']]" class="btn btn-outline-secondary btn-sm controls add showLookup"><xf:label><i class="bi bi-search"></i> Lookup </xf:label><xf:action ev:event="DOMActivate">
308+
<xf:trigger appearance="minimal" ref=".[instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography' or @form=''][@formURL != '']]" class="btn btn-outline-secondary btn-sm controls add showLookup"><xf:label><i class="bi bi-search"></i> Lookup </xf:label><xf:action ev:event="DOMActivate">
309309
<xf:toggle case="bibliographyGrpRepeatLevel11GrpRepeatLevel1RepeatLevel2LookupUnHide" ev:event="DOMActivate"></xf:toggle>
310310
<xf:load show="embed" targetid="bibliographyGrpRepeatLevel11GrpRepeatLevel1RepeatLevel2subformLookup">
311-
<xf:resource value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography'][@formURL != '']/@formURL"></xf:resource>
311+
<xf:resource value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography' or @form=''][@formURL != '']/@formURL"></xf:resource>
312312
</xf:load>
313-
<xf:setvalue ref="instance('i-lookup-uri')//uri" value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography'][@formURL != '']/@api"></xf:setvalue>
313+
<xf:setvalue ref="instance('i-lookup-uri')//uri" value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography' or @form=''][@formURL != '']/@api"></xf:setvalue>
314314
</xf:action>
315315
</xf:trigger>
316316
<xf:trigger appearance="minimal" ref=".[instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())][1]/*:popup[@formURL != '']]" class="btn btn-outline-secondary btn-sm controls add"><xf:label><i class="bi bi-plus"></i> New <xf:output value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/@elementLabel"></xf:output></xf:label><xf:action ev:event="DOMActivate">
@@ -411,12 +411,12 @@
411411
<xf:setvalue ref="instance('i-availableElements')/*" value="''"></xf:setvalue>
412412
</xf:trigger>
413413
</xf:group>
414-
<xf:trigger appearance="minimal" ref=".[instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography'][@formURL != '']]" class="btn btn-outline-secondary btn-sm controls add showLookup"><xf:label><i class="bi bi-search"></i> Lookup </xf:label><xf:action ev:event="DOMActivate">
414+
<xf:trigger appearance="minimal" ref=".[instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography' or @form=''][@formURL != '']]" class="btn btn-outline-secondary btn-sm controls add showLookup"><xf:label><i class="bi bi-search"></i> Lookup </xf:label><xf:action ev:event="DOMActivate">
415415
<xf:toggle case="bibliographyGrpRepeatLevel11GrpRepeatLevel1RepeatLevel2RepeatLevel3LookupUnHide" ev:event="DOMActivate"></xf:toggle>
416416
<xf:load show="embed" targetid="bibliographyGrpRepeatLevel11GrpRepeatLevel1RepeatLevel2RepeatLevel3subformLookup">
417-
<xf:resource value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography'][@formURL != '']/@formURL"></xf:resource>
417+
<xf:resource value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography' or @form=''][@formURL != '']/@formURL"></xf:resource>
418418
</xf:load>
419-
<xf:setvalue ref="instance('i-lookup-uri')//uri" value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography'][@formURL != '']/@api"></xf:setvalue>
419+
<xf:setvalue ref="instance('i-lookup-uri')//uri" value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/*:lookup[@form='bibliography' or @form=''][@formURL != '']/@api"></xf:setvalue>
420420
</xf:action>
421421
</xf:trigger>
422422
<xf:trigger appearance="minimal" ref=".[instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())][1]/*:popup[@formURL != '']]" class="btn btn-outline-secondary btn-sm controls add"><xf:label><i class="bi bi-plus"></i> New <xf:output value="instance('i-bibliography-schemaConstraints')/*[local-name() = local-name(current())]/@elementLabel"></xf:output></xf:label><xf:action ev:event="DOMActivate">

0 commit comments

Comments
 (0)