diff --git a/gulliver/system/class.headPublisher.php b/gulliver/system/class.headPublisher.php index 6d772e1c2..929620ce3 100755 --- a/gulliver/system/class.headPublisher.php +++ b/gulliver/system/class.headPublisher.php @@ -303,7 +303,8 @@ class headPublisher { $head .= $this->getExtJsScripts(); $head .= $this->getExtJsVariablesScript(); - if (SYS_LANG == 'ar' || SYS_LANG == 'he' || SYS_LANG == 'en') { + $oServerConf =& serverConf::getSingleton(); + if ($oServerConf->isRtl(SYS_LANG)) { $head .= " \n"; } diff --git a/workflow/engine/classes/class.serverConfiguration.php b/workflow/engine/classes/class.serverConfiguration.php index 4449010d2..1e0856c40 100755 --- a/workflow/engine/classes/class.serverConfiguration.php +++ b/workflow/engine/classes/class.serverConfiguration.php @@ -54,7 +54,7 @@ class serverConf { private $lanDirection; private $lanLanguage; public $workspaces = array(); - public $rtlLang = array('ar','he','es'); + public $rtlLang = array('ar','iw','fa'); public function __construct() { @@ -403,13 +403,9 @@ class serverConf { } } - function isRtl ($lang = SYS_LANG) { - $lang = substr($lang, 0, 2); - if (in_array($lang, $this->rtlLang)) { - return true; - } else { - return false; - } + function isRtl ($lang = SYS_LANG) { + $lang = substr($lang, 0, 2); + return in_array($lang, $this->rtlLang); } diff --git a/workflow/engine/skinEngine/base/css/rtl.css b/workflow/engine/skinEngine/base/css/rtl.css index b41c1e071..2692070ef 100644 --- a/workflow/engine/skinEngine/base/css/rtl.css +++ b/workflow/engine/skinEngine/base/css/rtl.css @@ -1,4 +1,4 @@ -/* buttons cochalos */ +/* buttons */ body, html { margin :0px !important; @@ -52,14 +52,14 @@ form.formDefault .FormFieldContent { .x-btn-mc em.x-btn-arrow { background-position:left center; padding-right:0; padding-left:10px; } .x-btn-mc em.x-btn-split { background-position:left center; display:block; padding-right:0; padding-left:14px; } -.x-btn-mc em.x-btn-split { background-image:url(../images/default/button/s-arrow-rtl.gif); } +.x-btn-mc em.x-btn-split {/* background-image:url(../images/default/button/s-arrow-rtl.gif);*/ } .x-btn-over .x-btn-mc em.x-btn-split, .x-btn-click .x-btn-mc em.x-btn-split, .x-btn-menu-active .x-btn-mc em.x-btn-split, .x-btn-pressed .x-btn-mc em.x-btn-split { - background-image:url(../images/default/button/s-arrow-o-rtl.gif); + /* background-image:url(../images/default/button/s-arrow-o-rtl.gif); */ } /* menus */ -.x-menu { background-image:url(../images/default/menu/menu-rtl.gif); background-position: top right; background-repeat:repeat-y; } -.x-menu-item-arrow{ background-image:url(../images/default/menu/menu-parent-rtl.gif); background-position:left center;} +.x-menu { /* background-image:url(../images/default/menu/menu-rtl.gif);*/ background-position: top right; background-repeat:repeat-y; } +.x-menu-item-arrow{ /* background-image:url(../images/default/menu/menu-parent-rtl.gif); */ background-position:left center;} .ext-ie .x-menu-item-arrow{background-position-x:10%;} a.x-menu-item { padding:3px 27px 3px 21px; } .x-menu-item-icon { left:auto; right:3px; } @@ -80,8 +80,8 @@ ul.x-tab-strip li{direction:ltr; float:right;margin-right:2px; margin-left:0; wi ul.x-tab-strip > li{width:auto;} .x-tab-strip-text {direction: rtl;} ul.x-tab-strip li.x-tab-edge { float:right;} -.x-tab-scroller-left { left:auto; right:0; background-image:url(../images/default/tabs/scroll-left-rtl.gif); } -.x-tab-scroller-right { right:auto; left:0; background-image:url(../images/default/tabs/scroll-right-rtl.gif); } +.x-tab-scroller-left { left:auto; right:0; /* background-image:url(../images/default/tabs/scroll-left-rtl.gif); */ } +.x-tab-scroller-right { right:auto; left:0; /* background-image:url(../images/default/tabs/scroll-right-rtl.gif); */ } .x-tab-strip .x-tab-with-icon span.x-tab-strip-text { /*background-position:100% 3px;*/ background-repeat:no-repeat; padding-right:20px; padding-left:0; } /*PARA CORREGIR LA POSICION DE LOS ICONOS AQUI ESTA COMENTADO BRAYAN*/ .x-tab-strip .x-tab-strip-closable a.x-tab-strip-close {right:auto; left:3px;} .x-tab-strip-closable .x-tab-left { padding-left:3px;padding-right:3px; } @@ -89,13 +89,13 @@ ul.x-tab-strip li.x-tab-edge { float:right;} /*Grids*/ .x-props-grid .x-grid3-td-name .x-grid3-cell-inner { - background-image:url(../images/default/grid/grid3-special-col-bg-1-rtl.gif) !important; + /* background-image:url(../images/default/grid/grid3-special-col-bg-1-rtl.gif) !important; */ padding-left: 0; padding-right: 12px; background-position: 100% 0% !important; } -.x-grid3-hd-btn { left:0; right:auto; background-image:url(../images/default/grid/grid3-hd-btn-rtl.gif); } +.x-grid3-hd-btn { left:0; right:auto; /* background-image:url(../images/default/grid/grid3-hd-btn-rtl.gif); */ } .x-grid3-hd-row td { border-right-color:#EEEEEE; border-left-color:#D0D0D0; } .x-grid3-body .x-grid3-td-numberer, .x-grid3-body .x-grid3-td-expander, .x-grid3-body .x-grid3-td-checker { - background-image:url(../images/default/grid/grid3-special-col-bg-rtl.gif); + /* background-image:url(../images/default/grid/grid3-special-col-bg-rtl.gif); */ } .x-grid-group-hd div { background-position: 99% -47px; padding:4px 20px 4px 17px; } .x-grid-group-collapsed .x-grid-group-hd div { background-position:99% 3px; } @@ -174,14 +174,14 @@ ul.x-tab-strip li.x-tab-edge { float:right;} } /*Forms*/ -.x-form-field-wrap .x-form-trigger {background-image:url(../images/default/form/trigger-rtl.gif)} -.x-form-field-wrap .x-form-date-trigger { background-image: url(../images/default/form/date-trigger-rtl.gif); } -.x-form-field-wrap .x-form-clear-trigger { background-image: url(../images/default/form/clear-trigger-rtl.gif); } -.x-form-field-wrap .x-form-search-trigger { background-image: url(../images/default/form/search-trigger-rtl.gif); } +.x-form-field-wrap .x-form-trigger { /* background-image:url(../images/default/form/trigger-rtl.gif) */} +.x-form-field-wrap .x-form-date-trigger { /* background-image: url(../images/default/form/date-trigger-rtl.gif); */} +.x-form-field-wrap .x-form-clear-trigger { /* background-image: url(../images/default/form/clear-trigger-rtl.gif);*/ } +.x-form-field-wrap .x-form-search-trigger { /* background-image: url(../images/default/form/search-trigger-rtl.gif);*/ } /*Date picker*/ -.x-date-right a { background-image: url(../images/default/shared/left-btn-rtl.gif); } -.x-date-left a{ background-image: url(../images/default/shared/right-btn-rtl.gif); } +.x-date-right a { /* background-image: url(../images/default/shared/left-btn-rtl.gif); */ } +.x-date-left a{ /* background-image: url(../images/default/shared/right-btn-rtl.gif); */ } .x-date-middle .x-btn-mc em.x-btn-arrow { background-position: 0 0; } x-btn-mc em.x-btn-arrow { padding-left: 12px } .x-date-mp-ybtn a.x-date-mp-next { background-position:0 -105px; } @@ -190,23 +190,23 @@ x-btn-mc em.x-btn-arrow { padding-left: 12px } .x-date-mp-ybtn a.x-date-mp-prev:hover { background-position:-15px -120px; } /*Toolbar icons*/ -.x-tbar-page-first{ background-image: url(../images/default/grid/page-first-rtl.gif) !important; } -.x-tbar-page-last{ background-image: url(../images/default/grid/page-last-rtl.gif) !important; } -.x-tbar-page-next{ background-image: url(../images/default/grid/page-next-rtl.gif) !important; } -.x-tbar-page-prev{ background-image: url(../images/default/grid/page-prev-rtl.gif) !important; } -.x-item-disabled .x-tbar-page-first{ background-image: url(../images/default/grid/page-first-disabled-rtl.gif) !important; } -.x-item-disabled .x-tbar-page-last{ background-image: url(../images/default/grid/page-last-disabled-rtl.gif) !important; } -.x-item-disabled .x-tbar-page-next{ background-image: url(../images/default/grid/page-next-disabled-rtl.gif) !important; } -.x-item-disabled .x-tbar-page-prev{ background-image: url(../images/default/grid/page-prev-disabled-rtl.gif) !important; } +.x-tbar-page-first{ /* background-image: url(../images/default/grid/page-first-rtl.gif) !important; */ } +.x-tbar-page-last{ /* background-image: url(../images/default/grid/page-last-rtl.gif) !important; */ } +.x-tbar-page-next{ /* background-image: url(../images/default/grid/page-next-rtl.gif) !important; */ } +.x-tbar-page-prev{ /* background-image: url(../images/default/grid/page-prev-rtl.gif) !important; */ } +.x-item-disabled .x-tbar-page-first{ /* background-image: url(../images/default/grid/page-first-disabled-rtl.gif) !important; */ } +.x-item-disabled .x-tbar-page-last{ /* background-image: url(../images/default/grid/page-last-disabled-rtl.gif) !important; */ } +.x-item-disabled .x-tbar-page-next{ /* background-image: url(../images/default/grid/page-next-disabled-rtl.gif) !important; */ } +.x-item-disabled .x-tbar-page-prev{ /* background-image: url(../images/default/grid/page-prev-disabled-rtl.gif) !important; */ } /*Toobar elements*/ .x-toolbar .x-btn-over .x-btn-mc em.x-btn-split, .x-toolbar .x-btn-click .x-btn-mc em.x-btn-split, .x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split, .x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split { - background-image:url(../images/default/button/s-arrow-o-rtl.gif); + /* background-image:url(../images/default/button/s-arrow-o-rtl.gif); */ } -.x-toolbar .x-btn-mc em.x-btn-split { background-image:url(../images/default/button/s-arrow-noline-rtl.gif); } -.x-toolbar-more-icon { background-image:url(../images/default/toolbar/more-rtl.gif) !important; } +.x-toolbar .x-btn-mc em.x-btn-split { /* background-image:url(../images/default/button/s-arrow-noline-rtl.gif); */ } +.x-toolbar-more-icon { /* background-image:url(../images/default/toolbar/more-rtl.gif) !important; */ } .x-btn-mc em.x-btn-arrow { background-position:left center; padding-right:0; padding-left:10px; } .x-toolbar-more em.x-btn-arrow { padding-left:0} @@ -233,23 +233,6 @@ x-btn-mc em.x-btn-arrow { padding-left: 12px } background-position: right 4px; } - - - - - - - - - - - - - - - - - /* ---- text fields ---- */ .x-form-check-group-label { padding-left: 0 !important; @@ -414,6 +397,3 @@ td.x-date-mp-sep { right: 0x !important; } - - - diff --git a/workflow/engine/skinEngine/base/layout-extjs.html b/workflow/engine/skinEngine/base/layout-extjs.html index ef3b7b5cf..93adff71d 100755 --- a/workflow/engine/skinEngine/base/layout-extjs.html +++ b/workflow/engine/skinEngine/base/layout-extjs.html @@ -1,8 +1,7 @@ -{typeDocument} +{doctype} - - + {meta} {header} diff --git a/workflow/engine/skinEngine/skinEngine.php b/workflow/engine/skinEngine/skinEngine.php index beb9b595f..e7038000e 100755 --- a/workflow/engine/skinEngine/skinEngine.php +++ b/workflow/engine/skinEngine/skinEngine.php @@ -241,33 +241,40 @@ class SkinEngine $templateFile = $this->layoutFile['dirname'] . PATH_SEP . $this->layoutFileExtjs['basename']; } - $typeDocument = ''; - $template = new TemplatePower($templateFile); $template->prepare(); $template->assign('header', $header); $template->assign('styles', $styles); $template->assign('bodyTemplate', $body); + // verify is RTL $oServerConf =& serverConf::getSingleton(); if ($oServerConf->isRtl(SYS_LANG)) { - $template->assign('dirBody', 'dir="RTL"'); - $iexplores = array( - 'IE=10' => '(MSIE 10\.[0-9]+)', - 'IE=9' => '(MSIE 9\.[0-9]+)', - 'IE=8' => '(MSIE 8\.[0-9]+)', - 'IE=7' => '(MSIE 7\.[0-9]+)', - 'IE=6' => '(MSIE 6\.[0-9]+)' - ); - - foreach ($iexplores as $browser => $pattern) { - if (preg_match('/'.$pattern.'/', $_SERVER['HTTP_USER_AGENT'])) { - $typeDocument = ''; - } - } + $template->assign('dirBody', 'dir="RTL"'); } + // end verify + + // verify is IE + $doctype = ''; + $meta = ''; + $iexplores = array( + 'IE=10' => '(MSIE 10\.[0-9]+)', + 'IE=9' => '(MSIE 9\.[0-9]+)', + 'IE=8' => '(MSIE 8\.[0-9]+)', + 'IE=7' => '(MSIE 7\.[0-9]+)', + 'IE=6' => '(MSIE 6\.[0-9]+)' + ); + + foreach ($iexplores as $browser => $pattern) { + if (preg_match('/'.$pattern.'/', $_SERVER['HTTP_USER_AGENT'])) { + $doctype = ''; + $meta = ''; + } + } + // end verify - $template->assign('typeDocument', $typeDocument); + $template->assign('meta', $meta); + $template->assign('doctype', $doctype); echo $template->getOutputContent(); } diff --git a/workflow/engine/skinEngine/uxmodern/config.xml b/workflow/engine/skinEngine/uxmodern/config.xml index fa23e32a8..5f09d36e3 100644 --- a/workflow/engine/skinEngine/uxmodern/config.xml +++ b/workflow/engine/skinEngine/uxmodern/config.xml @@ -11,45 +11,45 @@ - + - + - + - + - + \ No newline at end of file diff --git a/workflow/engine/skinEngine/uxmodern/css/rtl.css b/workflow/engine/skinEngine/uxmodern/css/rtl.css index fb8bbac3c..2692070ef 100644 --- a/workflow/engine/skinEngine/uxmodern/css/rtl.css +++ b/workflow/engine/skinEngine/uxmodern/css/rtl.css @@ -10,8 +10,11 @@ body, html float: left } -.textBlue { - float: left +ul#pm_menu { + float: right; + list-style: none outside none; + margin: 0; + padding: 0 0 0 13px; } @@ -49,14 +52,14 @@ form.formDefault .FormFieldContent { .x-btn-mc em.x-btn-arrow { background-position:left center; padding-right:0; padding-left:10px; } .x-btn-mc em.x-btn-split { background-position:left center; display:block; padding-right:0; padding-left:14px; } -.x-btn-mc em.x-btn-split { background-image:url(../images/default/button/s-arrow-rtl.gif); } +.x-btn-mc em.x-btn-split {/* background-image:url(../images/default/button/s-arrow-rtl.gif);*/ } .x-btn-over .x-btn-mc em.x-btn-split, .x-btn-click .x-btn-mc em.x-btn-split, .x-btn-menu-active .x-btn-mc em.x-btn-split, .x-btn-pressed .x-btn-mc em.x-btn-split { - background-image:url(../images/default/button/s-arrow-o-rtl.gif); + /* background-image:url(../images/default/button/s-arrow-o-rtl.gif); */ } /* menus */ -.x-menu { background-image:url(../images/default/menu/menu-rtl.gif); background-position: top right; background-repeat:repeat-y; } -.x-menu-item-arrow{ background-image:url(../images/default/menu/menu-parent-rtl.gif); background-position:left center;} +.x-menu { /* background-image:url(../images/default/menu/menu-rtl.gif);*/ background-position: top right; background-repeat:repeat-y; } +.x-menu-item-arrow{ /* background-image:url(../images/default/menu/menu-parent-rtl.gif); */ background-position:left center;} .ext-ie .x-menu-item-arrow{background-position-x:10%;} a.x-menu-item { padding:3px 27px 3px 21px; } .x-menu-item-icon { left:auto; right:3px; } @@ -77,8 +80,8 @@ ul.x-tab-strip li{direction:ltr; float:right;margin-right:2px; margin-left:0; wi ul.x-tab-strip > li{width:auto;} .x-tab-strip-text {direction: rtl;} ul.x-tab-strip li.x-tab-edge { float:right;} -.x-tab-scroller-left { left:auto; right:0; background-image:url(../images/default/tabs/scroll-left-rtl.gif); } -.x-tab-scroller-right { right:auto; left:0; background-image:url(../images/default/tabs/scroll-right-rtl.gif); } +.x-tab-scroller-left { left:auto; right:0; /* background-image:url(../images/default/tabs/scroll-left-rtl.gif); */ } +.x-tab-scroller-right { right:auto; left:0; /* background-image:url(../images/default/tabs/scroll-right-rtl.gif); */ } .x-tab-strip .x-tab-with-icon span.x-tab-strip-text { /*background-position:100% 3px;*/ background-repeat:no-repeat; padding-right:20px; padding-left:0; } /*PARA CORREGIR LA POSICION DE LOS ICONOS AQUI ESTA COMENTADO BRAYAN*/ .x-tab-strip .x-tab-strip-closable a.x-tab-strip-close {right:auto; left:3px;} .x-tab-strip-closable .x-tab-left { padding-left:3px;padding-right:3px; } @@ -86,13 +89,13 @@ ul.x-tab-strip li.x-tab-edge { float:right;} /*Grids*/ .x-props-grid .x-grid3-td-name .x-grid3-cell-inner { - background-image:url(../images/default/grid/grid3-special-col-bg-1-rtl.gif) !important; + /* background-image:url(../images/default/grid/grid3-special-col-bg-1-rtl.gif) !important; */ padding-left: 0; padding-right: 12px; background-position: 100% 0% !important; } -.x-grid3-hd-btn { left:0; right:auto; background-image:url(../images/default/grid/grid3-hd-btn-rtl.gif); } +.x-grid3-hd-btn { left:0; right:auto; /* background-image:url(../images/default/grid/grid3-hd-btn-rtl.gif); */ } .x-grid3-hd-row td { border-right-color:#EEEEEE; border-left-color:#D0D0D0; } .x-grid3-body .x-grid3-td-numberer, .x-grid3-body .x-grid3-td-expander, .x-grid3-body .x-grid3-td-checker { - background-image:url(../images/default/grid/grid3-special-col-bg-rtl.gif); + /* background-image:url(../images/default/grid/grid3-special-col-bg-rtl.gif); */ } .x-grid-group-hd div { background-position: 99% -47px; padding:4px 20px 4px 17px; } .x-grid-group-collapsed .x-grid-group-hd div { background-position:99% 3px; } @@ -171,14 +174,14 @@ ul.x-tab-strip li.x-tab-edge { float:right;} } /*Forms*/ -.x-form-field-wrap .x-form-trigger {background-image:url(../images/default/form/trigger-rtl.gif)} -.x-form-field-wrap .x-form-date-trigger { background-image: url(../images/default/form/date-trigger-rtl.gif); } -.x-form-field-wrap .x-form-clear-trigger { background-image: url(../images/default/form/clear-trigger-rtl.gif); } -.x-form-field-wrap .x-form-search-trigger { background-image: url(../images/default/form/search-trigger-rtl.gif); } +.x-form-field-wrap .x-form-trigger { /* background-image:url(../images/default/form/trigger-rtl.gif) */} +.x-form-field-wrap .x-form-date-trigger { /* background-image: url(../images/default/form/date-trigger-rtl.gif); */} +.x-form-field-wrap .x-form-clear-trigger { /* background-image: url(../images/default/form/clear-trigger-rtl.gif);*/ } +.x-form-field-wrap .x-form-search-trigger { /* background-image: url(../images/default/form/search-trigger-rtl.gif);*/ } /*Date picker*/ -.x-date-right a { background-image: url(../images/default/shared/left-btn-rtl.gif); } -.x-date-left a{ background-image: url(../images/default/shared/right-btn-rtl.gif); } +.x-date-right a { /* background-image: url(../images/default/shared/left-btn-rtl.gif); */ } +.x-date-left a{ /* background-image: url(../images/default/shared/right-btn-rtl.gif); */ } .x-date-middle .x-btn-mc em.x-btn-arrow { background-position: 0 0; } x-btn-mc em.x-btn-arrow { padding-left: 12px } .x-date-mp-ybtn a.x-date-mp-next { background-position:0 -105px; } @@ -187,23 +190,23 @@ x-btn-mc em.x-btn-arrow { padding-left: 12px } .x-date-mp-ybtn a.x-date-mp-prev:hover { background-position:-15px -120px; } /*Toolbar icons*/ -.x-tbar-page-first{ background-image: url(../images/default/grid/page-first-rtl.gif) !important; } -.x-tbar-page-last{ background-image: url(../images/default/grid/page-last-rtl.gif) !important; } -.x-tbar-page-next{ background-image: url(../images/default/grid/page-next-rtl.gif) !important; } -.x-tbar-page-prev{ background-image: url(../images/default/grid/page-prev-rtl.gif) !important; } -.x-item-disabled .x-tbar-page-first{ background-image: url(../images/default/grid/page-first-disabled-rtl.gif) !important; } -.x-item-disabled .x-tbar-page-last{ background-image: url(../images/default/grid/page-last-disabled-rtl.gif) !important; } -.x-item-disabled .x-tbar-page-next{ background-image: url(../images/default/grid/page-next-disabled-rtl.gif) !important; } -.x-item-disabled .x-tbar-page-prev{ background-image: url(../images/default/grid/page-prev-disabled-rtl.gif) !important; } +.x-tbar-page-first{ /* background-image: url(../images/default/grid/page-first-rtl.gif) !important; */ } +.x-tbar-page-last{ /* background-image: url(../images/default/grid/page-last-rtl.gif) !important; */ } +.x-tbar-page-next{ /* background-image: url(../images/default/grid/page-next-rtl.gif) !important; */ } +.x-tbar-page-prev{ /* background-image: url(../images/default/grid/page-prev-rtl.gif) !important; */ } +.x-item-disabled .x-tbar-page-first{ /* background-image: url(../images/default/grid/page-first-disabled-rtl.gif) !important; */ } +.x-item-disabled .x-tbar-page-last{ /* background-image: url(../images/default/grid/page-last-disabled-rtl.gif) !important; */ } +.x-item-disabled .x-tbar-page-next{ /* background-image: url(../images/default/grid/page-next-disabled-rtl.gif) !important; */ } +.x-item-disabled .x-tbar-page-prev{ /* background-image: url(../images/default/grid/page-prev-disabled-rtl.gif) !important; */ } /*Toobar elements*/ .x-toolbar .x-btn-over .x-btn-mc em.x-btn-split, .x-toolbar .x-btn-click .x-btn-mc em.x-btn-split, .x-toolbar .x-btn-menu-active .x-btn-mc em.x-btn-split, .x-toolbar .x-btn-pressed .x-btn-mc em.x-btn-split { - background-image:url(../images/default/button/s-arrow-o-rtl.gif); + /* background-image:url(../images/default/button/s-arrow-o-rtl.gif); */ } -.x-toolbar .x-btn-mc em.x-btn-split { background-image:url(../images/default/button/s-arrow-noline-rtl.gif); } -.x-toolbar-more-icon { background-image:url(../images/default/toolbar/more-rtl.gif) !important; } +.x-toolbar .x-btn-mc em.x-btn-split { /* background-image:url(../images/default/button/s-arrow-noline-rtl.gif); */ } +.x-toolbar-more-icon { /* background-image:url(../images/default/toolbar/more-rtl.gif) !important; */ } .x-btn-mc em.x-btn-arrow { background-position:left center; padding-right:0; padding-left:10px; } .x-toolbar-more em.x-btn-arrow { padding-left:0} @@ -230,23 +233,6 @@ x-btn-mc em.x-btn-arrow { padding-left: 12px } background-position: right 4px; } - - - - - - - - - - - - - - - - - /* ---- text fields ---- */ .x-form-check-group-label { padding-left: 0 !important; @@ -411,6 +397,3 @@ td.x-date-mp-sep { right: 0x !important; } - - - diff --git a/workflow/engine/skinEngine/uxmodern/layout-extjs.html b/workflow/engine/skinEngine/uxmodern/layout-extjs.html index 70aff481d..93adff71d 100644 --- a/workflow/engine/skinEngine/uxmodern/layout-extjs.html +++ b/workflow/engine/skinEngine/uxmodern/layout-extjs.html @@ -1,14 +1,12 @@ -{typeDocument} +{doctype} - - + {meta} {header} {bodyTemplate} -cochalo \ No newline at end of file diff --git a/workflow/engine/skinEngine/uxmodern/layout-pm-modern-login.html b/workflow/engine/skinEngine/uxmodern/layout-pm-modern-login.html index 8b1b6cf3d..84415515d 100644 --- a/workflow/engine/skinEngine/uxmodern/layout-pm-modern-login.html +++ b/workflow/engine/skinEngine/uxmodern/layout-pm-modern-login.html @@ -1,5 +1,6 @@ + diff --git a/workflow/engine/skinEngine/uxmodern/layout-pm-modern.html b/workflow/engine/skinEngine/uxmodern/layout-pm-modern.html index f1d7f60f4..617ba2d41 100644 --- a/workflow/engine/skinEngine/uxmodern/layout-pm-modern.html +++ b/workflow/engine/skinEngine/uxmodern/layout-pm-modern.html @@ -1,5 +1,6 @@ + {$_header}