From: <die...@us...> - 2010-02-05 07:34:02
|
Revision: 1799 http://openutils.svn.sourceforge.net/openutils/?rev=1799&view=rev Author: diego_schivo Date: 2010-02-05 07:33:54 +0000 (Fri, 05 Feb 2010) Log Message: ----------- MEDIA-64 media-info-details tooltip triggered by image Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediainfo.js trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/sexy-tooltips-1.1.js trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-04 15:06:40 UTC (rev 1798) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-05 07:33:54 UTC (rev 1799) @@ -198,16 +198,16 @@ cursor: pointer; } +.image .details { + display: none; +} + .mediainfo { border-bottom: dotted 1px #cfcfcf; margin: 0px 3px 5px 3px; padding: 5px 0 5px 0; } -.mediainfo .details { - display: none; -} - .used span { cursor: default; } Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediainfo.js =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediainfo.js 2010-02-04 15:06:40 UTC (rev 1798) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediainfo.js 2010-02-05 07:33:54 UTC (rev 1799) @@ -13,7 +13,8 @@ style: 'alert', sticky: false, mode: 'auto', - fixedPosition: true + fixedPosition: true, + offset: {x: -20, y: 110} }); trigger.addEvents({ 'mouseleave': this.hideStarter, Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/sexy-tooltips-1.1.js =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/sexy-tooltips-1.1.js 2010-02-04 15:06:40 UTC (rev 1798) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/sexy-tooltips-1.1.js 2010-02-05 07:33:54 UTC (rev 1799) @@ -284,10 +284,8 @@ } } - if (this.options.mode != 'auto'){ - left += this.options.offset.x; - top += this.options.offset.y; - } + left += this.options.offset.x; + top += this.options.offset.y; return { 'top': top, 'left': left }; }, Modified: trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-04 15:06:40 UTC (rev 1798) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-05 07:33:54 UTC (rev 1799) @@ -100,7 +100,7 @@ }); new MediaEdit('.edit'); - new MediaInfo('.mediainfo'); + new MediaInfo('.image'); }); </script> </head> @@ -272,6 +272,13 @@ [/#if] <img src="${this.request.contextPath}${thumbnailPath}" border="0" alt="" /> </a> + <div class="details"> + [#list media.mediaInfo?keys as key] + [#if key != 'extension' && key != 'width' && key != 'height'] + ${this.msgs.get("media.info.${key}")}: ${media.mediaInfo[key]}<br/> + [/#if] + [/#list] + </div> </div> </div> [#if media.mediaInfo??] @@ -280,13 +287,6 @@ [#if media.mediaInfo['width']?? && media.mediaInfo['height']??] ${media.mediaInfo['width']}x${media.mediaInfo['height']} [/#if] - <div class="details"> - [#list media.mediaInfo?keys as key] - [#if key != 'extension' && key != 'width' && key != 'height'] - ${this.msgs.get("media.info.${key}")}: ${media.mediaInfo[key]}<br/> - [/#if] - [/#list] - </div> </div> [/#if] [#if this.selectMedia] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |