Notes cleanup and minor stylistic fixes.

diff --git a/doc/collections.html b/doc/collections.html
index 259f2a1..2453ccf 100644 (file)
--- a/doc/collections.html
+++ b/doc/collections.html
@@ -428,7 +428,7 @@
 
   <p>To move images within the collection to change their order, initiate a drag for the selected image(s) and then move the mouse to the desired location within the window. A red arrow will appear to assist in determining the destination of the dragged images. Release the drag to move the images to the new location in the list.</p>
 
-  <p class="note">Note: When renaming or moving files within Geeqie, the contents of collections located in the folder ($HOME)/.geeqie/collections will automatically update to the new name or location.</p>
+  <p class="note"><span class="note_label">Note:</span> When renaming or moving files within Geeqie, the contents of collections located in the folder ($HOME)/.geeqie/collections will automatically update to the new name or location.</p>
 
   <hr id="bottomseparator" />
 

diff --git a/doc/faq.html b/doc/faq.html
index 7aad294..1d39348 100644 (file)
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -63,7 +63,7 @@ geeqie --remote-help
 geeqie -r -d12 -ss
 </code>
 
-  <p class="note">Note that if geeqie is running prior to this command, the slide show should also be stopped prior to changing the delay:</p>
+  <p class="note"><span class="note_label">Note that if geeqie is running prior to this command, the slide show should also be stopped prior to changing the delay:</span></p>
 
   <code>
 geeqie -r -sS -d12 -ss

diff --git a/doc/image_search_search.html b/doc/image_search_search.html
index c349633..931de83 100644 (file)
--- a/doc/image_search_search.html
+++ b/doc/image_search_search.html
@@ -60,7 +60,7 @@
   <dt>Comments</dt>
   <dd>
   <p>The search will include all files that have a keyword or comment associated to it.</p>
-  <p class="note">Note: Only keyword and comment associations stored in the user's home folder are included in this search type.</p>
+  <p class="note"><span class="note_label">Note:</span> Only keyword and comment associations stored in the user's home folder are included in this search type.</p>
   </dd>
 
   <dt>Results</dt>

diff --git a/doc/main_window_folder_pane.html b/doc/main_window_folder_pane.html
index 97b68a9..e52469f 100644 (file)
--- a/doc/main_window_folder_pane.html
+++ b/doc/main_window_folder_pane.html
@@ -49,7 +49,7 @@
  
   <p>The tool bar includes buttons for often used operations. The tool bar can be hidden or shown by selecting &ldquo;Hide toolbar&rdquo; from the view menu.</p>
 
-  <p class="note">Note: These buttons are only displayed as an icon, the text below refers to the tool tip that appears by hovering the mouse over each button.</p>
+  <p class="note"><span class="note_label">Note:</span> These buttons are only displayed as an icon, the text below refers to the tool tip that appears by hovering the mouse over each button.</p>
 
   <dl class="menu_desc">
   <dt>Show thumbnails</dt><dd>This button is active when the file list is in list view mode, and activating it will toggle the display of thumbnails.</dd>
@@ -77,7 +77,7 @@
 
   <p>A folder or file can be typed into the entry to quickly change to a desired location or image, the main window will update after pressing the Enter key. Tab completion is also available in the path entry.</p>
 
-  <p class="note">Note: Tab completion uses the tab key, press the down arrow to move the focus from the entry.</p>
+  <p class="note"><span class="note_label">Note:</span> Tab completion uses the tab key, press the down arrow to move the focus from the entry.</p>
 
   <p>Next to the path entry is a button with a down arrow, clicking this will display a drop down list containing the most recent locations viewed. The list is ordered such that the most recent location is at the top. Selecting a location from the drop down list will change the window to display the location.</p>
 
@@ -122,7 +122,7 @@
 
   <dt>Rename</dt><dd>Renames the selected folder.
 
-  <p class="note">Note: Renaming a folder will not update metadata, such as keywords, or cached thumbnails for images contained in that folder, the data will be lost.</p></dd>
+  <p class="note"><span class="note_label">Note:</span> Renaming a folder will not update metadata, such as keywords, or cached thumbnails for images contained in that folder, the data will be lost.</p></dd>
 
   <dt>View as tree</dt><dd>Toggles between the list and tree modes of the folder pane.</dd>
 

diff --git a/doc/main_window_image_pane.html b/doc/main_window_image_pane.html
index 2a93b55..0283980 100644 (file)
--- a/doc/main_window_image_pane.html
+++ b/doc/main_window_image_pane.html
@@ -60,10 +60,10 @@
 
   <p>To rotate the image clockwise 90 degrees press the &ldquo;]&rdquo; key, to rotate counterclockwise 90 degrees press the &ldquo;[&ldquo; key. To rotate the image 180 degrees use [Shift] + [R], the image can also be flipped horizontally or vertically with the respective [Shift] + [M] (mirror) and [Shift] + [F] (flip) keys.</p>
 
-  <p class="note">Note: The rotation, mirror, and flip functions will not change the image file on disk.</p>
+  <p class="note"><span class="note_label">Note:</span> The rotation, mirror, and flip functions will not change the image file on disk.</p>
 
   <h3>Mouse</h3>
-  <p>Press the primary mouse button on the image and hold it, then move the mouse to pan the image in the desired direction. Releasing the mouse button will stop the panning operation. The mouse wheel can also be used to scroll the image when holding down the [Shift] key (*).</p>
+  <p>Press the primary mouse button on the image and hold it, then move the mouse to pan the image in the desired direction. Releasing the mouse button will stop the panning operation. The mouse wheel can also be used to scroll the image when holding down the [Shift] key <a href="#bottomnote1" class="bottomnote">(*)</a>.</p>
 
   <p>To scale the image size hold down the [Control] key and scroll the mouse wheel up to zoom in, or down to zoom out.</p>
 
@@ -78,7 +78,7 @@
   <p>The Page Down and Page Up keys will change the image to the next or previous image, respectively, in the list. The Home and End keys will jump to the first and last image, respectively. When the image has the focus, the Space and Back Space keys can also be used to change the image.</p>
 
   <h3>Mouse</h3>
-  <p>To change to the next image in the list click the left mouse button, click the middle mouse button to change to the previous image. The mouse wheel can also be used to change the current image (*).</p>
+  <p>To change to the next image in the list click the left mouse button, click the middle mouse button to change to the previous image. The mouse wheel can also be used to change the current image <a href="#bottomnote1" class="bottomnote">(*)</a>.</p>
 
   <h2>Context menu</h2>
 
@@ -96,7 +96,7 @@
 
   <p>A drag and drop operation can be initiated from the image pane with the middle mouse button, the dragged item will contain the file path of the displayed image.</p>
 
-  <p class="note">(*) Note: The mouse wheel behavior for scrolling and image step can be swapped with the <span class="option_name">Mouse wheel scrolls image</span> option located on the <a href="options_advanced.html">Advanced tab</a> of the preferences dialog.</p>
+  <p class="bottomnote"><a id="bottomnote1" name="bottomnote1"></a><span class="note_label">(*) Note:</span> The mouse wheel behavior for scrolling and image step can be swapped with the <span class="option_name">Mouse wheel scrolls image</span> option located on the <a href="options_advanced.html">Advanced tab</a> of the preferences dialog.</p>
 
   <hr id="bottomseparator" />
 

diff --git a/doc/main_window_layout.html b/doc/main_window_layout.html
index 45df510..8fcab92 100644 (file)
--- a/doc/main_window_layout.html
+++ b/doc/main_window_layout.html
@@ -47,7 +47,7 @@
 
   <p>The order in which the panes are filled is determined by the three row list located below the layout selection. The three numbered rows correspond to the three numbered regions of the selected layout, to change the order of the list drag a row to the desired location within the list. To drag a row move the mouse over the selected row, press and hold the primary mouse button, then drag the row to the desired location and release the button.</p>
 
-  <p class="note">Note: In the options window the file and image panes are labeled similarly, however the folder pane is labeled as tools.</p>
+  <p class="note"><span class="note_label">Note:</span> In the options window the file and image panes are labeled similarly, however the folder pane is labeled as tools.</p>
 
   <h2>Changing the size of a pane</h2>
 

diff --git a/doc/options_advanced.html b/doc/options_advanced.html
index 3decaeb..1a286d4 100644 (file)
--- a/doc/options_advanced.html
+++ b/doc/options_advanced.html
@@ -69,7 +69,7 @@
 
   <dt>Safe Delete</dt>
   <dd><p>Moves deleted files to a temporary folder, for easy retrieval of deleted files. Files in the temporary folder are retained until the maximum size is reached, at which point deleting additional files will result in the removal of the oldest files to reclaim the space needed for the new files.</p>
-  <p class="note">Note: Files moved to the Safe Delete folder are prefixed with a six digit number in the format: <code>nnnnnn_FILENAME</code><br />
+  <p class="note"><span class="note_label">Note:</span> Files moved to the Safe Delete folder are prefixed with a six digit number in the format: <code>nnnnnn_FILENAME</code><br />
   This is used by the delete feature to distinguish which files to remove first when clearing space for new files.<br />
   The digit counter increments with each deleted file.</p></dd>
 
@@ -96,7 +96,7 @@
   <dt>Descend folders in tree view</dt>
   <dd>
   <p>This will allow Geeqie to read sub folder content to determine if it should display expander indicators in the folder tree view.</p>
-  <p class="note">Note: Disable this if Geeqie wakes up auto mounted network shares, or takes too long to initially display the folder view.</p>
+  <p class="note"><span class="note_label">Note:</span> Disable this if Geeqie wakes up auto mounted network shares, or takes too long to initially display the folder view.</p>
   </dd>
   <dt>In place renaming</dt>
   <dd><p>When renaming a single file, this will allow the rename entry to appear directly over the original filename.</p></dd>
@@ -125,7 +125,7 @@
 
   <dt>Offscreen cache size</dt>
   <dd><p>Geeqie only renders the visible portion of an image. To reduce rendering the same area frequently when panning an image, some memory is used to retain the recently rendered image data. This value controls the maximum amount of memory to use.</p>
-  <p class="note">Note: This setting controls the amount of memory for <em>each</em> image window.</p>
+  <p class="note"><span class="note_label">Note:</span> This setting controls the amount of memory for <em>each</em> image window.</p>
   </dd>
 
   </dl>

diff --git a/doc/options_filtering.html b/doc/options_filtering.html
index 9e83006..7ee0d28 100644 (file)
--- a/doc/options_filtering.html
+++ b/doc/options_filtering.html
@@ -62,7 +62,7 @@
 
   <p>This list contains the image formats that are understood by Geeqie. To disable a specific file type from being displayed, uncheck it's corresponding checkbox. Filters can be edited by first selecting the line containing the item to be changed, then clicking the filter or description field, making any changes, then pressing enter; press escape to cancel an active edit. The format for the filter field is a semicolon (;) seperated list of extensions, extensions must include the period (.).</p>
 
-  <p class="note">Note: Unlike all other options in the dialog, filter list changes are applied immediately.</p>
+  <p class="note"><span class="note_label">Note:</span> Unlike all other options in the dialog, filter list changes are applied immediately.</p>
 
   <dl class="dialog_desc">
 

diff --git a/doc/options_general.html b/doc/options_general.html
index 16a6f46..6a3efa3 100644 (file)
--- a/doc/options_general.html
+++ b/doc/options_general.html
@@ -78,7 +78,7 @@
 
   <dt>Use xvpics thumbnails when found</dt>
   <dd><p>xvpics is a common thumbnail caching format used by several applications. Thumbnails are stored locally to the source image in a sub folder with the name <b>.xvpics</b>. Enabling this option will allow Geeqie to read thumbnails saved in the xvpics format.</p>
-  <p class="note">Note: Support for xvpics is read only, Geeqie can not generate thumbnails in this format.</p></dd>
+  <p class="note"><span class="note_label">Note:</span> Support for xvpics is read only, Geeqie can not generate thumbnails in this format.</p></dd>
   </dl>
  
   <h2>Slide show</h2>
@@ -89,7 +89,7 @@
   
   <dt>Random</dt>
   <dd><p>When enabled, slide show images will appear in random order.</p>
-  <p class="note">Note: Random images are displayed such that each image appears once per cycle of all images. When the slide show repeat option is enabled, the image order is randomized after completing each cycle.</p></dd>
+  <p class="note"><span class="note_label">Note:</span> Random images are displayed such that each image appears once per cycle of all images. When the slide show repeat option is enabled, the image order is randomized after completing each cycle.</p></dd>
 
   <dt>Repeat</dt>
   <dd><p>When enabled, slide shows will continue at the beginning after the last image is displayed.</p></dd>

diff --git a/doc/options_image.html b/doc/options_image.html
index 75694dd..88edcd3 100644 (file)
--- a/doc/options_image.html
+++ b/doc/options_image.html
@@ -92,12 +92,12 @@
   <dl class="dialog_desc">
   <dt>Refresh on file change</dt>
   <dd><p>Geeqie will monitor currently active images and folders for changes in their modification time, and update the display if it changes.</p>
-  <p class="note">Note: Disable this if the system will not go into sleep mode due to occasional disk activity from the time check, or if Geeqie updates too often for folders with continuously changing content.</p>
+  <p class="note"><span class="note_label">Note:</span> Disable this if the system will not go into sleep mode due to occasional disk activity from the time check, or if Geeqie updates too often for folders with continuously changing content.</p>
   </dd>
 
   <dt>Preload next image</dt>
   <dd><p>Enabling this option will cause Geeqie to read the next logical image from disk when idle, it will also retain the previously viewed image in memory. By reading the nearest images into memory, time to display the next image is reduced.</p>
- <p class="note">Note: This option will increase Geeqie memory requirements, and may cause performance issues with very large images. If the use of Geeqie results in the system noticeably swapping memory to disk, try disabling this feature.</p></dd>
+ <p class="note"><span class="note_label">Note:</span> This option will increase Geeqie memory requirements, and may cause performance issues with very large images. If the use of Geeqie results in the system noticeably swapping memory to disk, try disabling this feature.</p></dd>
 
   <dt>Auto rotate image using EXIF information</dt>
   <dd><p>Auto rotates images based on data stored in images that include EXIF data.</p></dd>

diff --git a/doc/other_windows_image_properties.html b/doc/other_windows_image_properties.html
index 478e94b..261fe81 100644 (file)
--- a/doc/other_windows_image_properties.html
+++ b/doc/other_windows_image_properties.html
@@ -53,11 +53,15 @@
 
   <p>This displays information about the active file. It includes:</p>
 
-  <p><b>File attributes:</b> Modification date and time, size, owner, group, and permissions.</p>
+  <dl>
+  <dt>File attributes</dt>
+  <dd><p>Modification date and time, size, owner, group, and permissions.</p></dd>
 
-  <p><b>Image attributes:</b> Dimensions, uncompressed size, file or mime type, and existence of an alpha channel.</p>
+  <dt>Image attributes</dt>
+  <dd><p>Dimensions, uncompressed size, file or mime type, and existence of an alpha channel.</p></dd>
 
-  <p><b>Compress ratio:</b> The percentage of file size compared to the size of the image when decoded into memory.</p>
+  <dt>Compress ratio</dt><dd><p>The percentage of file size compared to the size of the image when decoded into memory.</p></dd>
+  </dl>
 
   <h2>Keywords tab</h2>
 

diff --git a/doc/reference_keyboard_shortcuts.html b/doc/reference_keyboard_shortcuts.html
index a3f46ab..64e2a82 100644 (file)
--- a/doc/reference_keyboard_shortcuts.html
+++ b/doc/reference_keyboard_shortcuts.html
@@ -69,7 +69,7 @@
         </td>
         <td>
           <p>Left Click on image view<br />
-          Mouse Wheel down (*)</p>
+          Mouse Wheel down <a href="#bottomnote1" class="bottomnote">(*)</a></p>
         </td>
         <td>
           <p>Change to next image.</p>
@@ -81,7 +81,7 @@
         </td>
         <td>
           <p>Middle Click on image view<br />
-          Mouse Wheel up (*)</p>
+          Mouse Wheel up <a href="#bottomnote1" class="bottomnote">(*)</a></p>
         </td>
         <td>
           <p>Change to previous image.</p>
@@ -116,7 +116,7 @@
         </td>
         <td>
           <p>Left Drag on image view<br />
-          [Shift] + Mouse Wheel (*)</p>
+          [Shift] + Mouse Wheel <a href="#bottomnote1" class="bottomnote">(*)</a></p>
         </td>
         <td>
           <p>Pan image.</p>
@@ -955,7 +955,7 @@
     </table>
   </div>
 
-  <p>(*) Default Mouse wheel functions, can be altered by changing the <a href="options_advanced.html" class="option_name">Mouse wheel scrolls image</a> option.</p>
+  <p class="bottomnote"><a id="bottomnote1" name="bottomnote1"></a><span class="note_label">(*) Note:</span> Default Mouse wheel functions can be altered by changing the <a href="options_advanced.html" class="option_name">Mouse wheel scrolls image</a> option.</p>
 
   <hr id="bottomseparator" />
 

diff --git a/doc/sidebars_keywords.html b/doc/sidebars_keywords.html
index 88c51bf..94b6f0a 100644 (file)
--- a/doc/sidebars_keywords.html
+++ b/doc/sidebars_keywords.html
@@ -63,7 +63,7 @@
 
   <h2>The buttons</h2>
 
-  <p class="note">Note: These buttons are only displayed as an icon, the text below refers to the tool tip that appears by hovering the mouse over each button.
+  <p class="note"><span class="note_label">Note:</span> These buttons are only displayed as an icon, the text below refers to the tool tip that appears by hovering the mouse over each button.
   </p>
 
   <dl class="dialog_desc">

diff --git a/doc/style.css b/doc/style.css
index 514349b..3fe8a63 100644 (file)
--- a/doc/style.css
+++ b/doc/style.css
@@ -11,8 +11,14 @@ body {
 
 table {page-break-before: always}
 
+a:hover {background-color: white}
+
+a.bottomnote {text-decoration: none; color: black;}
+
 .option_name { font-variant: small-caps; font-size: 90%; font-weight: bold }
 
+dt { font-weight: bold }
+
 p.previous {
        text-align: left
 }
@@ -112,7 +118,22 @@ p.note {
        font-weight: bold
 }
 
+p.bottomnote {
+       margin-top: 5em;
+       font-style: italic;
+       font-size: 90%
+}
+.bottomnote em {
+       font-weight: bold
+}
+
+span.note_label {
+       font-weight: bold;
+}
+
 code {
+       margin-left: 0.3em;
+       padding: 0.1em;
        background: white
 }