[open-ils-commits] [GIT] Evergreen ILS branch master updated. 88e8361ec62eff973dfe757cecf92281db052f17
Evergreen Git
git at git.evergreen-ils.org
Mon Dec 12 12:33:43 EST 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 88e8361ec62eff973dfe757cecf92281db052f17 (commit)
via 910dd43e3e5edec11f6ebac363dfec42c56a96b4 (commit)
via fa09b94fc71cb4e7282de057119a9115aa35c84a (commit)
via 6faac2b00f86f61eede58b1867b3c5bd11740b5f (commit)
via 43a2d1465e6ae1f8fbd2a8873d602e6b55700f51 (commit)
via 92b0d1dd1c96ec8fce51dbed12321a0c4f047f60 (commit)
via 9a5af472bd3e5d18ab0530d855c91471ca3aefa0 (commit)
via efb42e224820ac5e7f0ff10336e83173d4831831 (commit)
via 4659e31a24f2c860ae1a5a1e7dde497650aaa741 (commit)
via 8b3b014c4b84aeab438093c4a2925fb11a3f5cff (commit)
via b66817dc66ed35c64bc80a70d7c9f328be8d4d61 (commit)
via 36ce2d913b01e1061c55d79df8ca93211adff7a5 (commit)
via b6e117684b74a8c72fd9dd8b4b0468401590fbcf (commit)
via c0a0d6999d35a7157bef988c6218ddf31974896a (commit)
via a79111ea901703318bbc8edaba643bf38859bb74 (commit)
via 4186d6f18ab2e022e99a8b7478c13d67b33a1db3 (commit)
via d6557d0254c87eb009c7475c574279350333ffb2 (commit)
via 2382dbe9003a35f83dc0ee12dfe10db37cd1e65d (commit)
via 6439d5f95c101c43fb78001b2fa62c43f5756d00 (commit)
via b5aacbb7145948814ea73788505821945a2a545e (commit)
via a9475ad61c4279bdd2f1b5cb3c60f1bba1a00c74 (commit)
from b5315a444a87b9807aa15bf355699a4640fba63f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 88e8361ec62eff973dfe757cecf92281db052f17
Merge: b5315a4 910dd43
Author: Thomas Berezansky <tsbere at mvlc.org>
Date: Mon Dec 12 12:25:36 2011 -0500
Merge remote-tracking branch 'working/collab/dbs/tpac-non-fixed-width'
Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>
commit 910dd43e3e5edec11f6ebac363dfec42c56a96b4
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Dec 12 00:44:34 2011 -0500
TPAC: Remove more inline styles from results table
Most of the inline styles are gone from the results table.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index ce786fd..a8a277e 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -50,7 +50,7 @@
href="[% mkurl(ctx.opac_root _ '/record/' _ rec.id) %]"
class='search_link'>[% attrs.title | html %]</a>
</div>
- <div style="font-size:11px;">
+ <div>
<div>
<em><a title="[% l("Perform an Author Search") %]"
name='item_author'
@@ -166,17 +166,6 @@
%]
</div>
</div>
- <div class="hide_me">
- <span name='result_table_extra_span' class='hide_me'>
- <span name='result_table_pub_box'
- style='padding-left: 10px;'>
- <span name='result_table_edition_span'
- style='padding-left: 10px;'></span> |
- <span name='result_table_pub_span'> </span> |
- <span name='result_table_phys_span'> </span>
- </span>
- </span>
- </div>
</td>
<td name='result_table_format_cell' class='result_table_format_cell' width="1">
@@ -197,16 +186,16 @@
</td>
<td nowrap='nowrap' width="1" align="right">
- <div style="width:250px;text-align:left;">
- <div style="float:right;">
+ <div class="result_table_utils_cont">
+ <div class="result_table_utils">
<div class="results_aux_utils place_hold"><a
href="[% mkurl(ctx.opac_root _ '/place_hold',
{hold_target => rec.id, hold_type => 'T', hold_source_page => mkurl()}) %]"
name="place_hold_link" class="no-dec"><img
src="[% ctx.media_prefix %]/images/green_check.png"
- alt=""/><span style="position:relative;top:-3px;left:3px;">[% l('Place Hold') %]</span></a>
+ alt=""/><span class="result_place_hold">[% l('Place Hold') %]</span></a>
</div>
- <div class="results_aux_utils opac-auto-011">
+ <div class="results_aux_utils result_util">
[%
operation = ctx.mylist.grep(rec.id).size ? "delete" : "add";
label = (operation == "add") ? l("Add to my list") : l("Remove from my list");
@@ -219,13 +208,13 @@
</a>
</div>
[% IF ENV.OILS_CONTENT_CAFE_USER %]
- <div class="results_aux_utils opac-auto-011">
+ <div class="results_aux_utils result_util">
<a title="[% l('Reviews and More') %]" target='_blank'
href="[% ctx.proto %]://contentcafe2.btol.com/ContentCafeClient/ContentCafe.aspx?UserID=[%-
ENV.OILS_CONTENT_CAFE_USER %]&Password=[%-
ENV.OILS_CONTENT_CAFE_PASS %]&ItemKey=[% ident | uri %]&Options=Y">
<img src='[% ctx.media_prefix %]/images/starz.png'/>
- <span style='position:relative;top:-5px;'>[% l('Reviews & More') %]</span>
+ <span class="results_reviews">[% l('Reviews & More') %]</span>
</a>
</div>
[% END %]
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index cf1bcd2..27eb9d8 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -407,6 +407,16 @@ div.format_icon {
padding-right: 50px;
}
+.result_util {
+ border-bottom: 1px dotted #ccc;
+ padding-top: 6px;
+}
+
+.results_reviews {
+ position: relative;
+ top: -5px;
+}
+
#rdetail_copies {
padding-top: 1.5em;
}
@@ -715,8 +725,20 @@ tr.result_table_row td.result_table_row {
padding-top: 1em;
}
+div.result_table_utils_cont {
+ width: 250px;
+ text-align:left;
+}
+div.result_table_utils {
+ float: right;
+}
+div.result_place_hold {
+ position: relative;
+ top: -3px;
+ left:3px;
+}
.icon_text {
text-transform:capitalize;
@@ -1266,10 +1288,6 @@ table.bookbag-specific {
.save-notes { padding-bottom: 1.5ex; }
/* Moved from semiauto.css */
-.opac-auto-011 {
- border-bottom: 1px dotted #ccc;
- padding-top: 6px;
-}
.adv_global_input_container { border-bottom: none; }
.opac-auto-013 {
border-bottom: none;
commit fa09b94fc71cb4e7282de057119a9115aa35c84a
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Dec 12 00:29:47 2011 -0500
RPAC: Remove one formatting row from results
One of the table rows was being inserted into every result simply to
provide a border that is better handled via CSS on the existing useful
elements. Begone.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 07c7ae9..ce786fd 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -25,8 +25,8 @@
[% FOR rec IN ctx.records;
attrs = {marc_xml => rec.marc_xml};
PROCESS get_marc_attrs args=attrs %]
- <tr>
- <td class='result_table_row' align='left' width='100%'>
+ <tr class="result_table_row">
+ <td class="result_table_row" align='left' width='100%'>
<table cellpadding="0" cellspacing="0" class='result_table_subtable'>
<tbody class='result_table_subtbody'>
<tr name='counts_row'>
@@ -247,7 +247,6 @@
</td>
</tr>
[%- END %]
- <tr><td colspan="5"><div style="height:0px;border-top:1px solid #b7b7b7;border-bottom:1px solid #d4d4d4;margin:15px 0px;"></div></td></tr>
</tbody>
</table>
</td>
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 965fc0c..cf1bcd2 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -702,11 +702,18 @@ div.format_icon {
margin-top: 1em;
}
+tr.result_table_row td.result_table_row {
+ border-bottom:1px solid #d4d4d4;
+}
+
.result_numbers {
font-size: 11px; padding-left:15px; white-space: nowrap; width: 320px;
}
-.result_table_subtable { width: 100%; border-collapse: collapse; border: 0; }
+.result_table_subtable {
+ width: 100%;
+ padding-top: 1em;
+}
commit 6faac2b00f86f61eede58b1867b3c5bd11740b5f
Author: Dan Scott <dscott at laurentian.ca>
Date: Mon Dec 12 00:06:39 2011 -0500
TPAC: results use floated DIVs instead of table layout
Rather than a table containing a single row for the rather gross purpose
of placing the facet sidebar on the left, a little bit of a divider
between the facets and the results, and the results on the right, just
use a floated div and a relatively positioned div for the two pertinent
chunks of content. Bonus: one touch of CSS moves the facet sidebar to
the right instead of the left.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index fe3865a..07c7ae9 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -9,23 +9,18 @@
result_count = ctx.result_start;
%]
-<div style="height: 10px;"></div>
-
[% PROCESS "opac/parts/result/paginate.tt2" %]
[% ctx.results_count_header = PROCESS results_count_header;
ctx.results_count_header %]
<div id="result_table_div">
- <table cellpadding="0" cellspacing="0" border="0" width="100%">
- <tr>
- <td valign="top" width="1">
+ <div class="facet_sidebar">
[% INCLUDE "opac/parts/staff_saved_searches.tt2" %]
[% INCLUDE 'opac/parts/result/facets.tt2' %]
- </td>
- <td class="facet_border" width="1"></td>
- <td valign="top">
+ </div>
+ <div class="result_block">
<table cellpadding="0" cellspacing="0"
- border="0" width="100%" style="margin-top:10px;">
+ border="0" style="margin-top:10px;">
<tbody id="result_table">
[% FOR rec IN ctx.records;
attrs = {marc_xml => rec.marc_xml};
@@ -248,7 +243,7 @@
<tr>
<td/>
<td colspan='5'> <!-- Chilifresh reviews panel -->
- <div id="chili_review_[% attrs.isbn_clean | html %]" style="display: none;" align="center" width="100%"></div>
+ <div id="chili_review_[% attrs.isbn_clean | html %]" style="display: none;" align="center"></div>
</td>
</tr>
[%- END %]
@@ -260,9 +255,7 @@
[% END %]
</tbody>
</table>
- </td>
- </tr>
- </table>
+ </div>
</div>
<div>
[% ctx.results_count_header %]
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 39afdff..965fc0c 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -699,7 +699,7 @@ div.format_icon {
}
#result_table_div {
- margin-top: 20px;
+ margin-top: 1em;
}
.result_numbers {
@@ -932,6 +932,12 @@ div.format_icon {
.facetFieldLineValue { overflow: hidden; text-overflow: ellipsis; }
*/
+div.facet_sidebar {
+ float: left;
+ border-right: 1px solid #F3F3F3;
+ margin-right: 1em;
+}
+
.facet_box_temp {
padding-bottom:3px;
width: 15em;
commit 43a2d1465e6ae1f8fbd2a8873d602e6b55700f51
Author: Dan Scott <dscott at laurentian.ca>
Date: Sun Dec 11 23:37:02 2011 -0500
TPAC: Record details - inline style to classes
Continue the march towards no inline styles in the record details page.
Includes a small tweak for electronic resource display so that the
unordered list gains a bit of space on the left-hand side from the image
location.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 595978f..540c30d 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -9,10 +9,10 @@
[% INCLUDE 'opac/parts/record/refworks.tt2' %]
[%- END %]
-<hr style="margin-top: 1em;" />
+<hr />
[%- # This holds the record summary information %]
-<div id="rdetail_image_div" style="float: left; margin-right: 1em;">
+<div id="rdetail_image_div">
[% ident = attrs.isbn_clean || attrs.upc; IF ident; %]
<a href='[% ctx.media_prefix %]/opac/extras/ac/jacket/large/[% ident | uri %]'><img
alt="[% l('Image of item') %]" id='rdetail_image'
@@ -21,14 +21,14 @@
<br />
</div>
-<div id="rdetail_actions_div" style="float: right; margin-left: 1em;">
- <div class="rdetail_aux_utils opac-auto-010">
+<div id="rdetail_actions_div">
+ <div class="rdetail_aux_utils place_hold">
<a href="[% mkurl(ctx.opac_root _ '/place_hold',
{hold_target => ctx.bre_id, hold_type => 'T', hold_source_page => mkurl()}) %]"
class="no-dec"><img src="[% ctx.media_prefix %]/images/green_check.png" alt="[% l('place hold') %]" /><span
- style="position:relative;top:-3px;left:3px;">[% l('Place Hold') %]</span></a>
+ class="place_hold">[% l('Place Hold') %]</span></a>
</div>
- <div class="rdetail_aux_utils opac-auto-121">
+ <div class="rdetail_aux_utils toggle_list">
[%-
operation = ctx.mylist.grep(ctx.bre_id).size ? "delete" : "add";
label = (operation == "add") ? l("Add to my list") : l("Remove from my list");
@@ -42,7 +42,7 @@
<div id='rdetail_title_div'>
[%- IF attrs.format_icon %]
- <div style="float:right;margin-right:17px;">
+ <div class="format_icon">
<img alt="[% attrs.format_label %]" title="[% attrs.format_label | html %]" src="[% attrs.format_icon %]" />
</div>
[%- END %]
@@ -77,7 +77,7 @@
num_uris = merged_uris.size;
IF num_uris > 0;
-%]
-<h2 style="margin-top: 1em;">[% l("Electronic resources") %]</h2>
+<h2 class="rdetail_uris">[% l("Electronic resources") %]</h2>
<div class="rdetail_uris">
[%- IF num_uris > 1 %]<ul>[% END %]
[%- FOR uri IN merged_uris %]
@@ -189,12 +189,12 @@ IF num_uris > 0;
<td>
[%- more_copies_limit = 50 %] [%# TODO: config %]
[%- IF ctx.copy_limit != more_copies_limit AND ctx.copies.size >= ctx.copy_limit %]
- <div style='margin-top:10px;'>
+ <div class="rdetail_show_copies">
<img src="[% ctx.media_prefix %]/images/plus_sign.png" />
<a href="[% mkurl('', {copy_limit => more_copies_limit, copy_offset => 0}) %]">[% l('Show more copies') %]</a>
</div>
[%- ELSIF ctx.copy_limit == more_copies_limit %]
- <div style='margin-top:10px;'>
+ <div class="rdetail_show_copies">
<img src="[% ctx.media_prefix %]/images/minus_sign.png" />
<a href="[% mkurl('', {copy_limit => 0, copy_offset => 0}) %]">[% l('Show fewer copies') %]</a>
</div>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 46790fc..fe3865a 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -204,7 +204,7 @@
<td nowrap='nowrap' width="1" align="right">
<div style="width:250px;text-align:left;">
<div style="float:right;">
- <div class="results_aux_utils opac-auto-010"><a
+ <div class="results_aux_utils place_hold"><a
href="[% mkurl(ctx.opac_root _ '/place_hold',
{hold_target => rec.id, hold_type => 'T', hold_source_page => mkurl()}) %]"
name="place_hold_link" class="no-dec"><img
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index ffd92ec..39afdff 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -349,8 +349,30 @@ span.dash_divider {
padding-right: 10px;
}
-.rdetail_uris {
- padding: 1em;
+h2.rdetail_uris {
+ margin-top: 1em;
+}
+div.rdetail_uris {
+ padding: 0.5em 1em 0.5em 1em;
+ background-color: lightGray;
+}
+div.rdetail_uris ul li {
+ position: relative;
+ left: 1em;
+}
+
+div.rdetail_show_copies {
+ margin-top: 1em;
+}
+
+#rdetail_image_div {
+ float: left;
+ margin-right: 1em;
+}
+
+#rdetail_image_div {
+ float: right;
+ margin-left: 1em;
}
.rdetail_aux_utils {
@@ -360,6 +382,24 @@ span.dash_divider {
padding-right: 70px;
}
+div.place_hold {
+ border-bottom: 1px dotted #ccc;
+ padding-top: 10px;
+}
+
+span.place_hold {
+ position:relative;
+ top:-3px;
+ left:3px;
+}
+
+div.toggle_list { padding-top: 6px; }
+
+div.format_icon {
+ float: right;
+ margin-right: 17px;
+}
+
.results_aux_utils {
border-left:1px dotted #ccc;
padding-left: 17px;
@@ -1213,10 +1253,6 @@ table.bookbag-specific {
.save-notes { padding-bottom: 1.5ex; }
/* Moved from semiauto.css */
-.opac-auto-010 {
- border-bottom: 1px dotted #ccc;
- padding-top: 10px;
-}
.opac-auto-011 {
border-bottom: 1px dotted #ccc;
padding-top: 6px;
commit 92b0d1dd1c96ec8fce51dbed12321a0c4f047f60
Author: Dan Scott <dscott at laurentian.ca>
Date: Sun Dec 11 19:51:10 2011 -0500
TPAC: Include Chilifresh conditionally
Rather than including Chilifresh JavaScript and table cells
unconditionally, only include the Chilifresh calls if an account has
been defined in the Apache environment.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/parts/base.tt2 b/Open-ILS/src/templates/opac/parts/base.tt2
index 0a6c10c..4af9a87 100644
--- a/Open-ILS/src/templates/opac/parts/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/base.tt2
@@ -15,6 +15,8 @@
[% content %]
[% INCLUDE 'opac/parts/footer.tt2' %]
[% INCLUDE 'opac/parts/js.tt2' %]
- [% INCLUDE 'opac/parts/chilifresh.tt2' %]
+ [%- IF ENV.OILS_CHILIFRESH_ACCOUNT %]
+ [%- INCLUDE 'opac/parts/chilifresh.tt2' %]
+ [%- END %]
</body>
</html>
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index d9ef345..46790fc 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -238,6 +238,7 @@
</div>
</td>
</tr>
+ [%- IF ENV.OILS_CHILIFRESH_ACCOUNT %]
<tr>
<td/>
<td align='center'> <!-- Chilifresh reviews link -->
@@ -250,6 +251,7 @@
<div id="chili_review_[% attrs.isbn_clean | html %]" style="display: none;" align="center" width="100%"></div>
</td>
</tr>
+ [%- END %]
<tr><td colspan="5"><div style="height:0px;border-top:1px solid #b7b7b7;border-bottom:1px solid #d4d4d4;margin:15px 0px;"></div></td></tr>
</tbody>
</table>
commit 9a5af472bd3e5d18ab0530d855c91471ca3aefa0
Author: Dan Scott <dscott at laurentian.ca>
Date: Fri Dec 9 15:12:53 2011 -0500
TPAC: Fix record summary e-resource and copy display
Electronic resources were wrapped with an ugly black line and no
differentiation from the outstanding text. Give them a light background
and remove the black line. Also, use an unordered list if we have more
than one URI to display.
Move the copy summary below the "Copies" heading that immediately
follows it for a more logical grouping of elements.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/parts/record/summary.tt2 b/Open-ILS/src/templates/opac/parts/record/summary.tt2
index 125546c..595978f 100644
--- a/Open-ILS/src/templates/opac/parts/record/summary.tt2
+++ b/Open-ILS/src/templates/opac/parts/record/summary.tt2
@@ -73,13 +73,25 @@
[%- IF sfx.size && sfx.0 != '' %]
</div>
[%- END %]
-[%- FOR uri IN args.uris.merge(args.online_res); %]
-<div class="rdetail_uri">
- <a href="[% uri.href %]">[% uri.link %]</a>[% ' - ' _ uri.note IF uri.note %]
+[%- merged_uris = args.uris.merge(args.online_res);
+num_uris = merged_uris.size;
+IF num_uris > 0;
+-%]
+<h2 style="margin-top: 1em;">[% l("Electronic resources") %]</h2>
+<div class="rdetail_uris">
+ [%- IF num_uris > 1 %]<ul>[% END %]
+ [%- FOR uri IN merged_uris %]
+ [%- IF num_uris == 1 %]<p class="rdetail_uri">[% ELSE %]<li class="rdetail_uri">[% END %]
+ <a href="[% uri.href %]">[% uri.link %]</a>[% ' - ' _ uri.note IF uri.note %]
+ [%- IF num_uris == 1 %]</p>[% ELSE %]</li>[% END %]
+ [%- END %]
+ [%- IF num_uris > 1 %]</ul>[% END %]
</div>
[%- END %]
[%- # hold/copy summary %]
[%- IF ctx.copy_summary.0.count %]
+<div id='rdetail_copies'>
+<h2>[% l('Copies') %]</h2>
<div class="rdetail_copy_counts">
<span>
[%- l("[quant,_1,current hold,current holds] with [quant,_2,total copy,total copies].",
@@ -87,11 +99,6 @@
</span>
<span>[% l('[quant,_1,copy,copies] currently available.', ctx.copy_summary.0.available) %]</span>
</div>
-[% END %]
-
-[%- IF ctx.copy_summary.0.count %]
-<div id='rdetail_copies'>
-<h2>[% l('Copies') %]</h2>
<table cellpadding="0" cellspacing="0" border="0" width="100%" id="rdetails_status">
<thead>
<tr>
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 5e6a494..ffd92ec 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -349,9 +349,8 @@ span.dash_divider {
padding-right: 10px;
}
-.rdetail_uri {
- border: thin black solid;
- padding: 3px;
+.rdetail_uris {
+ padding: 1em;
}
.rdetail_aux_utils {
@@ -369,7 +368,6 @@ span.dash_divider {
}
#rdetail_copies {
- clear: both;
padding-top: 1.5em;
}
commit efb42e224820ac5e7f0ff10336e83173d4831831
Author: Dan Scott <dscott at laurentian.ca>
Date: Fri Dec 9 12:05:14 2011 -0500
TPAC: Remove more explicit widths from results page
Refactor the facet sidebar such that headers consist of a floated span
and a div with no specific width; absent a specific width, the button
will float over top of text that might expand due to translation.
Also remove the explicit table cell width for the results counter column
and move some inline styles over to CSS. More to be done in results
table but we are on our way.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/parts/result/facets.tt2 b/Open-ILS/src/templates/opac/parts/result/facets.tt2
index 76c335f..7b02773 100644
--- a/Open-ILS/src/templates/opac/parts/result/facets.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/facets.tt2
@@ -19,8 +19,7 @@ FOR facet_label IN labels.sort;
<div class="facet_box_temp">
<div class="header">
- <div class="title">[% facet.cmf.label %]</div>
- <div class="button">
+ <span class="button">
[% IF close_facets.grep(close_key).0;
new_close = [];
@@ -40,8 +39,8 @@ FOR facet_label IN labels.sort;
<a href="[% mkurl('', {close_facet => close_facets.merge([close_key])}) %]"><img
src="[% ctx.media_prefix %]/images/adv_search_minus_btn.png" alt="[% l('Collapse') %]" /></a>
[% END %]
- </div>
- <div class="clear"> </div>
+ </span>
+ <div class="title">[% facet.cmf.label %]</div>
</div>
[% IF !close_facets.grep(close_key).0 %]
<div class="box_wrapper">
@@ -88,7 +87,6 @@ FOR facet_label IN labels.sort;
[% END %]
[% END %]
</div>
- <div class="clear"> </div>
</div> <!-- box_wrapper -->
[% END %]
</div> <!-- facet_box_temp -->
diff --git a/Open-ILS/src/templates/opac/parts/result/table.tt2 b/Open-ILS/src/templates/opac/parts/result/table.tt2
index 422a378..d9ef345 100644
--- a/Open-ILS/src/templates/opac/parts/result/table.tt2
+++ b/Open-ILS/src/templates/opac/parts/result/table.tt2
@@ -18,13 +18,11 @@
<div id="result_table_div">
<table cellpadding="0" cellspacing="0" border="0" width="100%">
<tr>
- <td valign="top" width="1" style="padding-right:20px;">
- <div style="width:174px;">
- [% INCLUDE "opac/parts/staff_saved_searches.tt2" %]
- [% INCLUDE 'opac/parts/result/facets.tt2' %]
- </div>
+ <td valign="top" width="1">
+ [% INCLUDE "opac/parts/staff_saved_searches.tt2" %]
+ [% INCLUDE 'opac/parts/result/facets.tt2' %]
</td>
- <td class='opac-auto-015' width="1"></td>
+ <td class="facet_border" width="1"></td>
<td valign="top">
<table cellpadding="0" cellspacing="0"
border="0" width="100%" style="margin-top:10px;">
@@ -37,8 +35,7 @@
<table cellpadding="0" cellspacing="0" class='result_table_subtable'>
<tbody class='result_table_subtbody'>
<tr name='counts_row'>
- <td width="58" valign="top"
- style="font-weight:bold;padding-left:10px;"
+ <td valign="top" class="results_row_count"
name="results_row_count">[%
result_count; result_count = result_count + 1
%].</td>
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index a52fe3d..5e6a494 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -896,12 +896,11 @@ span.dash_divider {
.facet_box_temp {
padding-bottom:3px;
- width:180px;
+ width: 15em;
overflow:hidden;
}
.facet_box_temp .header {
- width:180px;
height:31px;
overflow:hidden;
background:url('/images/facet_box_bg.png') no-repeat;
@@ -914,7 +913,6 @@ span.dash_divider {
float:left;
padding-top:6px;
padding-left:12px;
- width:134px;
overflow:hidden;
}
@@ -931,7 +929,7 @@ span.dash_divider {
}
.facet_box_wrapper .box_wrapper .box {
- width:166px;
+ width: 14em;
border-top:1px solid #7ebee5;
border-left:1px solid #f3f3f3;
border-right:1px solid #f3f3f3;
@@ -963,6 +961,11 @@ span.dash_divider {
background-color: #d7d7d7;
}
+.facet_border {
+ border-left: 1px solid #e9ebf3;
+ padding-right: 0.5em;
+}
+
#footer-wrap {
background: linear-gradient(lightGreen, #252525);
background: -moz-linear-gradient(lightGreen, #252525);
@@ -1028,6 +1031,7 @@ a.dash-link:hover { text-decoration: underline !important; }
}
.list-create-table-buttons input[type=image] { margin-top: 2px; }
.result_table_format_cell { padding: 0px 10px; text-align: center; }
+.results_row_count { font-weight: bold; }
#hold_editor h1 { font-size: 120%; font-weight: bold; }
#hold_editor h2 { font-size: 111%; font-weight: normal; text-indent: 2em; font-style: italic; }
#hold_editor h1, #hold_editor h2 { margin: 2px 0; }
@@ -1224,10 +1228,6 @@ table.bookbag-specific {
border-bottom: none;
*height: 0px;
}
-.opac-auto-015 {
- border-left: 1px solid #e9ebf3;
- padding-right: 27px;
-}
.adv_global_filter_sort {
border: none;
width: 100%;
commit 4659e31a24f2c860ae1a5a1e7dde497650aaa741
Author: Dan Scott <dscott at laurentian.ca>
Date: Fri Dec 9 11:09:24 2011 -0500
TPAC: Use padding instead of explicit width for tabs
Explicit widths work well for a combination of a specific font sizes and
a known string; however, in the context of translation, strings may get
longer than the explicit width allows. Using padding gives us more
flexibility to accommodate different font sizes and variable length
strings; the uniformity of the tab size will be sacrificed but perhaps
that is not such a bad thing.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index eda8777..a52fe3d 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -283,7 +283,7 @@ span.dash_divider {
}
#adv_search_tabs a, #acct_tabs a, #acct_fines_tabs a {
- width:156px;
+ padding: 1em 1em 0.5em;
}
#adv_search.on, #num_search.on, #expert_search.on {
commit 8b3b014c4b84aeab438093c4a2925fb11a3f5cff
Merge: b66817d 6ebb789
Author: Dan Scott <dscott at laurentian.ca>
Date: Thu Dec 8 14:01:57 2011 -0500
Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/tpac-non-fixed-width
Conflicts:
Open-ILS/web/css/skin/default/opac/style.css
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --cc Open-ILS/web/css/skin/default/opac/style.css
index d71a036,6433166..eda8777
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@@ -1165,77 -1164,21 +1170,88 @@@ h2.bookbag-name { margin-bottom: 0em; p
.bookbag-description {
padding-top: 0em;
font-style: italic;
+ max-width: 40em;
}
+ #bbag-edit-description { width: 20em; }
+ #bbag-edit-name { width: 20em; }
+ textarea { font-family: sans-serif; }
table.bookbag-specific {
border-right: 1px solid #999;
border-bottom: 1px solid #666;
margin-bottom: 2ex;
}
+.bookbag-share {
+ float: left;
+ padding: 5px 0;
+}
+.bookbag-controls {
+ float: left;
+ padding: 5px 0px 0px 10px;
+}
+
+.bookbag-specific td.list_checkbox {
+ padding-left: 10px !important;
+}
+.bookbag-specific td.list_entry {
+ min-width: 10em;
+ padding-left: 5px !important;
+}
+.bookbag-specific td.list_actions {
+ white-space: nowrap !important;
+}
+
+.list_is_empty {
+ padding: 8px 0px 6px 0px;
+ width: 100%;
+ border: 0;
+ font-size: 120%;
+ text-align: center;
+ font-style: italic;
+}
.save-notes { padding-bottom: 1.5ex; }
+
+/* Moved from semiauto.css */
+.opac-auto-010 {
+ border-bottom: 1px dotted #ccc;
+ padding-top: 10px;
+}
+.opac-auto-011 {
+ border-bottom: 1px dotted #ccc;
+ padding-top: 6px;
+}
+.adv_global_input_container { border-bottom: none; }
+.opac-auto-013 {
+ border-bottom: none;
+ *height: 0px;
+}
+.opac-auto-015 {
+ border-left: 1px solid #e9ebf3;
+ padding-right: 27px;
+}
+.adv_global_filter_sort {
+ border: none;
+ width: 100%;
+}
+.clear-both { clear: both; }
+.common-no-pad {
+ clear: both;
+ height: 0px;
+ margin: 0px;
+ padding: 0px;
+}
+.common-full-pad {
+ clear: both;
+ height: 15px;
+}
+.alert { color: red; }
+.float-left { float: left; }
+.float-right { float: right; }
+
+ .saved-searches-header { width: 100%; font-weight: bold; font-size: 120%; }
+ .saved-searches-header .button { float: right; width: 28px; }
+ .saved-searches-header .text { float: left; padding-right: 1em; margin: 0.5ex 0;}
+ .saved-searches-header {font-weight: bold; font-size: 120%; }
+ .saved-searches { border-bottom: 1px solid #666; }
+ #staff-saved-search { /* wraps .saved-searches-header and .saved-searches on the record page */
+ border-right: 1px solid #333;
+ }
commit b66817dc66ed35c64bc80a70d7c9f328be8d4d61
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Oct 19 23:18:28 2011 -0400
TPAC: Create a meaningful bookbag class
Combine two meaningless opac-auto classes into a single bookbag class.
Also give a max-width to the bookbag description to prevent action
buttons from sprawling off to the right side of the screen.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index c298acb..7de4253 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -157,7 +157,7 @@
</thead>
<tbody>
[% UNLESS bbag.items.size %]
- <tr><td colspan="4" class="opac-auto-171 opac-auto-097">
+ <tr><td colspan="4" class="list_is_empty">
[% l("This list contains no items.") %]
</td></tr>
[% END %]
diff --git a/Open-ILS/web/css/skin/default/opac/semiauto.css b/Open-ILS/web/css/skin/default/opac/semiauto.css
index d51ef6c..67ea799 100644
--- a/Open-ILS/web/css/skin/default/opac/semiauto.css
+++ b/Open-ILS/web/css/skin/default/opac/semiauto.css
@@ -9,7 +9,6 @@
.qtype_selector_margin { margin-right: 7px; }
.warning_box { margin-top: 10px; }
.pad-bottom-five { padding: 5px; }
-.opac-auto-097 { padding: 8px 0px 6px 0px; width: 100%; border: 0; }
.item_list_padding { padding: 8px 0px 6px 0px; border: 0; }
.opac-auto-102 { padding-bottom: 7px; }
.opac-auto-108 { padding-left: 5px; }
@@ -30,7 +29,6 @@
.nowrap { white-space: nowrap; }
.opac-auto-164 { white-space: nowrap; padding-left: 5px; }
.full-width { width: 100%; }
-.opac-auto-171 { font-size: 120%; text-align: center; font-style: italic; }
#search_box { width: 162px; }
.selector_actions_for_list { width: 175px; margin-right: 11px; }
.selector_actions_for_list_inner_option { margin-left: 2em; } /* XXX ".opac-auto-179 optgroup option" doesn't work!? */
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index b124496..d71a036 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -1165,6 +1165,7 @@ h2.bookbag-name { margin-bottom: 0em; padding-bottom: 0em; }
.bookbag-description {
padding-top: 0em;
font-style: italic;
+ max-width: 40em;
}
table.bookbag-specific {
border-right: 1px solid #999;
@@ -1190,6 +1191,15 @@ table.bookbag-specific {
.bookbag-specific td.list_actions {
white-space: nowrap !important;
}
+
+.list_is_empty {
+ padding: 8px 0px 6px 0px;
+ width: 100%;
+ border: 0;
+ font-size: 120%;
+ text-align: center;
+ font-style: italic;
+}
.save-notes { padding-bottom: 1.5ex; }
/* Moved from semiauto.css */
commit 36ce2d913b01e1061c55d79df8ca93211adff7a5
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Oct 19 22:29:28 2011 -0400
TPAC: Remove unused HTML from bookbags page
A number of "hide_me" nodes were being kept on the page, only one of
which is actually referenced anywhere (to be displayed as help for
sharing). The rest are not invoked anywhere, so we delete them to reduce
the clutter and page size.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index 67ce963..c298acb 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -4,22 +4,6 @@
myopac_page = "lists" %]
<div id='myopac_bookbag_div' style="padding:5px;">
- <!-- <div class="header_middle">
- <span id="acct_holds_header" style="float:left;">[% l('My Lists') %]</span>
- <span style="float:right;"><a class="hide_me" href="#">[% l('Export List') %]</a></span>
- </div>
- <div style="float:right;width:85px;">
- <div style="position:absolute">
- <div style="position:relative;top:13px;">
- <a href="#" style="position:relative;top:-3px;left:-5px;"><img alt="[% l('Saving Help') %]"
- src="[% ctx.media_prefix %]/images/question-mark.png" /></a>
- <a href="#"><img alt="[% l('Save') %]" src="[% ctx.media_prefix %]/images/save-btn.png"/></a>
- </div>
- </div>
- </div> -->
- <div id="temp_wrapper">
-
-
<!-- new list creation -->
<form action="[% ctx.opac_root %]/myopac/list/update" method="POST" id="create_form">
<h1>[% l('Create new list') %]</h1><a name="createnewlist"></a>
@@ -226,41 +210,11 @@
</div>
[% END %]
- <div id='myopac_delete_bookbag_warn' class='hide_me'>
- [% l("This will remove the selected bookbag and all items contained within the bookbag. Are you sure you wish to continue?") %]
- </div>
- <div style='text-align: center; font-weight: bold;'
- class='hide_me' id='myopac_bookbags_none'>[% l("You have not created any bookbags") %]</div>
- <div style='width: 99%; text-align: center'>
- <b id='myopac_bookbag_items_name'> </b>
- </div>
<span id='bb_publish_text' class='hide_me'>
[% |l %]Sharing a Bookbag means that the contents
of the Bookbag will be visible to others.
To see the public view of a shared Bookbag,
click on the Bookbag's name in the Bookbag list.[% END %]
</span>
- <span id='myopac_remove_bb_item_confirm' class='hide_me'>
- [% l("Are you sure you wish to remove this bookbag item?") %]
- </span>
- <span id='myopac_make_published_confirm' class='hide_me'>
- [% l("Sharing this bookbag will allow the contents of the bookbag to be seen by others. Are you sure you wish to share this bookbag?") %]
- </span>
- <span id='myopac_make_unpublished_confirm' class='hide_me'>
- [% l("Are you sure you wish to hide this bookbag?") %]
- </span>
- <span id='myopac_bb_update_success' class='hide_me'>
- [% l("The Bookbag was successfully updated.") %]
- </span>
- <span id='bb_create_warning' class='hide_me'>
- [% l("Warning: Adding items to a bookbag creates a link between you and the items in the database. The contents of the bookbag are NOT publicly viewable unless the bookbag is shared. However, if you prefer not to have any link between your patron record and a particular item or items, we suggest that you do not place said items in a bookbag or that you avoid using bookbags all together. Thank you.") %]
- </span>
- <span id='myopac_bb_what_are' class='hide_me'>
- [% l("Bookbags are...") %]
- </span>
- <span class='hide_me' id='bb_update_success'>
- [% l("Bookbag successfully updated") %]
- </span>
-
</div>
[% END %]
commit b6e117684b74a8c72fd9dd8b4b0468401590fbcf
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Oct 19 22:19:20 2011 -0400
TPAC: Strip inline styles from bookbags page
Also use a margin instead of width percentage to keep bookbag action
buttons closer to the bookbag title; with a full-width layout the
buttons were almost disassociated from the bookbag title.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/myopac/lists.tt2 b/Open-ILS/src/templates/opac/myopac/lists.tt2
index c852364..67ce963 100644
--- a/Open-ILS/src/templates/opac/myopac/lists.tt2
+++ b/Open-ILS/src/templates/opac/myopac/lists.tt2
@@ -141,7 +141,7 @@
<table class="bookbag-specific" cellpadding='0' cellspacing='0' border='0'>
<thead id="acct_list_header">
<tr>
- <td width="1%" style="padding-left: 10px;">
+ <td class="list_checkbox">
<input type="checkbox" onclick="
var inputs=document.getElementsByTagName('input');
for (i = 0; i < inputs.length; i++) {
@@ -149,19 +149,19 @@
inputs[i].checked = this.checked;}"/>
</td>
- <td width="32%" style="padding-left: 5px;">
+ <td class="list_entry">
<a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=> (CGI.param('sort') == 'titlesort' ? 'titlesort.descending' : 'titlesort')}) %]">[% l('Title') %]</a>
</td>
- <td width="33%">
+ <td class="list_entry">
<a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {sort=>(CGI.param('sort') == 'authorsort' ? 'authorsort.descending' : 'authorsort')}) %]">[% l('Author(s)') %]</a>
</td>
- <td width="32%">
+ <td class="list_entry">
[% l('Notes') %]
[% IF CGI.param("edit_notes") != bbag.id %]
| <a href="[% mkurl(ctx.opac_root _ '/myopac/lists', {edit_notes=> bbag.id}) %]">[% l('Edit') %]</a>
[% END %]
</td>
- <td width="1%" class="nowrap">
+ <td class="list_actions">
<select name="action">
<option disabled="disabled">[% l('-- Actions for these items --') %]</option>
<option value="place_hold">[% l('Place hold') %]</option>
@@ -182,26 +182,26 @@
attrs = {marc_xml => ctx.bookbags_marc_xml.$rec_id};
PROCESS get_marc_attrs args=attrs %]
<tr class="bookbag-item-row">
- <td class="item_list_padding" style="padding-left: 10px;">
+ <td class="list_checkbox">
<input type="checkbox" name="selected_item" value="[% item.id %]" bbag='[% bbag.id %]'/>
</td>
- <td class="item_list_padding" style="padding-left: 5px;">
+ <td class="list_entry">
<a href="[% mkurl(ctx.opac_root _ '/record/' _ rec_id, {}, ['edit_notes', 'id']) %]">[% attrs.title | html %]</a>
</td>
- <td class="item_list_padding">
+ <td class="list_entry">
<a href="[%-
authorquery = attrs.author | replace('[,\.:;]', '');
mkurl(ctx.opac_root _ '/results', {qtype => 'author', query => authorquery}, ['page', 'id', 'edit_notes'])
-%]">[% attrs.author | html %]</a>
[% IF CGI.param("edit_notes") == bbag.id %]
- <td class="opac-auto-097b">
+ <td class="list_entry">
[% FOR note IN item.notes %]
<input type="text" name="note-[% note.id %]" value="[% note.note | html %]" />
[% END %]
<input type="text" name="item-[% item.id %]" />
</td>
[% ELSE %]
- <td class="opac-auto-097b">
+ <td class="list_entry">
[% FOR note IN item.notes %]
<div>[% note.note | html %]</div>
[% END %]
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 586cf9c..b124496 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -1155,7 +1155,10 @@ a.opac-button {
.bookbag-controls-holder { width: 100%; }
.bookbag-controls-holder:nth-child(odd) { background-color: #d7d7d7; }
.bookbag-controls-holder:nth-child(even) { background-color: #e3e3e3; }
-.bookbag-controls-holder .most { padding-left: 0; width: 55%; }
+.bookbag-controls-holder .most {
+ padding-left: 0;
+ margin-right: 5em;
+}
h2.bookbag-name { margin-bottom: 0em; padding-bottom: 0em; }
.bookbag-share .fixed { min-width: 4em; }
.bookbag-specific { margin-left: 1em; }
@@ -1177,6 +1180,16 @@ table.bookbag-specific {
padding: 5px 0px 0px 10px;
}
+.bookbag-specific td.list_checkbox {
+ padding-left: 10px !important;
+}
+.bookbag-specific td.list_entry {
+ min-width: 10em;
+ padding-left: 5px !important;
+}
+.bookbag-specific td.list_actions {
+ white-space: nowrap !important;
+}
.save-notes { padding-bottom: 1.5ex; }
/* Moved from semiauto.css */
commit c0a0d6999d35a7157bef988c6218ddf31974896a
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Oct 19 16:58:53 2011 -0400
TPAC: Search text box is weird in Firefox
The span border was conflicting with the input border for the text input
box. Also addresses the text box being jammed against the "for" word.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 68911f4..586cf9c 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -14,7 +14,6 @@ a {
}
#search-wrapper input[type=text] {
- border:none;
margin:0;
padding:0;
}
@@ -218,9 +217,7 @@ span.dash_divider {
}
.search_box_wrapper {
- border:1px solid #e9ebf3;
- padding: 1px;
- padding-left: 3px;
+ padding: 1px 1px 1px 3px;
}
#search-wrapper #breadcrumb {
commit a79111ea901703318bbc8edaba643bf38859bb74
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Oct 19 16:53:46 2011 -0400
TPAC: Restore a width to search bar elements
Use em's instead of pixels to better handle relative fonts at some
distant point in the future.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 1494826..68911f4 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -23,7 +23,7 @@ a {
border:1px solid #e9ebf3;
margin:0;
padding:0;
-/* width:168px; */
+ width: 12em;
}
/*
commit 4186d6f18ab2e022e99a8b7478c13d67b33a1db3
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Oct 19 15:44:25 2011 -0400
TPAC: Delete contentslider.css as it is not being used
Nothing references contentslider.css, it is noise.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/web/css/skin/default/opac/contentslider.css b/Open-ILS/web/css/skin/default/opac/contentslider.css
deleted file mode 100644
index 64a6d25..0000000
--- a/Open-ILS/web/css/skin/default/opac/contentslider.css
+++ /dev/null
@@ -1,39 +0,0 @@
-.sliderwrapper{
-position: relative; /*leave as is*/
-overflow: hidden; /*leave as is*/
-width: 675px; /*width of featured content slider*/
-height: 213px;
-}
-
-
-
-.sliderwrapper .contentdiv{
-visibility: hidden; /*leave as is*/
-position: absolute; /*leave as is*/
-left: 0; /*leave as is*/
-top: 0; /*leave as is*/
-width: 675px; /*width of content DIVs within slider. Total width should equal slider's inner width (390+5+5=400) */
-height: 100%;
-filter:progid:DXImageTransform.Microsoft.alpha(opacity=100);
--moz-opacity: 1;
-opacity: 1;
-}
-
-.pagination{
-width: 400px; /*Width of pagination DIV. Total width should equal slider's outer width (400+10+10=420)*/
-text-align: right;
-background-color: navy;
-padding: 5px 10px;
-}
-
-.pagination a{
-padding: 0 5px;
-text-decoration: none;
-color: #00007D;
-background: white;
-}
-
-.pagination a:hover, .pagination a.selected{
-color: #000;
-background-color: #FEE496;
-}
\ No newline at end of file
commit d6557d0254c87eb009c7475c574279350333ffb2
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Oct 19 15:33:01 2011 -0400
TPAC: Remove unused CSS from semiauto.css
Ran a script that essentially did the equivalent of:
for i in "semiauto.css definitions"; do
echo -n $i; echo -n " : "; ack -c -h "$i" Open-ILS/src/templates/opac
Where there were no hits, I deleted the entry from semiauto.css.
Now things are getting manageable...
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/web/css/skin/default/opac/semiauto.css b/Open-ILS/web/css/skin/default/opac/semiauto.css
index 3bfb4dc..d51ef6c 100644
--- a/Open-ILS/web/css/skin/default/opac/semiauto.css
+++ b/Open-ILS/web/css/skin/default/opac/semiauto.css
@@ -1,155 +1,38 @@
/* once done renaming and everything, combine with style.css */
.left-corner { float: left; width: 163px; height: 30px; background: url('/images/utils-corner-mid.png') repeat-x top; }
-.opac-auto-045 { float: right; margin-right: 17px; }
-.opac-auto-046 { float: right; width: 214px; }
-.opac-auto-047 { float: right; width: 353px; background: #ccc; padding: 10px; margin-top: 7px; }
-.opac-auto-048 { float: right; width: 65px; }
-#they_said_dont_touch { float: right; width: 675px; height: 213px; color: green; overflow: hidden; }
-.opac-auto-050 { float: right; width: 85px; }
-.ten-px { font-size: 10px; }
-.eleven-px { font-size: 11px; }
-.eight-pt { font-size: 8pt; }
-.opac-auto-054 { font-size: 8pt; padding-left: 20px; }
.bold { font-weight: bold; }
-.opac-auto-057 { font-weight: bold; padding: 5px; margin: 5px; width: 100%; }
-.opac-auto-058 { font-weight: bold; padding-left: 10px; }
-#anon_list_name { font-weight: bold; padding-right: 10px; }
-.opac-auto-060 { font-weight: normal; }
-.opac-auto-061 { height: 0px; border-top: 1px solid #b7b7b7; border-bottom: 1px solid #d4d4d4; margin: 15px 0px; }
-.small-height { height: 10px; }
.normal-height { height: 15px; }
.big-height { height: 20px; }
.very-big-height { height: 30px; }
#gold-links-holder { height: 24px; background: #252525; }
-.opac-auto-067 { margin: 3px; width: 100%; }
.big-block { margin: auto; width: 974px; height: 0px; }
-.opac-auto-069 { margin-bottom: 10px; }
-.opac-auto-070 { margin-bottom: 20px; }
-.opac-auto-071 { margin-bottom: 5px; }
-.opac-auto-072 { margin-left: 20px; }
-.bookbag-list { margin-left: 5px; margin-top: 5px; width: 91%; border: 0;}
-#cn_browse_where { margin-left: 6px; }
-.opac-auto-075 { margin-right: 20px; }
-.opac-auto-076 { margin-right: 3px; }
-.opac-auto-077 { margin-right: 4px; position: relative; top: -10px; }
.qtype_selector_margin { margin-right: 7px; }
.warning_box { margin-top: 10px; }
-.opac-auto-080 { margin-top: 10px; margin-bottom: 10px; }
-.opac-auto-081 { margin-top: 13px; }
-.opac-auto-082 { margin-top: 29px; }
-.opac-auto-083 { margin-top: 2px; }
-.opac-auto-084 { margin-top: 5px; }
-.opac-auto-085 { margin-top: 6px; margin-left: 20px; width: 250px; padding: 5px; }
-.opac-auto-086 { margin-top: 8px; }
-.opac-auto-087 { max-width: 11em; }
-.opac-auto-088 { padding: 0px; }
-.opac-auto-089 { padding: 0px 10px; }
-.opac-auto-090 { padding: 10px; }
-.opac-auto-091 { padding: 10px 0px; }
-.opac-auto-092 { padding: 4px; text-align: center; }
.pad-bottom-five { padding: 5px; }
-.opac-auto-094 { padding: 5px 7px 0px 0px; }
-.opac-auto-095 { padding: 5px 7px 0px 0px; white-space: nowrap; }
-.opac-auto-096 { padding: 6px }
.opac-auto-097 { padding: 8px 0px 6px 0px; width: 100%; border: 0; }
.item_list_padding { padding: 8px 0px 6px 0px; border: 0; }
-.opac-auto-098 { padding-bottom: 10px; }
-.opac-auto-099 { padding-bottom: 12px; color: #666; }
-.opac-auto-100 { padding-bottom: 16px; }
-.opac-auto-101 { padding-bottom: 1px; }
.opac-auto-102 { padding-bottom: 7px; }
-.opac-auto-103 { padding-left: 10px; }
-.opac-auto-104 { padding-left: 11px; padding-right: 11px; }
-.opac-auto-105 { padding-left: 11px; padding-right: 13px; }
-.opac-auto-106 { padding-left: 15px; }
-.opac-auto-107 { padding-left: 15px; padding-bottom: 10px; }
.opac-auto-108 { padding-left: 5px; }
-.opac-auto-109 { padding-left: 5px; padding-bottom: 10px; }
-.opac-auto-110 { padding-left: 6px; }
-.opac-auto-111 { padding-left: 8px; }
-.opac-auto-112 { padding-left: 9px; }
-.opac-auto-113 { padding-right: 10px; }
-.opac-auto-114 { padding-right: 15px; padding-left: 15px; }
-.opac-auto-115 { padding-right: 20px; }
-.opac-auto-116 { padding-right: 5px; }
-.opac-auto-117 { padding-right: 7px; }
.pad-top-ten { padding-top: 10px; }
-.opac-auto-119 { padding-top: 14px; }
-.opac-auto-120 { padding-top: 5px; }
.opac-auto-121 { padding-top: 6px; }
-.opac-auto-122 { padding-top: 7px; }
-.opac-auto-123 { padding-top: 8px; }
-.pos-abs { position: absolute; }
-#new_cat_link_holder { position: absolute; z-index: 101; }
#new_cat_link_holder a { display: block; width: 675px; height: 213px; }
.pos-rel { position: relative; }
#search-box table { position: relative; left: -10px; }
-.opac-auto-129 { position: relative; left: -19px; }
-.opac-auto-130 { position: relative; left: 80px; }
-.opac-auto-131 { position: relative; top: 0px; left: 55px; }
-.opac-auto-132 { position: relative; top: 13px; }
-.opac-auto-133 { position: relative; top: -13px; left: 2px; font-size: 10px; }
-.opac-auto-134 { position: relative; top: -15px; left: 172px; }
-.opac-auto-135 { position: relative; top: -15px; left: -23px; }
-.opac-auto-136 { position: relative; top: 161px; left: 172px; }
-.opac-auto-137 { position: relative; top: 161px; left: -23px; }
#home_adv_search_link { position: relative; top: -1px; left: 10px; }
#util_back_btn { position: relative; top: 1px; left: 10px; }
-.opac-auto-140 { position: relative; top: -2px; }
#util_help_btn { position: relative; top: 2px; left: 40px; }
#util_forw_btn { position: relative; top: 2px; left: 50px; }
-.opac-auto-143 { position: relative; top: -3px; }
#util_home_btn { position: relative; top: 3px; left: 20px; }
-.opac-auto-145 { position: relative; top: -3px; left: 3px; }
-.opac-auto-146 { position: relative; top: -3px; left: -5px; }
-.opac-auto-147 { position: relative; top: -5px; }
.pos-rel-top-5 { position: relative; top: 5px; }
-.opac-auto-149 { position: relative; top: 5px; left: 25px; }
#util_print_btn { position: relative; top: 5px; left: 30px; }
-.opac-auto-151 { position: relative; top: 75px; }
-#adv_reset { position: relative; top: -9px; }
-.opac-auto-153 { position: relative; z-index: 100; }
-.text-center { text-align: center; }
-.opac-auto-156 { text-align: center; font-weight: bold; }
#adv_quick_search_sidebar { text-align: center; margin-top: 20px; width: 400px; }
-.opac-auto-158 { text-align: center; margin-top: 6px; margin-bottom: 6px }
-.opac-auto-159 { text-align: center; padding: 20px; width: 100% }
-.opac-auto-160 { text-align: center; padding-bottom: 8px; }
.opac-auto-161 { text-align: right; padding-right: 7px; width: 62px; }
-.opac-auto-162 { vertical-align: top; }
.nowrap { white-space: nowrap; }
.opac-auto-164 { white-space: nowrap; padding-left: 5px; }
.full-width { width: 100%; }
-.opac-auto-167 { width: 100%; border: 1px solid black; padding: 6px; margin-top: 5px; }
-.opac-auto-168 { width: 100%; border: 2px solid #E0F0E0; margin-bottom: 20px; }
-.opac-auto-169 { width: 100%; height: 100%; }
-.opac-auto-170 { width: 100%; margin-top: 20px; border-top: 1px dotted #ccc; padding-top: 8px; }
.opac-auto-171 { font-size: 120%; text-align: center; font-style: italic; }
-.opac-auto-172 { width: 100%; text-align: center; padding-bottom: 5px; }
-.opac-auto-173 { width: 10px; }
-.opac-auto-174 { width: 111px; height: 25px; }
-.opac-auto-175 { width: 125px; height: 21px; }
-.opac-auto-176 { width: 129px; }
#search_box { width: 162px; }
-.opac-auto-178 { width: 174px; }
.selector_actions_for_list { width: 175px; margin-right: 11px; }
-.opac-auto-179 optgroup { margin-left: 1em; font-weight: normal; font-style: italic; }
.selector_actions_for_list_inner_option { margin-left: 2em; } /* XXX ".opac-auto-179 optgroup option" doesn't work!? */
-.opac-auto-180 { width: 182px; color: black; padding: 5px 25px; }
-.opac-auto-181 { width: 195px; }
-.opac-auto-182 { width: 230px; text-align: left; margin-top: 3px; }
-.opac-auto-183 { width: 250px; text-align: left; }
-.opac-auto-184 { width: 26px; height: 23px; margin-top: 6px; margin-bottom: 6px; }
-.opac-auto-185 { width: 324px; }
-.opac-auto-186 { width: 400px; margin-top: 20px; }
-.opac-auto-187 { width: 662px; }
-.opac-auto-188 { width: 700px; height: 30px; border: 1px solid red; }
-.opac-auto-189 { width: 742px; float: left; }
-.opac-auto-190 { width: 88px; }
-.opac-auto-191 { width: 90px; }
#cn_browse_div > div { width: 90%; text-align: center; margin: 10px; }
-.opac-auto-193 { width: 91px; }
#cn_browse { width: 95%; text-align: center; padding: 15px; }
-.opac-auto-195 { width: 99%; text-align: center }
-#homesearch_thing { width: 664px; height: 117px; background: #bda964; }
-#mystery_thing { width: 664px; height: 35px; background: #ffffff; }
commit 2382dbe9003a35f83dc0ee12dfe10db37cd1e65d
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Oct 19 15:24:50 2011 -0400
TPAC: Localize the "move to bookbag" string
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/parts/anon_list.tt2 b/Open-ILS/src/templates/opac/parts/anon_list.tt2
index 3afa99e..4a96558 100644
--- a/Open-ILS/src/templates/opac/parts/anon_list.tt2
+++ b/Open-ILS/src/templates/opac/parts/anon_list.tt2
@@ -32,7 +32,7 @@
<option value="place_hold">[% l('Place hold') %]</option>
<option value="delete">[% l('Remove from list') %]</option>
[% IF ctx.user AND ctx.bookbags.size %]
- <optgroup label="Move selected items to">
+ <optgroup label="[% l('Move selected items to bookbag:') %]">
[% FOR bbag IN ctx.bookbags %]]
<option value="[% bbag.id %]" class="selector_actions_for_list_inner_option">[% bbag.name | html %]</option>
[% END %]
commit 6439d5f95c101c43fb78001b2fa62c43f5756d00
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Oct 19 13:00:49 2011 -0400
TPAC: Bring used CSS definitions over from semiauto.css
Convert ".red" class to ".alert", delete classes that were defined in
semiauto.css as being verified as being in use that are actually no longer
in use, and merge the remainder to style.css. This will avoid one more
HTTP request as well as a huge mess of CSS to have to worry about
carrying around.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/src/templates/opac/myopac/circs.tt2 b/Open-ILS/src/templates/opac/myopac/circs.tt2
index c6312e3..e3234ea 100644
--- a/Open-ILS/src/templates/opac/myopac/circs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/circs.tt2
@@ -31,7 +31,7 @@
</div>
[% END %]
[% IF ctx.failed_renewals %]
- <div class="renew-summary red">
+ <div class="renew-summary alert">
[% l("Failed to renew [_1] item(s)", ctx.failed_renewals) %]
</div>
[% END %]
diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2
index 5068474..2398b3c 100644
--- a/Open-ILS/src/templates/opac/myopac/main.tt2
+++ b/Open-ILS/src/templates/opac/myopac/main.tt2
@@ -75,11 +75,11 @@
<!-- XXX TODO fines aren't really accruing
if circ has hit maxfines. more clarity
here? -->
- <span class="red">[% l('(fines accruing)') %]</span>
+ <span class="alert">[% l('(fines accruing)') %]</span>
[% END %]
</td>
<td>
- <strong class="red">
+ <strong class="alert">
[% money(f.xact.balance_owed) %]
</strong>
</td>
@@ -147,7 +147,7 @@
</td>
<td>[% money(f.xact.total_owed) %]</td>
<td>[% money(f.xact.total_paid) %]</td>
- <td class="red">
+ <td class="alert">
<strong>
[% money(f.xact.balance_owed) %]
</strong>
diff --git a/Open-ILS/src/templates/opac/myopac/prefs.tt2 b/Open-ILS/src/templates/opac/myopac/prefs.tt2
index 87cdfd0..418c7ac 100644
--- a/Open-ILS/src/templates/opac/myopac/prefs.tt2
+++ b/Open-ILS/src/templates/opac/myopac/prefs.tt2
@@ -11,7 +11,7 @@
width='100%'>
<tbody>
<tr>
- <td width='100%' class='red'>
+ <td width='100%' class='alert'>
[% l("Your account expired on") %]
<span id='myopac.expired.date'></span>!
[% l("Please see a librarian to renew your account.") %]</td>
diff --git a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
index 36ec79c..c603ada 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -37,7 +37,7 @@
</div>
</div>
[% l('Fines:') %]
- <span class='[% ctx.user_stats.fines.balance_owed ? "red" : ""%]'>
+ <span class='[% ctx.user_stats.fines.balance_owed ? "alert" : ""%]'>
[% money(ctx.user_stats.fines.balance_owed) %]
</span><br />
[% IF (ctx.fines.grocery.size OR ctx.fines.circulation.size) AND ctx.get_org_setting(ctx.user.home_ou, 'credit.payments.allow') == 1 %]
diff --git a/Open-ILS/web/css/skin/default/opac/semiauto.css b/Open-ILS/web/css/skin/default/opac/semiauto.css
index dbae5b2..3bfb4dc 100644
--- a/Open-ILS/web/css/skin/default/opac/semiauto.css
+++ b/Open-ILS/web/css/skin/default/opac/semiauto.css
@@ -1,31 +1,5 @@
/* once done renaming and everything, combine with style.css */
-
-/* Verfied in-use classes --------------------------- */
-.opac-auto-009 { border: 3px solid #E0E0E0; }
-.opac-auto-010 { border-bottom: 1px dotted #ccc; padding-top: 10px; }
-.opac-auto-011 { border-bottom: 1px dotted #ccc; padding-top: 6px; }
-.adv_global_input_container { border-bottom: none; }
-.opac-auto-013 { border-bottom: none; *height: 0px; }
-.opac-auto-015 { border-left: 1px solid #e9ebf3; padding-right: 27px; }
-.adv_global_filter_sort { border: none; width: 100%; }
-.opac-auto-018 { border-top: 1px dotted #ccc; padding-top: 17px; }
-.clear-both { clear: both; }
-.common-no-pad { clear: both; height: 0px; margin: 0px; padding: 0px; }
-.common-full-pad { clear: both; height: 15px; }
-.opac-auto-029 { color: #333; font-weight: bold; font-size: 13px; }
-.opac-auto-030 { color: #545454; }
-.opac-auto-031 { color: #9999FF; padding-left: 10px; font-size: 7pt; font-weight: 300; }
-.red { color: red; }
-.bold-red { color: red; font-weight: bold }
-.pointer { cursor: pointer; }
-/* ------------------------------------------- */
-
-
-.float-left { float: left; }
-.bookbag-share { float: left; padding: 5px 0; }
-.bookbag-controls { float: left; padding: 5px 0px 0px 10px; }
.left-corner { float: left; width: 163px; height: 30px; background: url('/images/utils-corner-mid.png') repeat-x top; }
-.float-right { float: right; }
.opac-auto-045 { float: right; margin-right: 17px; }
.opac-auto-046 { float: right; width: 214px; }
.opac-auto-047 { float: right; width: 353px; background: #ccc; padding: 10px; margin-top: 7px; }
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 7c703d6..1494826 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -200,6 +200,11 @@ span.dash_divider {
padding-left:0px;
}
+#gold-links-holder {
+ height: 24px;
+ background: #252525;
+}
+
#util-bar {
margin-left: 1em;
padding-left:0px;
@@ -1166,4 +1171,51 @@ table.bookbag-specific {
border-bottom: 1px solid #666;
margin-bottom: 2ex;
}
+.bookbag-share {
+ float: left;
+ padding: 5px 0;
+}
+.bookbag-controls {
+ float: left;
+ padding: 5px 0px 0px 10px;
+}
+
.save-notes { padding-bottom: 1.5ex; }
+
+/* Moved from semiauto.css */
+.opac-auto-010 {
+ border-bottom: 1px dotted #ccc;
+ padding-top: 10px;
+}
+.opac-auto-011 {
+ border-bottom: 1px dotted #ccc;
+ padding-top: 6px;
+}
+.adv_global_input_container { border-bottom: none; }
+.opac-auto-013 {
+ border-bottom: none;
+ *height: 0px;
+}
+.opac-auto-015 {
+ border-left: 1px solid #e9ebf3;
+ padding-right: 27px;
+}
+.adv_global_filter_sort {
+ border: none;
+ width: 100%;
+}
+.clear-both { clear: both; }
+.common-no-pad {
+ clear: both;
+ height: 0px;
+ margin: 0px;
+ padding: 0px;
+}
+.common-full-pad {
+ clear: both;
+ height: 15px;
+}
+.alert { color: red; }
+.float-left { float: left; }
+.float-right { float: right; }
+
commit b5aacbb7145948814ea73788505821945a2a545e
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date: Wed Oct 19 12:23:00 2011 -0400
add some 1em margins just to avoid text against the left edge
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index 2bf9022..7c703d6 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -137,7 +137,7 @@ span.dash_divider {
#header {
color: #fff;
padding-top: 26px;
- margin: auto;
+ margin-left: 1em;
font-size:11px;
}
@@ -191,7 +191,7 @@ span.dash_divider {
}
#gold-links {
- margin:auto;
+ margin-left: 1em;
padding-left:0px;
}
@@ -201,7 +201,7 @@ span.dash_divider {
}
#util-bar {
- margin:auto;
+ margin-left: 1em;
padding-left:0px;
height:0px;
}
@@ -240,7 +240,7 @@ span.dash_divider {
}
#search-wrapper #search-box {
- margin:auto;
+ margin-left: 1em;
padding-left: 0px;
}
@@ -262,7 +262,7 @@ span.dash_divider {
#adv_search_tabs, #acct_tabs, #acct_fines_tabs, #acct_checked_tabs, #acct_holds_tabs, #acct_prefs_tabs, #results_header_inner{
height: 40px;
- margin:auto;
+ margin-left: 1em;
}
#adv_search_tabs a, #acct_tabs a, #acct_fines_tabs a, #acct_checked_tabs a, #acct_holds_tabs a, #acct_prefs_tabs a {
@@ -320,6 +320,7 @@ span.dash_divider {
font-weight:bold;
color:#074079;
padding: 5px 7px 6px 0px;
+ margin-left: 1em;
border-bottom: 1px dotted #ccc;
}
@@ -454,6 +455,7 @@ span.dash_divider {
#hp-buttons {
margin: auto;
margin-top: 6px;
+ margin-left: 1em;
}
#hp-welcome {
@@ -478,7 +480,7 @@ span.dash_divider {
}
#hp-banner {
- margin: auto;
+ margin-left: 1em;
height: 213px;
}
@@ -535,17 +537,17 @@ span.dash_divider {
.content-wrapper-record-page { top: -15px; position: relative; }
#main-content-home {
- margin: auto;
padding-left: 17px;
+ margin-left: 1em;
}
#main-content {
- margin:auto;
padding-left: 0px;
+ margin-left: 1em;
}
#main-content-after-bar {
float: left;
- margin: auto;
+ margin-left: 1em;
padding-left: 4px;
}
@@ -969,7 +971,7 @@ span.dash_divider {
#footer {
padding-top:5px;
padding-bottom: 10px;
- margin: auto;
+ margin-left: 1em;
font-size: 11px;
}
commit a9475ad61c4279bdd2f1b5cb3c60f1bba1a00c74
Author: Dan Scott <dscott at laurentian.ca>
Date: Wed Oct 19 12:00:34 2011 -0400
TPAC: Remove most egregious fixed-width style attributes
Attacking the most obvious width elements in style.css gives us a usable
TPAC display, albeit with some remaining cleanup in extremely limited
widths.
Signed-off-by: Dan Scott <dscott at laurentian.ca>
diff --git a/Open-ILS/web/css/skin/default/opac/style.css b/Open-ILS/web/css/skin/default/opac/style.css
index e3a425d..2bf9022 100644
--- a/Open-ILS/web/css/skin/default/opac/style.css
+++ b/Open-ILS/web/css/skin/default/opac/style.css
@@ -23,7 +23,7 @@ a {
border:1px solid #e9ebf3;
margin:0;
padding:0;
- width:168px;
+/* width:168px; */
}
/*
@@ -137,7 +137,6 @@ span.dash_divider {
#header {
color: #fff;
padding-top: 26px;
- width: 974px;
margin: auto;
font-size:11px;
}
@@ -193,19 +192,16 @@ span.dash_divider {
#gold-links {
margin:auto;
- width:974px;
padding-left:0px;
}
#gold-links-home {
margin:auto;
- width:694px;
padding-left:0px;
}
#util-bar {
margin:auto;
- width:974px;
padding-left:0px;
height:0px;
}
@@ -244,7 +240,6 @@ span.dash_divider {
}
#search-wrapper #search-box {
- width:974px;
margin:auto;
padding-left: 0px;
}
@@ -267,7 +262,6 @@ span.dash_divider {
#adv_search_tabs, #acct_tabs, #acct_fines_tabs, #acct_checked_tabs, #acct_holds_tabs, #acct_prefs_tabs, #results_header_inner{
height: 40px;
- width:974px;
margin:auto;
}
@@ -460,7 +454,6 @@ span.dash_divider {
#hp-buttons {
margin: auto;
margin-top: 6px;
- width: 694px; /* 974px; */
}
#hp-welcome {
@@ -486,7 +479,6 @@ span.dash_divider {
#hp-banner {
margin: auto;
- width: 694px; /* formerly 974px */
height: 213px;
}
@@ -510,7 +502,6 @@ span.dash_divider {
}
#hp-ql-bottom {
- width: 640px;
height: 31px;
padding-left: 24px;
padding-top: 13px;
@@ -543,10 +534,20 @@ span.dash_divider {
.content-wrapper-record-page { top: -15px; position: relative; }
-#main-content-home { width: 694px; margin: auto; padding-left: 17px; }
-#main-content { width: 974px; margin:auto; padding-left: 0px; }
+#main-content-home {
+ margin: auto;
+ padding-left: 17px;
+}
+#main-content {
+ margin:auto;
+ padding-left: 0px;
+}
-#main-content-after-bar { float: left; width: 800px; margin: auto; padding-left: 4px; }
+#main-content-after-bar {
+ float: left;
+ margin: auto;
+ padding-left: 4px;
+}
#results-side-bar { float: left; width: 174px; height: 500px; /* XXX to height of container*/ }
@@ -586,7 +587,6 @@ span.dash_divider {
}
#home-buttons-inner {
- width:664px;
height:117px;
background:#bda964;
}
@@ -625,6 +625,7 @@ span.dash_divider {
float: left;
font-size: 11px;
color: #191919;
+ background: #929292;
margin-right: 6px;
}
@@ -743,7 +744,6 @@ span.dash_divider {
.acct_sum_row {
padding: 7px 15px;
- width: 712px;
background: #f0f0f0;
margin-bottom: 2px;
font-size: 10px;
@@ -970,7 +970,6 @@ span.dash_divider {
padding-top:5px;
padding-bottom: 10px;
margin: auto;
- width: 974px;
font-size: 11px;
}
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/templates/opac/myopac/circs.tt2 | 2 +-
Open-ILS/src/templates/opac/myopac/lists.tt2 | 68 +-----
Open-ILS/src/templates/opac/myopac/main.tt2 | 6 +-
Open-ILS/src/templates/opac/myopac/prefs.tt2 | 2 +-
Open-ILS/src/templates/opac/parts/anon_list.tt2 | 2 +-
Open-ILS/src/templates/opac/parts/base.tt2 | 4 +-
.../src/templates/opac/parts/myopac/main_base.tt2 | 2 +-
.../src/templates/opac/parts/record/summary.tt2 | 41 +++--
.../src/templates/opac/parts/result/facets.tt2 | 8 +-
Open-ILS/src/templates/opac/parts/result/table.tt2 | 62 ++----
.../web/css/skin/default/opac/contentslider.css | 39 ----
Open-ILS/web/css/skin/default/opac/semiauto.css | 145 -------------
Open-ILS/web/css/skin/default/opac/style.css | 216 ++++++++++++++++----
13 files changed, 246 insertions(+), 351 deletions(-)
delete mode 100644 Open-ILS/web/css/skin/default/opac/contentslider.css
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list