diff --git a/resources/content_server/browse/browse.css b/resources/content_server/browse/browse.css index f3dfc89caf..aceb595383 100644 --- a/resources/content_server/browse/browse.css +++ b/resources/content_server/browse/browse.css @@ -309,21 +309,27 @@ h2.library_name { display: block; } +#booklist div.right .stars .series { + display: block; +} + #booklist .title { font-size: larger; } -#booklist .formats a { +#booklist a { text-decoration: none; color: blue; } -#booklist .formats a:hover { +#booklist a:hover { color: red; } + #booklist .left .ui-button-text { - font-weight: bold; + font-size: medium; + color: black; padding-left: 0.25em; padding-right: 0.25em; padding-top: 0.25em; diff --git a/resources/content_server/browse/browse.html b/resources/content_server/browse/browse.html index 8c6d310015..b3039f8c4e 100644 --- a/resources/content_server/browse/browse.html +++ b/resources/content_server/browse/browse.html @@ -94,5 +94,6 @@ + diff --git a/resources/content_server/browse/browse.js b/resources/content_server/browse/browse.js index 5e0d9f8ee4..9d3c01fa15 100644 --- a/resources/content_server/browse/browse.js +++ b/resources/content_server/browse/browse.js @@ -200,8 +200,21 @@ function booklist(hide_sort) { $("#booklist").html(render_error("No books found")); return; } - + $("#book_details_dialog").dialog({ + autoOpen: false, + modal: true + }); first_page(); } +function show_details(a_dom) { + var book = $(a_dom).closest('div.summary'); + var id = book.attr('id').split('_')[1]; + var bd = $('#book_details_dialog'); + bd.attr('title', 'test'); + bd.html('test'); + bd.dialog('option', 'width', $('#container').width() - 50); + bd.dialog('open'); +} + // }}} diff --git a/resources/content_server/browse/summary.html b/resources/content_server/browse/summary.html index 01f2b333f2..8df42de366 100644 --- a/resources/content_server/browse/summary.html +++ b/resources/content_server/browse/summary.html @@ -4,7 +4,11 @@ {read_string}
-
{stars}{series}
+
+ {stars} + {series} + {details} +
{title}
{authors}
{comments}
diff --git a/resources/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_100_f5f0e5_1x400.png b/resources/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_100_f5f0e5_1x400.png index 688c2f3e88..4fb71be1b4 100644 Binary files a/resources/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_100_f5f0e5_1x400.png and b/resources/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_100_f5f0e5_1x400.png differ diff --git a/resources/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_70_ede4d4_1x400.png b/resources/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_70_ede4d4_1x400.png index 779ef0d0e2..0b4ae4776b 100644 Binary files a/resources/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_70_ede4d4_1x400.png and b/resources/content_server/jquery_ui/css/humanity-custom/images/ui-bg_glass_70_ede4d4_1x400.png differ diff --git a/resources/content_server/jquery_ui/css/humanity-custom/images/ui-bg_inset-soft_100_f4f0ec_1x100.png b/resources/content_server/jquery_ui/css/humanity-custom/images/ui-bg_inset-soft_100_f4f0ec_1x100.png index c171ea8e61..894bf75109 100644 Binary files a/resources/content_server/jquery_ui/css/humanity-custom/images/ui-bg_inset-soft_100_f4f0ec_1x100.png and b/resources/content_server/jquery_ui/css/humanity-custom/images/ui-bg_inset-soft_100_f4f0ec_1x100.png differ diff --git a/resources/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f08000_256x240.png b/resources/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f08000_256x240.png index f0a003fade..1a0305ed13 100644 Binary files a/resources/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f08000_256x240.png and b/resources/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f08000_256x240.png differ diff --git a/resources/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f35f07_256x240.png b/resources/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f35f07_256x240.png index 3ecc7d27ec..1105d2a24a 100644 Binary files a/resources/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f35f07_256x240.png and b/resources/content_server/jquery_ui/css/humanity-custom/images/ui-icons_f35f07_256x240.png differ diff --git a/resources/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ff7519_256x240.png b/resources/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ff7519_256x240.png index 5445171422..5a4070af92 100644 Binary files a/resources/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ff7519_256x240.png and b/resources/content_server/jquery_ui/css/humanity-custom/images/ui-icons_ff7519_256x240.png differ diff --git a/resources/content_server/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css b/resources/content_server/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css index f1625b027f..6b221bca77 100644 --- a/resources/content_server/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css +++ b/resources/content_server/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css @@ -50,13 +50,13 @@ * * http://docs.jquery.com/UI/Theming/API * - * To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Verdana,Arial,sans-serif&fwDefault=normal&fsDefault=1em&cornerRadius=6px&bgColorHeader=cb842e&bgTextureHeader=02_glass.png&bgImgOpacityHeader=25&borderColorHeader=d49768&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=f4f0ec&bgTextureContent=05_inset_soft.png&bgImgOpacityContent=100&borderColorContent=e0cfc2&fcContent=1e1b1d&iconColorContent=c47a23&bgColorDefault=ede4d4&bgTextureDefault=02_glass.png&bgImgOpacityDefault=70&borderColorDefault=cdc3b7&fcDefault=3f3731&iconColorDefault=f08000&bgColorHover=f5f0e5&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=f5ad66&fcHover=a46313&iconColorHover=f08000&bgColorActive=f4f0ec&bgTextureActive=04_highlight_hard.png&bgImgOpacityActive=100&borderColorActive=e0cfc2&fcActive=b85700&iconColorActive=f35f07&bgColorHighlight=f5f5b5&bgTextureHighlight=04_highlight_hard.png&bgImgOpacityHighlight=75&borderColorHighlight=d9bb73&fcHighlight=060200&iconColorHighlight=cb672b&bgColorError=fee4bd&bgTextureError=04_highlight_hard.png&bgImgOpacityError=65&borderColorError=f8893f&fcError=592003&iconColorError=ff7519&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=75&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=75&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px + * To view and modify this theme, visit http://jqueryui.com/themeroller/?tr=ffDefault=Helvetica,Arial,sans-serif&fwDefault=normal&fsDefault=1.1em&cornerRadius=6px&bgColorHeader=cb842e&bgTextureHeader=02_glass.png&bgImgOpacityHeader=25&borderColorHeader=d49768&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=f4f0ec&bgTextureContent=05_inset_soft.png&bgImgOpacityContent=100&borderColorContent=e0cfc2&fcContent=1e1b1d&iconColorContent=c47a23&bgColorDefault=ede4d4&bgTextureDefault=02_glass.png&bgImgOpacityDefault=70&borderColorDefault=cdc3b7&fcDefault=3f3731&iconColorDefault=f08000&bgColorHover=f5f0e5&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=f5ad66&fcHover=a46313&iconColorHover=f08000&bgColorActive=f4f0ec&bgTextureActive=04_highlight_hard.png&bgImgOpacityActive=100&borderColorActive=e0cfc2&fcActive=b85700&iconColorActive=f35f07&bgColorHighlight=f5f5b5&bgTextureHighlight=04_highlight_hard.png&bgImgOpacityHighlight=75&borderColorHighlight=d9bb73&fcHighlight=060200&iconColorHighlight=cb672b&bgColorError=fee4bd&bgTextureError=04_highlight_hard.png&bgImgOpacityError=65&borderColorError=f8893f&fcError=592003&iconColorError=ff7519&bgColorOverlay=aaaaaa&bgTextureOverlay=01_flat.png&bgImgOpacityOverlay=75&opacityOverlay=30&bgColorShadow=aaaaaa&bgTextureShadow=01_flat.png&bgImgOpacityShadow=75&opacityShadow=30&thicknessShadow=8px&offsetTopShadow=-8px&offsetLeftShadow=-8px&cornerRadiusShadow=8px */ /* Component containers ----------------------------------*/ -.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1em; } +.ui-widget { font-family: Verdana,Arial,sans-serif; font-size: 1.1em; } .ui-widget .ui-widget { font-size: 1em; } .ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: Verdana,Arial,sans-serif; font-size: 1em; } .ui-widget-content { border: 1px solid #e0cfc2; background: #f4f0ec url(images/ui-bg_inset-soft_100_f4f0ec_1x100.png) 50% bottom repeat-x; color: #1e1b1d; } @@ -293,6 +293,25 @@ /* Overlays */ .ui-widget-overlay { background: #aaaaaa url(images/ui-bg_flat_75_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); } .ui-widget-shadow { margin: -8px 0 0 -8px; padding: 8px; background: #aaaaaa url(images/ui-bg_flat_75_aaaaaa_40x100.png) 50% 50% repeat-x; opacity: .30;filter:Alpha(Opacity=30); -moz-border-radius: 8px; -webkit-border-radius: 8px; border-radius: 8px; }/* + * jQuery UI Resizable @VERSION + * + * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Resizable#theming + */ +.ui-resizable { position: relative;} +.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;} +.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } +.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } +.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } +.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } +.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } +.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } +.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } +.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } +.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* * jQuery UI Accordion @VERSION * * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) @@ -348,3 +367,24 @@ input.ui-button { padding: .4em 1em; } /* workarounds */ button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ +/* + * jQuery UI Dialog @VERSION + * + * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about) + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * http://docs.jquery.com/UI/Dialog#theming + */ +.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; } +.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative; } +.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; } +.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } +.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } +.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } +.ui-dialog .ui-dialog-content { position: relative; border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } +.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } +.ui-dialog .ui-dialog-buttonpane .ui-dialog-buttonset { float: right; } +.ui-dialog .ui-dialog-buttonpane button { margin: .5em .4em .5em 0; cursor: pointer; } +.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } +.ui-draggable .ui-dialog-titlebar { cursor: move; } diff --git a/src/calibre/library/server/browse.py b/src/calibre/library/server/browse.py index 439c0f4cf2..7d476ade3b 100644 --- a/src/calibre/library/server/browse.py +++ b/src/calibre/library/server/browse.py @@ -470,7 +470,11 @@ class BrowseServer(object): fmts = [x.lower() for x in fmts.split(',') if x] pf = prefs['output_format'].lower() fmt = pf if pf in fmts else fmts[0] - args = {'id':id_, 'mi':mi, 'read_string':_('Read'),} + args = {'id':id_, 'mi':mi, + 'read_string':xml(_('Read'), True), + 'details': xml(_('Details'), True), + 'details_tt': xml(_('Show book details'), True) + } for key in mi.all_field_keys(): val = mi.format_field(key)[1] if not val: