From d2ddd6abe74aa089e261c051b3ddf6c182dce011 Mon Sep 17 00:00:00 2001 From: Adam Chlipala Date: Thu, 22 Oct 2009 11:37:58 -0400 Subject: Title and abstract --- demo/more/conference.ur | 15 ++++++++++++--- demo/more/conference.urp | 1 + demo/more/conference.urs | 3 ++- demo/more/conference1.ur | 5 ++++- demo/more/conferenceFields.ur | 7 +++++++ demo/more/conferenceFields.urs | 5 +++++ demo/more/meta.ur | 19 +++++++++++++++++++ demo/more/meta.urs | 5 +++++ 8 files changed, 55 insertions(+), 5 deletions(-) create mode 100644 demo/more/conferenceFields.ur create mode 100644 demo/more/conferenceFields.urs (limited to 'demo/more') diff --git a/demo/more/conference.ur b/demo/more/conference.ur index 8d06e4cf..0a540fa0 100644 --- a/demo/more/conference.ur +++ b/demo/more/conference.ur @@ -2,8 +2,9 @@ open Meta functor Make(M : sig con paper :: {(Type * Type)} - constraint [Id, Title] ~ paper + constraint [Id] ~ paper val paper : $(map meta paper) + val paperFolder : folder paper con review :: {(Type * Type)} constraint [Paper, User] ~ review @@ -17,7 +18,7 @@ functor Make(M : sig CONSTRAINT Nam UNIQUE Nam sequence userId - con paper = [Id = int, Title = string] ++ map fst M.paper + con paper = [Id = int] ++ map fst M.paper table paper : paper PRIMARY KEY Id sequence paperId @@ -122,7 +123,7 @@ functor Make(M : sig } {if now < M.submissionDeadline then -
  • Submit
    •  +
  • Submit
    •  else } } @@ -132,4 +133,12 @@ functor Make(M : sig m <- main' (); return {m} + and submit () = return +

    Submit a Paper

    + +
    + {allWidgets M.paper M.paperFolder} +
    +     + end diff --git a/demo/more/conference.urp b/demo/more/conference.urp index 62ae39f9..cd064629 100644 --- a/demo/more/conference.urp +++ b/demo/more/conference.urp @@ -4,3 +4,4 @@ $/list meta bulkEdit conference +conferenceFields diff --git a/demo/more/conference.urs b/demo/more/conference.urs index 450725f9..1beb54a6 100644 --- a/demo/more/conference.urs +++ b/demo/more/conference.urs @@ -1,7 +1,8 @@ functor Make(M : sig con paper :: {(Type * Type)} - constraint [Id, Title] ~ paper + constraint [Id] ~ paper val paper : $(map Meta.meta paper) + val paperFolder : folder paper con review :: {(Type * Type)} constraint [Paper, User] ~ review diff --git a/demo/more/conference1.ur b/demo/more/conference1.ur index 5696e2f1..3fc5ff64 100644 --- a/demo/more/conference1.ur +++ b/demo/more/conference1.ur @@ -1,5 +1,8 @@ +open ConferenceFields + open Conference.Make(struct - val paper = {} + val paper = {Title = title, + Abstract = abstract} val review = {} val submissionDeadline = readError "2009-10-22 23:59:59" diff --git a/demo/more/conferenceFields.ur b/demo/more/conferenceFields.ur new file mode 100644 index 00000000..445b89b9 --- /dev/null +++ b/demo/more/conferenceFields.ur @@ -0,0 +1,7 @@ +open Meta + +con title = (string, string) +val title = string "Title" + +con abstract = (string, string) +val abstract = textarea "Abstract" diff --git a/demo/more/conferenceFields.urs b/demo/more/conferenceFields.urs new file mode 100644 index 00000000..9867db47 --- /dev/null +++ b/demo/more/conferenceFields.urs @@ -0,0 +1,5 @@ +con title :: (Type * Type) +val title : Meta.meta title + +con abstract :: (Type * Type) +val abstract : Meta.meta abstract diff --git a/demo/more/meta.ur b/demo/more/meta.ur index 2a8787f7..39aeb901 100644 --- a/demo/more/meta.ur +++ b/demo/more/meta.ur @@ -25,3 +25,22 @@ fun bool name = {Nam = name, , Parse = fn x => x, Inject = _} + +fun textarea name = {Nam = name, + Show = cdata, + Widget = fn [nm :: Name] =>
    , + WidgetPopulated = fn [nm :: Name] s =>
    + {[s]} +     , + Parse = fn s => s, + Inject = _} + +fun allWidgets [ts ::: {(Type * Type)}] (r : $(map meta ts)) (fl : folder ts) = + foldR [meta] [fn ts :: {(Type * Type)} => xml form [] (map snd ts)] + (fn [nm :: Name] [t :: (Type * Type)] [rest :: {(Type * Type)}] + [[nm] ~ rest] (col : meta t) (acc : xml form [] (map snd rest)) => + {[col.Nam]}: {col.Widget [nm]}
    + {useMore acc} +     ) + + [_] fl r diff --git a/demo/more/meta.urs b/demo/more/meta.urs index d4d626c5..17e8a9f3 100644 --- a/demo/more/meta.urs +++ b/demo/more/meta.urs @@ -10,3 +10,8 @@ val int : string -> meta (int, string) val float : string -> meta (float, string) val string : string -> meta (string, string) val bool : string -> meta (bool, bool) + +val textarea : string -> meta (string, string) + +val allWidgets : ts ::: {(Type * Type)} -> $(map meta ts) -> folder ts + -> xml form [] (map snd ts) -- cgit v1.2.3