diff --git a/plugins/ktcore/document/edit.php b/plugins/ktcore/document/edit.php index 06567e8..1cdd8a7 100755 --- a/plugins/ktcore/document/edit.php +++ b/plugins/ktcore/document/edit.php @@ -216,6 +216,31 @@ class KTDocumentEditAction extends KTDocumentAction { $values = (array) KTUtil::arrayGet($data, 'fieldset_' . $oFieldset->getId()); foreach ($fields as $oField) { $val = KTUtil::arrayGet($values, 'metadata_' . $oField->getId()); + + // for html fields we want to do some stripping :) + if ($oField->getIsHTML()) + { + // NOTE this works great...once the text is saved a first time + // but the first time the \ No newline at end of file + +js('form.js'); } ?> \ No newline at end of file diff --git a/setup/migrate/templates/installation.tpl b/setup/migrate/templates/installation.tpl index 9057d63..9704855 100644 --- a/setup/migrate/templates/installation.tpl +++ b/setup/migrate/templates/installation.tpl @@ -46,4 +46,5 @@ \ No newline at end of file + +js('form.js'); } ?> \ No newline at end of file diff --git a/setup/migrate/templates/installation_confirm.tpl b/setup/migrate/templates/installation_confirm.tpl index 427cc74..75ef017 100644 --- a/setup/migrate/templates/installation_confirm.tpl +++ b/setup/migrate/templates/installation_confirm.tpl @@ -71,4 +71,4 @@ - \ No newline at end of file +js('form.js'); } ?> \ No newline at end of file diff --git a/setup/migrate/templates/services.tpl b/setup/migrate/templates/services.tpl index f28082c..1ebdaf6 100644 --- a/setup/migrate/templates/services.tpl +++ b/setup/migrate/templates/services.tpl @@ -79,4 +79,5 @@ - \ No newline at end of file + +js('form.js'); } ?> \ No newline at end of file diff --git a/setup/wizard/installUtil.php b/setup/wizard/installUtil.php index 12c53f5..3b12bf1 100644 --- a/setup/wizard/installUtil.php +++ b/setup/wizard/installUtil.php @@ -66,21 +66,6 @@ class InstallUtil { return false; } - /** - * Check if system needs to be migrated - * - * @author KnowledgeTree Team - * @access public - * @param none - * @return boolean - */ - public function isMigration() { - if (isset($_POST['Migrate'])) { - return true; - } - return false; - } - public function error($error) { $template_vars['error'] = $error; $file = "templates/error.tpl"; @@ -518,6 +503,42 @@ class InstallUtil { } /** + * Check if system needs to be migrated + * + * @author KnowledgeTree Team + * @access public + * @param none + * @return boolean + */ + public function migrationSpecified() { + if(isset($_POST['installtype'])) { + if($_POST['installtype'] == "Upgrade Installation") { + return true; + } + } + + return false; + } + + /** + * Check if system needs to be migrated + * + * @author KnowledgeTree Team + * @access public + * @param none + * @return boolean + */ + public function upgradeSpecified() { + if(isset($_POST['installtype'])) { + if($_POST['installtype'] == "Upgrade Only") { + return true; + } + } + + return false; + } + + /** * Get session data from package * * @author KnowledgeTree Team @@ -644,7 +665,30 @@ class InstallUtil { return ''; } + /** + * Deletes migration lock file if a clean install is chosen + * This is in case someone changes their mind after choosing upgrade/migrate and clicks back up to this step + * + * @author KnowledgeTree Team + * @access private + * @return void + */ + function deleteMigrateFile() { + if(file_exists("migrate.lock")) + @unlink("migrate.lock"); + } + /** + * Check if we are migrating an existing installation + * + * @return unknown + */ + function isMigration() { + if(file_exists("migrate.lock")) + return true; + return false; + } + /** * Portably execute a command on any of the supported platforms. * diff --git a/setup/wizard/installWizard.php b/setup/wizard/installWizard.php index 4448233..785c889 100644 --- a/setup/wizard/installWizard.php +++ b/setup/wizard/installWizard.php @@ -116,18 +116,6 @@ class InstallWizard { } /** - * Check if system has to be migrated - * - * @author KnowledgeTree Team - * @access private - * @param none - * @return boolean - */ - private function isMigration() { - return $this->util->isMigration(); - } - - /** * Display the wizard * * @author KnowledgeTree Team @@ -295,8 +283,10 @@ class InstallWizard { $this->createInstallFile(); } if(!$this->isSystemInstalled()) { // Check if the systems not installed - if($this->isMigration()) { // Check if the migrator needs to be accessed + if($this->util->migrationSpecified()) { // Check if the migrator needs to be accessed $this->util->redirect('../migrate'); + } elseif ($this->util->upgradeSpecified()) { + $this->util->redirect('../upgrade'); } $response = $this->systemChecks(); if($response === true) { diff --git a/setup/wizard/installer.php b/setup/wizard/installer.php index 80d2237..60460b8 100644 --- a/setup/wizard/installer.php +++ b/setup/wizard/installer.php @@ -414,8 +414,6 @@ class Installer { */ private function _completeInstall() { @touch("install.lock"); - if(file_exists("migrate.lock")) - @unlink("migrate.lock"); } /** diff --git a/setup/wizard/lib/services/unixLucene.php b/setup/wizard/lib/services/unixLucene.php index a296c95..ff574e1 100644 --- a/setup/wizard/lib/services/unixLucene.php +++ b/setup/wizard/lib/services/unixLucene.php @@ -59,7 +59,7 @@ class unixLucene extends unixService { * @param string * @return void */ - public function load() { + public function load($options = null) { $this->setLuceneSource("ktlucene.jar"); $this->setLuceneDir(SYSTEM_DIR."bin".DS."luceneserver".DS); $this->setIndexerDir(SYSTEM_DIR."search2".DS."indexing".DS."bin".DS); diff --git a/setup/wizard/lib/services/unixOpenOffice.php b/setup/wizard/lib/services/unixOpenOffice.php index 42ba871..06098db 100644 --- a/setup/wizard/lib/services/unixOpenOffice.php +++ b/setup/wizard/lib/services/unixOpenOffice.php @@ -63,7 +63,7 @@ class unixOpenOffice extends unixService { * @param string * @return void */ - public function load() { + public function load($options = null) { $this->setPort("8100"); $this->setHost("localhost"); $this->soffice = $this->util->getOpenOffice(); diff --git a/setup/wizard/lib/services/unixScheduler.php b/setup/wizard/lib/services/unixScheduler.php index 47facc4..31bb884 100644 --- a/setup/wizard/lib/services/unixScheduler.php +++ b/setup/wizard/lib/services/unixScheduler.php @@ -57,7 +57,7 @@ class unixScheduler extends unixService { * @param string * @return void */ - public function load() { + public function load($options = null) { $this->setPhpCli(); $this->scheduler = 'scheduler'; $this->setSchedulerSource('schedulerTask.sh'); diff --git a/setup/wizard/lib/services/windowsLucene.php b/setup/wizard/lib/services/windowsLucene.php index 0ed2d1d..ff7a231 100644 --- a/setup/wizard/lib/services/windowsLucene.php +++ b/setup/wizard/lib/services/windowsLucene.php @@ -140,7 +140,7 @@ class windowsLucene extends windowsService { * @param string * @return void */ - public function load() { + public function load($options = null) { $this->setJavaBin(); $this->setLuceneDIR(SYSTEM_DIR."bin".DS."luceneserver"); $this->setLuceneExe("KTLuceneService.exe"); diff --git a/setup/wizard/lib/services/windowsOpenOffice.php b/setup/wizard/lib/services/windowsOpenOffice.php index b332ee2..082b921 100644 --- a/setup/wizard/lib/services/windowsOpenOffice.php +++ b/setup/wizard/lib/services/windowsOpenOffice.php @@ -140,8 +140,10 @@ class windowsOpenOffice extends windowsService { * @param string * @return void */ - public function load() { - // hack for testing + public function load($options = null) { + if(isset($options['binary'])) { + $this->setBin($options['binary']); + } $this->setPort("8100"); $this->setHost("127.0.0.1"); $this->setLog("openoffice.log"); @@ -173,7 +175,7 @@ class windowsOpenOffice extends windowsService { } private function setBin($bin) { - $this->bin = "\"".$bin."\""; + $this->bin = $bin; } public function getBin() { @@ -198,15 +200,18 @@ class windowsOpenOffice extends windowsService { public function install() { $status = $this->status(); if($status == '') { - $services = $this->util->getDataFromSession('services'); - $this->setBin($services['openOfficeExe']); - $cmd = "\"{$this->winservice}\" install $this->name "."-displayname {$this->name} -start auto {$this->getBin()} -headless -invisible -accept=socket,host={$this->host},port={$this->port};urp;";; - if(DEBUG) { - echo "Command : $cmd
"; - return ; - } - $response = $this->util->pexec($cmd); - return $response; + //$binary = $this->util->openOfficeSpecified(); + $binary = $this->getBin(); + if($binary != '') { + $cmd = "\"{$this->winservice}\" install $this->name "."-displayname {$this->name} -start auto \"".$binary."\" -headless -invisible -accept=socket,host={$this->host},port={$this->port};urp;";; + if(DEBUG) { + echo "Command : $cmd
"; + return ; + } + $response = $this->util->pexec($cmd); + return $response; + } + return $status; } else { return $status; diff --git a/setup/wizard/lib/services/windowsScheduler.php b/setup/wizard/lib/services/windowsScheduler.php index 59a6de6..775ecd4 100644 --- a/setup/wizard/lib/services/windowsScheduler.php +++ b/setup/wizard/lib/services/windowsScheduler.php @@ -85,7 +85,7 @@ class windowsScheduler extends windowsService { * @param string * @return void */ - function load() { + function load($options = null) { $this->setSchedulerDIR($this->varDir."bin"); $this->setSchedulerScriptPath("taskrunner.bat"); $this->setSchedulerSource("schedulerService.php"); diff --git a/setup/wizard/lib/validation/openofficeValidation.php b/setup/wizard/lib/validation/openofficeValidation.php index 47b6335..3e16a76 100644 --- a/setup/wizard/lib/validation/openofficeValidation.php +++ b/setup/wizard/lib/validation/openofficeValidation.php @@ -63,8 +63,7 @@ class openofficeValidation extends serviceValidation { */ private $unixLocations = array("/usr/local/bin", "/usr/bin"); - - public function preset() { + public function preset($options = null) { $this->specifyOpenOffice(); } @@ -91,15 +90,15 @@ class openofficeValidation extends serviceValidation { public function binaryChecks() { if($this->util->openOfficeSpecified()) { $this->soffice = $this->util->openOfficeSpecified(); - if(file_exists($this->soffice)) - return true; + if(file_exists($this->soffice)) + return $this->soffice; else return false; } else { $auto = $this->detectOpenOffice(); if($auto) { $this->soffice = $auto; - return true; + return $this->soffice; } return false; } diff --git a/setup/wizard/resources/css/wizard.css b/setup/wizard/resources/css/wizard.css index 9cc0130..f3d9fff 100644 --- a/setup/wizard/resources/css/wizard.css +++ b/setup/wizard/resources/css/wizard.css @@ -102,13 +102,13 @@ select { border: 1px solid rgb(207, 207, 207); padding: 5px; overflow: auto; - height: 400px; + min-height: 400px; } #step_content_dependencies { border: 1px solid rgb(207, 207, 207); padding: 5px; - min-height:265px; + min-height:285px; } #step_content_configuration { @@ -323,6 +323,12 @@ select { margin-top:10px; } +.button_radio_next { + float:none; + margin-left:0px; + margin-top:0px; +} + .buttons a { background: #DDDDDD; border: solid 1px #888; @@ -533,4 +539,10 @@ td.dir_description { position:relative; height:0px; width:0px; +} + +#install_options { + position:relative; + padding-left: 400px; + padding-top: 10px; } \ No newline at end of file diff --git a/setup/wizard/resources/js/wizard.js b/setup/wizard/resources/js/wizard.js index f4fe334..c7bf49e 100644 --- a/setup/wizard/resources/js/wizard.js +++ b/setup/wizard/resources/js/wizard.js @@ -218,17 +218,11 @@ wizard.prototype.sendRegistration = function () { } wizard.prototype.clearSessions = function () { - // var address = 'session.php?action=destroyAll'; // $.ajax({ // url: address, // dataType: "html", // type: "POST", // cache: false, -// }); +// }); } \ No newline at end of file diff --git a/setup/wizard/step.php b/setup/wizard/step.php index 321493b..046f5bb 100644 --- a/setup/wizard/step.php +++ b/setup/wizard/step.php @@ -295,10 +295,12 @@ class Step * @return boolean */ function migrate() { - if(isset($_POST['Migrate'])) { - return true; - } - + if(isset($_POST['installtype'])) { + if($_POST['installtype'] == "Upgrade Installation") { + return true; + } + } + return false; } diff --git a/setup/wizard/steps/complete.php b/setup/wizard/steps/complete.php index 6405e29..64134bb 100644 --- a/setup/wizard/steps/complete.php +++ b/setup/wizard/steps/complete.php @@ -52,6 +52,7 @@ class complete extends Step { private $paths_check = 'tick'; private $privileges_check = 'tick'; private $database_check = 'tick'; + private $migrate_check = false; protected $silent = true; function doStep() { @@ -61,14 +62,11 @@ class complete extends Step { } function doRun() { - // check filesystem (including location of document directory and logging) - $this->checkFileSystem(); - // check database - $this->checkDb(); - // check services - $this->checkServices(); + $this->checkFileSystem(); // check filesystem (including location of document directory and logging) + $this->checkDb(); // check database + $this->checkServices(); // check services + $this->checkInstallType();// Set silent mode variables $this->storeSilent();// Set silent mode variables - } private function checkFileSystem() @@ -219,6 +217,14 @@ class complete extends Step { return true; } + function checkInstallType() { + if ($this->util->isMigration()) { + $this->migrate_check = true; + } else { + $this->migrate_check = false; + } + } + /** * Set all silent mode varibles * @@ -228,11 +234,7 @@ class complete extends Step { $this->temp_variables['paths_check'] = $this->paths_check; $this->temp_variables['privileges_check'] = $this->privileges_check; $this->temp_variables['database_check'] = $this->database_check; - if (file_exists('migrate.lock')) { - $this->temp_variables['migrate_check'] = true; - } else { - $this->temp_variables['migrate_check'] = false; - } + $this->temp_variables['migrate_check'] = $this->migrate_check; } } ?> \ No newline at end of file diff --git a/setup/wizard/steps/configuration.php b/setup/wizard/steps/configuration.php index 1f1c9ed..f320404 100644 --- a/setup/wizard/steps/configuration.php +++ b/setup/wizard/steps/configuration.php @@ -310,7 +310,7 @@ class configuration extends Step $server = $conf['server']; $paths = $conf['paths']; // TODO - if (file_exists('migrate.lock')) { // Check if its an upgrade + if ($this->util->isMigration()) { // Check if its an upgrade $this->readInstallation(); } else { $this->readConfigPath(); // initialise writing to config.ini @@ -448,14 +448,14 @@ class configuration extends Step private function getPathInfo($fileSystemRoot) { if(isset($this->temp_variables['paths'])) { - if (file_exists('migrate.lock')) { // Check if its an upgrade + if ($this->util->isMigration()) { // Check if its an upgrade $this->readInstallation(); // Read values from config.ini of other installation $dirs = $this->getFromConfigPath(); // Store contents } else { $dirs = $this->temp_variables['paths']; // Pull from temp } } else { - if (file_exists('migrate.lock')) { // Check if its an upgrade + if ($this->util->isMigration()) { // Check if its an upgrade $this->readInstallation(); // Read values from config.ini of other installation } else { $this->readConfigPath(); // Read contents of config-path file diff --git a/setup/wizard/steps/database.php b/setup/wizard/steps/database.php index 898d15a..70856b1 100644 --- a/setup/wizard/steps/database.php +++ b/setup/wizard/steps/database.php @@ -557,8 +557,8 @@ class database extends Step */ private function mysql() { $con = $this->connectMysql(); - // check for migrate.lock file which indicates this is a migration and not a clean install - if (file_exists('migrate.lock')) { + // check for migrate lock file which indicates this is a migration and not a clean install + if ($this->util->isMigration()) { if(!$this->migrateDB($con)) { $this->error['con'] = "Could not Create Database: "; return false; diff --git a/setup/wizard/steps/installtype.php b/setup/wizard/steps/installtype.php index b9b4c8e..6932613 100644 --- a/setup/wizard/steps/installtype.php +++ b/setup/wizard/steps/installtype.php @@ -48,10 +48,11 @@ class installType extends step if(!$this->inStep("installtype")) { return 'landing'; } + if($this->migrate()) { return 'migrate'; } if($this->next()) { - $this->deleteMigrateFile(); + $this->util->deleteMigrateFile(); return 'next'; } else if($this->previous()) { return 'previous'; @@ -68,17 +69,5 @@ class installType extends step public function getErrors() { return $this->error; } - - /** - * Deletes migration lock file if a clean install is chosen - * This is in case someone changes their mind after choosing upgrade/migrate and clicks back up to this step - * - * @author KnowledgeTree Team - * @access private - * @return void - */ - private function deleteMigrateFile() { - @unlink("migrate.lock"); - } } ?> \ No newline at end of file diff --git a/setup/wizard/steps/services.php b/setup/wizard/steps/services.php index c99e2f5..038f1b1 100644 --- a/setup/wizard/steps/services.php +++ b/setup/wizard/steps/services.php @@ -216,10 +216,10 @@ class services extends Step $class = strtolower($service)."Validation"; $this->$class->preset(); // Sets defaults if(!$this->$class->installed) { - if(!WINDOWS_OS) { $this->$class->getBinary(); } // Get binary, if it exists + if(!WINDOWS_OS) { $binary = $this->$class->getBinary(); } // Get binary, if it exists $passed = $this->$class->binaryChecks(); // Run Binary Pre Checks if ($passed) { // Install Service - $this->installService($service); + $this->installService($service, $passed); } } else { $this->$class->installed(); @@ -323,10 +323,10 @@ class services extends Step * @access private * @return boolean */ - private function installService($serviceName) { + private function installService($serviceName, $binary) { $className = OS.$serviceName; $service = new $className(); - $status = $this->serviceHelper($service); + $status = $this->serviceHelper($service, $binary); if (!$status) { $this->serviceCheck = 'cross_orange'; } @@ -340,8 +340,8 @@ class services extends Step * @access private * @return string */ - private function serviceHelper($service) { - $service->load(); // Load Defaults + private function serviceHelper($service, $binary) { + $service->load(array('binary'=>$binary)); // Load Defaults $response = $service->install(); // Install service $statusCheck = OS."ServiceInstalled"; return $this->$statusCheck($service); @@ -446,7 +446,7 @@ class services extends Step * @return mixed */ public function installStep() { - if (!file_exists('migrate.lock')) { // Check if it is a migration + if (!$this->util->isMigration()) { // Check if it is a migration foreach ($this->getServices() as $serviceName) { $className = OS.$serviceName; $service = new $className(); diff --git a/setup/wizard/templates/complete.tpl b/setup/wizard/templates/complete.tpl index fd1fffe..d722b6f 100644 --- a/setup/wizard/templates/complete.tpl +++ b/setup/wizard/templates/complete.tpl @@ -12,7 +12,7 @@ . 'Click Here for help on overcoming post install issues
'; } ?> -
+

     "; ?>Paths and Permissions

@@ -65,6 +65,7 @@


+

     "; ?>Services

@@ -116,11 +117,13 @@
+
+ - Goto Login + Goto Login - Goto Login + Goto Login +

Checking System Configuration

@@ -32,7 +32,7 @@      Click here for help on overcoming configuration issues -

+

Server Settings

diff --git a/setup/wizard/templates/configuration_confirm.tpl b/setup/wizard/templates/configuration_confirm.tpl index a94e7d9..2dfb367 100644 --- a/setup/wizard/templates/configuration_confirm.tpl +++ b/setup/wizard/templates/configuration_confirm.tpl @@ -1,4 +1,4 @@ - +

System Configuration

Click here for help on overcoming configuration issues -
+

Server Settings

diff --git a/setup/wizard/templates/database.tpl b/setup/wizard/templates/database.tpl index 266e3b4..2078bb5 100644 --- a/setup/wizard/templates/database.tpl +++ b/setup/wizard/templates/database.tpl @@ -15,7 +15,7 @@ This step configures the connection to the database server and installs the database. The details for an administrative
user on the database server are required in order to be able to configure and install the installation database. -
+
Please confirm whether KnowledgeTree has correctly determined your database settings before proceeding. Print this page for future use. Click to Print This Page -
+

Database Settings

+

Checking PHP Dependencies

The wizard will review your system to determine whether you have the right PHP components in place to run KnowledgeTree.
@@ -29,7 +29,7 @@       Click here for help on overcoming dependency issues -

+

     "; ?>PHP Version Check

+

Finalizing System Installation

-
+


diff --git a/setup/wizard/templates/installtype.tpl b/setup/wizard/templates/installtype.tpl index 5c48b5f..be9c060 100644 --- a/setup/wizard/templates/installtype.tpl +++ b/setup/wizard/templates/installtype.tpl @@ -1,16 +1,31 @@ - +

Installation Type


-
-

- The wizard will require you choose between an upgrade of an existing sytem or a clean install. -

-
image('kt_browse.png'); ?>
+ The wizard will require you choose an installation type. +

+
+ + + + + + + + + + + + +
- - + + js('form.js'); } ?> \ No newline at end of file diff --git a/setup/wizard/templates/registration.tpl b/setup/wizard/templates/registration.tpl index d790250..eeefb09 100644 --- a/setup/wizard/templates/registration.tpl +++ b/setup/wizard/templates/registration.tpl @@ -20,7 +20,7 @@ and services. Please see our Privacy and Data Retention policies for more information.


-
+
diff --git a/setup/wizard/templates/registration_confirm.tpl b/setup/wizard/templates/registration_confirm.tpl index 6a9cb7f..8b3f615 100644 --- a/setup/wizard/templates/registration_confirm.tpl +++ b/setup/wizard/templates/registration_confirm.tpl @@ -1,6 +1,6 @@

Thank you for registering

-
+


diff --git a/setup/wizard/templates/services.tpl b/setup/wizard/templates/services.tpl index eda265f..f91232c 100644 --- a/setup/wizard/templates/services.tpl +++ b/setup/wizard/templates/services.tpl @@ -1,7 +1,7 @@ - + - +

Checking Service Dependencies

diff --git a/setup/wizard/templates/welcome.tpl b/setup/wizard/templates/welcome.tpl index ef18fa2..238d0b4 100644 --- a/setup/wizard/templates/welcome.tpl +++ b/setup/wizard/templates/welcome.tpl @@ -1,4 +1,4 @@ - +

Welcome to KnowledgeTree


diff --git a/templates/kt3/fieldsets/simple.smarty b/templates/kt3/fieldsets/simple.smarty index 6a1c265..964772d 100755 --- a/templates/kt3/fieldsets/simple.smarty +++ b/templates/kt3/fieldsets/simple.smarty @@ -8,8 +8,17 @@ {foreach item=aFieldPair from=$fieldset_values name=fields}
- + {/foreach}
{$aFieldPair.field->getName()}{if ($aFieldPair.value !== null)}{$aFieldPair.value|sanitize} - {else}{i18n}no value{/i18n}{/if} + {if ($aFieldPair.value !== null)} + {if ($aFieldPair.field->getIsHTML())} + {$aFieldPair.value} + {else} + {$aFieldPair.value|sanitize} + {/if} + {else} + {i18n}no value{/i18n} + {/if} +
diff --git a/templates/ktcore/forms/widgets/textarea.smarty b/templates/ktcore/forms/widgets/textarea.smarty index 63e2348..55aeaea 100755 --- a/templates/ktcore/forms/widgets/textarea.smarty +++ b/templates/ktcore/forms/widgets/textarea.smarty @@ -1,6 +1,10 @@ + ------------------------------------ + Bold, italics, underline, hyperlink and colour. +Lists, ordered and unordered (
    ,
      ,
    1. ). +Paragraph and break tags. + --> {if $options.field->getIsHTML()} {literal} @@ -15,10 +19,8 @@ theme : "advanced", plugins : "safari,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,imagemanager,filemanager", // Theme options -theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect,fontselect,fontsizeselect", -theme_advanced_buttons2 : "cut,copy,paste,pastetext,pasteword,|,search,replace,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor", -theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,print,|,ltr,rtl,|,fullscreen", -theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage", +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_toolbar_location : "top", theme_advanced_toolbar_align : "left", theme_advanced_statusbar_location : "bottom", diff --git a/templates/ktcore/search2/adv_query_builder.smarty b/templates/ktcore/search2/adv_query_builder.smarty index 4a4a4b6..22ee365 100755 --- a/templates/ktcore/search2/adv_query_builder.smarty +++ b/templates/ktcore/search2/adv_query_builder.smarty @@ -382,6 +382,7 @@ function createText(groupid, fid, type) html += "