Peter M. Groen / knowledgetree

Commit 5da7ce3b86713d0e6871e6c0439a424a27d5a397

Authored by Jarrett Jordaan
1 parent 14cb5c06

PT:2492070 : First Login wizard updated. 

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
Inline Side-by-side
Showing 5 changed files with 12 additions and 5 deletions
setup/firstlogin/stepAction.php
  View file @5da7ce3
... ... @@ -84,6 +84,12 @@ class stepAction extends stepActionBase {
84 84 $vars['left'] = $left; // Set left menu
85 85 $vars['fl_version'] = $this->properties['fl_version']; // Set version
86 86 $vars['fl_type'] = $this->properties['fl_type']; // Set type
  87 + if (KTPluginUtil::pluginIsActive('fs.FolderTemplatesPlugin.plugin')) { // Check if folder templates plugin is active
  88 + $oRegistry =& KTPluginRegistry::getSingleton();
  89 + $oPlugin =& $oRegistry->getPlugin('fs.FolderTemplatesPlugin.plugin'); // Get a handle on the plugin
  90 + $ft_dir = $oPlugin->getDirs();
  91 + }
  92 + $vars['ft_handle'] = $ft_dir; // Set type
87 93 return $vars;
88 94 }
89 95  
... ...
setup/firstlogin/steps/firstloginTemplates.php
  View file @5da7ce3
... ... @@ -68,7 +68,8 @@ class firstloginTemplates extends Step {
68 68 function doStep() {
69 69 $this->temp_variables = array(
70 70 "step_name"=>"templates",
71   - "silent"=>$this->silent);
  71 + "silent"=>$this->silent,
  72 + );
72 73 if(!$this->inStep("templates")) { // Landing
73 74 $this->doRun(); // Set folder structure templates
74 75 return 'landing';
... ...
setup/firstlogin/templates/wizard.tpl
  View file @5da7ce3
... ... @@ -49,5 +49,5 @@
49 49 </body>
50 50 </html>
51 51 <script>
52   - var fl = new firstlogin('<?php echo WIZARD_ROOTURL; ?>');
  52 + var fl = new firstlogin('<?php echo WIZARD_ROOTURL; ?>', '<?php echo $vars['ft_handle']; ?>');
53 53 </script>
54 54 \ No newline at end of file
... ...
setup/wizard/config/databases.xml
  View file @5da7ce3
... ... @@ -17,6 +17,6 @@
17 17 <duname>root</duname>
18 18 <dmsadminuser>ktcomadmin</dmsadminuser>
19 19 <dmsaupass>js9281djw</dmsaupass>
20   - <dmsuser>ktcom-dms</dmsuser>
  20 + <dmsuser>ktcomdms</dmsuser>
21 21 <dmsupass>djw9281js</dmsupass>
22 22 </database>
... ...
setup/wizard/resources/js/firstlogin.js
  View file @5da7ce3
... ... @@ -7,9 +7,9 @@ $(function() { // Document is ready
7 7 });
8 8  
9 9 // Class First Login
10   -function firstlogin(rootUrl) {
  10 +function firstlogin(rootUrl, pluginHandle) {
11 11 this.rootUrl = rootUrl;
12   - this.ktfolderAccess = rootUrl + "plugins/commercial/folder-templates/KTFolderTemplates.php?action=";
  12 + this.ktfolderAccess = rootUrl + pluginHandle + "?action=";
13 13 this.ktmanageFolderAccess = rootUrl + "admin.php?kt_path_info=misc/adminfoldertemplatesmanagement&action=";
14 14 this.ajaxOn = false;
15 15 }
... ...