svn commit: r1770979 [4/4] - in /ofbiz/trunk/specialpurpose/pr
Locked
svn commit: r1770979 [4/4] - in /ofbiz/trunk/specialpurpose/pr
 
|
Modified: ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl?rev=1770979&r1=1770978&r2=1770979&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl (original) +++ ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/ExcelImportHistoryReport.ftl Wed Nov 23 14:46:54 2016 @@ -16,94 +16,94 @@ KIND, either express or implied. See th 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 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> + <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 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> + </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> - <#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> + </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) { + function viewExcelImportLog(sequenceNum) { document.location = "<@ofbizUrl>viewExcelImportLog</@ofbizUrl>?sequenceNum=" + sequenceNum; } - function downloadCommentedExcel(sequenceNum) { + function downloadCommentedExcel(sequenceNum) { document.location = "<@ofbizUrl>downloadCommentedExcel</@ofbizUrl>?sequenceNum=" + sequenceNum; } </script> \ No newline at end of file Modified: ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/pricatreport.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/pricatreport.ftl?rev=1770979&r1=1770978&r2=1770979&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/pricatreport.ftl (original) +++ ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/pricatreport.ftl Wed Nov 23 14:46:54 2016 @@ -19,111 +19,111 @@ under the License. <#assign report = Static["org.apache.ofbiz.htmlreport.HtmlReport"].getInstance(request, response)> <#assign resourceParam = "resource" borderStyle = "2px inset ThreeDHighlight" - borderSimpleStyle = "2px solid ThreeDFace"> + borderSimpleStyle = "2px solid ThreeDFace"> <#if report.isMultiOperation(request)?string("true", "false") == "true"> - <#assign resourceParam = null> + <#assign resourceParam = null> </#if> <#assign action = report.getParamAction(request)> <#-- start of switch statement --> <#switch action> - <#case "reportupdate"> + <#case "reportupdate"> <#-- ACTION: get report update --> - <#assign htmlStart = report.htmlStart(false)> - ${StringUtil.wrapString(htmlStart)} + <#assign htmlStart = report.htmlStart(false)> + ${StringUtil.wrapString(htmlStart)} <script language='JavaScript'> <!-- function a(message) { - parent.append(message); + parent.append(message); } function aH(message) { - parent.appendHead(message); + parent.appendHead(message); } function aW(message) { - parent.appendWarning(message); + parent.appendWarning(message); } function aE(message) { - parent.appendError(message); + parent.appendError(message); } function aN(message) { - parent.appendNote(message); + parent.appendNote(message); } function aO(message) { - parent.appendOk(message); + parent.appendOk(message); } function aT(message) { - parent.appendThrowable(message); + parent.appendThrowable(message); } function aB() { - parent.appendBr(); + parent.appendBr(); } var active = null; function init() { - if (active != null) { - clearTimeout(active); - } - <#assign alive = report.isAlive(request)?string("true", "false")> + if (active != null) { + clearTimeout(active); + } + <#assign alive = report.isAlive(request)?string("true", "false")> var alive=${alive}; parent.flushArray(); ${StringUtil.wrapString(report.getReportUpdate())} - + parent.update(); - if (alive) { - active = setTimeout("reload('reportupdate');", 2000); + if (alive) { + active = setTimeout("reload('reportupdate');", 2000); } else { - var hasNext = "${report.getParamThreadHasNext(request)}"; - if (hasNext == "true") { - if (!${report.hasError()?string("true", "false")} || parent.isContinueChecked()) { - // all actions ok or continue checked, continue automatically - continueReport(); - } else { - // wait for user interaction - setTimeout('parent.stop();', 10); - }// end hasError - } else { - setTimeout('parent.stop();', 10); - }// end hasNext + var hasNext = "${report.getParamThreadHasNext(request)}"; + if (hasNext == "true") { + if (!${report.hasError()?string("true", "false")} || parent.isContinueChecked()) { + // all actions ok or continue checked, continue automatically + continueReport(); + } else { + // wait for user interaction + setTimeout('parent.stop();', 10); + }// end hasError + } else { + setTimeout('parent.stop();', 10); + }// end hasNext }// end alive } function reload(actionParam) { <#assign resName = report.getResourceList(request).get(0)> - var resName = "${resName}"; - if (resName != "") { - resName = "&resource=" + encodeURIComponent(resName); - } - <#assign dialogUri = report.getDialogRealUri(request) - thread = report.getParamThread(request) - threadhasnext = report.getParamThreadHasNext(request)> - location.href="${StringUtil.wrapString(dialogUri)}?action=" + actionParam + "&thread=${thread}&threadhasnext=${threadhasnext}" + resName; + var resName = "${resName}"; + if (resName != "") { + resName = "&resource=" + encodeURIComponent(resName); + } + <#assign dialogUri = report.getDialogRealUri(request) + thread = report.getParamThread(request) + threadhasnext = report.getParamThreadHasNext(request)> + location.href="${StringUtil.wrapString(dialogUri)}?action=" + actionParam + "&thread=${thread}&threadhasnext=${threadhasnext}" + resName; } function continueReport() { - if (!parent.buttonsInitialized) { - parent.initButtons(); - } - parent.disableButtons("buttonrowok"); - parent.displayButtonRowOk(); - parent.hasError = false; - parent.lastError = ""; - setTimeout("reload('reportend');", 2000); - if (parent.document.main.threadhasnext) { - parent.document.main.threadhasnext.value = "false"; - } + if (!parent.buttonsInitialized) { + parent.initButtons(); + } + parent.disableButtons("buttonrowok"); + parent.displayButtonRowOk(); + parent.hasError = false; + parent.lastError = ""; + setTimeout("reload('reportend');", 2000); + if (parent.document.main.threadhasnext) { + parent.document.main.threadhasnext.value = "false"; + } } // --> @@ -133,11 +133,11 @@ function continueReport() { ${StringUtil.wrapString(report.bodyEnd())} ${StringUtil.wrapString(report.htmlEnd())} - <#break> - <#-- ACTION: report begin --> - <#case "reportbegin"> - <#default> - ${report.setParamAction("reportend")} + <#break> + <#-- ACTION: report begin --> + <#case "reportbegin"> + <#default> + ${report.setParamAction("reportend")} ${StringUtil.wrapString(report.htmlStart())} @@ -180,46 +180,46 @@ var FORMAT_ERROR = 7; var buttonsInitialized = false; function append(message) { - reportOutputFormats.push(FORMAT_DEFAULT); - reportOutputMessages.push(message); + reportOutputFormats.push(FORMAT_DEFAULT); + reportOutputMessages.push(message); } function appendHead(message) { - reportOutputFormats.push(FORMAT_HEADLINE); - reportOutputMessages.push(message); - lastHeadline = "" + message; + reportOutputFormats.push(FORMAT_HEADLINE); + reportOutputMessages.push(message); + lastHeadline = "" + message; } function appendWarning(message) { - reportOutputFormats.push(FORMAT_WARNING); - reportOutputMessages.push(message); + reportOutputFormats.push(FORMAT_WARNING); + reportOutputMessages.push(message); } function appendError(message) { - reportOutputFormats.push(FORMAT_ERROR); - reportOutputMessages.push(message); - hasError = true; - lastError = message; + reportOutputFormats.push(FORMAT_ERROR); + reportOutputMessages.push(message); + hasError = true; + lastError = message; } function appendNote(message) { - reportOutputFormats.push(FORMAT_NOTE); - reportOutputMessages.push(message); + reportOutputFormats.push(FORMAT_NOTE); + reportOutputMessages.push(message); } function appendOk(message) { - reportOutputFormats.push(FORMAT_OK); - reportOutputMessages.push(message); + reportOutputFormats.push(FORMAT_OK); + reportOutputMessages.push(message); } function appendThrowable(message) { - reportOutputFormats.push(FORMAT_THROWABLE); - reportOutputMessages.push(message); + reportOutputFormats.push(FORMAT_THROWABLE); + reportOutputMessages.push(message); } function appendBr() { - reportOutputFormats.push(FORMAT_NEWLINE); - reportOutputMessages.push(""); + reportOutputFormats.push(FORMAT_NEWLINE); + reportOutputMessages.push(""); } var cssStyle = @@ -250,54 +250,54 @@ var pageStartSimple = "<td valign='middle'>"; var pageEndSimple = - "</td></tr>\n" + - "</table></div>\n" + - "</body>\n</html>"; + "</td></tr>\n" + + "</table></div>\n" + + "</body>\n</html>"; var pageStartExtended = "<html>\n<head>\n" + "<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=UTF-8'>\n"+ - cssStyle + + cssStyle + "</head>\n" + "<body style='overflow: auto;'>\n" + "<div class='main'>\n"; var pageEndExtended = - "</div>\n" + - "</body>\n" + - "</html>\n"; + "</div>\n" + + "</body>\n" + + "</html>\n"; function start() { - isRunning = true; + isRunning = true; - initButtons(); + initButtons(); } function stop() { - isRunning = false; - - if (document.main.threadhasnext) { - document.main.threadhasnext.value = "false"; - } - enableButtons("buttonrowcontinue"); - enableButtons("buttonrowok"); - - updateReport(); + isRunning = false; + + if (document.main.threadhasnext) { + document.main.threadhasnext.value = "false"; + } + enableButtons("buttonrowcontinue"); + enableButtons("buttonrowok"); + + updateReport(); } // flush the arrays with the report formats and messages -function flushArray() { +function flushArray() { reportOutputFormats = new Array(); - reportOutputMessages = new Array(); + reportOutputMessages = new Array(); } // updates the report, builds the HTML string from the JavaScript input function update() { - var size = 512000; + var size = 512000; - // resize the HTML string + // resize the HTML string if (htmlText.length > size) { htmlText = htmlText.substring(htmlText.length - size, htmlText.length); var pos = htmlText.indexOf("\n"); @@ -305,21 +305,21 @@ function update() { // cut output at the first linebreak to have a "nice" start htmlText = htmlText.substring(pos, htmlText.length); } - } - - // append the HTML of the extended report format to the HTML string + } + + // append the HTML of the extended report format to the HTML string htmlText += getContentExtended(); - - // write the HTML output to the iframe - updateReport(); + + // write the HTML output to the iframe + updateReport(); } // writes the HTML output to the iframe // this function gets also invoked when the report output format is toggled function updateReport() { - pageBody = pageStartExtended + htmlText + pageEndExtended; - document.getElementById("report").style.border = "${borderStyle}"; + pageBody = pageStartExtended + htmlText + pageEndExtended; + document.getElementById("report").style.border = "${borderStyle}"; report.document.open(); report.document.write(pageBody); report.document.close(); @@ -329,122 +329,122 @@ function updateReport() { // builds the HTML string from the JavaScript input function getContentExtended() { - var htmlStr = ""; - var i = 0; - for (i=0;i<reportOutputFormats.length && i<reportOutputMessages.length;i++) { - switch (reportOutputFormats[i]) { - case FORMAT_WARNING : - htmlStr += "<span class='warn'>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - break; - case FORMAT_ERROR : - htmlStr += "<span class='err'>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - break; - case FORMAT_HEADLINE : - htmlStr += "<span class='head'>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - break; - case FORMAT_NOTE : - htmlStr += "<span class='note'>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - break; - case FORMAT_OK : - htmlStr += "<span class='ok'>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - break; - case FORMAT_NEWLINE : - htmlStr += "\n"; - break; - case FORMAT_THROWABLE : - htmlStr += "<span class='throw'>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - break; - case FORMAT_DEFAULT : - default : - htmlStr += "<span>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - } - } - - return htmlStr; + var htmlStr = ""; + var i = 0; + for (i=0;i<reportOutputFormats.length && i<reportOutputMessages.length;i++) { + switch (reportOutputFormats[i]) { + case FORMAT_WARNING : + htmlStr += "<span class='warn'>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + break; + case FORMAT_ERROR : + htmlStr += "<span class='err'>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + break; + case FORMAT_HEADLINE : + htmlStr += "<span class='head'>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + break; + case FORMAT_NOTE : + htmlStr += "<span class='note'>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + break; + case FORMAT_OK : + htmlStr += "<span class='ok'>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + break; + case FORMAT_NEWLINE : + htmlStr += "\n"; + break; + case FORMAT_THROWABLE : + htmlStr += "<span class='throw'>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + break; + case FORMAT_DEFAULT : + default : + htmlStr += "<span>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + } + } + + return htmlStr; } function doScroll() { - var pos = 1000000; + var pos = 1000000; report.window.scrollTo(0, pos); } function isContinueChecked() { - if (document.main.continuereport && document.main.continuereport.checked == true) { - return true; - } else { - return false; - } + if (document.main.continuereport && document.main.continuereport.checked == true) { + return true; + } else { + return false; + } } function displayButtonRowContinue() { - displayButtonRow("buttonrowcontinue", true); - displayButtonRow("checkcontinue", true); - displayButtonRow("buttonrowok", false); + displayButtonRow("buttonrowcontinue", true); + displayButtonRow("checkcontinue", true); + displayButtonRow("buttonrowok", false); } function displayButtonRowOk() { - displayButtonRow("buttonrowcontinue", false); - toggleButton("continuereport", true); - displayButtonRow("buttonrowok", true); + displayButtonRow("buttonrowcontinue", false); + toggleButton("continuereport", true); + displayButtonRow("buttonrowok", true); } function displayButtonRow(rowId, show) { - if (show) { - document.getElementById(rowId).className = "show"; - } else { - document.getElementById(rowId).className = "hide"; - } + if (show) { + document.getElementById(rowId).className = "show"; + } else { + document.getElementById(rowId).className = "hide"; + } } function enableButtons(rowId) { - if (rowId == "buttonrowcontinue") { - toggleButton("contok", false); - toggleButton("contcancel", false); - } else { - toggleButton("okclose", false); - } + if (rowId == "buttonrowcontinue") { + toggleButton("contok", false); + toggleButton("contcancel", false); + } else { + toggleButton("okclose", false); + } } function disableButtons(rowId) { - if (rowId == "buttonrowcontinue") { - toggleButton("contok", true); - toggleButton("contcancel", true); - } else { - toggleButton("okclose", true); - toggleButton("okcancel", true); - } + if (rowId == "buttonrowcontinue") { + toggleButton("contok", true); + toggleButton("contcancel", true); + } else { + toggleButton("okclose", true); + toggleButton("okcancel", true); + } } function toggleButton(buttonId, disableButton) { - if (document.getElementById(buttonId)) { - document.getElementById(buttonId).disabled = disableButton; - } + if (document.getElementById(buttonId)) { + document.getElementById(buttonId).disabled = disableButton; + } } function initButtons() { - if (document.main.threadhasnext && document.main.threadhasnext.value == "true" - && document.main.reportcontinuekey && document.main.reportcontinuekey.value != "") { - displayButtonRowContinue(); - } else { - displayButtonRowOk(); - } - disableButtons("buttonrowcontinue"); - disableButtons("buttonrowok"); - buttonsInitialized = true; + if (document.main.threadhasnext && document.main.threadhasnext.value == "true" + && document.main.reportcontinuekey && document.main.reportcontinuekey.value != "") { + displayButtonRowContinue(); + } else { + displayButtonRowOk(); + } + disableButtons("buttonrowcontinue"); + disableButtons("buttonrowok"); + buttonsInitialized = true; } function submitActionRefresh(para1, para2, para3) { @@ -491,7 +491,7 @@ function downloadPricat(sequenceNum) { <table border="0" cellpadding="0" cellspacing="0" width="100%" height="400"> <tr> - <td><iframe name="report" id="report" src="about:blank" frameborder="0" style="width:99.8%; height:400px; padding: 0; margin: 0; border: ${borderStyle};"></iframe></td> + <td><iframe name="report" id="report" src="about:blank" frameborder="0" style="width:99.8%; height:400px; padding: 0; margin: 0; border: ${borderStyle};"></iframe></td> </tr> </table> Modified: ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/report.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/report.ftl?rev=1770979&r1=1770978&r2=1770979&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/report.ftl (original) +++ ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/report.ftl Wed Nov 23 14:46:54 2016 @@ -19,111 +19,111 @@ under the License. <#assign report = Static["org.apache.ofbiz.htmlreport.HtmlReport"].getInstance(request, response)> <#assign resourceParam = "resource" borderStyle = "2px inset ThreeDHighlight" - borderSimpleStyle = "2px solid ThreeDFace"> + borderSimpleStyle = "2px solid ThreeDFace"> <#if report.isMultiOperation(request)?string("true", "false") == "true"> - <#assign resourceParam = null> + <#assign resourceParam = null> </#if> <#assign action = report.getParamAction(request)> <#-- start of switch statement --> <#switch action> - <#case "reportupdate"> + <#case "reportupdate"> <#-- ACTION: get report update --> - <#assign htmlStart = report.htmlStart(false)> - ${StringUtil.wrapString(htmlStart)} + <#assign htmlStart = report.htmlStart(false)> + ${StringUtil.wrapString(htmlStart)} <script language='JavaScript'> <!-- function a(message) { - parent.append(message); + parent.append(message); } function aH(message) { - parent.appendHead(message); + parent.appendHead(message); } function aW(message) { - parent.appendWarning(message); + parent.appendWarning(message); } function aE(message) { - parent.appendError(message); + parent.appendError(message); } function aN(message) { - parent.appendNote(message); + parent.appendNote(message); } function aO(message) { - parent.appendOk(message); + parent.appendOk(message); } function aT(message) { - parent.appendThrowable(message); + parent.appendThrowable(message); } function aB() { - parent.appendBr(); + parent.appendBr(); } var active = null; function init() { - if (active != null) { - clearTimeout(active); - } - <#assign alive = report.isAlive(request)?string("true", "false")> + if (active != null) { + clearTimeout(active); + } + <#assign alive = report.isAlive(request)?string("true", "false")> var alive=${alive}; parent.flushArray(); ${StringUtil.wrapString(report.getReportUpdate())} - + parent.update(); - if (alive) { - active = setTimeout("reload('reportupdate');", 2000); + if (alive) { + active = setTimeout("reload('reportupdate');", 2000); } else { - var hasNext = "${report.getParamThreadHasNext(request)}"; - if (hasNext == "true") { - if (!${report.hasError()?string("true", "false")} || parent.isContinueChecked()) { - // all actions ok or continue checked, continue automatically - continueReport(); - } else { - // wait for user interaction - setTimeout('parent.stop();', 10); - }// end hasError - } else { - setTimeout('parent.stop();', 10); - }// end hasNext + var hasNext = "${report.getParamThreadHasNext(request)}"; + if (hasNext == "true") { + if (!${report.hasError()?string("true", "false")} || parent.isContinueChecked()) { + // all actions ok or continue checked, continue automatically + continueReport(); + } else { + // wait for user interaction + setTimeout('parent.stop();', 10); + }// end hasError + } else { + setTimeout('parent.stop();', 10); + }// end hasNext }// end alive } function reload(actionParam) { <#assign resName = report.getResourceList(request).get(0)> - var resName = "${resName}"; - if (resName != "") { - resName = "&resource=" + encodeURIComponent(resName); - } - <#assign dialogUri = report.getDialogRealUri(request) - thread = report.getParamThread(request) - threadhasnext = report.getParamThreadHasNext(request)> - location.href="${StringUtil.wrapString(dialogUri)}?&action=" + actionParam + "&thread=${thread}&threadhasnext=${threadhasnext}" + resName; + var resName = "${resName}"; + if (resName != "") { + resName = "&resource=" + encodeURIComponent(resName); + } + <#assign dialogUri = report.getDialogRealUri(request) + thread = report.getParamThread(request) + threadhasnext = report.getParamThreadHasNext(request)> + location.href="${StringUtil.wrapString(dialogUri)}?&action=" + actionParam + "&thread=${thread}&threadhasnext=${threadhasnext}" + resName; } function continueReport() { - if (!parent.buttonsInitialized) { - parent.initButtons(); - } - parent.disableButtons("buttonrowok"); - parent.displayButtonRowOk(); - parent.hasError = false; - parent.lastError = ""; - setTimeout("reload('reportend');", 2000); - if (parent.document.main.threadhasnext) { - parent.document.main.threadhasnext.value = "false"; - } + if (!parent.buttonsInitialized) { + parent.initButtons(); + } + parent.disableButtons("buttonrowok"); + parent.displayButtonRowOk(); + parent.hasError = false; + parent.lastError = ""; + setTimeout("reload('reportend');", 2000); + if (parent.document.main.threadhasnext) { + parent.document.main.threadhasnext.value = "false"; + } } // --> @@ -133,11 +133,11 @@ function continueReport() { ${StringUtil.wrapString(report.bodyEnd())} ${StringUtil.wrapString(report.htmlEnd())} - <#break> - <#-- ACTION: report begin --> - <#case "reportbegin"> - <#default> - ${report.setParamAction("reportend")} + <#break> + <#-- ACTION: report begin --> + <#case "reportbegin"> + <#default> + ${report.setParamAction("reportend")} ${StringUtil.wrapString(report.htmlStart())} @@ -180,46 +180,46 @@ var FORMAT_ERROR = 7; var buttonsInitialized = false; function append(message) { - reportOutputFormats.push(FORMAT_DEFAULT); - reportOutputMessages.push(message); + reportOutputFormats.push(FORMAT_DEFAULT); + reportOutputMessages.push(message); } function appendHead(message) { - reportOutputFormats.push(FORMAT_HEADLINE); - reportOutputMessages.push(message); - lastHeadline = "" + message; + reportOutputFormats.push(FORMAT_HEADLINE); + reportOutputMessages.push(message); + lastHeadline = "" + message; } function appendWarning(message) { - reportOutputFormats.push(FORMAT_WARNING); - reportOutputMessages.push(message); + reportOutputFormats.push(FORMAT_WARNING); + reportOutputMessages.push(message); } function appendError(message) { - reportOutputFormats.push(FORMAT_ERROR); - reportOutputMessages.push(message); - hasError = true; - lastError = message; + reportOutputFormats.push(FORMAT_ERROR); + reportOutputMessages.push(message); + hasError = true; + lastError = message; } function appendNote(message) { - reportOutputFormats.push(FORMAT_NOTE); - reportOutputMessages.push(message); + reportOutputFormats.push(FORMAT_NOTE); + reportOutputMessages.push(message); } function appendOk(message) { - reportOutputFormats.push(FORMAT_OK); - reportOutputMessages.push(message); + reportOutputFormats.push(FORMAT_OK); + reportOutputMessages.push(message); } function appendThrowable(message) { - reportOutputFormats.push(FORMAT_THROWABLE); - reportOutputMessages.push(message); + reportOutputFormats.push(FORMAT_THROWABLE); + reportOutputMessages.push(message); } function appendBr() { - reportOutputFormats.push(FORMAT_NEWLINE); - reportOutputMessages.push(""); + reportOutputFormats.push(FORMAT_NEWLINE); + reportOutputMessages.push(""); } var cssStyle = @@ -250,54 +250,54 @@ var pageStartSimple = "<td valign='middle'>"; var pageEndSimple = - "</td></tr>\n" + - "</table></div>\n" + - "</body>\n</html>"; + "</td></tr>\n" + + "</table></div>\n" + + "</body>\n</html>"; var pageStartExtended = "<html>\n<head>\n" + "<meta HTTP-EQUIV='Content-Type' CONTENT='text/html; charset=UTF-8'>\n"+ - cssStyle + + cssStyle + "</head>\n" + "<body style='overflow: auto;'>\n" + "<div class='main'>\n"; var pageEndExtended = - "</div>\n" + - "</body>\n" + - "</html>\n"; + "</div>\n" + + "</body>\n" + + "</html>\n"; function start() { - isRunning = true; + isRunning = true; - initButtons(); + initButtons(); } function stop() { - isRunning = false; - - if (document.main.threadhasnext) { - document.main.threadhasnext.value = "false"; - } - enableButtons("buttonrowcontinue"); - enableButtons("buttonrowok"); - - updateReport(); + isRunning = false; + + if (document.main.threadhasnext) { + document.main.threadhasnext.value = "false"; + } + enableButtons("buttonrowcontinue"); + enableButtons("buttonrowok"); + + updateReport(); } // flush the arrays with the report formats and messages -function flushArray() { +function flushArray() { reportOutputFormats = new Array(); - reportOutputMessages = new Array(); + reportOutputMessages = new Array(); } // updates the report, builds the HTML string from the JavaScript input function update() { - var size = 512000; + var size = 512000; - // resize the HTML string + // resize the HTML string if (htmlText.length > size) { htmlText = htmlText.substring(htmlText.length - size, htmlText.length); var pos = htmlText.indexOf("\n"); @@ -305,21 +305,21 @@ function update() { // cut output at the first linebreak to have a "nice" start htmlText = htmlText.substring(pos, htmlText.length); } - } - - // append the HTML of the extended report format to the HTML string + } + + // append the HTML of the extended report format to the HTML string htmlText += getContentExtended(); - - // write the HTML output to the iframe - updateReport(); + + // write the HTML output to the iframe + updateReport(); } // writes the HTML output to the iframe // this function gets also invoked when the report output format is toggled function updateReport() { - pageBody = pageStartExtended + htmlText + pageEndExtended; - document.getElementById("report").style.border = "${borderStyle}"; + pageBody = pageStartExtended + htmlText + pageEndExtended; + document.getElementById("report").style.border = "${borderStyle}"; report.document.open(); report.document.write(pageBody); report.document.close(); @@ -329,122 +329,122 @@ function updateReport() { // builds the HTML string from the JavaScript input function getContentExtended() { - var htmlStr = ""; - var i = 0; - for (i=0;i<reportOutputFormats.length && i<reportOutputMessages.length;i++) { - switch (reportOutputFormats[i]) { - case FORMAT_WARNING : - htmlStr += "<span class='warn'>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - break; - case FORMAT_ERROR : - htmlStr += "<span class='err'>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - break; - case FORMAT_HEADLINE : - htmlStr += "<span class='head'>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - break; - case FORMAT_NOTE : - htmlStr += "<span class='note'>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - break; - case FORMAT_OK : - htmlStr += "<span class='ok'>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - break; - case FORMAT_NEWLINE : - htmlStr += "\n"; - break; - case FORMAT_THROWABLE : - htmlStr += "<span class='throw'>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - break; - case FORMAT_DEFAULT : - default : - htmlStr += "<span>"; - htmlStr += reportOutputMessages[i]; - htmlStr += "</span>"; - } - } - - return htmlStr; + var htmlStr = ""; + var i = 0; + for (i=0;i<reportOutputFormats.length && i<reportOutputMessages.length;i++) { + switch (reportOutputFormats[i]) { + case FORMAT_WARNING : + htmlStr += "<span class='warn'>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + break; + case FORMAT_ERROR : + htmlStr += "<span class='err'>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + break; + case FORMAT_HEADLINE : + htmlStr += "<span class='head'>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + break; + case FORMAT_NOTE : + htmlStr += "<span class='note'>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + break; + case FORMAT_OK : + htmlStr += "<span class='ok'>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + break; + case FORMAT_NEWLINE : + htmlStr += "\n"; + break; + case FORMAT_THROWABLE : + htmlStr += "<span class='throw'>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + break; + case FORMAT_DEFAULT : + default : + htmlStr += "<span>"; + htmlStr += reportOutputMessages[i]; + htmlStr += "</span>"; + } + } + + return htmlStr; } function doScroll() { - var pos = 1000000; + var pos = 1000000; report.window.scrollTo(0, pos); } function isContinueChecked() { - if (document.main.continuereport && document.main.continuereport.checked == true) { - return true; - } else { - return false; - } + if (document.main.continuereport && document.main.continuereport.checked == true) { + return true; + } else { + return false; + } } function displayButtonRowContinue() { - displayButtonRow("buttonrowcontinue", true); - displayButtonRow("checkcontinue", true); - displayButtonRow("buttonrowok", false); + displayButtonRow("buttonrowcontinue", true); + displayButtonRow("checkcontinue", true); + displayButtonRow("buttonrowok", false); } function displayButtonRowOk() { - displayButtonRow("buttonrowcontinue", false); - toggleButton("continuereport", true); - displayButtonRow("buttonrowok", true); + displayButtonRow("buttonrowcontinue", false); + toggleButton("continuereport", true); + displayButtonRow("buttonrowok", true); } function displayButtonRow(rowId, show) { - if (show) { - document.getElementById(rowId).className = "show"; - } else { - document.getElementById(rowId).className = "hide"; - } + if (show) { + document.getElementById(rowId).className = "show"; + } else { + document.getElementById(rowId).className = "hide"; + } } function enableButtons(rowId) { - if (rowId == "buttonrowcontinue") { - toggleButton("contok", false); - toggleButton("contcancel", false); - } else { - toggleButton("okclose", false); - } + if (rowId == "buttonrowcontinue") { + toggleButton("contok", false); + toggleButton("contcancel", false); + } else { + toggleButton("okclose", false); + } } function disableButtons(rowId) { - if (rowId == "buttonrowcontinue") { - toggleButton("contok", true); - toggleButton("contcancel", true); - } else { - toggleButton("okclose", true); - toggleButton("okcancel", true); - } + if (rowId == "buttonrowcontinue") { + toggleButton("contok", true); + toggleButton("contcancel", true); + } else { + toggleButton("okclose", true); + toggleButton("okcancel", true); + } } function toggleButton(buttonId, disableButton) { - if (document.getElementById(buttonId)) { - document.getElementById(buttonId).disabled = disableButton; - } + if (document.getElementById(buttonId)) { + document.getElementById(buttonId).disabled = disableButton; + } } function initButtons() { - if (document.main.threadhasnext && document.main.threadhasnext.value == "true" - && document.main.reportcontinuekey && document.main.reportcontinuekey.value != "") { - displayButtonRowContinue(); - } else { - displayButtonRowOk(); - } - disableButtons("buttonrowcontinue"); - disableButtons("buttonrowok"); - buttonsInitialized = true; + if (document.main.threadhasnext && document.main.threadhasnext.value == "true" + && document.main.reportcontinuekey && document.main.reportcontinuekey.value != "") { + displayButtonRowContinue(); + } else { + displayButtonRowOk(); + } + disableButtons("buttonrowcontinue"); + disableButtons("buttonrowok"); + buttonsInitialized = true; } function submitActionRefresh(para1, para2, para3) { @@ -472,7 +472,7 @@ function submitActionRefresh(para1, para <table border="0" cellpadding="0" cellspacing="0" width="100%" height="400"> <tr> - <td><iframe name="report" id="report" src="about:blank" frameborder="0" style="width:99.8%; height:400px; padding: 0; margin: 0; border: ${borderStyle};"></iframe></td> + <td><iframe name="report" id="report" src="about:blank" frameborder="0" style="width:99.8%; height:400px; padding: 0; margin: 0; border: ${borderStyle};"></iframe></td> </tr> </table> Modified: ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl?rev=1770979&r1=1770978&r2=1770979&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl (original) +++ ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/viewExcelImportHistory.ftl Wed Nov 23 14:46:54 2016 @@ -17,15 +17,15 @@ specific language governing permissions 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 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 Modified: ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/viewExcelImportLog.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/viewExcelImportLog.ftl?rev=1770979&r1=1770978&r2=1770979&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/viewExcelImportLog.ftl (original) +++ ofbiz/trunk/specialpurpose/pricat/webapp/pricat/ftl/viewExcelImportLog.ftl Wed Nov 23 14:46:54 2016 @@ -17,23 +17,23 @@ specific language governing permissions 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 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!)}"); + jQuery("#htmlreport").html("${StringUtil.wrapString(logFileContent!)}"); }); //--> </script> Modified: ofbiz/trunk/specialpurpose/pricat/webapp/pricat/includes/pricat.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pricat/webapp/pricat/includes/pricat.css?rev=1770979&r1=1770978&r2=1770979&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pricat/webapp/pricat/includes/pricat.css (original) +++ ofbiz/trunk/specialpurpose/pricat/webapp/pricat/includes/pricat.css Wed Nov 23 14:46:54 2016 @@ -18,135 +18,135 @@ */ .main input { - margin-right: 7px; + margin-right: 7px; } /* headline of dialog window */ .dialoghead { - background-color: ActiveCaption; - margin-bottom: 8px; - padding: 2px; - color: CaptionText; - font-size: 12px; - font-weight: bold; - white-space: nowrap; + background-color: ActiveCaption; + margin-bottom: 8px; + padding: 2px; + color: CaptionText; + font-size: 12px; + font-weight: bold; + white-space: nowrap; } /* outer table of complete dialog window */ table.dialog { margin: 20px auto; - width: 85%; - border-left: 1px solid ThreeDLightShadow; - border-top: 1px solid ThreeDLightShadow; - border-right: 1px solid ThreedDarkShadow; - border-bottom: 1px solid ThreedDarkShadow; + width: 85%; + border-left: 1px solid ThreeDLightShadow; + border-top: 1px solid ThreeDLightShadow; + border-right: 1px solid ThreedDarkShadow; + border-bottom: 1px solid ThreedDarkShadow; } /* inner table of complete dialog window */ table.dialogbox { - width: 100%; - background-color: ThreeDFace; - background-color: ThreeDFace; - border-left: 1px solid ThreeDHighlight; - border-top: 1px solid ThreeDHighlight; - border-right: 1px solid ThreeDShadow; - border-bottom: 1px solid ThreeDShadow; - padding-top: 1px; - + width: 100%; + background-color: ThreeDFace; + background-color: ThreeDFace; + border-left: 1px solid ThreeDHighlight; + border-top: 1px solid ThreeDHighlight; + border-right: 1px solid ThreeDShadow; + border-bottom: 1px solid ThreeDShadow; + padding-top: 1px; + } body.dialog { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - padding: 0; - margin: 0; - + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + padding: 0; + margin: 0; + } /* Button - Image button in image style */ img.button { - height: 20px; - width: 20px; - border: 0px none; - vertical-align: middle; + height: 20px; + width: 20px; + border: 0px none; + vertical-align: middle; } /* Button - Link (href) style */ a.button { - color: ButtonText; - text-decoration: none; - cursor: pointer; + color: ButtonText; + text-decoration: none; + cursor: pointer; } /* Button - Normal style (inactive) */ span.norm { - display: block; - border: 1px solid ThreeDFace; + display: block; + border: 1px solid ThreeDFace; } /* Button - Hover style */ span.over { - display: block; - border-top: 1px solid ThreeDHighlight; - border-left: 1px solid ThreeDHighlight; - border-bottom: 1px solid ThreeDShadow; - border-right: 1px solid ThreeDShadow; + display: block; + border-top: 1px solid ThreeDHighlight; + border-left: 1px solid ThreeDHighlight; + border-bottom: 1px solid ThreeDShadow; + border-right: 1px solid ThreeDShadow; } /* Button - Push style */ span.push { - display: block; - border-top: 1px solid ThreeDShadow; - border-left: 1px solid ThreeDShadow; - border-bottom: 1px solid ThreeDHighlight; - border-right: 1px solid ThreeDHighlight; + display: block; + border-top: 1px solid ThreeDShadow; + border-left: 1px solid ThreeDShadow; + border-bottom: 1px solid ThreeDHighlight; + border-right: 1px solid ThreeDHighlight; } /* Button - Disabled style */ span.disabled { - display: block; - border: 1px solid ThreeDFace; - color: GrayText; + display: block; + border: 1px solid ThreeDFace; + color: GrayText; } /* Button - Separator */ span.separator { - display: block; - height: 18px; - width: 0px; - border-top: 0px; - border-left: 1px solid ThreeDShadow; - border-bottom: 0px; - border-right: 1px solid ThreeDHighlight; + display: block; + height: 18px; + width: 0px; + border-top: 0px; + border-left: 1px solid ThreeDShadow; + border-bottom: 0px; + border-right: 1px solid ThreeDHighlight; } /* final button row of dialog window */ .dialogbuttons { - padding: 3px 8px 5px; - text-align: center; - + padding: 3px 8px 5px; + text-align: center; + } .dialogcontent { - border-left: 1px solid ThreeDHighlight; - border-top: 1px solid ThreeDHighlight; - border-right: 2px solid ThreeDShadow; - border-bottom: 2px solid ThreeDShadow; - margin: 8px; - padding: 15px; + border-left: 1px solid ThreeDHighlight; + border-top: 1px solid ThreeDHighlight; + border-right: 2px solid ThreeDShadow; + border-bottom: 2px solid ThreeDShadow; + margin: 8px; + padding: 15px; } /* Submit and other buttons */ input.dialogbutton { - font-family: Verdana, Arial, Helvetica, sans-serif; - font-size: 11px; - background-color: ButtonFace; - width: 100px; - height: 20px; - padding: 0 5px; - margin-left: 12px; - overflow: visible; + font-family: Verdana, Arial, Helvetica, sans-serif; + font-size: 11px; + background-color: ButtonFace; + width: 100px; + height: 20px; + padding: 0 5px; + margin-left: 12px; + overflow: visible; } /* empty dummy style */ @@ -154,20 +154,20 @@ input.dialogbutton { /* element without margin and padding */ .nomargin { - padding: 0; - margin: 0; + padding: 0; + margin: 0; } /* hide a block */ .hide { - display: none; - visibility: hidden; + display: none; + visibility: hidden; } /* show a block */ .show { - display: inline; - visibility: visible; + display: inline; + visibility: visible; } .help { @@ -219,32 +219,32 @@ span.throw { color: #990000; font-weight } .ms-table-primary thead{ - background-color: #eeeeee; + background-color: #eeeeee; } .ms-table-primary tr.ms-table-header, tr.ms-table-header span{ - font-weight: bold; + font-weight: bold; } .ms-table-primary{ - width: 100%; - border:0; - margin:0; - border-collapse:collapse; + width: 100%; + border:0; + margin:0; + border-collapse:collapse; } .ms-table-primary td,th{ - padding:0; - text-align: center; - vertical-align: middle !important; + padding:0; + text-align: center; + vertical-align: middle !important; } .ms-table-primary .text-left{ - padding:0; - text-align: left; - vertical-align: middle !important; + padding:0; + text-align: left; + vertical-align: middle !important; } .ms-table-primary .text-right{ - padding:0; - text-align: right; - vertical-align: middle !important; + padding:0; + text-align: right; + vertical-align: middle !important; } .p-xs { Modified: ofbiz/trunk/specialpurpose/pricat/webapp/pricatdemo/ftl/SamplePricat.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pricat/webapp/pricatdemo/ftl/SamplePricat.ftl?rev=1770979&r1=1770978&r2=1770979&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pricat/webapp/pricatdemo/ftl/SamplePricat.ftl (original) +++ ofbiz/trunk/specialpurpose/pricat/webapp/pricatdemo/ftl/SamplePricat.ftl Wed Nov 23 14:46:54 2016 @@ -25,7 +25,7 @@ under the License. </div> <div class="screenlet-body"> <form method="post" enctype="multipart/form-data" action="<@ofbizUrl>pricatUpload</@ofbizUrl>"> - <input type="hidden" name="action" value="store_excel" /> + <input type="hidden" name="action" value="store_excel" /> <input type="file" size="60" name="filename"/><br /> ${uiLabelMap.ExcelTemplateType}: <select name="excelTemplateType" id="excelTemplateType"> Modified: ofbiz/trunk/specialpurpose/pricat/widget/CommonScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pricat/widget/CommonScreens.xml?rev=1770979&r1=1770978&r2=1770979&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pricat/widget/CommonScreens.xml (original) +++ ofbiz/trunk/specialpurpose/pricat/widget/CommonScreens.xml Wed Nov 23 14:46:54 2016 @@ -47,7 +47,7 @@ under the License. <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="ViewExcelImportHistory"/> - <script location="component://pricat/groovyScripts/pricat/FindMyExcelImport.groovy"/> + <script location="component://pricat/groovyScripts/pricat/FindMyExcelImport.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator"> @@ -66,7 +66,7 @@ under the License. <property-map resource="CommonUiLabels" map-name="uiLabelMap" global="true"/> <set field="titleProperty" value="ViewExcelImportLogContent"/> - <script location="component://pricat/groovyScripts/pricat/FindMyExcelImportLog.groovy"/> + <script location="component://pricat/groovyScripts/pricat/FindMyExcelImportLog.groovy"/> </actions> <widgets> <decorator-screen name="main-decorator"> Modified: ofbiz/trunk/specialpurpose/pricat/widget/SampleScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/pricat/widget/SampleScreens.xml?rev=1770979&r1=1770978&r2=1770979&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/pricat/widget/SampleScreens.xml (original) +++ ofbiz/trunk/specialpurpose/pricat/widget/SampleScreens.xml Wed Nov 23 14:46:54 2016 @@ -47,15 +47,15 @@ under the License. <widgets> <decorator-screen name="main-decorator"> <decorator-section name="body"> - <section> - <widgets> - <platform-specific> - <html> + <section> + <widgets> + <platform-specific> + <html> <html-template location="component://pricat/webapp/pricatdemo/ftl/main.ftl"/> - </html> - </platform-specific> + </html> + </platform-specific> </widgets> - </section> + </section> </decorator-section> </decorator-screen> </widgets> @@ -70,15 +70,15 @@ under the License. <widgets> <decorator-screen name="main-decorator"> <decorator-section name="body"> - <section> - <widgets> - <platform-specific> - <html> + <section> + <widgets> + <platform-specific> + <html> <html-template location="component://pricat/webapp/pricatdemo/ftl/countdownreport.ftl"/> - </html> - </platform-specific> + </html> + </platform-specific> </widgets> - </section> + </section> </decorator-section> </decorator-screen> </widgets> @@ -93,15 +93,15 @@ under the License. <widgets> <decorator-screen name="main-decorator"> <decorator-section name="body"> - <section> - <widgets> - <platform-specific> - <html> + <section> + <widgets> + <platform-specific> + <html> <html-template location="component://pricat/webapp/pricatdemo/ftl/countupreport.ftl"/> - </html> - </platform-specific> + </html> + </platform-specific> </widgets> - </section> + </section> </decorator-section> </decorator-screen> </widgets> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |