Some macros and images were improved, enhanced search capabilities.

This commit is contained in:
Gaetan Delannay 2009-11-24 22:41:42 +01:00
parent 7435ff1601
commit 253e61612d
9 changed files with 65 additions and 29 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 232 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 174 B

After

Width:  |  Height:  |  Size: 232 B

Before After
Before After

BIN
gen/plone25/skin/delete.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 239 B

View file

@ -118,8 +118,8 @@
<metal:showDate define-macro="showDateField"
tal:define="v python: field.getAccessor(contextObj)()">
<span tal:condition="showLabel" tal:content="label" class="appyLabel"></span>
<span tal:content="python: v.strftime('%d/%m/') + str(v.year())"></span>
<span tal:condition="python: appyType['format'] == 0"
<span tal:condition="v" tal:content="python: v.strftime('%d/%m/') + str(v.year())"></span>
<span tal:condition="python: v and (appyType['format'] == 0)"
tal:content="python: v.strftime('%H:%M')"></span>
</metal:showDate>
@ -132,7 +132,7 @@
<span tal:condition="showLabel" tal:content="label" class="appyLabel"
tal:attributes="class python: 'appyLabel ' + contextObj.getCssClasses(appyType, asSlave=False);
id python: v"></span>
<tal:severalValues condition="severalValues">
<tal:severalValues condition="python: v and severalValues">
<ul class="appyList">
<tal:items repeat="sv v">
<tal:select condition="appyType/isSelect">
@ -146,7 +146,7 @@
</tal:items>
</ul>
</tal:severalValues>
<tal:singleValue condition="not: severalValues">
<tal:singleValue condition="python: v and not severalValues">
<tal:select condition="appyType/isSelect">
<span tal:replace="python: tool.translate('%s_%s_list_%s' % (contextObj.meta_type, field.getName(), v))"/>
</tal:select>
@ -617,7 +617,7 @@
tal:condition="python: searchName and descr">
<span class="discreet" tal:content="descr"></span><br/><br/>
</td>
<td align="right">
<td align="right" width="25%">
<tal:comment replace="nothing">Appy (top) navigation</tal:comment>
<metal:nav use-macro="here/skyn/macros/macros/appyNavigate"/>
</td>
@ -723,8 +723,9 @@
<tal:comment replace="nothing">Delete the element</tal:comment>
<td class="noPadding">
<img tal:condition="python: member.has_permission('Delete objects', obj)"
src="delete_icon.gif" title="Delete" i18n:domain="plone" i18n:attributes="title" style="cursor:pointer"
tal:attributes="onClick python:'javascript:onDeleteObject(\'%s\')' % obj.UID()"/>
title="Delete" i18n:domain="plone" i18n:attributes="title" style="cursor:pointer"
tal:attributes="src string: $portal_url/skyn/delete.png;
onClick python:'javascript:onDeleteObject(\'%s\')' % obj.UID()"/>
</td>
</tr>
</table>

View file

@ -18,17 +18,6 @@
referenced object (edit, delete, etc).</tal:comment>
<table class="no-style-table" cellpadding="0" cellspacing="0">
<tr>
<tal:comment replace="nothing">Edit the element</tal:comment>
<td class="noPadding"><a tal:attributes="href python: obj.absolute_url() + '/skyn/edit'"
tal:condition="python: member.has_permission('Modify portal content', obj)">
<img src="edit.gif" title="label_edit" i18n:domain="plone" i18n:attributes="title" />
</a></td>
<tal:comment replace="nothing">Delete the element</tal:comment>
<td class="noPadding">
<img tal:condition="python: member.has_permission('Delete objects', obj)"
src="delete_icon.gif" title="Delete" i18n:domain="plone" i18n:attributes="title" style="cursor:pointer"
tal:attributes="onClick python:'javascript:onDeleteObject(\'%s\')' % obj.UID()"/>
</td>
<tal:comment replace="nothing">Arrows for moving objects up or down</tal:comment>
<td class="noPadding" tal:condition="python: (len(objs)&gt;1) and member.has_permission('Modify portal content', obj)">
<tal:moveRef define="objectIndex python:contextObj.getAppyRefIndex(fieldName, obj);
@ -47,6 +36,18 @@
style="cursor:pointer"/>
</tal:moveRef>
</td>
<tal:comment replace="nothing">Edit the element</tal:comment>
<td class="noPadding"><a tal:attributes="href python: obj.absolute_url() + '/skyn/edit'"
tal:condition="python: member.has_permission('Modify portal content', obj)">
<img src="edit.gif" title="label_edit" i18n:domain="plone" i18n:attributes="title" />
</a></td>
<tal:comment replace="nothing">Delete the element</tal:comment>
<td class="noPadding">
<img tal:condition="python: member.has_permission('Delete objects', obj)"
title="Delete" i18n:domain="plone" i18n:attributes="title" style="cursor:pointer"
tal:attributes="src string: $portal_url/skyn/delete.png;
onClick python:'javascript:onDeleteObject(\'%s\')' % obj.UID()"/>
</td>
</tr>
</table>
</metal:objectActions>