preview 2.2.0 for release ASAP needed in response to user request on Forum

git-svn-id: https://plugins.svn.wordpress.org/footnotes/trunk@2438469 b8457f37-d9ea-0310-8a92-e5e31aec5664

templates/dashboard/customize-superscript.html

@@ -18,3 +18,6 @@
         </tr>
     </tbody>
 </table>
+<div class="footnotes_description">
+    <p>[[description-link]]</p>
+</div>

templates/dashboard/expert-lookup.html

@@ -1,7 +1,7 @@
 <div class="footnotes_description">
     <p>[[description-1]]</p>
-    <p>[[description-2]] [[description-3]]</p>
-    <p>[[description-4]] [[description-5]]</p>
+    <p>[[description-2]]</p>
+    <p>[[description-3]]</p>
 </div>
 <table id="expert_lookup" class="widefat fixed">
     <thead>
@@ -46,5 +46,5 @@
     </tbody>
 </table>
 <div class="footnotes_description">
-    <p>[[description-6]]</p>
+    <p>[[description-4]]</p>
 </div>

templates/dashboard/mouse-over-box-display.html

@@ -2,43 +2,14 @@
     <tbody>
         <tr>
             <td>[[label-enable]]</td>
-            <td>[[enable]]</td>
+            <td>[[enable]] <span class="footnotes_notice">[[notice-enable]]</span></td>
         </tr>
         <tr>
             <td>[[label-alternative]]</td>
             <td>[[alternative]] <span class="footnotes_notice">[[notice-alternative]]</span></td>
         </tr>
-        <tr>
-            <td>[[label-position]]</td>
-            <td>[[position]]</td>
-        </tr>
-        <tr>
-            <td>[[label-offset-x]]</td>
-            <td>[[offset-x]] <span class="footnotes_notice">[[notice-offset-x]]</span></td>
-        </tr>
-        <tr>
-            <td>[[label-offset-y]]</td>
-            <td>[[offset-y]] <span class="footnotes_notice">[[notice-offset-y]]</span></td>
-        </tr>
-        <tr>
-            <td>[[label-max-width]]</td>
-            <td>[[max-width]] <span class="footnotes_notice">[[notice-max-width]]</span></td>
-        </tr>
-        <tr>
-            <td>[[label-fade-in-delay]]</td>
-            <td>[[fade-in-delay]] <span class="footnotes_notice">[[notice-fade-in-delay]]</span></td>
-        </tr>
-        <tr>
-            <td>[[label-fade-in-duration]]</td>
-            <td>[[fade-in-duration]] <span class="footnotes_notice">[[notice-fade-in-duration]]</span></td>
-        </tr>
-        <tr>
-            <td>[[label-fade-out-delay]]</td>
-            <td>[[fade-out-delay]] <span class="footnotes_notice">[[notice-fade-out-delay]]</span></td>
-        </tr>
-        <tr>
-            <td>[[label-fade-out-duration]]</td>
-            <td>[[fade-out-duration]] <span class="footnotes_notice">[[notice-fade-out-duration]]</span></td>
-        </tr>
     </tbody>
 </table>
+<div class="footnotes_description">
+    <p>[[description-alternative]]</p>
+</div>

templates/dashboard/mouse-over-box-position.html

@@ -0,0 +1,20 @@
+<table id="mouse_over_box_position" class="widefat fixed">
+    <tbody>
+        <tr>
+            <td>[[label-position]]</td>
+            <td>[[position]]</td>
+        </tr>
+        <tr>
+            <td>[[label-offset-x]]</td>
+            <td>[[offset-x]] <span class="footnotes_notice">[[notice-offset-x]]</span></td>
+        </tr>
+        <tr>
+            <td>[[label-offset-y]]</td>
+            <td>[[offset-y]] <span class="footnotes_notice">[[notice-offset-y]]</span></td>
+        </tr>
+        <tr>
+            <td>[[label-max-width]]</td>
+            <td>[[max-width]] <span class="footnotes_notice">[[notice-max-width]]</span></td>
+        </tr>
+    </tbody>
+</table>

templates/dashboard/mouse-over-box-timing.html

@@ -0,0 +1,20 @@
+<table id="mouse_over_box_timing" class="widefat fixed">
+    <tbody>
+        <tr>
+            <td>[[label-fade-in-delay]]</td>
+            <td>[[fade-in-delay]] <span class="footnotes_notice">[[notice-fade-in-delay]]</span></td>
+        </tr>
+        <tr>
+            <td>[[label-fade-in-duration]]</td>
+            <td>[[fade-in-duration]] <span class="footnotes_notice">[[notice-fade-in-duration]]</span></td>
+        </tr>
+        <tr>
+            <td>[[label-fade-out-delay]]</td>
+            <td>[[fade-out-delay]] <span class="footnotes_notice">[[notice-fade-out-delay]]</span></td>
+        </tr>
+        <tr>
+            <td>[[label-fade-out-duration]]</td>
+            <td>[[fade-out-duration]] <span class="footnotes_notice">[[notice-fade-out-duration]]</span></td>
+        </tr>
+    </tbody>
+</table>

templates/dashboard/mouse-over-box-truncation.html

@@ -6,7 +6,7 @@
         </tr>
         <tr>
             <td>[[label-max-length]]</td>
-            <td>[[max-length]]</td>
+            <td>[[max-length]] <span class="footnotes_notice">[[notice-max-length]]</span></td>
         </tr>
         <tr>
             <td>[[label-readon]]</td>

templates/dashboard/settings-excerpts.html

@@ -7,5 +7,5 @@
     </tbody>
 </table>
 <div class="footnotes_description">
-    <p>[[description1-excerpts]] [[description2-excerpts]]</p>
+    <p>[[description-excerpts]]</p>
 </div>

templates/dashboard/settings-numbering.html

@@ -11,5 +11,5 @@
     </tbody>
 </table>
 <div class="footnotes_description">
-    <p>[[description1-identical]] [[description2-identical]] [[description3-identical]]</p>
+    <p>[[description-identical]]</p>
 </div>

templates/dashboard/settings-reference-container.html

@@ -8,9 +8,13 @@
             <td>[[label-collapse]]</td>
             <td>[[collapse]]</td>
         </tr>
+        <tr>
+            <td>[[label-shortcode]]</td>
+            <td>[[shortcode]] <span class="footnotes_notice">[[notice-shortcode]]</span></td>
+        </tr>
         <tr>
             <td>[[label-position]]</td>
-            <td>[[position]]</td>
+            <td>[[position]] <span class="footnotes_notice">[[notice-position]]</span></td>
         </tr>
         <tr>
             <td>[[label-page-layout]]</td>