diff --git a/i18n/knowledgeTree.pot b/i18n/knowledgeTree.pot index c7f803a..2afcf68 100644 --- a/i18n/knowledgeTree.pot +++ b/i18n/knowledgeTree.pot @@ -6669,7 +6669,7 @@ msgid "It is not possible to archive a shortcut. Please archive the target docum msgstr "" #: plugins/ktcore/admin/documentFieldsv2.php:115 -msgid "It is possibler to create different types of fieldsets. The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields. The administrator may have installed additional plugins which provide different types of fieldsets." +msgid "It is possible to create different types of fieldsets. The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields. The administrator may have installed additional plugins which provide different types of fieldsets." msgstr "" #: i18n/templates.c:7529 diff --git a/plugins/i18n/french/translations/fr_FR/knowledgeTree.po b/plugins/i18n/french/translations/fr_FR/knowledgeTree.po index d822c82..1bdb9f7 100644 --- a/plugins/i18n/french/translations/fr_FR/knowledgeTree.po +++ b/plugins/i18n/french/translations/fr_FR/knowledgeTree.po @@ -6779,7 +6779,7 @@ msgid "It is not possible to archive a shortcut. Please archive the target docum msgstr "Il est impossible d'archiver un raccourci. Veuillez archiver à la place le document ou le dossier ciblé." #: plugins/ktcore/admin/documentFieldsv2.php:115 -msgid "It is possibler to create different types of fieldsets. The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields. The administrator may have installed additional plugins which provide different types of fieldsets." +msgid "It is possible to create different types of fieldsets. The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields. The administrator may have installed additional plugins which provide different types of fieldsets." msgstr "Il est possible de créer différents types de formulaires. Le plus commun est un formulaire \"normal\" , qui peut être configuré de facon à disposer de différents types de champs. L'administrateur peut avoir installé des plugins supplémentaires qui fournissent différents types de formulaires." #: i18n/templates.c:7160 diff --git a/plugins/i18n/german/translations/de_DE/knowledgeTree.po b/plugins/i18n/german/translations/de_DE/knowledgeTree.po index 7d33464..5659bbe 100644 --- a/plugins/i18n/german/translations/de_DE/knowledgeTree.po +++ b/plugins/i18n/german/translations/de_DE/knowledgeTree.po @@ -6785,7 +6785,7 @@ msgid "It is not possible to archive a shortcut. Please archive the target docum msgstr "Verknüpfungen können nicht archiviert werden. Bitte archivieren Sie das Zieldokument oder den Zielordner." #: plugins/ktcore/admin/documentFieldsv2.php:115 -msgid "It is possibler to create different types of fieldsets. The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields. The administrator may have installed additional plugins which provide different types of fieldsets." +msgid "It is possible to create different types of fieldsets. The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields. The administrator may have installed additional plugins which provide different types of fieldsets." msgstr "Es ist möglich verschiedene Typen von Feldgruppen zu erstellen. Die übliche Form ist eine \"normale\" Feldgruppe, welche unterschiedliche Felder beinhalten kann. Der Administrator hat eventuell weitere Plugins installiert die verschiedene Typen von Feldgruppen bereitstellen." #: i18n/templates.c:7160 diff --git a/plugins/i18n/italian/translations/it_IT/knowledgeTree.po b/plugins/i18n/italian/translations/it_IT/knowledgeTree.po index 11f9935..e66d74e 100644 --- a/plugins/i18n/italian/translations/it_IT/knowledgeTree.po +++ b/plugins/i18n/italian/translations/it_IT/knowledgeTree.po @@ -6926,7 +6926,7 @@ msgid "It is not possible to archive a shortcut. Please archive the target docum msgstr "Non è possibile archiviare un collegamento. Si prega di archiviare il documento scelto o la cartella." #: plugins/ktcore/admin/documentFieldsv2.php:115 -msgid "It is possibler to create different types of fieldsets. The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields. The administrator may have installed additional plugins which provide different types of fieldsets." +msgid "It is possible to create different types of fieldsets. The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields. The administrator may have installed additional plugins which provide different types of fieldsets." msgstr "E' possibile crare tipi diversi di gruppi di attributi. Il tipo più comune è un gruppo di attributi \"normale\", che può essere configurato in modo da avere vari tipi di campi. L'amministratore potrebbe avere installato dei componenti aggiuntivi addizionali che forniscono tipi diversi di gruppi di attributi." #: i18n/templates.c:7175 diff --git a/plugins/ktcore/admin/documentFieldsv2.php b/plugins/ktcore/admin/documentFieldsv2.php index 05201f3..2408999 100644 --- a/plugins/ktcore/admin/documentFieldsv2.php +++ b/plugins/ktcore/admin/documentFieldsv2.php @@ -112,7 +112,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher { $widgets[] = array('ktcore.widgets.selection', array( 'label' => _kt("Fieldset Type"), 'use_simple' => false, - 'description' => _kt("It is possibler to create different types of fieldsets. The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields. The administrator may have installed additional plugins which provide different types of fieldsets."), + 'description' => _kt("It is possible to create different types of fieldsets. The most common kind is a \"normal\" fieldset, which can be configured to have different kinds of fields. The administrator may have installed additional plugins which provide different types of fieldsets."), 'important_description' => _kt('Note that it is not possible to convert between different types of fieldsets, so please choose carefully.'), 'name' => 'fieldset_type', 'required' => true, diff --git a/plugins/ktstandard/KTEmail.php b/plugins/ktstandard/KTEmail.php index 46c1158..3a29b0b 100644 --- a/plugins/ktstandard/KTEmail.php +++ b/plugins/ktstandard/KTEmail.php @@ -246,7 +246,7 @@ function sendEmailDocument($aDestEmailAddress, $iDocumentID, $sDocumentName, $sC $sMessage .= sprintf(_kt("Your colleague, %s, wishes you to view the attached document entitled '%s'."), $oSendingUser->getName(), $sDocumentName); $sMessage .= "\n\n"; if (strlen($sComment) > 0) { - $sMessage .= '

' . _kt('Comments') . ':
' . $sComment; + $sMessage .= '

' . _kt('Comments') . ':
' . nl2br($sComment); } $sTitle = sprintf(_kt("Document (ID %s): %s from %s"), $iDocumentID, $sDocumentName, $oSendingUser->getName()); @@ -311,7 +311,7 @@ function sendEmailHyperlink($aDestEmailAddress, $iDocumentID, $sDocumentName, $s $sMessage .= '
' . generateControllerLink('viewDocument', "fDocumentID=$iDocumentID", $sDocumentName, true); // add optional comment if (strlen($sComment) > 0) { - $sMessage .= '

' . _kt('Comments') . ':
' . $sComment; + $sMessage .= '

' . _kt('Comments') . ':
' . nl2br($sComment); } $sMessage .= ''; $sTitle = sprintf(_kt("Link (ID %s): %s from %s"), $iDocumentID, $sDocumentName, $oSendingUser->getName()); diff --git a/resources/css/kt-framing.css b/resources/css/kt-framing.css index b80dbcf..59c1e05 100644 --- a/resources/css/kt-framing.css +++ b/resources/css/kt-framing.css @@ -1217,15 +1217,15 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes } .portlet_button a .arrow_download { - background: transparent url(../../resources/graphics/download_arrow.gif) top right no-repeat; - width: 27px; + background: transparent url(../../resources/graphics/download_arrow.gif) center right no-repeat; + width: 20px; height: 47px; float: right; } .portlet_button a .arrow_upload { - background: transparent url(../../resources/graphics/upload_arrow.gif) top right no-repeat; - width: 27px; + background: transparent url(../../resources/graphics/upload_arrow.gif) center right no-repeat; + width: 20px; height: 47px; float: right; } diff --git a/resources/graphics/download_arrow.gif b/resources/graphics/download_arrow.gif index c5e1e6b..82238d1 100644 --- a/resources/graphics/download_arrow.gif +++ b/resources/graphics/download_arrow.gif diff --git a/resources/graphics/upload_arrow.gif b/resources/graphics/upload_arrow.gif index 0a668c4..363fe13 100644 --- a/resources/graphics/upload_arrow.gif +++ b/resources/graphics/upload_arrow.gif diff --git a/resources/js/search2widget.js b/resources/js/search2widget.js index df88b37..b4882c5 100644 --- a/resources/js/search2widget.js +++ b/resources/js/search2widget.js @@ -87,6 +87,8 @@ function populateSavedSearch(menu) var item = menu.addMenuItem({ text: sSearchTranslations[5], /*Saved Searches*/ menu: { + shadow: false, + minWidth: '150px', items: [] } }); @@ -118,6 +120,7 @@ function createSearchBar(div, suffix) { var menu = new Ext.menu.Menu({ shadow: false, + minWidth: '200px', items: [ { text: sSearchTranslations[6], /* Advanced Search */ @@ -131,6 +134,7 @@ function createSearchBar(div, suffix) text: sSearchTranslations[8] , /*Quick Search Options*/ menu: { shadow: false, + minWidth: '150px', items: [ new Ext.menu.CheckItem({ text: sSearchTranslations[9], /* content and metadata */ @@ -153,6 +157,7 @@ function createSearchBar(div, suffix) text: sSearchTranslations[13] , /*Toggle results format*/ menu: { shadow: false, + minWidth: '150px', items: [ new Ext.menu.CheckItem({ text: sSearchTranslations[14], /* search engine format */ diff --git a/sql/mysql/install/data.sql b/sql/mysql/install/data.sql index 5836276..72bbcd4 100644 --- a/sql/mysql/install/data.sql +++ b/sql/mysql/install/data.sql @@ -1458,7 +1458,7 @@ LOCK TABLES `system_settings` WRITE; INSERT INTO `system_settings` VALUES (1,'lastIndexUpdate','0'), (2,'knowledgeTreeVersion','3.6.1'), -(3,'databaseVersion','3.6.0'), +(3,'databaseVersion','3.6.1'), (4,'server_name','127.0.0.1'); /*!40000 ALTER TABLE `system_settings` ENABLE KEYS */; UNLOCK TABLES; @@ -1752,7 +1752,8 @@ INSERT INTO `upgrades` VALUES (214,'func*3.5.4a*0*removeOldFilesAndFolders354a','Remove old files and folders that are no longer needed.','2008-10-01 00:00:00',1,'upgrade*3.5.4a*99*upgrade3.5.4a'), (215,'func*3.5.4a*0*removeOldFilesAndFolders354a1','Remove old files and folders that are no longer needed.','2008-10-01 00:00:00',1,'upgrade*3.5.4a*99*upgrade3.5.4a'), (216,'upgrade*3.5.4a*99*upgrade3.5.4a','Upgrade from version 3.5.4 to 3.5.4a','2008-12-01 00:00:00',1,'upgrade*3.5.4a*99*upgrade3.5.4a'), -(217,'upgrade*3.6.0*99*upgrade3.6.0','Upgrade from version 3.5.4a to 3.6.0','2009-01-01 00:00:00',1,'upgrade*3.6.0*99*upgrade3.6.0'); +(217,'upgrade*3.6.0*99*upgrade3.6.0','Upgrade from version 3.5.4a to 3.6.0','2009-01-01 00:00:00',1,'upgrade*3.6.0*99*upgrade3.6.0'), +(218,'upgrade*3.6.1*99*upgrade3.6.1','Upgrade from version 3.6.0 to 3.6.1','2009-04-01 00:00:00',1,'upgrade*3.6.1*99*upgrade3.6.1'); /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */; UNLOCK TABLES; diff --git a/templates/ktcore/search2/adv_query_builder.smarty b/templates/ktcore/search2/adv_query_builder.smarty index fb9bbf8..ad40065 100755 --- a/templates/ktcore/search2/adv_query_builder.smarty +++ b/templates/ktcore/search2/adv_query_builder.smarty @@ -183,15 +183,16 @@ function createRange(groupid, fid, type) html += "