fix some issues for PDF processing... adjust image sizing to fit page and add a few...

diff --git a/admin/upgrading.xml b/admin/upgrading.xml
index 4fbcbd3..fc71aa7 100644 (file)
--- a/admin/upgrading.xml
+++ b/admin/upgrading.xml
@@ -198,15 +198,15 @@ psql -U evergreen -h localhost -f Open-ILS/src/sql/Pg/2.1.0-2.1.1-upgrade-db.sql
                                <caution><para>Copying these configuration files will remove any customizations you have made to them. Remember to redo your customizations after copying \r
                                them.</para></caution>\r
                        </step>\r
-                       <step>\r
-                               <substeps>\r
-                                       <para>Update Apache files:</para>\r
-                                       <caution>\r
-                                               <para>Copying these Apache configuration files will remove any customizations you have made to them. Remember to redo \r
-                                               your customizations after copying them. For example, if you purchased an SSL certificate, you \r
-                                               will need to edit <filename>eg.conf</filename> to point to the appropriate SSL certificate files.</para>\r
-                                               <indexterm><primary>SSL</primary><secondary>certificates</secondary></indexterm>\r
-                                       </caution> \r
+                       <step>  \r
+                               <para>Update Apache files:</para>\r
+                               <caution>\r
+                                       <para>Copying these Apache configuration files will remove any customizations you have made to them. Remember to redo \r
+                                       your customizations after copying them. For example, if you purchased an SSL certificate, you \r
+                                       will need to edit <filename>eg.conf</filename> to point to the appropriate SSL certificate files.</para>\r
+                                       <indexterm><primary>SSL</primary><secondary>certificates</secondary></indexterm>\r
+                               </caution>\r
+                               <substeps> \r
                                        <step>\r
                                                <para>Update <filename>/etc/apache2/startup.pl</filename> by copying the example from \r
                                                <filename>Open-ILS/examples/apache/startup.pl</filename>.\r

diff --git a/reports/report-add-data-source.xml b/reports/report-add-data-source.xml
index 88c596d..f25cea3 100644 (file)
--- a/reports/report-add-data-source.xml
+++ b/reports/report-add-data-source.xml
@@ -250,7 +250,9 @@ where u.active = 't' and u.deleted <> 't';
     <para>The following example is a class definition for the example view
     that was created in the previous section.</para>
 
-    <para><programlisting>&lt;class id="erpstats" controller="open-ils.reporter-store" oils_obj:fieldmapper="extend_reporter::patronstats" oils_persist:tablename="extend_reporter.patronstats" oils_persist:readonly="true" reporter:label="Patron Statistics" reporter:core="true"&gt;
+    <para>
+<programlisting>&lt;class id="erpstats" controller="open-ils.reporter-store" oils_obj:fieldmapper="extend_reporter::patronstats" 
+oils_persist:tablename="extend_reporter.patronstats" oils_persist:readonly="true" reporter:label="Patron Statistics" reporter:core="true"&gt;
   &lt;fields oils_persist:primary="id"&gt;
   &lt;field reporter:label="Patron ID" name="id" reporter:datatype="link" /&gt;
   &lt;field reporter:label="Patron Type" name="ptype" reporter:datatype="text" /&gt;
@@ -310,7 +312,9 @@ where u.active = 't' and u.deleted &lt;&gt; 't';
       <listitem>
         <para>Restart the Evergreen reporter. You may need to modify this
         command depending on your system configuration and pid
-        path<programlisting>opensrf-perl.pl -l -action restart -service open-ils.reporter -config /openils/conf/opensrf_core.xml -pid-dir /openils/var/run</programlisting></para>
+        path
+<programlisting>opensrf-perl.pl -l -action restart -service open-ils.reporter \
+-config /openils/conf/opensrf_core.xml -pid-dir /openils/var/run</programlisting></para>
       </listitem>
 
       <listitem>

diff --git a/reports/report-exporting-report-templates-using-phppgadmin.xml b/reports/report-exporting-report-templates-using-phppgadmin.xml
index 2b96a2d..46b2037 100644 (file)
--- a/reports/report-exporting-report-templates-using-phppgadmin.xml
+++ b/reports/report-exporting-report-templates-using-phppgadmin.xml
@@ -30,7 +30,12 @@
                <para>The following statement could be used to grab the data in the folder and dump it with admin account as the owner and the first folder in your system.</para>\r
                <screen>SELECT 1 as owner, name, description, data, 1 as folder FROM reporter.template</screen>\r
                <para>or use the following to capture your folder names for export</para>\r
-               <screen>SELECT 1 as owner, t.name, t.description, t.data, f.name as folder FROM reporter.template t JOIN reporter.template_folder f ON t.folder=f.id</screen>\r
+               \r
+<screen>\r
+SELECT 1 as owner, t.name, t.description, t.data, f.name as folder \r
+       FROM reporter.template t \r
+       JOIN reporter.template_folder f ON t.folder=f.id\r
+</screen>\r
                \r
                <orderedlist>\r
         <listitem>Run the above query</listitem>\r

diff --git a/stafftasks/cataloging.xml b/stafftasks/cataloging.xml
index 26dc4c0..08b4e7e 100644 (file)
--- a/stafftasks/cataloging.xml
+++ b/stafftasks/cataloging.xml
@@ -149,7 +149,7 @@
                </note>\r
                <mediaobject>\r
                  <imageobject>\r
-                 <imagedata fileref="../media/unified_volume_copy_creator3.jpg"/>\r
+                 <imagedata width="100%" scalefit="1" fileref="../media/unified_volume_copy_creator3.jpg"/>\r
                  </imageobject>\r
                </mediaobject>\r
                </listitem>\r
@@ -162,7 +162,7 @@
                \r
                <mediaobject>\r
                  <imageobject>\r
-                 <imagedata fileref="../media/unified_volume_copy_creator4.jpg"/>\r
+                 <imagedata width="100%" scalefit="1" fileref="../media/unified_volume_copy_creator4.jpg"/>\r
                  </imageobject>\r
                </mediaobject>\r
                \r
@@ -172,7 +172,7 @@
                \r
                <mediaobject>\r
                  <imageobject>\r
-                 <imagedata fileref="../media/unified_volume_copy_creator5.jpg"/>\r
+                 <imagedata width="100%" scalefit="1" fileref="../media/unified_volume_copy_creator5.jpg"/>\r
                  </imageobject>\r
                </mediaobject>\r
                \r
@@ -260,7 +260,7 @@
                \r
                <mediaobject>\r
                  <imageobject>\r
-                 <imagedata fileref="../media/monograph_parts4.jpg"/>\r
+                 <imagedata width="100%" scalefit="1" fileref="../media/monograph_parts4.jpg"/>\r
                  </imageobject>\r
                </mediaobject>\r
                \r
@@ -303,7 +303,7 @@
                \r
                <mediaobject>\r
                 <imageobject>\r
-                       <imagedata fileref="../media/conj1.jpg"/>\r
+                       <imagedata width="100%" scalefit="1" fileref="../media/conj1.jpg"/>\r
                 </imageobject>\r
                </mediaobject>\r
                \r
@@ -323,7 +323,7 @@
                \r
                <mediaobject>\r
                  <imageobject>\r
-                 <imagedata fileref="../media/conj2.jpg"/>\r
+                 <imagedata width="100%" scalefit="1" fileref="../media/conj2.jpg"/>\r
                  </imageobject>\r
                </mediaobject>\r
                \r
@@ -400,7 +400,7 @@
                \r
                <mediaobject>\r
                  <imageobject>\r
-                 <imagedata fileref="../media/conj9.jpg"/>\r
+                 <imagedata width="100%" scalefit="1" fileref="../media/conj9.jpg"/>\r
                  </imageobject>\r
                </mediaobject>\r
                \r

diff --git a/stafftasks/circulation.xml b/stafftasks/circulation.xml
index d3fcdc9..e52f22a 100644 (file)
--- a/stafftasks/circulation.xml
+++ b/stafftasks/circulation.xml
@@ -117,7 +117,7 @@
        </simpara>\r
        <mediaobject>\r
          <imageobject>\r
-       <imagedata fileref="../media/holds-placing-3.png"/>\r
+       <imagedata width="100%" scalefit="1" fileref="../media/holds-placing-3.png"/>\r
        </imageobject>\r
        </mediaobject>\r
        </listitem>\r
@@ -310,7 +310,7 @@
        </simpara>\r
        <mediaobject>\r
          <imageobject>\r
-       <imagedata fileref="../media/holds-placing-10.png"/>\r
+       <imagedata width="100%" scalefit="1" fileref="../media/holds-placing-10.png"/>\r
        </imageobject>\r
        </mediaobject>\r
        </listitem>\r
@@ -320,7 +320,7 @@
        </simpara>\r
        <mediaobject>\r
          <imageobject>\r
-       <imagedata fileref="../media/holds-placing-11.png"/>\r
+       <imagedata width="100%" scalefit="1" fileref="../media/holds-placing-11.png"/>\r
        </imageobject>\r
        </mediaobject>\r
        </listitem>\r
@@ -370,7 +370,7 @@
        </simpara>\r
        <mediaobject>\r
          <imageobject>\r
-       <imagedata fileref="../media/holds-managing-1.png"/>\r
+       <imagedata width="100%" scalefit="1" fileref="../media/holds-managing-1.png"/>\r
        </imageobject>\r
        </mediaobject>\r
        </listitem>\r
@@ -401,7 +401,7 @@
        </simpara>\r
        <mediaobject>\r
          <imageobject>\r
-       <imagedata fileref="../media/holds-managing-3.png"/>\r
+       <imagedata width="100%" scalefit="1" fileref="../media/holds-managing-3.png"/>\r
        </imageobject>\r
        </mediaobject>\r
        <note><simpara>Suspended holds will not be filled but its hold position will be kept. They will automatically become active on the activation day if there is an activation \r
@@ -488,7 +488,7 @@
        </simpara>\r
        <mediaobject>\r
          <imageobject>\r
-       <imagedata fileref="../media/holds-managing-9.png"/>\r
+       <imagedata width="100%" scalefit="1" fileref="../media/holds-managing-9.png"/>\r
        </imageobject>\r
        </mediaobject>\r
        </listitem>\r
@@ -550,7 +550,7 @@
        </simpara>\r
        <mediaobject>\r
          <imageobject>\r
-       <imagedata fileref="../media/holds-managing-14.png"/>\r
+       <imagedata width="100%" scalefit="1" fileref="../media/holds-managing-14.png"/>\r
        </imageobject>\r
        </mediaobject>\r
        </listitem>\r
@@ -571,7 +571,7 @@
        <simpara>Using the Column Picker, you can display Queue Position and Total number of Holds.</simpara>\r
        <mediaobject>\r
          <imageobject>\r
-       <imagedata fileref="../media/holds-managing-16.png"/>\r
+       <imagedata width="100%" scalefit="1" fileref="../media/holds-managing-16.png"/>\r
        </imageobject>\r
        </mediaobject>\r
        </simplesect>\r
@@ -707,7 +707,7 @@
        </simpara>\r
        <mediaobject>\r
          <imageobject>\r
-       <imagedata fileref="../media/holds-pull-2.png"/>\r
+       <imagedata width="100%" scalefit="1" fileref="../media/holds-pull-2.png"/>\r
        </imageobject>\r
        </mediaobject>\r
        <note>\r
@@ -850,7 +850,7 @@
        </simpara>\r
        <mediaobject>\r
          <imageobject>\r
-       <imagedata fileref="../media/holds-notifications-1.png"/>\r
+       <imagedata width="100%" scalefit="1" fileref="../media/holds-notifications-1.png"/>\r
        </imageobject>\r
        </mediaobject>\r
        <simpara>The “phone and email” option is the default for those users who have not yet set a preference.</simpara>\r
@@ -862,7 +862,7 @@
        </simpara>\r
        <mediaobject>\r
          <imageobject>\r
-       <imagedata fileref="../media/holds-notifications-2.png"/>\r
+       <imagedata width="100%" scalefit="1" fileref="../media/holds-notifications-2.png"/>\r
        </imageobject>\r
        </mediaobject>\r
        </listitem>\r
@@ -918,7 +918,7 @@
        </simpara>\r
        <mediaobject>\r
          <imageobject>\r
-       <imagedata fileref="../media/holds-clearing-2.png"/>\r
+       <imagedata width="100%" scalefit="1" fileref="../media/holds-clearing-2.png"/>\r
        </imageobject>\r
        </mediaobject>\r
        </listitem>\r
@@ -943,7 +943,7 @@
        </simpara>\r
        <mediaobject>\r
          <imageobject>\r
-       <imagedata fileref="../media/holds-clearing-4.png"/>\r
+       <imagedata width="100%" scalefit="1" fileref="../media/holds-clearing-4.png"/>\r
        </imageobject>\r
        </mediaobject>\r
        </listitem>\r