Minor improvements regarding #705 (coding style, unit tests, etc.)

9 files changed, 13 insertions, 12 deletions

diff --git a/tpl/default/configure.html b/tpl/default/configure.html
index 94f6df69..e71133b4 100644
--- a/tpl/default/configure.html
+++ b/tpl/default/configure.html
@@ -25,14 +25,15 @@
         <td>
           <select name="theme" id="theme">
             {loop="$theme_available"}
-              {if="$value===$theme"}
-                <option selected value="{$value}">{$value|ucfirst}</option>
-              {else}
-                <option value="{$value}">{$value|ucfirst}</option>
-              {/if}
+              <option value="{$value}"
+                {if="$value===$theme"}
+                  selected="selected"
+                {/if}
+              >
+                {$value|ucfirst}
+              </option>
             {/loop}
           </select>
-          <label for="theme">(default value is: Default)</label>
         </td>
       </tr>
 
diff --git a/tpl/default/inc/reset.css b/tpl/default/css/reset.css
index e29699e2..e29699e2 100644
--- a/tpl/default/inc/reset.css
+++ b/tpl/default/css/reset.css
diff --git a/tpl/default/inc/shaarli.css b/tpl/default/css/shaarli.css
index 45890f62..45890f62 100644
--- a/tpl/default/inc/shaarli.css
+++ b/tpl/default/css/shaarli.css
diff --git a/tpl/default/daily.html b/tpl/default/daily.html
index 024ee32e..e86e90b1 100644
--- a/tpl/default/daily.html
+++ b/tpl/default/daily.html
@@ -28,9 +28,9 @@
     </div>
 
     <div class="dailyTitle">
-        <img src="../../images/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left">
+        <img src="images/floral_left.png" width="51" height="50" class="nomobile" alt="floral_left">
         The Daily Shaarli
-        <img src="../../images/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right">
+        <img src="images/floral_right.png" width="51" height="50" class="nomobile" alt="floral_right">
     </div>
 
     <div class="dailyDate">
@@ -50,7 +50,7 @@
                     <div class="dailyEntry">
                         <div class="dailyEntryPermalink">
                             <a href="?{$value.shorturl}">
-                                <img src="../../images/squiggle2.png" width="25" height="26" title="permalink" alt="permalink">
+                                <img src="images/squiggle.png" width="25" height="26" title="permalink" alt="permalink">
                             </a>
                         </div>
                         {if="!$hide_timestamps || isLoggedIn()"}
@@ -94,7 +94,7 @@
             {$value}
         {/loop}
     </div>
-    <div id="closing"><img src="../../images/squiggle_closing.png" width="66" height="61" alt="-"></div>
+    <div id="closing"><img src="images/squiggle_closing.png" width="66" height="61" alt="-"></div>
 </div>
 {include="page.footer"}
 </body>
diff --git a/tpl/default/images/floral_left.png b/tpl/default/images/floral_left.png
new file mode 100644
index 00000000..f09a861d
--- /dev/null
+++ b/tpl/default/images/floral_left.png
diff --git a/tpl/default/images/floral_right.png b/tpl/default/images/floral_right.png
new file mode 100644
index 00000000..0dfb6112
--- /dev/null
+++ b/tpl/default/images/floral_right.png
diff --git a/tpl/default/images/squiggle.png b/tpl/default/images/squiggle.png
new file mode 100644
index 00000000..c795f0a3
--- /dev/null
+++ b/tpl/default/images/squiggle.png
diff --git a/tpl/default/images/squiggle_closing.png b/tpl/default/images/squiggle_closing.png
new file mode 100644
index 00000000..3f9d02b1
--- /dev/null
+++ b/tpl/default/images/squiggle_closing.png
diff --git a/tpl/default/includes.html b/tpl/default/includes.html
index 2ff5d8df..c3b837f5 100644
--- a/tpl/default/includes.html
+++ b/tpl/default/includes.html
@@ -6,8 +6,8 @@
 <link rel="alternate" type="application/rss+xml" href="{$feedurl}?do=rss{$searchcrits}#" title="RSS Feed" />
 <link rel="alternate" type="application/atom+xml" href="{$feedurl}?do=atom{$searchcrits}#" title="ATOM Feed" />
 <link href="images/favicon.ico#" rel="shortcut icon" type="image/x-icon" />
-<link type="text/css" rel="stylesheet" href="inc/reset.css" />
-<link type="text/css" rel="stylesheet" href="inc/shaarli.css" />
+<link type="text/css" rel="stylesheet" href="css/reset.css" />
+<link type="text/css" rel="stylesheet" href="css/shaarli.css" />
 {if="is_file('inc/user.css')"}<link type="text/css" rel="stylesheet" href="inc/user.css#" />{/if}
 {loop="$plugins_includes.css_files"}
 <link type="text/css" rel="stylesheet" href="{$value}#"/>