Peter M. Groen / knowledgetree

Commit 8efdbb8aed5a86880473e259cb8bbaaf1966126a

Authored by Paul Barrett
2 parents dfe8da73 44bb30ab

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

Inline Side-by-side
Showing 11 changed files with 40 additions and 30 deletions
kthelp/ktcore/EN/welcome.html
  View file @8efdbb8
... ... @@ -4,6 +4,7 @@
4 4 </head>
5 5 <body>
6 6 <p class="descriptiveText"><b>#APP_NAME# is Document Management Made Simple.</b></p><br>
  7 +<a href="http://www.youtube.com/watch?v=adTzHbk3SLU" target="_blank"><img src="resources/graphics/video_dashlet.png" border="0" align="right" /></a>
7 8 <p class="descriptiveText">Easily and securely
8 9 manage your company's document creation, editing, versioning, and sharing - all from
9 10 a powerful Web interface and Microsoft&#0174 Office&#0174 and Windows&#0174 Explorer&#0174 tools.</p>
... ...
kthelp/ktcore/EN/welcomeCommercial.html
  View file @8efdbb8
... ... @@ -5,9 +5,10 @@
5 5 <body>
6 6 <p class="descriptiveText"><b>#APP_NAME# is Document Management Made Simple.</b></p> <br>
7 7  
8   -<p class="descriptiveText">Easily and securely manage your company's document creation, editing, versioning, and sharing - all from a powerful Web interface and Microsoft&#0174 Office&#0174 and Windows&#0174 Explorer&#0174 tools.</p> <br>
  8 +<a href="http://www.youtube.com/watch?v=adTzHbk3SLU" target="_blank"><img src="resources/graphics/video_dashlet.png" border="0" align="right" /></a>
  9 +<p class="descriptiveText">Easily and securely manage your company's document creation, editing, versioning, and sharing - all from a powerful Web interface and Microsoft&#0174 Office and Windows&#0174 Explorer tools.</p> <br>
9 10  
10 11 <p class="descriptiveText">A subscription to #APP_NAME# provides your organization with product updates, enhanced document management features, and commercial support. Please view your welcome mailer for information on accessing these services.</p> <br>
11 12  
12 13 </body>
13   -</html>
14 14 \ No newline at end of file
  15 +</html>
... ...
plugins/ktcore/KTWidgets.php
  View file @8efdbb8
... ... @@ -944,36 +944,46 @@ class KTCoreTextAreaWidget extends KTWidget {
944 944 $global_required_default = true;
945 945 $this->bRequired = (KTUtil::arrayGet($aOptions, 'required', $global_required_default, false) == true);
946 946  
947   - $this->aOptions['cols'] = KTUtil::arrayGet($aOptions, 'cols', 60);
948   - $this->aOptions['rows'] = KTUtil::arrayGet($aOptions, 'rows', 3);
  947 + // Part of the space on the mce editor is taken up by the toolbars, so make the plain text field slightly smaller (if using the default size)
  948 + $default_rows = 20;
  949 + if(isset($this->aOptions['field'])){
  950 + $oField = $this->aOptions['field'];
  951 + if(!$oField->getIsHTML()){
  952 + $default_rows = 15;
  953 + }
  954 + }
  955 +
  956 +
  957 + $this->aOptions['cols'] = KTUtil::arrayGet($aOptions, 'cols', 80);
  958 + $this->aOptions['rows'] = KTUtil::arrayGet($aOptions, 'rows', $default_rows);
949 959 $this->aOptions['field'] = KTUtil::arrayGet($aOptions, 'field');
950 960 }
951 961  
952 962 function render() {
953 963 // very simple, general purpose passthrough. Chances are this is sufficient,
954 964 // just override the template being used.
955   - $bHasErrors = false;
  965 + $bHasErrors = false;
956 966 if (count($this->aErrors) != 0) { $bHasErrors = true; }
957 967 //var_dump($this->aErrors);
958   - $oTemplating =& KTTemplating::getSingleton();
  968 + $oTemplating =& KTTemplating::getSingleton();
959 969 $oTemplate = $oTemplating->loadTemplate('ktcore/forms/widgets/base');
960 970  
961 971 $this->aJavascript[] = 'thirdpartyjs/tinymce/jscripts/tiny_mce/tiny_mce.js';
962 972 $this->aJavascript[] = 'resources/js/kt_tinymce_init.js';
963   -
  973 +
964 974 if (!empty($this->aJavascript)) {
965 975 // grab our inner page.
966   - $oPage =& $GLOBALS['main'];
  976 + $oPage =& $GLOBALS['main'];
967 977 $oPage->requireJSResources($this->aJavascript);
968 978 }
969 979 if (!empty($this->aCSS)) {
970 980 // grab our inner page.
971   - $oPage =& $GLOBALS['main'];
  981 + $oPage =& $GLOBALS['main'];
972 982 $oPage->requireCSSResources($this->aCSS);
973 983 }
974   -
  984 +
975 985 $widget_content = $this->getWidget();
976   -
  986 +
977 987 $aTemplateData = array(
978 988 "context" => $this,
979 989 "label" => $this->sLabel,
... ...
resources/graphics/video_dashlet.png 0 → 100644
View file @8efdbb8

18.7 KB
setup/wizard/installUtil.php
  View file @8efdbb8
... ... @@ -693,17 +693,17 @@ class InstallUtil {
693 693 }
694 694  
695 695 /* function getOpenOffice() {
696   - $cmd = "whereis soffice.bin";
  696 + $cmd = "whereis soffice";
697 697 $res = $this->getOpenOfficeHelper($cmd);
698   - if($res != '' && preg_match('/soffice.bin/', $res)) {
  698 + if($res != '' && preg_match('/soffice/', $res)) {
699 699 return $res;
700 700 }
701   - $cmd = "which soffice.bin";
  701 + $cmd = "which soffice";
702 702 $res = $this->getOpenOfficeHelper($cmd);
703 703 if($res != '') {
704 704 return $res;
705 705 }
706   - $cmd = "locate soffice.bin";
  706 + $cmd = "locate soffice";
707 707 $res = $this->getOpenOfficeHelper($cmd);
708 708 if($res != '') {
709 709 return $res;
... ... @@ -720,7 +720,7 @@ class InstallUtil {
720 720 foreach ($broke as $r) {
721 721 $match = preg_match('/bin/', $r);
722 722 if($match) {
723   - return preg_replace('/soffice.bin:/', '', $r);
  723 + return preg_replace('/soffice:/', '', $r);
724 724 }
725 725 }
726 726 }
... ...
setup/wizard/lib/services/unixOpenOffice.php
  View file @8efdbb8
... ... @@ -67,11 +67,10 @@ class unixOpenOffice extends unixService {
67 67 if(isset($options['binary'])) {
68 68 $this->setBin($options['binary']);
69 69 } else {
70   - $this->setBin("/usr/lib/openoffice/program/soffice.bin");
  70 + $this->setBin("/usr/bin//soffice");
71 71 }
72 72 $this->setPort("8100");
73 73 $this->setHost("localhost");
74   -// $this->soffice = $this->util->getOpenOffice();
75 74 }
76 75  
77 76 private function setPort($port = "8100") {
... ... @@ -144,11 +143,7 @@ class unixOpenOffice extends unixService {
144 143 return ;
145 144 }
146 145 $response = $this->util->pexec($cmd);
147   -// $state = $this->status();
148   -// if($state != 'STARTED') {
149   -// $cmd = "nohup ".$this->getBin()." -nofirststartwizard -nologo -headless -accept=\"socket,host=localhost,port=8100;urp;StarOffice.ServiceManager\" &1> /dev/null &";
150   -// $response = $this->util->pexec($cmd);
151   -// }
  146 +
152 147 return $response;
153 148 } elseif ($state == '') {
154 149 // Start Service
... ...
setup/wizard/lib/system/openOffice.class
View file @8efdbb8
No preview for this file type
setup/wizard/lib/system/openOffice.java
  View file @8efdbb8
... ... @@ -8,7 +8,7 @@ public class openOffice {
8 8 String openoffice = args[0];
9 9 try {
10 10 // Execute a command without arguments
11   - String command = "nohup "+openoffice+" -nofirststartwizard -nologo -headless -accept=\"socket,host=localhost,port=8100;urp;StarOffice.ServiceManager\"";
  11 + String command = ""+openoffice+" -nofirststartwizard -nologo -headless -accept=\"socket,host=localhost,port=8100;urp;StarOffice.ServiceManager\"";
12 12 Process child = Runtime.getRuntime().exec(command);
13 13 System.out.println(command);
14 14 } catch (IOException e) {
... ...
setup/wizard/lib/validation/openofficeValidation.php
  View file @8efdbb8
... ... @@ -61,7 +61,7 @@ class openofficeValidation extends serviceValidation {
61 61 * @access private
62 62 * @var mixed
63 63 */
64   - private $unixLocations = array("/usr/lib/openoffice/program");
  64 + private $unixLocations = array("/usr/bin/");
65 65  
66 66 public function preset($options = null) {
67 67 $this->specifyOpenOffice();
... ... @@ -98,7 +98,7 @@ class openofficeValidation extends serviceValidation {
98 98 $auto = $this->detectOpenOffice();
99 99 if($auto) {
100 100 $this->soffice = $auto;
101   - $this->openOfficeExeError = true;
  101 + $this->openOfficeExeError = false;
102 102 return $this->soffice;
103 103 }
104 104 return false;
... ... @@ -111,10 +111,10 @@ class openofficeValidation extends serviceValidation {
111 111 $bin = "soffice.exe";
112 112 } else {
113 113 $locations = $this->unixLocations;
114   - $bin = "soffice.bin";
  114 + $bin = "soffice";
115 115 }
116 116 foreach ($locations as $loc) {
117   - $pathToBinary = $loc.DS.$bin;
  117 + $pathToBinary = $loc.$bin;
118 118 if(file_exists($pathToBinary)) {
119 119 return $pathToBinary;
120 120 }
... ...
setup/wizard/steps/database.php
  View file @8efdbb8
... ... @@ -768,7 +768,10 @@ class database extends Step
768 768 $sqlFile = $dbMigrate['dumpLocation'];
769 769 $this->parse_mysql_dump($sqlFile);
770 770 $this->dbhandler->load($this->dhost, $this->duname, $this->dpassword, $this->dname);
771   - $this->dbhandler->query("TRUNCATE plugin_helper;");
  771 + $dropPluginHelper = "TRUNCATE plugin_helper;";
  772 + $this->dbhandler->query($dropPluginHelper);
  773 + $updateUrls = 'UPDATE config_settings c SET c.value = "default" where c.group_name = "urls";';
  774 + $this->dbhandler->query($updateUrls);
772 775 return true;
773 776 }
774 777 /**
... ...
setup/wizard/templates/database_confirm.tpl
  View file @8efdbb8
... ... @@ -33,7 +33,7 @@
33 33 <tr>
34 34 <td>Root Password: </td>
35 35 <td> <div id="tooltips" title="Root user password of the database">&nbsp;</div> </td>
36   - <td><?php echo $dpassword; ?></td>
  36 + <td><?php for($i=0; $i< strlen($dpassword); $i++) echo "*"; //echo $dpassword; ?></td>
37 37 </tr>
38 38 <?php if($ddrop) { ?>
39 39 <tr>
... ...