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

- Fix für SciDepartmentProjectsTabO 

- Integriertes Mandalay-Theme auf aktuellen Stand gebracht


git-svn-id: https://svn.libreccm.org/ccm/trunk@1675 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2012-05-21 14:05:39 +00:00
parent 26395fc5a8
commit 697835822b
16 changed files with 46 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciDepartment/SciDepartmentMembersTab.xsl
View File

@ -216,8 +216,8 @@
<xsl:attribute name="href">
<xsl:value-of select="./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']/value"/>
</xsl:attribute>
<xsl:if test="string-length(./titlePre) &gt; 0">
<xsl:value-of select="./titlePre"/>
<xsl:if test="string-length(./titlepre) &gt; 0">
<xsl:value-of select="./titlepre"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="string-length(./givenname) &gt; 0">
@ -227,16 +227,16 @@
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./surname"/>
</xsl:if>
<xsl:if test="string-length(./titlePost) &gt; 0">
<xsl:if test="string-length(./titlepost) &gt; 0">
<xsl:text>, </xsl:text>
<xsl:value-of select="./titlePost"/>
<xsl:value-of select="./titlepost"/>
</xsl:if>
</a>
</xsl:when>
<xsl:otherwise>
<span class="CIname memberName">
<xsl:if test="string-length(./titlePre) &gt; 0">
<xsl:value-of select="./titlePre"/>
<xsl:if test="string-length(./titlepre) &gt; 0">
<xsl:value-of select="./titlepre"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="string-length(./givenname) &gt; 0">
@ -246,9 +246,9 @@
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./surname"/>
</xsl:if>
<xsl:if test="string-length(./titlePost) &gt; 0">
<xsl:if test="string-length(./titlepost) &gt; 0">
<xsl:text>, </xsl:text>
<xsl:value-of select="./titlePost"/>
<xsl:value-of select="./titlepost"/>
</xsl:if>
</span>
</xsl:otherwise>
@ -303,8 +303,8 @@
</xsl:otherwise>
</xsl:choose>
</span>
</span>
<xsl:text> </xsl:text>
</span><br/>
<!-- <xsl:text> </xsl:text> -->
</xsl:if>
</xsl:for-each>
<xsl:if test="($showAddress = 'true') and (string-length(./contacts/address/address) &gt; 0)">

8
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciDepartment/SciDepartmentProjectsTab.xsl
View File

@ -272,12 +272,12 @@
<xsl:with-param name="id" select="'projectsTab/projectHeadPostText'"/>
</xsl:call-template>
</xsl:if>
<xsl:for-each select="./persons">
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./givenname"/>
<xsl:for-each select="./members/member">
<xsl:if test="string-length(./givenName) &gt; 0">
<xsl:value-of select="./givenName"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:if test="string-length(./surname) &gt; 0">
<xsl:value-of select="./surname"/>
</xsl:if>
<xsl:if test="./link/role_name = 'head'">

4
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciInstitute/SciInstitute.xsl
View File

@ -101,7 +101,7 @@
</xsl:if>
<ul class="availableData">
<xsl:for-each select="../orgaUnitTabs/availableTabs/availableTab">
<xsl:for-each select="./orgaUnitTabs/availableTabs/availableTab">
<li>
<xsl:if test="./@selected = 'true'">
<xsl:attribute name="class">selectedTab active</xsl:attribute>
@ -127,7 +127,7 @@
</xsl:for-each>
</ul>
<xsl:apply-templates select="../orgaUnitTabs/selectedTab" mode="tabs"/>
<xsl:apply-templates select="./orgaUnitTabs/selectedTab" mode="tabs"/>
</div>
</xsl:template>

23
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciInstitute/SciInstituteMembersTab.xsl
View File

@ -212,13 +212,13 @@
<xsl:for-each select="./member">
<li class="sciMember">
<xsl:choose>
<xsl:when test="($linkMembers = 'true') and ($showContactData = 'true')">
<xsl:when test="($linkMembers = 'true') and ($showContactData = 'true') and (string-length(./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']) &gt; 0)">
<a class="CIname memberName">
<xsl:attribute name="href">
<xsl:value-of select="./contacts/contactentries[keyId='homepage']/value"/>
<xsl:value-of select="./contacts/contact[@contactType='commonContact']/contactentries[keyId='homepage']/value"/>
</xsl:attribute>
<xsl:if test="string-length(./titlePre) &gt; 0">
<xsl:value-of select="./titlePre"/>
<xsl:if test="string-length(./titlepre) &gt; 0">
<xsl:value-of select="./titlepre"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="string-length(./givenname) &gt; 0">
@ -228,15 +228,15 @@
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./surname"/>
</xsl:if>
<xsl:if test="string-length(./titlePost) &gt; 0">
<xsl:if test="string-length(./titlepost) &gt; 0">
<xsl:text>, </xsl:text>
<xsl:value-of select="./titlePost"/>
<xsl:value-of select="./titlepost"/>
</xsl:if>
</a>
</xsl:when>
<xsl:otherwise>
<span class="CIname memberName">
<xsl:if test="string-length(./titlePre) &gt; 0">
<xsl:if test="string-length(./titlepre) &gt; 0">
<xsl:value-of select="./titlePre"/>
<xsl:text> </xsl:text>
</xsl:if>
@ -247,9 +247,9 @@
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./surname"/>
</xsl:if>
<xsl:if test="string-length(./titlePost) &gt; 0">
<xsl:if test="string-length(./titlepost) &gt; 0">
<xsl:text>, </xsl:text>
<xsl:value-of select="./titlePost"/>
<xsl:value-of select="./titlepost"/>
</xsl:if>
</span>
</xsl:otherwise>
@ -258,7 +258,7 @@
<xsl:if test="$showContactData = 'true'">
<span class="contact">
<xsl:for-each select="./contacts/contactentries">
<xsl:for-each select="./contacts/contact[@contactType='commonContact']/contactentries">
<xsl:sort select="key"/>
<xsl:variable name="showContactEntry">
<xsl:call-template name="mandalay:getSetting">
@ -305,7 +305,8 @@
</xsl:choose>
</span>
</span>
<xsl:text> </xsl:text>
<br/>
<!-- <xsl:text> </xsl:text>-->
</xsl:if>
</xsl:for-each>
<xsl:if test="($showAddress = 'true') and (string-length(./contacts/address/address) &gt; 0)">

8
ccm-sci-bundle/web/themes/mandalay/user/includes/types/SciInstitute/SciInstituteProjectsTab.xsl
View File

@ -271,12 +271,12 @@
<xsl:with-param name="id" select="'projectsTab/projectHeadPostText'"/>
</xsl:call-template>
</xsl:if>
<xsl:for-each select="./persons">
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:value-of select="./givenname"/>
<xsl:for-each select="./members/member">
<xsl:if test="string-length(./givenName) &gt; 0">
<xsl:value-of select="./givenName"/>
<xsl:text> </xsl:text>
</xsl:if>
<xsl:if test="string-length(./givenname) &gt; 0">
<xsl:if test="string-length(./surname) &gt; 0">
<xsl:value-of select="./surname"/>
</xsl:if>
<xsl:if test="./link/role_name = 'head'">

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

@ -202,7 +202,7 @@
<xsl:if test="./publications">
<ul class="publicationList">
<xsl:for-each select="publications">
<xsl:for-each select="./publications">
<li class="sciPublication">
<xsl:apply-templates select="." mode="list_view"/>
</li>

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

@ -187,6 +187,7 @@
<xsl:value-of select="./title"/>
</a>
<br/>
<xsl:if test="count(./heads/head) &gt; 0">
<xsl:call-template name="mandalay:getStaticText">
<xsl:with-param name="module" select="'SciInstitute'"/>
<xsl:with-param name="id" select="'departmentHeadPreText'"/>
@ -256,6 +257,7 @@
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
</xsl:if>
</li>
</xsl:for-each>
</ul>

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

@ -436,7 +436,7 @@
<xsl:with-param name="surname" select="./surname"/>
<xsl:with-param name="givenName" select="./givenname"/>
<xsl:with-param name="isEditor" select="./@isEditor"/>
<xsl:with-param name="authorsCount" select="count(../authors/author)"/>
<xsl:with-param name="authorsCount" select="count(../author)"/>
<xsl:with-param name="position" select="position()"/>
</xsl:apply-templates>
</xsl:for-each>

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

@ -440,7 +440,7 @@
<xsl:with-param name="surname" select="./surname"/>
<xsl:with-param name="givenName" select="./givenname"/>
<xsl:with-param name="isEditor" select="./@isEditor"/>
<xsl:with-param name="authorsCount" select="count(../authors)"/>
<xsl:with-param name="authorsCount" select="count(../author)"/>
<xsl:with-param name="position" select="position()"/>
</xsl:apply-templates>
</xsl:for-each>

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

@ -435,7 +435,7 @@
<xsl:with-param name="surname" select="./surname"/>
<xsl:with-param name="givenName" select="./givenname"/>
<xsl:with-param name="isEditor" select="./@isEditor"/>
<xsl:with-param name="authorsCount" select="count(../authors)"/>
<xsl:with-param name="authorsCount" select="count(../author)"/>
<xsl:with-param name="position" select="position()"/>
</xsl:apply-templates>
</xsl:for-each>

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

@ -343,7 +343,7 @@
<xsl:with-param name="surname" select="./surname"/>
<xsl:with-param name="givenName" select="./givenname"/>
<xsl:with-param name="isEditor" select="./@isEditor"/>
<xsl:with-param name="authorsCount" select="count(../authors/author)"/>
<xsl:with-param name="authorsCount" select="count(../author)"/>
<xsl:with-param name="position" select="position()"/>
</xsl:apply-templates>
</xsl:for-each>

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

@ -374,7 +374,7 @@
<xsl:with-param name="surname" select="./surname"/>
<xsl:with-param name="givenName" select="./givenname"/>
<xsl:with-param name="isEditor" select="./@isEditor"/>
<xsl:with-param name="authorsCount" select="count(./authors/author)"/>
<xsl:with-param name="authorsCount" select="count(../author)"/>
<xsl:with-param name="position" select="position()"/>
</xsl:apply-templates>
</xsl:for-each>

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

@ -432,7 +432,7 @@
<xsl:with-param name="surname" select="./surname"/>
<xsl:with-param name="givenName" select="./givenname"/>
<xsl:with-param name="isEditor" select="@isEditor"/>
<xsl:with-param name="authorsCount" select="count(../authors/author)"/>
<xsl:with-param name="authorsCount" select="count(../author)"/>
<xsl:with-param name="position" select="position()"/>
</xsl:apply-templates>
</xsl:for-each>
@ -451,6 +451,7 @@
</xsl:apply-templates>
</xsl:for-each>
</xsl:variable>
<!-- Call template for standard format -->
<xsl:apply-templates select="document(concat($theme-prefix, '/settings/', $formatDefFile))/bibrefFormat/bibrefMonographFormat">
<xsl:with-param name="authors" select="$authors"/>

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

@ -333,6 +333,7 @@
<!-- technical data -->
<xsl:param name="oid"/>
<xsl:param name="useRelativeUrl" select="'false'"/>
<xsl:apply-templates>
<!-- publication data -->
<xsl:with-param name="authors" select="$authors"/>

2
ccm-sci-bundle/web/themes/mandalay/user/includes/types/public-personal-profile/public-personal-profile.xsl
View File

@ -268,7 +268,7 @@
</xsl:call-template>
</xsl:variable>
<xsl:if test="$setOwnerImage = 'true'">
<xsl:for-each select="../profileOwner/owner">
<xsl:for-each select="./profileOwner/owner">
<xsl:call-template name="mandalay:imageAttachment">
<xsl:with-param name="maxWidth">
<xsl:call-template name="mandalay:getSetting">

3
ccm-sci-types-department/src/com/arsdigita/cms/contenttypes/ui/SciDepartmentProjectsTab.java
View File

@ -309,7 +309,8 @@ public class SciDepartmentProjectsTab implements GenericOrgaUnitTab {
final long start = System.currentTimeMillis();
final XmlGenerator generator = new XmlGenerator(project);
generator.setItemElemName("project", "");
generator.setUseExtraXml(false);
generator.setUseExtraXml(true);
generator.setListMode(true);
generator.generateXML(state, parent, "");
logger.debug(String.format("Generated XML for project '%s' in %d ms.",
project.getName(),