The "API" is really simple: http://www.adlibris.com/se/showimagesafe.aspx?isbn=9188876659
Created attachment 43188 [details] [review] Bug 8630 - Adlibris covers (syspref files) This patch adds a system preference for cover images from Swedish book retailer Adlibris. Images are retrieved via http or https from an external web server. This might leak OPAC and Staff interface data to third parties and should thus be used with caution. Sponsored-By: Halland County Library Test plan: Test 1: Test upgrade procedure for clean installation. Start by removing existing sysprefs, if present: $ mysql -u kohaadmin -p -D koha > DELETE FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; * Apply this patch which will add a pref file, update the 'syspref' structure and add an atomic upgrade file. * Install the update: Koha$ perl installer/data/mysql/updatedatabase.pl * Once upgraded and logged in, Select 'More', 'Administration', 'Global Preferences' and finally 'Enhanced content'. There should be a new option called 'Adlibris'. The first option should default to "Don't show", if not the patch is broken. The second options should show the default URL: http://www.adlibris.com/se/organisationer/showimagesafe.aspx If not, the patch is broken. Test 2: Changing sysprefs * In the control panel, change the first value from "Don't show" to "Show" and save the changes. Use MySQL client to inspect changes: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; The column 'value' should now have the value '1', if not the patch is broken. Test 3: Apply update to existing data * Re-execute the installer now that the database has the data already: Koha$ perl installer/data/mysql/updatedatabase.pl If any errors occur the patch is broken. Examine the database contents: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; If the values were overwritten by the installer the patch is broken.
Created attachment 43256 [details] [review] Bug 8630 - Adlibris covers (intranet templates) Changes to staff interface (intranet) templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test results.tt * From the main intranet page, select "Search the catalog" and enter the title we added, "1984" and press "Search". * You should end up with the url: http://127.0.1.1:8080/cgi-bin/koha/catalogue/search.pl?q=1984 * The cover image should be shown in the leftmost column. * If cover is clicked, the full cover image should be shown. * Test detail.tt (continue from the search results used in prev. test) * Click on the title text, you should be sent to: http://127.0.1.1:8080/cgi-bin/koha/catalogue/detail.pl?biblionumber=2 * The cover image should be shown on the right. * If clicked, the full cover should be shown. Sponsored-By: Halland County Library
Created attachment 43257 [details] [review] Bug 8630 - Adlibris covers (intranet CSS) This defined two new CSS classes for use by the intranet templates. Apply this patch before doing the testing of "intranet templates". Sponsored-By: Halland County Library
Created attachment 43258 [details] [review] Bug 8630 - Adlibris covers (OPAC templates) Changes to OPAC templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test opac-results.tt * Search library catalog from OPAC for "1984". * You should be sent to: http://127.0.1.1/cgi-bin/koha/opac-search.pl?idx=&q=1984 * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * Test opac-detail.tt (continued from previous test's location) * Click on the title with cover (1984, ISBN: 9780451524935) * Cover should be displayed to the left in full size. * If clicked, should link to the full-size image. Test opac-results-grouped.tt * This template is only used if an external "grouping" server is setup and the syspref "OPACGroupResults" is set to "Use". * Personally I did not test this, b/c: terminally lazy * Test opac-showreviews.tt * Could not find any links to this location, manually enter it: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl * Image should be shown to the right in full size. * If clicked it should take you to the detail view with the comments tab opened. * Test opac-showreviews-rss.tt * Click on the RSS icon from previous test's start location. URL should be: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl?format=rss * An image tag linking to the full-size image without any styling class should be present. * Test opac-user.tt * Click on your username to open: http://127.0.1.1/cgi-bin/koha/opac-user.pl * Covers should be shown for checked out items with CSS class: adlibris-cover * When clicked the destination should be the same as clicking the title column entry: opac-details.pl * Test opac-opensearch.tt * Click on "Advanced search" and enter "1984" then press "Search" * This search screen uses a different template. * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * If clicked, should link to the OPAC detail view. * Test opac-readingrecord.tt * Click on your logged-in name to go to your personal page. * Click on "Your reading history" tab on the left. http://127.0.1.1/cgi-bin/koha/opac-readingrecord.pl * Covers should be shown in leftmost column with CSS class: adlibris-cover * If clicked, should link to the same as the 'Title' link. Sponsored-By: Halland County Library
Created attachment 43259 [details] [review] Bug 8630 - Adlibris covers (OPAC less changes) This patch adds two new CSS classes specific to Adlibris covers. Sponsored-By: Halland County Library
Created attachment 43260 [details] [review] Bug 8630 - Adlibris covers (OPAC minified CSS) This is the minified CSS updated via the lessc tool, separated into a standalone patch for ease of integration. Sponsored-By: Halland County Library
Added a system preference to the "Enhanced content" tab and changed all templates in Intranet and OPAC to include this new cover source. The images needed some new CSS classes for scaling purposes, these were added to both OPAC and intranet CSS files. Separated into a bunch of patchsets in case someone deems there is a better way to handle parts of this.
Is this ready to test?
Please rebase. Also, opac minified CSS is going to conflict regularly.
Created attachment 58333 [details] [review] Bug 8630 - Adlibris covers (syspref files) This patch adds a system preference for cover images from Swedish book retailer Adlibris. Images are retrieved via http or https from an external web server. This might leak OPAC and Staff interface data to third parties and should thus be used with caution. Sponsored-By: Halland County Library Test plan: Test 1: Test upgrade procedure for clean installation. Start by removing existing sysprefs, if present: $ mysql -u kohaadmin -p -D koha > DELETE FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; * Apply this patch which will add a pref file, update the 'syspref' structure and add an atomic upgrade file. * Install the update: Koha$ perl installer/data/mysql/updatedatabase.pl * Once upgraded and logged in, Select 'More', 'Administration', 'Global Preferences' and finally 'Enhanced content'. There should be a new option called 'Adlibris'. The first option should default to "Don't show", if not the patch is broken. The second options should show the default URL: http://www.adlibris.com/se/organisationer/showimagesafe.aspx If not, the patch is broken. Test 2: Changing sysprefs * In the control panel, change the first value from "Don't show" to "Show" and save the changes. Use MySQL client to inspect changes: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; The column 'value' should now have the value '1', if not the patch is broken. Test 3: Apply update to existing data * Re-execute the installer now that the database has the data already: Koha$ perl installer/data/mysql/updatedatabase.pl If any errors occur the patch is broken. Examine the database contents: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; If the values were overwritten by the installer the patch is broken.
Created attachment 58334 [details] [review] Bug 8630 - Adlibris covers (intranet templates) Changes to staff interface (intranet) templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test results.tt * From the main intranet page, select "Search the catalog" and enter the title we added, "1984" and press "Search". * You should end up with the url: http://127.0.1.1:8080/cgi-bin/koha/catalogue/search.pl?q=1984 * The cover image should be shown in the leftmost column. * If cover is clicked, the full cover image should be shown. * Test detail.tt (continue from the search results used in prev. test) * Click on the title text, you should be sent to: http://127.0.1.1:8080/cgi-bin/koha/catalogue/detail.pl?biblionumber=2 * The cover image should be shown on the right. * If clicked, the full cover should be shown. Sponsored-By: Halland County Library
Created attachment 58335 [details] [review] Bug 8630 - Adlibris covers (intranet CSS) This defined two new CSS classes for use by the intranet templates. Apply this patch before doing the testing of "intranet templates". Sponsored-By: Halland County Library
Created attachment 58336 [details] [review] Bug 8630 - Adlibris covers (OPAC templates) Changes to OPAC templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test opac-results.tt * Search library catalog from OPAC for "1984". * You should be sent to: http://127.0.1.1/cgi-bin/koha/opac-search.pl?idx=&q=1984 * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * Test opac-detail.tt (continued from previous test's location) * Click on the title with cover (1984, ISBN: 9780451524935) * Cover should be displayed to the left in full size. * If clicked, should link to the full-size image. Test opac-results-grouped.tt * This template is only used if an external "grouping" server is setup and the syspref "OPACGroupResults" is set to "Use". * Personally I did not test this, b/c: terminally lazy * Test opac-showreviews.tt * Could not find any links to this location, manually enter it: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl * Image should be shown to the right in full size. * If clicked it should take you to the detail view with the comments tab opened. * Test opac-showreviews-rss.tt * Click on the RSS icon from previous test's start location. URL should be: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl?format=rss * An image tag linking to the full-size image without any styling class should be present. * Test opac-user.tt * Click on your username to open: http://127.0.1.1/cgi-bin/koha/opac-user.pl * Covers should be shown for checked out items with CSS class: adlibris-cover * When clicked the destination should be the same as clicking the title column entry: opac-details.pl * Test opac-opensearch.tt * Click on "Advanced search" and enter "1984" then press "Search" * This search screen uses a different template. * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * If clicked, should link to the OPAC detail view. * Test opac-readingrecord.tt * Click on your logged-in name to go to your personal page. * Click on "Your reading history" tab on the left. http://127.0.1.1/cgi-bin/koha/opac-readingrecord.pl * Covers should be shown in leftmost column with CSS class: adlibris-cover * If clicked, should link to the same as the 'Title' link. Sponsored-By: Halland County Library
Created attachment 58337 [details] [review] Bug 8630 - Adlibris covers (OPAC less changes) This patch adds two new CSS classes specific to Adlibris covers. Sponsored-By: Halland County Library
Patches have been rebased and are ready for testing. Test WITHOUT the opac minified css patch - this will only cause painful conflicts.
Created attachment 58343 [details] [review] [SIGNED-OFF] Bug 8630 - Adlibris covers (syspref files) This patch adds a system preference for cover images from Swedish book retailer Adlibris. Images are retrieved via http or https from an external web server. This might leak OPAC and Staff interface data to third parties and should thus be used with caution. Sponsored-By: Halland County Library Test plan: Test 1: Test upgrade procedure for clean installation. Start by removing existing sysprefs, if present: $ mysql -u kohaadmin -p -D koha > DELETE FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; * Apply this patch which will add a pref file, update the 'syspref' structure and add an atomic upgrade file. * Install the update: Koha$ perl installer/data/mysql/updatedatabase.pl * Once upgraded and logged in, Select 'More', 'Administration', 'Global Preferences' and finally 'Enhanced content'. There should be a new option called 'Adlibris'. The first option should default to "Don't show", if not the patch is broken. The second options should show the default URL: http://www.adlibris.com/se/organisationer/showimagesafe.aspx If not, the patch is broken. Test 2: Changing sysprefs * In the control panel, change the first value from "Don't show" to "Show" and save the changes. Use MySQL client to inspect changes: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; The column 'value' should now have the value '1', if not the patch is broken. Test 3: Apply update to existing data * Re-execute the installer now that the database has the data already: Koha$ perl installer/data/mysql/updatedatabase.pl If any errors occur the patch is broken. Examine the database contents: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; If the values were overwritten by the installer the patch is broken. Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 58344 [details] [review] [SIGNED-OFF] Bug 8630 - Adlibris covers (intranet templates) Changes to staff interface (intranet) templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test results.tt * From the main intranet page, select "Search the catalog" and enter the title we added, "1984" and press "Search". * You should end up with the url: http://127.0.1.1:8080/cgi-bin/koha/catalogue/search.pl?q=1984 * The cover image should be shown in the leftmost column. * If cover is clicked, the full cover image should be shown. * Test detail.tt (continue from the search results used in prev. test) * Click on the title text, you should be sent to: http://127.0.1.1:8080/cgi-bin/koha/catalogue/detail.pl?biblionumber=2 * The cover image should be shown on the right. * If clicked, the full cover should be shown. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 58345 [details] [review] [SIGNED-OFF] Bug 8630 - Adlibris covers (intranet CSS) This defined two new CSS classes for use by the intranet templates. Apply this patch before doing the testing of "intranet templates". Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 58346 [details] [review] [SIGNED-OFF] Bug 8630 - Adlibris covers (OPAC templates) Changes to OPAC templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test opac-results.tt * Search library catalog from OPAC for "1984". * You should be sent to: http://127.0.1.1/cgi-bin/koha/opac-search.pl?idx=&q=1984 * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * Test opac-detail.tt (continued from previous test's location) * Click on the title with cover (1984, ISBN: 9780451524935) * Cover should be displayed to the left in full size. * If clicked, should link to the full-size image. Test opac-results-grouped.tt * This template is only used if an external "grouping" server is setup and the syspref "OPACGroupResults" is set to "Use". * Personally I did not test this, b/c: terminally lazy * Test opac-showreviews.tt * Could not find any links to this location, manually enter it: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl * Image should be shown to the right in full size. * If clicked it should take you to the detail view with the comments tab opened. * Test opac-showreviews-rss.tt * Click on the RSS icon from previous test's start location. URL should be: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl?format=rss * An image tag linking to the full-size image without any styling class should be present. * Test opac-user.tt * Click on your username to open: http://127.0.1.1/cgi-bin/koha/opac-user.pl * Covers should be shown for checked out items with CSS class: adlibris-cover * When clicked the destination should be the same as clicking the title column entry: opac-details.pl * Test opac-opensearch.tt * Click on "Advanced search" and enter "1984" then press "Search" * This search screen uses a different template. * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * If clicked, should link to the OPAC detail view. * Test opac-readingrecord.tt * Click on your logged-in name to go to your personal page. * Click on "Your reading history" tab on the left. http://127.0.1.1/cgi-bin/koha/opac-readingrecord.pl * Covers should be shown in leftmost column with CSS class: adlibris-cover * If clicked, should link to the same as the 'Title' link. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 58347 [details] [review] [SIGNED-OFF] Bug 8630 - Adlibris covers (OPAC less changes) This patch adds two new CSS classes specific to Adlibris covers. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 64244 [details] [review] Bug 8630 - Adlibris covers (syspref files) This patch adds a system preference for cover images from Swedish book retailer Adlibris. Images are retrieved via http or https from an external web server. This might leak OPAC and Staff interface data to third parties and should thus be used with caution. Sponsored-By: Halland County Library Test plan: Test 1: Test upgrade procedure for clean installation. Start by removing existing sysprefs, if present: $ mysql -u kohaadmin -p -D koha > DELETE FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; * Apply this patch which will add a pref file, update the 'syspref' structure and add an atomic upgrade file. * Install the update: Koha$ perl installer/data/mysql/updatedatabase.pl * Once upgraded and logged in, Select 'More', 'Administration', 'Global Preferences' and finally 'Enhanced content'. There should be a new option called 'Adlibris'. The first option should default to "Don't show", if not the patch is broken. The second options should show the default URL: http://www.adlibris.com/se/organisationer/showimagesafe.aspx If not, the patch is broken. Test 2: Changing sysprefs * In the control panel, change the first value from "Don't show" to "Show" and save the changes. Use MySQL client to inspect changes: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; The column 'value' should now have the value '1', if not the patch is broken. Test 3: Apply update to existing data * Re-execute the installer now that the database has the data already: Koha$ perl installer/data/mysql/updatedatabase.pl If any errors occur the patch is broken. Examine the database contents: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; If the values were overwritten by the installer the patch is broken. Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 64245 [details] [review] Bug 8630 - Adlibris covers (intranet templates) Changes to staff interface (intranet) templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test results.tt * From the main intranet page, select "Search the catalog" and enter the title we added, "1984" and press "Search". * You should end up with the url: http://127.0.1.1:8080/cgi-bin/koha/catalogue/search.pl?q=1984 * The cover image should be shown in the leftmost column. * If cover is clicked, the full cover image should be shown. * Test detail.tt (continue from the search results used in prev. test) * Click on the title text, you should be sent to: http://127.0.1.1:8080/cgi-bin/koha/catalogue/detail.pl?biblionumber=2 * The cover image should be shown on the right. * If clicked, the full cover should be shown. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 64246 [details] [review] Bug 8630 - Adlibris covers (intranet CSS) This defined two new CSS classes for use by the intranet templates. Apply this patch before doing the testing of "intranet templates". Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 64247 [details] [review] Bug 8630 - Adlibris covers (OPAC templates) Changes to OPAC templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test opac-results.tt * Search library catalog from OPAC for "1984". * You should be sent to: http://127.0.1.1/cgi-bin/koha/opac-search.pl?idx=&q=1984 * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * Test opac-detail.tt (continued from previous test's location) * Click on the title with cover (1984, ISBN: 9780451524935) * Cover should be displayed to the left in full size. * If clicked, should link to the full-size image. Test opac-results-grouped.tt * This template is only used if an external "grouping" server is setup and the syspref "OPACGroupResults" is set to "Use". * Personally I did not test this, b/c: terminally lazy * Test opac-showreviews.tt * Could not find any links to this location, manually enter it: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl * Image should be shown to the right in full size. * If clicked it should take you to the detail view with the comments tab opened. * Test opac-showreviews-rss.tt * Click on the RSS icon from previous test's start location. URL should be: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl?format=rss * An image tag linking to the full-size image without any styling class should be present. * Test opac-user.tt * Click on your username to open: http://127.0.1.1/cgi-bin/koha/opac-user.pl * Covers should be shown for checked out items with CSS class: adlibris-cover * When clicked the destination should be the same as clicking the title column entry: opac-details.pl * Test opac-opensearch.tt * Click on "Advanced search" and enter "1984" then press "Search" * This search screen uses a different template. * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * If clicked, should link to the OPAC detail view. * Test opac-readingrecord.tt * Click on your logged-in name to go to your personal page. * Click on "Your reading history" tab on the left. http://127.0.1.1/cgi-bin/koha/opac-readingrecord.pl * Covers should be shown in leftmost column with CSS class: adlibris-cover * If clicked, should link to the same as the 'Title' link. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 64248 [details] [review] Bug 8630 - Adlibris covers (OPAC less changes) This patch adds two new CSS classes specific to Adlibris covers. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Patches have been rebased. Ready to test.
There is a conflict in the OPAC minified CSS: Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 8630 - Adlibris covers (OPAC minified CSS) Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/css/opac.css Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/opac.css CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/css/opac.css error: Failed to merge in the changes. Patch failed at 0001 Bug 8630 - Adlibris covers (OPAC minified CSS) Leaving this Needs Signoff, someone familiar with the process could recompile before testing.
*** Bug 14953 has been marked as a duplicate of this bug. ***
There is a conflict with the CSS files, Aleisha, could you fix please? Would it be safe to leave the first patch off and then regenereate opac.css from the lst one?
pply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 8630 - Adlibris covers (OPAC minified CSS) Using index info to reconstruct a base tree... M koha-tmpl/opac-tmpl/bootstrap/css/opac.css Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/opac.css CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/css/opac.css error: Failed to merge in the changes. Patch failed at 0001 Bug 8630 - Adlibris covers (OPAC minified CSS) The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-8630---Adlibris-covers-OPAC-minified-CSS-2gtmVc.patch
(In reply to Katrin Fischer from comment #30) > pply? [(y)es, (n)o, (i)nteractive] y > Applying: Bug 8630 - Adlibris covers (OPAC minified CSS) > Using index info to reconstruct a base tree... > M koha-tmpl/opac-tmpl/bootstrap/css/opac.css See my comment #9. This is why I asked Tomas to get lessc into the kohadevbox. I believe it is there now. https://wiki.koha-community.org/wiki/Working_with_Bootstrap_OPAC_LESS_files I'd recommend skipping the first patch, and then rebuilding the minified OPAC CSS. I'll try to remember to check back in 12+ hours, and rebase if needed.
(In reply to M. Tompsett from comment #31) > (In reply to Katrin Fischer from comment #30) > > pply? [(y)es, (n)o, (i)nteractive] y > > Applying: Bug 8630 - Adlibris covers (OPAC minified CSS) > > Using index info to reconstruct a base tree... > > M koha-tmpl/opac-tmpl/bootstrap/css/opac.css > > See my comment #9. This is why I asked Tomas to get lessc into the > kohadevbox. I believe it is there now. > https://wiki.koha-community.org/wiki/Working_with_Bootstrap_OPAC_LESS_files > I'd recommend skipping the first patch, and then rebuilding the minified > OPAC CSS. > I'll try to remember to check back in 12+ hours, and rebase if needed. I didn't make the minified CSS file so I'm not 100% sure what to do with it! Martin can you check in here please? I think it was your patch.
Instructions on recreating the less changes are here: https://wiki.koha-community.org/wiki/Working_with_Bootstrap_OPAC_LESS_files
Instructions on recreating the less changes are here: https://wiki.koha-community.org/wiki/Working_with_Bootstrap_OPAC_LESS_files I am super impressed with how fast and well the cover service works! I am having trouble to generate the minified version in kohadevbox, I will upload my non-minified file for further testing, but we need to fix this correctly in the patches to be pushed. 1) Staff result list - OK 2) Staff detail page - Cover is in the wrong spot, please check! 3) OPAC result list - OK 4) OPAC detail page - OK 5) Recent reviews - OK 6) Recent reviews - RSS - OK 7) OPAC - patron account - reading history - OK 8) OPAC - patron account - checkouts - OK 9) OPAC - patron account - overdues - Not ok, I think some code here is missing, but if condition was changed in the template. Read the code for opac-results-grouped.tt, but couldn't test. I am not sure if the feature this template is used is still usable even. Should not be a blocker. Aleisha, could you try to generate the minified CSS and take a look at the two problem cases?
Created attachment 68366 [details] [review] Bug 8630 - Regenerated CSS - Not minified, do NOT PUSH! Had trouble with rgenerating the minified CSS in kohadevbox, but uploading this as a help for others.
Created attachment 73125 [details] [review] Bug 8630 - Adlibris covers (intranet templates) Changes to staff interface (intranet) templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test results.tt * From the main intranet page, select "Search the catalog" and enter the title we added, "1984" and press "Search". * You should end up with the url: http://127.0.1.1:8080/cgi-bin/koha/catalogue/search.pl?q=1984 * The cover image should be shown in the leftmost column. * If cover is clicked, the full cover image should be shown. * Test detail.tt (continue from the search results used in prev. test) * Click on the title text, you should be sent to: http://127.0.1.1:8080/cgi-bin/koha/catalogue/detail.pl?biblionumber=2 * The cover image should be shown on the right. * If clicked, the full cover should be shown. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 73126 [details] [review] Bug 8630 - Adlibris covers (intranet CSS) This defined two new CSS classes for use by the intranet templates. Apply this patch before doing the testing of "intranet templates". Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 73127 [details] [review] Bug 8630 - Adlibris covers (OPAC templates) Changes to OPAC templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test opac-results.tt * Search library catalog from OPAC for "1984". * You should be sent to: http://127.0.1.1/cgi-bin/koha/opac-search.pl?idx=&q=1984 * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * Test opac-detail.tt (continued from previous test's location) * Click on the title with cover (1984, ISBN: 9780451524935) * Cover should be displayed to the left in full size. * If clicked, should link to the full-size image. Test opac-results-grouped.tt * This template is only used if an external "grouping" server is setup and the syspref "OPACGroupResults" is set to "Use". * Personally I did not test this, b/c: terminally lazy * Test opac-showreviews.tt * Could not find any links to this location, manually enter it: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl * Image should be shown to the right in full size. * If clicked it should take you to the detail view with the comments tab opened. * Test opac-showreviews-rss.tt * Click on the RSS icon from previous test's start location. URL should be: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl?format=rss * An image tag linking to the full-size image without any styling class should be present. * Test opac-user.tt * Click on your username to open: http://127.0.1.1/cgi-bin/koha/opac-user.pl * Covers should be shown for checked out items with CSS class: adlibris-cover * When clicked the destination should be the same as clicking the title column entry: opac-details.pl * Test opac-opensearch.tt * Click on "Advanced search" and enter "1984" then press "Search" * This search screen uses a different template. * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * If clicked, should link to the OPAC detail view. * Test opac-readingrecord.tt * Click on your logged-in name to go to your personal page. * Click on "Your reading history" tab on the left. http://127.0.1.1/cgi-bin/koha/opac-readingrecord.pl * Covers should be shown in leftmost column with CSS class: adlibris-cover * If clicked, should link to the same as the 'Title' link. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 73128 [details] [review] Bug 8630 - Adlibris covers (OPAC less changes) This patch adds two new CSS classes specific to Adlibris covers. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 73129 [details] [review] Bug 8630 - Regenerated CSS - Not minified, do NOT PUSH! Had trouble with rgenerating the minified CSS in kohadevbox, but uploading this as a help for others.
Created attachment 76848 [details] [review] Bug 8630 - Adlibris covers (syspref files) This patch adds a system preference for cover images from Swedish book retailer Adlibris. Images are retrieved via http or https from an external web server. This might leak OPAC and Staff interface data to third parties and should thus be used with caution. Sponsored-By: Halland County Library Test plan: Test 1: Test upgrade procedure for clean installation. Start by removing existing sysprefs, if present: $ mysql -u kohaadmin -p -D koha > DELETE FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; * Apply this patch which will add a pref file, update the 'syspref' structure and add an atomic upgrade file. * Install the update: Koha$ perl installer/data/mysql/updatedatabase.pl * Once upgraded and logged in, Select 'More', 'Administration', 'Global Preferences' and finally 'Enhanced content'. There should be a new option called 'Adlibris'. The first option should default to "Don't show", if not the patch is broken. The second options should show the default URL: http://www.adlibris.com/se/organisationer/showimagesafe.aspx If not, the patch is broken. Test 2: Changing sysprefs * In the control panel, change the first value from "Don't show" to "Show" and save the changes. Use MySQL client to inspect changes: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; The column 'value' should now have the value '1', if not the patch is broken. Test 3: Apply update to existing data * Re-execute the installer now that the database has the data already: Koha$ perl installer/data/mysql/updatedatabase.pl If any errors occur the patch is broken. Examine the database contents: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; If the values were overwritten by the installer the patch is broken. Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 76849 [details] [review] Bug 8630 - Adlibris covers (intranet templates) Changes to staff interface (intranet) templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test results.tt * From the main intranet page, select "Search the catalog" and enter the title we added, "1984" and press "Search". * You should end up with the url: http://127.0.1.1:8080/cgi-bin/koha/catalogue/search.pl?q=1984 * The cover image should be shown in the leftmost column. * If cover is clicked, the full cover image should be shown. * Test detail.tt (continue from the search results used in prev. test) * Click on the title text, you should be sent to: http://127.0.1.1:8080/cgi-bin/koha/catalogue/detail.pl?biblionumber=2 * The cover image should be shown on the right. * If clicked, the full cover should be shown. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 76850 [details] [review] Bug 8630 - Adlibris covers (intranet CSS) This defined two new CSS classes for use by the intranet templates. Apply this patch before doing the testing of "intranet templates". Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 76851 [details] [review] Bug 8630 - Adlibris covers (OPAC templates) Changes to OPAC templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test opac-results.tt * Search library catalog from OPAC for "1984". * You should be sent to: http://127.0.1.1/cgi-bin/koha/opac-search.pl?idx=&q=1984 * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * Test opac-detail.tt (continued from previous test's location) * Click on the title with cover (1984, ISBN: 9780451524935) * Cover should be displayed to the left in full size. * If clicked, should link to the full-size image. Test opac-results-grouped.tt * This template is only used if an external "grouping" server is setup and the syspref "OPACGroupResults" is set to "Use". * Personally I did not test this, b/c: terminally lazy * Test opac-showreviews.tt * Could not find any links to this location, manually enter it: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl * Image should be shown to the right in full size. * If clicked it should take you to the detail view with the comments tab opened. * Test opac-showreviews-rss.tt * Click on the RSS icon from previous test's start location. URL should be: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl?format=rss * An image tag linking to the full-size image without any styling class should be present. * Test opac-user.tt * Click on your username to open: http://127.0.1.1/cgi-bin/koha/opac-user.pl * Covers should be shown for checked out items with CSS class: adlibris-cover * When clicked the destination should be the same as clicking the title column entry: opac-details.pl * Test opac-opensearch.tt * Click on "Advanced search" and enter "1984" then press "Search" * This search screen uses a different template. * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * If clicked, should link to the OPAC detail view. * Test opac-readingrecord.tt * Click on your logged-in name to go to your personal page. * Click on "Your reading history" tab on the left. http://127.0.1.1/cgi-bin/koha/opac-readingrecord.pl * Covers should be shown in leftmost column with CSS class: adlibris-cover * If clicked, should link to the same as the 'Title' link. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 76852 [details] [review] Bug 8630 - Adlibris covers (OPAC less changes) This patch adds two new CSS classes specific to Adlibris covers. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 76853 [details] [review] Bug 8630: [FOLLOW-UP] Make Adlibris cover show on OPAC overdues tab and fix alignment of cover on Staff detail page.
Created attachment 76859 [details] [review] Bug 8630: Regenerated minified OPAC CSS Regenerated minified OPAC CSS
Ready for testing. Use Test Plan in Comment 44
Patch failed in PTFS Sandbox 0: The sandbox you've requested is not ready. Some problems occurred applying patches from bug 8630: <h1>Something went wrong !</h1>Applying: Bug 8630 - Adlibris covers (syspref files) Applying: Bug 8630 - Adlibris covers (intranet templates) Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt M koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt Applying: Bug 8630 - Adlibris covers (intranet CSS) error: Failed to merge in the changes. Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/css/staff-global.css Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/css/staff-global.css CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/css/staff-global.css Patch failed at 0001 Bug 8630 - Adlibris covers (intranet CSS) The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run git bz apply --continue. If you would prefer to skip this patch, instead run git bz apply --skip. To restore the original branch and stop patching run git bz apply --abort. Bug 8630 - Add covers from AdLibris to the OPAC and Intranet 76848 - Bug 8630 - Adlibris covers (syspref files) 76849 - Bug 8630 - Adlibris covers (intranet templates) 76850 - Bug 8630 - Adlibris covers (intranet CSS) 76851 - Bug 8630 - Adlibris covers (OPAC templates) 76852 - Bug 8630 - Adlibris covers (OPAC less changes) 76853 - Bug 8630: [FOLLOW-UP] Make Adlibris cover show on OPAC overdues tab 76859 - Bug 8630: Regenerated minified OPAC CSS Apply? [(y)es, (n)o, (i)nteractive] Patch left in /tmp/Bug-8630---Adlibris-covers-intranet-CSS-11sz87.patch
Patch doesn't apply, please rebase! Problem is probably this one: Bug 19474 - Convert staff client CSS to SCSS
Created attachment 78259 [details] [review] Bug 8630 - Adlibris covers (syspref files) This patch adds a system preference for cover images from Swedish book retailer Adlibris. Images are retrieved via http or https from an external web server. This might leak OPAC and Staff interface data to third parties and should thus be used with caution. Sponsored-By: Halland County Library Test plan: Test 1: Test upgrade procedure for clean installation. Start by removing existing sysprefs, if present: $ mysql -u kohaadmin -p -D koha > DELETE FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; * Apply this patch which will add a pref file, update the 'syspref' structure and add an atomic upgrade file. * Install the update: Koha$ perl installer/data/mysql/updatedatabase.pl * Once upgraded and logged in, Select 'More', 'Administration', 'Global Preferences' and finally 'Enhanced content'. There should be a new option called 'Adlibris'. The first option should default to "Don't show", if not the patch is broken. The second options should show the default URL: http://www.adlibris.com/se/organisationer/showimagesafe.aspx If not, the patch is broken. Test 2: Changing sysprefs * In the control panel, change the first value from "Don't show" to "Show" and save the changes. Use MySQL client to inspect changes: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; The column 'value' should now have the value '1', if not the patch is broken. Test 3: Apply update to existing data * Re-execute the installer now that the database has the data already: Koha$ perl installer/data/mysql/updatedatabase.pl If any errors occur the patch is broken. Examine the database contents: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; If the values were overwritten by the installer the patch is broken. Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 78260 [details] [review] Bug 8630 - Adlibris covers (intranet templates) Changes to staff interface (intranet) templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test results.tt * From the main intranet page, select "Search the catalog" and enter the title we added, "1984" and press "Search". * You should end up with the url: http://127.0.1.1:8080/cgi-bin/koha/catalogue/search.pl?q=1984 * The cover image should be shown in the leftmost column. * If cover is clicked, the full cover image should be shown. * Test detail.tt (continue from the search results used in prev. test) * Click on the title text, you should be sent to: http://127.0.1.1:8080/cgi-bin/koha/catalogue/detail.pl?biblionumber=2 * The cover image should be shown on the right. * If clicked, the full cover should be shown. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 78261 [details] [review] Bug 8630 - Adlibris covers (intranet CSS) This defined two new CSS classes for use by the intranet templates. Apply this patch before doing the testing of "intranet templates". Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 78262 [details] [review] Bug 8630 - Adlibris covers (OPAC templates) Changes to OPAC templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test opac-results.tt * Search library catalog from OPAC for "1984". * You should be sent to: http://127.0.1.1/cgi-bin/koha/opac-search.pl?idx=&q=1984 * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * Test opac-detail.tt (continued from previous test's location) * Click on the title with cover (1984, ISBN: 9780451524935) * Cover should be displayed to the left in full size. * If clicked, should link to the full-size image. Test opac-results-grouped.tt * This template is only used if an external "grouping" server is setup and the syspref "OPACGroupResults" is set to "Use". * Personally I did not test this, b/c: terminally lazy * Test opac-showreviews.tt * Could not find any links to this location, manually enter it: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl * Image should be shown to the right in full size. * If clicked it should take you to the detail view with the comments tab opened. * Test opac-showreviews-rss.tt * Click on the RSS icon from previous test's start location. URL should be: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl?format=rss * An image tag linking to the full-size image without any styling class should be present. * Test opac-user.tt * Click on your username to open: http://127.0.1.1/cgi-bin/koha/opac-user.pl * Covers should be shown for checked out items with CSS class: adlibris-cover * When clicked the destination should be the same as clicking the title column entry: opac-details.pl * Test opac-opensearch.tt * Click on "Advanced search" and enter "1984" then press "Search" * This search screen uses a different template. * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * If clicked, should link to the OPAC detail view. * Test opac-readingrecord.tt * Click on your logged-in name to go to your personal page. * Click on "Your reading history" tab on the left. http://127.0.1.1/cgi-bin/koha/opac-readingrecord.pl * Covers should be shown in leftmost column with CSS class: adlibris-cover * If clicked, should link to the same as the 'Title' link. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 78263 [details] [review] Bug 8630 - Adlibris covers (OPAC less changes) This patch adds two new CSS classes specific to Adlibris covers. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 78264 [details] [review] Bug 8630: [FOLLOW-UP] Make Adlibris cover show on OPAC overdues tab and fix alignment of cover on Staff detail page.
Created attachment 79989 [details] [review] Bug 8630 - Adlibris covers (syspref files) This patch adds a system preference for cover images from Swedish book retailer Adlibris. Images are retrieved via http or https from an external web server. This might leak OPAC and Staff interface data to third parties and should thus be used with caution. Sponsored-By: Halland County Library Test plan: Test 1: Test upgrade procedure for clean installation. Start by removing existing sysprefs, if present: $ mysql -u kohaadmin -p -D koha > DELETE FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; * Apply this patch which will add a pref file, update the 'syspref' structure and add an atomic upgrade file. * Install the update: Koha$ perl installer/data/mysql/updatedatabase.pl * Once upgraded and logged in, Select 'More', 'Administration', 'Global Preferences' and finally 'Enhanced content'. There should be a new option called 'Adlibris'. The first option should default to "Don't show", if not the patch is broken. The second options should show the default URL: http://www.adlibris.com/se/organisationer/showimagesafe.aspx If not, the patch is broken. Test 2: Changing sysprefs * In the control panel, change the first value from "Don't show" to "Show" and save the changes. Use MySQL client to inspect changes: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; The column 'value' should now have the value '1', if not the patch is broken. Test 3: Apply update to existing data * Re-execute the installer now that the database has the data already: Koha$ perl installer/data/mysql/updatedatabase.pl If any errors occur the patch is broken. Examine the database contents: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; If the values were overwritten by the installer the patch is broken. Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 79990 [details] [review] Bug 8630 - Adlibris covers (intranet templates) Changes to staff interface (intranet) templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test results.tt * From the main intranet page, select "Search the catalog" and enter the title we added, "1984" and press "Search". * You should end up with the url: http://127.0.1.1:8080/cgi-bin/koha/catalogue/search.pl?q=1984 * The cover image should be shown in the leftmost column. * If cover is clicked, the full cover image should be shown. * Test detail.tt (continue from the search results used in prev. test) * Click on the title text, you should be sent to: http://127.0.1.1:8080/cgi-bin/koha/catalogue/detail.pl?biblionumber=2 * The cover image should be shown on the right. * If clicked, the full cover should be shown. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 79991 [details] [review] Bug 8630 - Adlibris covers (intranet CSS) This defined two new CSS classes for use by the intranet templates. Apply this patch before doing the testing of "intranet templates". Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 79992 [details] [review] Bug 8630 - Adlibris covers (OPAC templates) Changes to OPAC templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test opac-results.tt * Search library catalog from OPAC for "1984". * You should be sent to: http://127.0.1.1/cgi-bin/koha/opac-search.pl?idx=&q=1984 * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * Test opac-detail.tt (continued from previous test's location) * Click on the title with cover (1984, ISBN: 9780451524935) * Cover should be displayed to the left in full size. * If clicked, should link to the full-size image. Test opac-results-grouped.tt * This template is only used if an external "grouping" server is setup and the syspref "OPACGroupResults" is set to "Use". * Personally I did not test this, b/c: terminally lazy * Test opac-showreviews.tt * Could not find any links to this location, manually enter it: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl * Image should be shown to the right in full size. * If clicked it should take you to the detail view with the comments tab opened. * Test opac-showreviews-rss.tt * Click on the RSS icon from previous test's start location. URL should be: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl?format=rss * An image tag linking to the full-size image without any styling class should be present. * Test opac-user.tt * Click on your username to open: http://127.0.1.1/cgi-bin/koha/opac-user.pl * Covers should be shown for checked out items with CSS class: adlibris-cover * When clicked the destination should be the same as clicking the title column entry: opac-details.pl * Test opac-opensearch.tt * Click on "Advanced search" and enter "1984" then press "Search" * This search screen uses a different template. * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * If clicked, should link to the OPAC detail view. * Test opac-readingrecord.tt * Click on your logged-in name to go to your personal page. * Click on "Your reading history" tab on the left. http://127.0.1.1/cgi-bin/koha/opac-readingrecord.pl * Covers should be shown in leftmost column with CSS class: adlibris-cover * If clicked, should link to the same as the 'Title' link. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 79993 [details] [review] Bug 8630 - Adlibris covers (OPAC less changes) This patch adds two new CSS classes specific to Adlibris covers. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 79994 [details] [review] Bug 8630: (follow-up) Make Adlibris cover show on OPAC overdues tab and fix alignment of cover on Staff detail page.
Created attachment 80106 [details] [review] Bug 8630: Adlibris covers (syspref files) This patch adds a system preference for cover images from Swedish book retailer Adlibris. Images are retrieved via http or https from an external web server. This might leak OPAC and Staff interface data to third parties and should thus be used with caution. Sponsored-By: Halland County Library Test plan: Test 1: Test upgrade procedure for clean installation. Start by removing existing sysprefs, if present: $ mysql -u kohaadmin -p -D koha > DELETE FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; * Apply this patch which will add a pref file, update the 'syspref' structure and add an atomic upgrade file. * Install the update: Koha$ perl installer/data/mysql/updatedatabase.pl * Once upgraded and logged in, Select 'More', 'Administration', 'Global Preferences' and finally 'Enhanced content'. There should be a new option called 'Adlibris'. The first option should default to "Don't show", if not the patch is broken. The second options should show the default URL: http://www.adlibris.com/se/organisationer/showimagesafe.aspx If not, the patch is broken. Test 2: Changing sysprefs * In the control panel, change the first value from "Don't show" to "Show" and save the changes. Use MySQL client to inspect changes: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; The column 'value' should now have the value '1', if not the patch is broken. Test 3: Apply update to existing data * Re-execute the installer now that the database has the data already: Koha$ perl installer/data/mysql/updatedatabase.pl If any errors occur the patch is broken. Examine the database contents: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; If the values were overwritten by the installer the patch is broken. Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 80107 [details] [review] Bug 8630: Adlibris covers (intranet templates) Changes to staff interface (intranet) templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test results.tt * From the main intranet page, select "Search the catalog" and enter the title we added, "1984" and press "Search". * You should end up with the url: http://127.0.1.1:8080/cgi-bin/koha/catalogue/search.pl?q=1984 * The cover image should be shown in the leftmost column. * If cover is clicked, the full cover image should be shown. * Test detail.tt (continue from the search results used in prev. test) * Click on the title text, you should be sent to: http://127.0.1.1:8080/cgi-bin/koha/catalogue/detail.pl?biblionumber=2 * The cover image should be shown on the right. * If clicked, the full cover should be shown. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 80108 [details] [review] Bug 8630: Adlibris covers (intranet CSS) This defined two new CSS classes for use by the intranet templates. Apply this patch before doing the testing of "intranet templates". Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 80109 [details] [review] Bug 8630: Adlibris covers (OPAC templates) Changes to OPAC templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test opac-results.tt * Search library catalog from OPAC for "1984". * You should be sent to: http://127.0.1.1/cgi-bin/koha/opac-search.pl?idx=&q=1984 * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * Test opac-detail.tt (continued from previous test's location) * Click on the title with cover (1984, ISBN: 9780451524935) * Cover should be displayed to the left in full size. * If clicked, should link to the full-size image. Test opac-results-grouped.tt * This template is only used if an external "grouping" server is setup and the syspref "OPACGroupResults" is set to "Use". * Personally I did not test this, b/c: terminally lazy * Test opac-showreviews.tt * Could not find any links to this location, manually enter it: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl * Image should be shown to the right in full size. * If clicked it should take you to the detail view with the comments tab opened. * Test opac-showreviews-rss.tt * Click on the RSS icon from previous test's start location. URL should be: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl?format=rss * An image tag linking to the full-size image without any styling class should be present. * Test opac-user.tt * Click on your username to open: http://127.0.1.1/cgi-bin/koha/opac-user.pl * Covers should be shown for checked out items with CSS class: adlibris-cover * When clicked the destination should be the same as clicking the title column entry: opac-details.pl * Test opac-opensearch.tt * Click on "Advanced search" and enter "1984" then press "Search" * This search screen uses a different template. * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * If clicked, should link to the OPAC detail view. * Test opac-readingrecord.tt * Click on your logged-in name to go to your personal page. * Click on "Your reading history" tab on the left. http://127.0.1.1/cgi-bin/koha/opac-readingrecord.pl * Covers should be shown in leftmost column with CSS class: adlibris-cover * If clicked, should link to the same as the 'Title' link. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 80110 [details] [review] Bug 8630: Adlibris covers (OPAC SCSS changes) This patch adds two new CSS classes specific to Adlibris covers. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Created attachment 80111 [details] [review] Bug 8630: (follow-up) Make Adlibris cover show on OPAC overdues tab and fix alignment of cover on Staff detail page.
Created attachment 80119 [details] [review] Bug 8630: (follow-up) Template corrections This patch makes two corrections to templates: One to correct the case of a variable, an error which I introduced when adding html filters. The other removes a redundant image tag from the recent comments template. To test, apply the patch and log in to the OPAC as a user with checkouts. Cover images on the "your summar" page should appear correctly. View the "recent comments" page and confirm that images still appear correctly.
Created attachment 80245 [details] [review] [SIGNED-OFF] Bug 8630: (follow-up) Make Adlibris cover show on OPAC overdues tab and fix alignment of cover on Staff detail page. Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>
Created attachment 80246 [details] [review] [SIGNED-OFF] Bug 8630: (follow-up) Template corrections This patch makes two corrections to templates: One to correct the case of a variable, an error which I introduced when adding html filters. The other removes a redundant image tag from the recent comments template. To test, apply the patch and log in to the OPAC as a user with checkouts. Cover images on the "your summar" page should appear correctly. View the "recent comments" page and confirm that images still appear correctly. Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com>
Started here, will continue soon!
Created attachment 80377 [details] [review] Bug 8630: Adlibris covers (syspref files) This patch adds a system preference for cover images from Swedish book retailer Adlibris. Images are retrieved via http or https from an external web server. This might leak OPAC and Staff interface data to third parties and should thus be used with caution. Sponsored-By: Halland County Library Test plan: Test 1: Test upgrade procedure for clean installation. Start by removing existing sysprefs, if present: $ mysql -u kohaadmin -p -D koha > DELETE FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; * Apply this patch which will add a pref file, update the 'syspref' structure and add an atomic upgrade file. * Install the update: Koha$ perl installer/data/mysql/updatedatabase.pl * Once upgraded and logged in, Select 'More', 'Administration', 'Global Preferences' and finally 'Enhanced content'. There should be a new option called 'Adlibris'. The first option should default to "Don't show", if not the patch is broken. The second options should show the default URL: http://www.adlibris.com/se/organisationer/showimagesafe.aspx If not, the patch is broken. Test 2: Changing sysprefs * In the control panel, change the first value from "Don't show" to "Show" and save the changes. Use MySQL client to inspect changes: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; The column 'value' should now have the value '1', if not the patch is broken. Test 3: Apply update to existing data * Re-execute the installer now that the database has the data already: Koha$ perl installer/data/mysql/updatedatabase.pl If any errors occur the patch is broken. Examine the database contents: $ mysql -u kohaadmin -p -D koha > SELECT * FROM `systempreferences` WHERE `variable` LIKE 'Adlibris%'; If the values were overwritten by the installer the patch is broken. Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 80378 [details] [review] Bug 8630: Adlibris covers (intranet templates) Changes to staff interface (intranet) templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test results.tt * From the main intranet page, select "Search the catalog" and enter the title we added, "1984" and press "Search". * You should end up with the url: http://127.0.1.1:8080/cgi-bin/koha/catalogue/search.pl?q=1984 * The cover image should be shown in the leftmost column. * If cover is clicked, the full cover image should be shown. * Test detail.tt (continue from the search results used in prev. test) * Click on the title text, you should be sent to: http://127.0.1.1:8080/cgi-bin/koha/catalogue/detail.pl?biblionumber=2 * The cover image should be shown on the right. * If clicked, the full cover should be shown. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 80379 [details] [review] Bug 8630: Adlibris covers (intranet CSS) This defined two new CSS classes for use by the intranet templates. Apply this patch before doing the testing of "intranet templates". Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 80380 [details] [review] Bug 8630: Adlibris covers (OPAC templates) Changes to OPAC templates. Depends on new CSS clases defined in separate patch. Test plan: To test this particular patch (intranet templates) you need: * The syspref patch applied * The intranet CSS patch applied To test: * Apply this patch * Enable covers (if not done already) * Go to staff interface, log in as a priviliged user. * Select "More" -> "Administration" -> "Global system preferences" -> "Enhanced content". * Set ""AdlibrisCoversEnabled" to "Show" under "Adlibris". * Save changes * Add a book with a known cover/ISBN (if none exists) * Set MARC field 020 a, "INTERNATIONAL STANDARD BOOK NUMBER" to: 9780451524935 * Set MARC field 245 a, "Title" to: 1984 * Save changes * Test opac-results.tt * Search library catalog from OPAC for "1984". * You should be sent to: http://127.0.1.1/cgi-bin/koha/opac-search.pl?idx=&q=1984 * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * Test opac-detail.tt (continued from previous test's location) * Click on the title with cover (1984, ISBN: 9780451524935) * Cover should be displayed to the left in full size. * If clicked, should link to the full-size image. Test opac-results-grouped.tt * This template is only used if an external "grouping" server is setup and the syspref "OPACGroupResults" is set to "Use". * Personally I did not test this, b/c: terminally lazy * Test opac-showreviews.tt * Could not find any links to this location, manually enter it: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl * Image should be shown to the right in full size. * If clicked it should take you to the detail view with the comments tab opened. * Test opac-showreviews-rss.tt * Click on the RSS icon from previous test's start location. URL should be: http://127.0.1.1/cgi-bin/koha/opac-showreviews.pl?format=rss * An image tag linking to the full-size image without any styling class should be present. * Test opac-user.tt * Click on your username to open: http://127.0.1.1/cgi-bin/koha/opac-user.pl * Covers should be shown for checked out items with CSS class: adlibris-cover * When clicked the destination should be the same as clicking the title column entry: opac-details.pl * Test opac-opensearch.tt * Click on "Advanced search" and enter "1984" then press "Search" * This search screen uses a different template. * Cover image should be shown to the right of each title with CSS class: "adlibris-cover" * If clicked, should link to the OPAC detail view. * Test opac-readingrecord.tt * Click on your logged-in name to go to your personal page. * Click on "Your reading history" tab on the left. http://127.0.1.1/cgi-bin/koha/opac-readingrecord.pl * Covers should be shown in leftmost column with CSS class: adlibris-cover * If clicked, should link to the same as the 'Title' link. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 80381 [details] [review] Bug 8630: Adlibris covers (OPAC SCSS changes) This patch adds two new CSS classes specific to Adlibris covers. Sponsored-By: Halland County Library Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 80382 [details] [review] Bug 8630: (follow-up) Make Adlibris cover show on OPAC overdues tab and fix alignment of cover on Staff detail page. Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 80383 [details] [review] Bug 8630: (follow-up) Template corrections This patch makes two corrections to templates: One to correct the case of a variable, an error which I introduced when adding html filters. The other removes a redundant image tag from the recent comments template. To test, apply the patch and log in to the OPAC as a user with checkouts. Cover images on the "your summar" page should appear correctly. View the "recent comments" page and confirm that images still appear correctly. Signed-off-by: Aleisha Amohia <aleishaamohia@hotmail.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
A long journey - thx for your perseverance!
Maybe a silly question but, should not the css rules depend on the device (@media)? max-height in px is ok? (I did not test!) Could we imagine a test to make sure the service is still working correctly?
(In reply to Jonathan Druart from comment #81) > Maybe a silly question but, should not the css rules depend on the device > (@media)? max-height in px is ok? (I did not test!) Looking at how things are displayed in both the OPAC and staff client, I think this patch works well.
Created attachment 81934 [details] [review] Bug 8630: (RM follow-up) Remove loop.odd reference and fix filters
Awesome work all! Pushed to master for 18.11
Enhancement, will not be backported to 18.05.x series.