Author: andre
Date: 2009-11-26 22:09:39 +0100 (Thu, 26 Nov 2009)
New Revision: 39996
Modified:
openimages/trunk/src/main/webapp/article.jspx
openimages/trunk/src/main/webapp/editors/edit.jspx
openimages/trunk/src/main/webapp/editors/inc/navigation.jspx
openimages/trunk/src/main/webapp/editors/inc/settings.jspx
openimages/trunk/src/main/webapp/style/css/editors.css
openimages/trunk/src/main/webapp/style/css/specific-styles.css
Log:
added attachments to editors, article in right column
Modified: openimages/trunk/src/main/webapp/article.jspx
===================================================================
--- openimages/trunk/src/main/webapp/article.jspx 2009-11-26 20:28:51 UTC
(rev 39995)
+++ openimages/trunk/src/main/webapp/article.jspx 2009-11-26 21:09:39 UTC
(rev 39996)
@@ -48,7 +48,7 @@
<mm:relatednodescontainer type="pages" role="posrel"
searchdirs="destination">
<mm:size>
<mm:isgreaterthan value="0">
- <ul>
+ <ul class="menu">
<mm:relatednodes>
<li class="${page eq _node.number ? 'active ' :''}">
<mm:link page="page" referids="_n...@n">
@@ -83,42 +83,60 @@
</mm:size>
</mm:relatednodescontainer>
</mm:nodefunction>
-
<mm:relatednodescontainer type="articles" role="posrel"
searchdirs="destination">
- <mm:maxnumber value="1" />
+ <mm:sortorder field="posrel.pos" direction="UP" />
<mm:relatednodes>
- <mm:relatednodescontainer type="urls" role="posrel"
searchdirs="destination">
- <mm:size>
- <mm:isgreaterthan value="0">
- <oip:h3>Links</oip:h3>
- <ul>
+ <mm:first>
+ <mm:relatednodescontainer type="urls" role="posrel"
searchdirs="destination">
+ <mm:sortorder field="posrel.pos" direction="UP" />
+ <mm:size>
+ <mm:isgreaterthan value="0">
+ <oip:h3>Links</oip:h3>
+ <ul>
+ <mm:relatednodes>
+ <li>
+ <mm:field name="url">
+ <a title="${_node.description}"
href="${_}"><mm:field name="name" /></a>
+ </mm:field>
+ </li>
+ </mm:relatednodes>
+ </ul>
+ </mm:isgreaterthan>
+ </mm:size>
+ </mm:relatednodescontainer>
+
+ <mm:relatednodescontainer type="attachments" role="posrel"
searchdirs="destination">
+ <mm:sortorder field="posrel.pos" direction="UP" />
+ <mm:size>
+ <mm:isgreaterthan value="0">
+ <oip:h3>Documents</oip:h3>
+ <ul>
<mm:relatednodes>
- <li>
- <mm:field name="url"><a href="${_}"><mm:field
name="name" /></a></mm:field>
+ <li class="TODO">
+ <mm:attachment><a title="${_node.description}"
href="${_}"><mm:field name="title" /></a></mm:attachment>
+ (<mm:field name="mimetype" />, <mm:field name="size"
escape="filesize" />)
</li>
</mm:relatednodes>
- </ul>
- </mm:isgreaterthan>
- </mm:size>
- </mm:relatednodescontainer>
-
- <mm:relatednodescontainer type="attachments" role="posrel"
searchdirs="destination">
- <mm:size>
- <mm:isgreaterthan value="0">
- <oip:h3>Documents</oip:h3>
- <ul>
- <mm:relatednodes>
- <li class="TODO">
- <mm:attachment />
- </li>
- </mm:relatednodes>
- </ul>
- </mm:isgreaterthan>
- </mm:size>
- </mm:relatednodescontainer>
- </mm:relatednodes>
- </mm:relatednodescontainer>
+ </ul>
+ </mm:isgreaterthan>
+ </mm:size>
+ </mm:relatednodescontainer>
+ </mm:first>
+
+ <!-- article in right column -->
+ <mm:first inverse="true">
+ <mm:nodefunction name="translation">
+ <oip:h3><mm:field name="title" /></oip:h3>
+ <mm:field name="subtitle"><mm:isnotempty><h3
class="subtitle"><mm:write /></h3></mm:isnotempty></mm:field>
+ <mm:field name="intro" escape="paragraph" />
+ <mm:field name="body" escape="paragraph" />
+ </mm:nodefunction>
+ </mm:first>
+
+ </mm:relatednodes>
+ </mm:relatednodescontainer>
+
</div>
</div>
</jsp:attribute>
Modified: openimages/trunk/src/main/webapp/editors/edit.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/edit.jspx 2009-11-26 20:28:51 UTC
(rev 39995)
+++ openimages/trunk/src/main/webapp/editors/edit.jspx 2009-11-26 21:09:39 UTC
(rev 39996)
@@ -175,6 +175,17 @@
</mm:include>
</p>
</mm:hasrelationmanager>
+ <mm:hasrelationmanager sourcemanager="$type"
destinationmanager="attachments" role="posrel">
+ <p>
+ <mm:include page="inc/searchrelate.jspx" referids="nr">
+ <mm:param name="type">attachments</mm:param>
+ <mm:param name="role">posrel</mm:param>
+ <mm:param name="searchdirs">destination</mm:param>
+ <mm:param name="sortorder">posrel.pos</mm:param>
+ <mm:param name="list">title,filename,mimetype</mm:param>
+ </mm:include>
+ </p>
+ </mm:hasrelationmanager>
<mm:hasrelationmanager sourcemanager="$type"
destinationmanager="licenses" role="related">
<p>
<mm:include page="inc/searchrelate.jspx" referids="nr">
Modified: openimages/trunk/src/main/webapp/editors/inc/navigation.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/inc/navigation.jspx
2009-11-26 20:28:51 UTC (rev 39995)
+++ openimages/trunk/src/main/webapp/editors/inc/navigation.jspx
2009-11-26 21:09:39 UTC (rev 39996)
@@ -24,8 +24,9 @@
<li id="tab5"><mm:link page="edit.jspx"><mm:param
name="type">articles</mm:param><a href="${_}">articles</a></mm:link></li>
<li id="tab6"><mm:link page="edit.jspx"><mm:param
name="type">urls</mm:param><a href="${_}">links</a></mm:link></li>
<li id="tab7"><mm:link page="edit.jspx"><mm:param
name="type">images</mm:param><a href="${_}">afbeeldingen</a></mm:link></li>
- <li id="tab8"><mm:link page="edit.jspx"><mm:param
name="type">tags</mm:param><a href="${_}">tags</a></mm:link></li>
- <li id="tab9"><mm:link page="edit.jspx"><mm:param
name="type">licenses</mm:param><a href="${_}">licenses</a></mm:link></li>
+ <li id="tab8"><mm:link page="edit.jspx"><mm:param
name="type">attachments</mm:param><a href="${_}">bestanden</a></mm:link></li>
+ <li id="tab9"><mm:link page="edit.jspx"><mm:param
name="type">tags</mm:param><a href="${_}">tags</a></mm:link></li>
+ <li id="tab10"><mm:link page="edit.jspx"><mm:param
name="type">licenses</mm:param><a href="${_}">licenses</a></mm:link></li>
</ul>
</div>
Modified: openimages/trunk/src/main/webapp/editors/inc/settings.jspx
===================================================================
--- openimages/trunk/src/main/webapp/editors/inc/settings.jspx 2009-11-26
20:28:51 UTC (rev 39995)
+++ openimages/trunk/src/main/webapp/editors/inc/settings.jspx 2009-11-26
21:09:39 UTC (rev 39996)
@@ -72,6 +72,12 @@
<mm:import id="editfields" reset="true">${searchfields}</mm:import>
</mm:compare>
+ <mm:compare referid="type" value="attachments">
+ <mm:import id="listfields" reset="true">title,handle,mimetype</mm:import>
+ <mm:import id="searchfields"
reset="true">${listfields},filename,description</mm:import>
+ <mm:import id="editfields" reset="true">${searchfields}</mm:import>
+ </mm:compare>
+
<mm:compare referid="type" value="images">
<mm:import id="listfields" reset="true">title,handle</mm:import>
<mm:import id="searchfields"
reset="true">${listfields},description</mm:import>
Modified: openimages/trunk/src/main/webapp/style/css/editors.css
===================================================================
--- openimages/trunk/src/main/webapp/style/css/editors.css 2009-11-26
20:28:51 UTC (rev 39995)
+++ openimages/trunk/src/main/webapp/style/css/editors.css 2009-11-26
21:09:39 UTC (rev 39996)
@@ -167,9 +167,10 @@
body.articles_translations #tab5 a,
body.urls #tab6 a,
body.images #tab7 a,
-body.tags #tab8 a,
-body.licenses #tab9 a,
-body.licenses_translations #tab9 a
+body.attachments #tab8 a,
+body.tags #tab9 a,
+body.licenses #tab10 a,
+body.licenses_translations #tab11 a
{
color: #222;
padding-bottom: 5px;
Modified: openimages/trunk/src/main/webapp/style/css/specific-styles.css
===================================================================
--- openimages/trunk/src/main/webapp/style/css/specific-styles.css
2009-11-26 20:28:51 UTC (rev 39995)
+++ openimages/trunk/src/main/webapp/style/css/specific-styles.css
2009-11-26 21:09:39 UTC (rev 39996)
@@ -5,11 +5,13 @@
* @version '$Id$'
*/
+ul.menu { margin-bottom: 2em; }
+
div.main-column ul,
div.right-column ul
{
- margin-left: 0;
- list-style: none;
+ list-style: none;
+ margin: 0 0 2em 0;
}
div.right-column ul li.active { font-weight: bold; }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
