Commit 4719e796f6f863cb98191ad40a901ac3349f54e2
1 parent
a3269ed3
Story Id:1166869 Daily Commit
Committed by: Jarrett Jordaan Reviewed by: Megan Watson
Showing
2 changed files
with
10 additions
and
9 deletions
setup/migrate/steps/migrateInstallation.php
| @@ -97,7 +97,7 @@ class migrateInstallation extends step | @@ -97,7 +97,7 @@ class migrateInstallation extends step | ||
| 97 | 97 | ||
| 98 | private $knownWindowsLocations = array("C:\Program Files\ktdms"=>"C:\Program Files\ktdms\knowledgeTree\config\config-path","C:\Program Files x86\ktdms"=>"C:\Program Files x86\ktdms\knowledgeTree\config\config-path","C:\ktdms"=>"C:\ktdms\knowledgeTree\config\config-path"); | 98 | private $knownWindowsLocations = array("C:\Program Files\ktdms"=>"C:\Program Files\ktdms\knowledgeTree\config\config-path","C:\Program Files x86\ktdms"=>"C:\Program Files x86\ktdms\knowledgeTree\config\config-path","C:\ktdms"=>"C:\ktdms\knowledgeTree\config\config-path"); |
| 99 | 99 | ||
| 100 | - private $knownUnixLocations = array("/opt/ktdms","/var/www/ktdms"); | 100 | + private $knownUnixLocations = array("/opt/ktdms"=>"/opt/ktdms/knowledgeTree/config/config-path","/var/www/ktdms"=>"/var/www/ktdms/knowledgeTree/config/config-path"); |
| 101 | 101 | ||
| 102 | /** | 102 | /** |
| 103 | * Installation Settings | 103 | * Installation Settings |
| @@ -257,13 +257,14 @@ class migrateInstallation extends step | @@ -257,13 +257,14 @@ class migrateInstallation extends step | ||
| 257 | $this->ktSettings = array('fileSystemRoot'=> $froot, | 257 | $this->ktSettings = array('fileSystemRoot'=> $froot, |
| 258 | ); | 258 | ); |
| 259 | $urlPaths = $ini->getSection('urls'); | 259 | $urlPaths = $ini->getSection('urls'); |
| 260 | - $this->urlPaths = array(array('name'=> 'Var Directory', 'path'=> $froot.DS.'var'), | ||
| 261 | - array('name'=> 'Log Directory', 'path'=> $froot.DS.'log'), | ||
| 262 | - array('name'=> 'Document Root', 'path'=> $froot.DS.'Documents'), | 260 | + $varFolder = $froot.DS.'var'; |
| 261 | + $this->urlPaths = array(array('name'=> 'Var Directory', 'path'=> $varFolder), | ||
| 262 | + array('name'=> 'Log Directory', 'path'=> $varFolder.DS.'log'), | ||
| 263 | + array('name'=> 'Document Root', 'path'=> $varFolder.DS.'Documents'), | ||
| 263 | array('name'=> 'UI Directory', 'path'=> $froot.DS.'presentation'.DS.'lookAndFeel'.DS.'knowledgeTree'), | 264 | array('name'=> 'UI Directory', 'path'=> $froot.DS.'presentation'.DS.'lookAndFeel'.DS.'knowledgeTree'), |
| 264 | - array('name'=> 'Temporary Directory', 'path'=> $froot.DS.'tmp'), | ||
| 265 | - array('name'=> 'Cache Directory', 'path'=> $froot.DS.'cache'), | ||
| 266 | - array('name'=> 'Upload Directory', 'path'=> $froot.DS.'uploads'), | 265 | + array('name'=> 'Temporary Directory', 'path'=> $varFolder.DS.'tmp'), |
| 266 | + array('name'=> 'Cache Directory', 'path'=> $varFolder.DS.'cache'), | ||
| 267 | + array('name'=> 'Upload Directory', 'path'=> $varFolder.DS.'uploads'), | ||
| 267 | ); | 268 | ); |
| 268 | $this->temp_variables['urlPaths'] = $this->urlPaths; | 269 | $this->temp_variables['urlPaths'] = $this->urlPaths; |
| 269 | $this->temp_variables['ktSettings'] = $this->ktSettings; | 270 | $this->temp_variables['ktSettings'] = $this->ktSettings; |
templates/ktcore/forms/widgets/textarea.smarty
| @@ -7,7 +7,7 @@ Paragraph and break tags. | @@ -7,7 +7,7 @@ Paragraph and break tags. | ||
| 7 | --> | 7 | --> |
| 8 | {if $options.field->getIsHTML()} | 8 | {if $options.field->getIsHTML()} |
| 9 | {literal} | 9 | {literal} |
| 10 | -<script type="text/javascript" src="/thirdpartyjs/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> | 10 | +<script type="text/javascript" src="thirdpartyjs/tinymce/jscripts/tiny_mce/tiny_mce.js"></script> |
| 11 | <script type="text/javascript"> | 11 | <script type="text/javascript"> |
| 12 | tinyMCE.init({ | 12 | tinyMCE.init({ |
| 13 | // General options | 13 | // General options |
| @@ -50,4 +50,4 @@ staffid : "991234" | @@ -50,4 +50,4 @@ staffid : "991234" | ||
| 50 | {if $has_id} id="{$id}"{/if} | 50 | {if $has_id} id="{$id}"{/if} |
| 51 | {if $options.rows} rows="{$options.rows}"{else} rows="7"{/if} | 51 | {if $options.rows} rows="{$options.rows}"{else} rows="7"{/if} |
| 52 | {if $options.cols} cols="{$options.cols}"{else} cols="45"{/if} | 52 | {if $options.cols} cols="{$options.cols}"{else} cols="45"{/if} |
| 53 | - >{if $has_value}{$value|sanitize_input}{/if}</textarea> | ||
| 54 | \ No newline at end of file | 53 | \ No newline at end of file |
| 54 | + >{if $has_value}{$value|sanitize_input}{/if}</textarea> |