From a794b993c6824ce32461b72ba695b7fa92d73d83 Mon Sep 17 00:00:00 2001 From: Alan Date: Mon, 28 Nov 2022 12:13:35 +0800 Subject: [PATCH] Fix #7468 - updating template scanner --- DataObjects/Cms_templatestr.php | 16 + Import/Cms_templatestr.php | 225 ++++++++ Pman.Tab.CmsTranslateTemplates.bjs | 805 +++++++++++++++++++++++------ Pman.Tab.CmsTranslateTemplates.js | 98 +++- UpdateBjsTemplates.php | 12 +- 5 files changed, 994 insertions(+), 162 deletions(-) create mode 100644 Import/Cms_templatestr.php diff --git a/DataObjects/Cms_templatestr.php b/DataObjects/Cms_templatestr.php index 30235e5e..0f87f1ad 100644 --- a/DataObjects/Cms_templatestr.php +++ b/DataObjects/Cms_templatestr.php @@ -128,12 +128,28 @@ class Pman_Cms_DataObjects_Cms_templatestr extends DB_DataObject case 'transtree': // DB_DataObject::debugLevel(1); + $cfg = HTML_FlexyFramework::get()->Pman_Cms; + $defaults = isset($cfg['languages']) ? $cfg['languages'] : array(); + $x = DB_Dataobject::Factory($this->tableName()); $x->selectAdd(); $x->selectAdd('distinct(lang) as lang'); $x->whereAdd("lang != ''"); $ret= array(); + $got = array(); foreach( $x->fetchAll('lang') as $l) { + + $ret[] = array( + 'text'=>$l, + 'id' =>$l, + 'language' => true + ); + $got[] = $l; + } + foreach($defaults as $l) { + if (in_array($l,$got)) { + continue; + } $ret[] = array( 'text'=>$l, 'id' =>$l, diff --git a/Import/Cms_templatestr.php b/Import/Cms_templatestr.php new file mode 100644 index 00000000..03878e10 --- /dev/null +++ b/Import/Cms_templatestr.php @@ -0,0 +1,225 @@ +cli; + if ($cli) { + $this->cli = true; + return true; + } + parent::getAuth(); + $au = $this->getAuthUser(); + if (!$au) { + $this->jerrAuth(); + } + return true; + } + + function post($base = '' ) + { + + // should handle uploaded file.. + if (empty($_FILES['imageUpload']['tmp_name']) || + empty($_FILES['imageUpload']['name']) || + empty($_FILES['imageUpload']['type']) + ) { + $this->jerr ("Missing file details"); + exit; + } + + PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, array($this, 'onPearError')); + + + $this->transObj = DB_DataObject::factory('core_enum'); + + $this->transObj->query('BEGIN'); + + // first convert the file to a readable format.. + //$rows = $this->readXLS("/home/alan/Downloads/oll_example.xls") ; + $rows = $this->readXLS($_FILES['imageUpload']['tmp_name']) ; + + $ret = $this->processRows($rows); + + + $this->jok("DONE", false, array('extra'=> $ret)); + + } + + /* + function get($base = '', $opts = array()) + { + $rows = $this->readXLS("/var/lib/php/sessions/pressrelease-translations.xls") ; + + + + $ret = $this->processRows($rows); + + $this->jdata($ret); + exit; + + } + */ + function processRows($rows) + { + $ret = array(); + foreach($rows as $r) { + if (isset($r['table id'])) { + $ret[] = $this->updateTableTranslation($r); + continue; + } + + $ret[] = $this->updateTranslation($r); + + } + return $ret; + } + + + var $seq = 1; + function updateTranslation($r) + { + //print_R($r); DB_DataObject::DebugLevel(1); + $tr = DB_DataObject::Factory('cms_templatestr'); + $tr->autoJoin(); + + + $tr->whereAdd("join_template_id_id.template='{$tr->escape($r['template'])}'"); + $tr->whereAdd("join_template_id_id.view_name='{$tr->escape($r['module'])}'"); + $tr->whereAdd("join_src_id_id.mdsum='{$tr->escape($r['code'])}'"); + $tr->lang = $r['language']; + if ($tr->find(true)) { + $tt = DB_DataObject::Factory('cms_templatestr'); + $tt->get($tr->id); + $tr= clone($tt); + $tt->txt = $r['translation']; + $tt->updated = date('Y-m-d H:i:s'); + $tt->update($tr); + + return 1; + } + return 0; + } + + + + function updateTableTranslation($r) + { + // print_R($r); DB_DataObject::DebugLevel(1); + $tr = DB_DataObject::Factory('cms_templatestr'); + $tr->autoJoin(); + + + $tr->whereAdd("cms_templatestr.on_id='{$tr->escape($r['table id'])}'"); + $tr->whereAdd("cms_templatestr.on_table='{$tr->escape($r['table'])}'"); + $tr->whereAdd("cms_templatestr.on_col='{$tr->escape($r['column'])}'"); + $tr->whereAdd("join_src_id_id.mdsum='{$tr->escape($r['code'])}'"); + $tr->lang = $r['translation']; + if ($tr->find(true) && strlen(trim($r['txt']))) { + $tt = DB_DataObject::Factory('cms_templatestr'); + $tt->get($tr->id); + $tr= clone($tt); + $tt->txt = $r['txt']; + $tt->updated = date('Y-m-d H:i:s'); + $tt->update($tr); + + return 1; + } + return 0; + } + + + function readXLS($file) { + + require_once 'System.php'; + $ssconvert = System::which('ssconvert'); + if (!$ssconvert) die("ssconvert not installed"); + $csv = $this->tempName('csv'); + $cmd = "$ssconvert -T Gnumeric_stf:stf_csv ". escapeshellarg($file) . ' '.$csv; + + $data= `$cmd`; + + clearstatcache(); + if (!file_exists($csv)) { + $this->jerr("Failed to make file . \n". + $cmd . "\n" . + $data + ); + + + } + //echo $data; + $fh = fopen($csv, 'r'); + if (!$fh) { + $this->jerr("file invalid"); + } + $rows = array(); + $head = false; + $blank = 0; + while (false !== ($row = fgetcsv($fh))) { + + if ($head === false) { + + $h = $row; + // skip header lines. + array_shift($h); + if (!strlen(implode('', $h))) { + continue; + } + // how many empty rows.. + if (count(explode(',',(rtrim(implode(',', $h), " ,")))) < 3) { + continue; + } + + $head = array(); + foreach($row as $i=>$c) { + $c = preg_replace('/[\t \n]+/', ' ', $c); + $head[$i] = strtolower(trim($c)); + } + continue; + } + + if (!strlen(trim(implode('', $h)))) { + $blank++; + if ($blank > 3) { + break; + } + continue; + } + + $blank = 0; + $rrow = array(); + foreach($row as $i=>$c) { + $c = preg_replace('/[\t \n]+/', ' ', $c); + $rrow[$head[$i]] = trim($c); + } + // var_dump($row); + // print_r($max); + $rows[] = $rrow; + } + unlink($csv); + return $rows; + + + } + +} \ No newline at end of file diff --git a/Pman.Tab.CmsTranslateTemplates.bjs b/Pman.Tab.CmsTranslateTemplates.bjs index 29625e58..10e06b5c 100644 --- a/Pman.Tab.CmsTranslateTemplates.bjs +++ b/Pman.Tab.CmsTranslateTemplates.bjs @@ -1,295 +1,790 @@ { - "name" : "Pman.Tab.CmsTranslateTemplates", - "parent" : "Pman.Tab.Cms", - "title" : "Pman.Tab.CmsTranslateTemplates", - "path" : "/home/alan/gitlive/Pman.Cms/Pman.Tab.CmsTranslateTemplates.bjs", - "permname" : "", - "modOrder" : "800", - "strings" : { - "0a52da7a03a6de3beefe54f8c03ad80d" : "Original", - "0b8d92bc19b720bb1065649535463409" : "Translations", - "9d1ead73e678fa2f51a70a933b0bf017" : "Not Found", - "6dd08874f83507e9c7b23f1a46b7fa7c" : "Translation", - "e3d388b2c43e5ba0905702620ae2abc1" : "Search for", - "e2f9d206562d8f5ea421ad51100f7151" : "Displaying petition_entry{0} - {1} of {2}", - "dc00a593c8be0a664ba934335b093154" : "Translate Templates", - "cd6ae20e52d83f601c5fa12b66f0f6d0" : "Rescan", - "4d1c8263ba1036754f8db14a98f9f006" : "Reload", - "f2a6c498fb90ee345d997f888fce3b18" : "Delete", - "03c2e7e41ffc181a4e84080b4710e81e" : "New", - "193cfc9be3b995831c6af2fea6650e60" : "Page", - "1bc29b36f623ba82aaf6724fd3b16718" : "md5" - }, "items" : [ { - "region" : "center", - "xtype" : "NestedLayoutPanel", - "title" : "Translate Templates", "$ xns" : "Roo", "items" : [ { - "xtype" : "BorderLayout", "$ xns" : "Roo", "* prop" : "layout", "items" : [ { - "xtype" : "LayoutRegion", - "width" : 300, "$ xns" : "Roo", + "* prop" : "west", "split" : true, - "* prop" : "west" + "width" : 350, + "xtype" : "LayoutRegion" }, { - "xtype" : "LayoutRegion", "$ xns" : "Roo", - "* prop" : "center" + "* prop" : "center", + "xtype" : "LayoutRegion" }, { - "listeners" : { - "render" : "function (_self)\n{\n _this.treepanel = _self;\n}" - }, - "region" : "west", - "xtype" : "TreePanel", "$ xns" : "Roo", "items" : [ { - "xtype" : "Toolbar", "$ xns" : "Roo", "* prop" : "toolbar", "items" : [ { + "$ xns" : "Roo.Toolbar", "listeners" : { - "click" : "function (_self, e)\n{\n Pman.Dialog.CmsLanguagePick.show( { }, function(lang) {\n \n new Pman.Request({\n url : baseURL + '/Roo/cms_templatestr',\n method : 'POST',\n params : {\n _rescan : lang\n }, \n success : function()\n {\n _this.treepanel.tree.getRootNode().reload();\n }\n });\n \n });\n \n}" + "click" : [ + "function (_self, e)", + "{", + " Pman.Dialog.CmsLanguagePick.show( { }, function(lang) {", + " ", + " new Pman.Request({", + " url : baseURL + '/Roo/cms_templatestr',", + " method : 'POST',", + " params : {", + " _rescan : lang", + " }, ", + " success : function()", + " {", + " _this.treepanel.tree.getRootNode().reload();", + " }", + " });", + " ", + " });", + " ", + "}" + ] }, "text" : "New", - "xtype" : "Button", - "$ xns" : "Roo.Toolbar" + "xtype" : "Button" }, { - "xtype" : "Separator", - "$ xns" : "Roo.Toolbar" + "$ xns" : "Roo.Toolbar", + "xtype" : "Separator" }, { + "$ xns" : "Roo.Toolbar", "listeners" : { - "click" : "function (_self, e)\n{\n var tree = _this.treepanel.tree;\n var sn = tree.getSelectionModel().getSelectedNode();\n\n if (!sn || typeof(sn.attributes.language) == 'undefined' || !sn.attributes.language) {\n Roo.MessageBox.alert(\"Error\", \"Select a language\");\n return;\n }\n\n Roo.MessageBox.confirm(\"Confirm\", \"Are sure you want to delete the language\", function (v){\n if (v != 'yes') {\n return;\n }\n Roo.MessageBox.alert(\"Not yet\", \"not done yet\");\n return;\n Roo.Ajax.request({\n url : baseURL + '/Roo/cms_language.php',\n method: 'POST',\n params : {\n _delete : _t.selectedNode.id \n },\n success : function()\n {\n _this.treepanel.tree.getRootNode().reload();\n //g.getDataSource().reload();\n },\n failure : function()\n {\n Roo.MessageBox.alert(\"Error\", \n \"There was a problem saving the data - try reloading\");\n \n }\n \n });\n \n \n \n \n });\n}" + "click" : [ + "function (_self, e)", + "{", + " var tree = _this.treepanel.tree;", + " var sn = tree.getSelectionModel().getSelectedNode();", + "", + " if (!sn || typeof(sn.attributes.language) == 'undefined' || !sn.attributes.language) {", + " Roo.MessageBox.alert(\"Error\", \"Select a language\");", + " return;", + " }", + "", + " Roo.MessageBox.confirm(\"Confirm\", \"Are sure you want to delete the language\", function (v){", + " if (v != 'yes') {", + " return;", + " }", + " Roo.MessageBox.alert(\"Not yet\", \"not done yet\");", + " return;", + " Roo.Ajax.request({", + " url : baseURL + '/Roo/cms_language.php',", + " method: 'POST',", + " params : {", + " _delete : _t.selectedNode.id ", + " },", + " success : function()", + " {", + " _this.treepanel.tree.getRootNode().reload();", + " //g.getDataSource().reload();", + " },", + " failure : function()", + " {", + " Roo.MessageBox.alert(\"Error\", ", + " \"There was a problem saving the data - try reloading\");", + " ", + " }", + " ", + " });", + " ", + " ", + " ", + " ", + " });", + "}" + ] }, "text" : "Delete", - "xtype" : "Button", - "$ xns" : "Roo.Toolbar" + "xtype" : "Button" }, { - "xtype" : "Separator", - "$ xns" : "Roo.Toolbar" + "$ xns" : "Roo.Toolbar", + "xtype" : "Separator" }, { + "$ xns" : "Roo.Toolbar", "listeners" : { - "click" : "function (_self, e)\n{\n var tree = _this.treepanel.tree;\n Roo.log(tree);\n var sn = tree.getSelectionModel().getSelectedNode();\n\n if (!sn) {\n Roo.MessageBox.alert(\"Error\", \"Select a node\");\n return;\n }\n \n var syncTemplate = function(){\n new Pman.Request({\n url : baseURL + '/Cms/UpdateBjsTemplates',\n method : 'GET',\n mask : 'Processing...',\n timeout : 9000000,\n success : function()\n {\n _this.treepanel.tree.getRootNode().reload();\n }\n });\n \n };\n \n \n var syncLanguage = function(){\n new Pman.Request({\n url : baseURL + '/Roo/cms_templatestr',\n method : 'POST',\n mask : 'Processing...',\n params : {\n _rescan : sn.attributes.id\n }, \n success : function()\n {\n _this.treepanel.tree.getRootNode().reload();\n }\n });\n };\n \n if(typeof(sn.isRoot) != 'undefined' && sn.isRoot){\n syncTemplate();\n return;\n }\n \n if(typeof(sn.attributes.language) != 'undefined' && sn.attributes.language){\n syncLanguage();\n return;\n }\n \n \n \n \n \n}" + "click" : [ + "function (_self, e)", + "{", + " var tree = _this.treepanel.tree;", + " Roo.log(tree);", + " var sn = tree.getSelectionModel().getSelectedNode();", + "", + " if (!sn) {", + " Roo.MessageBox.alert(\"Error\", \"Select a node\");", + " return;", + " }", + " ", + " var syncTemplate = function(){", + " new Pman.Request({", + " url : baseURL + '/Cms/UpdateBjsTemplates',", + " method : 'GET',", + " mask : 'Processing...',", + " timeout : 9000000,", + " success : function()", + " {", + " _this.treepanel.tree.getRootNode().reload();", + " }", + " });", + " ", + " };", + " ", + " ", + " var syncLanguage = function(){", + " new Pman.Request({", + " url : baseURL + '/Roo/cms_templatestr',", + " method : 'POST',", + " mask : 'Processing...',", + " params : {", + " _rescan : sn.attributes.id", + " }, ", + " success : function()", + " {", + " _this.treepanel.tree.getRootNode().reload();", + " }", + " });", + " };", + " ", + " if(typeof(sn.isRoot) != 'undefined' && sn.isRoot){", + " syncTemplate();", + " return;", + " }", + " ", + " if(typeof(sn.attributes.language) != 'undefined' && sn.attributes.language){", + " syncLanguage();", + " return;", + " }", + " ", + " ", + " ", + " ", + " ", + "}" + ] }, "text" : "Rescan", - "xtype" : "Button", - "$ xns" : "Roo.Toolbar" + "xtype" : "Button" }, { - "xtype" : "Fill", - "$ xns" : "Roo.Toolbar" + "$ xns" : "Roo.Toolbar", + "xtype" : "Separator" }, { + "$ xns" : "Roo.Toolbar", "listeners" : { - "click" : "function (_self, e)\n{\n _this.treepanel.tree.getRootNode().reload();\n \n}" + "click" : [ + "function (_self, e)", + "{", + " ", + " ", + " Pman.Dialog.Image.show({", + " _url : baseURL + '/Cms/Import/Cms_templatestr' ", + " ", + " }, function() {", + " _this.treepanel.tree.getRootNode().reload();", + " });", + " ", + " ", + " ", + "}" + ] + }, + "text" : "Upload", + "xtype" : "Button" + }, + { + "$ xns" : "Roo.Toolbar", + "listeners" : { + "click" : [ + "function (_self, e)", + "{", + " var tree = _this.treepanel.tree;", + "", + " var sn = tree.getSelectionModel().getSelectedNode();", + " ", + " p = {", + " csvCols : 'src_id_mdsum,template_id_view_name,template_id_template,src_id_txt,lang,txt',", + " csvTitles : 'Code,Module,Template,Original,Language,Translation',", + " limit : 9999,", + " sort: 'template_id_view_name,template_id_template,src_id_txt',", + " dir: 'ASC'", + " };", + " if (!sn || sn.id == 'transtree') {", + " Roo.MessageBox.alert(\"Error\", \"Select language, module or page\");", + " return;", + " }", + " if (typeof(sn.id) == 'number') {", + " p.template_id = sn.id;", + " p.lang = sn.parentNode.attributes.id;", + " ", + " } else {", + " ", + " ", + " if (sn.id.match(/^table:/)) {", + " var sns = sn.id.split(':');", + " p.lang = sns[1];", + " p.on_table = sns[2];", + " p.csvCols = 'src_id_mdsum,on_table,on_id,on_col,src_id_txt,lang,txt';", + " p.csvTitles = 'Code,Table,Table id,Column,Language,Translation';", + " }", + " ", + " if (sn.id.match(/^view:/)) {", + " var sns = sn.id.split(':');", + " p.lang = sns[1];", + " p.template_id_view_name = sns[2];", + " ", + " }", + " if (sn.id.match(/^lang:/)) {", + " var sns = sn.id.split(':');", + " p.lang = sns[1];", + "", + " }", + " }", + " // transtree", + " // view: {lang} : {view_name}", + " // lang:", + " ", + " new Pman.Download({", + " url : baseURL + '/Roo/Cms_templatestr',", + " params : p,", + " method : 'GET' ", + " });", + " ", + " ", + " ", + " ", + " ", + "}" + ] + }, + "text" : "Download", + "xtype" : "Button" + }, + { + "$ xns" : "Roo.Toolbar", + "xtype" : "Fill" + }, + { + "$ xns" : "Roo.Toolbar", + "listeners" : { + "click" : [ + "function (_self, e)", + "{", + " _this.treepanel.tree.getRootNode().reload();", + " ", + "}" + ] }, "text" : "Reload", - "xtype" : "Button", - "$ xns" : "Roo.Toolbar" + "xtype" : "Button" } - ] + ], + "xtype" : "Toolbar" }, { - "xtype" : "TreePanel", - "rootVisible" : true, "$ xns" : "Roo.tree", - "containerScroll" : false, "* prop" : "tree", + "containerScroll" : false, "items" : [ { - "listeners" : { - "loadexception" : "function (This, node, response)\n{\n Roo.MessageBox.alert(\"Error\", \"Problem loading tree\");\n}", - "beforeload" : "function (This, node, callback)\n{\n // set some params.\n Roo.log(node);\n this.baseParams._tree = 1;\n \n //this.baseParams.category = node.attributes.category;\n}" - }, "$ baseParams" : "{ _tree : 1 }", - "xtype" : "TreeLoader", - "requestMethod" : "GET", + "$ dataUrl" : "baseURL + '/Roo/cms_templatestr'", "$ xns" : "Roo.tree", "* prop" : "loader", - "$ dataUrl" : "baseURL + '/Roo/cms_templatestr'" + "listeners" : { + "beforeload" : [ + "function (This, node, callback)", + "{", + " // set some params.", + " Roo.log(node);", + " this.baseParams._tree = 1;", + " ", + " //this.baseParams.category = node.attributes.category;", + "}" + ], + "loadexception" : [ + "function (This, node, response)", + "{", + " Roo.MessageBox.alert(\"Error\", \"Problem loading tree\");", + "}" + ] + }, + "requestMethod" : "GET", + "xtype" : "TreeLoader" }, { + "$ xns" : "Roo.tree", + "* prop" : "root", "id" : "transtree", "text" : "Translations", - "xtype" : "AsyncTreeNode", - "$ xns" : "Roo.tree", - "* prop" : "root" + "xtype" : "AsyncTreeNode" }, { + "$ xns" : "Roo.tree", + "* prop" : "selModel", "listeners" : { - "selectionchange" : "function (_self, node)\n{\n Roo.log(node);\n \n //if (node.id.split('/').length < 2) {\n // return;\n // }\n (function() {\n _this.grid.footer.onClick('first');\n }).defer(100);\n \n}" + "selectionchange" : [ + "function (_self, node)", + "{", + " Roo.log(node);", + " ", + " //if (node.id.split('/').length < 2) {", + " // return;", + " // }", + " (function() {", + " _this.grid.footer.onClick('first');", + " }).defer(100);", + " ", + "}" + ] }, - "xtype" : "DefaultSelectionModel", - "$ xns" : "Roo.tree", - "* prop" : "selModel" + "xtype" : "DefaultSelectionModel" } - ] + ], + "rootVisible" : true, + "xtype" : "TreePanel" } - ] - }, - { + ], "listeners" : { - "|activate" : "function() {\n _this.panel = this;\n if (_this.grid) {\n _this.grid.footer.onClick('first');\n }\n}" + "render" : [ + "function (_self)", + "{", + " _this.treepanel = _self;", + "}" + ] }, - "fitToframe" : true, + "region" : "west", + "xtype" : "TreePanel" + }, + { + "$ xns" : "Roo", "background" : false, - "region" : "center", - "title" : "Page", - "xtype" : "GridPanel", "fitContainer" : true, - "$ xns" : "Roo", - "tableName" : "Page", + "fitToframe" : true, "items" : [ { - "listeners" : { - "beforeedit" : "function (e)\n{ \n /*if (e.record.data.src_id_txt.indexOf('<') > -1) {\n // console.log(\"HTML EDITOR!!\");\n Pman.Dialog.CmsTranslateEditor.show(e.record);\n return false;\n }*/\n \n var str=e.record.data.src_id_txt;\n var patt=/{(.*?)}/g;\n \n Roo.log(str.length);\n \n \n if(patt.test(str)){\n e.cancel = true;\n Pman.Dialog.CmsTranslateTemplates.show(e.record.data, function(v){\n Roo.log(v);\n e.value = v.txt;\n e.record.set('txt', v.txt);\n e.record.commit();\n });\n /*\n Roo.MessageBox.prompt('WARNING', 'This text is with {TEMPLATE VARIABLE}, PLEASE BE CAREFUL EDITING. What\\'s change? '+str, function(btn, text){\n if (btn == 'ok'){\n e.value = text;\n e.record.set('txt', text);\n e.record.commit();\n }\n });*/\n return;\n }\n \n if(str.length > 150){\n e.cancel = true;\n Pman.Dialog.CmsTranslateTemplates.show(e.record.data, function(v){\n e.value = v.txt;\n e.record.set('txt', v.txt);\n e.record.commit();\n });\n /*\n Roo.MessageBox.prompt('WARNING', 'This text is with {TEMPLATE VARIABLE}, PLEASE BE CAREFUL EDITING. What\\'s change? '+str, function(btn, text){\n if (btn == 'ok'){\n e.value = text;\n e.record.set('txt', text);\n e.record.commit();\n }\n });*/\n return;\n }\n \n\n if (e.record.data.txt.replace(/\\s+/, '').length) {\n return true;\n }\n \n var tl = _this.treepanel.tree.getSelectionModel().getSelectedNode().parentNode.attributes.id;\n // mapping?\n \n tl = (tl == 'zh_HK') ? 'zh-TW' : tl;\n \n if (tl == 'en' && !e.value.length) {\n\n e.value = e.record.data.src_id_txt;\n e.record.set('txt', e.record.data.src_id_txt);\n return true;\n }\n \n Pman.GoogleTranslate(e.record.data.src_id_txt, \"en\", tl, function(result) {\n // Roo.log(result);\n _this.grid.activeEditor.setValue(result);\n //console.log(result.translation);\n });\n \n\n \n return true;\n}", - "|rowdblclick" : "function (_self, rowIndex, e)\n{\n if (!_this.dialog) {\n return;\n }\n _this.dialog.show( this.getDataSource().getAt(rowIndex).data, function() {\n _this.grid.footer.onClick('first');\n }); \n}\n", - "|render" : "function() \n{\n _this.grid = this; \n //_this.dialog = Pman.Dialog.FILL_IN\n if (_this.panel.active) {\n this.footer.onClick('first');\n // this.ds.onc.onClick('first');\n }\n}", - "afteredit" : "function (e)\n{\n e.record.commit();\n}" - }, - "autoExpandColumn" : "txt", - "xtype" : "EditorGrid", - "loadMask" : true, - "clicksToEdit" : 1, "$ xns" : "Roo.grid", "* prop" : "grid", + "autoExpandColumn" : "txt", + "clicksToEdit" : 1, "items" : [ { - "xtype" : "Toolbar", "$ xns" : "Roo", "* prop" : "toolbar", "items" : [ { + "$ xns" : "Roo.form", + "String emptyText" : "Search for", "listeners" : { - "specialkey" : "function (_self, e)\n{\n_this.grid.footer.onClick('first');\n}", - "render" : "function (_self)\n{\n _this.searchBox = this;\n}" + "render" : [ + "function (_self)", + "{", + " _this.searchBox = this;", + "}" + ], + "specialkey" : [ + "function (_self, e)", + "{", + "_this.grid.footer.onClick('first');", + "}" + ] }, - "xtype" : "TextField", - "String emptyText" : "Search for", - "$ xns" : "Roo.form" + "xtype" : "TextField" }, { + "$ icon" : "rootURL + '/Pman/templates/images/search.gif'", + "$ xns" : "Roo.Toolbar", + "cls" : "x-btn-icon", "listeners" : { - "|click" : "function (_self, e)\n{\n_this.grid.footer.onClick('first');\n}" + "|click" : [ + "function (_self, e)", + "{", + "_this.grid.footer.onClick('first');", + "}" + ] }, - "xtype" : "Button", - "cls" : "x-btn-icon", - "$ icon" : "rootURL + '/Pman/templates/images/search.gif'", - "$ xns" : "Roo.Toolbar" + "xtype" : "Button" }, { + "$ icon" : "rootURL + '/Pman/templates/images/edit-clear.gif'", + "$ xns" : "Roo.Toolbar", + "cls" : "x-btn-icon", "listeners" : { - "|click" : "function (_self, e)\n{\n _this.searchBox.setValue('');\n \n _this.grid.footer.onClick('first');\n}" + "|click" : [ + "function (_self, e)", + "{", + " _this.searchBox.setValue('');", + " ", + " _this.grid.footer.onClick('first');", + "}" + ] }, - "xtype" : "Button", - "cls" : "x-btn-icon", - "$ icon" : "rootURL + '/Pman/templates/images/edit-clear.gif'", - "$ xns" : "Roo.Toolbar" + "xtype" : "Button" } - ] + ], + "xtype" : "Toolbar" }, { - "pageSize" : 100, - "xtype" : "PagingToolbar", - "emptyMsg" : "Not Found", "$ xns" : "Roo", - "displayMsg" : "Displaying petition_entry{0} - {1} of {2}", + "* prop" : "footer", "displayInfo" : true, - "* prop" : "footer" + "displayMsg" : "Displaying petition_entry{0} - {1} of {2}", + "emptyMsg" : "Not Found", + "pageSize" : 100, + "xtype" : "PagingToolbar" }, { - "listeners" : { - "update" : "function (_self, rec, operation)\n{\n Roo.log(operation);\n \n if (operation != 'commit') {\n return;\n }\n \n\n _this.grid.getView().el.mask(\"Saving\");\n new Pman.Request({\n url : baseURL + '/Roo/cms_templatestr',\n method: 'POST',\n params : {\n id : rec.get('id'),\n txt : rec.get('txt')\n },\n success : function()\n {\n _this.grid.getView().el.unmask();\n //g.getDataSource().reload();\n },\n failure : function()\n {\n _this.grid.getView().el.unmask();\n Roo.MessageBox.alert(\"Error\", \"There was a problem saving the data - try reloading\");\n }\n \n });\n \n}", - "beforeload" : "function (_self, o)\n{\n \n var sn = _this.treepanel.tree.getSelectionModel().getSelectedNode();\n\n if (!sn || typeof(sn.attributes) == 'undefined' || typeof(sn.attributes.leaf) == 'undefined' || !sn.attributes.leaf) { \n _this.grid.ds.removeAll();\n return false;\n }\n\n o.params = o.params || {};\n \n //var pn = sn.parentNode.attributes.id.split(':')[1]; // should be view:en:{module}\n \n \n o.params.lang = sn.parentNode.attributes.id;\n o.params.template_id = sn.attributes.id * 1;\n o.params.active = 1;\n o.params['!src_id'] = 0;\n \n if (_this.searchBox && _this.searchBox.getValue().length) { \n o.params['_search_txt'] = _this.searchBox.getValue();\n }\n \n \n if(sn.attributes.on_table){\n o.params.on_table = sn.attributes.on_table;\n }\n \n}\n\n\n" - }, - "xtype" : "Store", - "remoteSort" : true, "$ sortInfo" : "{ field : 'src_id_txt', direction: 'ASC' }", "$ xns" : "Roo.data", "* prop" : "dataSource", "items" : [ { "$ url" : "baseURL + '/Roo/cms_templatestr.php'", - "xtype" : "HttpProxy", - "method" : "GET", "$ xns" : "Roo.data", - "* prop" : "proxy" + "* prop" : "proxy", + "method" : "GET", + "xtype" : "HttpProxy" }, { - "id" : "id", - "root" : "data", - "xtype" : "JsonReader", - "$ fields" : "[\n {\n 'name': 'id',\n 'type': 'int'\n },\n {\n 'name': 'shortname',\n 'type': 'string'\n }\n \n]", + "$ fields" : [ + "[", + " {", + " 'name': 'id',", + " 'type': 'int'", + " },", + " {", + " 'name': 'shortname',", + " 'type': 'string'", + " }", + " ", + "]" + ], "$ xns" : "Roo.data", "* prop" : "reader", - "totalProperty" : "total" + "id" : "id", + "root" : "data", + "totalProperty" : "total", + "xtype" : "JsonReader" } - ] + ], + "listeners" : { + "beforeload" : [ + "function (_self, o)", + "{", + " ", + " var sn = _this.treepanel.tree.getSelectionModel().getSelectedNode();", + "", + " if (!sn || typeof(sn.attributes) == 'undefined' || typeof(sn.attributes.leaf) == 'undefined' || !sn.attributes.leaf) { ", + " _this.grid.ds.removeAll();", + " return false;", + " }", + "", + " o.params = o.params || {};", + " ", + " //var pn = sn.parentNode.attributes.id.split(':')[1]; // should be view:en:{module}", + " ", + " ", + " o.params.lang = sn.parentNode.attributes.id;", + " o.params.template_id = sn.attributes.id * 1;", + " o.params.active = 1;", + " o.params['!src_id'] = 0;", + " ", + " if (_this.searchBox && _this.searchBox.getValue().length) { ", + " o.params['_search_txt'] = _this.searchBox.getValue();", + " }", + " ", + " ", + " if(sn.attributes.on_table){", + " o.params.on_table = sn.attributes.on_table;", + " }", + " ", + "}", + "", + "", + "" + ], + "update" : [ + "function (_self, rec, operation)", + "{", + " Roo.log(operation);", + " ", + " if (operation != 'commit') {", + " return;", + " }", + " ", + "", + " _this.grid.getView().el.mask(\"Saving\");", + " new Pman.Request({", + " url : baseURL + '/Roo/cms_templatestr',", + " method: 'POST',", + " params : {", + " id : rec.get('id'),", + " txt : rec.get('txt')", + " },", + " success : function()", + " {", + " _this.grid.getView().el.unmask();", + " //g.getDataSource().reload();", + " },", + " failure : function()", + " {", + " _this.grid.getView().el.unmask();", + " Roo.MessageBox.alert(\"Error\", \"There was a problem saving the data - try reloading\");", + " }", + " ", + " });", + " ", + "}" + ] + }, + "remoteSort" : true, + "xtype" : "Store" }, { - "xtype" : "ColumnModel", - "width" : 200, - "header" : "Original", - "$ renderer" : "function(v,x,r) \n{\n var c = '#666';\n if (r.data.updated < r.data.src_id_updated) {\n c = 'red';\n }\n \n return String.format('
{0}
', v)\n\n}", + "$ renderer" : [ + "function(v,x,r) ", + "{", + " var c = '#666';", + " if (r.data.updated < r.data.src_id_updated) {", + " c = 'red';", + " }", + " ", + " return String.format('
{0}
', v)", + "", + "}" + ], "$ xns" : "Roo.grid", "* prop" : "cm[]", - "dataIndex" : "src_id_txt" + "dataIndex" : "src_id_txt", + "header" : "Original", + "width" : 200, + "xtype" : "ColumnModel" }, { - "xtype" : "ColumnModel", - "width" : 200, - "header" : "Translation", - "$ renderer" : "function(v,x,r) \n{ \n\n var c = '#666';\n if (r.data.updated < r.data.src_id_updated) {\n c = 'red';\n }\n \n return String.format('
{0}
', v)\n\n}", + "$ renderer" : [ + "function(v,x,r) ", + "{ ", + "", + " var c = '#666';", + " if (r.data.updated < r.data.src_id_updated) {", + " c = 'red';", + " }", + " ", + " return String.format('
{0}
', v)", + "", + "}" + ], "$ xns" : "Roo.grid", "* prop" : "cm[]", "dataIndex" : "txt", + "header" : "Translation", "items" : [ { - "xtype" : "GridEditor", "$ xns" : "Roo.grid", "* prop" : "editor", "items" : [ { - "xtype" : "TextField", - "allowBlank" : false, "$ xns" : "Roo.form", - "* prop" : "field" + "* prop" : "field", + "allowBlank" : false, + "xtype" : "TextField" } - ] + ], + "xtype" : "GridEditor" } - ] + ], + "width" : 200, + "xtype" : "ColumnModel" }, { - "xtype" : "ColumnModel", - "width" : 250, - "header" : "md5", - "$ renderer" : "function(v,x,r) \n{\n return v ? v : '';\n\n}", + "$ renderer" : [ + "function(v,x,r) ", + "{", + " return v ? v : '';", + "", + "}" + ], "$ xns" : "Roo.grid", "* prop" : "cm[]", "Boolean hidden" : true, - "dataIndex" : "src_id_mdsum" + "dataIndex" : "src_id_mdsum", + "header" : "md5", + "width" : 250, + "xtype" : "ColumnModel" } - ] + ], + "listeners" : { + "afteredit" : [ + "function (e)", + "{", + " e.record.commit();", + "}" + ], + "beforeedit" : [ + "function (e)", + "{ ", + " /*if (e.record.data.src_id_txt.indexOf('<') > -1) {", + " // console.log(\"HTML EDITOR!!\");", + " Pman.Dialog.CmsTranslateEditor.show(e.record);", + " return false;", + " }*/", + " ", + " var str=e.record.data.src_id_txt;", + " var patt=/{(.*?)}/g;", + " ", + " Roo.log(str.length);", + " ", + " ", + " if(patt.test(str)){", + " e.cancel = true;", + " Pman.Dialog.CmsTranslateTemplates.show(e.record.data, function(v){", + " Roo.log(v);", + " e.value = v.txt;", + " e.record.set('txt', v.txt);", + " e.record.commit();", + " });", + " /*", + " Roo.MessageBox.prompt('WARNING', 'This text is with {TEMPLATE VARIABLE}, PLEASE BE CAREFUL EDITING. What\\'s change? '+str, function(btn, text){", + " if (btn == 'ok'){", + " e.value = text;", + " e.record.set('txt', text);", + " e.record.commit();", + " }", + " });*/", + " return;", + " }", + " ", + " if(str.length > 150){", + " e.cancel = true;", + " Pman.Dialog.CmsTranslateTemplates.show(e.record.data, function(v){", + " e.value = v.txt;", + " e.record.set('txt', v.txt);", + " e.record.commit();", + " });", + " /*", + " Roo.MessageBox.prompt('WARNING', 'This text is with {TEMPLATE VARIABLE}, PLEASE BE CAREFUL EDITING. What\\'s change? '+str, function(btn, text){", + " if (btn == 'ok'){", + " e.value = text;", + " e.record.set('txt', text);", + " e.record.commit();", + " }", + " });*/", + " return;", + " }", + " ", + "", + " if (e.record.data.txt.replace(/\\s+/, '').length) {", + " return true;", + " }", + " ", + " var tl = _this.treepanel.tree.getSelectionModel().getSelectedNode().parentNode.attributes.id;", + " // mapping?", + " ", + " tl = (tl == 'zh_HK') ? 'zh-TW' : tl;", + " ", + " if (tl == 'en' && !e.value.length) {", + "", + " e.value = e.record.data.src_id_txt;", + " e.record.set('txt', e.record.data.src_id_txt);", + " return true;", + " }", + " ", + " Pman.GoogleTranslate(e.record.data.src_id_txt, \"en\", tl, function(result) {", + " // Roo.log(result);", + " _this.grid.activeEditor.setValue(result);", + " //console.log(result.translation);", + " });", + " ", + "", + " ", + " return true;", + "}" + ], + "|render" : [ + "function() ", + "{", + " _this.grid = this; ", + " //_this.dialog = Pman.Dialog.FILL_IN", + " if (_this.panel.active) {", + " this.footer.onClick('first');", + " // this.ds.onc.onClick('first');", + " }", + "}" + ], + "|rowdblclick" : [ + "function (_self, rowIndex, e)", + "{", + " if (!_this.dialog) {", + " return;", + " }", + " _this.dialog.show( this.getDataSource().getAt(rowIndex).data, function() {", + " _this.grid.footer.onClick('first');", + " }); ", + "}", + "" + ] + }, + "loadMask" : true, + "xtype" : "EditorGrid" } - ] + ], + "listeners" : { + "|activate" : [ + "function() {", + " _this.panel = this;", + " if (_this.grid) {", + " _this.grid.footer.onClick('first');", + " }", + "}" + ] + }, + "region" : "center", + "tableName" : "Page", + "title" : "Page", + "xtype" : "GridPanel" } - ] + ], + "xtype" : "BorderLayout" } - ] + ], + "region" : "center", + "title" : "Translate Templates", + "xtype" : "NestedLayoutPanel" } - ] + ], + "modOrder" : "800", + "name" : "Pman.Tab.CmsTranslateTemplates", + "parent" : "Pman.Tab.Cms", + "path" : "/home/alan/gitlive/Pman.Cms/Pman.Tab.CmsTranslateTemplates.bjs", + "permname" : "", + "strings" : { + "03c2e7e41ffc181a4e84080b4710e81e" : "New", + "0a52da7a03a6de3beefe54f8c03ad80d" : "Original", + "0b8d92bc19b720bb1065649535463409" : "Translations", + "193cfc9be3b995831c6af2fea6650e60" : "Page", + "1bc29b36f623ba82aaf6724fd3b16718" : "md5", + "4d1c8263ba1036754f8db14a98f9f006" : "Reload", + "6dd08874f83507e9c7b23f1a46b7fa7c" : "Translation", + "801ab24683a4a8c433c6eb40c48bcd9d" : "Download", + "91412465ea9169dfd901dd5e7c96dd99" : "Upload", + "9d1ead73e678fa2f51a70a933b0bf017" : "Not Found", + "cd6ae20e52d83f601c5fa12b66f0f6d0" : "Rescan", + "dc00a593c8be0a664ba934335b093154" : "Translate Templates", + "e2f9d206562d8f5ea421ad51100f7151" : "Displaying petition_entry{0} - {1} of {2}", + "e3d388b2c43e5ba0905702620ae2abc1" : "Search for", + "f2a6c498fb90ee345d997f888fce3b18" : "Delete" + }, + "title" : "Pman.Tab.CmsTranslateTemplates" } \ No newline at end of file diff --git a/Pman.Tab.CmsTranslateTemplates.js b/Pman.Tab.CmsTranslateTemplates.js index 0b6340d9..d8c0a752 100644 --- a/Pman.Tab.CmsTranslateTemplates.js +++ b/Pman.Tab.CmsTranslateTemplates.js @@ -10,11 +10,13 @@ Pman.Tab.CmsTranslateTemplates = new Roo.XComponent({ '0a52da7a03a6de3beefe54f8c03ad80d' :"Original", '0b8d92bc19b720bb1065649535463409' :"Translations", '9d1ead73e678fa2f51a70a933b0bf017' :"Not Found", + '801ab24683a4a8c433c6eb40c48bcd9d' :"Download", '6dd08874f83507e9c7b23f1a46b7fa7c' :"Translation", 'e3d388b2c43e5ba0905702620ae2abc1' :"Search for", 'e2f9d206562d8f5ea421ad51100f7151' :"Displaying petition_entry{0} - {1} of {2}", 'dc00a593c8be0a664ba934335b093154' :"Translate Templates", 'cd6ae20e52d83f601c5fa12b66f0f6d0' :"Rescan", + '91412465ea9169dfd901dd5e7c96dd99' :"Upload", '4d1c8263ba1036754f8db14a98f9f006' :"Reload", 'f2a6c498fb90ee345d997f888fce3b18' :"Delete", '03c2e7e41ffc181a4e84080b4710e81e' :"New", @@ -51,7 +53,7 @@ Pman.Tab.CmsTranslateTemplates = new Roo.XComponent({ west : { xtype : 'LayoutRegion', split : true, - width : 300, + width : 350, xns : Roo, '|xns' : 'Roo' }, @@ -217,6 +219,100 @@ Pman.Tab.CmsTranslateTemplates = new Roo.XComponent({ + } + }, + xns : Roo.Toolbar, + '|xns' : 'Roo.Toolbar' + }, + { + xtype : 'Separator', + xns : Roo.Toolbar, + '|xns' : 'Roo.Toolbar' + }, + { + xtype : 'Button', + text : _this._strings['91412465ea9169dfd901dd5e7c96dd99'] /* Upload */, + listeners : { + click : function (_self, e) + { + + + Pman.Dialog.Image.show({ + _url : baseURL + '/Cms/Import/Cms_templatestr' + + }, function() { + _this.treepanel.tree.getRootNode().reload(); + }); + + + + } + }, + xns : Roo.Toolbar, + '|xns' : 'Roo.Toolbar' + }, + { + xtype : 'Button', + text : _this._strings['801ab24683a4a8c433c6eb40c48bcd9d'] /* Download */, + listeners : { + click : function (_self, e) + { + var tree = _this.treepanel.tree; + + var sn = tree.getSelectionModel().getSelectedNode(); + + p = { + csvCols : 'src_id_mdsum,template_id_view_name,template_id_template,src_id_txt,lang,txt', + csvTitles : 'Code,Module,Template,Original,Language,Translation', + limit : 9999, + sort: 'template_id_view_name,template_id_template,src_id_txt', + dir: 'ASC' + }; + if (!sn || sn.id == 'transtree') { + Roo.MessageBox.alert("Error", "Select language, module or page"); + return; + } + if (typeof(sn.id) == 'number') { + p.template_id = sn.id; + p.lang = sn.parentNode.attributes.id; + + } else { + + + if (sn.id.match(/^table:/)) { + var sns = sn.id.split(':'); + p.lang = sns[1]; + p.on_table = sns[2]; + p.csvCols = 'src_id_mdsum,on_table,on_id,on_col,src_id_txt,lang,txt'; + p.csvTitles = 'Code,Table,Table id,Column,Language,Translation'; + } + + if (sn.id.match(/^view:/)) { + var sns = sn.id.split(':'); + p.lang = sns[1]; + p.template_id_view_name = sns[2]; + + } + if (sn.id.match(/^lang:/)) { + var sns = sn.id.split(':'); + p.lang = sns[1]; + + } + } + // transtree + // view: {lang} : {view_name} + // lang: + + new Pman.Download({ + url : baseURL + '/Roo/Cms_templatestr', + params : p, + method : 'GET' + }); + + + + + } }, xns : Roo.Toolbar, diff --git a/UpdateBjsTemplates.php b/UpdateBjsTemplates.php index 0f98ab00..6e0176c8 100644 --- a/UpdateBjsTemplates.php +++ b/UpdateBjsTemplates.php @@ -58,13 +58,13 @@ class Pman_Cms_UpdateBjsTemplates extends Pman } $base = $ff->Pman_Cms['project_name']; - - $dh = opendir($base); + $dir = $ff->Pman_Cms['site_dir'][$base]; + $dh = opendir($dir); $ret = array(); if(!$dh){ - $this->jerr("could not open dir: config[Pman_Cms] = " . $base); + $this->jerr("could not open dir: config[Pman_Cms] = " . $dir); return $ret; // something went wrong!? } @@ -73,7 +73,7 @@ class Pman_Cms_UpdateBjsTemplates extends Pman if(empty($fn) || $fn[0] == '.' || !preg_match('/\.bjs$/', $fn)){ continue; } - + // var_dump($fn);exit; if($this->cli){ echo "Processing {$fn} \n"; } @@ -102,8 +102,8 @@ class Pman_Cms_UpdateBjsTemplates extends Pman $x = DB_DataObject::Factory('cms_templatestr'); $x->syncTemplateWords($template, false); } - - $this->scanPmanTemplates(); + // pman templates are done via core templates + // $this->scanPmanTemplates(); } -- 2.39.2