svn commit: r1559799 [12/12] - in /ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23: ./ applications/accounting/widget/ applications/humanres/widget/ applications/order/src/org/ofbiz/order/shoppingcart/ applications/product/webapp/catalog/WEB-I...

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/images/webapp/images/selectall.js Mon Jan 20 18:23:28 2014
@@ -942,4 +942,46 @@ function showErrorAlert(errBoxTitle, err
             }
         });
     }
+}
+
+/**
+ * Submit the pagination request
+ * @param obj The DOM object of pagination anchor or select element
+ * @param url The pagination URL
+ */
+function submitPagination(obj, url) {
+    if (obj.getAttribute("data-lookupajax") == "true" && typeof window.lookupPaginationAjaxRequest == "function") {
+        lookupPaginationAjaxRequest(url, (obj.tagName == "SELECT" ? "select" : "link"));
+        return false;
+    }
+    if (url.length > 2000) {
+        var request = url.substring(0, url.indexOf("?"));
+        var params = url.substring(url.indexOf("?")+1, url.length);
+        var paramsArray = params.split("&");
+        var form = document.createElement("form");
+        form.setAttribute("method", "post");
+        form.setAttribute("action", request);
+        for (var i = 0; i < paramsArray.length; i ++) {
+            var param = paramsArray[i];
+            if (param!= "" && param.indexOf("=") > 0) {
+                var keyValue = param.split("=");
+                var hiddenField = document.createElement("input");
+                hiddenField.setAttribute("type", "hidden");
+                hiddenField.setAttribute("name", keyValue[0]);
+                hiddenField.setAttribute("value", keyValue[1]);
+                form.appendChild(hiddenField);
+            }
+        }
+        document.body.appendChild(form);
+        form.submit();
+        return false;
+    } else {
+        if (obj.tagName == "SELECT") {
+            location.href = url;
+            return false;
+        } else {
+            obj.href = url;
+            return true;
+        }
+    }
 }
\ No newline at end of file

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/job/JobManager.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/job/JobManager.java?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/job/JobManager.java (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/service/src/org/ofbiz/service/job/JobManager.java Mon Jan 20 18:23:28 2014
@@ -21,6 +21,7 @@ package org.ofbiz.service.job;
 import java.io.IOException;
 import java.sql.Timestamp;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -154,11 +155,10 @@ public final class JobManager {
         // The rest of this method logs exceptions and does not throw them.
         // The idea is to keep the JobPoller working even when a database
         // connection is not available (possible on a saturated server).
-        List<Job> poll = new ArrayList<Job>(limit);
         DispatchContext dctx = getDispatcher().getDispatchContext();
         if (dctx == null) {
             Debug.logWarning("Unable to locate DispatchContext object; not running job!", module);
-            return poll;
+            return Collections.emptyList();
         }
         // basic query
         List<EntityExpr> expressions = UtilMisc.toList(EntityCondition.makeCondition("runTime", EntityOperator.LESS_THAN_EQUAL_TO, UtilDateTime.nowTimestamp()),
@@ -171,7 +171,7 @@ public final class JobManager {
             pools = getRunPools();
         } catch (GenericConfigException e) {
             Debug.logWarning(e, "Unable to get run pools - not running job: ", module);
-            return poll;
+            return Collections.emptyList();
         }
         List<EntityExpr> poolsExpr = UtilMisc.toList(EntityCondition.makeCondition("poolId", EntityOperator.EQUALS, null));
         if (!pools.isEmpty()) {
@@ -179,6 +179,7 @@ public final class JobManager {
                 poolsExpr.add(EntityCondition.makeCondition("poolId", EntityOperator.EQUALS, poolName));
             }
         }
+        List<Job> poll = new ArrayList<Job>(limit);
         // make the conditions
         EntityCondition baseCondition = EntityCondition.makeCondition(expressions);
         EntityCondition poolCondition = EntityCondition.makeCondition(poolsExpr, EntityOperator.OR);
@@ -188,7 +189,7 @@ public final class JobManager {
         try {
             beganTransaction = TransactionUtil.begin();
             if (!beganTransaction) {
-                Debug.logWarning("Unable to poll JobSandbox for jobs; transaction was not started by this process", module);
+                Debug.logWarning("Unable to poll JobSandbox for jobs; unable to begin transaction.", module);
                 return poll;
             }
             jobsIterator = delegator.find("JobSandbox", mainCondition, null, null, UtilMisc.toList("runTime"), null);
@@ -205,15 +206,16 @@ public final class JobManager {
                 }
                 jobValue = jobsIterator.next();
             }
+            TransactionUtil.commit(beganTransaction);
         } catch (Throwable t) {
-            poll.clear();
-            String errMsg =  "Exception thrown while polling JobSandbox: ";
-            Debug.logWarning(t, errMsg, module);
+            String errMsg = "Exception thrown while polling JobSandbox: ";
             try {
-                TransactionUtil.rollback(beganTransaction, errMsg + t.getMessage(), t);
+                TransactionUtil.rollback(beganTransaction, errMsg, t);
             } catch (GenericEntityException e) {
                 Debug.logWarning(e, "Exception thrown while rolling back transaction: ", module);
             }
+            Debug.logWarning(t, errMsg, module);
+            return Collections.emptyList();
         } finally {
             if (jobsIterator != null) {
                 try {
@@ -222,11 +224,6 @@ public final class JobManager {
                     Debug.logWarning(e, module);
                 }
             }
-            try {
-                TransactionUtil.commit(beganTransaction);
-            } catch (GenericTransactionException e) {
-                Debug.logWarning(e, "Transaction error trying to commit when polling and updating the JobSandbox: ", module);
-            }
         }
         if (poll.isEmpty()) {
             // No jobs to run, see if there are any jobs to purge
@@ -236,7 +233,7 @@ public final class JobManager {
                 cal.add(Calendar.DAY_OF_YEAR, -daysToKeep);
             } catch (GenericConfigException e) {
                 Debug.logWarning(e, "Unable to get purge job days: ", module);
-                return poll;
+                return Collections.emptyList();
             }
             Timestamp purgeTime = new Timestamp(cal.getTimeInMillis());
             List<EntityExpr> finExp = UtilMisc.toList(EntityCondition.makeCondition("finishDateTime", EntityOperator.NOT_EQUAL, null), EntityCondition.makeCondition("finishDateTime", EntityOperator.LESS_THAN, purgeTime));
@@ -248,8 +245,8 @@ public final class JobManager {
             try {
                 beganTransaction = TransactionUtil.begin();
                 if (!beganTransaction) {
-                    Debug.logWarning("Unable to poll JobSandbox for jobs; transaction was not started by this process", module);
-                    return poll;
+                    Debug.logWarning("Unable to poll JobSandbox for jobs; unable to begin transaction.", module);
+                    return Collections.emptyList();
                 }
                 jobsIterator = delegator.find("JobSandbox", mainCondition, null, null, UtilMisc.toList("jobId"), null);
                 GenericValue jobValue = jobsIterator.next();
@@ -260,15 +257,16 @@ public final class JobManager {
                     }
                     jobValue = jobsIterator.next();
                 }
+                TransactionUtil.commit(beganTransaction);
             } catch (Throwable t) {
-                poll.clear();
-                String errMsg =  "Exception thrown while polling JobSandbox: ";
-                Debug.logWarning(t, errMsg, module);
+                String errMsg = "Exception thrown while polling JobSandbox: ";
                 try {
-                    TransactionUtil.rollback(beganTransaction, errMsg + t.getMessage(), t);
+                    TransactionUtil.rollback(beganTransaction, errMsg, t);
                 } catch (GenericEntityException e) {
                     Debug.logWarning(e, "Exception thrown while rolling back transaction: ", module);
                 }
+                Debug.logWarning(t, errMsg, module);
+                return Collections.emptyList();
             } finally {
                 if (jobsIterator != null) {
                     try {
@@ -277,11 +275,6 @@ public final class JobManager {
                         Debug.logWarning(e, module);
                     }
                 }
-                try {
-                    TransactionUtil.commit(beganTransaction);
-                } catch (GenericTransactionException e) {
-                    Debug.logWarning(e, "Transaction error trying to commit when polling the JobSandbox: ", module);
-                }
             }
         }
         return poll;

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/dtd/widget-screen.xsd Mon Jan 20 18:23:28 2014
@@ -791,7 +791,11 @@ under the License.
                     <xs:restriction base="xs:token">
                         <xs:enumeration value="auto">
                             <xs:annotation>
-                                <xs:documentation>If selected the hidden-form type will be used if the url-mode is intra-app and the request specified has an event, otherwise the anchor type will be used.</xs:documentation>
+                                <xs:documentation>
+                                    If selected the hidden-form type will be used if the url-mode is intra-app
+                                    and the request specified has an event, otherwise the anchor type will be used,
+                                    except if the ajax-window mode is specified.
+                                </xs:documentation>
                             </xs:annotation>
                         </xs:enumeration>
                         <xs:enumeration value="anchor" />

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlFormMacroLibrary.ftl Mon Jan 20 18:23:28 2014
@@ -740,21 +740,21 @@ Parameter: lastViewName, String, optiona
   <#if listSize gt viewSize>
     <div class="${paginateStyle}">&nbsp;
       <ul>
-        <li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxFirstUrl}')<#else>${firstUrl}</#if>">${paginateFirstLabel}</a><#else>-disabled"><span>${paginateFirstLabel}</span></#if></li>
-        <li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>${previousUrl}</#if>">${paginatePreviousLabel}</a><#else>-disabled"><span>${paginatePreviousLabel}</span></#if></li>
-        <#if listSize gt 0 && javaScriptEnabled><li class="nav-page-select">${pageLabel} <select name="page" size="1" onchange="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxSelectUrl}')<#else>location.href='${selectUrl}'+this.value;</#if>"><#rt/>
+        <li class="${paginateFirstStyle}<#if viewIndex gt 0>"><a href="javascript:void(0)" onclick="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxFirstUrl}')<#else>submitPagination(this, '${firstUrl}')</#if>">${paginateFirstLabel}</a><#else>-disabled"><span>${paginateFirstLabel}</span></#if></li>
+        <li class="${paginatePreviousStyle}<#if viewIndex gt 0>"><a href="javascript:void(0)" onclick="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxPreviousUrl}')<#else>submitPagination(this, '${previousUrl}')</#if>">${paginatePreviousLabel}</a><#else>-disabled"><span>${paginatePreviousLabel}</span></#if></li>
+        <#if listSize gt 0 && javaScriptEnabled><li class="nav-page-select">${pageLabel} <select name="page" size="1" onchange="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxSelectUrl}')<#else>submitPagination(this, '${selectUrl}'+this.value)</#if>"><#rt/>
           <#assign x=(listSize/viewSize)?ceiling>
             <#list 1..x as i>
               <#if i == (viewIndex+1)><option selected="selected" value="<#else><option value="</#if>${i-1}">${i}</option>
             </#list>
           </select></li>
         </#if>
-        <li class="${paginateNextStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxNextUrl}')<#else>${nextUrl}</#if>">${paginateNextLabel}</a><#else>-disabled"><span>${paginateNextLabel}</span></#if></li>
-        <li class="${paginateLastStyle}<#if highIndex lt listSize>"><a href="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxLastUrl}')<#else>${lastUrl}</#if>">${paginateLastLabel}</a><#else>-disabled"><span>${paginateLastLabel}</span></#if></li>
-        <#if javaScriptEnabled><li class="nav-pagesize"><select name="pageSize" size="1" onchange="<#if ajaxEnabled>javascript:ajaxUpdateAreas('${ajaxSelectSizeUrl}')<#else>location.href='${selectSizeUrl}';</#if>"><#rt/>
-          <#assign availPageSizes = [viewSize, 20, 30, 50, 100, 200]>
+        <li class="${paginateNextStyle}<#if highIndex lt listSize>"><a href="javascript:void(0)" onclick="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxNextUrl}')<#else>submitPagination(this, '${nextUrl}')</#if>">${paginateNextLabel}</a><#else>-disabled"><span>${paginateNextLabel}</span></#if></li>
+        <li class="${paginateLastStyle}<#if highIndex lt listSize>"><a href="javascript:void(0)" onclick="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxLastUrl}')<#else>submitPagination(this, '${lastUrl}')</#if>">${paginateLastLabel}</a><#else>-disabled"><span>${paginateLastLabel}</span></#if></li>
+        <#if javaScriptEnabled><li class="nav-pagesize"><select name="pageSize" size="1" onchange="<#if ajaxEnabled>ajaxUpdateAreas('${ajaxSelectSizeUrl}')<#else>submitPagination(this, '${selectSizeUrl}')</#if>"><#rt/>
+            <#assign availPageSizes = [20, 30, 50, 100, 200]>
           <#list availPageSizes as ps>
-            <option<#if viewSize == ps> selected="selected" </#if> value="${ps}">${ps}</option>
+            <option <#if viewSize == ps> selected="selected" </#if> value="${ps}">${ps}</option>
           </#list>
           </select> ${paginateViewSizeLabel}</li>
         </#if>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlMenuMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlMenuMacroLibrary.ftl?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlMenuMacroLibrary.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlMenuMacroLibrary.ftl Mon Jan 20 18:23:28 2014
@@ -54,11 +54,11 @@ under the License.
     </#list>
 </form><#rt/>
   </#if>
-<#if linkUrl?has_content>
+<#if (linkType?has_content && "hidden-form" == linkType) || linkUrl?has_content>
 <a<#if id?has_content> id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if name?has_content> name="${name}"</#if><#if targetWindow?has_content> target="${targetWindow}"</#if> href="<#if "hidden-form"==linkType>javascript:document.${uniqueItemName}.submit()<#else>${linkUrl}</#if>"><#rt/>
 </#if>
 <#if imgStr?has_content>${imgStr}</#if><#if text?has_content>${text}</#if><#rt/>
-<#if linkType?has_content></a><#rt/></#if>
+<#if (linkType?has_content && "hidden-form" == linkType) || linkUrl?has_content></a><#rt/></#if>
 </#macro>
 
 <#macro renderMenuItemBegin style toolTip linkStr containsNestedMenus>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlScreenMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlScreenMacroLibrary.ftl?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlScreenMacroLibrary.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/widget/templates/htmlScreenMacroLibrary.ftl Mon Jan 20 18:23:28 2014
@@ -91,52 +91,60 @@ under the License.
 </#macro>
 
 <#macro renderLink parameterList targetWindow target uniqueItemName linkType actionUrl id style name height width linkUrl text imgStr>
-<#if "ajax-window" != linkType>
-<#if "hidden-form" == linkType>
-<form method="post" action="${actionUrl}" <#if targetWindow?has_content>target="${targetWindow}"</#if> onsubmit="javascript:submitFormDisableSubmits(this)" name="${uniqueItemName}"><#rt/>
-<#list parameterList as parameter>
-<input name="${parameter.name}" value="${parameter.value}" type="hidden"/><#rt/>
-</#list>
-</form><#rt/>
-</#if>
-<a <#if id?has_content>id="${id}"</#if> <#if style?has_content>class="${style}"</#if> <#if name?has_content>name="${name}"</#if> <#if targetWindow?has_content>target="${targetWindow}"</#if> href="<#if "hidden-form"==linkType>javascript:document.${uniqueItemName}.submit()<#else>${linkUrl}</#if>"><#rt/>
-<#if imgStr?has_content>${imgStr}</#if><#if text?has_content>${text}</#if></a>
-<#else>
-<div id="${uniqueItemName}"></div>
-
-<a href="javascript:void(0);" id="${uniqueItemName}_link" <#if style?has_content>class="${style}"</#if>><#if text?has_content>${text}</#if></a>
-<script type="text/javascript">
-    function getRequestData () {
-        var data =  {
-            <#list parameterList as parameter>
-                "${parameter.name}": "${parameter.value}",
-            </#list>
-            "presentation": "layer"
-        };
-
-        return data;
-    }
-    jQuery("#${uniqueItemName}_link").click( function () {
-        jQuery("#${uniqueItemName}").dialog("open");
-    });
-    jQuery("#${uniqueItemName}").dialog({
-         autoOpen: false,
-         <#if text?has_content>title: "${text}",</#if>
-         height: ${height},
-         width: ${width},
-         modal: true,
-         open: function() {
-                 jQuery.ajax({
-                     url: "${target}",
-                     type: "POST",
-                     data: getRequestData(),
-                     success: function(data) {jQuery("#${uniqueItemName}").html(data);}
-                 });
-         }
-    });
-</script>
-</#if>
+    <#if "ajax-window" != linkType>
+        <#if "hidden-form" == linkType>
+            <form method="post" action="${actionUrl}" <#if targetWindow?has_content>target="${targetWindow}"</#if> onsubmit="javascript:submitFormDisableSubmits(this)" name="${uniqueItemName}"><#rt/>
+                <#list parameterList as parameter>
+                <input name="${parameter.name}" value="${parameter.value}" type="hidden"/><#rt/>
+                </#list>
+            </form><#rt/>
+        </#if>
+        <a
+            <#if id?has_content>id="${id}"</#if>
+            <#if style?has_content>class="${style}"</#if>
+            <#if name?has_content>name="${name}"</#if>
+            <#if targetWindow?has_content>target="${targetWindow}"</#if>
+            href="<#if "hidden-form"==linkType>javascript:document.${uniqueItemName}.submit()<#else>${linkUrl}</#if>"><#rt/>
+            <#if imgStr?has_content>${imgStr}</#if><#if text?has_content>${text}</#if>
+        </a>
+    <#else>
+        <div id="${uniqueItemName}"></div>
+        <a href="javascript:void(0);" id="${uniqueItemName}_link"
+        <#if style?has_content>class="${style}"</#if>>
+        <#if text?has_content>${text}</#if></a>
+        <script type="text/javascript">
+            function getRequestData () {
+                var data =  {
+                    <#list parameterList as parameter>
+                        "${parameter.name}": "${parameter.value}",
+                    </#list>
+                    "presentation": "layer"
+                };
+        
+                return data;
+            }
+            jQuery("#${uniqueItemName}_link").click( function () {
+                jQuery("#${uniqueItemName}").dialog("open");
+            });
+            jQuery("#${uniqueItemName}").dialog({
+                 autoOpen: false,
+                 <#if text?has_content>title: "${text}",</#if>
+                 height: ${height},
+                 width: ${width},
+                 modal: true,
+                 open: function() {
+                         jQuery.ajax({
+                             url: "${target}",
+                             type: "POST",
+                             data: getRequestData(),
+                             success: function(data) {jQuery("#${uniqueItemName}").html(data);}
+                         });
+                 }
+            });
+        </script>
+    </#if>
 </#macro>
+
 <#macro renderImage src id style wid hgt border alt urlString>
 <#if src?has_content>
 <img <#if id?has_content>id="${id}"</#if><#if style?has_content> class="${style}"</#if><#if wid?has_content> width="${wid}"</#if><#if hgt?has_content> height="${hgt}"</#if><#if border?has_content> border="${border}"</#if> alt="<#if alt?has_content>${alt}</#if>" src="${urlString}" />

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/birt/webapp/birt/WEB-INF/controller.xml Mon Jan 20 18:23:28 2014
@@ -77,16 +77,6 @@ under the License.
         <response name="success" type="view" value="BirtMain"/>
     </request-map>
 
-    <!--flot example requests-->
-    <request-map uri="ExampleBarChart">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ExampleBarChart"/>
-    </request-map>
-    <request-map uri="ExamplePieChart">
-        <security https="true" auth="true"/>
-        <response name="success" type="view" value="ExamplePieChart"/>
-    </request-map>
-
     <request-map uri="chartReport">
         <security https="true" auth="true"/>
         <response name="success" type="view" value="chartReport"/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Mon Jan 20 18:23:28 2014
@@ -158,7 +158,7 @@ under the License.
     </request-map>
 
     <!-- Common json reponse events, chain these after events to send json reponses -->
-    <!-- Standard json response, uses all compatible request attributes -->
+    <!-- Standard json response, For security reason (OFBIZ-5409) tries to keep only the initially called service attributes -->
     <request-map uri="json">
         <security direct-request="false"/>
         <event type="java" path="org.ofbiz.common.CommonEvents" invoke="jsonResponseFromRequestAttributes"/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/webapp/ecommerce/catalog/ProductCategories.ftl Mon Jan 20 18:23:28 2014
@@ -17,7 +17,7 @@
   under the License.
   -->
 <script language="javascript" type="text/javascript" src="<@ofbizContentUrl>/images/jquery/plugins/jsTree/jquery.jstree.js</@ofbizContentUrl>"></script>
-<script type="text/javascript" src="<@ofbizContentUrl>/images/jquery/ui/development-bundle/external/jquery.cookie.js</@ofbizContentUrl>"></script>
+<script type="text/javascript" src="<@ofbizContentUrl>/images/jquery/ui/js/jquery.cookie-1.4.0.js</@ofbizContentUrl>"></script>
   
 <script type="text/javascript">
 <#-- some labels are not unescaped in the JSON object so we have to do this manuely -->

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CommonScreens.xml Mon Jan 20 18:23:28 2014
@@ -43,11 +43,11 @@ under the License.
                 <set field="initialLocaleComplete" type="String" value="${groovy:parameters?.userLogin?.lastLocale}" default-value="${groovy:locale.toString()}"/>
                 <set field="layoutSettings.javaScripts[+0]" value="${groovy: org.ofbiz.common.JsLanguageFilesMapping.dateTime.getFilePath(initialLocaleComplete)}" global="true"/>
 
-                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon-1.0.5.js" global="true"/>
-                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.9.0.custom.min.js" global="true"/>
-                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/development-bundle/ui/jquery.ui.datepicker.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/datetimepicker/jquery-ui-timepicker-addon.min-1.4.3.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/ui/js/jquery-ui-1.10.3.min.js" global="true"/>
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
-                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.2.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.10.2.min.js" global="true"/>
 
                 <script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
 
@@ -262,7 +262,9 @@ under the License.
                 <set field="layoutSettings.javaScripts[]" value="/images/selectall.js" global="true"/>
 
                 <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/plugins/validate/jquery.validate.min.js" global="true"/>
-                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.8.2.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-1.10.2.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[+0]" value="/images/jquery/jquery-migrate-1.2.1.js" global="true" />
+                
 
                 <script location="component://ecommerce/widget/EcommerceSetup.groovy"/>
 

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/example/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/example/WEB-INF/controller.xml?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/example/WEB-INF/controller.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/webapp/example/WEB-INF/controller.xml Mon Jan 20 18:23:28 2014
@@ -216,6 +216,17 @@ under the License.
     <request-map uri="ExampleOsmGeoLocationPointSet2"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet2"/></request-map>
     <request-map uri="ExampleOsmGeoLocationPointSet3"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet3"/></request-map>
     <request-map uri="ExampleOsmGeoLocationPointSet4"><security https="true" auth="true"/><response name="success" type="view" value="ExampleOsmGeoLocationPointSet4"/></request-map>
+    
+    <!--flot example requests-->
+    <request-map uri="ExampleBarChart">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ExampleBarChart"/>
+    </request-map>
+    <request-map uri="ExamplePieChart">
+        <security https="true" auth="true"/>
+        <response name="success" type="view" value="ExamplePieChart"/>
+    </request-map>
+    
     <!-- end of request mappings -->
 
     <!-- View Mappings -->

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleMenus.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleMenus.xml?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleMenus.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/example/widget/example/ExampleMenus.xml Mon Jan 20 18:23:28 2014
@@ -42,6 +42,9 @@ under the License.
         <menu-item name="ExampleGeoLocation" title="${uiLabelMap.CommonGeoLocation}">
             <link target="ExampleGeoLocationPointSet1"/>
         </menu-item>
+        <menu-item name="ExampleCharts" title="Chart examples">
+            <link target="ExampleBarChart"/>
+        </menu-item>
     </menu>
 
     <menu name="EditExample" extends="CommonTabBarMenu" extends-resource="component://common/widget/CommonMenus.xml">

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/webapp/webpos/WEB-INF/controller.xml Mon Jan 20 18:23:28 2014
@@ -95,7 +95,7 @@
     <!-- End of Security Mappings -->
     
     <!-- Common json reponse events, chain these after events to send json reponses -->
-    <!-- Standard json response, uses all compatible request attributes -->
+    <!-- Standard json response, For security reason (OFBIZ-5409) tries to keep only the initially called service attributes -->
     <request-map uri="json">
         <security direct-request="false"/>
         <event type="java" path="org.ofbiz.common.CommonEvents" invoke="jsonResponseFromRequestAttributes"/>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/widget/CommonScreens.xml?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/widget/CommonScreens.xml (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/webpos/widget/CommonScreens.xml Mon Jan 20 18:23:28 2014
@@ -40,7 +40,7 @@ under the License.
                 <set field="applicationMenuName" value="WebPosAppBar" global="true"/>
                 <set field="applicationMenuLocation" value="component://webpos/widget/WebPosMenus.xml" global="true"/>
                 <set field="applicationTitle" value="${uiLabelMap.WebPosMenuMain}" global="true"/>
-                <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/jquery.hotkeys-0.7.9.min.js" global="true"/>
+                <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/jquery.hotkeys-0.8.min.js" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/WebPosHotkeys.js" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/Shortcuts.js" global="true"/>
                 <set field="layoutSettings.javaScripts[]" value="/webpos/images/js/SearchProducts.js" global="true"/>
@@ -267,4 +267,4 @@ under the License.
             </widgets>
         </section>
     </screen>
-</screens>
\ No newline at end of file
+</screens>

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/webapp/bizznesstime/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/webapp/bizznesstime/css/style.css?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/webapp/bizznesstime/css/style.css (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bizznesstime/webapp/bizznesstime/css/style.css Mon Jan 20 18:23:28 2014
@@ -1551,27 +1551,27 @@ width:10%
 }
 
 img.cssImgXLarge {
- /*border: 1px black solid;*/
- max-width: 200px;
- max-height: 150px;
+  /*border: 1px black solid;*/
+  max-width: 200px;
+  max-height: 150px;
 }
 
 img.cssImgLarge {
- /*border: 1px black solid;*/
- max-width: 100px;
- max-height: 75px;
+  /*border: 1px black solid;*/
+  max-width: 100px;
+  max-height: 75px;
 }
 
 img.cssImgStandard {
- /*border: 1px black solid;*/
- max-width: 70px;
- max-height: 52px;
+  /*border: 1px black solid;*/
+  max-width: 70px;
+  max-height: 52px;
 }
 
 img.cssImgSmall {
- /*border: 1px black solid;*/
- max-width: 50px;
- max-height: 37px;
+  /*border: 1px black solid;*/
+  max-width: 50px;
+  max-height: 37px;
 }
 
 /* ========================================================= */
@@ -1719,11 +1719,11 @@ button.ui-button::-moz-focus-inner { bor
     left: -4px; /*must have*/
     width: 200px; /*must have*/
     height: 200px; /*must have*/
-}.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+}.ui-dialog { position: absolute; top: 0; left: 0; padding; .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em;  height: 16px; position: relative;}
 .ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
 .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+/*.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }*/
 .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
 .ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
 .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
@@ -1777,8 +1777,8 @@ button.ui-button::-moz-focus-inner { bor
 /* TR overrides */
 span.ui-spinner { background: none; }
 .ui-spinner .ui-icon-triangle-1-s {
- /* need to fix icons sprite */
- background-position:-65px -16px;
+  /* need to fix icons sprite */
+  background-position:-65px -16px;
 }
 .ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
 .ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
@@ -1789,17 +1789,17 @@ span.ui-spinner { background: none; }
 .ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
 .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
 .ui-tooltip {
- padding:8px;
- position:absolute;
- z-index:9999;
- -o-box-shadow: 0 0 5px #aaa;
- -moz-box-shadow: 0 0 5px #aaa;
- -webkit-box-shadow: 0 0 5px #aaa;
- box-shadow: 0 0 5px #aaa;
+  padding:8px;
+  position:absolute;
+  z-index:9999;
+  -o-box-shadow: 0 0 5px #aaa;
+  -moz-box-shadow: 0 0 5px #aaa;
+  -webkit-box-shadow: 0 0 5px #aaa;
+  box-shadow: 0 0 5px #aaa;
 }
 /* Fades and background-images don't work well together in IE6, drop the image */
 * html .ui-tooltip {
- background-image: none;
+  background-image: none;
 }
 body .ui-tooltip { border-width:2px; }
 

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bluelight/webapp/bluelight/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bluelight/webapp/bluelight/style.css?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bluelight/webapp/bluelight/style.css (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/bluelight/webapp/bluelight/style.css Mon Jan 20 18:23:28 2014
@@ -2055,27 +2055,27 @@ background-image:url(/images/spinner.gif
 }
 
 img.cssImgXLarge {
- /*border: 1px black solid;*/
- max-width: 200px;
- max-height: 150px;
+  /*border: 1px black solid;*/
+  max-width: 200px;
+  max-height: 150px;
 }
 
 img.cssImgLarge {
- /*border: 1px black solid;*/
- max-width: 100px;
- max-height: 75px;
+  /*border: 1px black solid;*/
+  max-width: 100px;
+  max-height: 75px;
 }
 
 img.cssImgStandard {
- /*border: 1px black solid;*/
- max-width: 70px;
- max-height: 52px;
+  /*border: 1px black solid;*/
+  max-width: 70px;
+  max-height: 52px;
 }
 
 img.cssImgSmall {
- /*border: 1px black solid;*/
- max-width: 50px;
- max-height: 37px;
+  /*border: 1px black solid;*/
+  max-width: 50px;
+  max-height: 37px;
 }
 
 /* ========================================================= */
@@ -2223,11 +2223,11 @@ button.ui-button::-moz-focus-inner { bor
     left: -4px; /*must have*/
     width: 200px; /*must have*/
     height: 200px; /*must have*/
-}.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+}.ui-dialog { position: absolute; top: 0; left: 0; padding; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em;  height: 16px; position: relative;}
 .ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
 .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+/*.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }*/
 .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
 .ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
 .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
@@ -2281,8 +2281,8 @@ button.ui-button::-moz-focus-inner { bor
 /* TR overrides */
 span.ui-spinner { background: none; }
 .ui-spinner .ui-icon-triangle-1-s {
- /* need to fix icons sprite */
- background-position:-65px -16px;
+  /* need to fix icons sprite */
+  background-position:-65px -16px;
 }
 .ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
 .ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
@@ -2293,17 +2293,17 @@ span.ui-spinner { background: none; }
 .ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
 .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
 .ui-tooltip {
- padding:8px;
- position:absolute;
- z-index:9999;
- -o-box-shadow: 0 0 5px #aaa;
- -moz-box-shadow: 0 0 5px #aaa;
- -webkit-box-shadow: 0 0 5px #aaa;
- box-shadow: 0 0 5px #aaa;
+  padding:8px;
+  position:absolute;
+  z-index:9999;
+  -o-box-shadow: 0 0 5px #aaa;
+  -moz-box-shadow: 0 0 5px #aaa;
+  -webkit-box-shadow: 0 0 5px #aaa;
+  box-shadow: 0 0 5px #aaa;
 }
 /* Fades and background-images don't work well together in IE6, drop the image */
 * html .ui-tooltip {
- background-image: none;
+  background-image: none;
 }
 body .ui-tooltip { border-width:2px; }
 

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/droppingcrumbs/webapp/droppingcrumbs/css/style.css Mon Jan 20 18:23:28 2014
@@ -2054,27 +2054,27 @@ background-image:url(/images/spinner.gif
 }
 
 img.cssImgXLarge {
- /*border: 1px black solid;*/
- max-width: 200px;
- max-height: 150px;
+  /*border: 1px black solid;*/
+  max-width: 200px;
+  max-height: 150px;
 }
 
 img.cssImgLarge {
- /*border: 1px black solid;*/
- max-width: 100px;
- max-height: 75px;
+  /*border: 1px black solid;*/
+  max-width: 100px;
+  max-height: 75px;
 }
 
 img.cssImgStandard {
- /*border: 1px black solid;*/
- max-width: 70px;
- max-height: 52px;
+  /*border: 1px black solid;*/
+  max-width: 70px;
+  max-height: 52px;
 }
 
 img.cssImgSmall {
- /*border: 1px black solid;*/
- max-width: 50px;
- max-height: 37px;
+  /*border: 1px black solid;*/
+  max-width: 50px;
+  max-height: 37px;
 }
 
 /* ========================================================== */
@@ -2222,11 +2222,11 @@ button.ui-button::-moz-focus-inner { bor
     left: -4px; /*must have*/
     width: 200px; /*must have*/
     height: 200px; /*must have*/
-}.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+}.ui-dialog { position: absolute; top: 0; left: 0; padding; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em;  height: 16px; position: relative;}
 .ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
 .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+/*.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }*/
 .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
 .ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
 .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
@@ -2280,8 +2280,8 @@ button.ui-button::-moz-focus-inner { bor
 /* TR overrides */
 span.ui-spinner { background: none; }
 .ui-spinner .ui-icon-triangle-1-s {
- /* need to fix icons sprite */
- background-position:-65px -16px;
+  /* need to fix icons sprite */
+  background-position:-65px -16px;
 }
 .ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
 .ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
@@ -2292,17 +2292,17 @@ span.ui-spinner { background: none; }
 .ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
 .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
 .ui-tooltip {
- padding:8px;
- position:absolute;
- z-index:9999;
- -o-box-shadow: 0 0 5px #aaa;
- -moz-box-shadow: 0 0 5px #aaa;
- -webkit-box-shadow: 0 0 5px #aaa;
- box-shadow: 0 0 5px #aaa;
+  padding:8px;
+  position:absolute;
+  z-index:9999;
+  -o-box-shadow: 0 0 5px #aaa;
+  -moz-box-shadow: 0 0 5px #aaa;
+  -webkit-box-shadow: 0 0 5px #aaa;
+  box-shadow: 0 0 5px #aaa;
 }
 /* Fades and background-images don't work well together in IE6, drop the image */
 * html .ui-tooltip {
- background-image: none;
+  background-image: none;
 }
 body .ui-tooltip { border-width:2px; }
 

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/webapp/flatgrey/javascript.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/webapp/flatgrey/javascript.css?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/webapp/flatgrey/javascript.css (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/flatgrey/webapp/flatgrey/javascript.css Mon Jan 20 18:23:28 2014
@@ -219,11 +219,11 @@ button.ui-button::-moz-focus-inner { bor
     left: -4px; /*must have*/
     width: 200px; /*must have*/
     height: 200px; /*must have*/
-}.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
+}.ui-dialog { position: absolute; top: 0; left: 0; padding; padding: .2em; width: 300px; overflow: hidden; }
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em;  height: 16px; position: relative;}
 .ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
 .ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+/*.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }*/
 .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
 .ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
 .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
@@ -277,8 +277,8 @@ button.ui-button::-moz-focus-inner { bor
 /* TR overrides */
 span.ui-spinner { background: none; }
 .ui-spinner .ui-icon-triangle-1-s {
- /* need to fix icons sprite */
- background-position:-65px -16px;
+  /* need to fix icons sprite */
+  background-position:-65px -16px;
 }
 .ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
 .ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
@@ -289,17 +289,17 @@ span.ui-spinner { background: none; }
 .ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
 .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
 .ui-tooltip {
- padding:8px;
- position:absolute;
- z-index:9999;
- -o-box-shadow: 0 0 5px #aaa;
- -moz-box-shadow: 0 0 5px #aaa;
- -webkit-box-shadow: 0 0 5px #aaa;
- box-shadow: 0 0 5px #aaa;
+  padding:8px;
+  position:absolute;
+  z-index:9999;
+  -o-box-shadow: 0 0 5px #aaa;
+  -moz-box-shadow: 0 0 5px #aaa;
+  -webkit-box-shadow: 0 0 5px #aaa;
+  box-shadow: 0 0 5px #aaa;
 }
 /* Fades and background-images don't work well together in IE6, drop the image */
 * html .ui-tooltip {
- background-image: none;
+  background-image: none;
 }
 body .ui-tooltip { border-width:2px; }
 

Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/webapp/tomahawk/css/style.css
URL: http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/webapp/tomahawk/css/style.css?rev=1559799&r1=1559798&r2=1559799&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/webapp/tomahawk/css/style.css (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/themes/tomahawk/webapp/tomahawk/css/style.css Mon Jan 20 18:23:28 2014
@@ -2301,7 +2301,7 @@ border-right: 2px solid #000;
 border-left: 2px solid #000;
 border-bottom: 3px solid #000;
 position: absolute;
-padding: 3px 1 1 1;
+padding: 3px 1px 1px 1px;
 overflow: visible;
 z-index: 110000;
 visibility: visible;
@@ -2440,27 +2440,27 @@ background-image:url(/images/spinner.gif
 }
 
 img.cssImgXLarge {
- /*border: 1px black solid;*/
- max-width: 200px;
- max-height: 150px;
+  /*border: 1px black solid;*/
+  max-width: 200px;
+  max-height: 150px;
 }
 
 img.cssImgLarge {
- /*border: 1px black solid;*/
- max-width: 100px;
- max-height: 75px;
+  /*border: 1px black solid;*/
+  max-width: 100px;
+  max-height: 75px;
 }
 
 img.cssImgStandard {
- /*border: 1px black solid;*/
- max-width: 70px;
- max-height: 52px;
+  /*border: 1px black solid;*/
+  max-width: 70px;
+  max-height: 52px;
 }
 
 img.cssImgSmall {
- /*border: 1px black solid;*/
- max-width: 50px;
- max-height: 37px;
+  /*border: 1px black solid;*/
+  max-width: 50px;
+  max-height: 37px;
 }
 
 /* ========================================================= */
@@ -2478,9 +2478,13 @@ img.cssImgSmall {
 .ui-helper-hidden { display: none; }
 .ui-helper-hidden-accessible { position: absolute !important; clip: rect(1px 1px 1px 1px); clip: rect(1px,1px,1px,1px); }
 .ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; }
-.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table; }
+.ui-helper-clearfix:before, .ui-helper-clearfix:after { content: ""; display: table;
+    border-collapse: collapse;
+}
 .ui-helper-clearfix:after { clear: both; }
-.ui-helper-clearfix { zoom: 1; }
+.ui-helper-clearfix { zoom: 1;
+    min-height: 0; /* support: IE7 */
+}
 .ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); }
 
 
@@ -2597,11 +2601,13 @@ button.ui-button::-moz-focus-inner { bor
     left: -4px; /*must have*/
     width: 200px; /*must have*/
     height: 200px; /*must have*/
-}.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; }
-.ui-dialog .ui-dialog-titlebar { padding: .4em 1em; position: relative;  }
-.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .1em 0; }
-.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; }
-.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }
+}
+.ui-dialog { position: absolute; top: 0; left: 0; padding: .2em; width: 300px; overflow: hidden; outline: 0;}
+.ui-dialog .ui-dialog-titlebar { padding: .4em 1em;  height: 16px; position: relative;}
+.ui-dialog .ui-dialog-title { float: left; margin: .1em 0 .1em 0;     white-space: nowrap; width: 90%; overflow: hidden; text-overflow: ellipsis;}
+
+.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 21px; margin: -10px 0 0 0; padding: 1px; height: 20px; }
+/*.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; }*/
 .ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; }
 .ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; }
 .ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; }
@@ -2611,9 +2617,14 @@ button.ui-button::-moz-focus-inner { bor
 .ui-draggable .ui-dialog-titlebar { cursor: move; }
 .ui-menu { list-style:none; padding: 2px; margin: 0; display:block; outline: none; }
 .ui-menu .ui-menu { margin-top: -3px; position: absolute; }
-.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1; width: 100%; }
+.ui-menu .ui-menu-item { margin: 0; padding: 0; zoom: 1; width: 100%;
+    /* support: IE10, see #8844 */
+    list-style-image: url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7);
+}
 .ui-menu .ui-menu-divider { margin: 5px -2px 5px -2px; height: 0; font-size: 0; line-height: 0; border-width: 1px 0 0 0; }
-.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal; }
+.ui-menu .ui-menu-item a { text-decoration: none; display: block; padding: 2px .4em; line-height: 1.5; zoom: 1; font-weight: normal;
+    min-height: 0; /* support: IE7 */
+}
 .ui-menu .ui-menu-item a.ui-state-focus,
 .ui-menu .ui-menu-item a.ui-state-active { font-weight: normal; margin: -1px; }
 
@@ -2666,8 +2677,8 @@ button.ui-button::-moz-focus-inner { bor
 /* TR overrides */
 span.ui-spinner { background: none; }
 .ui-spinner .ui-icon-triangle-1-s {
- /* need to fix icons sprite */
- background-position:-65px -16px;
+  /* need to fix icons sprite */
+  background-position:-65px -16px;
 }
 .ui-tabs { position: relative; padding: .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */
 .ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; }
@@ -2678,17 +2689,17 @@ span.ui-spinner { background: none; }
 .ui-tabs .ui-tabs-nav li a, .ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-active a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */
 .ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1em 1.4em; background: none; }
 .ui-tooltip {
- padding:8px;
- position:absolute;
- z-index:9999;
- -o-box-shadow: 0 0 5px #aaa;
- -moz-box-shadow: 0 0 5px #aaa;
- -webkit-box-shadow: 0 0 5px #aaa;
- box-shadow: 0 0 5px #aaa;
+  padding:8px;
+  position:absolute;
+  z-index:9999;
+  -o-box-shadow: 0 0 5px #aaa;
+  -moz-box-shadow: 0 0 5px #aaa;
+  -webkit-box-shadow: 0 0 5px #aaa;
+  box-shadow: 0 0 5px #aaa;
 }
 /* Fades and background-images don't work well together in IE6, drop the image */
 * html .ui-tooltip {
- background-image: none;
+  background-image: none;
 }
 body .ui-tooltip { border-width:2px; }