Revision: 3748 Author: hans URL: http://bknr.net/trac/changeset/3748
Update news layout. CSS tweaks to remove dotted focus indicator in Firefox.
U trunk/projects/quickhoney/src/imageproc.lisp U trunk/projects/quickhoney/website/static/javascript.js U trunk/projects/quickhoney/website/static/styles.css U trunk/projects/quickhoney/website/templates/index.xml
Modified: trunk/projects/quickhoney/src/imageproc.lisp =================================================================== --- trunk/projects/quickhoney/src/imageproc.lisp 2008-08-28 15:56:17 UTC (rev 3747) +++ trunk/projects/quickhoney/src/imageproc.lisp 2008-08-29 13:47:43 UTC (rev 3748) @@ -72,7 +72,8 @@ (when (eq :pixel category) (list 1)))) (cutout-width (floor (/ button-width scale-factor))) - (cutout-height (floor (/ button-height scale-factor)))) + (cutout-height (floor (/ button-height scale-factor))) + (radius (parse-integer radius))) (copy-image input-image button-image (floor (- (image-width input-image) cutout-width) 2) (if (eq :vector category) @@ -91,7 +92,8 @@ 0 0 0 0 (image-width type-image) (image-height type-image))))) - (corner-image :image button-image :radius (parse-integer radius)) + (unless (zerop radius) + (corner-image :image button-image :radius radius)) button-image))
(define-imageproc-handler center-thumbnail (input-image width height)
Modified: trunk/projects/quickhoney/website/static/javascript.js =================================================================== --- trunk/projects/quickhoney/website/static/javascript.js 2008-08-28 15:56:17 UTC (rev 3747) +++ trunk/projects/quickhoney/website/static/javascript.js 2008-08-29 13:47:43 UTC (rev 3748) @@ -231,7 +231,7 @@ onclick: function () { jump_to(item.category + '/' + item.subcategory + '/' + item.name) } }; return DIV({ 'class': 'newsentry autonews news_' + item.category }, A(link_dest, - revealer.IMG({ src: "/image/" + item.name + '/cutout-button,,' + color + ',98,98,4,' + item.category, + revealer.IMG({ src: "/image/" + item.name + '/cutout-button,,' + color + ',98,98,0,' + item.category, style: 'visibility: hidden', width: 98, height: 98, onload: 'reveal_image(this)' })), @@ -1049,6 +1049,7 @@ $("edit_client").value = current_image.client; $("edit_keywords").value = current_image.spider_keywords; map(function(keyword) { + log("initialize edit keyword " + keyword); $('edit_' + keyword).checked = current_image.keywords[keyword] ? true : false; }, ['explicit', 'buy-file', 'buy-print', 'buy-t-shirt']); show_cms_window("edit_form");
Modified: trunk/projects/quickhoney/website/static/styles.css =================================================================== --- trunk/projects/quickhoney/website/static/styles.css 2008-08-28 15:56:17 UTC (rev 3747) +++ trunk/projects/quickhoney/website/static/styles.css 2008-08-29 13:47:43 UTC (rev 3748) @@ -7,6 +7,10 @@ font-size: 80%; }
+/* remove dotted borders around links */ +a:active { outline: none } +a:focus { -moz-outline-style: none } + .page { display: none; border: 0px; @@ -146,8 +150,6 @@ #menu.contact a#m_contact img.selected { visibility: inherit; } #menu.contact a#m_contact img.unselected { visibility: hidden }
-.autonews a { color: #30be01; } - #m_home { top: 30px; left: 36px; } #m_pixel { top: 36px; left: 250px; } #m_vector { top: 36px; left: 331px; } @@ -381,6 +383,8 @@
/* news styles */
+.autonews a { color: #30be01; } + #newsentries { width: 486px; } @@ -389,35 +393,48 @@ width: 486px; }
-.autonews { - height: 108px; +.newsentry h1 { + margin: 5px 0px 2px 0px; + font-size: 120%; + font-weight: normal; + color: #30be01 }
-.newsentry img { - margin-bottom: 8px; +.autonews { + height: 106px; + color: #000; border-width: 1px; border-style: solid }
.autonews img { padding: 0px; + padding-right: 4px; float: left; - margin: 5px; + margin: 4px; }
-.newsentry h1 { - margin: 0px 0px 2px 0px; - font-size: 120%; - font-weight: normal; - color: #30be01 -} +.news_pixel h1, .news_pixel a { color: #00ccff } +.news_vector h1, .news_vector a { color: #00ccff }
-.autonews h1 { - color: white; -} - -.news_vector { background-color: #00ccff; } -.news_pixel { background-color: #ff00ff; } -.autonews a { color: white } +.news_vector { border-color: #00ccff } +.news_pixel { border-color: #ff00ff } div.news_sep { width: 486px; height: 17px; background-image: url(/image/news-sep); } +.archive { width: 162px } +.archive a.year { font-size: 1.2em; margin: 2px 0px 2px 0px} +.archive a.year.active { color: #000; } +.archive a.month.active { display: block; } +.archive a.month { display: none; margin-top: 2px; font-size: 1em; } +#archive-navigation.m1 a.m1 { color: #000; } +#archive-navigation.m2 a.m2 { color: #000; } +#archive-navigation.m3 a.m3 { color: #000; } +#archive-navigation.m4 a.m4 { color: #000; } +#archive-navigation.m5 a.m5 { color: #000; } +#archive-navigation.m6 a.m6 { color: #000; } +#archive-navigation.m7 a.m7 { color: #000; } +#archive-navigation.m8 a.m8 { color: #000; } +#archive-navigation.m9 a.m9 { color: #000; } +#archive-navigation.m10 a.m10 { color: #000; } +#archive-navigation.m11 a.m11 { color: #000; } +#archive-navigation.m12 a.m12 { color: #000; }
/* cms styles */
@@ -596,21 +613,3 @@ left: 585px; visibility: hidden; } - -.archive a.year { font-size: 1.2em; margin: 2px 0px 2px 0px; } -.archive a.year.active { color: #000; } -.archive a.month.active { display: block; } -.archive a.month { display: none; padding: 0px 5px 2px 5px; margin-top: 2px; font-size: 0.8em; } -#archive-navigation.m1 a.m1 { color: #000; } -#archive-navigation.m2 a.m2 { color: #000; } -#archive-navigation.m3 a.m3 { color: #000; } -#archive-navigation.m4 a.m4 { color: #000; } -#archive-navigation.m5 a.m5 { color: #000; } -#archive-navigation.m6 a.m6 { color: #000; } -#archive-navigation.m7 a.m7 { color: #000; } -#archive-navigation.m8 a.m8 { color: #000; } -#archive-navigation.m9 a.m9 { color: #000; } -#archive-navigation.m10 a.m10 { color: #000; } -#archive-navigation.m11 a.m11 { color: #000; } -#archive-navigation.m12 a.m12 { color: #000; } -.archive { padding-left: 1em; }
Modified: trunk/projects/quickhoney/website/templates/index.xml =================================================================== --- trunk/projects/quickhoney/website/templates/index.xml 2008-08-28 15:56:17 UTC (rev 3747) +++ trunk/projects/quickhoney/website/templates/index.xml 2008-08-29 13:47:43 UTC (rev 3748) @@ -150,7 +150,7 @@ <tr> <td valign="top" id="newsentries"> </td> - <td class="archive" id="archive-navigation" valign="top"> + <td class="archive" id="archive-navigation" valign="top" align="right"> </td> </tr> </tbody> @@ -278,9 +278,9 @@ Keywords:<br /> <input type="text" id="edit_keywords" name="spider-keywords" value="" /><br /> <input type="checkbox" id="edit_explicit" name="explicit" value="1" /> Explicit<br/> - <input type="checkbox" id="edit_buy_file" name="buy-file" value="1"/> Sell as file<br/> - <input type="checkbox" id="edit_buy_print" name="buy-print" value="1"/> Sell as print<br/> - <input type="checkbox" id="edit_buy_t_shirt" name="buy-t-shirt" value="1"/> Sell as t-shirt<br/> + <input type="checkbox" id="edit_buy-file" name="buy-file" value="1"/> Sell as file<br/> + <input type="checkbox" id="edit_buy-print" name="buy-print" value="1"/> Sell as print<br/> + <input type="checkbox" id="edit_buy-t-shirt" name="buy-t-shirt" value="1"/> Sell as t-shirt<br/> </p> <p class="cms"> <input type="submit" name="action" value="edit" />