Fixed XSL for (old) terms admin page at /ccm/admin/terms. The features of this admin page have not been integrated into the new admin tab at /ccm/admin completly yet, but they are needed by some APLAWS+ users. This is only a temporary solution, the terms module will integraded into the normal categories soon.

git-svn-id: https://svn.libreccm.org/ccm/trunk@2821 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-08-20 10:35:43 +00:00
parent 7668f285f1
commit 756dcf561e
9 changed files with 374 additions and 285 deletions

View File

@ -9,7 +9,7 @@
name="ScientificCMS" name="ScientificCMS"
prettyName="Scientific CMS" prettyName="Scientific CMS"
version="2.3.0" version="2.3.0"
release="devel-SNAPSHOT-r2816" release="devel-SNAPSHOT-r2820"
webxml="sci-web.xml" webxml="sci-web.xml"
portletxml="sci-portlet.xml" portletxml="sci-portlet.xml"
webapp="libreccm" webapp="libreccm"

View File

@ -20,8 +20,7 @@
along with Mandalay. If not, see <http://www.gnu.org/licenses/>. along with Mandalay. If not, see <http://www.gnu.org/licenses/>.
--> -->
<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: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"
@ -44,7 +43,8 @@
<xsl:import href="../fallback/admin-category-step.xsl"/> <!-- Support for AJAXed load-cat.jsp --> <xsl:import href="../fallback/admin-category-step.xsl"/> <!-- Support for AJAXed load-cat.jsp -->
<xsl:import href="../../../../../ROOT/packages/bebop/xsl/dcp.xsl"/> <xsl:import href="../../../../../ROOT/packages/bebop/xsl/dcp.xsl"/>
<xsl:variable name="here"><xsl:value-of select="$static-prefix"/>/cms/admin/page</xsl:variable> <xsl:variable name="here">
<xsl:value-of select="$static-prefix"/>/cms/admin/page</xsl:variable>
<!-- DE: Einstiegspunkt --> <!-- DE: Einstiegspunkt -->
<xsl:template name="mandalay:fallbackEntryPoint"> <xsl:template name="mandalay:fallbackEntryPoint">
@ -65,7 +65,9 @@
<xsl:template name="mandalay:fallbackAdminLayout"> <xsl:template name="mandalay:fallbackAdminLayout">
<html xmlns:deditor="http://www.arsdigita.com/deditor/1.0"> <html xmlns:deditor="http://www.arsdigita.com/deditor/1.0">
<head> <head>
<title><xsl:value-of select="bebop:title"/></title> <title>
<xsl:value-of select="bebop:title"/>
</title>
<link rel="stylesheet" type="text/css" href="{$legacy-asset-prefix}/css/acs-master.css"/> <link rel="stylesheet" type="text/css" href="{$legacy-asset-prefix}/css/acs-master.css"/>
<link rel="stylesheet" type="text/css" href="{$static-prefix}/cms/admin/cms-admin.css"/> <link rel="stylesheet" type="text/css" href="{$static-prefix}/cms/admin/cms-admin.css"/>
<xsl:call-template name="mandalay:fallbackHeaderStyleSheets"/> <xsl:call-template name="mandalay:fallbackHeaderStyleSheets"/>
@ -74,40 +76,75 @@
<xsl:call-template name="bebop:dcpJavascript"/> <xsl:call-template name="bebop:dcpJavascript"/>
<table id="global-header"> <table id="global-header">
<tr> <tr>
<td id="logo"><img src="{$theme-prefix}/images/aplaws-logo-small.png" height="30" width="30"/></td> <td id="logo">
<td id="context"><xsl:apply-templates select="bebop:contextBar"/></td> <img src="{$theme-prefix}/images/aplaws-logo-small.png" height="30" width="30"/>
<td style="margin: 0; color: #3f3f3f; border: 0; padding: 0; padding-right: 18px;">Welcome <strong><xsl:value-of select="@name" /></strong></td> </td>
<td id="context">
<xsl:apply-templates select="bebop:contextBar"/>
</td>
<td style="margin: 0; color: #3f3f3f; border: 0; padding: 0; padding-right: 18px;">Welcome <strong>
<xsl:value-of select="@name" />
</strong>
</td>
<td> <td>
<table id="global-links"> <table id="global-links">
<tr> <tr>
<td class="global-link-icon"><a href="{cms:globalNavigation/cms:workspace/@href}"><img src="{$here}/home.png" height="18" width="18"/></a></td> <td class="global-link-icon">
<td class="global-link"><a href="{cms:globalNavigation/cms:workspace/@href}">Home</a></td> <a href="{cms:globalNavigation/cms:workspace/@href}">
<img src="{$here}/home.png" height="18" width="18"/>
</a>
</td>
<td class="global-link">
<a href="{cms:globalNavigation/cms:workspace/@href}">Home</a>
</td>
<td class="global-link-icon"><a href="{cms:globalNavigation/cms:signOut/@href}"><img src="{$here}//lock.png" height="18" width="14"/></a></td> <td class="global-link-icon">
<td class="global-link"><a href="{cms:globalNavigation/cms:signOut/@href}">Logout</a></td> <a href="{cms:globalNavigation/cms:signOut/@href}">
<img src="{$here}//lock.png" height="18" width="14"/>
</a>
</td>
<td class="global-link">
<a href="{cms:globalNavigation/cms:signOut/@href}">Logout</a>
</td>
</tr> </tr>
</table> </table>
</td> </td>
</tr> </tr>
</table> </table>
<div id="page-title"><xsl:value-of select="bebop:title"/></div> <div id="page-title">
<xsl:value-of select="bebop:title"/>
</div>
<xsl:if test="bebop:link[@id = 'preview_link']"> <xsl:if test="bebop:link[@id = 'preview_link']">
<xsl:choose> <xsl:choose>
<xsl:when test="bebop:link[@target]"> <xsl:when test="bebop:link[@target]">
<div style="float: right; margin-right: 12px"><a target="{bebop:link/@target}" href="{bebop:link[@id = 'preview_link']/@href}"><xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/></a></div> <div style="float: right; margin-right: 12px">
<a target="{bebop:link/@target}" href="{bebop:link[@id = 'preview_link']/@href}">
<xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/>
</a>
</div>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<div style="float: right; margin-right: 12px"><a href="{bebop:link[@id = 'preview_link']/@href}"><xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/></a></div> <div style="float: right; margin-right: 12px">
<a href="{bebop:link[@id = 'preview_link']/@href}">
<xsl:value-of select="bebop:link[@id = 'preview_link']/bebop:label"/>
</a>
</div>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>
</xsl:if> </xsl:if>
<div><xsl:apply-templates select="*[@id = 'page-body']"/></div> <div>
<xsl:apply-templates select="*[@id = 'page-body']"/>
</div>
<xsl:choose> <xsl:choose>
<xsl:when test="bebop:structure"> <xsl:when test="bebop:structure">
<div><xsl:apply-templates select="bebop:structure"/></div> <div>
<xsl:apply-templates select="bebop:structure"/>
</div>
</xsl:when> </xsl:when>
<xsl:when test="ui:debugPanel"> <xsl:when test="ui:debugPanel">
<div><xsl:apply-templates select="ui:debugPanel"/></div> <div>
<xsl:apply-templates select="ui:debugPanel"/>
</div>
</xsl:when> </xsl:when>
</xsl:choose> </xsl:choose>
</body> </body>
@ -117,7 +154,9 @@
<xsl:template name="mandalay:fallbackAplawsPage"> <xsl:template name="mandalay:fallbackAplawsPage">
<html> <html>
<head> <head>
<title><xsl:value-of select="/bebop:page/bebop:title"/></title> <title>
<xsl:value-of select="/bebop:page/bebop:title"/>
</title>
<meta name="title"> <meta name="title">
<xsl:attribute name="content"> <xsl:attribute name="content">
<xsl:value-of select="/bebop:page/bebop:title"/> <xsl:value-of select="/bebop:page/bebop:title"/>
@ -133,9 +172,12 @@
<xsl:apply-templates select="ui:userBanner"/> <xsl:apply-templates select="ui:userBanner"/>
</div> </div>
<div class="bodyBreadcrumb"> <div class="bodyBreadcrumb">
<a href="/">APLAWS</a>&gt;<xsl:value-of select="/bebop:page/bebop:title"/> <a href="/">APLAWS</a>&gt;
<xsl:value-of select="/bebop:page/bebop:title"/>
</div> </div>
<h1><xsl:value-of select="/bebop:page/bebop:title"/></h1> <h1>
<xsl:value-of select="/bebop:page/bebop:title"/>
</h1>
<div class="bodyContent"> <div class="bodyContent">
<xsl:apply-templates select="*[not(@metadata.tag)]"/> <xsl:apply-templates select="*[not(@metadata.tag)]"/>
</div> </div>

View File

@ -17,32 +17,46 @@
<table class="domainDetails"> <table class="domainDetails">
<thead> <thead>
<tr><th colspan="2">Domain details</th></tr> <tr>
<th colspan="2">Domain details</th>
</tr>
</thead> </thead>
<tbody> <tbody>
<tr class="odd"> <tr class="odd">
<th>Title</th> <th>Title</th>
<td><xsl:value-of select="terms:title"/></td> <td>
<xsl:value-of select="title"/>
</td>
</tr> </tr>
<tr class="even"> <tr class="even">
<th>Key:</th> <th>Key:</th>
<td><xsl:value-of select="terms:key"/></td> <td>
<xsl:value-of select="key"/>
</td>
</tr> </tr>
<tr class="odd"> <tr class="odd">
<th>URL:</th> <th>URL:</th>
<td><xsl:value-of select="terms:url"/></td> <td>
<xsl:value-of select="url"/>
</td>
</tr> </tr>
<tr class="even"> <tr class="even">
<th>Description:</th> <th>Description:</th>
<td><xsl:value-of select="terms:description"/></td> <td>
<xsl:value-of select="description"/>
</td>
</tr> </tr>
<tr class="odd"> <tr class="odd">
<th>Version:</th> <th>Version:</th>
<td><xsl:value-of select="terms:version"/></td> <td>
<xsl:value-of select="version"/>
</td>
</tr> </tr>
<tr class="even"> <tr class="even">
<th>Released:</th> <th>Released:</th>
<td><xsl:value-of select="terms:released"/></td> <td>
<xsl:value-of select="released"/>
</td>
</tr> </tr>
<tr class="odd"> <tr class="odd">
<th>Indexer trained:</th> <th>Indexer trained:</th>
@ -62,18 +76,26 @@
<tr> <tr>
<td>&nbsp;</td> <td>&nbsp;</td>
<td> <td>
<a href="{terms:action[@name='edit']/@url}"><img src="/__ccm__/static/cms/admin/action-group/action-generic.png" width="14" height="14" border="0"/></a> <!--<a href="{terms:action[@name='edit']/@url}">
<img src="/__ccm__/static/cms/admin/action-group/action-generic.png" width="14" height="14" border="0"/>
</a>-->
<a href="{terms:action[@name='edit']/@url}">Edit</a> <a href="{terms:action[@name='edit']/@url}">Edit</a>
<xsl:text>&#160;</xsl:text> <xsl:text>&#160;</xsl:text>
<a href="{terms:action[@name='delete']/@url}"><img src="/__ccm__/static/cms/admin/action-group/action-delete.png" width="14" height="14" border="0"/></a> <!--<a href="{terms:action[@name='delete']/@url}">
<img src="/__ccm__/static/cms/admin/action-group/action-delete.png" width="14" height="14" border="0"/>
</a>-->
<a href="{terms:action[@name='delete']/@url}">Delete</a> <a href="{terms:action[@name='delete']/@url}">Delete</a>
<xsl:text>&nbsp;</xsl:text> <xsl:text>&nbsp;</xsl:text>
<a href="{terms:action[@name='train']/@url}"><img src="{$context-prefix}/assets/action-generic.png" width="14" height="14" border="0"/></a> <!--<a href="{terms:action[@name='train']/@url}">
<img src="{$context-prefix}/assets/action-generic.png" width="14" height="14" border="0"/>
</a>-->
<xsl:choose> <xsl:choose>
<xsl:when test="terms:indexer"> <xsl:when test="terms:indexer">
<a href="{terms:action[@name='train']/@url}">Retrain indexer</a> <a href="{terms:action[@name='train']/@url}">Retrain indexer</a>
<xsl:text>&nbsp;</xsl:text> <xsl:text>&nbsp;</xsl:text>
<a href="{terms:action[@name='untrain']/@url}"><img src="{$context-prefix}/assets/action-delete.png" width="14" height="14" border="0"/></a> <a href="{terms:action[@name='untrain']/@url}">
<img src="{$context-prefix}/assets/action-delete.png" width="14" height="14" border="0"/>
</a>
<a href="{terms:action[@name='untrain']/@url}">Delete indexer</a> <a href="{terms:action[@name='untrain']/@url}">Delete indexer</a>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>

View File

@ -36,11 +36,15 @@
<tr class="{$class}"> <tr class="{$class}">
<xsl:choose> <xsl:choose>
<xsl:when test="@isSelected"> <xsl:when test="@isSelected">
<th><xsl:value-of select="terms:title"/></th> <th>
<xsl:value-of select="title"/>
</th>
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<td> <td>
<a title="{$hint}" href="{terms:action[@name='view']/@url}"><xsl:value-of select="terms:title"/></a> <a title="{$hint}" href="{terms:action[@name='view']/@url}">
<xsl:value-of select="title"/>
</a>
</td> </td>
</xsl:otherwise> </xsl:otherwise>
</xsl:choose> </xsl:choose>

View File

@ -34,9 +34,9 @@
<xsl:if test="not(terms:useContext)"> <xsl:if test="not(terms:useContext)">
<xsl:text>Default</xsl:text> <xsl:text>Default</xsl:text>
</xsl:if> </xsl:if>
<xsl:value-of select="terms:useContext"/> <xsl:value-of select="useContext"/>
</td> </td>
<td><xsl:value-of select="terms:categoryOwner/terms:primaryURL"/></td> <td><xsl:value-of select="categoryOwner/primaryURL"/></td>
<td> <td>
<xsl:for-each select="terms:action"> <xsl:for-each select="terms:action">
<a href="{@url}"><xsl:value-of select="@name"/></a> <a href="{@url}"><xsl:value-of select="@name"/></a>

View File

@ -7,38 +7,54 @@
<xsl:template match="terms:termDetails"> <xsl:template match="terms:termDetails">
<table class="termDetails"> <table class="termDetails">
<thead> <thead>
<tr><th colspan="2">Term details</th></tr> <tr>
<th colspan="2">Term details</th>
</tr>
</thead> </thead>
<tbody> <tbody>
<tr class="even"> <tr class="even">
<th>Unique ID:</th> <th>Unique ID:</th>
<td><xsl:value-of select="terms:uniqueID"/></td> <td>
<xsl:value-of select="uniqueID"/>
</td>
</tr> </tr>
<tr class="odd"> <tr class="odd">
<th>Name</th> <th>Name</th>
<td><xsl:value-of select="terms:model/terms:name"/></td> <td>
<xsl:value-of select="model/name"/>
</td>
</tr> </tr>
<tr class="even"> <tr class="even">
<th>Description:</th> <th>Description:</th>
<td><xsl:value-of select="terms:model/terms:description"/></td> <td>
<xsl:value-of select="model/description"/>
</td>
</tr> </tr>
<tr class="odd"> <tr class="odd">
<th>Shortcut:</th> <th>Shortcut:</th>
<td><xsl:value-of select="terms:shortcut"/></td> <td>
<xsl:value-of select="shortcut"/>
</td>
</tr> </tr>
<tr class="even"> <tr class="even">
<th>In A-Z:</th> <th>In A-Z:</th>
<td><xsl:value-of select="terms:inAtoZ"/></td> <td>
<xsl:value-of select="inAtoZ"/>
</td>
</tr> </tr>
</tbody> </tbody>
<tfoot> <tfoot>
<tr> <tr>
<td></td> <td></td>
<td> <td>
<a href="{terms:action[@name='edit']/@url}"><img src="{$context-prefix}/assets/images/action-generic.png" width="14" height="14" border="0"/></a> <!--<a href="{terms:action[@name='edit']/@url}">
<img src="{$context-prefix}/assets/images/action-generic.png" width="14" height="14" border="0"/>
</a>-->
<a href="{terms:action[@name='edit']/@url}">Edit</a> <a href="{terms:action[@name='edit']/@url}">Edit</a>
<xsl:text>&#160;</xsl:text> <xsl:text>&#160;</xsl:text>
<a href="{terms:action[@name='delete']/@url}"><img src="{$context-prefix}/assets/images/action-delete.png" width="14" height="14" border="0"/></a> <!--<a href="{terms:action[@name='delete']/@url}">
<img src="{$context-prefix}/assets/images/action-delete.png" width="14" height="14" border="0"/>
</a>-->
<a href="{terms:action[@name='delete']/@url}">Delete</a> <a href="{terms:action[@name='delete']/@url}">Delete</a>
<xsl:text>&#160;</xsl:text> <xsl:text>&#160;</xsl:text>
</td> </td>

View File

@ -84,12 +84,12 @@
<tr class="{$class}"> <tr class="{$class}">
<td width="20%"> <td width="20%">
<xsl:value-of select="terms:uniqueID"/> <xsl:value-of select="uniqueID"/>
</td> </td>
<xsl:choose> <xsl:choose>
<xsl:when test="@isSelected"> <xsl:when test="@isSelected">
<th> <th>
<xsl:value-of select="terms:model/terms:name"/> <xsl:value-of select="model/name"/>
<xsl:if test="terms:domain/terms:key"> <xsl:if test="terms:domain/terms:key">
<xsl:text> (</xsl:text> <xsl:text> (</xsl:text>
<xsl:value-of select="terms:domain/terms:key"/> <xsl:value-of select="terms:domain/terms:key"/>
@ -99,7 +99,9 @@
</xsl:when> </xsl:when>
<xsl:otherwise> <xsl:otherwise>
<td> <td>
<a href="{terms:action[@name='view']/@url}"><xsl:value-of select="terms:model/terms:name"/></a> <a href="{terms:action[@name='view']/@url}">
<xsl:value-of select="model/name"/>
</a>
<xsl:if test="terms:domain/terms:key"> <xsl:if test="terms:domain/terms:key">
<xsl:text> (</xsl:text> <xsl:text> (</xsl:text>
<xsl:value-of select="terms:domain/terms:key"/> <xsl:value-of select="terms:domain/terms:key"/>

View File

@ -39,5 +39,8 @@
<css-file media="screen">admin.css</css-file> <css-file media="screen">admin.css</css-file>
<!--<css-file>wysiwyg.css</css-file>--> <!--<css-file>wysiwyg.css</css-file>-->
</application> </application>
<application name="terms">
<css-file media="screen">admin.css</css-file>
</application>
</css-files> </css-files>

View File

@ -37,7 +37,7 @@
<entrypoint application="theme" class="simplePage">content-center.xml</entrypoint> <entrypoint application="theme" class="simplePage">content-center.xml</entrypoint>
<entrypoint application="shortcuts" class="simplePage">content-center.xml</entrypoint> <entrypoint application="shortcuts" class="simplePage">content-center.xml</entrypoint>
<entrypoint application="subsite" class="simplePage">content-center.xml</entrypoint> <entrypoint application="subsite" class="simplePage">content-center.xml</entrypoint>
<entrypoint application="terms" class="simplePage">content-center.xml</entrypoint> <entrypoint application="terms" class="simplePage">terms.xml</entrypoint>
<entrypoint application="rss" class="simplePage">content-center.xml</entrypoint> <entrypoint application="rss" class="simplePage">content-center.xml</entrypoint>
<entrypoint application="portal" class="simplePage">portal.xml</entrypoint> <entrypoint application="portal" class="simplePage">portal.xml</entrypoint>