Changeset 593 for branches/stable/templates

Timestamp:

05/14/13 18:10:22 (11 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Merge /trunk r517 (merge /branches/htmlform)
Conflicts all resolved towards /trunk.
Fix a minor syntax error with "while (@data..." -> "while (my @data..."
(may cause merge conflicts later)

Location:

branches/stable

Files:

• . (modified) (1 prop)
• templates (copied) (copied from trunk/templates )
• templates/aclerror.tmpl (copied) (copied from trunk/templates/aclerror.tmpl )
• templates/addmaster.tmpl (copied) (copied from trunk/templates/addmaster.tmpl )
• templates/admin (copied) (copied from trunk/templates/admin )
• templates/admin/aclerr.tmpl (copied) (copied from trunk/templates/admin/aclerr.tmpl )
• templates/admin/addnotice.tmpl (copied) (copied from trunk/templates/admin/addnotice.tmpl )
• templates/admin/alloc.tmpl (copied) (copied from trunk/templates/admin/alloc.tmpl )
• templates/admin/alloctweak.tmpl (copied) (copied from trunk/templates/admin/alloctweak.tmpl )
• templates/admin/confirm.tmpl (copied) (copied from trunk/templates/admin/confirm.tmpl )
• templates/admin/dberr.tmpl (copied) (copied from trunk/templates/admin/dberr.tmpl )
• templates/admin/delnotice.tmpl (copied) (copied from trunk/templates/admin/delnotice.tmpl )
• templates/admin/deluser.tmpl (copied) (copied from trunk/templates/admin/deluser.tmpl )
• templates/admin/dunno.tmpl (copied) (copied from trunk/templates/admin/dunno.tmpl )
• templates/admin/edcust.tmpl (copied) (copied from trunk/templates/admin/edcust.tmpl )
• templates/admin/ednotice.tmpl (copied) (copied from trunk/templates/admin/ednotice.tmpl )
• templates/admin/emailnotice.tmpl (copied) (copied from trunk/templates/admin/emailnotice.tmpl )
• templates/admin/header.tmpl (copied) (copied from trunk/templates/admin/header.tmpl )
• templates/admin/listcust.tmpl (copied) (copied from trunk/templates/admin/listcust.tmpl )
• templates/admin/main.tmpl (copied) (copied from trunk/templates/admin/main.tmpl )
• templates/admin/newuser.tmpl (copied) (copied from trunk/templates/admin/newuser.tmpl )
• templates/admin/showallocs.tmpl (copied) (copied from trunk/templates/admin/showallocs.tmpl )
• templates/admin/showpools.tmpl (copied) (copied from trunk/templates/admin/showpools.tmpl )
• templates/admin/showusers.tmpl (copied) (copied from trunk/templates/admin/showusers.tmpl )
• templates/admin/touch.tmpl (copied) (copied from trunk/templates/admin/touch.tmpl )
• templates/admin/tweakpool.tmpl (copied) (copied from trunk/templates/admin/tweakpool.tmpl )
• templates/admin/updacl.tmpl (copied) (copied from trunk/templates/admin/updacl.tmpl )
• templates/admin/update.tmpl (copied) (copied from trunk/templates/admin/update.tmpl )
• templates/admin/updatepool.tmpl (copied) (copied from trunk/templates/admin/updatepool.tmpl )
• templates/admin/updcust.tmpl (copied) (copied from trunk/templates/admin/updcust.tmpl )
• templates/admin/updnotice.tmpl (copied) (copied from trunk/templates/admin/updnotice.tmpl )
• templates/assign.tmpl (copied) (copied from trunk/templates/assign.tmpl )
• templates/confirm.tmpl (copied) (copied from trunk/templates/confirm.tmpl )
• templates/dberr.tmpl (copied) (copied from trunk/templates/dberr.tmpl )
• templates/delete.tmpl (copied) (copied from trunk/templates/delete.tmpl )
• templates/dunno.tmpl (copied) (copied from trunk/templates/dunno.tmpl )
• templates/edit.tmpl (copied) (copied from trunk/templates/edit.tmpl )
• templates/finaldelete.tmpl (copied) (copied from trunk/templates/finaldelete.tmpl )
• templates/footer.tmpl (copied) (copied from trunk/templates/footer.tmpl )
• templates/header.tmpl (copied) (copied from trunk/templates/header.tmpl )
• templates/index.tmpl (copied) (copied from trunk/templates/index.tmpl )
• templates/insert.tmpl (copied) (copied from trunk/templates/insert.tmpl )
• templates/listpool.tmpl (copied) (copied from trunk/templates/listpool.tmpl )
• templates/newcity.tmpl (copied) (copied from trunk/templates/newcity.tmpl )
• templates/newmaster.tmpl (copied) (copied from trunk/templates/newmaster.tmpl )
• templates/newnode.tmpl (copied) (copied from trunk/templates/newnode.tmpl )
• templates/nodesearch.tmpl (copied) (copied from trunk/templates/nodesearch.tmpl )
• templates/search (copied) (copied from trunk/templates/search )
• templates/search/compsearch.tmpl (copied) (copied from trunk/templates/search/compsearch.tmpl )
• templates/search/sresults.tmpl (copied) (copied from trunk/templates/search/sresults.tmpl )
• templates/showmaster.tmpl (copied) (copied from trunk/templates/showmaster.tmpl )
• templates/showrouted.tmpl (copied) (copied from trunk/templates/showrouted.tmpl )
• templates/subnet-calc.tmpl (copied) (copied from trunk/templates/subnet-calc.tmpl )
• templates/update.tmpl (copied) (copied from trunk/templates/update.tmpl )
• templates/widgets.js (copied) (copied from trunk/templates/widgets.js )