Author: andre
Date: 2009-08-17 11:58:44 +0200 (Mon, 17 Aug 2009)
New Revision: 37933
Modified:
openimages/trunk/src/main/webapp/WEB-INF/tags/oip/medialist.tagx
openimages/trunk/src/main/webapp/WEB-INF/tags/oip/video.tagx
openimages/trunk/src/main/webapp/mmbase/components/oip/user-favorites.jspx
openimages/trunk/src/main/webapp/style/css/main.css
openimages/trunk/src/main/webapp/style/css/specific-styles.css
Log:
more design stuff
Modified: openimages/trunk/src/main/webapp/WEB-INF/tags/oip/medialist.tagx
===================================================================
--- openimages/trunk/src/main/webapp/WEB-INF/tags/oip/medialist.tagx
2009-08-17 09:47:08 UTC (rev 37932)
+++ openimages/trunk/src/main/webapp/WEB-INF/tags/oip/medialist.tagx
2009-08-17 09:58:44 UTC (rev 37933)
@@ -15,7 +15,7 @@
<mm:cloudinfo type="usernode" id="iam" write="false" />
<mm:escaper id="wrap_title" type="substring">
<mm:param name="from" value="0" />
- <mm:param name="to" value="34" />
+ <mm:param name="to" value="30" />
<mm:param name="ellipsis" value="..." />
</mm:escaper>
<mm:escaper id="wrap_subtitle" type="substring">
@@ -44,14 +44,12 @@
</c:choose>
<dl class="${gridclass}">
<dt>
- <a title="${mediafragment.title} ${mediafragment.subtitle}"
href="${_}">
+ <a title="${mediafragment.title}" href="${_}">
<c:catch>
<oip:thumb alt="${mediafragment.title}" />
</c:catch>
</a>
-
</dt>
- <!-- dd> <mm:field name="title" escape="wrapper" /> </dd -->
</dl>
</c:when>
@@ -66,10 +64,10 @@
<a href="${_}" title="edit"
class="edit">edit</a><jsp:text> </jsp:text>
</mm:link>
</mm:maywrite>
- <a href="${_}"><mm:field name="title" escape="wrap_title"
/></a>
+ <a title="${mediafragment.title}" href="${_}"><mm:field
name="title" escape="wrap_title" /></a>
</dt>
<dd class="img">
- <a title="${mediafragment.title} ${mediafragment.subtitle}"
href="${_}">
+ <a title="${mediafragment.title}" href="${_}">
<c:catch>
<oip:thumb alt="${mediafragment.title}" />
</c:catch>
Modified: openimages/trunk/src/main/webapp/WEB-INF/tags/oip/video.tagx
===================================================================
--- openimages/trunk/src/main/webapp/WEB-INF/tags/oip/video.tagx
2009-08-17 09:47:08 UTC (rev 37932)
+++ openimages/trunk/src/main/webapp/WEB-INF/tags/oip/video.tagx
2009-08-17 09:58:44 UTC (rev 37933)
@@ -20,11 +20,21 @@
<c:set var="template">s(${w}!x${h}!)+adjoin(${overlay})+flatten</c:set>
<c:set var="basictemplate">s(${w}!x${h}!)</c:set>
- <mm:import
id="poster">${mm:link('/style/images/preview_video.png')}</mm:import>
+ <mm:nodeinfo type="nodemanager" write="false">
+ <c:choose>
+ <c:when test="${_ eq 'audiofragments'}">
+ <c:set
var="poster">${mm:link('/style/images/preview_audio.png')}</c:set>
+ </c:when>
+ <c:otherwise>
+ <c:set
var="poster">${mm:link('/style/images/preview_video.png')}</c:set>
+ </c:otherwise>
+ </c:choose>
+ </mm:nodeinfo>
+
<mm:relatednodescontainer type="images" role="related"
searchdirs="destination">
<mm:maxnumber value="1" />
<mm:relatednodes>
- <mm:import id="poster" reset="true"><mm:image template="$template"
/></mm:import>
+ <c:set var="poster"><mm:image template="$template" /></c:set>
<mm:import id="imgnr" reset="true"><mm:field name="number" /></mm:import>
</mm:relatednodes>
</mm:relatednodescontainer>
Modified:
openimages/trunk/src/main/webapp/mmbase/components/oip/user-favorites.jspx
===================================================================
--- openimages/trunk/src/main/webapp/mmbase/components/oip/user-favorites.jspx
2009-08-17 09:47:08 UTC (rev 37932)
+++ openimages/trunk/src/main/webapp/mmbase/components/oip/user-favorites.jspx
2009-08-17 09:58:44 UTC (rev 37933)
@@ -33,7 +33,7 @@
<dl class="${gridclass}">
<dt>
- <a title="${favorite.title} ${favorite.subtitle}"
href="${_}"><oip:thumb /></a>
+ <a title="${favorite.title}" href="${_}"><oip:thumb /></a>
<mm:link referids="favorite">
<mm:param name="remove">please</mm:param>
<a title="remove favorite" class="remove"
href="${_}">remove</a>
Modified: openimages/trunk/src/main/webapp/style/css/main.css
===================================================================
--- openimages/trunk/src/main/webapp/style/css/main.css 2009-08-17 09:47:08 UTC
(rev 37932)
+++ openimages/trunk/src/main/webapp/style/css/main.css 2009-08-17 09:58:44 UTC
(rev 37933)
@@ -168,7 +168,7 @@
{
padding: 3px;
margin: 0 0 6px 0;
- color: #555;
+ color: #888;
width: 312px;
font-size: 1em;
border: 1px solid #cfcfcf;
Modified: openimages/trunk/src/main/webapp/style/css/specific-styles.css
===================================================================
--- openimages/trunk/src/main/webapp/style/css/specific-styles.css
2009-08-17 09:47:08 UTC (rev 37932)
+++ openimages/trunk/src/main/webapp/style/css/specific-styles.css
2009-08-17 09:58:44 UTC (rev 37933)
@@ -123,7 +123,6 @@
float: left;
margin: 10px 0;
width: 320px;
- line-height: 14px;
}
dl.list dt
@@ -132,7 +131,6 @@
font-size: 1em;
font-weight: bold;
width: 230px;
- line-height: normal;
}
dl.list dd.img { margin-left: 0;}
@@ -141,6 +139,7 @@
{
margin-left: 90px;
font-size: 0.85em;
+ line-height: 16px;
}
dl.list dd strong
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
