mirror of
https://github.com/SuiteCRM/SuiteCRM-Core.git
synced 2025-09-13 00:42:08 +08:00
[Legacy] Fix user wizard finish screen re-direction
- Look into the whatnext input value and redirect
This commit is contained in:
Clemente Raposo
balumahendran
parent
541522f0df
commit
961536b014
4 changed files with 109 additions and 3 deletions
87
public/legacy/include/images/sa_logo.svg
Normal file
87
public/legacy/include/images/sa_logo.svg
Normal file
|
|
@ -0,0 +1,87 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Generator: Adobe Illustrator 23.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
||||
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
||||
viewBox="0 0 595.3 419.5" style="enable-background:new 0 0 595.3 419.5;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#474154;}
|
||||
.st1{fill:#E3A025;}
|
||||
</style>
|
||||
<g>
|
||||
<g>
|
||||
<path class="st0" d="M75.5,172.9c-0.4,0.7-0.9,1.3-1.4,1.6c-0.5,0.3-1.1,0.5-1.8,0.5c-0.7,0-1.5-0.3-2.4-0.8
|
||||
c-0.9-0.5-1.9-1.2-3.1-1.8c-1.2-0.7-2.6-1.3-4.2-1.8c-1.6-0.6-3.5-0.8-5.7-0.8c-2,0-3.7,0.2-5.2,0.7c-1.5,0.5-2.7,1.1-3.7,2
|
||||
c-1,0.8-1.8,1.9-2.3,3c-0.5,1.2-0.7,2.5-0.7,3.9c0,1.8,0.5,3.3,1.5,4.5c1,1.2,2.3,2.2,4,3.1c1.7,0.8,3.6,1.6,5.7,2.3
|
||||
c2.1,0.7,4.3,1.4,6.5,2.1c2.2,0.8,4.4,1.6,6.5,2.7c2.1,1,4,2.3,5.7,3.8c1.7,1.5,3,3.4,4,5.6c1,2.2,1.5,4.9,1.5,8.1
|
||||
c0,3.5-0.6,6.7-1.8,9.7c-1.2,3-2.9,5.7-5.2,7.9c-2.3,2.2-5.1,4-8.3,5.3c-3.3,1.3-7.1,1.9-11.3,1.9c-2.4,0-4.8-0.2-7.2-0.7
|
||||
c-2.4-0.5-4.6-1.2-6.8-2c-2.2-0.9-4.2-1.9-6.1-3.2c-1.9-1.2-3.6-2.6-5.1-4.1l4.2-6.8c0.4-0.5,0.8-0.9,1.4-1.2
|
||||
c0.6-0.3,1.2-0.5,1.8-0.5c0.9,0,1.8,0.4,2.9,1.1c1,0.7,2.2,1.5,3.7,2.4c1.4,0.9,3.1,1.7,5,2.4c1.9,0.7,4.2,1.1,6.8,1.1
|
||||
c4.1,0,7.2-1,9.4-2.9c2.2-1.9,3.3-4.7,3.3-8.3c0-2-0.5-3.7-1.5-4.9c-1-1.3-2.3-2.3-4-3.2c-1.7-0.9-3.6-1.6-5.7-2.2
|
||||
c-2.1-0.6-4.3-1.3-6.5-2c-2.2-0.7-4.3-1.6-6.5-2.5c-2.1-1-4-2.3-5.7-3.9c-1.7-1.6-3-3.6-4-6c-1-2.4-1.5-5.3-1.5-8.8
|
||||
c0-2.8,0.6-5.5,1.7-8.2c1.1-2.7,2.7-5,4.9-7.1c2.1-2.1,4.7-3.7,7.8-4.9c3.1-1.2,6.7-1.9,10.7-1.9c4.5,0,8.7,0.7,12.5,2.1
|
||||
c3.8,1.4,7.1,3.4,9.8,5.9L75.5,172.9z"/>
|
||||
<path class="st0" d="M88.8,188.8c6.3-5.7,13.8-8.6,22.6-8.6c3.2,0,6,0.5,8.5,1.6c2.5,1,4.6,2.5,6.4,4.4c1.7,1.9,3,4.1,3.9,6.7
|
||||
c0.9,2.6,1.4,5.4,1.4,8.5v34.4h-5.9c-1.2,0-2.2-0.2-2.9-0.6c-0.7-0.4-1.2-1.1-1.6-2.3l-1.2-3.9c-1.4,1.2-2.7,2.3-4,3.3
|
||||
c-1.3,0.9-2.7,1.7-4.1,2.4c-1.4,0.6-2.9,1.1-4.5,1.5c-1.6,0.3-3.4,0.5-5.3,0.5c-2.3,0-4.4-0.3-6.4-0.9c-1.9-0.6-3.6-1.5-5-2.8
|
||||
c-1.4-1.2-2.5-2.8-3.3-4.6c-0.8-1.8-1.2-4-1.2-6.4c0-1.4,0.2-2.7,0.7-4.1c0.5-1.4,1.2-2.7,2.3-3.9c1-1.2,2.4-2.4,4.1-3.5
|
||||
c1.7-1.1,3.7-2,6.1-2.9c2.4-0.8,5.2-1.5,8.5-2c3.2-0.5,6.9-0.8,11-0.9v-3.2c0-3.6-0.8-6.3-2.3-8.1c-1.6-1.8-3.8-2.6-6.7-2.6
|
||||
c-2.1,0-3.9,0.2-5.3,0.7c-1.4,0.5-2.6,1.1-3.7,1.7c-1.1,0.6-2,1.2-2.9,1.7c-0.9,0.5-1.8,0.7-2.9,0.7c-0.9,0-1.7-0.2-2.3-0.7
|
||||
c-0.6-0.5-1.1-1-1.5-1.7L88.8,188.8z M118.8,212.4c-3.8,0.2-7,0.5-9.5,1c-2.6,0.5-4.6,1.1-6.2,1.8c-1.6,0.7-2.7,1.6-3.3,2.6
|
||||
c-0.7,1-1,2.1-1,3.2c0,2.3,0.7,3.9,2,4.9c1.4,1,3.1,1.5,5.3,1.5c2.7,0,5-0.5,7-1.5c2-1,3.9-2.4,5.8-4.4V212.4z"/>
|
||||
<path class="st0" d="M157.1,156.8v78.8H144v-78.8H157.1z"/>
|
||||
<path class="st0" d="M180.3,210.1c0.2,2.8,0.7,5.2,1.5,7.2c0.8,2,1.8,3.7,3.1,5c1.3,1.3,2.8,2.3,4.5,3c1.8,0.7,3.7,1,5.8,1
|
||||
c2.1,0,3.9-0.2,5.5-0.7c1.5-0.5,2.9-1,4-1.6c1.1-0.6,2.2-1.2,3-1.6c0.9-0.5,1.7-0.7,2.5-0.7c1.1,0,1.9,0.4,2.4,1.2l3.8,4.8
|
||||
c-1.5,1.7-3.1,3.1-4.9,4.3c-1.8,1.1-3.7,2.1-5.6,2.8c-2,0.7-4,1.2-6,1.5c-2,0.3-4,0.4-5.9,0.4c-3.8,0-7.3-0.6-10.5-1.9
|
||||
c-3.3-1.3-6.1-3.1-8.5-5.6c-2.4-2.5-4.3-5.5-5.7-9.1c-1.4-3.6-2.1-7.8-2.1-12.6c0-3.7,0.6-7.2,1.8-10.5c1.2-3.3,2.9-6.1,5.2-8.5
|
||||
c2.2-2.4,5-4.3,8.2-5.8c3.2-1.4,6.9-2.1,10.9-2.1c3.4,0,6.6,0.6,9.5,1.6c2.9,1.1,5.4,2.7,7.5,4.8c2.1,2.1,3.7,4.7,4.9,7.7
|
||||
c1.2,3.1,1.8,6.5,1.8,10.5c0,2-0.2,3.3-0.6,4c-0.4,0.7-1.2,1-2.4,1H180.3z M205.3,202.2c0-1.7-0.2-3.3-0.7-4.8
|
||||
c-0.5-1.5-1.2-2.8-2.1-3.9c-1-1.1-2.2-2-3.6-2.7c-1.5-0.7-3.2-1-5.1-1c-3.8,0-6.8,1.1-8.9,3.2c-2.2,2.2-3.6,5.2-4.2,9.2H205.3z"/>
|
||||
<path class="st0" d="M260,191.8c-0.4,0.6-0.7,1-1.1,1.2c-0.4,0.2-0.9,0.3-1.5,0.3c-0.6,0-1.3-0.2-2-0.5c-0.7-0.4-1.6-0.7-2.5-1.2
|
||||
c-1-0.4-2-0.8-3.3-1.2c-1.2-0.4-2.7-0.5-4.3-0.5c-2.6,0-4.6,0.5-6.1,1.6c-1.5,1.1-2.2,2.5-2.2,4.3c0,1.2,0.4,2.1,1.1,2.9
|
||||
c0.8,0.8,1.8,1.5,3,2.1c1.3,0.6,2.7,1.1,4.3,1.6c1.6,0.5,3.2,1,4.9,1.6c1.6,0.6,3.3,1.2,4.8,1.9c1.6,0.7,3,1.6,4.3,2.8
|
||||
c1.3,1.1,2.3,2.5,3,4c0.8,1.6,1.1,3.4,1.1,5.6c0,2.6-0.5,5-1.4,7.2c-0.9,2.2-2.3,4.1-4.2,5.7c-1.8,1.6-4.1,2.9-6.8,3.8
|
||||
c-2.7,0.9-5.8,1.4-9.4,1.4c-1.9,0-3.7-0.2-5.5-0.5c-1.8-0.3-3.5-0.8-5.1-1.4c-1.6-0.6-3.2-1.3-4.6-2.1c-1.4-0.8-2.6-1.7-3.7-2.7
|
||||
l3-5c0.4-0.6,0.8-1.1,1.4-1.4c0.5-0.3,1.2-0.5,2-0.5c0.8,0,1.6,0.2,2.3,0.7c0.7,0.5,1.6,1,2.5,1.5c1,0.5,2.1,1,3.4,1.5
|
||||
c1.3,0.5,2.9,0.7,4.9,0.7c1.6,0,2.9-0.2,4-0.6c1.1-0.4,2-0.9,2.8-1.5c0.7-0.6,1.3-1.3,1.6-2.1c0.3-0.8,0.5-1.6,0.5-2.5
|
||||
c0-1.3-0.4-2.3-1.1-3.1c-0.8-0.8-1.8-1.5-3-2.1c-1.3-0.6-2.7-1.1-4.3-1.6c-1.6-0.5-3.3-1-4.9-1.6c-1.7-0.6-3.3-1.2-4.9-2
|
||||
c-1.6-0.8-3-1.7-4.3-2.9c-1.3-1.2-2.3-2.6-3-4.3c-0.8-1.7-1.1-3.7-1.1-6.2c0-2.2,0.4-4.3,1.3-6.4c0.9-2,2.2-3.8,3.9-5.3
|
||||
c1.7-1.5,3.9-2.7,6.4-3.6c2.6-0.9,5.5-1.4,8.9-1.4c3.7,0,7.2,0.6,10.2,1.9c3.1,1.2,5.6,2.9,7.7,4.9L260,191.8z"/>
|
||||
</g>
|
||||
<g>
|
||||
<path class="st1" d="M340.5,235.6h-10.7c-1.2,0-2.1-0.3-2.8-0.9c-0.7-0.6-1.1-1.3-1.4-2.3l-3.2-16h-28.6l-7.1,16
|
||||
c-0.4,0.8-1,1.5-1.9,2.2c-0.9,0.6-1.9,1-3,1h-10.8l37.1-76.7h14L340.5,235.6z M320.5,206.8l-5.2-26.2c-0.2-1.2-0.5-2.6-0.7-4.2
|
||||
c-0.3-1.6-0.6-3.3-0.8-5.2c-0.7,1.9-1.4,3.6-2.1,5.2c-0.7,1.6-1.3,3-1.8,4.2l-11.6,26.2H320.5z"/>
|
||||
<path class="st1" d="M398.5,183.2l-0.6,4.2c-0.2,1.7-1.1,2.8-2.6,3.4l-5.6,1.4c0.2,0.7,0.3,1.5,0.4,2.3c0.1,0.8,0.1,1.6,0.1,2.5
|
||||
c0,1.6-0.2,3.1-0.5,4.4c-0.4,1.3-0.8,2.5-1.3,3.6c-0.5,1.1-1.1,2.1-1.7,3.1c-0.6,1-1.2,2-1.7,3c-0.5,1-0.9,2.1-1.3,3.2
|
||||
c-0.4,1.1-0.5,2.3-0.5,3.7c0,1.5,0.3,2.8,0.9,4c0.6,1.2,1.2,2.5,2,3.7c0.7,1.3,1.4,2.6,2,4.1c0.6,1.5,0.9,3.1,0.9,5
|
||||
c0,2.7-0.7,5.2-1.9,7.7c-1.2,2.4-2.9,4.5-5.2,6.4c-2.2,1.8-5,3.3-8.2,4.3c-3.3,1.1-6.9,1.6-11,1.6c-3.3,0-6.3-0.3-9-1
|
||||
c-2.7-0.7-5-1.7-6.8-2.9c-1.9-1.2-3.3-2.7-4.3-4.4c-1-1.7-1.5-3.5-1.5-5.5c0-2.5,0.5-4.6,1.6-6.5c1.1-1.8,2.5-3.4,4.2-4.6
|
||||
c1.8-1.3,3.8-2.3,6.1-3c2.3-0.7,4.7-1.3,7.2-1.6c2.5-0.3,4.9-0.4,7.4-0.4s4.8,0.3,6.9,0.6c-0.3-1.1-0.5-2.2-0.5-3.4
|
||||
c0-2.1,0.6-4.3,1.7-6.8c-1.3,0.9-2.9,1.6-4.6,2.1c-1.7,0.5-3.8,0.7-6.2,0.7c-2,0-4-0.3-5.9-1c-1.9-0.7-3.5-1.7-4.9-3.1
|
||||
c-1.4-1.4-2.5-3.1-3.4-5.2c-0.8-2.1-1.2-4.5-1.2-7.2c0-2.7,0.5-5.2,1.5-7.8c1-2.5,2.5-4.8,4.4-6.8c1.9-2,4.3-3.6,7.2-4.8
|
||||
c2.9-1.2,6.2-1.8,10-1.8c2,0,3.9,0.2,5.8,0.7c1.8,0.5,3.5,1.2,5,2.1H398.5z M363.8,245.6c2,0,3.8-0.2,5.4-0.7
|
||||
c1.6-0.5,3-1.2,4.2-2.1c1.2-0.9,2.1-1.9,2.7-3.1c0.6-1.2,1-2.5,1-3.9c0-0.5,0-1-0.1-1.5c-0.1-0.5-0.1-0.9-0.2-1.4
|
||||
c-4.2-0.7-7.7-1-10.7-0.9c-3,0.1-5.4,0.5-7.3,1.1c-1.9,0.6-3.3,1.5-4.1,2.5c-0.9,1.1-1.3,2.2-1.3,3.4c0,2.1,0.9,3.7,2.6,4.8
|
||||
C357.6,245.1,360.2,245.6,363.8,245.6z M368.5,210.1c1.6,0,3-0.4,4.2-1.1c1.2-0.7,2.2-1.7,3-2.9c0.8-1.2,1.5-2.6,1.9-4.1
|
||||
c0.4-1.5,0.7-3,0.7-4.6c0-2.6-0.6-4.7-1.9-6.1c-1.3-1.4-3.1-2.1-5.4-2.1c-1.6,0-3,0.3-4.2,1c-1.2,0.7-2.2,1.6-3,2.8
|
||||
c-0.8,1.2-1.4,2.5-1.8,4c-0.4,1.5-0.6,3-0.6,4.6c0,2.7,0.6,4.8,1.9,6.3C364.4,209.4,366.2,210.1,368.5,210.1z"/>
|
||||
<path class="st1" d="M419.6,181.2l-6.5,54.4h-12.9l6.5-54.4H419.6z M422.9,165.4c0,1.1-0.2,2.2-0.7,3.2c-0.5,1-1.1,1.9-1.9,2.6
|
||||
c-0.8,0.7-1.7,1.3-2.7,1.8c-1,0.4-2,0.7-3.1,0.7c-1,0-2-0.2-3-0.7c-1-0.4-1.8-1-2.5-1.8c-0.7-0.7-1.3-1.6-1.8-2.6
|
||||
c-0.4-1-0.7-2-0.7-3.2c0-1.1,0.2-2.2,0.7-3.2c0.5-1,1.1-1.9,1.8-2.7c0.7-0.8,1.6-1.4,2.6-1.8c1-0.4,2-0.7,3-0.7
|
||||
c1.1,0,2.1,0.2,3.1,0.7c1,0.4,1.9,1,2.6,1.8c0.8,0.7,1.4,1.6,1.8,2.7C422.7,163.1,422.9,164.2,422.9,165.4z"/>
|
||||
<path class="st1" d="M425.8,235.6l9.5-78.8h12.9l-9.6,78.8H425.8z"/>
|
||||
<path class="st1" d="M470.9,181.2l-6.5,54.4h-12.9l6.5-54.4H470.9z M474.2,165.4c0,1.1-0.2,2.2-0.7,3.2c-0.5,1-1.1,1.9-1.9,2.6
|
||||
c-0.8,0.7-1.7,1.3-2.7,1.8c-1,0.4-2,0.7-3.1,0.7c-1,0-2-0.2-3-0.7c-1-0.4-1.8-1-2.5-1.8c-0.7-0.7-1.3-1.6-1.8-2.6
|
||||
c-0.4-1-0.7-2-0.7-3.2c0-1.1,0.2-2.2,0.7-3.2c0.5-1,1.1-1.9,1.8-2.7c0.7-0.8,1.6-1.4,2.6-1.8c1-0.4,2-0.7,3-0.7
|
||||
c1.1,0,2.1,0.2,3.1,0.7c1,0.4,1.9,1,2.6,1.8c0.8,0.7,1.4,1.6,1.8,2.7C474,163.1,474.2,164.2,474.2,165.4z"/>
|
||||
<path class="st1" d="M481.5,224.5c0-0.2,0-0.5,0-0.9c0-0.3,0-0.8,0.1-1.5c0.1-0.7,0.1-1.5,0.3-2.6c0.1-1.1,0.3-2.5,0.5-4.2l3-24.4
|
||||
h-5.1c-0.6,0-1.2-0.2-1.6-0.7c-0.4-0.5-0.5-1.1-0.4-2.1l0.6-5.2l8.3-1.4l4.3-14.8c0.2-0.7,0.6-1.3,1.1-1.6
|
||||
c0.5-0.4,1.1-0.6,1.9-0.6h7l-2.1,17.1h13.1l-1.1,9.3h-13.2l-2.9,23.7c-0.2,1.4-0.3,2.6-0.4,3.4c-0.1,0.8-0.2,1.5-0.2,2
|
||||
c-0.1,0.5-0.1,0.8-0.1,1c0,0.2,0,0.3,0,0.4c0,1.3,0.3,2.4,1,3.2c0.7,0.8,1.6,1.2,2.8,1.2c0.7,0,1.4-0.1,1.9-0.3
|
||||
c0.5-0.2,1-0.4,1.4-0.6c0.4-0.2,0.7-0.4,1.1-0.6c0.3-0.2,0.6-0.3,0.9-0.3c0.4,0,0.7,0.1,0.9,0.3c0.2,0.2,0.4,0.5,0.6,0.9l2.8,6.4
|
||||
c-1.9,1.6-4.1,2.8-6.4,3.6c-2.4,0.8-4.7,1.2-7.2,1.2c-3.9,0-6.9-1-9.1-3.1C482.8,231.3,481.6,228.3,481.5,224.5z"/>
|
||||
<path class="st1" d="M568.3,181.2l-35.9,69.5c-0.5,0.9-1.1,1.6-1.7,2c-0.7,0.4-1.5,0.7-2.5,0.7h-9.7l12.1-21.9l-13.7-50.2h11
|
||||
c1,0,1.7,0.2,2.1,0.7c0.5,0.5,0.8,1.1,1,1.7l6.7,28.2c0.4,1.8,0.6,3.6,0.8,5.4c0.4-0.9,0.8-1.8,1.2-2.7c0.4-0.9,0.8-1.8,1.2-2.7
|
||||
l13.4-28.2c0.4-0.7,0.9-1.3,1.5-1.7c0.7-0.4,1.4-0.7,2.1-0.7H568.3z"/>
|
||||
</g>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 8.5 KiB |
|
|
@ -187,8 +187,21 @@ class UsersController extends SugarController
|
|||
$_POST['default_locale_name_format'], 0, 'global');
|
||||
}
|
||||
|
||||
$next = $_POST['whatnext'] ?? '';
|
||||
|
||||
$base = 'index.php?action=index&module=Home';
|
||||
$nextActions = [
|
||||
'users' => 'index.php?action=index&module=Users' ,
|
||||
'finish' => 'index.php?action=index&module=Home',
|
||||
'settings' => 'index.php?action=index&module=Administration',
|
||||
'studio' => 'index.php?action=index&module=ModuleBuilder?type=studio',
|
||||
'import' => 'index.php?module=Import&action=step1&import_module=Administration',
|
||||
];
|
||||
|
||||
$returnUrl = $nextActions[$next] ?? $base;
|
||||
|
||||
// redirect to home
|
||||
SugarApplication::redirect('index.php?action=index&module=Home');
|
||||
SugarApplication::redirect($returnUrl);
|
||||
|
||||
}
|
||||
|
||||
|
|
@ -214,4 +227,4 @@ class UsersController extends SugarController
|
|||
SugarApplication::redirect("index.php?module=Home&action=index");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -80,6 +80,7 @@
|
|||
<div class="col panel">
|
||||
<h1>{$MOD.LBL_WIZARD_WELCOME_TITLE}</h1>
|
||||
<div class="open-crm-txt"> Open Source CRM For The World </div>
|
||||
<div class="wizard-mainlbl">Maintained by <img src=include/images/sa_logo.svg style="height:60px;"></div>
|
||||
<div class="wizard-lbl">{$MOD.LBL_WIZARD_WELCOME_NOSMTP}</div>
|
||||
<div class="wizard-btn">
|
||||
<input title="{$MOD.LBL_WIZARD_NEXT_BUTTON}"
|
||||
|
|
|
|||
|
|
@ -91,6 +91,7 @@
|
|||
background: rgba(255,255,255,0.7);
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
width: 50%;
|
||||
@media (max-width: 750px) {
|
||||
background: transparent;
|
||||
box-shadow: none;
|
||||
|
|
@ -108,8 +109,12 @@
|
|||
text-transform: uppercase;
|
||||
border-bottom: 1px solid #958383;
|
||||
}
|
||||
.wizard-mainlbl {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
}
|
||||
.wizard-lbl {
|
||||
margin-top: 0.8em;
|
||||
margin-bottom: 0.5em;
|
||||
padding: 0.1em;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue
