Many little improvements for the version 2.0.46

This commit is contained in:
Julio Cesar Laura
2012-12-21 10:00:42 -04:00
parent 07b87753d0
commit cf1a161d09
6 changed files with 6 additions and 10 deletions

View File

@@ -2022,8 +2022,6 @@ function removeValue(id){
function datePicker4(obj, id, mask, startDate, endDate, showTIme, idIsoDate) function datePicker4(obj, id, mask, startDate, endDate, showTIme, idIsoDate)
{ {
__lastMask__ = mask;
if (showTIme=='false') { if (showTIme=='false') {
showTIme = false; showTIme = false;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -474,7 +474,7 @@ var dynaformEditor={
parserfile: ["parsexml.js", "parsecss.js", "tokenizejavascript.js", "parsejavascript.js", parserfile: ["parsexml.js", "parsecss.js", "tokenizejavascript.js", "parsejavascript.js",
"../contrib/php/js/tokenizephp.js", "../contrib/php/js/parsephp.js", "../contrib/php/js/tokenizephp.js", "../contrib/php/js/parsephp.js",
"../contrib/php/js/parsephphtmlmixed.js"], "../contrib/php/js/parsephphtmlmixed.js"],
stylesheet: ["css/xmlcolors.css", "css/jscolors.css", "css/csscolors.css", "contrib/php/css/phpcolors.css"], stylesheet: ["css/xmlcolors.css", "css/jscolors.css"],
path: "js/", path: "js/",
lineNumbers: true, lineNumbers: true,
continuousScanning: 500 continuousScanning: 500

View File

@@ -245,7 +245,7 @@ $oDataset = $oSession->Execute('SELECT * FROM dynaForm WHERE NOT( XMLNODE_NAME =
$iMaximun = $oDataset->count(); $iMaximun = $oDataset->count();
while ($aRow = $oDataset->Read()) { while ($aRow = $oDataset->Read()) {
$aFields[] = array('XMLNODE_NAME' => $aRow['XMLNODE_NAME'], $aFields[] = array('XMLNODE_NAME' => $aRow['XMLNODE_NAME'],
'TYPE' => $aRow['TYPE'], 'TYPE' => isset($aRow['TYPE']) ? $aRow['TYPE'] : '',
'UP' => ($i > 0 ? G::LoadTranslation('ID_UP') : ''), 'UP' => ($i > 0 ? G::LoadTranslation('ID_UP') : ''),
'DOWN' => ($i < $iMaximun - 1 ? G::LoadTranslation('ID_DOWN') : ''), 'DOWN' => ($i < $iMaximun - 1 ? G::LoadTranslation('ID_DOWN') : ''),
'row__' => ($i + 1)); 'row__' => ($i + 1));
@@ -261,4 +261,3 @@ if (isset($sType) && $sType === 'javascript') {
$editor = new dynaformEditorAjax($_POST); $editor = new dynaformEditorAjax($_POST);
$editor->set_javascript($A, $fieldName, $sCode); $editor->set_javascript($A, $fieldName, $sCode);
} }

View File

@@ -52,7 +52,7 @@ function skinList ()
$wildcard = '@'; $wildcard = '@';
} }
foreach ($skinList['skins'] as $key => $value) { foreach ($skinList['skins'] as $key => $value) {
if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs') { if ($value['SKIN_FOLDER_ID'] != 'simplified' && $value['SKIN_FOLDER_ID'] != 'uxs' && $value['SKIN_FOLDER_ID'] != 'uxmodern') {
if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) { if ($skinList['currentSkin'] == $value['SKIN_FOLDER_ID']) {
$value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' ); $value['SKIN_STATUS'] = $wildcard . G::LoadTranslation( 'ID_ACTIVE' );
$value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME']; $value['SKIN_NAME'] = $wildcard . $value['SKIN_NAME'];