Peter M. Groen / knowledgetree

Commit dda957a64ea3cd3cde72e7e0a7b93f3969ba6c70

Authored by Jarrett Jordaan
1 parent 87453e40

Updated templating. 

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
Inline Side-by-side
Showing 6 changed files with 5 additions and 27 deletions
setup/migrate/steps/migrateDatabase.php
  View file @dda957a
... ... @@ -148,7 +148,6 @@ class migrateDatabase extends Step
148 148 $cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.' --socket="'.$socket.'" '.$dbName.' > '.$sqlFile;
149 149 else
150 150 $cmd = $exe.' -u"'.$dbAdminUser.'" -p"'.$dbAdminPass.'" --port="'.$port.'" '.$dbName.' > '.$sqlFile;
151   - echo $cmd;
152 151 $response = $this->util->pexec($cmd);
153 152 }
154 153 if(file_exists($sqlFile)) {
... ...
setup/wizard/templates/configuration_confirm.tpl
  View file @dda957a
... ... @@ -50,9 +50,7 @@
50 50 <td><?php echo $server['file_system_root']['value']; ?></td>
51 51 </tr>
52 52 </table>
53   -
54 53 <h3>Paths and Permissions</h3>
55   -
56 54 <table class="conf_paths">
57 55 <?php
58 56 if($errors || $warnings) {
... ...
setup/wizard/templates/dependencies.tpl
  View file @dda957a
1   -<!--<form id="license_dependencies_configuration" action="index.php?step_name=<?php //echo $step_name; ?>" method="post">-->
2 1 <form id="installtype_dependencies_configuration" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
3 2 <p class="title">Checking PHP Dependencies</p>
4 3 <p class="description">
5   - The wizard will review your system to determine whether you have the right PHP components in place to run KnowledgeTree. <!--<br/> -->
  4 + The wizard will review your system to determine whether you have the right PHP components in place to run KnowledgeTree.
6 5 Once the scan is completed, you&rsquo;ll see whether your system has met the requirements or whether there are areas you need to address.
7 6 </p>
8 7 <!--Continue Message-->
... ... @@ -12,7 +11,6 @@
12 11 <span class='big_ok'>&nbsp;&nbsp;&nbsp;</span>
13 12 <span class='description'>Congratulations! Your system is ready to run KnowledgeTree. Click <b>Next</b> to continue.</span>
14 13 <br/>
15   -<!-- <br/>-->
16 14 <?php
17 15 }
18 16 ?>
... ... @@ -35,7 +33,7 @@
35 33 $iconFlag = "<span class='{$php}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>";
36 34 $checkHeading = "<h3 style='width:30%; float:left'>".$iconFlag."PHP Version Check</h3>";
37 35 ?>
38   -<!-- PHP Version Check</h3>-->
  36 +<!--PHP Version Check</h3>-->
39 37 <?php if($silent) { ?>
40 38 <?php if($versionSection) {
41 39 $details = 'Hide Details';
... ... @@ -57,7 +55,6 @@
57 55 $phpVersionCheck .= "<p class='description dependencies'>Your version of PHP must be between 5.0 and 5.2 to run optimally. Versions that are 5.3 or higher are not recommended.</p>";
58 56 ?>
59 57 <?php $phpVersionCheck .= "<span class='{$version['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$version['version']}"; ?>
60   - <?php //echo "<span class='{$version['class']}'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>{$version['version']}"; ?>
61 58 <?php if($version['class'] != 'tick') { ?>
62 59 <?php if (AJAX) { ?>
63 60 <?php $phpVersionCheck .= "<a href='#' class='refresh' onclick='w.refresh('dependencies')'>Refresh</a>"; ?>
... ...
setup/wizard/templates/installtype.tpl
  View file @dda957a
1 1 <form id="license_installtype_dependencies" action="index.php?step_name=<?php echo $step_name; ?>" method="post">
2 2 <p class="title">Installation Type</p>
3   -
4 3 <div id="step_content" class="step">
5 4 Select an installation type
6 5 <br/><br/>
... ... @@ -24,9 +23,4 @@
24 23 <input type="submit" name="Previous" value="Previous" class="button_previous"/>
25 24 <input type="submit" name="Next" value="Next" class="button_next" />
26 25 </form>
27   -<script type="text/javascript">
28   - function clear() {
29   -
30   - }
31   -</script>
32 26 <?php if (AJAX) { echo $html->js('form.js'); } ?>
33 27 \ No newline at end of file
... ...
setup/wizard/templates/license.tpl
  View file @dda957a
... ... @@ -6,9 +6,8 @@
6 6 }
7 7 }?>
8 8 <p class="description_1">
9   -Read and accept the license agreement below before continuing with the setup.
  9 + Read and accept the license agreement below before continuing with the setup.
10 10 </p>
11   -
12 11 <?php if(!empty($errors)) { ?>
13 12 <div class="license_agreement" tabindex="-1" style="height:270px;">
14 13 <?php } else { ?>
... ...
setup/wizard/templates/registration.tpl
  View file @dda957a
... ... @@ -3,20 +3,16 @@
3 3 <?php } else { ?>
4 4 <form id="registration" action="index.php?step_name=<?php echo $step_name; ?>" method="post" onsubmit="javascript:{ if(w.validateRegistration()) { w.sendRegistration() };return false;}">
5 5 <?php } ?>
6   -
7 6 <p class="title">Registering KnowledgeTree</p>
8   - <?php
9   - //echo $sel_country;
10   - ?>
11 7 <p class="description">
12   - Register your KnowledgeTree installation and receive the KnowledgeTree Drop Box for Windows software, a drag and drop tool that makes placing documents into KnowledgeTree even easier.
  8 + Register your KnowledgeTree installation and receive the KnowledgeTree Drop Box for Windows software, a drag and drop tool that makes placing documents into KnowledgeTree even easier.
13 9 <?php if(AJAX) { ?>
14 10 <a href='#' onclick='javascript:{w.getUrl("index.php?step_name=install", "content_container");}'>Skip Registration</a>
15 11 <?php } else { ?>
16 12 <a href="index.php?step_name=install">Skip Registration</a>
17 13 <?php } ?>
18 14 </p>
19   - <!-- Hidden Fields -->
  15 +<!-- Hidden Fields -->
20 16 <input type="hidden" id="sendAll" name="" value="" />
21 17 <input type="hidden" id="state" name="" />
22 18 <p class='disclaimer'>
... ... @@ -36,7 +32,6 @@
36 32 <td rowspan='<?php echo $rowspan; ?>' width='5%'>&nbsp;</td>
37 33 <td rowspan='<?php echo $rowspan; ?>'> <?php echo $html->image('dropbox.png'); ?> </td>
38 34 </tr>
39   -
40 35 <tr>
41 36 <td><label for='last'>Last Name</label></td>
42 37 <td><input value="<?php echo $last_name; ?>" name='submitted[last_name]' id='last' size='<?php echo $input_width; ?>' style="float:left;"/></td>
... ... @@ -59,7 +54,6 @@
59 54 }
60 55  
61 56 }
62   -
63 57 echo $str;
64 58 ?>
65 59 </select>
... ... @@ -78,7 +72,6 @@
78 72 $str .= "<option name='{$code}' value='{$industry}'>{$industry}</option>";
79 73 }
80 74 }
81   -
82 75 echo $str;
83 76 ?>
84 77 </select>
... ... @@ -104,11 +97,9 @@
104 97 </td>
105 98 </tr>
106 99 </table>
107   -
108 100 <input type='hidden' name='form_id' value='webform_client_form_242' />
109 101 <input type='hidden' name='op' value='Submit' />
110 102 </div>
111   -
112 103 <input type="submit" name="Previous" value="Previous" onclick="w.pClick()" class="button_previous"/>
113 104 <input type="submit" name="Next" value="Register" onclick="w.nClick()" class="button_next"/>
114 105 </form>
... ...