Merge branch 'master' of git.evergreen-ils.org:Evergreen into dbs/tpac-non-fixed...

Conflicts:
	Open-ILS/web/css/skin/default/opac/style.css

Signed-off-by: Dan Scott <dscott@laurentian.ca>

diff --cc Open-ILS/src/templates/opac/myopac/circs.tt2
Simple merge

diff --cc Open-ILS/src/templates/opac/myopac/lists.tt2
Simple merge

diff --cc Open-ILS/web/css/skin/default/opac/style.css
index d71a036,6433166..eda8777
--- 1/Open-ILS/web/css/skin/default/opac/style.css
--- 2/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;
+ }