From f558299f49f25443d6ecdb710d552b19a068267f Mon Sep 17 00:00:00 2001 From: Damian Helme Date: Tue, 15 Nov 2011 16:55:13 +0000 Subject: [PATCH] tidying up before pushing to github --- src/main/scala/bootstrap/liftweb/Boot.scala | 5 +- src/main/scala/code/snippet/ReqVarOps.scala | 117 +------------------- src/main/webapp/eventeditonly.html | 6 - src/main/webapp/simply4-2.html | 14 --- src/main/webapp/stringeditonly.html | 6 - 5 files changed, 4 insertions(+), 144 deletions(-) delete mode 100755 src/main/webapp/eventeditonly.html delete mode 100755 src/main/webapp/simply4-2.html delete mode 100755 src/main/webapp/stringeditonly.html diff --git a/src/main/scala/bootstrap/liftweb/Boot.scala b/src/main/scala/bootstrap/liftweb/Boot.scala index 89e9187..1c731c5 100644 --- a/src/main/scala/bootstrap/liftweb/Boot.scala +++ b/src/main/scala/bootstrap/liftweb/Boot.scala @@ -44,14 +44,11 @@ class Boot { def sitemap = SiteMap( Menu.i("Home") / "index", // >> User.AddUserMenusAfter, // the simple way to declare a menu - Menu("Simply Lift 4.2") / "simply4-2" , Menu("ReqVar String Edit") / "reqvarstringedit" >> Hidden, Menu("ReqVar String List") / "reqvarstringlist", Menu("ReqVar Event Edit") / "reqvareventedit" >> Hidden, Menu("ReqVar Event List") / "reqvareventlist", - Menu("ReqVar Event Edit Only") / "reqvareventeditonly", - Menu("Event Edit Only") / "eventeditonly", - Menu("String Edit Only") / "stringeditonly" + Menu("ReqVar Event Edit Only") / "reqvareventeditonly" // more complex because this menu allows anything in the // /static path to be visible //Menu(Loc("Static", Link(List("static"), true, "/static/index"), "Static Content")) diff --git a/src/main/scala/code/snippet/ReqVarOps.scala b/src/main/scala/code/snippet/ReqVarOps.scala index b6459f4..a095bad 100755 --- a/src/main/scala/code/snippet/ReqVarOps.scala +++ b/src/main/scala/code/snippet/ReqVarOps.scala @@ -66,49 +66,13 @@ class ReqVarEventEditOnly extends Logger { debug("eventVar.notes before being set: " + eventVarEdit.is.notes) debug("dummy is: " + Dummy.time) eventVarEdit.is.notes(name) - debug("...done in callback to set name") + debug("...done in callback to setNotes") } def edit = { "name=name" #> SHtml.text(eventVarEdit.is.eventName.is, setName(_)) & "name=notes" #> SHtml.text(eventVarEdit.is.notes.is, setNotes(_)) & - "type=submit" #> SHtml.onSubmitUnit(() => {debug("processing submit for name: " + eventVarEdit.is.eventName.is )}) - } - -} - -class EventEditOnly extends Logger { - - var event = Event.create.eventName("default") - - def setName(name: String ) = { - debug("in callback to setName with value: " + name + " ....\n") - debug("name before being set: " + event.eventName ) - event.eventName( name ) - debug("...done in callback to setNme\n") - } - - def edit = { - "name=name" #> SHtml.text(event.eventName.is, setName(_)) & - "type=submit" #> SHtml.onSubmitUnit(() => {debug("processing submit for name: " + event.eventName.is )}) - } - -} - -class StringEditOnly extends Logger { - - var myName = "default" - - def setName(name: String ) = { - debug("in callback to setNme with value: " + name + " ....\n") - debug("name before being set: " + myName ) - myName = name - debug("...done in callback to setNme\n") - } - - def edit = { - "name=name" #> SHtml.text(myName, setName(_)) & - "type=submit" #> SHtml.onSubmitUnit(() => {debug("processing submit for name")}) + "type=submit" #> SHtml.onSubmitUnit(() => {debug("processing submit for name" )}) } } @@ -144,7 +108,6 @@ object OnSubmit { "type=submit" #> SHtml.onSubmitUnit(() => { println("processing submit") } ) } } -////////////////////////////////////////////////////////// */ object OnSubmit { var name = "" var age = 0 @@ -153,9 +116,9 @@ object OnSubmit { "type=submit" #> SHtml.onSubmitUnit(() => { println("processing submit") } ) } } +////////////////////////////////////////////////////////// */ /* State not preserved: * - // tidied + vars moved out of render + onSubmit => text + object -> class class OnSubmit { var name = "" @@ -225,78 +188,4 @@ object OnSubmit { } ================================================= - */ - /* -object OnSubmit extends Logger { - var myName = "" - - def setName(name: String ) = { - debug("in callback to set name....\n") - debug("name before being set: " + myName ) - myName = name - debug("...done in callback to set name\n") - } - - def render = { - "name=name" #> SHtml.text(myName, myName = _ ) & - "type=submit" #> SHtml.onSubmitUnit(() => debug("processing submit")) - } -} - -object OnSubmit { - def render = { - var name = "" - var age = 0 - // define some variables to put our values into - // process the form - def process() { - // if the age is < 13, display an error - if (age < 13) S.error("Too young!") - else { - // otherwise give the user feedback and - // redirect to the home page - S.notice("Name: "+name) - S.notice("Age: "+age) - S.redirectTo("/") - } - } - // associate each of the form elements - // with a function... behavior to perform when the - // for element is submitted - "name=name" #> SHtml.onSubmit(name = _) & // set the name - // set the age variable if we can convert to an Int - "name=age" #> SHtml.onSubmit(s => asInt(s).foreach(age = _)) & - // when the form is submitted, process the variable - "type=submit" #> SHtml.onSubmitUnit(process) - } -} - */ -/* - * object OnSubmit { - def render = { - var name = "" - var age = 0 - // define some variables to put our values into - // process the form - def process() { - // if the age is < 13, display an error - if (age < 13) S.error("Too young!") - else { - // otherwise give the user feedback and - // redirect to the home page - S.notice("Name: "+name) - S.notice("Age: "+age) - S.redirectTo("/") - } - } - // associate each of the form elements - // with a function... behavior to perform when the - // for element is submitted - "name=name" #> SHtml.onSubmit(name = _) & // set the name - // set the age variable if we can convert to an Int - "name=age" #> SHtml.onSubmit(s => asInt(s).foreach(age = _)) & - // when the form is submitted, process the variable - "type=submit" #> SHtml.onSubmitUnit(process) - } -} */ \ No newline at end of file diff --git a/src/main/webapp/eventeditonly.html b/src/main/webapp/eventeditonly.html deleted file mode 100755 index 19ea96c..0000000 --- a/src/main/webapp/eventeditonly.html +++ /dev/null @@ -1,6 +0,0 @@ -
-
- Name:
- -
-
\ No newline at end of file diff --git a/src/main/webapp/simply4-2.html b/src/main/webapp/simply4-2.html deleted file mode 100755 index 45184a5..0000000 --- a/src/main/webapp/simply4-2.html +++ /dev/null @@ -1,14 +0,0 @@ -
-
- Using Lift's SHtml.onSubmit, we've got better control - over the form processing. -
- -
-
- Name:
- Age:
- -
-
-
\ No newline at end of file diff --git a/src/main/webapp/stringeditonly.html b/src/main/webapp/stringeditonly.html deleted file mode 100755 index 976744c..0000000 --- a/src/main/webapp/stringeditonly.html +++ /dev/null @@ -1,6 +0,0 @@ -
-
- Name:
- -
-
\ No newline at end of file