You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2017/02/05 11:10:01 UTC
svn commit: r1781731 [5/45] - in /ofbiz/trunk:
applications/accounting/src/main/java/org/apache/ofbiz/accounting/thirdparty/ideal/
applications/accounting/webapp/ap/error/
applications/accounting/webapp/ar/error/
applications/commonext/webapp/ofbizsetu...
Modified: ofbiz/trunk/plugins/birt/webapp/birt/error/error.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/birt/webapp/birt/error/error.jsp?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/birt/webapp/birt/error/error.jsp (original)
+++ ofbiz/trunk/plugins/birt/webapp/birt/error/error.jsp Sun Feb 5 11:09:59 2017
@@ -1,52 +1,52 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
---%>
-<%@ page import="org.apache.ofbiz.base.util.*" %>
-<html>
-<head>
-<title>OFBiz Message</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>
-
-<body bgcolor="#FFFFFF">
-<div align="center">
- <br/>
- <table width="100%" border="1" height="200">
- <tr>
- <td>
- <table width="100%" border="0" height="200">
- <tr bgcolor="#CC6666">
- <td height="45">
- <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>
- </td>
- </tr>
- <tr>
- <td>
- <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-</div>
-<div align="center"></div>
-</body>
-</html>
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<%@ page import="org.apache.ofbiz.base.util.*" %>
+<html>
+<head>
+<title>OFBiz Message</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>
+
+<body bgcolor="#FFFFFF">
+<div align="center">
+ <br/>
+ <table width="100%" border="1" height="200">
+ <tr>
+ <td>
+ <table width="100%" border="0" height="200">
+ <tr bgcolor="#CC6666">
+ <td height="45">
+ <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+</div>
+<div align="center"></div>
+</body>
+</html>
Propchange: ofbiz/trunk/plugins/birt/webapp/birt/error/error.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/birt/webapp/birt/index.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/birt/webapp/birt/index.jsp?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/birt/webapp/birt/index.jsp (original)
+++ ofbiz/trunk/plugins/birt/webapp/birt/index.jsp Sun Feb 5 11:09:59 2017
@@ -1,19 +1,19 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
---%>
-<%response.sendRedirect("control/main");%>
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<%response.sendRedirect("control/main");%>
Propchange: ofbiz/trunk/plugins/birt/webapp/birt/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/cmssite/template/docbook/extensions/README.LIBXSLT
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/ebaystore/config/EbayStore.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/ecommerce/config/blog.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/ecommerce/template/catalog/ShowBestSellingCategory.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/ecommerce/template/email/ContactListEmailTemplate.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/ecommerce/template/email/ContactListSubscribeEmail.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/ecommerce/template/email/ContactListUnsubscribeVerifyEmail.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/ecommerce/webapp/ecommerce/images/blog.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/example/config/examplepdf.properties
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/hhfacility/webapp/hhfacility/error/error.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/pricat/README.md
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/pricat/README.md?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/pricat/README.md (original)
+++ ofbiz/trunk/plugins/pricat/README.md Sun Feb 5 11:09:59 2017
@@ -1,14 +1,14 @@
-<img src="http://ofbiz.apache.org/images/logo.png" alt="Apache OFBiz" />
-
-# PriCat component
-PriCat is the abbreviation of Price and Catalog/Category. The PriCat component is to support importing/parsing excel files with price and catalog/category data. The excel files can be checked by version, header column names, currencyId. Each row can be validated by facility(name, Id and ownership), required fields, string or number and etc.
-
-PriCat component contains two webapps: /pricat/ and /pricatdemo/. In production environment, you SHOULD remove or disable the /pricatdemo/.
-
-## more information
----------------------------------------
-PriCat Demos
----------------------------------------
-/pricatdemo/control/SamplePricat/: you can use this demo to implement your own excel templates.
-
+<img src="http://ofbiz.apache.org/images/logo.png" alt="Apache OFBiz" />
+
+# PriCat component
+PriCat is the abbreviation of Price and Catalog/Category. The PriCat component is to support importing/parsing excel files with price and catalog/category data. The excel files can be checked by version, header column names, currencyId. Each row can be validated by facility(name, Id and ownership), required fields, string or number and etc.
+
+PriCat component contains two webapps: /pricat/ and /pricatdemo/. In production environment, you SHOULD remove or disable the /pricatdemo/.
+
+## more information
+---------------------------------------
+PriCat Demos
+---------------------------------------
+/pricatdemo/control/SamplePricat/: you can use this demo to implement your own excel templates.
+
/pricatdemo/control/countdownreport and /pricatdemo/control/countupreport: these 2 demos are on html report, you can try this way to display the processing report of rebuilding of lucene index or marchine learning data.
\ No newline at end of file
Propchange: ofbiz/trunk/plugins/pricat/README.md
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/pricat/config/pricat.properties
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/pricat/config/pricat.properties?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/pricat/config/pricat.properties (original)
+++ ofbiz/trunk/plugins/pricat/config/pricat.properties Sun Feb 5 11:09:59 2017
@@ -1,24 +1,24 @@
-###############################################################################
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-###############################################################################
-
-# the latest pricat version to parse and download
-pricat.latest.version=V1.1
-
-# the max number of pricat history files to keep
-pricat.history.max.filenumber=20
+###############################################################################
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+###############################################################################
+
+# the latest pricat version to parse and download
+pricat.latest.version=V1.1
+
+# the max number of pricat history files to keep
+pricat.history.max.filenumber=20
Propchange: ofbiz/trunk/plugins/pricat/config/pricat.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/pricat/webapp/pricat/error/error.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/pricat/webapp/pricat/error/error.jsp?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/pricat/webapp/pricat/error/error.jsp (original)
+++ ofbiz/trunk/plugins/pricat/webapp/pricat/error/error.jsp Sun Feb 5 11:09:59 2017
@@ -1,52 +1,52 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
---%>
-<%@ page import="org.apache.ofbiz.base.util.*" %>
-<html>
-<head>
-<title>OFBiz Message</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>
-
-<body bgcolor="#FFFFFF">
-<div align="center">
- <br/>
- <table width="100%" border="1" height="200">
- <tr>
- <td>
- <table width="100%" border="0" height="200">
- <tr bgcolor="#CC6666">
- <td height="45">
- <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>
- </td>
- </tr>
- <tr>
- <td>
- <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-</div>
-<div align="center"></div>
-</body>
-</html>
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<%@ page import="org.apache.ofbiz.base.util.*" %>
+<html>
+<head>
+<title>OFBiz Message</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>
+
+<body bgcolor="#FFFFFF">
+<div align="center">
+ <br/>
+ <table width="100%" border="1" height="200">
+ <tr>
+ <td>
+ <table width="100%" border="0" height="200">
+ <tr bgcolor="#CC6666">
+ <td height="45">
+ <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+</div>
+<div align="center"></div>
+</body>
+</html>
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricat/error/error.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl (original)
+++ ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl Sun Feb 5 11:09:59 2017
@@ -1,109 +1,109 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<div class="row">
- <div class="col-sm-12 m-b-xs text-left p-xs">
- <label >${uiLabelMap.ExcelImportHistoryList}</label>
- <span class="tooltip pad-left30 top">${uiLabelMap.OnlyYourOwnImportHistoryDisplayed}</span>
- </div>
-</div>
-
-<div id="loadBody" style="display:none">
-</div>
-<table id="productlist" name="productlist" class="table table-striped ms-table-primary">
- <thead>
- <th></th>
- <th>${uiLabelMap.SerialNumber}</th>
- <th>${uiLabelMap.Filename}</th>
- <th>${uiLabelMap.FromDate}</th>
- <th>${uiLabelMap.ThruDate}</th>
- <th>${uiLabelMap.ImportStatus}</th>
- <th>${uiLabelMap.ThruReasonId}</th>
- <th>${uiLabelMap.Actions}</th>
- </thead>
- <tbody>
- <#if (data?has_content)>
- <#list data as historyEntry>
- <tr name="${historyEntry.sequenceNum!}">
- <td>
- <#if historyEntry.statusId?exists && historyEntry.statusId == 'EXCEL_IMPORTING'>
- <img src="/erptheme/images/blue_anime.gif" alt="${uiLabelMap.EXCE_IMPORTING}" tooltip="${uiLabelMap.EXCE_IMPORTING}">
- <#elseif historyEntry.statusId?exists && historyEntry.statusId == 'EXCEL_IMPORTED' && historyEntry.thruReasonId?exists && historyEntry.thruReasonId?has_content>
- <#if historyEntry.thruReasonId == 'EXCEL_IMPORT_SUCCESS'>
- <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-ok-sign success-color">${uiLabelMap.ReasonOK}</i></button>
- <#elseif historyEntry.thruReasonId == 'EXCEL_IMPORT_STOPPED'>
- <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-remove-sign stopped-color">${uiLabelMap.ReasonStopped}</i></button>
- <#elseif historyEntry.thruReasonId == 'EXCEL_IMPORT_ERROR'>
- <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-exclamation-sign error-color"></i>${uiLabelMap.ReasonError}</button>
- <#elseif historyEntry.thruReasonId == 'EXCEL_IMPORT_QUEST'>
- <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-question-sign question-color"></i>${uiLabelMap.ReasonWarning}</button>
- </#if>
- </#if>
- </td>
- <td>${historyEntry.sequenceNum!}</td>
- <td style="text-align:right;">${historyEntry.fileName!}</td>
- <td><#if historyEntry.fromDate?exists && historyEntry.fromDate?has_content>${historyEntry.fromDate?string("yyyy-MM-dd HH:mm:ss")}</#if></td>
- <td><#if historyEntry.thruDate?exists && historyEntry.thruDate?has_content>${historyEntry.thruDate?string("yyyy-MM-dd HH:mm:ss")}</#if></td>
- <td><#if historyEntry.statusId?exists && historyEntry.statusId?has_content>${uiLabelMap.get(historyEntry.statusId)}</#if></td>
- <td><#if historyEntry.statusId?exists && historyEntry.statusId == "EXCEL_IMPORTED" && historyEntry.thruReasonId?exists && historyEntry.thruReasonId?has_content>${uiLabelMap.get(historyEntry.thruReasonId)}</#if></td>
- <td>
- <#assign buttons = 0 />
- <#if historyEntry.logFileName?exists && historyEntry.logFileName?has_content>
- <#if Static["org.apache.ofbiz.base.util.FileUtil"].getFile(historyEntry.logFileName).exists()>
- <button id="excel-import-log" type="button" onclick="viewExcelImportLog(${historyEntry.sequenceNum});" data-tooltip="${uiLabelMap.ViewExcelImportLogContent}">
- <i class="icon-comments icon-blue">${uiLabelMap.ViewPricatLog}</i>
- </button>
- <#assign buttons = buttons + 1 />
- </#if>
- </#if>
- <#if buttons == 0>
- <#--- <button id="excel-import-empty" type="button"></button> -->
- <#assign buttons = buttons + 1 />
- </#if>
- <#if historyEntry.logFileName?exists && historyEntry.logFileName?has_content>
- <#if Static["org.apache.ofbiz.pricat.AbstractPricatParser"].isCommentedExcelExists(request, historyEntry.sequenceNum)>
- <button id="excel-import-download" type="button" onclick="downloadCommentedExcel(${historyEntry.sequenceNum});" data-tooltip="${uiLabelMap.DownloadCommentedExcel}">
- <i class="icon-download icon-blue">${uiLabelMap.DownloadCommentedPricat}</i>
- </button>
- <#assign buttons = buttons + 1 />
- </#if>
- </#if>
- <#if buttons == 1>
- <#--- <button id="excel-import-empty" type="button"></button> -->
- </#if>
- </td>
- </tr>
- </#list>
- <#else>
- <tr>
- <td colspan="10" style="text-align:center;vertical-align:middle;height:60px;">
- ${uiLabelMap.ExcelImportTipNoData}
- </td>
- </tr>
- </#if>
- </tbody>
-</table>
-<script type="text/javascript" language="JavaScript">
- function viewExcelImportLog(sequenceNum) {
- document.location = "<@o...@ofbizUrl>?sequenceNum=" + sequenceNum;
- }
-
- function downloadCommentedExcel(sequenceNum) {
- document.location = "<@o...@ofbizUrl>?sequenceNum=" + sequenceNum;
- }
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div class="row">
+ <div class="col-sm-12 m-b-xs text-left p-xs">
+ <label >${uiLabelMap.ExcelImportHistoryList}</label>
+ <span class="tooltip pad-left30 top">${uiLabelMap.OnlyYourOwnImportHistoryDisplayed}</span>
+ </div>
+</div>
+
+<div id="loadBody" style="display:none">
+</div>
+<table id="productlist" name="productlist" class="table table-striped ms-table-primary">
+ <thead>
+ <th></th>
+ <th>${uiLabelMap.SerialNumber}</th>
+ <th>${uiLabelMap.Filename}</th>
+ <th>${uiLabelMap.FromDate}</th>
+ <th>${uiLabelMap.ThruDate}</th>
+ <th>${uiLabelMap.ImportStatus}</th>
+ <th>${uiLabelMap.ThruReasonId}</th>
+ <th>${uiLabelMap.Actions}</th>
+ </thead>
+ <tbody>
+ <#if (data?has_content)>
+ <#list data as historyEntry>
+ <tr name="${historyEntry.sequenceNum!}">
+ <td>
+ <#if historyEntry.statusId?exists && historyEntry.statusId == 'EXCEL_IMPORTING'>
+ <img src="/erptheme/images/blue_anime.gif" alt="${uiLabelMap.EXCE_IMPORTING}" tooltip="${uiLabelMap.EXCE_IMPORTING}">
+ <#elseif historyEntry.statusId?exists && historyEntry.statusId == 'EXCEL_IMPORTED' && historyEntry.thruReasonId?exists && historyEntry.thruReasonId?has_content>
+ <#if historyEntry.thruReasonId == 'EXCEL_IMPORT_SUCCESS'>
+ <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-ok-sign success-color">${uiLabelMap.ReasonOK}</i></button>
+ <#elseif historyEntry.thruReasonId == 'EXCEL_IMPORT_STOPPED'>
+ <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-remove-sign stopped-color">${uiLabelMap.ReasonStopped}</i></button>
+ <#elseif historyEntry.thruReasonId == 'EXCEL_IMPORT_ERROR'>
+ <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-exclamation-sign error-color"></i>${uiLabelMap.ReasonError}</button>
+ <#elseif historyEntry.thruReasonId == 'EXCEL_IMPORT_QUEST'>
+ <button id="excel-import-status" data-tooltip="${uiLabelMap.get(historyEntry.thruReasonId)}"><i class="icon-question-sign question-color"></i>${uiLabelMap.ReasonWarning}</button>
+ </#if>
+ </#if>
+ </td>
+ <td>${historyEntry.sequenceNum!}</td>
+ <td style="text-align:right;">${historyEntry.fileName!}</td>
+ <td><#if historyEntry.fromDate?exists && historyEntry.fromDate?has_content>${historyEntry.fromDate?string("yyyy-MM-dd HH:mm:ss")}</#if></td>
+ <td><#if historyEntry.thruDate?exists && historyEntry.thruDate?has_content>${historyEntry.thruDate?string("yyyy-MM-dd HH:mm:ss")}</#if></td>
+ <td><#if historyEntry.statusId?exists && historyEntry.statusId?has_content>${uiLabelMap.get(historyEntry.statusId)}</#if></td>
+ <td><#if historyEntry.statusId?exists && historyEntry.statusId == "EXCEL_IMPORTED" && historyEntry.thruReasonId?exists && historyEntry.thruReasonId?has_content>${uiLabelMap.get(historyEntry.thruReasonId)}</#if></td>
+ <td>
+ <#assign buttons = 0 />
+ <#if historyEntry.logFileName?exists && historyEntry.logFileName?has_content>
+ <#if Static["org.apache.ofbiz.base.util.FileUtil"].getFile(historyEntry.logFileName).exists()>
+ <button id="excel-import-log" type="button" onclick="viewExcelImportLog(${historyEntry.sequenceNum});" data-tooltip="${uiLabelMap.ViewExcelImportLogContent}">
+ <i class="icon-comments icon-blue">${uiLabelMap.ViewPricatLog}</i>
+ </button>
+ <#assign buttons = buttons + 1 />
+ </#if>
+ </#if>
+ <#if buttons == 0>
+ <#--- <button id="excel-import-empty" type="button"></button> -->
+ <#assign buttons = buttons + 1 />
+ </#if>
+ <#if historyEntry.logFileName?exists && historyEntry.logFileName?has_content>
+ <#if Static["org.apache.ofbiz.pricat.AbstractPricatParser"].isCommentedExcelExists(request, historyEntry.sequenceNum)>
+ <button id="excel-import-download" type="button" onclick="downloadCommentedExcel(${historyEntry.sequenceNum});" data-tooltip="${uiLabelMap.DownloadCommentedExcel}">
+ <i class="icon-download icon-blue">${uiLabelMap.DownloadCommentedPricat}</i>
+ </button>
+ <#assign buttons = buttons + 1 />
+ </#if>
+ </#if>
+ <#if buttons == 1>
+ <#--- <button id="excel-import-empty" type="button"></button> -->
+ </#if>
+ </td>
+ </tr>
+ </#list>
+ <#else>
+ <tr>
+ <td colspan="10" style="text-align:center;vertical-align:middle;height:60px;">
+ ${uiLabelMap.ExcelImportTipNoData}
+ </td>
+ </tr>
+ </#if>
+ </tbody>
+</table>
+<script type="text/javascript" language="JavaScript">
+ function viewExcelImportLog(sequenceNum) {
+ document.location = "<@o...@ofbizUrl>?sequenceNum=" + sequenceNum;
+ }
+
+ function downloadCommentedExcel(sequenceNum) {
+ document.location = "<@o...@ofbizUrl>?sequenceNum=" + sequenceNum;
+ }
</script>
\ No newline at end of file
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/pricatreport.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/report.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl (original)
+++ ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl Sun Feb 5 11:09:59 2017
@@ -1,31 +1,31 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<div id="wrapper">
- <div id="page-wrapper" class="gray-bg">
- <div class="row">
- <div class="col-lg-12">
- <div class="ibox float-e-margins">
- <div class="ibox-content text-left p-md">
- <#include "component://pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl"/>
- </div>
- </div>
- </div>
- </div>
- </div>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div id="wrapper">
+ <div id="page-wrapper" class="gray-bg">
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="ibox float-e-margins">
+ <div class="ibox-content text-left p-md">
+ <#include "component://pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl"/>
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
</div>
\ No newline at end of file
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/viewExcelImportLog.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/viewExcelImportLog.ftl?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/viewExcelImportLog.ftl (original)
+++ ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/viewExcelImportLog.ftl Sun Feb 5 11:09:59 2017
@@ -1,39 +1,39 @@
-<#--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<div id="wrapper">
- <div id="page-wrapper" class="gray-bg">
- <div class="row">
- <div class="col-lg-12">
- <div class="ibox float-e-margins">
- <div id="htmlreport" class="ibox-content text-left p-md">
-
- </div>
- </div>
- </div>
- </div>
- </div>
-</div>
-
-<script language='JavaScript'>
-<!--
-jQuery(document).ready( function() {
- jQuery("#htmlreport").html("${StringUtil.wrapString(logFileContent!)}");
-});
-//-->
-</script>
+<#--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<div id="wrapper">
+ <div id="page-wrapper" class="gray-bg">
+ <div class="row">
+ <div class="col-lg-12">
+ <div class="ibox float-e-margins">
+ <div id="htmlreport" class="ibox-content text-left p-md">
+
+ </div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+<script language='JavaScript'>
+<!--
+jQuery(document).ready( function() {
+ jQuery("#htmlreport").html("${StringUtil.wrapString(logFileContent!)}");
+});
+//-->
+</script>
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricat/ftl/viewExcelImportLog.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricat/includes/pricat.css
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricat/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/pricat/webapp/pricatdemo/error/error.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/pricat/webapp/pricatdemo/error/error.jsp?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/pricat/webapp/pricatdemo/error/error.jsp (original)
+++ ofbiz/trunk/plugins/pricat/webapp/pricatdemo/error/error.jsp Sun Feb 5 11:09:59 2017
@@ -1,52 +1,52 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
---%>
-<%@ page import="org.apache.ofbiz.base.util.*" %>
-<html>
-<head>
-<title>OFBiz Message</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>
-
-<body bgcolor="#FFFFFF">
-<div align="center">
- <br/>
- <table width="100%" border="1" height="200">
- <tr>
- <td>
- <table width="100%" border="0" height="200">
- <tr bgcolor="#CC6666">
- <td height="45">
- <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>
- </td>
- </tr>
- <tr>
- <td>
- <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-</div>
-<div align="center"></div>
-</body>
-</html>
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<%@ page import="org.apache.ofbiz.base.util.*" %>
+<html>
+<head>
+<title>OFBiz Message</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>
+
+<body bgcolor="#FFFFFF">
+<div align="center">
+ <br/>
+ <table width="100%" border="1" height="200">
+ <tr>
+ <td>
+ <table width="100%" border="0" height="200">
+ <tr bgcolor="#CC6666">
+ <td height="45">
+ <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+</div>
+<div align="center"></div>
+</body>
+</html>
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricatdemo/error/error.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricatdemo/ftl/SamplePricat.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricatdemo/ftl/countdownreport.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricatdemo/ftl/countupreport.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricatdemo/ftl/main.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricatdemo/ftl/parsePricatExcel.ftl
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: ofbiz/trunk/plugins/pricat/webapp/pricatdemo/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/projectmgr/webapp/projectmgr/error/error.jsp
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/projectmgr/webapp/projectmgr/error/error.jsp?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/projectmgr/webapp/projectmgr/error/error.jsp (original)
+++ ofbiz/trunk/plugins/projectmgr/webapp/projectmgr/error/error.jsp Sun Feb 5 11:09:59 2017
@@ -1,52 +1,52 @@
-<%--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
---%>
-<%@ page import="org.apache.ofbiz.base.util.*" %>
-<html>
-<head>
-<title>OFBiz Message</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-</head>
-
-<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>
-
-<body bgcolor="#FFFFFF">
-<div align="center">
- <br/>
- <table width="100%" border="1" height="200">
- <tr>
- <td>
- <table width="100%" border="0" height="200">
- <tr bgcolor="#CC6666">
- <td height="45">
- <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>
- </td>
- </tr>
- <tr>
- <td>
- <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-</div>
-<div align="center"></div>
-</body>
-</html>
+<%--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+--%>
+<%@ page import="org.apache.ofbiz.base.util.*" %>
+<html>
+<head>
+<title>OFBiz Message</title>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+</head>
+
+<% String errorMsg = (String) request.getAttribute("_ERROR_MESSAGE_"); %>
+
+<body bgcolor="#FFFFFF">
+<div align="center">
+ <br/>
+ <table width="100%" border="1" height="200">
+ <tr>
+ <td>
+ <table width="100%" border="0" height="200">
+ <tr bgcolor="#CC6666">
+ <td height="45">
+ <div align="center"><font face="Verdana, Arial, Helvetica, sans-serif" size="4" color="#FFFFFF"><b>:ERROR MESSAGE:</b></font></div>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div align="left"><font face="Verdana, Arial, Helvetica, sans-serif" size="2"><%=UtilFormatOut.replaceString(errorMsg, "\n", "<br/>")%></font></div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+</div>
+<div align="center"></div>
+</body>
+</html>
Propchange: ofbiz/trunk/plugins/projectmgr/webapp/projectmgr/error/error.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.html?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.html (original)
+++ ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.html Sun Feb 5 11:09:59 2017
@@ -1,24 +1,24 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- The content of this page will be statically included into the top-
-right box of the cores overview page. Uncomment this as an example to
-see there the content will show up.
-
-<img src="img/ico/construction.png"> This line will appear at the top-
-right box on collection1's Overview
--->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- The content of this page will be statically included into the top-
+right box of the cores overview page. Uncomment this as an example to
+see there the content will show up.
+
+<img src="img/ico/construction.png"> This line will appear at the top-
+right box on collection1's Overview
+-->
Propchange: ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.menu-bottom.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.menu-bottom.html?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.menu-bottom.html (original)
+++ ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.menu-bottom.html Sun Feb 5 11:09:59 2017
@@ -1,25 +1,25 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- admin-extra.menu-bottom.html -->
-<!--
-<li>
- <a href="#" style="background-image: url(img/ico/construction.png);">
- LAST ITEM
- </a>
-</li>
--->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- admin-extra.menu-bottom.html -->
+<!--
+<li>
+ <a href="#" style="background-image: url(img/ico/construction.png);">
+ LAST ITEM
+ </a>
+</li>
+-->
Propchange: ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.menu-bottom.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.menu-top.html
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.menu-top.html?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.menu-top.html (original)
+++ ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.menu-top.html Sun Feb 5 11:09:59 2017
@@ -1,25 +1,25 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- admin-extra.menu-top.html -->
-<!--
-<li>
- <a href="#" style="background-image: url(img/ico/construction.png);">
- FIRST ITEM
- </a>
-</li>
--->
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- admin-extra.menu-top.html -->
+<!--
+<li>
+ <a href="#" style="background-image: url(img/ico/construction.png);">
+ FIRST ITEM
+ </a>
+</li>
+-->
Propchange: ofbiz/trunk/plugins/solr/home/solrdefault/conf/admin-extra.menu-top.html
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_ca.txt
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_ca.txt?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_ca.txt (original)
+++ ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_ca.txt Sun Feb 5 11:09:59 2017
@@ -1,8 +1,8 @@
-# Set of Catalan contractions for ElisionFilter
-# TODO: load this as a resource from the analyzer and sync it in build.xml
-d
-l
-m
-n
-s
-t
+# Set of Catalan contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+d
+l
+m
+n
+s
+t
Propchange: ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_ca.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_fr.txt
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_fr.txt?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_fr.txt (original)
+++ ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_fr.txt Sun Feb 5 11:09:59 2017
@@ -1,15 +1,15 @@
-# Set of French contractions for ElisionFilter
-# TODO: load this as a resource from the analyzer and sync it in build.xml
-l
-m
-t
-qu
-n
-s
-j
-d
-c
-jusqu
-quoiqu
-lorsqu
-puisqu
+# Set of French contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+l
+m
+t
+qu
+n
+s
+j
+d
+c
+jusqu
+quoiqu
+lorsqu
+puisqu
Propchange: ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_fr.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_ga.txt
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_ga.txt?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_ga.txt (original)
+++ ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_ga.txt Sun Feb 5 11:09:59 2017
@@ -1,5 +1,5 @@
-# Set of Irish contractions for ElisionFilter
-# TODO: load this as a resource from the analyzer and sync it in build.xml
-d
-m
-b
+# Set of Irish contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+d
+m
+b
Propchange: ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_ga.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_it.txt
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_it.txt?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_it.txt (original)
+++ ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_it.txt Sun Feb 5 11:09:59 2017
@@ -1,23 +1,23 @@
-# Set of Italian contractions for ElisionFilter
-# TODO: load this as a resource from the analyzer and sync it in build.xml
-c
-l
-all
-dall
-dell
-nell
-sull
-coll
-pell
-gl
-agl
-dagl
-degl
-negl
-sugl
-un
-m
-t
-s
-v
-d
+# Set of Italian contractions for ElisionFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+c
+l
+all
+dall
+dell
+nell
+sull
+coll
+pell
+gl
+agl
+dagl
+degl
+negl
+sugl
+un
+m
+t
+s
+v
+d
Propchange: ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/contractions_it.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/hyphenations_ga.txt
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/hyphenations_ga.txt?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/hyphenations_ga.txt (original)
+++ ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/hyphenations_ga.txt Sun Feb 5 11:09:59 2017
@@ -1,5 +1,5 @@
-# Set of Irish hyphenations for StopFilter
-# TODO: load this as a resource from the analyzer and sync it in build.xml
-h
-n
-t
+# Set of Irish hyphenations for StopFilter
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+h
+n
+t
Propchange: ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/hyphenations_ga.txt
------------------------------------------------------------------------------
svn:eol-style = native
Modified: ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/stemdict_nl.txt
URL: http://svn.apache.org/viewvc/ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/stemdict_nl.txt?rev=1781731&r1=1781730&r2=1781731&view=diff
==============================================================================
--- ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/stemdict_nl.txt (original)
+++ ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/stemdict_nl.txt Sun Feb 5 11:09:59 2017
@@ -1,6 +1,6 @@
-# Set of overrides for the dutch stemmer
-# TODO: load this as a resource from the analyzer and sync it in build.xml
-fiets fiets
-bromfiets bromfiets
-ei eier
-kind kinder
+# Set of overrides for the dutch stemmer
+# TODO: load this as a resource from the analyzer and sync it in build.xml
+fiets fiets
+bromfiets bromfiets
+ei eier
+kind kinder
Propchange: ofbiz/trunk/plugins/solr/home/solrdefault/conf/lang/stemdict_nl.txt
------------------------------------------------------------------------------
svn:eol-style = native