Move html modules under calp.

4 files changed, 22 insertions, 22 deletions

diff --git a/module/html/view/calendar.scm b/module/calp/html/view/calendar.scm
index aa67220c..67a1a7b5 100644
--- a/module/html/view/calendar.scm
+++ b/module/calp/html/view/calendar.scm
@@ -1,4 +1,4 @@
-(define-module (html view calendar)
+(define-module (calp html view calendar)
   :use-module (util)
   :use-module (vcomponent)
   :use-module ((vcomponent datetime)
@@ -6,17 +6,17 @@
   :use-module ((vcomponent build)
                :select (vcalendar vevent))
   :use-module (datetime)
-  :use-module (html components)
-  :use-module ((html vcomponent)
+  :use-module (calp html components)
+  :use-module ((calp html vcomponent)
                :select (popup
                         calendar-styles
                         fmt-day
                         make-block
                         fmt-single-event
                                           ))
-  :use-module (html config)
-  :use-module (html util)
-  :use-module ((html caltable) :select (cal-table))
+  :use-module (calp html config)
+  :use-module (calp html util)
+  :use-module ((calp html caltable) :select (cal-table))
 
   :use-module (util config)
 
diff --git a/module/html/view/calendar/month.scm b/module/calp/html/view/calendar/month.scm
index 99640a22..ce8957da 100644
--- a/module/html/view/calendar/month.scm
+++ b/module/calp/html/view/calendar/month.scm
@@ -1,16 +1,16 @@
-(define-module (html view calendar month)
+(define-module (calp html view calendar month)
   :use-module (util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
   :use-module (datetime)
-  :use-module (html view calendar shared)
-  :use-module (html config)
+  :use-module (calp html view calendar shared)
+  :use-module (calp html config)
   :use-module (vcomponent)
   :use-module ((vcomponent datetime)
                :select (really-long-event?
                         events-between))
-  :use-module ((html vcomponent)
+  :use-module ((calp html vcomponent)
                :select (make-block))
   :use-module ((vcomponent group)
                :select (group-stream get-groups-between))
@@ -80,8 +80,8 @@
     ;; These popups are relative the document root. Can thus be placed anywhere in the DOM.
     ,@(for event in (stream->list
                      (events-between start-date end-date events))
-           ((@ (html vcomponent) popup) event
-            (string-append "popup" ((@ (html util) html-id) event))))
+           ((@ (calp html vcomponent) popup) event
+            (string-append "popup" ((@ (calp html util) html-id) event))))
     ))
 
 
diff --git a/module/html/view/calendar/shared.scm b/module/calp/html/view/calendar/shared.scm
index d1f58460..73698060 100644
--- a/module/html/view/calendar/shared.scm
+++ b/module/calp/html/view/calendar/shared.scm
@@ -1,4 +1,4 @@
-(define-module (html view calendar shared)
+(define-module (calp html view calendar shared)
   :use-module (util)
   :use-module (srfi srfi-1)
   :use-module (vcomponent)
@@ -10,10 +10,10 @@
                :select (format-summary))
   :use-module (util tree)
   :use-module (datetime)
-  :use-module (html config)
-  :use-module ((html components)
+  :use-module (calp html config)
+  :use-module ((calp html components)
                :select (btn tabset))
-  :use-module ((html vcomponent)
+  :use-module ((calp html vcomponent)
                :select (make-block) )
   )
 
diff --git a/module/html/view/calendar/week.scm b/module/calp/html/view/calendar/week.scm
index 34e8eeb4..ca6aa9f8 100644
--- a/module/html/view/calendar/week.scm
+++ b/module/calp/html/view/calendar/week.scm
@@ -1,18 +1,18 @@
-(define-module (html view calendar week)
+(define-module (calp html view calendar week)
   :use-module (util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (datetime)
-  :use-module (html view calendar shared)
-  :use-module (html config)
-  :use-module (html util)
+  :use-module (calp html view calendar shared)
+  :use-module (calp html config)
+  :use-module (calp html util)
   :use-module (vcomponent)
   :use-module ((vcomponent datetime)
                :select (long-event?
                         event-length/day
                         event-zero-length?
                         events-between))
-  :use-module ((html vcomponent)
+  :use-module ((calp html vcomponent)
                :select (make-block) )
   :use-module ((vcomponent group)
                :select (group-stream get-groups-between))
@@ -46,7 +46,7 @@
 
                 ,@(for event in (stream->list
                                  (events-between start-date end-date events))
-                       ((@ (html vcomponent ) popup) event (string-append "popup" (html-id event))))
+                       ((@ (calp html vcomponent ) popup) event (string-append "popup" (html-id event))))
 
                 )))))