Merge branch 'edge' of git@github.com:ktgit/knowledgetree into edge

Megan Watson
2 parents 8f5c58fd 64d55e87
Showing 3 changed files with 12 additions and 10 deletions
plugins/multiselect/templates/manage_field.smarty
setup/migrate/steps/migrateInstallation.php
templates/ktcore/forms/widgets/textarea.smarty
@@ -60,7 +60,7 @@ available.{/i18n}&lt;/p&gt;
 <p class="descriptiveText">{i18n}Different fields have different actions and options
 available.{/i18n}</p>
-<form method="POST" action="admin.php?kt_path_info=documents/fieldmanagement2&fieldset_action=updatelargetextoptions&fFieldId={$field_id}&fFieldsetId={$field->getParentFieldsetId()}&action=edit">
+<form method="POST" action="{$rootUrl}/admin.php?kt_path_info=documents/ratpfieldset&fieldset_action=updatelargetextoptions&fFieldId={$field_id}&fFieldsetId={$field->getParentFieldsetId()}&action=edit">
 <div class="field">
 <label for="largefield[size]">Max Length</label>
@@ -97,7 +97,7 @@ class migrateInstallation extends step
 	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");
-	private $knownUnixLocations = array("/opt/ktdms","/var/www/ktdms");
+	private $knownUnixLocations = array("/opt/ktdms"=>"/opt/ktdms/knowledgeTree/config/config-path","/var/www/ktdms"=>"/var/www/ktdms/knowledgeTree/config/config-path");
 	/**
 	* Installation Settings
@@ -257,13 +257,14 @@ class migrateInstallation extends step
 		$this->ktSettings = array('fileSystemRoot'=> $froot,
     	);
     	$urlPaths = $ini->getSection('urls');
-		$this->urlPaths = array(array('name'=> 'Var Directory', 'path'=> $froot.DS.'var'),
-									array('name'=> 'Log Directory', 'path'=> $froot.DS.'log'),
-									array('name'=> 'Document Root', 'path'=> $froot.DS.'Documents'),
+    	$varFolder = $froot.DS.'var';
+		$this->urlPaths = array(array('name'=> 'Var Directory', 'path'=> $varFolder),
+									array('name'=> 'Log Directory', 'path'=> $varFolder.DS.'log'),
+									array('name'=> 'Document Root', 'path'=> $varFolder.DS.'Documents'),
 									array('name'=> 'UI Directory', 'path'=> $froot.DS.'presentation'.DS.'lookAndFeel'.DS.'knowledgeTree'),
-									array('name'=> 'Temporary Directory', 'path'=> $froot.DS.'tmp'),
-									array('name'=> 'Cache Directory', 'path'=> $froot.DS.'cache'),
-									array('name'=> 'Upload Directory', 'path'=> $froot.DS.'uploads'),
+									array('name'=> 'Temporary Directory', 'path'=> $varFolder.DS.'tmp'),
+									array('name'=> 'Cache Directory', 'path'=> $varFolder.DS.'cache'),
+									array('name'=> 'Upload Directory', 'path'=> $varFolder.DS.'uploads'),
     	);
     	$this->temp_variables['urlPaths'] = $this->urlPaths;
     	$this->temp_variables['ktSettings'] = $this->ktSettings;
@@ -7,7 +7,7 @@ Paragraph and break tags.
     -->
 {if $options.field->getIsHTML()}
 {literal}
-<script type="text/javascript" src="/thirdpartyjs/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
+<script type="text/javascript" src="thirdpartyjs/tinymce/jscripts/tiny_mce/tiny_mce.js"></script>
 <script type="text/javascript"> 
 tinyMCE.init({ 
 // General options 
@@ -21,6 +21,7 @@ plugins : &quot;safari,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,a
 // Theme options 
 theme_advanced_buttons1 : "bold,italic,underline,|,forecolor,backcolor,|,bullist,numlist,|,link,unlink,anchor,|,pagebreak,|,insertdate,inserttime,preview,help", 
 theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,undo,redo,|,cleanup,removeformat,print,fullscreen,spellchecker", 
+theme_advanced_buttons3 : "",
 theme_advanced_toolbar_location : "top", 
 theme_advanced_toolbar_align : "left", 
 theme_advanced_statusbar_location : "bottom", 
@@ -49,4 +50,4 @@ staffid : &quot;991234&quot;
         {if $has_id} id="{$id}"{/if}
         {if $options.rows} rows="{$options.rows}"{else} rows="7"{/if}
         {if $options.cols} cols="{$options.cols}"{else} cols="45"{/if}
-    >{if $has_value}{$value|sanitize_input}{/if}</textarea>
 \ No newline at end of file
+    >{if $has_value}{$value|sanitize_input}{/if}</textarea>