Menu
▾
▴
[Exist-commits] SF.net SVN: exist:[16199] apps/ziziphus
|
From: <win...@us...> - 2012-03-27 15:18:26
|
Revision: 16199
http://exist.svn.sourceforge.net/exist/?rev=16199&view=rev
Author: windauer
Date: 2012-03-27 15:18:13 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
[ziziphus] implemented first version of 'collapse all / none / workrecord / imagerecord'
[ziziphus] implemented 2 column mode View
[ziziphus] started adjusting forms to HeidIcon data
Modified Paths:
--------------
apps/ziziphus/data/example001.xml
apps/ziziphus/data/example002.xml
apps/ziziphus/data/example003.xml
apps/ziziphus/forms/AgentSet.xhtml
apps/ziziphus/forms/CulturalContextSet.xhtml
apps/ziziphus/forms/DateSet.xhtml
apps/ziziphus/forms/DescriptionSet.xhtml
apps/ziziphus/forms/InscriptionSet.xhtml
apps/ziziphus/forms/LocationSet.xhtml
apps/ziziphus/forms/MaterialSet.xhtml
apps/ziziphus/forms/MeasurementsSet.xhtml
apps/ziziphus/forms/RelationSet.xhtml
apps/ziziphus/forms/RightsSet.xhtml
apps/ziziphus/forms/SourceSet.xhtml
apps/ziziphus/forms/StateEditionSet.xhtml
apps/ziziphus/forms/StylePeriodSet.xhtml
apps/ziziphus/forms/SubjectSet.xhtml
apps/ziziphus/forms/TechniqueSet.xhtml
apps/ziziphus/forms/TextrefSet.xhtml
apps/ziziphus/forms/TitleSet.xhtml
apps/ziziphus/forms/WorktypeSet.xhtml
apps/ziziphus/index.xql
apps/ziziphus/modules/vra2html.xql
apps/ziziphus/repo.xml
apps/ziziphus/resources/css/ziziphus.css
apps/ziziphus/resources/script/ziziphus.js
apps/ziziphus/resources/xsl/vra-record.xsl
Modified: apps/ziziphus/data/example001.xml
===================================================================
--- apps/ziziphus/data/example001.xml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/data/example001.xml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<vra xmlns="http://www.vraweb.org/vracore4.htm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vraweb.org/vracore4.htm http://www.vraweb.org/projects/vracore4/vra-4.0-restricted.xsd">
<work id="w_01" source="Core 4 Sample Database (VCat)" refid="1">
- <agentSet xmlns:bf="http://betterform.sourceforge.net/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:vra="http://www.vraweb.org/vracore4.htm" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:exist="http://exist.sourceforge.net/NS/exist">
+ <agentSet xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:vra="http://www.vraweb.org/vracore4.htm" xmlns:bf="http://betterform.sourceforge.net/xforms" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:exist="http://exist.sourceforge.net/NS/exist">
<display dataDate="" extent="" href="" pref="false" refid="" rules="" source="" vocab="" xml:lang=""/>
<notes dataDate="" extent="" href="" pref="false" refid="" rules="" source="" vocab="" xml:lang="">Priya Paul (born 1967), is a prominent woman entrepreneur of India</notes>
<agent dataDate="" extent="" href="" pref="false" refid="" rules="" source="" vocab="" xml:lang="">
Modified: apps/ziziphus/data/example002.xml
===================================================================
--- apps/ziziphus/data/example002.xml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/data/example002.xml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<vra xmlns="http://www.vraweb.org/vracore4.htm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vraweb.org/vracore4.htm http://www.vraweb.org/projects/vracore4/vra-4.0-restricted.xsd">
<work id="w_02" source="Core 4 Sample Database (VCat)" refid="1">
- <agentSet xmlns:vra="http://www.vraweb.org/vracore4.htm" xmlns:bf="http://betterform.sourceforge.net/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:exist="http://exist.sourceforge.net/NS/exist">
+ <agentSet xmlns:bf="http://betterform.sourceforge.net/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:vra="http://www.vraweb.org/vracore4.htm" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:exist="http://exist.sourceforge.net/NS/exist">
<display dataDate="" extent="" href="" pref="false" refid="" rules="" source="" vocab="" xml:lang=""/>
<notes dataDate="" extent="" href="" pref="false" refid="" rules="" source="" vocab="" xml:lang="">Note 2</notes>
<agent dataDate="" extent="" href="" pref="false" refid="" rules="" source="" vocab="" xml:lang="">
Modified: apps/ziziphus/data/example003.xml
===================================================================
--- apps/ziziphus/data/example003.xml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/data/example003.xml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<vra xmlns="http://www.vraweb.org/vracore4.htm" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.vraweb.org/vracore4.htm http://www.vraweb.org/projects/vracore4/vra-4.0-restricted.xsd">
<work id="w_03" source="Core 4 Sample Database (VCat)" refid="1">
- <agentSet xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:vra="http://www.vraweb.org/vracore4.htm" xmlns:bf="http://betterform.sourceforge.net/xforms" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:exist="http://exist.sourceforge.net/NS/exist">
+ <agentSet xmlns:vra="http://www.vraweb.org/vracore4.htm" xmlns:bf="http://betterform.sourceforge.net/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:exist="http://exist.sourceforge.net/NS/exist">
<display dataDate="" extent="" href="" pref="false" refid="" rules="" source="" vocab="" xml:lang=""/>
<notes dataDate="" extent="" href="" pref="false" refid="" rules="" source="" vocab="" xml:lang="">Note 2</notes>
<agent dataDate="" extent="" href="" pref="false" refid="" rules="" source="" vocab="" xml:lang="">
Modified: apps/ziziphus/forms/AgentSet.xhtml
===================================================================
--- apps/ziziphus/forms/AgentSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/AgentSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:vra="http://www.vraweb.org/vracore4.htm" xmlns:bf="http://betterform.sourceforge.net/xforms" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:exist="http://exist.sourceforge.net/NS/exist">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:ev="http://www.w3.org/2001/xml-events" xmlns:vra="http://www.vraweb.org/vracore4.htm" xmlns:bf="http://betterform.sourceforge.net/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xf="http://www.w3.org/2002/xforms" xmlns:exist="http://exist.sourceforge.net/NS/exist">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<title>Ziziphus_Image_DB</title>
@@ -169,7 +169,7 @@
</artist>
</artists>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:agentSet&_wrap=no" replace="instance" instance="i-agentSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:agentSet&_wrap=no" replace="instance" instance="i-agentSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load AgentSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=agentSet" replace="none" ref="instance('i-agentSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/CulturalContextSet.xhtml
===================================================================
--- apps/ziziphus/forms/CulturalContextSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/CulturalContextSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -55,7 +55,7 @@
<culturalContext dataDate="" extent="" href="" xml:lang="" pref="false" refid="" rules="" source="" vocab=""/>
</templates>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:culturalContextSet&_wrap=no" replace="instance" instance="i-culturalContextSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:culturalContextSet&_wrap=no" replace="instance" instance="i-culturalContextSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load CulturalContextSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=culturalContextSet" replace="none" ref="instance('i-culturalContextSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/DateSet.xhtml
===================================================================
--- apps/ziziphus/forms/DateSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/DateSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -68,7 +68,7 @@
</date>
</templates>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:dateSet&_wrap=no" replace="instance" instance="i-dateSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:dateSet&_wrap=no" replace="instance" instance="i-dateSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load DateSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=dateSet" replace="none" ref="instance('i-dateSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/DescriptionSet.xhtml
===================================================================
--- apps/ziziphus/forms/DescriptionSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/DescriptionSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -55,7 +55,7 @@
<description dataDate="" extent="" href="" xml:lang="" pref="false" refid="" rules="" source="" vocab=""/>
</templates>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:descriptionSet&_wrap=no" replace="instance" instance="i-descriptionSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:descriptionSet&_wrap=no" replace="instance" instance="i-descriptionSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load DescriptionSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=descriptionSet" replace="none" ref="instance('i-descriptionSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/InscriptionSet.xhtml
===================================================================
--- apps/ziziphus/forms/InscriptionSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/InscriptionSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -97,7 +97,7 @@
</inscription>
</templates>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:inscriptionSet&_wrap=no" replace="instance" instance="i-inscriptionSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:inscriptionSet&_wrap=no" replace="instance" instance="i-inscriptionSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load InscriptionSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=inscriptionSet" replace="none" ref="instance('i-inscriptionSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/LocationSet.xhtml
===================================================================
--- apps/ziziphus/forms/LocationSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/LocationSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -86,7 +86,7 @@
</location>
</templates>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:locationSet&_wrap=no" replace="instance" instance="i-locationSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:locationSet&_wrap=no" replace="instance" instance="i-locationSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load LocationSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=locationSet" replace="none" ref="instance('i-locationSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/MaterialSet.xhtml
===================================================================
--- apps/ziziphus/forms/MaterialSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/MaterialSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -56,7 +56,7 @@
<material type="" dataDate="" extent="" href="" xml:lang="" pref="false" refid="" rules="" source="" vocab=""/>
</templates>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:materialSet&_wrap=no" replace="instance" instance="i-materialSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:materialSet&_wrap=no" replace="instance" instance="i-materialSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load MaterialSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=materialSet" replace="none" ref="instance('i-materialSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/MeasurementsSet.xhtml
===================================================================
--- apps/ziziphus/forms/MeasurementsSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/MeasurementsSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -58,7 +58,7 @@
<orientation/>
</templates>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:measurementsSet&_wrap=no" replace="instance" instance="i-measurementsSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:measurementsSet&_wrap=no" replace="instance" instance="i-measurementsSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load MeasurementsSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=measurementsSet" replace="none" ref="instance('i-measurementsSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/RelationSet.xhtml
===================================================================
--- apps/ziziphus/forms/RelationSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/RelationSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -84,7 +84,7 @@
<relid>w_a_011</relid>
</relids>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:relationSet&_wrap=no" replace="instance" instance="i-relationSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:relationSet&_wrap=no" replace="instance" instance="i-relationSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load RelationSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=relationSet" replace="none" ref="instance('i-relationSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/RightsSet.xhtml
===================================================================
--- apps/ziziphus/forms/RightsSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/RightsSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -84,7 +84,7 @@
</rights>
</templates>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:rightsSet&_wrap=no" replace="instance" instance="i-rightsSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:rightsSet&_wrap=no" replace="instance" instance="i-rightsSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load RightsSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=rightsSet" replace="none" ref="instance('i-rightsSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/SourceSet.xhtml
===================================================================
--- apps/ziziphus/forms/SourceSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/SourceSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -87,7 +87,7 @@
</source>
</templates>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:sourceSet&_wrap=no" replace="instance" instance="i-sourceSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:sourceSet&_wrap=no" replace="instance" instance="i-sourceSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load SourceSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=sourceSet" replace="none" ref="instance('i-sourceSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/StateEditionSet.xhtml
===================================================================
--- apps/ziziphus/forms/StateEditionSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/StateEditionSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -86,7 +86,7 @@
</stateEdition>
</templates>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:stateEditionSet&_wrap=no" replace="instance" instance="i-stateEditionSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:stateEditionSet&_wrap=no" replace="instance" instance="i-stateEditionSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load StateEditionSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=stateEditionSet" replace="none" ref="instance('i-stateEditionSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/StylePeriodSet.xhtml
===================================================================
--- apps/ziziphus/forms/StylePeriodSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/StylePeriodSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -71,7 +71,7 @@
</vocab>
</vocabularies>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:stylePeriodSet&_wrap=no" replace="instance" instance="i-stylePeriodSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:stylePeriodSet&_wrap=no" replace="instance" instance="i-stylePeriodSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load StylePeriodSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=stylePeriodSet" replace="none" ref="instance('i-stylePeriodSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/SubjectSet.xhtml
===================================================================
--- apps/ziziphus/forms/SubjectSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/SubjectSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -87,7 +87,7 @@
</vocab>
</vocabularies>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:subjectSet&_wrap=no" replace="instance" instance="i-subjectSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:subjectSet&_wrap=no" replace="instance" instance="i-subjectSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load SubjectSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=subjectSet" replace="none" ref="instance('i-subjectSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/TechniqueSet.xhtml
===================================================================
--- apps/ziziphus/forms/TechniqueSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/TechniqueSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -71,7 +71,7 @@
</vocab>
</vocabularies>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:techniqueSet&_wrap=no" replace="instance" instance="i-techniqueSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:techniqueSet&_wrap=no" replace="instance" instance="i-techniqueSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load TechniqueSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=techniqueSet" replace="none" ref="instance('i-techniqueSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/TextrefSet.xhtml
===================================================================
--- apps/ziziphus/forms/TextrefSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/TextrefSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -87,7 +87,7 @@
</textref>
</templates>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:textrefSet&_wrap=no" replace="instance" instance="i-textrefSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:textrefSet&_wrap=no" replace="instance" instance="i-textrefSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load TextrefSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=textrefSet" replace="none" ref="instance('i-textrefSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/TitleSet.xhtml
===================================================================
--- apps/ziziphus/forms/TitleSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/TitleSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -72,7 +72,7 @@
</vocab>
</vocabularies>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:titleSet&_wrap=no" replace="instance" instance="i-titleSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:titleSet&_wrap=no" replace="instance" instance="i-titleSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load TitleSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=titleSet" replace="none" ref="instance('i-titleSet')" method="post" validate="false">
Modified: apps/ziziphus/forms/WorktypeSet.xhtml
===================================================================
--- apps/ziziphus/forms/WorktypeSet.xhtml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/forms/WorktypeSet.xhtml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -71,7 +71,7 @@
</vocab>
</vocabularies>
</xf:instance>
- <xf:submission id="s-load-data" resource="data?_query=//*[@id='{$recordId}']/*:worktypeSet&_wrap=no" replace="instance" instance="i-worktypeSet" method="get" serialize="false" validate="false">
+ <xf:submission id="s-load-data" resource="records?_query=//*[@id='{$recordId}']/*:worktypeSet&_wrap=no" replace="instance" instance="i-worktypeSet" method="get" serialize="false" validate="false">
<xf:message ev:event="xforms-submit-error">Could not load WorktypeSet data</xf:message>
</xf:submission>
<xf:submission id="s-save-data" resource="modules/save2section.xql?id={bf:appContext('recordId')}&section=worktypeSet" replace="none" ref="instance('i-worktypeSet')" method="post" validate="false">
Modified: apps/ziziphus/index.xql
===================================================================
--- apps/ziziphus/index.xql 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/index.xql 2012-03-27 15:18:13 UTC (rev 16199)
@@ -50,14 +50,20 @@
<div dojoType="dijit.MenuBar" id="mainMenu">
<div dojoType="dijit.PopupMenuBarItem" label="View">
-
<div dojoType="dijit.Menu" id="View">
<div data-dojo-type="dijit.CheckedMenuItem" data-dojo-props="onClick:function(){{toggleView(this,'imagerecord')}},checked:true">Image Record</div>
<div data-dojo-type="dijit.CheckedMenuItem" data-dojo-props="onClick:function(){{toggleView(this,'workrecord')}},checked:true">Work Record</div>
<div data-dojo-type="dijit.CheckedMenuItem" data-dojo-props="onClick:function(){{toggleView(this,'imagepane')}},checked:true">Image Area</div>
+ <div data-dojo-type="dijit.CheckedMenuItem" data-dojo-props="onClick:function(){{toggleView(this,'twoColumnMode')}},checked:false">2 column mode</div>
</div>
-
</div>
+ <div dojoType="dijit.PopupMenuBarItem" label="Collapse">
+ <div dojoType="dijit.Menu" id="Collapse">
+ <div id="collapseAll" data-dojo-type="dijit.CheckedMenuItem" data-dojo-props="onClick:function(){{collapse(this,'all')}},checked:false">All</div>
+ <div id="collapseWork" data-dojo-type="dijit.CheckedMenuItem" data-dojo-props="onClick:function(){{collapse(this,'work')}},checked:false">Work Record</div>
+ <div id="collapseImage" data-dojo-type="dijit.CheckedMenuItem" data-dojo-props="onClick:function(){{collapse(this,'image')}},checked:false">Image Record</div>
+ </div>
+ </div>
</div>
{vra2html:createVraRecords($uuid)}
Modified: apps/ziziphus/modules/vra2html.xql
===================================================================
--- apps/ziziphus/modules/vra2html.xql 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/modules/vra2html.xql 2012-03-27 15:18:13 UTC (rev 16199)
@@ -6,21 +6,35 @@
declare namespace vra = "http://www.vraweb.org/vracore4.htm";
declare function vra2html:createVraRecords($uuid as xs:string) {
- let $vraRecord := collection('ziziphus/data')/vra:vra[vra:work/@id = $uuid]
- let $vraWorkRecord := $vraRecord/vra:work[@id = $uuid]
- let $imageRecordId := $vraWorkRecord/vra:relationSet/vra:relation[@pref='true']/@relids
- let $vraImageRecord := $vraRecord/vra:image[@id = $imageRecordId]
- let $vraImageId := $vraImageRecord/vra:relationSet/vra:relation[@pref='true']/@relids
+ let $vraWorkRecord := collection('ziziphus/records')/vra:vra/vra:work[@id = concat('w_',$uuid)]
+ let $imageRecordId := if(exists($vraWorkRecord/vra:relationSet/vra:relation/@pref[.='true']))
+ then $vraWorkRecord/vra:relationSet/vra:relation[@pref='true']/@relids
+ else $vraWorkRecord/vra:relationSet/vra:relation[1]/@relids
+ let $vraImageRecord := collection('ziziphus/records')/vra:vra/vra:image[@id = $imageRecordId]
+ let $vraImageId := $vraImageRecord/@refid
return
+
<div id="mainpanel" data-dojo-type="dijit.layout.BorderContainer" data-dojo-props="design:'sidebars', gutters:true">
<!-- render work record -->
{vra2html:transformVraRecord($vraWorkRecord, $uuid, 'work')}
<!-- render image according to image record -->
<div id="imagepane" data-dojo-type="dijit.layout.ContentPane" data-dojo-props="region:'center'">
+ <div style="color:black;background:white;display:none;">
+ <div>Debug Output</div>
+ <div><span>UUID:</span><span>{$uuid}</span></div>
+ <div><span>WorkRecord:</span><span>{$vraWorkRecord}</span></div>
+ <div><span>WorkRecord ID:</span><span>{$vraWorkRecord/@id}</span></div>
+ <div><span>relids ID:</span><span>{$vraWorkRecord/vra:relationSet/vra:relation[1]/@relids}</span></div>
+ <div><span>ImageRecord ID:</span><span>{$imageRecordId}</span></div>
+ <div><span>ImageRecord:</span><span>{$vraImageRecord}</span></div>
+ <span><span>vraImageId:</span><span>{$vraImageId}</span></span>
+ </div>
<div class="currentImage">
- <img src="resources/images/360/{$vraImageId}" alt="image title" />
- </div>
+ <a href="records/{concat($vraImageId,'.jpg')}" target="_blank">
+ <img id="vraImage" src="records/{concat($vraImageId,'.jpg')}" alt="image title" />
+ </a>
+ </div>
</div>
<!-- render image record -->
Modified: apps/ziziphus/repo.xml
===================================================================
--- apps/ziziphus/repo.xml 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/repo.xml 2012-03-27 15:18:13 UTC (rev 16199)
@@ -11,5 +11,5 @@
<repo:prepare>pre-install.xql</repo:prepare>
<repo:finish>post-install.xql</repo:finish>
<repo:permissions user="editor" password="editor" group="biblio.users" mode="0444"/>
- <deployed>2012-03-14T12:37:52.518+01:00</deployed>
+ <deployed>2012-03-27T13:12:22.994+02:00</deployed>
</repo:meta>
\ No newline at end of file
Modified: apps/ziziphus/resources/css/ziziphus.css
===================================================================
--- apps/ziziphus/resources/css/ziziphus.css 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/resources/css/ziziphus.css 2012-03-27 15:18:13 UTC (rev 16199)
@@ -11,6 +11,10 @@
height:100%;
text-align:center;
}
+.bf .currentImage #vraImage {
+ width:400px;
+}
+
.bf * {
font-size: 10px !important;
}
Modified: apps/ziziphus/resources/script/ziziphus.js
===================================================================
--- apps/ziziphus/resources/script/ziziphus.js 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/resources/script/ziziphus.js 2012-03-27 15:18:13 UTC (rev 16199)
@@ -1,8 +1,47 @@
+
function toggleView(control,target){
- console.debug(control,target);
- if(control.checked){
- dijit.byId("mainpanel").addChild(dijit.byId(target));
- }else{
- dijit.byId("mainpanel").removeChild(dijit.byId(target));
+ // console.debug("toggleView: control:", control, " ,target:",target);
+ if(target == "twoColumnMode" && control.checked){
+ var width = dojo.style("mainpanel","width");
+ var containerSize = (width / 2) - 20;
+ dojo.style(dojo.byId("workrecord"), "width", (containerSize +"px"));
+ dojo.style(dojo.byId("imagerecord"), "width", (containerSize +"px"));
+ dijit.byId("mainpanel").layout();
+ } else if(target == "twoColumnMode" && !control.checked) {
+ dojo.style(dojo.byId("workrecord"), "width", "20%");
+ dojo.style(dojo.byId("imagerecord"), "width", "20%");
+ dijit.byId("mainpanel").layout();
+ }else {
+ if(control.checked){
+ dijit.byId("mainpanel").addChild(dijit.byId(target));
+ }else{
+ dijit.byId("mainpanel").removeChild(dijit.byId(target));
+ }
}
}
+function collapse(control,target){
+ console.debug("collapse: control:", control, " ,target:",target);
+ var open = control.checked;
+ var node;
+ if(target == "work") {
+ node = dojo.byId("workrecord");
+ }
+ else if(target == "image"){
+ node = dojo.byId("imagerecord");
+ }else {
+ node = dojo.body();
+ }
+ if(target != "all" && !open){
+ dijit.byId("collapseAll").set("checked",false);
+ }
+ if(target == "all" && open){
+ dijit.byId("collapseWork").set("checked",true);
+ dijit.byId("collapseImage").set("checked",true);
+ }
+ dojo.query(".dijitTitlePane",node).forEach(function(item){
+ dijit.byId(item.id)._setOpenAttr(open,true);
+ });
+ if(dijit.byId("collapseWork").get("checked") && dijit.byId("collapseImage").get("checked")){
+ dijit.byId("collapseAll").set("checked",true);
+ }
+}
Modified: apps/ziziphus/resources/xsl/vra-record.xsl
===================================================================
--- apps/ziziphus/resources/xsl/vra-record.xsl 2012-03-27 10:36:02 UTC (rev 16198)
+++ apps/ziziphus/resources/xsl/vra-record.xsl 2012-03-27 15:18:13 UTC (rev 16199)
@@ -31,14 +31,89 @@
<div class="columntitle">
<xsl:value-of select="$title"/>
</div>
- <xsl:apply-templates mode="titlePane"/>
+ <!--<xsl:apply-templates mode="titlePane"/>-->
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'AgentSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:agentSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'CulturalContextSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:culturalContextSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'DateSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:dateSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'DescriptionSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:descriptionSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'InscriptionSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:inscriptionSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'LocationSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:locationSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'MaterialSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:materialSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'MeasurementsSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:measurementsSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'RelationSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:relationSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'RightsSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:rightsSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'SourceSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:sourceSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'StateEditionSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:stateEditionSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'StylePeriodSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:stylePeriodSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'SubjectSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:subjectSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'TechniqueSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:techniqueSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'TextrefSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:textrefSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'TitleSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:titleSet"/>
+ </xsl:call-template>
+ <xsl:call-template name="titlePane">
+ <xsl:with-param name="vraSetName" select="'WorktypeSet'"/>
+ <xsl:with-param name="vraSetNode" select="vra:worktypeSet"/>
+ </xsl:call-template>
</div>
</xsl:template>
- <xsl:template match="vra:work/*|vra:image/*" mode="titlePane">
- <xsl:variable name="title" select="bfn:sectionTitle(local-name(.))"/>
- <xsl:variable name="id" select="concat($id_pref,$title)"/>
- <xsl:variable name="formName" select="bfn:upperCase(local-name(.))"/>
- <div id="{$id}" data-dojo-type="dijit.TitlePane" data-dojo-props="title: '{$title}',open:false">
+ <xsl:template match="vra:work/vra:image" mode="titlePane" priority="40"/>
+ <xsl:template name="titlePane">
+ <xsl:param name="vraSetName"/>
+ <xsl:param name="vraSetNode" as="node()?"/>
+ <xsl:variable name="title" select="bfn:sectionTitle($vraSetName)"/>
+ <xsl:variable name="id" select="concat($id_pref,$vraSetName)"/>
+ <!--<xsl:variable name="formName" select="$vraSetName"/>-->
+ <div id="{$id}" data-dojo-type="dijit.TitlePane" data-dojo-props="title: '{$title}',open:true">
<xsl:variable name="mountPoint" select="concat($id,'_MountPoint')"/>
<xsl:variable name="caseId" select="concat('c-',$id)"/>
<xf:switch>
@@ -47,11 +122,11 @@
<xf:trigger class="t-edit">
<xf:label/>
<xf:action>
-<!-- <xf:message><xsl:value-of select="$type"/></xf:message>-->
+ <!-- <xf:message><xsl:value-of select="$type"/></xf:message>-->
<xf:setvariable name="record" select="'{$type}'"/>
<xf:setvariable name="recordId" select="'{$recordId}'"/>
<xf:load show="embed" targetid="{$mountPoint}">
- <xf:resource value="'forms/{$formName}.xhtml#xforms'"/>
+ <xf:resource value="'forms/{$vraSetName}.xhtml#xforms'"/>
<xf:extension includeCSS="false" includeScript="false"/>
</xf:load>
<xf:toggle case="{$caseId}-edit"/>
@@ -61,7 +136,7 @@
</xf:trigger>
</div>
<div id="{concat($id,'_HtmlContent')}">
- <xsl:apply-templates select="."/>
+ <xsl:apply-templates select="$vraSetNode"/>
</div>
</xf:case>
<xf:case id="{$caseId}-edit">
@@ -77,19 +152,19 @@
</xf:switch>
</div>
</xsl:template>
-
-<!-- <xsl:template match="*[exists(*)]" priority="20">
- <xsl:variable name="nodeName" select="local-name(.)"/>
- <div class="{$nodeName}">
- <div class="{$nodeName}Label complexLabel">
- <xsl:value-of select="bfn:upperCase($nodeName)"/>:</div>
- <div class="attrEntry">
- <xsl:apply-templates select="@*" />
+
+ <!-- <xsl:template match="*[exists(*)]" priority="20">
+ <xsl:variable name="nodeName" select="local-name(.)"/>
+ <div class="{$nodeName}">
+ <div class="{$nodeName}Label complexLabel">
+ <xsl:value-of select="bfn:upperCase($nodeName)"/>:</div>
+ <div class="attrEntry">
+ <xsl:apply-templates select="@*" />
+ </div>
+ <xsl:apply-templates select="*" />
</div>
- <xsl:apply-templates select="*" />
- </div>
- </xsl:template>
--->
+ </xsl:template>
+ -->
<xsl:template match="*[not(exists(*))]" priority="10">
<xsl:choose>
<xsl:when test="string-length(.) gt 0">
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|