diff --git a/workflow/engine/controllers/home.php b/workflow/engine/controllers/home.php index 5e6d3ae99..4fd7d5051 100755 --- a/workflow/engine/controllers/home.php +++ b/workflow/engine/controllers/home.php @@ -14,6 +14,7 @@ class Home extends Controller private $userFullName; private $userRolName; private $userUxType; + private $userUxBaseTemplate; private $appListStart = 0; private $appListLimit = 15; @@ -30,6 +31,7 @@ class Home extends Controller // getting the ux type from user o group conf. $this->userUxType = isset($_SESSION['user_experience'])? $_SESSION['user_experience']: 'SIMPLIFIED'; $this->lastSkin = isset($_SESSION['user_last_skin']) ? $_SESSION['user_last_skin'] : 'classic'; + $this->userUxBaseTemplate = (is_dir(PATH_CUSTOM_SKINS . 'uxs')) ? PATH_CUSTOM_SKINS . 'simplified' . PATH_SEP . 'templates' : 'home'; if (isset($_SESSION['USER_LOGGED']) && !empty($_SESSION['USER_LOGGED'])) { $this->userID = isset($_SESSION['USER_LOGGED']) ? $_SESSION['USER_LOGGED'] : null; @@ -59,7 +61,7 @@ class Home extends Controller $this->setVar('pwd', $data['p']); $this->setVar('skin', $skin); - $this->setView("home/$template"); + $this->setView($this->userUxBaseTemplate . PATH_SEP . $template); $this->render(); } @@ -127,7 +129,7 @@ class Home extends Controller } } - $this->setView('home/index'); + $this->setView($this->userUxBaseTemplate . PATH_SEP . 'index'); $this->setVar('usrUid', $this->userID); $this->setVar('userName', $this->userName); @@ -152,11 +154,10 @@ class Home extends Controller $cases = $apps->getAll($this->userID, 0, 1, 'todo'); - if (!isset($cases['data'][0])) { //the current user has not any aplication to do - $this->setView('home/indexSingle'); - $this->setVar('default_url', 'home/error?no=2'); + $this->setView($this->userUxBaseTemplate . PATH_SEP .'indexSingle'); + $this->setVar('default_url', $this->userUxBaseTemplate . "/" . 'error?no=2'); $this->render(); exit(); } @@ -172,7 +173,7 @@ class Home extends Controller $lastStep['title'] = G::LoadTranslation('ID_FINISH'); $steps[] = $lastStep; - $this->setView('home/indexSingle'); + $this->setView($this->userUxBaseTemplate . PATH_SEP . 'indexSingle'); $this->setVar('usrUid', $this->userID); $this->setVar('userName', $this->userName); @@ -207,7 +208,7 @@ class Home extends Controller $cases = $this->getAppsData($httpData->t); // settings html template - $this->setView('home/appList'); + $this->setView($this->userUxBaseTemplate . PATH_SEP . 'appList'); // settings vars and rendering $this->setVar('cases', $cases['data']); @@ -224,7 +225,7 @@ class Home extends Controller { $cases = $this->getAppsData($httpData->t, $httpData->start, $httpData->limit); - $this->setView('home/applications'); + $this->setView($this->userUxBaseTemplate . PATH_SEP . 'applications'); $this->setVar('cases', $cases['data']); $this->render(); } @@ -304,8 +305,8 @@ class Home extends Controller $httpData->no = isset($httpData->no) ? $httpData->no : 0; switch ($httpData->no) { - case 2: $tpl = 'home/noAppsMsg'; break; - default: $tpl = 'home/error'; + case 2: $tpl = $this->userUxBaseTemplate . PATH_SEP . 'noAppsMsg'; break; + default: $tpl = $this->userUxBaseTemplate . PATH_SEP . 'error'; } $this->setView($tpl); diff --git a/workflow/engine/skinEngine/simplified/templates/appList.html b/workflow/engine/skinEngine/simplified/templates/appList.html new file mode 100644 index 000000000..95c88e871 --- /dev/null +++ b/workflow/engine/skinEngine/simplified/templates/appList.html @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + {literal} + + + + + + + +
+
+

{$title} ({$cases_count})

+ + + {if $cases_count > $appListLimit} +
+ Load More +
+ {/if} +
+
+ + +
+ + diff --git a/workflow/engine/skinEngine/simplified/templates/applications.html b/workflow/engine/skinEngine/simplified/templates/applications.html new file mode 100644 index 000000000..2be3e212f --- /dev/null +++ b/workflow/engine/skinEngine/simplified/templates/applications.html @@ -0,0 +1,51 @@ +{foreach from=$cases key=id item=APP} +
  • + + #{$APP.APP_NUMBER} + + + + + + + + + + +

    + + {$APP.APP_TITLE} + +

    +

    + {if $APP.APP_DEL_PREVIOUS_USER != ''} + From {$APP.APP_DEL_PREVIOUS_USER}, send at + {/if} + {$APP.DEL_DELEGATE_DATE} +

    +

    {$APP.APP_PRO_TITLE} +
    {$APP.APP_TAS_TITLE}

    + +
    + {if $APP.NOTES_COUNT neq 0} + {foreach from=$APP.NOTES_LIST key=k item=NOTE} +
    + + + + + +
    + + +

    {$NOTE.USR_FIRSTNAME} {$NOTE.USR_LASTNAME} ({$NOTE.USR_USERNAME})

    + 

    {$NOTE.NOTE_CONTENT}
    +
    Posted at {$NOTE.NOTE_DATE}
    +
    +
    + {/foreach} + {/if} +
    + +
    • +{/foreach} \ No newline at end of file diff --git a/workflow/engine/skinEngine/simplified/templates/index.html b/workflow/engine/skinEngine/simplified/templates/index.html new file mode 100644 index 000000000..ae709b407 --- /dev/null +++ b/workflow/engine/skinEngine/simplified/templates/index.html @@ -0,0 +1,205 @@ + + + + + + + + + + + + + + {if $clientBrowser neq 'msie'} + + {/literal} + {/if} + + {literal} + + {/literal} + + + +
    + +
    +
    +
    +
    + + +
      + + + + + {if count($arrayMnuOption) > 0} + {foreach from=$arrayMnuOption key=index item=option} + + {/foreach} + {/if} + + {if $canStartCase neq false && count($mnuNewCase) > 0} + + {/if} +
    + + + +
    +
    +
    + +
    + + + + + + {literal} + + {/literal} + + + \ No newline at end of file diff --git a/workflow/engine/skinEngine/simplified/templates/indexSingle.html b/workflow/engine/skinEngine/simplified/templates/indexSingle.html new file mode 100644 index 000000000..f09f07ee2 --- /dev/null +++ b/workflow/engine/skinEngine/simplified/templates/indexSingle.html @@ -0,0 +1,92 @@ + + + + + + + + + + + + + + + {literal} + + + + + + {/literal} + + + +
    + + + + + + + {literal} + + {/literal} + + + \ No newline at end of file diff --git a/workflow/engine/skinEngine/simplified/templates/login_ie.html b/workflow/engine/skinEngine/simplified/templates/login_ie.html new file mode 100644 index 000000000..5d9ea97a5 --- /dev/null +++ b/workflow/engine/skinEngine/simplified/templates/login_ie.html @@ -0,0 +1,77 @@ + + + + + + + {literal} + + {/literal} + + + +
    +
    +
    +
    +
    + + + + +
    + + + + + + + + + + + + + + + + +
    Login
    User + +
    Password + +
    +
    + +
    +
    +
    +
    +
    +
    +
    + + + + + diff --git a/workflow/engine/skinEngine/simplified/templates/login_standard.html b/workflow/engine/skinEngine/simplified/templates/login_standard.html new file mode 100644 index 000000000..34b6268da --- /dev/null +++ b/workflow/engine/skinEngine/simplified/templates/login_standard.html @@ -0,0 +1,102 @@ + + + + + + + + {literal} + + {/literal} + + + +
    +
    + +
    +
    + + + + + + diff --git a/workflow/engine/skinEngine/simplified/templates/noAppsMsg.html b/workflow/engine/skinEngine/simplified/templates/noAppsMsg.html new file mode 100644 index 000000000..9c886155b --- /dev/null +++ b/workflow/engine/skinEngine/simplified/templates/noAppsMsg.html @@ -0,0 +1,41 @@ + + + + + + + {literal} + + + {/literal} + + + +
    +
    + + +
    Information
    +

    +

    You are now finished. Please refresh your view to see if you have any more work pending.

    +
    + +
    +
    +
    + + +