Peter M. Groen / knowledgetree

Commit 4d3b460d4112bc01e91df5727173e21c4694b1f5

Authored by jjordaan
2 parents 952e758e 3ede41a8

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

Inline Side-by-side
Showing 12 changed files with 33 additions and 27 deletions
i18n/knowledgeTree.pot
  View file @4d3b460
... ... @@ -6669,7 +6669,7 @@ msgid "It is not possible to archive a shortcut. Please archive the target docum
6669 6669 msgstr ""
6670 6670  
6671 6671 #: plugins/ktcore/admin/documentFieldsv2.php:115
6672   -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."
  6672 +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."
6673 6673 msgstr ""
6674 6674  
6675 6675 #: i18n/templates.c:7529
... ...
plugins/i18n/french/translations/fr_FR/knowledgeTree.po
  View file @4d3b460
... ... @@ -6779,7 +6779,7 @@ msgid "It is not possible to archive a shortcut. Please archive the target docum
6779 6779 msgstr "Il est impossible d'archiver un raccourci. Veuillez archiver à la place le document ou le dossier ciblé."
6780 6780  
6781 6781 #: plugins/ktcore/admin/documentFieldsv2.php:115
6782   -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."
  6782 +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."
6783 6783 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."
6784 6784  
6785 6785 #: i18n/templates.c:7160
... ...
plugins/i18n/german/translations/de_DE/knowledgeTree.po
  View file @4d3b460
... ... @@ -6785,7 +6785,7 @@ msgid "It is not possible to archive a shortcut. Please archive the target docum
6785 6785 msgstr "Verknüpfungen können nicht archiviert werden. Bitte archivieren Sie das Zieldokument oder den Zielordner."
6786 6786  
6787 6787 #: plugins/ktcore/admin/documentFieldsv2.php:115
6788   -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."
  6788 +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."
6789 6789 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."
6790 6790  
6791 6791 #: i18n/templates.c:7160
... ...
plugins/i18n/italian/translations/it_IT/knowledgeTree.po
  View file @4d3b460
... ... @@ -6926,7 +6926,7 @@ msgid "It is not possible to archive a shortcut. Please archive the target docum
6926 6926 msgstr "Non è possibile archiviare un collegamento. Si prega di archiviare il documento scelto o la cartella."
6927 6927  
6928 6928 #: plugins/ktcore/admin/documentFieldsv2.php:115
6929   -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."
  6929 +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."
6930 6930 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."
6931 6931  
6932 6932 #: i18n/templates.c:7175
... ...
plugins/ktcore/admin/documentFieldsv2.php
  View file @4d3b460
... ... @@ -112,7 +112,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
112 112 $widgets[] = array('ktcore.widgets.selection', array(
113 113 'label' => _kt("Fieldset Type"),
114 114 'use_simple' => false,
115   - '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."),
  115 + '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."),
116 116 'important_description' => _kt('Note that it is not possible to convert between different types of fieldsets, so please choose carefully.'),
117 117 'name' => 'fieldset_type',
118 118 'required' => true,
... ...
plugins/ktstandard/KTEmail.php
  View file @4d3b460
... ... @@ -246,7 +246,7 @@ function sendEmailDocument($aDestEmailAddress, $iDocumentID, $sDocumentName, $sC
246 246 $sMessage .= sprintf(_kt("Your colleague, %s, wishes you to view the attached document entitled '%s'."), $oSendingUser->getName(), $sDocumentName);
247 247 $sMessage .= "\n\n";
248 248 if (strlen($sComment) > 0) {
249   - $sMessage .= '<br><br>' . _kt('Comments') . ':<br>' . $sComment;
  249 + $sMessage .= '<br><br>' . _kt('Comments') . ':<br>' . nl2br($sComment);
250 250 }
251 251 $sTitle = sprintf(_kt("Document (ID %s): %s from %s"), $iDocumentID, $sDocumentName, $oSendingUser->getName());
252 252  
... ... @@ -311,7 +311,7 @@ function sendEmailHyperlink($aDestEmailAddress, $iDocumentID, $sDocumentName, $s
311 311 $sMessage .= '<br>' . generateControllerLink('viewDocument', "fDocumentID=$iDocumentID", $sDocumentName, true);
312 312 // add optional comment
313 313 if (strlen($sComment) > 0) {
314   - $sMessage .= '<br><br>' . _kt('Comments') . ':<br>' . $sComment;
  314 + $sMessage .= '<br><br>' . _kt('Comments') . ':<br>' . nl2br($sComment);
315 315 }
316 316 $sMessage .= '</font>';
317 317 $sTitle = sprintf(_kt("Link (ID %s): %s from %s"), $iDocumentID, $sDocumentName, $oSendingUser->getName());
... ...
resources/css/kt-framing.css
  View file @4d3b460
... ... @@ -1217,15 +1217,15 @@ The text will be hidden for screen view. The generic fahrner-ish approach comes
1217 1217 }
1218 1218  
1219 1219 .portlet_button a .arrow_download {
1220   - background: transparent url(../../resources/graphics/download_arrow.gif) top right no-repeat;
1221   - width: 27px;
  1220 + background: transparent url(../../resources/graphics/download_arrow.gif) center right no-repeat;
  1221 + width: 20px;
1222 1222 height: 47px;
1223 1223 float: right;
1224 1224 }
1225 1225  
1226 1226 .portlet_button a .arrow_upload {
1227   - background: transparent url(../../resources/graphics/upload_arrow.gif) top right no-repeat;
1228   - width: 27px;
  1227 + background: transparent url(../../resources/graphics/upload_arrow.gif) center right no-repeat;
  1228 + width: 20px;
1229 1229 height: 47px;
1230 1230 float: right;
1231 1231 }
... ...
resources/graphics/download_arrow.gif
View file @4d3b460

662 Bytes | W: | H:

4.93 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
resources/graphics/upload_arrow.gif
View file @4d3b460

662 Bytes | W: | H:

4.93 KB | W: | H:

  • 2-up
  • Swipe
  • Onion skin
resources/js/search2widget.js
  View file @4d3b460
... ... @@ -87,6 +87,8 @@ function populateSavedSearch(menu)
87 87 var item = menu.addMenuItem({
88 88 text: sSearchTranslations[5], /*Saved Searches*/
89 89 menu: {
  90 + shadow: false,
  91 + minWidth: '150px',
90 92 items: []
91 93 }
92 94 });
... ... @@ -118,6 +120,7 @@ function createSearchBar(div, suffix)
118 120 {
119 121 var menu = new Ext.menu.Menu({
120 122 shadow: false,
  123 + minWidth: '200px',
121 124 items: [
122 125 {
123 126 text: sSearchTranslations[6], /* Advanced Search */
... ... @@ -131,6 +134,7 @@ function createSearchBar(div, suffix)
131 134 text: sSearchTranslations[8] , /*Quick Search Options*/
132 135 menu: {
133 136 shadow: false,
  137 + minWidth: '150px',
134 138 items: [
135 139 new Ext.menu.CheckItem({
136 140 text: sSearchTranslations[9], /* content and metadata */
... ... @@ -153,6 +157,7 @@ function createSearchBar(div, suffix)
153 157 text: sSearchTranslations[13] , /*Toggle results format*/
154 158 menu: {
155 159 shadow: false,
  160 + minWidth: '150px',
156 161 items: [
157 162 new Ext.menu.CheckItem({
158 163 text: sSearchTranslations[14], /* search engine format */
... ...
sql/mysql/install/data.sql
  View file @4d3b460
... ... @@ -1458,7 +1458,7 @@ LOCK TABLES `system_settings` WRITE;
1458 1458 INSERT INTO `system_settings` VALUES
1459 1459 (1,'lastIndexUpdate','0'),
1460 1460 (2,'knowledgeTreeVersion','3.6.1'),
1461   -(3,'databaseVersion','3.6.0'),
  1461 +(3,'databaseVersion','3.6.1'),
1462 1462 (4,'server_name','127.0.0.1');
1463 1463 /*!40000 ALTER TABLE `system_settings` ENABLE KEYS */;
1464 1464 UNLOCK TABLES;
... ... @@ -1752,7 +1752,8 @@ INSERT INTO `upgrades` VALUES
1752 1752 (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'),
1753 1753 (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'),
1754 1754 (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'),
1755   -(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');
  1755 +(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'),
  1756 +(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');
1756 1757 /*!40000 ALTER TABLE `upgrades` ENABLE KEYS */;
1757 1758 UNLOCK TABLES;
1758 1759  
... ...
templates/ktcore/search2/adv_query_builder.smarty
  View file @4d3b460
... ... @@ -183,15 +183,16 @@ function createRange(groupid, fid, type)
183 183 html += "<option value=\"is not\">{/literal}{i18n}not on{/i18n}{literal}";
184 184 break;
185 185 default:
186   - html += "<option value=\"is\">=";
187   - html += "<option value=\"is not\">!=";
188   - html += "<option value=\"\>\">\>";
189   - html += "<option value=\"\>=\">\>=";
190   - html += "<option value=\"\<\">\<";
191   - html += "<option value=\"\<=\">\<=";
  186 + html += "<option value=\"is\">{/literal}{i18n}equal to{/i18n}";
  187 + html += "<option value=\"is not\">{i18n}not equal to{/i18n}";
  188 + html += "<option value=\"\>\">{i18n}greater than{/i18n}";
  189 + html += "<option value=\"\>=\">{i18n}greater than or equal to{/i18n}";
  190 + html += "<option value=\"\<\">{i18n}less than{/i18n}";
  191 + html += "<option value=\"\<=\">{i18n}less than or equal to{/i18n}";
192 192 html += "<option value=\"between\">{/literal}{i18n}between{/i18n}{literal}";
193 193 break;
194 194 }
  195 +
195 196 html += "</SELECT>";
196 197  
197 198 html += "<td valign=top width=\"100\"><div id=\"field"+ groupid + '_' + fid +"start\"></div>";
... ... @@ -296,18 +297,17 @@ function onFilesizeChange(groupid, fid)
296 297  
297 298 function createFilesize(groupid, fid)
298 299 {
299   - var html = "<table><tr><td width=\"140\"";
  300 + var html = "<table><tr><td width=\"140\">";
300 301  
301 302 html += "<SELECT style=\"width: 140px\" id=\"field" + groupid + "_" + fid + "op\">";
302   - html += "<option value=\"\<\">\<";
303   - html += "<option value=\"\<=\">\<=";
304   - html += "<option value=\"\>\">\>";
305   - html += "<option value=\"\>=\">\>=";
306   - html += "<option value=\"=\">=";
307   - html += "<option value=\"!=\">!=";
  303 + html += "<option value=\"\<\">{/literal}{i18n}less than{/i18n}"; // <
  304 + html += "<option value=\"\<=\">{i18n}less than or equal to{/i18n}"; // <=
  305 + html += "<option value=\"\>\">{i18n}greater than{/i18n}"; // >
  306 + html += "<option value=\"\>=\">{i18n}greater than or equal to{/i18n}"; // >=
  307 + html += "<option value=\"=\">{i18n}equal to{/i18n}"; // =
  308 + html += "<option value=\"!=\">{i18n}not equal to{/i18n}{literal}"; // !=
308 309 html += "</SELECT>"
309 310  
310   -
311 311 html += "<td valign=top width=\"50px\"><div id=\"field"+ groupid + '_' + fid +"input\"></div>";
312 312 html += "<td>";
313 313 html += "<SELECT id=\"field" + groupid + "_" + fid + "factor\" onchange=\"onFilesizeChange( " + groupid + "," + fid + ")\">";
... ...