Index: /extensions/simple_themes/simple/language/en_UK/theme.lang.php
===================================================================
--- /extensions/simple_themes/simple/language/en_UK/theme.lang.php	(revision 13549)
+++ /extensions/simple_themes/simple/language/en_UK/theme.lang.php	(revision 13558)
@@ -2,4 +2,7 @@
 
 $lang['Show/hide menu'] = 'Show/hide menu';
+$lang['Album title and description'] = 'Album title and description';
+$lang['under the album thumbnail'] = 'under the album thumbnail';
+$lang['next to the album thumbnail'] = 'next to the album thumbnail';
 
 ?>
Index: /extensions/simple_themes/simple/language/fr_FR/theme.lang.php
===================================================================
--- /extensions/simple_themes/simple/language/fr_FR/theme.lang.php	(revision 13549)
+++ /extensions/simple_themes/simple/language/fr_FR/theme.lang.php	(revision 13558)
@@ -2,4 +2,7 @@
 
 $lang['Show/hide menu'] = 'Afficher/cacher le menu';
+$lang['Album title and description'] = 'Titre et description de l\'album';
+$lang['under the album thumbnail'] = 'sous la miniature représentante';
+$lang['next to the album thumbnail'] = 'à côté de la miniature représentante';
 
 ?>
Index: /extensions/simple_themes/simple/option_album_title_line.css
===================================================================
--- /extensions/simple_themes/simple/option_album_title_line.css	(revision 13558)
+++ /extensions/simple_themes/simple/option_album_title_line.css	(revision 13558)
@@ -0,0 +1,18 @@
+.thumbnailCategories {
+  padding: 1em;
+}
+
+.thumbnailCategories li {
+  height: 160px;
+  width: 45%;
+  text-align:left;
+}
+
+.illustration {
+  float: left;
+  width: 150px;
+}
+
+.description {
+  padding-left: 1em;
+}
Index: /extensions/simple_themes/simple/admin/admin.inc.php
===================================================================
--- /extensions/simple_themes/simple/admin/admin.inc.php	(revision 13558)
+++ /extensions/simple_themes/simple/admin/admin.inc.php	(revision 13558)
@@ -0,0 +1,31 @@
+<?php
+load_language('theme.lang', PHPWG_THEMES_PATH.'simple/');
+
+global $conf;
+if (!isset($conf['stripped']))
+{
+  $conf['simple'] = serialize(array('albumDisplay' => 'column'));
+}
+
+$simple_conf = array();
+
+if (isset($_POST['submit']))
+{
+  $simple_conf['albumDisplay'] = $_POST['albumDisplay'];
+  
+  conf_update_param('simple', pwg_db_real_escape_string(serialize($simple_conf)));
+
+  array_push($page['infos'], l10n('Your configuration settings are saved'));
+
+  load_conf_from_db();
+}
+
+$template->set_filenames(
+  array(
+    'theme_admin_content' => dirname(__FILE__) . '/admin.tpl')
+  );
+
+$template->assign('options', unserialize($conf['simple']));
+
+$template->assign_var_from_handle('ADMIN_CONTENT', 'theme_admin_content');
+?>
Index: /extensions/simple_themes/simple/admin/admin.tpl
===================================================================
--- /extensions/simple_themes/simple/admin/admin.tpl	(revision 13558)
+++ /extensions/simple_themes/simple/admin/admin.tpl	(revision 13558)
@@ -0,0 +1,21 @@
+<div class="titrePage">
+  <h2>Simple Theme Configuration</h2>
+</div>
+
+<form method="post" class="properties" action="" class="properties">
+  <div>
+    <fieldset>
+      <legend>{'Albums'|@translate}</legend>
+        <ul>
+          <li><label>
+            <span class="property">{'Album title and description'|@translate}</span>&nbsp;
+            <select name="albumDisplay" style="min-width:150px;">
+              <option value="column" {if ($options.albumDisplay=="line")}selected="selected"{/if}>{'under the album thumbnail'|@translate}</option>
+              <option value="line" {if ($options.albumDisplay=="line")}selected="selected"{/if}>{'next to the album thumbnail'|@translate}</option>
+            </select>
+          </label></li>
+        </ul>
+      </fieldset>
+  </div>
+  <p><input class="submit" type="submit" value="{'Save Settings'|@translate}" name="submit" /></p>
+</form>
Index: /extensions/simple_themes/simple/README.md
===================================================================
--- /extensions/simple_themes/simple/README.md	(revision 13557)
+++ /extensions/simple_themes/simple/README.md	(revision 13558)
@@ -42,4 +42,16 @@
 Changelog
 ---------
+
+### version 2.5.3 (22/01/2012)
+
+* add an option and admin page to choose the layout for albums (with description
+  under or next to the album thumbnail)
+
+### version 2.5.2 (20/12/2011)
+
+* more flexible layout for thumbnails
+* more flexible layout for categories
+* restore the possibility to hide thumbnails caption.
+* center image in slideshow
 
 ### version 2.5.1 (18/10/2011)
Index: /extensions/simple_themes/simple/themeconf.inc.php
===================================================================
--- /extensions/simple_themes/simple/themeconf.inc.php	(revision 13557)
+++ /extensions/simple_themes/simple/themeconf.inc.php	(revision 13558)
@@ -2,5 +2,5 @@
 /*
 Theme Name: Simple Grey
-Version: 2.5.2
+Version: 2.5.3
 Description: Simple Grey
 Theme URI: http://piwigo.org/ext/extension_view.php?eid=308
@@ -29,5 +29,19 @@
 
 // debug - do not combine files
-// $conf['template_combine_files'] = false;
+$conf['template_combine_files'] = false;
+
+if (!isset($conf['simple']))
+{
+  $conf['simple'] = serialize(array('albumDisplay' => 'column'));
+}
+$conf['simple'] = unserialize($conf['simple']);
+
+add_event_handler('loc_begin_page_header', 'simple_set_config');
+function simple_set_config()
+{
+  global $template, $conf;
+  
+  $template->assign('simple_conf', $conf['simple']);
+}
 
 ?>
Index: /extensions/simple_themes/simple/local_head.tpl
===================================================================
--- /extensions/simple_themes/simple/local_head.tpl	(revision 13546)
+++ /extensions/simple_themes/simple/local_head.tpl	(revision 13558)
@@ -0,0 +1,5 @@
+{if $load_css}
+  {if $simple_conf.albumDisplay eq 'line'}
+    {combine_css path="themes/simple/option_album_title_line.css" order=-10}
+  {/if}
+{/if}