From 93bf5882cc6706aef490481051917bd34778ee11 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 24 Apr 2015 16:20:30 +0000
Subject: [PATCH] Foundry:     - More tags for publication types     -
 JavaScript for Double Click Protection in the Content Centre was missing

git-svn-id: https://svn.libreccm.org/ccm/trunk@3358 8810af33-2d31-482b-a856-94f89814c4df
---
 .../lib/template-tags/content-items.xsl       |  4 +-
 .../content-items/scipublications.xsl         | 69 +++++++++++++++++--
 .../foundry/lib/template-tags/data-tags.xsl   |  4 ++
 .../web/themes/foundry/foundry/scripts/dcp.js | 31 +++++++++
 .../foundry/templates/admin-layout.xml        |  1 +
 5 files changed, 102 insertions(+), 7 deletions(-)
 create mode 100644 ccm-core/web/themes/foundry/foundry/scripts/dcp.js

diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
index 2b0fb5c5d..5ed079dc4 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items.xsl
@@ -417,7 +417,9 @@
         <xsl:variable name="category" select="foundry:read-current-category()"/>
         
         <xsl:variable name="content-type" 
-                      select="$contentitem-tree/nav:attribute[@name = 'objectType']"/>
+                      select="if ($contentitem-tree/nav:attribute[@name = 'objectType'])
+                              then $contentitem-tree/nav:attribute[@name = 'objectType']
+                              else $contentitem-tree/objectType"/>
         
         <xsl:variable name="style">
             <xsl:choose>
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
index 04274506f..0b90f5cf9 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
@@ -108,7 +108,7 @@
         <xsl:value-of select="concat(./@before, $publisher/publisherName, ./@after)"/>
     </xsl:template>
     
-    <xsl:template match="content-item-layout//scipublications//publisher//place">
+    <xsl:template match="content-item-layout//scipublications//publisher//publisher-place">
         <xsl:param name="publisher" tunnel="yes"/>
         
         <xsl:value-of select="concat(./@before, $publisher/place, ./@after)"/>
@@ -198,7 +198,7 @@
         </xsl:if>
     </xsl:template>
 
-    <xsl:template match="content-item-layout//scipublications//series">
+    <xsl:template match="content-item-layout//scipublications//publication-series">
         <xsl:param name="contentitem-tree" tunnel="yes"/>
         
         <xsl:if test="$contentitem-tree/series">
@@ -210,7 +210,7 @@
         </xsl:if>
     </xsl:template>
     
-    <xsl:template match="content-item-layout//scipublications//series//series">
+    <xsl:template match="content-item-layout//scipublications//publication-series//series">
         <xsl:param name="series" tunnel="yes"/>
         
         <xsl:variable name="layout-tree" select="./*"/>
@@ -227,13 +227,13 @@
         </xsl:for-each>
     </xsl:template>
     
-    <xsl:template match="content-item-layout//scipublications//series//series//series-name">
+    <xsl:template match="content-item-layout//scipublications//publication-series//series//series-name">
         <xsl:param name="series-obj" tunnel="yes"/>
         
         <xsl:value-of select="$series-obj/title"/>
     </xsl:template>
     
-    <xsl:template match="content-item-layout//scipublications//series//series//series-volume">
+    <xsl:template match="content-item-layout//scipublications//publication-series//series//series-volume">
         <xsl:param name="series-obj" tunnel="yes"/>
         
         <xsl:value-of select="$series-obj/@volume"/>
@@ -620,7 +620,11 @@
         <xsl:param name="contentitem-tree" tunnel="yes"/>
         
         <xsl:if test="$contentitem-tree/collectedVolume">
-            <xsl:apply-templates/>
+            <xsl:apply-templates>
+                <xsl:with-param name="contentitem-tree" 
+                                tunnel="yes" 
+                                select="$contentitem-tree/collectedVolume"/>
+            </xsl:apply-templates>
         </xsl:if>
     </xsl:template>
     
@@ -638,4 +642,57 @@
         <xsl:value-of select="$contentitem-tree/chapter"/>
     </xsl:template>
     
+    <xsl:template match="content-item-layout//scipublications//if-name-of-conference">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:if test="$contentitem-tree/nameOfConference">
+            <xsl:apply-templates/>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//scipublications//name-of-conference">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:value-of select="$contentitem-tree/nameOfConference"/>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//scipublications//if-place-of-conference">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:if test="$contentitem-tree/placeOfConference">
+            <xsl:apply-templates/>
+        </xsl:if>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//scipublications//place-of-conference">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:value-of select="$contentitem-tree/placeOfConference"/>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//scipublications//date-from-conference">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:value-of select="$contentitem-tree/dateFromOfConference"/>
+    </xsl:template>
+    
+    <xsl:template match="content-item-layout//scipublications//date-to-conference">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:value-of select="$contentitem-tree/dateToOfConference"/>
+    </xsl:template>
+    
+        <xsl:template match="content-item-layout//scipublications//if-proceedings">
+        <xsl:param name="contentitem-tree" tunnel="yes"/>
+        
+        <xsl:if test="$contentitem-tree/proceedings">
+            <xsl:apply-templates>
+                <xsl:with-param name="contentitem-tree" 
+                                tunnel="yes" 
+                                select="$contentitem-tree/proceedings"/>
+            </xsl:apply-templates>
+        </xsl:if>
+    </xsl:template>
+
+    
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl b/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
index 0c6451da7..77056bc07 100644
--- a/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
+++ b/ccm-core/web/themes/foundry/foundry/lib/template-tags/data-tags.xsl
@@ -118,4 +118,8 @@
         <xsl:value-of select="'&#x20;'"/>
     </xsl:template>
     
+    <xsl:template match="show-characters">
+        <xsl:value-of select="."/>
+    </xsl:template>
+    
 </xsl:stylesheet>
diff --git a/ccm-core/web/themes/foundry/foundry/scripts/dcp.js b/ccm-core/web/themes/foundry/foundry/scripts/dcp.js
new file mode 100644
index 000000000..dbe667bc1
--- /dev/null
+++ b/ccm-core/web/themes/foundry/foundry/scripts/dcp.js
@@ -0,0 +1,31 @@
+function doubleClickProtect(element) {
+
+    if (element.nodeName == "INPUT") {
+
+        // change button label
+        elementClone = element.cloneNode(true);
+        elementClone.value = "Bitte warten...";
+
+        // set cloned button and hide the original one
+        element.parentNode.insertBefore(elementClone, element);
+        element.style.display = "none";
+
+        // disable all submit buttons in this form
+        formElements = element.form.elements;
+        for (i = 0; i < formElements.length; i++) {
+            if (formElements[i].tagName == "INPUT" &&
+                    formElements[i].type == "submit" &&
+                    formElements[i] != element)
+                formElements[i].setAttribute("disabled", "disabled");
+        }
+
+    } else {
+
+        // disable link
+        link = element.getAttribute("href");
+        element.text = "Bitte warten...";
+        element.removeAttribute("href");
+        location.href = link;
+    }
+
+}
\ No newline at end of file
diff --git a/ccm-core/web/themes/foundry/foundry/templates/admin-layout.xml b/ccm-core/web/themes/foundry/foundry/templates/admin-layout.xml
index 6614d49c4..5203e9d84 100644
--- a/ccm-core/web/themes/foundry/foundry/templates/admin-layout.xml
+++ b/ccm-core/web/themes/foundry/foundry/templates/admin-layout.xml
@@ -9,6 +9,7 @@
         <load-css-files/>
         <load-jquery/>
         <script src="scripts/category-step.js" origin="internal"/>
+        <script src="scripts/dcp.js" origin="internal"/>
     </head>
     <body id="cms-page">
         <div id="cms-header" class="header-height">