diff --git a/README.md b/README.md index ee15b84..a442cf1 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ connectivity to the browser or other websocket client (often a browser embedded in a native template application.) STATUS: CLOG is complete enough for most uses. See below for some -enhacements bing worked on, CLOG is actually based on GNOGA, a +enhacements being worked on, CLOG is actually based on GNOGA, a framework I wrote for Ada in 2013 and used in commercial production code for the last 8 years, i.e. the techiniques CLOG uses are solid and proven. @@ -40,7 +40,7 @@ or Browser control compiled to native code. CLOG uses websockets for communications and the browser to render a GUI that maintains an active soft realtime connection. For most CLOG applications all programming logic, events and decisions are done on the server -which can be local or remote over the web. +which can be local, or remote over the web. CLOG is developed on an M1 MacBook with ECL, it is tested fairly regulary with SCBL on Linux, Windows and Intel MacBook. It should diff --git a/tutorial/13-tutorial.lisp b/tutorial/13-tutorial.lisp index 37b36cf..3cb5735 100644 --- a/tutorial/13-tutorial.lisp +++ b/tutorial/13-tutorial.lisp @@ -6,10 +6,10 @@ (defun start-tutorial () "Start tutorial." - (format t "Tutorial 13 is a how to on building your own clog appliction.~%~ + (format t "Tutorial 13 is a how to on building your own clog application.~%~ Copy the directory - ~A~%~ to your ~~/common-lisp directory or other asdf / quicklisp~%~ - directory. Then follow the directions in the 13-tutorial ~%~ + directory. Then follow the directions in the 13-tutorial/README.md ~%~ directory." - (merge-pathnames "./tutorial/13-tutorial" + (merge-pathnames "./tutorial/13-tutorial/hello-clog/" (asdf:system-source-directory :clog)))) diff --git a/tutorial/14-tutorial.lisp b/tutorial/14-tutorial.lisp index bb563fe..a217e43 100644 --- a/tutorial/14-tutorial.lisp +++ b/tutorial/14-tutorial.lisp @@ -29,9 +29,9 @@ "

Local Storage vs Session Storage

The value of local storage persists in browser cache even after browser closed. -If you reset this page the session storage key will remain the same, but openning -in another window or tab will be a new session but if came from a click from this -window the session keys are copied first to the new window.

+If you reset this page the session storage key will remain the same, but opening +in another window or tab will be a new session, but if it came from a click from +this window the session keys are copied first to the new window.


Another Window = Different Session

diff --git a/tutorial/16-tutorial.lisp b/tutorial/16-tutorial.lisp index 071dbe5..d8851cb 100644 --- a/tutorial/16-tutorial.lisp +++ b/tutorial/16-tutorial.lisp @@ -25,7 +25,7 @@ (jumbo (create-div body :class "jumbotron text-center")) (jname (create-section jumbo :h1 :content "My First Bootstrap Page")) (tmp (create-p jumbo :content "Resize this responsive page to see the effect!")) - ;; Container for three colomns pf text + ;; Container for three columns of text (container (create-div body :class "container")) (row (create-div container :class "row")) ;; Column 1 diff --git a/tutorial/17-tutorial.lisp b/tutorial/17-tutorial.lisp index 1e20fe3..5e7047b 100644 --- a/tutorial/17-tutorial.lisp +++ b/tutorial/17-tutorial.lisp @@ -4,7 +4,7 @@ (in-package :clog-user) -;;; In this tutorial we will use a CSS only alternative to bootsrap - +;;; In this tutorial we will use a CSS only alternative to bootstrap - ;;; https://www.w3schools.com/w3css/default.asp (defun on-index (body) @@ -80,7 +80,7 @@ (run body)) (defun start-tutorial () - "Start turtorial." + "Start tutorial." (initialize #'on-index) (set-on-new-window #'on-page2 :path "/page2") (set-on-new-window #'on-page3 :path "/page3") diff --git a/tutorial/18-tutorial.lisp b/tutorial/18-tutorial.lisp index 0ae7811..2c11766 100644 --- a/tutorial/18-tutorial.lisp +++ b/tutorial/18-tutorial.lisp @@ -45,7 +45,7 @@ ;; 5 the target on-drop event is set (set-on-drop target1 (lambda (obj data) (place-inside-bottom-of target1 object))) - ;; Set up other box 1 also as targer for returning drag box + ;; Set up other box 1 also as target for returning drag box (set-on-drag-over target2 (lambda (obj)())) (set-on-drop target2 (lambda (obj data) (print (getf data :drag-data)) @@ -53,6 +53,6 @@ (run body))) (defun start-tutorial () - "Start turtorial." + "Start tutorial." (initialize #'on-new-window) (open-browser)) diff --git a/tutorial/19-tutorial.lisp b/tutorial/19-tutorial.lisp index 02984be..17c40cf 100644 --- a/tutorial/19-tutorial.lisp +++ b/tutorial/19-tutorial.lisp @@ -7,14 +7,14 @@ ;;; In this tutorial we will see how to easily use a JavaScript ;;; component. In the static-files directory there is a simple ;;; JavaScript component (clog/static-files/tutorial/jslists) to create -;;; collapsable trees that we will use for this tutorial. +;;; collapsible trees that we will use for this tutorial. (defun on-new-window (body) ;; First we need to load jslists' JavaScript file and css (load-css (html-document body) "/tutorial/jslists/jsLists.css") (load-script (html-document body) "/tutorial/jslists/jsLists.js") ;; Second we need to build an example list. jsLists uses an ordered - ;; or unordered list for it's data. + ;; or unordered list for its data. (let* ((list-top (create-unordered-list body)) (item (create-list-item list-top :content "Top of tree")) (list-b (create-unordered-list item)) @@ -27,6 +27,6 @@ (run body)) (defun start-tutorial () - "Start turtorial." + "Start tutorial." (initialize #'on-new-window) (open-browser)) diff --git a/tutorial/20-tutorial.lisp b/tutorial/20-tutorial.lisp index 6882853..cbb8342 100644 --- a/tutorial/20-tutorial.lisp +++ b/tutorial/20-tutorial.lisp @@ -23,7 +23,7 @@ ;;; Next we will use the clog-unordered-list as the base for our new ;;; class clog-toggler (defclass clog-toggler (clog-unordered-list) () - (:documentation "Toggler object - a collapsable UI component")) + (:documentation "Toggler object - a collapsible UI component")) (defgeneric create-toggler (clog-obj &key class html-id auto-place) (:documentation "Create a toggler.")) @@ -34,8 +34,8 @@ (let ((new-obj (create-unordered-list obj :class class :html-id html-id :auto-place auto-place))) - ;; Using change-class we can reuse the parent clog-unordered-lists's - ;; create method and it's initialization. Otherwise we can use + ;; Using change-class we can re-use the parent clog-unordered-lists's + ;; create method and its initialization. Otherwise we can use ;; create-child and the needed html. (change-class new-obj 'clog-toggler) new-obj)) @@ -69,6 +69,6 @@ (run body)) (defun start-tutorial () - "Start turtorial." + "Start tutorial." (initialize #'on-new-window) (open-browser)) diff --git a/tutorial/21-tutorial.lisp b/tutorial/21-tutorial.lisp index 70251b4..05987b3 100644 --- a/tutorial/21-tutorial.lisp +++ b/tutorial/21-tutorial.lisp @@ -11,11 +11,11 @@ (in-package :clog-drop-list) ;;; Next we will use the clog-unordered-list as the base for our new -;;; class clog-drop list and allow access to the "drop root" for +;;; class clog-drop-list and allow access to the "drop-root" for ;;; list items to be children of. (defclass clog-drop-list (clog-unordered-list) ((drop-root :accessor drop-root)) - (:documentation "CLOG Drop List object - a collapsable list component")) + (:documentation "CLOG Drop List object - a collapsible list component")) (defgeneric drop-root (clog-drop-list) (:documentation "Accessor for the drop list root, create clog-list-items @@ -56,6 +56,6 @@ on the drop-root.")) (run body)) (defun start-tutorial () - "Start turtorial." + "Start tutorial." (initialize #'on-new-window) (open-browser))