LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BugFix for Proceedings in Mandalay and some other minor things (formatting) 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2974 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-11-18 10:19:36 +00:00
parent 6c93b16b63
commit dfbf54d11e
3 changed files with 113 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-sci-bundle/src/ccm-sci-bundle.load
View File

@ -8,7 +8,7 @@
<initializer class="com.arsdigita.cms.Initializer"/> <initializer class="com.arsdigita.cms.Initializer"/>
<initializer class="com.arsdigita.portalworkspace.Initializer"/> <initializer class="com.arsdigita.portalworkspace.Initializer"/>
<initializer class="com.arsdigita.subsite.Initializer"/> <initializer class="com.arsdigita.subsite.Initializer"/>
<initializer class="com.arsdigita.london.search.Initializer"/> <!--<initializer class="com.arsdigita.london.search.Initializer"/>-->
<initializer class="com.arsdigita.london.terms.Initializer"/> <initializer class="com.arsdigita.london.terms.Initializer"/>
</requires> </requires>

221
ccm-sci-bundle/web/themes/mandalay/includes/portal/workspace.xsl
View File

@ -31,122 +31,123 @@
<!-- Autor: Sören Bernstein --> <!-- Autor: Sören Bernstein -->
<xsl:stylesheet <xsl:stylesheet
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:bebop="http://www.arsdigita.com/bebop/1.0" xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:mandalay="http://mandalay.quasiweb.de" xmlns:mandalay="http://mandalay.quasiweb.de"
xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0" xmlns:portlet="http://www.uk.arsdigita.com/portlet/1.0"
exclude-result-prefixes="xsl bebop cms nav mandalay portal portlet" exclude-result-prefixes="xsl bebop cms nav mandalay portal portlet"
version="1.0"> version="1.0">
<!-- DE Importiere wichtige Funktionen --> <!-- DE Importiere wichtige Funktionen -->
<!-- EN using toolbox --> <!-- EN using toolbox -->
<xsl:template match="portal:workspace"> <xsl:template match="portal:workspace">
<xsl:apply-templates select="*[not(self::bebop:link)]"/> <!--<xsl:apply-templates select="*[not(self::bebop:link)]"/>-->
</xsl:template> <xsl:apply-templates/>
</xsl:template>
<xsl:template match="portal:workspaceDetails"> <xsl:template match="portal:workspaceDetails">
<div class="workspaceDetails"> <div class="workspaceDetails">
<xsl:choose> <xsl:choose>
<xsl:when test="../@id != 'view'"> <xsl:when test="../@id != 'view'">
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:call-template name="mandalay:linkParser"> <xsl:call-template name="mandalay:linkParser">
<xsl:with-param name="link" select="./primaryURL"/> <xsl:with-param name="link" select="./primaryURL"/>
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:attribute>
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'portal'"/> <xsl:with-param name="module" select="'portal'"/>
<xsl:with-param name="id" select="'workspace/view/title'"/> <xsl:with-param name="id" select="'workspace/view/title'"/>
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:attribute>
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'portal'"/> <xsl:with-param name="module" select="'portal'"/>
<xsl:with-param name="id" select="'workspace/view/link'"/> <xsl:with-param name="id" select="'workspace/view/link'"/>
</xsl:call-template> </xsl:call-template>
</a> </a>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'portal'"/> <xsl:with-param name="module" select="'portal'"/>
<xsl:with-param name="id" select="'workspace/view/text'"/> <xsl:with-param name="id" select="'workspace/view/text'"/>
</xsl:call-template> </xsl:call-template>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
&nbsp; &nbsp;
<xsl:choose> <xsl:choose>
<xsl:when test="../@id != 'edit' and @canEdit = 'true'"> <xsl:when test="../@id != 'edit' and @canEdit = 'true'">
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:call-template name="mandalay:linkParser"> <xsl:call-template name="mandalay:linkParser">
<xsl:with-param name="link" select="concat(./primaryURL, 'edit.jsp')"/> <xsl:with-param name="link" select="concat(./primaryURL, 'edit.jsp')"/>
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:attribute>
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'portal'"/> <xsl:with-param name="module" select="'portal'"/>
<xsl:with-param name="id" select="'workspace/edit/title'"/> <xsl:with-param name="id" select="'workspace/edit/title'"/>
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:attribute>
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'portal'"/> <xsl:with-param name="module" select="'portal'"/>
<xsl:with-param name="id" select="'workspace/edit/link'"/> <xsl:with-param name="id" select="'workspace/edit/link'"/>
</xsl:call-template> </xsl:call-template>
</a> </a>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'portal'"/> <xsl:with-param name="module" select="'portal'"/>
<xsl:with-param name="id" select="'workspace/edit/text'"/> <xsl:with-param name="id" select="'workspace/edit/text'"/>
</xsl:call-template> </xsl:call-template>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
&nbsp; &nbsp;
<xsl:choose> <xsl:choose>
<xsl:when test="../@id != 'admin' and @canAdmin = 'true'"> <xsl:when test="../@id != 'admin' and @canAdmin = 'true'">
<a> <a>
<xsl:attribute name="href"> <xsl:attribute name="href">
<xsl:call-template name="mandalay:linkParser"> <xsl:call-template name="mandalay:linkParser">
<xsl:with-param name="link" select="concat(./primaryURL, 'admin/index.jsp')"/> <xsl:with-param name="link" select="concat(./primaryURL, 'admin/index.jsp')"/>
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:attribute>
<xsl:attribute name="title"> <xsl:attribute name="title">
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'portal'"/> <xsl:with-param name="module" select="'portal'"/>
<xsl:with-param name="id" select="'workspace/admin/title'"/> <xsl:with-param name="id" select="'workspace/admin/title'"/>
</xsl:call-template> </xsl:call-template>
</xsl:attribute> </xsl:attribute>
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'portal'"/> <xsl:with-param name="module" select="'portal'"/>
<xsl:with-param name="id" select="'workspace/admin/link'"/> <xsl:with-param name="id" select="'workspace/admin/link'"/>
</xsl:call-template> </xsl:call-template>
</a> </a>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'portal'"/> <xsl:with-param name="module" select="'portal'"/>
<xsl:with-param name="id" select="'workspace/admin/text'"/> <xsl:with-param name="id" select="'workspace/admin/text'"/>
</xsl:call-template> </xsl:call-template>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</div> </div>
</xsl:template> </xsl:template>
<!-- Ist eigendlich überflüssig im XML, bietet keine zusatzliche Funktionalität --> <!-- Ist eigendlich überflüssig im XML, bietet keine zusatzliche Funktionalität -->
<xsl:template match="portal:homepageWorkspace"> <xsl:template match="portal:homepageWorkspace">
<div class="workspaceColumn"> <div class="workspaceColumn">
<xsl:call-template name="mandalay:processAttributes"/> <xsl:call-template name="mandalay:processAttributes"/>
<xsl:apply-templates/> <xsl:apply-templates/>
</div> </div>
<xsl:if test="position() != last()"> <xsl:if test="position() != last()">
<div class="workspaceColumnSpacer"> <div class="workspaceColumnSpacer">
&nbsp; &nbsp;
</div> </div>
</xsl:if> </xsl:if>
</xsl:template> </xsl:template>
</xsl:stylesheet> </xsl:stylesheet>

2
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciPublications/Proceedings.xsl
View File

@ -400,7 +400,7 @@
<xsl:value-of select="./organizer/title" /> <xsl:value-of select="./organizer/title" />
</dd> </dd>
</xsl:if> </xsl:if>
<xsl:if test="($setPlaceOfConference = 'true') and (string-length(./PlaceOfConference) &gt; 0)"> <xsl:if test="($setPlaceOfConference = 'true') and (string-length(./placeOfConference) &gt; 0)">
<dt> <dt>
<xsl:call-template name="mandalay:getStaticText"> <xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciPublications'" /> <xsl:with-param name="module" select="'SciPublications'" />