Merge branch 'v0.11' into stablestable

2 files changed, 11 insertions, 0 deletions

diff --git a/tpl/vintage/configure.html b/tpl/vintage/configure.html
index f1892fa1..160286a5 100644
--- a/tpl/vintage/configure.html
+++ b/tpl/vintage/configure.html
@@ -107,6 +107,14 @@
         </td>
       </tr>
       <tr>
+        <td valign="top"><b>Automatically retrieve description for new bookmarks:</b></td>
+        <td>
+          <input type="checkbox" name="retrieveDescription" id="retrieveDescription"
+                 {if="$retrieve_description"}checked{/if}/>
+          <label for="retrieveDescription">&nbsp;Shaarli will try to retrieve the description from meta HTML headers</label>
+        </td>
+      </tr>
+      <tr>
         <td valign="top"><b>Enable REST API</b></td>
         <td>
           <input type="checkbox" name="enableApi" id="enableApi"
diff --git a/tpl/vintage/daily.html b/tpl/vintage/daily.html
index 71d84475..00f18e26 100644
--- a/tpl/vintage/daily.html
+++ b/tpl/vintage/daily.html
@@ -35,6 +35,9 @@
 
     <div class="dailyDate">
         <span class="nomobile">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span>
+        {if="!empty($dayDesc)"}
+          {$dayDesc} -
+        {/if}
         {function="strftime('%A %d, %B %Y', $day)"}
         <span class="nomobile">&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;&mdash;</span>
     </div>