This is an automated email from the git hooks/post-receive script.

glondu pushed a commit to branch master
in repository nurpawiki.

commit c580e64664b257269e577a29980afde81407669b
Author: Stephane Glondu <st...@glondu.net>
Date:   Sun Feb 7 14:04:03 2016 +0100

    Port to Eliom 4.2
---
 debian/patches/0008-Port-to-Eliom-4.2.patch | 206 ++++++++++++++++++++++++++++
 debian/patches/series                       |   1 +
 2 files changed, 207 insertions(+)

diff --git a/debian/patches/0008-Port-to-Eliom-4.2.patch 
b/debian/patches/0008-Port-to-Eliom-4.2.patch
new file mode 100644
index 0000000..d5da7a4
--- /dev/null
+++ b/debian/patches/0008-Port-to-Eliom-4.2.patch
@@ -0,0 +1,206 @@
+From: Stephane Glondu <st...@glondu.net>
+Date: Sun, 7 Feb 2016 14:00:11 +0100
+Subject: Port to Eliom 4.2
+
+Visible changes: table x xs -> table (x :: xs)
+---
+ history.ml        |  4 ++--
+ html_util.ml      | 10 +++++-----
+ main.ml           |  4 ++--
+ page_revisions.ml |  4 ++--
+ scheduler.ml      | 14 +++++++-------
+ session.ml        |  6 +++---
+ user_editor.ml    | 16 ++++++++--------
+ 7 files changed, 29 insertions(+), 29 deletions(-)
+
+diff --git a/history.ml b/history.ml
+index 604ecb1..bb8b01e 100644
+--- a/history.ml
++++ b/history.ml
+@@ -150,11 +150,11 @@ let view_history_page ~cur_user ~nth_page =
+   let activity_groups = group_activities activity activity_in_pages in
+ 
+   let act_table = 
+-    table ~a:[a_class ["todo_table"]]
++    table ~a:[a_class ["todo_table"]] @@
+       (tr [th [];
+            th [pcdata "Activity"];
+            th [pcdata "By"];
+-           th [pcdata "Details"]])
++           th [pcdata "Details"]]) ::
+       (List.rev
+          (fst 
+             (RSMap.fold
+diff --git a/html_util.ml b/html_util.ml
+index 031b823..fd68a6a 100644
+--- a/html_util.ml
++++ b/html_util.ml
+@@ -105,16 +105,16 @@ let navbar_html ~cur_user ?(top_info_bar=[]) 
?(wiki_revisions_link=[]) ?(wiki_pa
+ 
+   [div ~a:[a_id "topbar"]
+      [table ~a:[a_class ["top_menu_size"]]
+-        (tr
++        [tr
+            [td ~a:[a_class ["top_menu_left_align"]]
+               [table
+-                 (tr [td [home_link
++                 [tr [td [home_link
+                             [img ~alt:"Home" ~src:(make_static_uri 
["home.png"]) ();
+                              pcdata "Home"]];
+                       td [scheduler_link];
+                       td [history_link];
+-                      td wiki_page_links])
+-                 []];
++                      td wiki_page_links]]
++                 ];
+             td ~a:[a_class ["top_menu_right_align"]]
+               ([a ~service:about_page [pcdata "About"] ()] @
+                  [pcdata " "] @
+@@ -122,7 +122,7 @@ let navbar_html ~cur_user ?(top_info_bar=[]) 
?(wiki_revisions_link=[]) ?(wiki_pa
+                  [pcdata " "] @
+                  edit_users_link @
+                  [pcdata " "] @
+-                 disconnect_link)]) []]]
++                 disconnect_link)]]]]
+   @
+     (if top_info_bar = [] then [] else [div ~a:[a_id "top_action_bar"] 
top_info_bar])
+   @
+diff --git a/main.ml b/main.ml
+index 8d9a1a1..e51941f 100644
+--- a/main.ml
++++ b/main.ml
+@@ -446,9 +446,9 @@ let todo_list_table_html ~cur_user cur_page todos =
+   let priority_changes = Session.any_task_priority_changes () in
+ 
+   return &
+-  table ~a:[a_class ["todo_table"]]
++  table ~a:[a_class ["todo_table"]] @@
+     (tr 
+-       [th [pcdata "Id"]; th [pcdata "Description"]])
++       [th [pcdata "Id"]; th [pcdata "Description"]]) ::
+     (List.map
+        (fun todo ->
+           let id = todo.t_id in
+diff --git a/page_revisions.ml b/page_revisions.ml
+index 95c45f4..7f04026 100644
+--- a/page_revisions.ml
++++ b/page_revisions.ml
+@@ -44,8 +44,8 @@ let revision_table page_descr =
+       revisions in
+ 
+   return
+-    [table
+-       (tr [th [pcdata "Revision"]; th [pcdata "When"]; th [pcdata "Changed 
by"]])
++    [table @@
++       (tr [th [pcdata "Revision"]; th [pcdata "When"]; th [pcdata "Changed 
by"]]) ::
+        rows]
+ 
+ 
+diff --git a/scheduler.ml b/scheduler.ml
+index d0e0336..b9d52bf 100644
+--- a/scheduler.ml
++++ b/scheduler.ml
+@@ -122,11 +122,11 @@ let view_scheduler_page ~cur_user =
+        parameter passing of pages. *)
+     let table () = 
+       [p [raw_input ~input_type:`Submit ~value:"Mass edit" ()];
+-       table
+-         (tr [th []; th []; th []; th [pcdata "Activates on"]; th [pcdata 
"Todo"]])
++       table @@
++         (tr [th []; th []; th []; th [pcdata "Activates on"]; th [pcdata 
"Todo"]]) ::
+          (todo_section merged_todos todos_in_pages);
+        table
+-         (tr 
++         [tr
+             [td [button
+                    ~a:[a_class ["scheduler_check_button"];
+                        a_id "button_select_all"]
+@@ -135,8 +135,8 @@ let view_scheduler_page ~cur_user =
+              td [button
+                    ~a:[a_class ["scheduler_check_button"];
+                        a_id "button_deselect_all"]
+-                   ~button_type:`Button [pcdata "Unselect All"]]])
+-         []] in
++                   ~button_type:`Button [pcdata "Unselect All"]]]]
++         ] in
+     
+     let table' = 
+       post_form edit_todo_page table (ET_scheduler, None) in
+@@ -232,9 +232,9 @@ let rec render_todo_editor ~cur_user (src_page_cont, 
todos_to_edit) =
+     (* See nurpawiki_calendar.js for JavaScript calendar binding
+        details. *)
+     let create_listform f = 
+-      [table 
++      [table @@
+          (tr [th [pcdata "ID"];
+-              th [pcdata "Description"]; th [pcdata "Activates on"]])
++              th [pcdata "Description"]; th [pcdata "Activates on"]]) ::
+          (f.it
+             (fun (tv_id,(tv_act_date,(tv_descr,tv_owner_id))) todo accu ->
+                let pri_style = 
+diff --git a/session.ml b/session.ml
+index a9228a5..6db4c21 100644
+--- a/session.ml
++++ b/session.ml
+@@ -109,9 +109,9 @@ let login_html ~err =
+           [post_form connect_action
+              (fun (loginname,passwd) ->
+                 [table ~a:[a_class ["login_box"]]
+-                   (tr [td ~a:[a_class ["login_text"]]
+-                          (pcdata "Welcome to Nurpawiki!"::help_text)])
+-                   [tr [td [pcdata ""]];
++                   [tr [td ~a:[a_class ["login_text"]]
++                          (pcdata "Welcome to Nurpawiki!"::help_text)];
++                    tr [td [pcdata ""]];
+                     tr [td ~a:[a_class ["login_text_descr"]]
+                           [pcdata "Username:"]];
+                     tr [td [string_input ~input_type:`Text ~name:loginname 
()]];
+diff --git a/user_editor.ml b/user_editor.ml
+index a1eeea2..3335d6a 100644
+--- a/user_editor.ml
++++ b/user_editor.ml
+@@ -48,12 +48,12 @@ let service_save_user_edit =
+ let rec view_user_admin_page ~err ~cur_user =
+   lwt users = Db.query_users () in
+   let users_table = 
+-    table 
++    table @@
+       (tr 
+          [th [pcdata "Id"];
+           th [pcdata "Login"];
+           th [pcdata "Real Name"];
+-          th [pcdata "E-mail"]])
++          th [pcdata "E-mail"]]) ::
+       (List.map 
+          (fun user ->
+             tr 
+@@ -75,10 +75,10 @@ let rec view_user_admin_page ~err ~cur_user =
+                (fun (login,(passwd,(passwd2,(name,email)))) ->
+                   [h2 [pcdata "Create a new user"];
+                    (table
+-                      (tr
+-                         [td [pcdata "Login:"];
+-                          td [string_input ~input_type:`Text ~name:login ()]])
+                       [tr
++                         [td [pcdata "Login:"];
++                          td [string_input ~input_type:`Text ~name:login ()]];
++                       tr
+                          [td [pcdata "Password:"];
+                           td [string_input ~input_type:`Password ~name:passwd 
()]];
+ 
+@@ -156,11 +156,11 @@ let _ =
+ 
+ let save_user_prefs c_passwd c_passwd2 (c_name,old_name) (c_email,old_email) =
+   (table
+-     (tr
++     [tr
+         [td [pcdata "New Password:"];
+          td [string_input ~input_type:`Password ~name:c_passwd ()];
+-        ])
+-     [tr
++        ];
++      tr
+         [td [pcdata "Re-type Password:"];
+          td [string_input ~input_type:`Password ~name:c_passwd2 ()]];
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 828b566..24494ce 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-Replace-ocsigen_ext-by-ocsigen.ext-in-conf-template.patch
 0006-Port-to-Ocsigen-2-Eliom-3.patch
 0007-Port-to-Eliom-4.patch
+0008-Port-to-Eliom-4.2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-ocaml-maint/packages/nurpawiki.git

_______________________________________________
Pkg-ocaml-maint-commits mailing list
Pkg-ocaml-maint-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits

Reply via email to