- Some finetuning for admin styles
- New tag show-date-property for showing date properties

Content-Centre:
- Fixed missing label in AgendaPropertyForm


git-svn-id: https://svn.libreccm.org/ccm/trunk@3312 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2015-04-07 09:54:06 +00:00
parent 2720c63533
commit 7a7f99d723
3 changed files with 47 additions and 2 deletions

View File

@ -112,8 +112,8 @@ public class AgendaPropertyForm extends BasicPageForm
"cms.contenttypes.ui.summary")); "cms.contenttypes.ui.summary"));
add(summary); add(summary);
// add(new Label(AgendaGlobalizationUtil add(new Label(AgendaGlobalizationUtil
// .globalize("cms.contenttypes.ui.agenda.agenda_date"))); .globalize("cms.contenttypes.ui.agenda.agenda_date")));
ParameterModel agendaDateParam = new DateTimeParameter(AGENDA_DATE); ParameterModel agendaDateParam = new DateTimeParameter(AGENDA_DATE);
agendaDateParam agendaDateParam
.addParameterListener(new NotNullValidationListener()); .addParameterListener(new NotNullValidationListener());

View File

@ -641,6 +641,38 @@
</xsl:choose> </xsl:choose>
</xsl:template> </xsl:template>
<xsl:template match="/content-item-layout//show-date-property">
<xsl:param name="contentitem-tree" tunnel="yes"/>
<xsl:variable name="name" select="./@name"/>
<xsl:choose>
<xsl:when test="$contentitem-tree/*[name() = $name]">
<xsl:call-template name="foundry:format-date">
<xsl:with-param name="date-elem"
select="$contentitem-tree/*[name() = $name]"/>
<xsl:with-param name="date-format"
select="./date-format"/>
</xsl:call-template>
</xsl:when>
<xsl:when test="$contentitem-tree/nav:attribute[@name = $name]">
<xsl:call-template name="foundry:format-date">
<xsl:with-param name="date-elem"
select="$contentitem-tree/nav:attribute[@name = $name]"/>
<xsl:with-param name="date-format"
select="./date-format"/>
</xsl:call-template>
</xsl:when>
<xsl:otherwise>
<xsl:if test="foundry:debug-enabled()">
<code>
<xsl:value-of select="concat('No property ', $name, ' found')"/>
</code>
</xsl:if>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
<foundry:doc section="user" type="template-tag"> <foundry:doc section="user" type="template-tag">
<foundry:doc-desc> <foundry:doc-desc>
<p> <p>

View File

@ -1608,6 +1608,19 @@ form#propertyedit input[type='text'] {
max-width: 55%; max-width: 55%;
} }
#content form#pageCreate input[type='text'].day,
#content form#pageCreate input[type='text'].month,
#content form#pageCreate input[type='text'].year,
#content form#pageCreate input[type='text'].hour,
#content form#pageCreate input[type='text'].minute,
form#propertyedit input[type='text'].day,
form#propertyedit input[type='text'].month,
form#propertyedit input[type='text'].year,
form#propertyedit input[type='text'].hour,
form#propertyedit input[type='text'].minute {
width: 2em;
}
#content span.option-group input[value="externalLink"]:checked ~ fieldset[class="internalLink"]{ #content span.option-group input[value="externalLink"]:checked ~ fieldset[class="internalLink"]{
display:none; display:none;
} }