/lenasys/trunk : revision 21

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: Gustav Hartvigsson
Date: 2013-04-08 08:05:58 UTC
mfrom: (19.4.4 lenasys)
Revision ID: gustav.hartvigsson@gmail.com-20130408080558-0o7itutyu7jrn48b

Note to self: "bzr resolve --all" works like magic.
Merged implementation group 1's branch.
20130408.

files added:
CodeViewer/Lindex.css

CodeViewer/Lindex.js

codehighlighterimpl/DomExample1.php

codehighlighterimpl/css

codehighlighterimpl/css/codeviewer.css

codehighlighterimpl/js

codehighlighterimpl/js.txt

codehighlighterimpl/js/codeviewer.js

files removed:
ErModeller/dugga.js

codehighlighterimpl/DomExample1.htm

files modified:
Code Tokenizer and Parser/Parser_Test.css

Code Tokenizer and Parser/Parser_Test.html

Code Tokenizer and Parser/Parser_Test.js

Code Viewer Alt/AJAX/AjaxDemoApp0_getCustomer.php

Code Viewer Alt/AJAX/AjaxDemoApp1_storeCustomer.php

Code Viewer Alt/Codeviewer/showcode.php

Code Viewer Alt/Codeviewer/showsource.php

Code Viewer Alt/index.js

Code Viewer Alt/style.css

CodeViewer/Lindex.html

CodeViewer/codeviewer.js

CodeViewer/codeviewer.php

CodeViewer/codeviewerfunctions.php

DuggaSys/duggor/Dugga 3 Datorgrafik - Transformationer/dugga_datorgrafik_1_transforms.php

DuggaSys/duggor/index.html

DuggaSys/index.php

ErModeller/canvas.css

ErModeller/canvas.js

ErModeller/canvas_ER_demo_duggajs.html

WebGL and Benchmarking/Benchy.php

codehighlighterimpl/index.php

codehighlighterimpl/showcode.php

Show diffs side-by-side

added added

removed removed

Code Viewer Alt/AJAX/AjaxDemoApp1_storeCustomer.php

<!DOCTYPE html>

<html>

<head>

</head>

<<<<<<< TREE

<body>

<?php

include("../Codeviewer/showcode.php");

menulayout("AjaxDemoApp2_getCustomerBookings.php","AjaxDemoApp0_getCustomer.php","AjaxDemoApp1_storeCustomer.txt","AJAX Example 1: Creation of Customer","AjaxDemoApp1_storeCustomer.html","AjaxDemoApp1_storeCustomer1.html");

$interestingrows = array(array(7,26,"Ajax function"),array(28,36,"Ajax return function"));

$keywords = array("makeCustomer","storeCustomer","ResultCustomer","customerID");

$highlight = array(array("{","highlightnormal"),array("}","highlightnormal"),array("function","highlightspecial"));

showfile($interestingrows,$keywords,$highlight,"AjaxDemoApp1_storeCustomer.html");

menulayoutend();

</body>

=======

<?php

</body>

>>>>>>> MERGE-SOURCE

</html>

Older »