Permalink
Browse files

Replaced css-based pprint-article-summary-li rules with a simpler sep…

…arator in markup generation
  • Loading branch information...
1 parent a4f1460 commit f26f02006067a996d944fe225fc0f9d237ac1594 @vsedach committed Nov 16, 2011
Showing with 10 additions and 16 deletions.
  1. +7 −6 src/markup.lisp
  2. +3 −2 src/search.lisp
  3. +0 −8 static/css/style.css
View
@@ -101,15 +101,16 @@
:attributes (("a" . ("href" "class")))
:protocols (("a" . (("href" . (:ftp :http :https :mailto :relative))))))
-(defun pprint-article-summary-li (article)
+(defun pprint-article-summary-li (article separator)
#H[<li>] (pprint-article-link (title article))
- #H[<span class="search_result_description">${(generate-html-from-markup (article-description article) +links-only+)}</span></li>])
+ #H[ ${separator}
+ ${(generate-html-from-markup (article-description article) +links-only+)}
+ </li>])
(defmethod 3bmd:print-tagged-element ((tag (eql :cliki2-category-list)) *html-stream* category)
- #H[<ul class="category_list">]
- (map nil #'pprint-article-summary-li
- (sort (copy-list (articles-with-category category))
- #'string< :key 'canonical-title))
+ #H[<ul>] (dolist (article (sort (copy-list (articles-with-category category))
+ #'string< :key 'canonical-title))
+ (pprint-article-summary-li article "-"))
#H[</ul>])
;;;; package-link
View
@@ -48,8 +48,9 @@
#H[<h1>Search results</h1>]
(if articles
(progn
- #H[<ol start="${(1+ start)}" id="search_results">]
- (map nil #'pprint-article-summary-li articles)
+ #H[<ol start="${(1+ start)}">]
+ (dolist (article articles)
+ (pprint-article-summary-li article "<br />"))
#H[</ol>
<div id="paginator">
<span>Result page:</span>
@@ -156,10 +156,6 @@
#search input[type=submit] {border:none;background:#175487;width: 65px; height: 23px;line-height:23px;color:white;cursor:pointer;}
#search input[type=submit]:hover { background: #256aa3 ; }
-#search_results .search_result_description {
- display:block;
-}
-
#paginator {
color: #333;
background: #eee;
@@ -226,10 +222,6 @@
#content a.hyperspec { color: #4040f2;}
#content a.download { color: #00E; font-weight: bold; }
-.category_list .search_result_description:before {
- content:" - ";
-}
-
#footer {
margin-top: 20px;
}

0 comments on commit f26f020

Please sign in to comment.