Commit d8dff5df authored by Dave Cooper's avatar Dave Cooper
Browse files

Merge branch 'devo' into feature/smlib-threads

parents d4ce251e 9dbbf937
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@

(asdf:defsystem #:ta2 :description
 "The Gendl™ (legacy) Testing and Tracking Utility, version 2 (using Ajax but pre-gdlAjax, and no JQuery or CSS)"
 :author "John McCarthy" :license
 "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
 :version "20131015" :depends-on (:gwl-graphics)
 :author "Dave Cooper and Genworks International" :license
 "Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
 :serial t :version "20131023" :depends-on (:gwl-graphics)
 #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
 #+asdf-encodings :encoding #+asdf-encodings :utf-8
 :components
+10 −2
Original line number Diff line number Diff line
@@ -391,7 +391,9 @@ The error was: ~a
         
         ((:div :class "outer-west ui-widget pane")
          ((:div :class "header ui-widget-header")"Tree")
          ((:div :class "ui-widget-content")(str (the tree main-div)))
          ((:div :class "ui-widget-content" 
		 :style (format nil "background-color: ~a" (or (getf *colors-default* :background) "#fafafa")))
		 (str (the tree main-div)))
          ((:div :class "footer ui-widget-header") 
           "Click-mode:" (str (the tree-status-object main-div)))
          )
@@ -404,7 +406,13 @@ The error was: ~a
          ((:div :class "footer ui-widget-header")
           ((:span :class "fltrt") 
            "powered by " ((:a :href "http://www.genworks.com" :target "_new")"Genworks GDL")
            "- empowered by " ((:a :href "http://www.ke-works.com" :target "_new")"KE-works"))
	    (if (glisp:featurep :smlib) ", " " and ")
	    ((:a :href "http://www.quicklisp.org" :target "_new")"Quicklisp")
	    (if (glisp:featurep :smlib) 
		(progn
		  (str ", and ")
		  (htm ((:a :href "http://www.smlib.com" :target "_new") "SMLib")))
		""))
           ((:span) "GDL status: ")
           ((:span :id "gdlStatus")"Done.")
           (when *tasty-developing?*
+9 −8
Original line number Diff line number Diff line
@@ -197,16 +197,17 @@
      (:center
       ((:span :style "font-style: italic; font-weight: bold;")
        (:p "Inspecting: " 
	    (fmt "\"~a\"" (the node strings-for-display))
	    :br 
	    "root-path: "
            (esc (format nil "~s" 
                         (cons 'the (reverse (butlast (the node-root-path))))))
            (unless (butlast (the node-root-path))
              (htm " [the root object]")))
        (:p " of type:  " ((:span :style "color: blue; cursor: pointer;" 
              (htm " [the root object]"))
	    :br
	    " type:  " ((:span :style "color: blue; cursor: pointer;" 
			       :onclick (the (gdl-ajax-call :function-key :visit-definition-in-emacs
                                                               :arguments (list (format nil "~s" (the node type)))))
                                  
                                  
                                  )
							    :arguments (list (format nil "~s" (the node type))))))
			(esc (format nil "~s" (the node type)))))))
      
      ((:table :class "inspector-table" :border 1)
+3 −3
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@

(asdf:defsystem #:tasty :description
 "The Gendl™ Web-based Development Environment (tasty)" :author
 "John McCarthy" :license
 "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
 :version "20131015" :depends-on (:tree :gwl-graphics)
 "Dave Cooper and Genworks International" :license
 "Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
 :serial t :version "20131023" :depends-on (:tree :gwl-graphics)
 #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
 #+asdf-encodings :encoding #+asdf-encodings :utf-8
 :components
+3 −3
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@

(asdf:defsystem #:translators :description
 "The Gendl™ Translators to/from XML and potentially other high-level KBE and Knowledge formats"
 :author "John McCarthy" :license
 "Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
 :version "20131015" :depends-on (:gwl)
 :author "Dave Cooper and Genworks International" :license
 "Gnu Affero General Public License (please see http://www.gnu.org/licenses/)"
 :serial t :version "20131023" :depends-on (:gwl)
 #-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
 #+asdf-encodings :encoding #+asdf-encodings :utf-8
 :components
Loading