From: <mol...@us...> - 2015-04-13 19:44:13
|
Revision: 4620 http://openutils.svn.sourceforge.net/openutils/?rev=4620&view=rev Author: molaschi Date: 2015-04-13 19:44:11 +0000 (Mon, 13 Apr 2015) Log Message: ----------- fix imported tag libraries Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag Modified: magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag =================================================================== --- magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag 2015-04-13 15:32:36 UTC (rev 4619) +++ magnoliamodules/trunk/openutils-mgnlmessages/src/main/resources/META-INF/tags/msg/msgs-global.tag 2015-04-13 19:44:11 UTC (rev 4620) @@ -1,12 +1,10 @@ -<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib" - xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" - xmlns:media="http://net.sourceforge.openutils/mgnlMedia" xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" - xmlns:su="http://openutils.sf.net/openutils-stringutils" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:mu="mgnlutils" - xmlns:du="dateutils" xmlns:fdt="urn:jsptagdir:/WEB-INF/tags/fieradigitale-tags" xmlns:mgnlt="urn:jsptagdir:/WEB-INF/tags/mgnltags" - xmlns:fd="fieradigitale"> +<jsp:root version="2.1" xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" + xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" + xmlns:mu="mgnlutils"> <jsp:directive.attribute name="jqueryui" required="false" rtexprvalue="true" type="java.lang.Boolean" /> <jsp:directive.attribute name="jquery" required="false" rtexprvalue="true" type="java.lang.Boolean" /> - <c:if test="${mgnl.editMode and cmsfn:canEdit()}"> + <c:if test="${cmsfn:isEditMode() and mu:canEdit()}"> <c:if test="${not empty jquery and jquery}"> <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"><!-- --> </script> @@ -23,7 +21,7 @@ style="position:absolute;background:#000 url(${appCtx}/.resources/messages/icons/edit.png) center \ center no-repeat;border-radius:4px;-moz-border-radius:4px;\ -webkit-border-radius:4px;width:24px;height:24px;z-index:1000; top:-5px; left:-24px;"></a>'); - + function init(container, dialog) { container.css({ "-webkit-border-radius" : 4, @@ -35,18 +33,18 @@ var msgLocale = container.attr("data-msglocale"); var msgDefaultLocale = container.attr("data-msgdefaultlocale"); var defaultMsg = container.attr("data-msgdefault"); - + container.append(editLink.clone()).css('position','relative').find('a') .fadeTo('slow',0.3) - .live('mouseenter',function(){ + .on('mouseenter',function(){ $(this).fadeTo('slow',1.0); msgsWithSameKey.animate({"background-color" : 'yellow'}); }) - .live('mouseleave',function(){ + .on('mouseleave',function(){ editLink.fadeTo('slow',0.3); msgsWithSameKey.css({"background-color" : 'transparent'}); }) - .live('click',function(evt){ + .on('click',function(evt){ evt.preventDefault(); currentMsgEdit = container; $("#dialog-msgEdit-default").css({ @@ -58,8 +56,8 @@ dialog.dialog( "open" ); }); }; - - $.fn.mgnlMessageEdit = function(params) { + + $.fn.mgnlMessageEdit = function(params) { var dialog = $("#dialog-msgEdit").dialog({ autoOpen: false, height: 220, @@ -99,19 +97,19 @@ }, close: function() { } - + }); $(this).each(function(i,el){ - init($(el), dialog); + init($(el), dialog); }); - }; - + }; + })($); - + $('head').append('<link type="text/css" rel="stylesheet" href="${appCtx}/.resources/messages/css/messages.css" />'); $('head').append('<link type="text/css" rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.11.3/themes/smoothness/jquery-ui.css" />'); - - $(document).ready(function(){ + + $(document).ready(function(){ $(".msgEdit").mgnlMessageEdit(); }); ]]> @@ -131,4 +129,4 @@ </form> </div> </c:if> -</jsp:root> \ No newline at end of file +</jsp:root> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |