Commit c45fe56521b6ed5fcd670442d50c8acca1d1b236
Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge
Showing
3 changed files
with
12 additions
and
10 deletions
plugins/multiselect/templates/manage_field.smarty
| ... | ... | @@ -60,7 +60,7 @@ available.{/i18n}</p> |
| 60 | 60 | <p class="descriptiveText">{i18n}Different fields have different actions and options |
| 61 | 61 | available.{/i18n}</p> |
| 62 | 62 | |
| 63 | -<form method="POST" action="admin.php?kt_path_info=documents/fieldmanagement2&fieldset_action=updatelargetextoptions&fFieldId={$field_id}&fFieldsetId={$field->getParentFieldsetId()}&action=edit"> | |
| 63 | +<form method="POST" action="{$rootUrl}/admin.php?kt_path_info=documents/ratpfieldset&fieldset_action=updatelargetextoptions&fFieldId={$field_id}&fFieldsetId={$field->getParentFieldsetId()}&action=edit"> | |
| 64 | 64 | |
| 65 | 65 | <div class="field"> |
| 66 | 66 | <label for="largefield[size]">Max Length</label> | ... | ... |
setup/migrate/steps/migrateInstallation.php
| ... | ... | @@ -97,7 +97,7 @@ class migrateInstallation extends step |
| 97 | 97 | |
| 98 | 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 | 103 | * Installation Settings |
| ... | ... | @@ -257,13 +257,14 @@ class migrateInstallation extends step |
| 257 | 257 | $this->ktSettings = array('fileSystemRoot'=> $froot, |
| 258 | 258 | ); |
| 259 | 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 | 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 | 269 | $this->temp_variables['urlPaths'] = $this->urlPaths; |
| 269 | 270 | $this->temp_variables['ktSettings'] = $this->ktSettings; | ... | ... |
templates/ktcore/forms/widgets/textarea.smarty
| ... | ... | @@ -7,7 +7,7 @@ Paragraph and break tags. |
| 7 | 7 | --> |
| 8 | 8 | {if $options.field->getIsHTML()} |
| 9 | 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 | 11 | <script type="text/javascript"> |
| 12 | 12 | tinyMCE.init({ |
| 13 | 13 | // General options |
| ... | ... | @@ -21,6 +21,7 @@ plugins : "safari,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,a |
| 21 | 21 | // Theme options |
| 22 | 22 | theme_advanced_buttons1 : "bold,italic,underline,|,forecolor,backcolor,|,bullist,numlist,|,link,unlink,anchor,|,pagebreak,|,insertdate,inserttime,preview,help", |
| 23 | 23 | theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,undo,redo,|,cleanup,removeformat,print,fullscreen,spellchecker", |
| 24 | +theme_advanced_buttons3 : "", | |
| 24 | 25 | theme_advanced_toolbar_location : "top", |
| 25 | 26 | theme_advanced_toolbar_align : "left", |
| 26 | 27 | theme_advanced_statusbar_location : "bottom", |
| ... | ... | @@ -49,4 +50,4 @@ staffid : "991234" |
| 49 | 50 | {if $has_id} id="{$id}"{/if} |
| 50 | 51 | {if $options.rows} rows="{$options.rows}"{else} rows="7"{/if} |
| 51 | 52 | {if $options.cols} cols="{$options.cols}"{else} cols="45"{/if} |
| 52 | - >{if $has_value}{$value|sanitize_input}{/if}</textarea> | |
| 53 | 53 | \ No newline at end of file |
| 54 | + >{if $has_value}{$value|sanitize_input}{/if}</textarea> | ... | ... |