From: <die...@us...> - 2010-02-18 10:43:49
|
Revision: 1981 http://openutils.svn.sourceforge.net/openutils/?rev=1981&view=rev Author: diego_schivo Date: 2010-02-18 10:43:42 +0000 (Thu, 18 Feb 2010) Log Message: ----------- MEDIA-104 fix "edit" menu Modified Paths: -------------- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.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-18 09:24:28 UTC (rev 1980) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/css/folderView.css 2010-02-18 10:43:42 UTC (rev 1981) @@ -338,7 +338,3 @@ .menupopup a img { margin-right: 4px; } - -.menupopup a span { - width: 290px; -} Modified: trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js =================================================================== --- trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-02-18 09:24:28 UTC (rev 1980) +++ trunk/openutils-mgnlmedia/src/main/resources/mgnl-resources/media/js/mediafolderview.js 2010-02-18 10:43:42 UTC (rev 1981) @@ -74,7 +74,9 @@ var menu = menuitem.getNext(); if (menu != this.menu){ this.hide(); + var width = menu.getStyle('width') var content = new Element('div', {html: menu.get('html')}); + content.getElements('a span').setStyle('width', (width.toInt() - 30) + 'px') var coords = menuitem.getCoordinates(); this.popup .empty() @@ -82,7 +84,7 @@ .setStyles({ left: coords.left + 'px', top: (coords.bottom + 5) + 'px', - width: menu.getStyle('width'), + width: width, display: 'block' }); this.popup.setStyle('height', content.getSize().y + 'px'); 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-18 09:24:28 UTC (rev 1980) +++ trunk/openutils-mgnlmedia/src/main/resources/net/sourceforge/openutils/mgnlmedia/media/pages/MediaFolderViewPage.html 2010-02-18 10:43:42 UTC (rev 1981) @@ -178,45 +178,53 @@ <a href="javascript:$empty()" onclick="openDialog('${media.handle}')" title="${this.msgs.get('media.edit')}"> <img src="${this.request.contextPath}/.resources/media/icons/ico16-edit.png" border="0" /> <span>${this.msgs.get('media.edit')}</span> + <div style="clear: left;"><!-- --></div> </a> </li> <li> <a href="javascript:$empty()" onclick="deleteMedia('${media.handle}')" title="${this.msgs.get('media.delete')}"> <img src="${this.request.contextPath}/.resources/icons/16/delete2.gif" border="0" /> <span>${this.msgs.get('media.delete')}</span> + <div style="clear: left;"><!-- --></div> </a> </li> <li> <a href="javascript:$empty()" onclick="openMediaTree('move','${media.handle}')" title="${this.msgs.get('media.move')}"> <img src="${this.request.contextPath}/.resources/icons/16/up_down.gif" border="0" /> <span>${this.msgs.get('media.move')}</span> + <div style="clear: left;"><!-- --></div> </a> </li> <li> <a href="javascript:$empty()" onclick="openMediaTree('copy','${media.handle}')" title="${this.msgs.get('media.copy')}"> <img src="${this.request.contextPath}/.resources/icons/16/copy.gif" border="0" /> <span>${this.msgs.get('media.copy')}</span> + <div style="clear: left;"><!-- --></div> </a> </li> [#else] <li> <a> <img src="${this.request.contextPath}/.resources/media/icons/ico16-edit_inactive.png" border="0" /> + <div style="clear: left;"><!-- --></div> </a> </li> <li> <a> <img src="${this.request.contextPath}/.resources/icons/16/delete2_inactive.gif" border="0" /> + <div style="clear: left;"><!-- --></div> </a> </li> <li> <a> <img src="${this.request.contextPath}/.resources/icons/16/up_down_inactive.gif" border="0" /> + <div style="clear: left;"><!-- --></div> </a> </li> <li> <a> <img src="${this.request.contextPath}/.resources/icons/16/copy_inactive.gif" border="0" /> + <div style="clear: left;"><!-- --></div> </a> </li> [/#if] @@ -225,6 +233,7 @@ <a href="?command=download&path=${media.handle}"> <img src="${this.request.contextPath}/.resources/media/icons/ico16-download.png" border="0" /> <span>${this.msgs.get('media.download')}</span> + <div style="clear: left;"><!-- --></div> </a> </li> [/#if] @@ -234,6 +243,7 @@ <a href="javascript:$empty()" onclick="performAction('activate', '${media.handle}','')" title="${this.msgs.get('media.activate')}"> <img src="${this.request.contextPath}/.resources/icons/16/arrow_right_green.gif" border="0" /> <span>${this.msgs.get('media.activate')}</span> + <div style="clear: left;"><!-- --></div> </a> </li> [#else] @@ -249,6 +259,7 @@ <a href="javascript:$empty()" onclick="performAction('deactivate', '${media.handle}','')" title="${this.msgs.get('media.deactivate')}"> <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red.gif" border="0" /> <span>${this.msgs.get('media.deactivate')}</span> + <div style="clear: left;"><!-- --></div> </a> </li> [#else] @@ -256,6 +267,7 @@ <a title="${this.msgs.get('media.deactivate')}" class="disabled"> <img src="${this.request.contextPath}/.resources/icons/16/arrow_left_red_inactive.gif" border="0" /> <span>${this.msgs.get('media.deactivate')}</span> + <div style="clear: left;"><!-- --></div> </a> </li> [/#if] This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |