/lenasys/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/lenasys/trunk

« back to all changes in this revision

Viewing changes to Code Viewer Alt/AJAX/AjaxDemoApp1_storeCustomer.php

  • Committer: Erik Wikström
  • Date: 2013-04-09 09:09:31 UTC
  • mfrom: (21 lenasys)
  • mto: (21.1.1 lenasys)
  • mto: This revision was merged to the branch mainline in revision 22.
  • Revision ID: wikxen@gmail.com-20130409090931-9jcs9kzg8et0912g
Remerged! Changed password hashes to VARCHAR(32)

Show diffs side-by-side

added added

removed removed

Lines of Context:
Code Viewer Alt/AJAX/AjaxDemoApp1_storeCustomer.php
 
1
<!DOCTYPE html>
1
2
<html>
2
3
        <head>
3
4
                <link rel="stylesheet" type="text/css" href="../Codeviewer/showcode.css">
4
5
                <script language="javascript" " src="../Codeviewer/showcode.js"></script>
5
6
        </head>
 
7
<<<<<<< TREE
 
8
        <body>
 
9
        <?php
 
10
 
 
11
                include("../Codeviewer/showcode.php");
 
12
                
 
13
                menulayout("AjaxDemoApp2_getCustomerBookings.php","AjaxDemoApp0_getCustomer.php","AjaxDemoApp1_storeCustomer.txt","AJAX Example 1: Creation of Customer","AjaxDemoApp1_storeCustomer.html","AjaxDemoApp1_storeCustomer1.html");
 
14
                
 
15
                $interestingrows = array(array(7,26,"Ajax function"),array(28,36,"Ajax return function"));
 
16
                $keywords = array("makeCustomer","storeCustomer","ResultCustomer","customerID");
 
17
                $highlight = array(array("{","highlightnormal"),array("}","highlightnormal"),array("function","highlightspecial"));
 
18
 
 
19
                showfile($interestingrows,$keywords,$highlight,"AjaxDemoApp1_storeCustomer.html");
 
20
 
 
21
                menulayoutend();
 
22
 
 
23
        ?>
 
24
 
 
25
        </body>
 
26
=======
6
27
 
7
28
<?php
8
29
 
9
30
        include("../Codeviewer/showcode.php");
10
31
        
11
 
        menulayout("AjaxDemoApp2_getCustomerBookings.php","AjaxDemoApp0_getCustomer.php","AjaxDemoApp1_storeCustomer.txt","AJAX Example 1: Creation of Customer","AjaxDemoApp1_storeCustomer.html","AjaxDemoApp1_storeCustomer1.html");
 
32
        menulayout("AjaxDemoApp2_getCustomerBookings.php","AjaxDemoApp0_getCustomer.php","AjaxDemoApp1_storeCustomer.txt","AJAX Example 1: Creation of Customer","AjaxDemoApp1_storeCustomer.html","AjaxDemoApp1_storeCustomer_description.html");
12
33
        
13
34
        $interestingrows = array(array(7,26,"Ajax function"),array(28,36,"Ajax return function"));
14
35
        $keywords = array("makeCustomer","storeCustomer","ResultCustomer","customerID");
21
42
?>
22
43
 
23
44
</body>
 
45
>>>>>>> MERGE-SOURCE
24
46
</html>