Changeset 9976 for lang/gauche/oldtype/trunk

Timestamp:

04/20/08 13:56:23 (5 years ago)

Author:

kiyoka

Message:

Supported tooltip and user icon feature.

Location:

lang/gauche/oldtype/trunk

Files:

• Kahua/oldtype/Makefile (modified) (1 diff)
• Kahua/oldtype/oldtype/import/orig (added)
• Kahua/oldtype/oldtype/import/tooltips.css (added)
• Kahua/oldtype/oldtype/import/tooltips.js (added)
• Kahua/oldtype/oldtype/oldtype.js (modified) (2 diffs)
• Kahua/oldtype/oldtype/oldtype.kahua (modified) (5 diffs)
• bin/ot_RecentChanges (modified) (2 diffs)

lang/gauche/oldtype/trunk/Kahua/oldtype/Makefile

@@ -37 +37 @@
 TEST_DIR    = $(PWD)
 SCRIPTFILES = $(package)/$(package).kahua $(package)/version.kahua $(package)/util.kahua $(package)/format.scm $(package)/kahualib.scm $(package)/parse.scm $(package)/util.scm $(package)/pasttime.scm
-STATICFILES = $(package)/$(package).css $(package)/staticimg/*.png $(package)/*.el $(package)/import/*.js  $(package)/$(package).js
+STATICFILES = $(package)/$(package).css $(package)/staticimg/*.png $(package)/*.el $(package)/import/*.js $(package)/import/*.css $(package)/$(package).js
 
 SOURCEDIR   = $(package)

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/oldtype.js

@@ -7 +7 @@
 var dropOutTime   = 1500; // ms
 
+// for In-place edit
 function otEditStart( bodyId ) {
     if( 'none' == $(bodyId + ':editarea').getStyle( 'display' )) {
@@ -26 +27 @@
 }
 
+// for tooltips.js
+function setup_tooltips( ) {
+    $$("body .help").each( function(input) {
+        new Tooltip(input, {backgroundColor: "#FC9", borderColor: "#C96", 
+                            textColor: "#000", textShadowColor: "#FFF"});
+    });
+}

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/oldtype.kahua

@@ -54 +54 @@
   (if (eq? 'w3m (oldtype-user-agent))
       (br/)
-      (node-set/
-       (text/ "Click to jump:")
-       (map/
-         (lambda (x)
-           (let ((name  (car x))
-                 (param (cadr x)))
-             (case name
-               ((div)
-                (let ((latest-rate (assq-ref param 'latest-rate))
-                      (id          (assq-ref param 'lineno)))
-                  (a/ (@/ (href  (format "#~d" id)))
-                      (case latest-rate
-                        ((0)  (oldtype:icon-image 'vline0))
-                        ((1)  (oldtype:icon-image 'vline1))
-                        ((2)  (oldtype:icon-image 'vline2))
-                        ((3)  (oldtype:icon-image 'vline3))
-                        ((4)  (oldtype:icon-image 'vline4))
-                        (else (oldtype:icon-image 'vline5)))))))))
-         sxmls))))
+      (map/
+       (lambda (x)
+         (let ((name  (car x))
+               (param (cadr x)))
+           (case name
+             ((div)
+              (let ((latest-rate (assq-ref param 'latest-rate))
+                    (id          (assq-ref param 'lineno)))
+                (a/ (@/ (href  (format "#~d" id))
+                        (title "Click to jump")
+                        (class "help"))
+                    (case latest-rate
+                      ((0)  (oldtype:icon-image 'vline0))
+                      ((1)  (oldtype:icon-image 'vline1))
+                      ((2)  (oldtype:icon-image 'vline2))
+                      ((3)  (oldtype:icon-image 'vline3))
+                      ((4)  (oldtype:icon-image 'vline4))
+                      (else (oldtype:icon-image 'vline5)))))))))
+       sxmls)))
 
   
@@ -127 +127 @@
                                                                 (string-append orig "\n"))
                                                             (string-append orig "\n")))
-                                                      page-src)))
-                                                   ""
-                                                   )))))
+                                                      page-src))))
+                                                  ""
+                                                  ))))
                                          (node-set
-                                          (list
-                                           (if is-w3m
-                                               (text/ "info")
-                                               (oldtype:icon-image 'info))
-                                           (case (assq-ref param 'latest-rate)
-                                             ((0)  (oldtype:icon-image 'new0))
-                                             ((1)  (oldtype:icon-image 'new1))
-                                             ((2)  (oldtype:icon-image 'new2))
-                                             ((3)  (oldtype:icon-image 'new3))
-                                             ((4)  (oldtype:icon-image 'new4))
-                                             (else (if is-w3m
-                                                       (oldtype:space->nbsp "  ")
-                                                       (oldtype:icon-image 'new5))))))))
+                                          (let ((date-message (string-append
+                                                               (oldtype:utc->ago-string (assq-ref param 'commit-utc)) "  "
+                                                               "date:"
+                                                               (oldtype:utc->date-string (assq-ref param 'commit-utc))))
+                                                (person-message (symbol->string (assq-ref param 'committer))))
+                                            (list
+                                             (span/ (@/ (title date-message)
+                                                        (class "help"))
+                                                    (case (assq-ref param 'latest-rate)
+                                                      ((0)  (oldtype:icon-image 'new0))
+                                                      ((1)  (oldtype:icon-image 'new1))
+                                                      ((2)  (oldtype:icon-image 'new2))
+                                                      ((3)  (oldtype:icon-image 'new3))
+                                                      ((4)  (oldtype:icon-image 'new4))
+                                                      (else (if is-w3m
+                                                                (oldtype:space->nbsp "  ")
+                                                                (oldtype:icon-image 'new5)))))
+                                             (let1 committer-str (symbol->string (assq-ref param 'committer))
+                                                   (a/ (@/ (href
+                                                            (oldtype:gen-page-path committer-str)))
+                                                       (span/
+                                                        (@/ (class "help")
+                                                            (title person-message))
+                                                        (img/
+                                                         (@/ 
+                                                          (class "icon")
+                                                          (src
+                                                           (string-append
+                                                            (oldtype:static-image-path) "../img/" committer-str ".png"))))))))))))
                                (_rest
                                 (node-set (rec (cdr arg)))))
@@ -155 +171 @@
                                           (style "float: none;"))
                                          (div/ (@/ (style "position: absolute; left: 2em; font-size: small;"))
-                                               _first
-                                               (oldtype:expand-wiki-name (symbol->string (assq-ref param 'committer))))
+                                               _first)
                                          (if (oldtype:is-editable wikiname)
                                              (div/ (@/ (style "padding-left:  5em;")
@@ -246 +261 @@
 
 (define (standard-page wikiname barcode nodes first-line)
-  (html/ (head/ (title/ (string-append wikiname first-line))
+  (html/ (head/ (title/ (string-append wikiname " / " first-line))
                 (link/ (@/ (rel "stylesheet") (type "text/css")
                            (href (string-append "/kahua/" (kahua-worker-type) "/oldtype.css"))))
+                (link/ (@/ (rel "stylesheet") (type "text/css")
+                           (href (string-append "/kahua/" (kahua-worker-type) "/import/tooltips.css"))))
                 (script/ (@/ (src (string-append "/kahua/" (kahua-worker-type) "/import/prototype.js"))      (type "text/javascript")))
                 (script/ (@/ (src (string-append "/kahua/" (kahua-worker-type) "/import/scriptaculous.js"))  (type "text/javascript")))
+                (script/ (@/ (src (string-append "/kahua/" (kahua-worker-type) "/import/tooltips.js"))       (type "text/javascript")))
                 (script/ (@/ (src (string-append "/kahua/" (kahua-worker-type) "/oldtype.js"))               (type "text/javascript"))))
          (body/
+          (@/ (onload "setup_tooltips();"))
           (div/ (@/ (class "header"))
                 (div/ (@/ (style "float: left;"))
@@ -289 +308 @@
    (filter
     (lambda (x)
-      (not (#/^[ ]*$/ x)))
+      (not (or
+            (#/^[ ]*$/ x)
+            (#/^[ ]*##/ x))))
     page-src)))
 

lang/gauche/oldtype/trunk/bin/ot_RecentChanges

@@ -13 +13 @@
 fi
 
+echo "RecentChanges of OldType contents." >  ${OT_EDITHOME}/edit/!RecentChanges.ot.tmp
+echo "----"                               >> ${OT_EDITHOME}/edit/!RecentChanges.ot.tmp
 _svn t --xml info ${lst} | ${OT_HOME}/src/oldtype_svninfo shell | while read line
 do
@@ -20 +22 @@
       echo "- ##(timestamp ${commit_utc}) ##(since ${commit_utc}): [[${name}]] by ([[${commit_author}]])"
   fi
-done | sort -r | head -${DISPLAY_LINES} > ${OT_EDITHOME}/edit/!RecentChanges.ot.tmp
+done | sort -r | head -${DISPLAY_LINES} >> ${OT_EDITHOME}/edit/!RecentChanges.ot.tmp
 if [ -s ${OT_EDITHOME}/edit/!RecentChanges.ot.tmp ]; then
   /bin/mv -f ${OT_EDITHOME}/edit/!RecentChanges.ot.tmp ${OT_EDITHOME}/edit/!RecentChanges.ot