Author: andre Date: 2010-05-17 13:59:56 +0200 (Mon, 17 May 2010) New Revision: 42179
Added: openimages/trunk/src/main/webapp/action/progress.jspx openimages/trunk/src/main/webapp/action/you.jspx Modified: openimages/trunk/src/main/webapp/WEB-INF/tags/oip/menu.tagx openimages/trunk/src/main/webapp/action/tags.jspx openimages/trunk/src/main/webapp/style/js/upload.js Log: non-html moved to action dir Modified: openimages/trunk/src/main/webapp/WEB-INF/tags/oip/menu.tagx =================================================================== --- openimages/trunk/src/main/webapp/WEB-INF/tags/oip/menu.tagx 2010-05-17 11:40:31 UTC (rev 42178) +++ openimages/trunk/src/main/webapp/WEB-INF/tags/oip/menu.tagx 2010-05-17 11:59:56 UTC (rev 42179) @@ -11,7 +11,7 @@ <mm:node number="pool_oip"> <c:set var="query_str" value="${requestScope['javax.servlet.forward.query_string']}" /> <script type="text/javascript"> - <mm:link page="/you.jspx" escapeamps="true"> + <mm:link page="/action/you.jspx" escapeamps="true"> <mm:param name="referrer">${requestScope['javax.servlet.forward.request_uri']}<c:if test="{!empty query_string}">?${query_string}</c:if></mm:param> <c:if test="${! empty requestScope['org.mmbase.mmsite.language']}"> <mm:param name="locale">${requestScope['org.mmbase.mmsite.language']}</mm:param> Copied: openimages/trunk/src/main/webapp/action/progress.jspx (from rev 42178, openimages/trunk/src/main/webapp/progress.jspx) =================================================================== --- openimages/trunk/src/main/webapp/action/progress.jspx (rev 0) +++ openimages/trunk/src/main/webapp/action/progress.jspx 2010-05-17 11:59:56 UTC (rev 42179) @@ -0,0 +1,44 @@ +<mm:content + type="application/xml" + postprocessor="none" + expires="0" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"> + <!-- + Used by /style/js/upload.js + <div style="width: 2%;" class="PROGRESS"> + <span class="percentage">2%</span><span class="speed">(40 MiB/1832 MiB, 40 MiB/s)</span> + </div> + --> + <jsp:output omit-xml-declaration="true" /> + <mm:import externid="length" vartype="integer">100</mm:import> + <mm:import externid="unit" vartype="string">%</mm:import> + <fmt:formatNumber value="${sessionScope['org.mmbase.uploadInfo'].fraction * length}" + maxFractionDigits="0" + var="roundedLength" /> + <c:choose> + <c:when test="${sessionScope['org.mmbase.uploadInfo'].elapsedTime gt 500}"> + <div class="${sessionScope['org.mmbase.uploadInfo'].status}" style="width: ${roundedLength}${unit};"> + <span class="percentage"> + <fmt:formatNumber + value="${sessionScope['org.mmbase.uploadInfo'].fraction}" + type="percent" /> + </span> + <span class="speed"> + <jsp:text> (</jsp:text> + <mm:escape escape="filesize">${sessionScope['org.mmbase.uploadInfo'].bytesRead}</mm:escape> + <jsp:text> / </jsp:text> + <mm:escape escape="filesize">${sessionScope['org.mmbase.uploadInfo'].totalSize}</mm:escape> + <jsp:text>, </jsp:text> + <mm:escape escape="filesize">${1000 * sessionScope['org.mmbase.uploadInfo'].bytesRead / sessionScope['org.mmbase.uploadInfo'].elapsedTime}</mm:escape> + <jsp:text>/s)</jsp:text> + </span> + </div> + </c:when> + <c:otherwise> + <div class="PROGRESS">Uploading... </div> + </c:otherwise> + </c:choose> +</mm:content> Modified: openimages/trunk/src/main/webapp/action/tags.jspx =================================================================== --- openimages/trunk/src/main/webapp/action/tags.jspx 2010-05-17 11:40:31 UTC (rev 42178) +++ openimages/trunk/src/main/webapp/action/tags.jspx 2010-05-17 11:59:56 UTC (rev 42179) @@ -6,6 +6,7 @@ xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"> <jsp:output omit-xml-declaration="true" /> + <jsp:directive.page session="false" /> <mm:cloud> <mm:import externid="tag" required="true" /> <mm:present referid="tag"> Copied: openimages/trunk/src/main/webapp/action/you.jspx (from rev 42178, openimages/trunk/src/main/webapp/you.jspx) =================================================================== --- openimages/trunk/src/main/webapp/action/you.jspx (rev 0) +++ openimages/trunk/src/main/webapp/action/you.jspx 2010-05-17 11:59:56 UTC (rev 42179) @@ -0,0 +1,48 @@ +<jsp:root + version="2.0" + xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:jsp="http://java.sun.com/JSP/Page" + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" + xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0"> + <jsp:directive.page session="false" /> + <mm:import externid="locale">client</mm:import> + <mm:content + type="application/xml" + postprocessor="none" + expires="0" + language="${locale}"> + + <!-- + Reports who you are, or, if anonymous, shows a 'login' link. + --> + <jsp:output omit-xml-declaration="true" /> + <fmt:setBundle basename="eu.openimages.messages"/> + <mm:cloud method="asis"> + <mm:hasrank minvalue="site user"> + <mm:link> + <mm:frameworkparam name="component">oip</mm:frameworkparam> + <mm:frameworkparam name="block">user</mm:frameworkparam> + <mm:frameworkparam name="user"><mm:cloudinfo type="usernode" /></mm:frameworkparam> + <c:if test="${locale ne 'client'}"> + <mm:frameworkparam name="userlocale">${locale}</mm:frameworkparam> + </c:if> + <span> + <a href="${_}"><mm:cloudinfo type="user" /></a> + <jsp:text> | </jsp:text> + <mm:link page="/logout.jspx" referids="locale"> + <a href="${_}"><fmt:message key="login.logout" /></a> + </mm:link> + </span> + </mm:link> + </mm:hasrank> + <mm:hasrank value="anonymous"> + <mm:import externid="referrer" /> + <mm:node number="page_login"> + <mm:link page="${_node.path}" referids="referrer"> + <a href="${_}"><mm:field name="title" /></a> + </mm:link> + </mm:node> + </mm:hasrank> + </mm:cloud> + </mm:content> +</jsp:root> Modified: openimages/trunk/src/main/webapp/style/js/upload.js =================================================================== --- openimages/trunk/src/main/webapp/style/js/upload.js 2010-05-17 11:40:31 UTC (rev 42178) +++ openimages/trunk/src/main/webapp/style/js/upload.js 2010-05-17 11:59:56 UTC (rev 42179) @@ -1,5 +1,5 @@ $(document).ready(function() { - var progressUrl = $("head meta[name=ContextRoot]").attr("content") + "progress.jspx"; + var progressUrl = $("head meta[name=ContextRoot]").attr("content") + "action/progress.jspx"; $("form[enctype=multipart/form-data]").each(function() { $(this).submit(function() { var form = this; _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs