diff --git a/workflow/engine/controllers/installer.php b/workflow/engine/controllers/installer.php index ed2b6cd04..e82c2e256 100644 --- a/workflow/engine/controllers/installer.php +++ b/workflow/engine/controllers/installer.php @@ -314,8 +314,7 @@ class Installer extends Controller { else { $info = $this->createMSSQLWorkspace(); } - $info->url = '/sys' . $_REQUEST['workspace'] . '/en/classic/main/login'; - $this->forceTogenerateTranslationsFiles($info->url); + return $info; } @@ -713,7 +712,6 @@ class Installer extends Controller { $this->installLog("Index File updated $indexFileUpdated with lang: {$sysConf['default_lang']}, skin: {$sysConf['default_skin']} " ); $this->installLog("Install completed Succesfully" ); - $info->url = '/sys' . $_REQUEST['workspace'] . '/en/uxmodern/main/login'; $info->uri = '/sys' . $_REQUEST['workspace'] . '/en/uxmodern/main/login'; $info->result = true; $info->message = 'Succesfully OK---'; diff --git a/workflow/engine/controllers/main.php b/workflow/engine/controllers/main.php index 681f58ae3..fbfa1e746 100644 --- a/workflow/engine/controllers/main.php +++ b/workflow/engine/controllers/main.php @@ -226,11 +226,7 @@ class Main extends Controller $this->memcache->set( 'flagGettingStarted', $flagGettingStarted, 8*3600 ) ; } - // if( $flagGettingStarted == 0 ) { - // $oHeadPublisher->addScriptCode( 'var flagGettingStarted = 1; '); - // } - // else - // $oHeadPublisher->addScriptCode( 'var flagGettingStarted = 0; '); + $this->setJSVar('flagGettingStarted', ($flagGettingStarted == 0)); G::loadClass('configuration'); $oConf = new Configurations; @@ -474,8 +470,7 @@ class Main extends Controller private function getCompanyLogo() { - $sCompanyLogo = '/images/processmaker2.logo.png'; - //$sCompanyLogo = '/images/logo_processmaker2.gif'; + $sCompanyLogo = '/images/processmaker2.logo2.png'; if(defined("SYS_SYS")){ if ( ($aFotoSelect = $this->memcache->get('aFotoSelect')) === false ) { diff --git a/workflow/engine/templates/main/login.js b/workflow/engine/templates/main/login.js index df38b5b18..f5c9d377e 100644 --- a/workflow/engine/templates/main/login.js +++ b/workflow/engine/templates/main/login.js @@ -68,6 +68,10 @@ var Login = function() { if (typeof flyNotify != 'undefined') { Ext.msgBoxSlider.msgTopCenter(flyNotify.type, flyNotify.title, flyNotify.text, flyNotify.time); } + + if (flagGettingStarted) { + this.gettingStartedWindow.show(); + } } } }(); @@ -344,6 +348,29 @@ Login.initComponents = function() }) }); + this.gettingStartedWindow = new Ext.Window({ + id: 'gettingStartedWindow', + layout: 'fit', + title: '', + width: 640, + height: 500, //180, + //iconCls: 'ux-auth-header-icon', + closable: true, + resizable: false, + plain: true, + draggable: false, + modal:true, + //autoLoad: '../services/login_getStarted.php' + items: [ + { + xtype: 'iframepanel', + defaultSrc : '../services/login_getStarted.php', + loadMask:{msg:_('ID_LOADING')+'...'}, + bodyStyle:{height: (PMExt.getBrowser().screen.height-60) + 'px', overflow:'auto'}, + width:588 + } + ] + }); //Ext.getCmp('login-form').hide(); } diff --git a/workflow/engine/templates/services/login_getStarted.html b/workflow/engine/templates/services/login_getStarted.html index 79541937d..babd8dd16 100755 --- a/workflow/engine/templates/services/login_getStarted.html +++ b/workflow/engine/templates/services/login_getStarted.html @@ -1,44 +1,58 @@ + + + + + + + Get Started - - - - - @@ -48,8 +62,6 @@ span.cLow {

To get started, log in using the following credentials. You can change them later:

Username: admin
Password: admin - -

We suggest you follow our 7 easy videos to automate your workflow. You can see a demo of each step at http://www.processmaker.com/demos/

Other Resources:

PM Library - Import Templates
@@ -62,5 +74,31 @@ span.cLow {

+
+ + - \ No newline at end of file + + \ No newline at end of file