Issue 426: first step; separation of admin and public into two templates

Need to simplify and delete files not needed


git-svn-id: http://piwigo.org/svn/trunk@1363 68402e56-0260-453c-a942-63ccdbb3a9ee

105 files changed, 2125 insertions, 0 deletions

diff --git a/template/public/yoga/about.tpl b/template/public/yoga/about.tpl
new file mode 100644
index 000000000..6efa0e9ee
--- /dev/null
+++ b/template/public/yoga/about.tpl
@@ -0,0 +1,15 @@
+<div id="content">
+  <div class="titrePage">
+    <ul class="categoryActions">
+      <li>
+        <a href="{U_HOME}" title="{lang:return to homepage}">
+          <img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/>
+        </a>
+      </li>
+    </ul>
+    <h2>{lang:About}</h2>
+  </div>
+
+  {ABOUT_MESSAGE}
+
+</div>
diff --git a/template/yoga/admin.tpl b/template/public/yoga/admin.tpl
index 24177e427..24177e427 100644
--- a/template/yoga/admin.tpl
+++ b/template/public/yoga/admin.tpl
diff --git a/template/yoga/admin/cat_list.tpl b/template/public/yoga/admin/cat_list.tpl
index ec4b66d43..ec4b66d43 100644
--- a/template/yoga/admin/cat_list.tpl
+++ b/template/public/yoga/admin/cat_list.tpl
diff --git a/template/yoga/admin/cat_modify.tpl b/template/public/yoga/admin/cat_modify.tpl
index ed8861d84..ed8861d84 100644
--- a/template/yoga/admin/cat_modify.tpl
+++ b/template/public/yoga/admin/cat_modify.tpl
diff --git a/template/yoga/admin/cat_move.tpl b/template/public/yoga/admin/cat_move.tpl
index 5d5247f2f..5d5247f2f 100644
--- a/template/yoga/admin/cat_move.tpl
+++ b/template/public/yoga/admin/cat_move.tpl
diff --git a/template/yoga/admin/cat_options.tpl b/template/public/yoga/admin/cat_options.tpl
index 891dc37d4..891dc37d4 100644
--- a/template/yoga/admin/cat_options.tpl
+++ b/template/public/yoga/admin/cat_options.tpl
diff --git a/template/public/yoga/admin/cat_perm.tpl b/template/public/yoga/admin/cat_perm.tpl
new file mode 100644
index 000000000..9c8fafa69
--- /dev/null
+++ b/template/public/yoga/admin/cat_perm.tpl
@@ -0,0 +1,65 @@
+<div class="titrePage">
+  <ul class="categoryActions">
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+  </ul>
+  <h2>{lang:Manage permissions for a category}</h2>
+</div>
+
+<h3>{CATEGORIES_NAV}</h3>
+
+<form action="{F_ACTION}" method="post" id="categoryPermissions">
+
+  <h4>{lang:Groups}</h4>
+
+  <fieldset>
+    <legend>{lang:Permission granted}</legend>
+    <ul>
+      <!-- BEGIN group_granted -->
+      <li><label><input type="checkbox" name="deny_groups[]" value="{group_granted.ID}" /> {group_granted.NAME}</label></li>
+      <!-- END group_granted -->
+    </ul>
+    <input type="submit" name="deny_groups_submit" value="{lang:Deny selected groups}" {TAG_INPUT_ENABLED}/>
+  </fieldset>
+
+  <fieldset>
+    <legend>{lang:Permission denied}</legend>
+    <ul>
+      <!-- BEGIN group_denied -->
+      <li><label><input type="checkbox" name="grant_groups[]" value="{group_denied.ID}"> {group_denied.NAME}</label></li>
+      <!-- END group_denied -->
+    </ul>
+    <input type="submit" name="grant_groups_submit" value="{lang:Grant selected groups}" {TAG_INPUT_ENABLED}/>
+  </fieldset>
+
+  <h4>{lang:Users}</h4>
+  
+  <fieldset>
+    <legend>{lang:Permission granted}</legend>
+    <ul>
+      <!-- BEGIN user_granted -->
+      <li><label><input type="checkbox" name="deny_users[]" value="{user_granted.ID}" /> {user_granted.NAME}</label></li>
+      <!-- END user_granted -->
+    </ul>
+    <input type="submit" name="deny_users_submit" value="{lang:Deny selected users}" {TAG_INPUT_ENABLED}/>
+  </fieldset>
+
+  <fieldset>
+    <legend>{lang:Permission granted thanks to a group}</legend>
+    <ul>
+      <!-- BEGIN user_granted_indirect -->
+      <li>{user_granted_indirect.NAME} ({user_granted_indirect.GROUP})</li>
+      <!-- END user_granted_indirect -->
+    </ul>
+  </fieldset>
+
+  <fieldset>
+    <legend>{lang:Permission denied}</legend>
+    <ul>
+      <!-- BEGIN user_denied -->
+      <li><label><input type="checkbox" name="grant_users[]" value="{user_denied.ID}"> {user_denied.NAME}</label></li>
+      <!-- END user_denied -->
+    </ul>
+    <input type="submit" name="grant_users_submit" value="{lang:Grant selected users}" {TAG_INPUT_ENABLED}/>
+  </fieldset>
+
+</form>
diff --git a/template/public/yoga/admin/comments.tpl b/template/public/yoga/admin/comments.tpl
new file mode 100644
index 000000000..065a1c8ee
--- /dev/null
+++ b/template/public/yoga/admin/comments.tpl
@@ -0,0 +1,24 @@
+<h2>{lang:User comments validation}</h2>
+
+<form method="post" action="{F_ACTION}">
+  <!-- BEGIN comment -->
+  <div class="comment">
+    <a class="illustration" href="{comment.U_PICTURE}"><img src="{comment.TN_SRC}" /></a>
+    <p class="commentHeader"><strong>{comment.AUTHOR}</strong> - <em>{comment.DATE}</em></p>
+    <blockquote>{comment.CONTENT}</blockquote>
+    <ul class="actions">
+      <li><label><input type="radio" name="action-{comment.ID}" value="reject" />{lang:Reject}</label></li>
+      <li><label><input type="radio" name="action-{comment.ID}" value="validate" />{lang:Validate}</label></li>
+    </ul>
+  </div>
+  <!-- END comment -->
+
+  <p class="bottomButtons">
+    <input type="hidden" name="list" value="{LIST}" />
+    <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}/>
+    <input type="submit" name="validate-all" value="{lang:Validate All}" />
+    <input type="submit" name="reject-all" value="{lang:Reject All}" />
+    <input type="reset" value="{lang:Reset}" />
+  </p>
+
+</form>
diff --git a/template/yoga/admin/configuration.tpl b/template/public/yoga/admin/configuration.tpl
index a0578692d..a0578692d 100644
--- a/template/yoga/admin/configuration.tpl
+++ b/template/public/yoga/admin/configuration.tpl
diff --git a/template/public/yoga/admin/double_select.tpl b/template/public/yoga/admin/double_select.tpl
new file mode 100644
index 000000000..2bfa28072
--- /dev/null
+++ b/template/public/yoga/admin/double_select.tpl
@@ -0,0 +1,23 @@
+<table class="doubleSelect">
+  <tr>
+    <td>
+      <h3>{L_CAT_OPTIONS_TRUE}</h3>
+      <select class="categoryList" name="cat_true[]" multiple="multiple" size="30">
+        <!-- BEGIN category_option_true -->
+        <option {category_option_true.SELECTED} value="{category_option_true.VALUE}">{category_option_true.OPTION}</option>
+        <!-- END category_option_true -->
+      </select>
+      <p><input type="submit" value="&raquo;" name="falsify" style="font-size:15px;" {TAG_INPUT_ENABLED}/></p>
+    </td>
+
+    <td>
+      <h3>{L_CAT_OPTIONS_FALSE}</h3>
+      <select class="categoryList" name="cat_false[]" multiple="multiple" size="30">
+        <!-- BEGIN category_option_false -->
+        <option {category_option_false.SELECTED} value="{category_option_false.VALUE}">{category_option_false.OPTION}</option>
+        <!-- END category_option_false -->
+      </select>
+      <p><input type="submit" value="&laquo;" name="trueify" style="font-size:15px;" {TAG_INPUT_ENABLED}/></p>
+    </td>
+  </tr>
+</table>
diff --git a/template/yoga/admin/element_set_global.tpl b/template/public/yoga/admin/element_set_global.tpl
index 7bb9d7006..7bb9d7006 100644
--- a/template/yoga/admin/element_set_global.tpl
+++ b/template/public/yoga/admin/element_set_global.tpl
diff --git a/template/public/yoga/admin/element_set_unit.tpl b/template/public/yoga/admin/element_set_unit.tpl
new file mode 100644
index 000000000..5adce8833
--- /dev/null
+++ b/template/public/yoga/admin/element_set_unit.tpl
@@ -0,0 +1,89 @@
+<h2>{lang:Batch management}</h2>
+
+<h3>{CATEGORIES_NAV}</h3>
+
+<p style="text-align:center;">
+  <a href="{U_GLOBAL_MODE}">{lang:global mode}</a>
+  | {lang:unit mode}
+</p>
+
+<form action="{F_ACTION}" method="POST">
+<fieldset>
+
+  <legend>{lang:Display options}</legend>
+  <input type="hidden" name="list" value="{IDS_LIST}" />
+  <p>{lang:elements per page} :
+      <a href="{U_ELEMENTS_PAGE}&amp;display=5">5</a>
+    | <a href="{U_ELEMENTS_PAGE}&amp;display=10">10</a>
+    | <a href="{U_ELEMENTS_PAGE}&amp;display=50">50</a>
+    | <a href="{U_ELEMENTS_PAGE}&amp;display=all">{lang:all}</a>
+  </p>
+
+</fieldset>
+
+<div class="navigationBar">{NAV_BAR}</div>
+
+<!-- BEGIN element -->
+<fieldset class="elementEdit">
+  <legend>{element.LEGEND}</legend>
+
+  <a href="{element.U_EDIT}"><img src="{element.TN_SRC}" alt="" class="miniature" title="{lang:Edit all picture informations}" /></a>
+
+  <table>
+
+    <tr>
+      <td><strong>{lang:Name}</strong></td>
+      <td><input type="text" name="name-{element.ID}" value="{element.NAME}" /></td>
+    </tr>
+
+    <tr>
+      <td><strong>{lang:Author}</strong></td>
+      <td><input type="text" name="author-{element.ID}" value="{element.AUTHOR}" /></td>
+    </tr>
+
+    <tr>
+      <td><strong>{lang:Creation date}</strong></td>
+      <td>
+        <label><input type="radio" name="date_creation_action-{element.ID}" value="unset" /> {lang:unset}</label>
+        <input type="radio" name="date_creation_action-{element.ID}" value="set" id="date_creation_action_set-{element.ID}" /> {lang:set to}
+        <select onmousedown="document.getElementById('date_creation_action_set-{element.ID}').checked = true;" name="date_creation_day-{element.ID}">
+          <!-- BEGIN date_creation_day -->
+          <option {element.date_creation_day.SELECTED} value="{element.date_creation_day.VALUE}">{element.date_creation_day.OPTION}</option>
+          <!-- END date_creation_day -->
+        </select>
+        <select onmousedown="document.getElementById('date_creation_action_set-{element.ID}').checked = true;" name="date_creation_month-{element.ID}">
+          <!-- BEGIN date_creation_month -->
+          <option {element.date_creation_month.SELECTED} value="{element.date_creation_month.VALUE}">{element.date_creation_month.OPTION}</option>
+          <!-- END date_creation_month -->
+        </select>
+        <input onmousedown="document.getElementById('date_creation_action_set-{element.ID}').checked = true;"
+               name="date_creation_year-{element.ID}"
+               type="text"
+               size="4"
+               maxlength="4"
+               value="{element.DATE_CREATION_YEAR}" />
+      </td>
+    </tr>
+
+    <tr>
+      <td><strong>{lang:Tags}</strong></td>
+      <td>{element.TAG_SELECTION}</td>
+    </tr>
+
+    <tr>
+      <td><strong>{lang:Description}</strong></td>
+      <td><textarea name="description-{element.ID}" class="description">{element.DESCRIPTION}</textarea></td>
+    </tr>
+
+  </table>
+
+</fieldset>
+<!-- END element -->
+
+<p>
+  <input type="submit" value="{L_SUBMIT}" name="submit" {TAG_INPUT_ENABLED}/>
+  <input type="reset" value="{lang:Reset}" />
+</p>
+
+
+</form>
diff --git a/template/yoga/admin/group_list.tpl b/template/public/yoga/admin/group_list.tpl
index 7b7dd67eb..7b7dd67eb 100644
--- a/template/yoga/admin/group_list.tpl
+++ b/template/public/yoga/admin/group_list.tpl
diff --git a/template/public/yoga/admin/group_perm.tpl b/template/public/yoga/admin/group_perm.tpl
new file mode 100644
index 000000000..91c2f637a
--- /dev/null
+++ b/template/public/yoga/admin/group_perm.tpl
@@ -0,0 +1,7 @@
+<h2>{TITLE}</h2>
+
+<form method="post" action="{F_ACTION}">
+  {DOUBLE_SELECT}
+</form>
+
+<p>{lang:Only private categories are listed}</p>
diff --git a/template/yoga/admin/intro.tpl b/template/public/yoga/admin/intro.tpl
index 58c6b2510..58c6b2510 100644
--- a/template/yoga/admin/intro.tpl
+++ b/template/public/yoga/admin/intro.tpl
diff --git a/template/yoga/admin/maintenance.tpl b/template/public/yoga/admin/maintenance.tpl
index 697e0954b..697e0954b 100644
--- a/template/yoga/admin/maintenance.tpl
+++ b/template/public/yoga/admin/maintenance.tpl
diff --git a/template/public/yoga/admin/notification_by_mail.tpl b/template/public/yoga/admin/notification_by_mail.tpl
new file mode 100644
index 000000000..22309e96d
--- /dev/null
+++ b/template/public/yoga/admin/notification_by_mail.tpl
@@ -0,0 +1,113 @@
+<!-- $Id: notification_by_mail.tpl Ruben ARNAUD -->
+<div class="titrePage">
+  <ul class="categoryActions">
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+  </ul>
+  <h2>{lang:nbm_send_mail_to_users} [{U_TABSHEET_TITLE}]</h2>
+  <!-- BEGIN header_link -->
+  <h3>
+      <a href="{header_link.PARAM_MODE}">{lang:nbm_param_mode}</a> | 
+      <a href="{header_link.SUBSCRIBE_MODE}">{lang:nbm_subscribe_mode}</a> | 
+      <a href="{header_link.SEND_MODE}">{lang:nbm_send_mode}</a>
+  </h3>
+  <!-- END header_link -->
+</div>
+
+<form method="post" name="notification_by_mail" id="notification_by_mail" action="{F_ACTION}">
+  <!-- BEGIN repost -->
+  <fieldset>
+    <div class="infos">
+      <input type="submit" value="{lang:nbm_repost_submit}" name="{repost.REPOST_SUBMIT_NAME}" {TAG_INPUT_ENABLED}/>
+    </div>
+  </fieldset>
+  <!-- END repost -->
+
+  <!-- BEGIN param -->
+  <fieldset>
+    <legend>{lang:nbm_title_param}</legend>
+    <table>
+      <tr>
+        <td>
+          <label for="send_mail_as">{lang:nbm_send_mail_as}</label>
+          <br><i><small>{lang:nbm_info_send_mail_as}</small></i>
+        </td>
+        <td><input type="text" maxlength="35" size="35" name="nbm_send_mail_as" id="send_mail_as" value="{param.SEND_MAIL_AS}"/></td>
+      </tr>
+      <tr> 
+        <td><label>{lang:nbm_send_detailed_content} </label></td>
+        <td>
+          <label><input type="radio" name="nbm_send_detailed_content" value="true"  {param.SEND_DETAILED_CONTENT_YES}/>{lang:yes}</label>
+          <label><input type="radio" name="nbm_send_detailed_content" value="false" {param.SEND_DETAILED_CONTENT_NO}/>{lang:no}</label>
+        </td>
+      </tr>
+     <tr>
+        <td><label for="complementary_mail_content">{lang:nbm_complementary_mail_content} </label></td>
+        <td><textarea cols="50" rows="5" name="nbm_complementary_mail_content" id="complementary_mail_content">{param.COMPLEMENTARY_MAIL_CONTENT}</textarea></td>
+      </tr>
+    </table>
+  </fieldset>
+
+  <p>
+    <input type="submit" value="{lang:Submit}" name="param_submit" {TAG_INPUT_ENABLED}/>
+    <input type="reset" value="{lang:Reset}" name="param_reset"/>
+  </p>
+  <!-- END param -->
+
+  <!-- BEGIN subscribe -->
+  <fieldset>
+    <legend>{lang:nbm_title_subscribe}</legend>
+    <p><i>{lang:nbm_warning_subscribe_unsubcribe}</i></p>
+    {DOUBLE_SELECT}
+  </fieldset>
+  <!-- END subscribe -->
+
+  <!-- BEGIN send -->
+    <!-- BEGIN send_empty -->
+    <p>{lang:nbm_no_user_available_to_send_L1}</p>
+    <p>
+    {lang:nbm_no_user_available_to_send_L2}<br>
+    {lang:nbm_no_user_available_to_send_L3}
+    </p>
+    <!-- END send_empty -->
+    <!-- BEGIN send_data -->
+    <fieldset>
+      <legend>{lang:nbm_title_send}</legend>
+      <table class="table2">
+        <tr class="throw">
+          <th>{lang:nbm_col_user}</th>
+          <th>{lang:nbm_col_mail}</th>
+          <th>{lang:nbm_col_last_send}</th>
+          <th>{lang:nbm_col_check_user_send_mail}</th>
+        </tr>
+        <!-- BEGIN user_send_mail -->
+        <tr class="{send.send_data.user_send_mail.CLASS}">
+          <td><label for="send_selection-{send.send_data.user_send_mail.ID}">{send.send_data.user_send_mail.USERNAME}</label></td>
+          <td><label for="send_selection-{send.send_data.user_send_mail.ID}">{send.send_data.user_send_mail.EMAIL}</label></td>
+          <td><label for="send_selection-{send.send_data.user_send_mail.ID}">{send.send_data.user_send_mail.LAST_SEND}</label></td>
+          <td><input type="checkbox" name="send_selection[]" value="{send.send_data.user_send_mail.ID}" {send.send_data.user_send_mail.CHECKED} id="send_selection-{send.send_data.user_send_mail.ID}"/></td>
+        </tr>
+        <!-- END user_send_mail -->
+      </table>
+      <p>
+          <a href="#" onclick="SelectAll(document.getElementById('notification_by_mail')); return false;">{lang:nbm_send_check_all}</a>
+        / <a href="#" onclick="DeselectAll(document.getElementById('notification_by_mail')); return false;">{lang:nbm_send_uncheck_all}</a>
+      </p>
+    </fieldset>
+
+    <fieldset>
+      <legend>{lang:nbm_send_options}</legend>
+      <table>
+       <tr>
+          <td><label for="send_customize_mail_content">{lang:nbm_send_complementary_mail_content} </label></td>
+          <td><textarea cols="50" rows="5" name="send_customize_mail_content" id="send_customize_mail_content">{send.send_data.CUSTOMIZE_MAIL_CONTENT}</textarea></td>
+        </tr>
+      </table>
+    </fieldset>
+
+    <p>
+      <input type="submit" value="{lang:nbm_send_submit}" name="send_submit" {TAG_INPUT_ENABLED}/>
+    </p>
+    <!-- END send_data -->
+  <!-- END send -->
+
+</form>
diff --git a/template/yoga/admin/picture_modify.tpl b/template/public/yoga/admin/picture_modify.tpl
index c10e7744e..c10e7744e 100644
--- a/template/yoga/admin/picture_modify.tpl
+++ b/template/public/yoga/admin/picture_modify.tpl
diff --git a/template/public/yoga/admin/rating.tpl b/template/public/yoga/admin/rating.tpl
new file mode 100644
index 000000000..ac78bf419
--- /dev/null
+++ b/template/public/yoga/admin/rating.tpl
@@ -0,0 +1,67 @@
+<h2>{lang:Rating} [{NB_ELEMENTS} {lang:elements}]</h2>
+
+<form action="{F_ACTION}" method="GET" id="update" class="filter">
+  <fieldset>
+    <legend>{lang:Filter}</legend>
+
+    <label>
+      {lang:Sort by}
+      <select name="order_by">
+        <!-- BEGIN order_by -->
+        <option value="{order_by.VALUE}" {order_by.SELECTED}>{order_by.CONTENT}</option>
+        <!-- END order_by -->
+      </select>
+    </label>
+
+    <label>
+      {lang:Users}
+      <select name="users">
+        <!-- BEGIN user_option -->
+        <option value="{user_option.VALUE}" {user_option.SELECTED}>{user_option.CONTENT}</option>
+        <!-- END user_option -->
+      </select>
+    </label>
+
+    <label>
+      {lang:Number of items}
+      <input type="text" name="display" size="2" value="{DISPLAY}">
+    </label>
+
+    <input type="submit" name="submit_filter" value="{lang:Submit}" />
+    <input type="hidden" name="page" value="rating" />
+  </fieldset>
+</form>
+
+<div class="navigationBar">{NAVBAR}</div>
+<table width="99%">
+<tr class="throw">
+  <td>{lang:File}</td>
+  <td>{lang:Number of rates}</td>
+  <td>{lang:Average rate}</td>
+  <td>{lang:Controversy}</td>
+  <td>{lang:Sum of rates}</td>
+  <td>{lang:Rate}</td>
+  <td>{lang:Username}</td>
+  <td>{lang:Rate date}</td>
+  <td></td>
+</tr>
+<!-- BEGIN image -->
+<tr valign="bottom">
+  <td rowspan="{image.NB_RATES_PLUS1}"><a href="{image.U_URL}"><img src="{image.U_THUMB}" alt="{image.FILE}" title="{image.FILE}"></a></td>
+  <td rowspan="{image.NB_RATES_PLUS1}"><strong>{image.NB_RATES}/{image.NB_RATES_TOTAL}</strong></td>
+  <td rowspan="{image.NB_RATES_PLUS1}"><strong>{image.AVG_RATE}</strong></td>
+  <td rowspan="{image.NB_RATES_PLUS1}"><strong>{image.STD_RATE}</strong></td>
+  <td rowspan="{image.NB_RATES_PLUS1}" style="border-right: 1px solid;" ><strong>{image.SUM_RATE}</strong></td>
+</tr>
+<!-- BEGIN rate -->
+<tr>
+    <td>{image.rate.RATE}</td>
+    <td><b>{image.rate.USER}</b></td>
+    <td><span class="date">{image.rate.DATE}</span></td>
+    <td><a href="{image.rate.U_DELETE}"><img src="{themeconf:icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{lang:delete}]"/></a></td>
+</tr>
+<!-- END rate -->
+<!-- END image -->
+</table>
+
+<div class="navigationBar">{NAVBAR}</div>
diff --git a/template/yoga/admin/site_manager.tpl b/template/public/yoga/admin/site_manager.tpl
index 88b77a362..88b77a362 100644
--- a/template/yoga/admin/site_manager.tpl
+++ b/template/public/yoga/admin/site_manager.tpl
diff --git a/template/public/yoga/admin/site_update.tpl b/template/public/yoga/admin/site_update.tpl
new file mode 100644
index 000000000..d3d0221ca
--- /dev/null
+++ b/template/public/yoga/admin/site_update.tpl
@@ -0,0 +1,109 @@
+<!-- $Id: update.tpl 980 2005-12-10 15:24:53Z chrisaga $ -->
+
+<div class="titrePage">
+  <ul class="categoryActions">
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+  </ul>
+  <h2>{lang:title_update}: <a href="{SITE_URL}">{SITE_URL}</a></h2>
+</div>
+
+<!-- BEGIN update_result -->
+<h3>{L_RESULT_UPDATE}</h3>
+<ul>
+  <li class="update_summary_new">{update_result.NB_NEW_CATEGORIES} {lang:update_nb_new_categories}</li>
+  <li class="update_summary_new">{update_result.NB_NEW_ELEMENTS} {lang:update_nb_new_elements}</li>
+  <li class="update_summary_del">{update_result.NB_DEL_CATEGORIES} {lang:update_nb_del_categories}</li>
+  <li class="update_summary_del">{update_result.NB_DEL_ELEMENTS} {lang:update_nb_del_elements}</li>
+  <li>{update_result.NB_UPD_ELEMENTS} {lang:update_nb_upd_elements}</li>
+  <li class="update_summary_err">{update_result.NB_ERRORS} {lang:update_nb_errors}</li>
+</ul>
+<!-- END update_result -->
+
+<!-- BEGIN metadata_result -->
+<h3>{L_RESULT_METADATA}</h3>
+<ul>
+  <li>{metadata_result.NB_ELEMENTS_DONE} {lang:update_nb_elements_metadata_sync}</li>
+  <li>{metadata_result.NB_ELEMENTS_CANDIDATES} {lang:update_nb_elements_metadata_available}</li>
+  <li>{lang:update_used_metadata} : {METADATA_LIST}</li>
+</ul>
+<!-- END metadata_result -->
+
+
+<!-- BEGIN sync_errors -->
+<h3>{lang:update_error_list_title}</h3>
+<div class="errors">
+<ul>
+  <!-- BEGIN error -->
+  <li>[{sync_errors.error.ELEMENT}] {sync_errors.error.LABEL}</li>
+  <!-- END error -->
+</ul>
+</div>
+<h3>{lang:update_errors_caption}</h3>
+<ul>
+  <!-- BEGIN error_caption -->
+  <li><strong>{sync_errors.error_caption.TYPE}</strong>: {sync_errors.error_caption.LABEL}</li>
+  <!-- END error_caption -->
+</ul>
+<!-- END sync_errors -->
+
+<!-- BEGIN sync_infos -->
+<h3>{lang:update_infos_title}</h3>
+<div class="infos">
+<ul>
+  <!-- BEGIN info -->
+  <li>[{sync_infos.info.ELEMENT}] {sync_infos.info.LABEL}</li>
+  <!-- END sync_infos -->
+</ul>
+</div>
+<!-- END infos -->
+
+<!-- BEGIN introduction -->
+<h3>{lang:update_default_title}</h3>
+<form action="{F_ACTION}" method="post" id="update">
+
+  <fieldset>
+    <legend>{lang:update_sync_files}</legend>
+    <ul>
+      <li><label><input type="radio" name="sync" value="dirs" {SYNC_DIRS_CHECKED} /> {lang:update_sync_dirs}</label></li>
+      <li><label><input type="radio" name="sync" value="files" {SYNC_ALL_CHECKED} /> {lang:update_sync_all}</label></li>
+      <li><label><input type="checkbox" name="display_info" value="1" {DISPLAY_INFO_CHECKED} /> {lang:update_display_info}</label></li>
+    </ul>
+  </fieldset>
+
+  <fieldset>
+    <legend>{lang:update_sync_metadata}</legend>
+    {lang:update_used_metadata} : {METADATA_LIST}.<br/>
+    <ul>
+      <li><label><input type="radio" name="sync" value="metadata_new" {SYNC_META_NEW_CHECKED} /> {lang:update_sync_metadata_new}</label></li>
+      <li><label><input type="radio" name="sync" value="metadata_all" {SYNC_META_ALL_CHECKED} /> {lang:update_sync_metadata_all}</label></li>
+    </ul>
+  </fieldset>
+
+  <fieldset>
+    <legend></legend>
+    <ul><li><label><input type="checkbox" name="simulate" value="1" checked="checked" {TAG_INPUT_ENABLED} /> {lang:update_simulate}</label></li></ul>
+  </fieldset>
+
+  <fieldset>
+    <legend>{lang:update_cats_subset}</legend>
+    <ul>
+    <li>
+    <select style="width:500px" name="cat" size="10">
+      <!-- BEGIN category_option -->
+      <option {introduction.category_option.SELECTED} value="{introduction.category_option.VALUE}">{introduction.category_option.OPTION}</option>
+      <!-- END category_option -->
+    </select>
+    </li>
+
+    <li><label><input type="checkbox" name="subcats-included" value="1" {SUBCATS_INCLUDED_CHECKED} /> {lang:search_subcats_included}</label></li>
+    </ul>
+  </fieldset>
+
+  <p class="bottomButtons">
+    <input type="submit" value="{lang:submit}" name="submit" />
+    <input type="reset"  value="{lang:reset}"  name="reset"  />
+  </p>
+</form>
+<!-- END introduction -->
+
+<a href="{U_SITE_MANAGER}">{lang:Site manager}</a>
diff --git a/template/yoga/admin/stats.tpl b/template/public/yoga/admin/stats.tpl
index 75de81f79..75de81f79 100644
--- a/template/yoga/admin/stats.tpl
+++ b/template/public/yoga/admin/stats.tpl
diff --git a/template/public/yoga/admin/tags.tpl b/template/public/yoga/admin/tags.tpl
new file mode 100644
index 000000000..8fe666b59
--- /dev/null
+++ b/template/public/yoga/admin/tags.tpl
@@ -0,0 +1,53 @@
+<div class="titrePage">
+  <h2>{lang:Manage tags}</h2>
+</div>
+
+<form action="{F_ACTION}" method="post">
+
+  <!-- BEGIN edit_tags -->
+  <fieldset>
+    <legend>{lang:Edit tags}</legend>
+    <input type="hidden" name="edit_list" value="{edit_tags.LIST}" />
+    <table class="table2">
+      <tr class="throw">
+        <th>{lang:Current name}</th>
+        <th>{lang:New name}</th>
+      </tr>
+      <!-- BEGIN tag -->
+      <tr>
+        <td>{edit_tags.tag.NAME}</td>
+        <td><input type="text" name="tag_name-{edit_tags.tag.ID}" value="{edit_tags.tag.NAME}" /></td>
+      </tr>
+      <!-- END tag -->
+    </table>
+
+    <p>
+      <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED} />
+      <input type="reset" value="{lang:Reset}" />
+    </p>
+  </fieldset>
+  <!-- END edit_tags -->
+
+  <fieldset>
+    <legend>{lang:Add a tag}</legend>
+
+    <label>
+      {lang:New tag}
+      <input type="text" name="add_tag" />
+    </label>
+    
+    <p><input type="submit" name="add" value="{lang:Submit}" {TAG_INPUT_ENABLED}/></p>
+  </fieldset>
+
+  <fieldset>
+    <legend>{lang:Tag selection}</legend>
+    
+    {TAG_SELECTION}
+
+    <p>
+      <input type="submit" name="edit" value="{lang:Edit selected tags}" {TAG_INPUT_ENABLED}/>
+      <input type="submit" name="delete" value="{lang:Delete selected tags}" onclick="return confirm('{lang:Are you sure?}');" {TAG_INPUT_ENABLED}/>
+    </p>
+  </fieldset>
+
+</form>
diff --git a/template/yoga/admin/thumbnail.tpl b/template/public/yoga/admin/thumbnail.tpl
index cf5345d43..cf5345d43 100644
--- a/template/yoga/admin/thumbnail.tpl
+++ b/template/public/yoga/admin/thumbnail.tpl
diff --git a/template/public/yoga/admin/user_list.tpl b/template/public/yoga/admin/user_list.tpl
new file mode 100644
index 000000000..e6c1e81b6
--- /dev/null
+++ b/template/public/yoga/admin/user_list.tpl
@@ -0,0 +1,307 @@
+<div class="titrePage">
+  <ul class="categoryActions">
+    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+  </ul>
+  <h2>{lang:title_liste_users}</h2>
+</div>
+
+<form class="filter" method="post" name="add_user" action="{F_ADD_ACTION}">
+  <fieldset>
+    <legend>{lang:Add a user}</legend>
+    <label>{lang:Username} <input type="text" name="login" maxlength="50" size="20" /></label>
+    <label>{L_PASSWORD} <input type="text" name="password" /></label>
+    <input type="submit" name="submit_add" value="{L_SUBMIT}" {TAG_INPUT_ENABLED} />
+  </fieldset>
+</form>
+
+<form class="filter" method="get" name="filter" action="{F_FILTER_ACTION}"> 
+<fieldset>
+  <legend>{lang:Filter}</legend>
+  <input type="hidden" name="page" value="user_list" />
+
+  <label>{lang:Username} <input type="text" name="username" value="{F_USERNAME}" /></label>
+
+  <label>
+  {lang:status}
+  <select name="status">
+    <!-- BEGIN status_option -->
+    <option value="{status_option.VALUE}" {status_option.SELECTED} > {status_option.CONTENT}</option>
+    <!-- END status_option -->
+  </select>
+  </label>
+
+  <label>
+  {lang:group}
+  <select name="group">
+    <!-- BEGIN group_option -->
+    <option value="{group_option.VALUE}" {group_option.SELECTED} > {group_option.CONTENT}</option>
+    <!-- END group_option -->
+  </select>
+  </label>
+
+  <label>
+  {lang:Order by}
+  <select name="order_by">
+    <!-- BEGIN order_by -->
+    <option value="{order_by.VALUE}" {order_by.SELECTED} >{order_by.CONTENT}</option>
+    <!-- END order_by -->
+  </select>
+  </label>
+
+  <label>
+  {lang:Sort order}
+  <select name="direction">
+    <!-- BEGIN direction -->
+    <option value="{direction.VALUE}" {direction.SELECTED} >{direction.CONTENT}</option>
+    <!-- END direction -->
+  </select>
+  </label>
+
+  <input type="submit" name="submit_filter" value="{L_SUBMIT}" {TAG_INPUT_ENABLED}/>
+
+</fieldset>
+
+</form>
+
+<form method="post" name="preferences" action="{F_PREF_ACTION}">
+
+<table class="table2">
+  <tr class="throw">
+    <th>&nbsp;</th>
+    <th>{lang:Username}</th>
+    <th>{L_STATUS}</th>
+    <th>{L_EMAIL}</th>
+    <th>{lang:Groups}</th>
+    <th>{L_PROPERTIES}</th>
+    <th>{L_ACTIONS}</th>
+  </tr>
+  <!-- BEGIN user -->
+  <tr class="{user.CLASS}">
+    <td><input type="checkbox" name="selection[]" value="{user.ID}" {user.CHECKED} id="selection-{user.ID}" /></td>
+    <td><label for="selection-{user.ID}">{user.USERNAME}</label></td>
+    <td>{user.STATUS}</td>
+    <td>{user.EMAIL}</td>
+    <td>{user.GROUPS}</td>
+    <td>{user.PROPERTIES}</td>
+    <td style="text-align:center;">
+      <a href="{user.U_PERM}"><img src="{themeconf:icon_dir}/permissions.png" class="button" style="border:none" alt="{L_PERMISSIONS}" title="{L_PERMISSIONS}" /></a>
+    </td>
+  </tr>
+  <!-- END user -->
+</table>
+
+<div class="navigationBar">{NAVBAR}</div>
+
+<!-- delete the selected users ? -->
+<fieldset>
+  <legend>{lang:Deletions}</legend>
+  <label><input type="checkbox" name="confirm_deletion" value="1" /> {lang:confirm}</label>
+  <input type="submit" value="{lang:Delete selected users}" name="delete" {TAG_INPUT_ENABLED}/>
+</fieldset>
+
+<fieldset>
+  <legend>{lang:Status}</legend>
+
+  <table>
+    <tr>
+      <td>{L_STATUS}</td>
+      <td>
+        <label><input type="radio" name="status_action" value="leave" checked="checked" /> {lang:leave}</label>
+        <label><input type="radio" name="status_action" value="set" id="status_action_set" /> {lang:set to}</label>
+        <select onmousedown="document.getElementById('status_action_set').checked = true;" name="status" size="1">
+          <!-- BEGIN pref_status_option -->
+          <option {pref_status_option.SELECTED} value="{pref_status_option.VALUE}">{pref_status_option.CONTENT}</option>
+          <!-- END pref_status_option -->
+        </select>
+      </td>
+    </tr>
+
+    <!-- BEGIN adviser -->
+    <tr>
+      <td>{lang:adviser}</td>
+      <td>
+        <label><input type="radio" name="adviser" value="leave" checked="checked" /> {lang:leave}</label>
+        / {lang:set to}
+        <label><input type="radio" name="adviser" value="true"  {ADVISER_YES} />{L_YES}</label>
+        <label><input type="radio" name="adviser" value="false" {ADVISER_NO}  />{L_NO}</label>
+      </td>
+    </tr>
+    <!-- END adviser -->
+
+  </table>
+</fieldset>
+
+<!-- form to set properties for many users at once -->
+<fieldset>
+  <legend>{lang:Groups}</legend>
+
+<table>
+
+  <tr>
+    <td>{lang:associate to group}</td>
+    <td>
+      <select name="associate" size="1">
+        <!-- BEGIN associate_option -->
+        <option {associate_option.SELECTED} value="{associate_option.VALUE}">{associate_option.CONTENT}</option>
+        <!-- END associate_option -->
+      </select>
+    </td>
+  </tr>
+
+  <tr>
+    <td>{lang:dissociate from group}</td>
+    <td>
+      <select name="dissociate" size="1">
+        <!-- BEGIN dissociate_option -->
+        <option {dissociate_option.SELECTED} value="{dissociate_option.VALUE}">{dissociate_option.CONTENT}</option>
+        <!-- END dissociate_option -->
+      </select>
+    </td>
+  </tr>
+
+</table>
+
+</fieldset>
+
+<!-- Properties -->
+<fieldset>
+  <legend>{L_PROPERTIES}</legend>
+
+  <table>
+
+    <tr>
+      <td>{lang:enabled_high}</td>
+      <td>
+        <label><input type="radio" name="enabled_high" value="leave" checked="checked" /> {lang:leave}</label>
+        / {lang:set to}
+        <label><input type="radio" name="enabled_high" value="true"  {ENABLED_HIGH_YES} />{L_YES}</label>
+        <label><input type="radio" name="enabled_high" value="false" {ENABLED_HIGH_NO}  />{L_NO}</label>
+      </td>
+    </tr>
+
+  </table>
+
+</fieldset>
+
+<!-- preference -->
+<fieldset>
+  <legend>{lang:Preferences}</legend>
+
+<table>
+
+  <tr>
+    <td>{L_NB_IMAGE_LINE}</td>
+    <td>
+      <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set" /> {lang:set to}</label>
+      <input onmousedown="document.getElementById('nb_image_line_action_set').checked = true;"
+             size="3" maxlength="2" type="text" name="nb_image_line" value="{NB_IMAGE_LINE}" />
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_NB_LINE_PAGE}</td>
+    <td>
+      <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> {lang:set to}</label>
+      <input onmousedown="document.getElementById('nb_line_page_action_set').checked = true;"
+             size="3" maxlength="2" type="text" name="nb_line_page" value="{NB_LINE_PAGE}" />
+    <td>
+  </tr>
+
+  <tr>
+    <td>{L_TEMPLATE}</td>
+    <td>
+      <label><input type="radio" name="template_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="template_action" value="set" id="template_action_set" /> {lang:set to}</label>
+      <select onmousedown="document.getElementById('template_action_set').checked = true;" name="template" size="1">
+        <!-- BEGIN template_option -->
+        <option {template_option.SELECTED} value="{template_option.VALUE}">{template_option.CONTENT}</option>
+        <!-- END template_option -->
+      </select>
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_LANGUAGE}</td>
+    <td>
+      <label><input type="radio" name="language_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="language_action" value="set" id="language_action_set" /> {lang:set to}</label>
+      <select onmousedown="document.getElementById('language_action_set').checked = true;" name="language" size="1">
+        <!-- BEGIN language_option -->
+        <option {language_option.SELECTED} value="{language_option.VALUE}">{language_option.CONTENT}</option>
+        <!-- END language_option -->
+      </select>
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_RECENT_PERIOD}</td>
+    <td>
+      <label><input type="radio" name="recent_period_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set" /> {lang:set to}</label>
+      <input onmousedown="document.getElementById('recent_period_action_set').checked = true;"
+             type="text" size="3" maxlength="2" name="recent_period" value="{RECENT_PERIOD}" />
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_EXPAND}</td>
+    <td>
+      <label><input type="radio" name="expand" value="leave" checked="checked" /> {lang:leave}</label>
+      / {lang:set to}
+      <label><input type="radio" name="expand" value="true"  {EXPAND_YES} />{L_YES}</label>
+      <label><input type="radio" name="expand" value="false" {EXPAND_NO}  />{L_NO}</label>
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_SHOW_NB_COMMENTS}</td>
+    <td>
+      <label><input type="radio" name="show_nb_comments" value="leave" checked="checked" /> {lang:leave}</label>
+      / {lang:set to}
+      <label><input type="radio" name="show_nb_comments" value="true" {SHOW_NB_COMMENTS_YES} />{L_YES}</label>
+      <label><input type="radio" name="show_nb_comments" value="false" {SHOW_NB_COMMENTS_NO} />{L_NO}</label>
+    </td>
+  </tr>
+
+  <tr>
+    <td>{L_MAXWIDTH}</td>
+    <td>
+      <label><input type="radio" name="maxwidth_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="maxwidth_action" value="unset" /> {lang:unset}</label>
+      <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> {lang:set to}</label>
+      <input onmousedown="document.getElementById('maxwidth_action_set').checked = true;"
+             type="text" size="4" maxlength="4" name="maxwidth" value="{MAXWIDTH}" />
+    </td>
+  </tr>
+
+
+  <tr>
+    <td>{L_MAXHEIGHT}</td>
+    <td>
+      <label><input type="radio" name="maxheight_action" value="leave" checked="checked" /> {lang:leave}</label>
+      <label><input type="radio" name="maxheight_action" value="unset" /> {lang:unset}</label>
+      <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> {lang:set to}</label>
+      <input onmousedown="document.getElementById('maxheight_action_set').checked = true;"
+             type="text" size="4" maxlength="4" name="maxheight" value="{MAXHEIGHT}" />
+    </td>
+  </tr>
+
+
+</table>
+
+</fieldset>
+
+<p>
+  {lang:target}
+  <label><input type="radio" name="target" value="all" /> {lang:all}</label>
+  <label><input type="radio" name="target" value="selection" checked="checked" /> {lang:selection}</label>
+</p>
+
+<p>
+  <input type="submit" value="{L_SUBMIT}" name="pref_submit" {TAG_INPUT_ENABLED} />
+  <input type="reset" value="{L_RESET}" name="pref_reset" />
+</p>
+
+</form>
diff --git a/template/public/yoga/admin/user_perm.tpl b/template/public/yoga/admin/user_perm.tpl
new file mode 100644
index 000000000..a24fd9096
--- /dev/null
+++ b/template/public/yoga/admin/user_perm.tpl
@@ -0,0 +1,21 @@
+<h2>{TITLE}</h2>
+
+<!-- BEGIN groups -->
+<fieldset>
+  <legend>{lang:Categories authorized thanks to group associations}</legend>
+
+  <ul>
+    <!-- BEGIN category -->
+    <li>{groups.category.NAME}</li>
+    <!-- END category -->
+  </ul>
+</fieldset>
+<!-- END groups -->
+
+<fieldset>
+  <legend>{lang:Other private categories}</legend>
+
+  <form method="post" action="{F_ACTION}">
+    {DOUBLE_SELECT}
+  </form>
+</fieldset>
diff --git a/template/yoga/admin/waiting.tpl b/template/public/yoga/admin/waiting.tpl
index b48aa314b..b48aa314b 100644
--- a/template/yoga/admin/waiting.tpl
+++ b/template/public/yoga/admin/waiting.tpl
diff --git a/template/yoga/comments.tpl b/template/public/yoga/comments.tpl
index 6bf28d33b..6bf28d33b 100644
--- a/template/yoga/comments.tpl
+++ b/template/public/yoga/comments.tpl
diff --git a/template/yoga/content.css b/template/public/yoga/content.css
index 7a8909856..7a8909856 100644
--- a/template/yoga/content.css
+++ b/template/public/yoga/content.css
diff --git a/template/public/yoga/dclear.css b/template/public/yoga/dclear.css
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/template/public/yoga/dclear.css
diff --git a/template/yoga/default-colors.css b/template/public/yoga/default-colors.css
index 8b73f966b..8b73f966b 100644
--- a/template/yoga/default-colors.css
+++ b/template/public/yoga/default-colors.css
diff --git a/template/yoga/default-layout.css b/template/public/yoga/default-layout.css
index a9fc2da1c..a9fc2da1c 100644
--- a/template/yoga/default-layout.css
+++ b/template/public/yoga/default-layout.css
diff --git a/template/yoga/fix-ie5-ie6.css b/template/public/yoga/fix-ie5-ie6.css
index 8dad42298..8dad42298 100644
--- a/template/yoga/fix-ie5-ie6.css
+++ b/template/public/yoga/fix-ie5-ie6.css
diff --git a/template/yoga/fix-khtml.css b/template/public/yoga/fix-khtml.css
index 6853313e9..6853313e9 100644
--- a/template/yoga/fix-khtml.css
+++ b/template/public/yoga/fix-khtml.css
diff --git a/template/public/yoga/footer.tpl b/template/public/yoga/footer.tpl
new file mode 100644
index 000000000..44d905995
--- /dev/null
+++ b/template/public/yoga/footer.tpl
@@ -0,0 +1,24 @@
+<div id="copyright">
+ <!-- BEGIN debug -->
+ {lang:generation_time} {debug.TIME} ({debug.NB_QUERIES} {lang:sql_queries_in} {debug.SQL_TIME}) -
+ <!-- END debug -->
+
+ <!-- Please, do not remove this copyright. If you really want to,
+	  contact us on http://phpwebgallery.net to find a solution on how
+	  to show the origin of the script...-->
+
+  {lang:powered_by} <a href="http://www.phpwebgallery.net" class="back">PhpWebGallery</a>
+  {VERSION}
+  <!-- BEGIN contact -->
+  - {lang:send_mail}
+  <a href="mailto:{contact.MAIL}?subject={L_TITLE_MAIL}">{lang:Webmaster}</a>
+  <!-- END contact -->
+
+</div> <!-- copyright -->
+</div> <!-- the_page -->
+
+<!-- BEGIN debug -->
+  {debug.QUERIES_LIST}
+<!-- END debug -->
+</body>
+</html>
diff --git a/template/public/yoga/header.tpl b/template/public/yoga/header.tpl
new file mode 100644
index 000000000..beb80d2d2
--- /dev/null
+++ b/template/public/yoga/header.tpl
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="{LANG}" dir="{DIR}">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset={CONTENT_ENCODING}">
+<link rel="shortcut icon" type="image/x-icon" href="{pwg_root}template-common/favicon.ico">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/public/{themeconf:template}/layout.css">
+<!-- the next css is used to fix khtml (Konqueror/Safari) issue
+the "text/nonsense" prevents gecko based browsers to load it -->
+<link rel="stylesheet" type="text/nonsense" href="{pwg_root}template/public/{themeconf:template}/fix-khtml.css">
+<!--[if lt IE 7]>
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/public/{themeconf:template}/fix-ie5-ie6.css">
+<![endif]-->
+<link rel="stylesheet" type="text/css" media="print" href="{pwg_root}template/public/{themeconf:template}/print.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/public/{themeconf:template}/default-colors.css">
+<link rel="stylesheet" type="text/css" href="{pwg_root}template/public/{themeconf:template}/theme/{themeconf:theme}/theme.css">
+<!-- BEGIN next -->
+<link rel="prefetch" href="{next.U_IMG_SRC}">
+<!-- END next -->
+<!-- BEGIN refresh -->
+<meta http-equiv="refresh" content="{REFRESH_TIME};url={U_REFRESH}">
+<!-- END refresh -->
+<title>{GALLERY_TITLE}:{PAGE_TITLE}</title>
+<script type="text/javascript" src="{pwg_root}include/scripts.js"></script>
+<!--[if lt IE 7]>
+<script type="text/javascript" src="{pwg_root}include/pngfix.js"></script>
+<![endif]-->
+</head>
+
+<body id="{BODY_ID}">
+<div id="the_page">
+
+{PAGE_BANNER}
diff --git a/template/public/yoga/icon/add_tag.png b/template/public/yoga/icon/add_tag.png
new file mode 100644
index 000000000..9051a1d26
--- /dev/null
+++ b/template/public/yoga/icon/add_tag.png
diff --git a/template/public/yoga/icon/admin/errors.png b/template/public/yoga/icon/admin/errors.png
new file mode 100644
index 000000000..3c8a37df5
--- /dev/null
+++ b/template/public/yoga/icon/admin/errors.png
diff --git a/template/public/yoga/icon/admin/infos.png b/template/public/yoga/icon/admin/infos.png
new file mode 100644
index 000000000..dc8c8a457
--- /dev/null
+++ b/template/public/yoga/icon/admin/infos.png
diff --git a/template/public/yoga/icon/caddie_add.png b/template/public/yoga/icon/caddie_add.png
new file mode 100644
index 000000000..eb20f4e06
--- /dev/null
+++ b/template/public/yoga/icon/caddie_add.png
diff --git a/template/public/yoga/icon/calendar.png b/template/public/yoga/icon/calendar.png
new file mode 100644
index 000000000..e0a44a13d
--- /dev/null
+++ b/template/public/yoga/icon/calendar.png
diff --git a/template/public/yoga/icon/calendar_created.png b/template/public/yoga/icon/calendar_created.png
new file mode 100644
index 000000000..14a84c43c
--- /dev/null
+++ b/template/public/yoga/icon/calendar_created.png
diff --git a/template/public/yoga/icon/category_children.png b/template/public/yoga/icon/category_children.png
new file mode 100644
index 000000000..7205c3f61
--- /dev/null
+++ b/template/public/yoga/icon/category_children.png
diff --git a/template/public/yoga/icon/category_delete.png b/template/public/yoga/icon/category_delete.png
new file mode 100644
index 000000000..da796da11
--- /dev/null
+++ b/template/public/yoga/icon/category_delete.png
diff --git a/template/public/yoga/icon/category_edit.png b/template/public/yoga/icon/category_edit.png
new file mode 100644
index 000000000..0f3b619ed
--- /dev/null
+++ b/template/public/yoga/icon/category_edit.png
diff --git a/template/public/yoga/icon/category_elements.png b/template/public/yoga/icon/category_elements.png
new file mode 100644
index 000000000..1d367b38f
--- /dev/null
+++ b/template/public/yoga/icon/category_elements.png
diff --git a/template/public/yoga/icon/category_jump-to.png b/template/public/yoga/icon/category_jump-to.png
new file mode 100644
index 000000000..62db1f4ee
--- /dev/null
+++ b/template/public/yoga/icon/category_jump-to.png
diff --git a/template/public/yoga/icon/category_permissions.png b/template/public/yoga/icon/category_permissions.png
new file mode 100644
index 000000000..4780841ae
--- /dev/null
+++ b/template/public/yoga/icon/category_permissions.png
diff --git a/template/public/yoga/icon/category_representant_random.png b/template/public/yoga/icon/category_representant_random.png
new file mode 100644
index 000000000..dfa69846f
--- /dev/null
+++ b/template/public/yoga/icon/category_representant_random.png
diff --git a/template/public/yoga/icon/del_favorite.png b/template/public/yoga/icon/del_favorite.png
new file mode 100644
index 000000000..cfc609749
--- /dev/null
+++ b/template/public/yoga/icon/del_favorite.png
diff --git a/template/public/yoga/icon/delete.png b/template/public/yoga/icon/delete.png
new file mode 100644
index 000000000..af10be03e
--- /dev/null
+++ b/template/public/yoga/icon/delete.png
diff --git a/template/public/yoga/icon/exit.png b/template/public/yoga/icon/exit.png
new file mode 100644
index 000000000..2aafbb4cb
--- /dev/null
+++ b/template/public/yoga/icon/exit.png
diff --git a/template/public/yoga/icon/favorite.png b/template/public/yoga/icon/favorite.png
new file mode 100644
index 000000000..58befd9e3
--- /dev/null
+++ b/template/public/yoga/icon/favorite.png
diff --git a/template/public/yoga/icon/first.png b/template/public/yoga/icon/first.png
new file mode 100644
index 000000000..2b8db1cff
--- /dev/null
+++ b/template/public/yoga/icon/first.png
diff --git a/template/public/yoga/icon/help.png b/template/public/yoga/icon/help.png
new file mode 100644
index 000000000..c76f68292
--- /dev/null
+++ b/template/public/yoga/icon/help.png
diff --git a/template/public/yoga/icon/home.png b/template/public/yoga/icon/home.png
new file mode 100644
index 000000000..cce450d85
--- /dev/null
+++ b/template/public/yoga/icon/home.png
diff --git a/template/public/yoga/icon/last.png b/template/public/yoga/icon/last.png
new file mode 100644
index 000000000..12e1367a7
--- /dev/null
+++ b/template/public/yoga/icon/last.png
diff --git a/template/public/yoga/icon/left.png b/template/public/yoga/icon/left.png
new file mode 100644
index 000000000..63d306c9c
--- /dev/null
+++ b/template/public/yoga/icon/left.png
diff --git a/template/public/yoga/icon/lost_password.png b/template/public/yoga/icon/lost_password.png
new file mode 100644
index 000000000..ad6d71422
--- /dev/null
+++ b/template/public/yoga/icon/lost_password.png
diff --git a/template/public/yoga/icon/metadata.png b/template/public/yoga/icon/metadata.png
new file mode 100644
index 000000000..d5d8fa6dc
--- /dev/null
+++ b/template/public/yoga/icon/metadata.png
diff --git a/template/public/yoga/icon/mimetypes/avi.png b/template/public/yoga/icon/mimetypes/avi.png
new file mode 100644
index 000000000..065f0b282
--- /dev/null
+++ b/template/public/yoga/icon/mimetypes/avi.png
diff --git a/template/public/yoga/icon/mimetypes/mp3.png b/template/public/yoga/icon/mimetypes/mp3.png
new file mode 100644
index 000000000..afb7e1b0a
--- /dev/null
+++ b/template/public/yoga/icon/mimetypes/mp3.png
diff --git a/template/public/yoga/icon/mimetypes/mpg.png b/template/public/yoga/icon/mimetypes/mpg.png
new file mode 100644
index 000000000..f7dbd2388
--- /dev/null
+++ b/template/public/yoga/icon/mimetypes/mpg.png
diff --git a/template/public/yoga/icon/mimetypes/ogg.png b/template/public/yoga/icon/mimetypes/ogg.png
new file mode 100644
index 000000000..ead3f62c3
--- /dev/null
+++ b/template/public/yoga/icon/mimetypes/ogg.png
diff --git a/template/public/yoga/icon/mimetypes/zip.png b/template/public/yoga/icon/mimetypes/zip.png
new file mode 100644
index 000000000..1f08fe1a3
--- /dev/null
+++ b/template/public/yoga/icon/mimetypes/zip.png
diff --git a/template/public/yoga/icon/normal_mode.png b/template/public/yoga/icon/normal_mode.png
new file mode 100644
index 000000000..07318b568
--- /dev/null
+++ b/template/public/yoga/icon/normal_mode.png
diff --git a/template/public/yoga/icon/permissions.png b/template/public/yoga/icon/permissions.png
new file mode 100644
index 000000000..33091eb85
--- /dev/null
+++ b/template/public/yoga/icon/permissions.png
diff --git a/template/public/yoga/icon/preferences.png b/template/public/yoga/icon/preferences.png
new file mode 100644
index 000000000..0f3b619ed
--- /dev/null
+++ b/template/public/yoga/icon/preferences.png
diff --git a/template/public/yoga/icon/recent.png b/template/public/yoga/icon/recent.png
new file mode 100644
index 000000000..78c1428ca
--- /dev/null
+++ b/template/public/yoga/icon/recent.png
diff --git a/template/public/yoga/icon/register.png b/template/public/yoga/icon/register.png
new file mode 100644
index 000000000..d1dd3c834
--- /dev/null
+++ b/template/public/yoga/icon/register.png
diff --git a/template/public/yoga/icon/representative.png b/template/public/yoga/icon/representative.png
new file mode 100644
index 000000000..f1141d91b
--- /dev/null
+++ b/template/public/yoga/icon/representative.png
diff --git a/template/public/yoga/icon/right.png b/template/public/yoga/icon/right.png
new file mode 100644
index 000000000..f998098e4
--- /dev/null
+++ b/template/public/yoga/icon/right.png
diff --git a/template/public/yoga/icon/save.png b/template/public/yoga/icon/save.png
new file mode 100644
index 000000000..b4b9da08b
--- /dev/null
+++ b/template/public/yoga/icon/save.png
diff --git a/template/public/yoga/icon/search_rules.png b/template/public/yoga/icon/search_rules.png
new file mode 100644
index 000000000..300186647
--- /dev/null
+++ b/template/public/yoga/icon/search_rules.png
diff --git a/template/public/yoga/icon/slideshow.png b/template/public/yoga/icon/slideshow.png
new file mode 100644
index 000000000..455d73fdf
--- /dev/null
+++ b/template/public/yoga/icon/slideshow.png
diff --git a/template/public/yoga/icon/sync_metadata.png b/template/public/yoga/icon/sync_metadata.png
new file mode 100644
index 000000000..03570ead6
--- /dev/null
+++ b/template/public/yoga/icon/sync_metadata.png
diff --git a/template/public/yoga/icon/up.png b/template/public/yoga/icon/up.png
new file mode 100644
index 000000000..0c9cda5b1
--- /dev/null
+++ b/template/public/yoga/icon/up.png
diff --git a/template/yoga/identification.tpl b/template/public/yoga/identification.tpl
index dd07d0135..dd07d0135 100644
--- a/template/yoga/identification.tpl
+++ b/template/public/yoga/identification.tpl
diff --git a/template/public/yoga/image.css b/template/public/yoga/image.css
new file mode 100644
index 000000000..9ecbaea08
--- /dev/null
+++ b/template/public/yoga/image.css
@@ -0,0 +1,149 @@
+#imageHeaderBar {
+  padding-top: 2px;
+  padding-bottom: 2px;
+  margin-top: 4px;
+  overflow: hidden;
+  width: 100%;
+}
+
+#imageHeaderBar .browsePath {
+  float: left;
+  margin-left: 10px;
+}
+
+#imageHeaderBar .imageNumber {
+  float: right;
+  margin-right: 10px;
+}
+
+#imageHeaderBar H2 {
+  text-align: center;
+  padding: 0;
+  clear: both;
+}
+
+#imageToolBar {
+  text-align: center;
+  position: relative;
+  clear: both;
+  margin-bottom: 4px;
+  padding: 0;
+}
+
+#imageToolBar {
+    height: 28px;
+}
+#imageToolBar A, #imageToolBar IMG {
+    display: block;
+    border: none;
+    margin: 0; padding: 0;
+}
+#imageToolBar A { width: 48px; }
+#imageToolBar IMG { margin: 2px auto; }
+#imageToolBar .randomButtons A { float: left; }
+#imageToolBar .navButtons    A { float: right; }
+
+#theImage {
+    clear: left;
+}
+
+#theImage>IMG {
+    display: block;
+    margin: 0 auto;
+}
+
+#theImage IMG {
+  border-width: 3px;
+  border-style: solid;
+}
+
+.navThumb {
+    margin-top: 2px;
+}
+#thumbPrev {
+    float: left;
+}
+
+#thumbNext {
+    float: right;
+}
+
+#linkPrev {
+    margin-right: 10px;
+    margin-left: 5px;
+}
+
+#linkNext {
+    margin-right: 5px;
+    margin-left: 10px;
+}
+
+TABLE.infoTable .value {
+    text-align: left;
+}
+
+TABLE.infoTable .label {
+    font-weight: bold;
+    text-align: right;
+    padding-right: 0.5em;
+}
+
+TABLE.infoTable TD.value UL {
+  margin: 0;
+  padding: 0 0 0 1.5em;
+  list-style-type: square;
+}
+
+.rateButton, .rateButtonSelected {
+  background-color:transparent;
+  padding:0;
+  border:0;
+}
+
+.rateButton {
+  cursor: pointer;
+}
+
+.rateButtonSelected {
+  color:inherit;
+  font-weight:bold;
+  font-size:120%;
+}
+
+#comments {
+    text-align: left;
+}
+
+#comments .comment {
+    margin: 3ex 0;
+}
+
+#comments H2 {
+    margin: 1ex 0;
+}
+
+#comments P {
+    margin: 0;
+}
+
+#comments .author {
+    font-weight: bold;
+}
+
+#comments BLOCKQUOTE {
+    margin: 1ex 0 1ex 2em;
+    padding: 4px 4px 0 /* IE bug */ 4px;
+}
+
+#comments BLOCKQUOTE P {
+    margin: 0;
+    padding-bottom: 4px; /* IE bug follow-up */
+}
+#comments BLOCKQUOTE P+P {
+    margin-top: 1ex;
+}
+
+#comments P.userCommentDelete {
+    float: right;
+    margin: 0;
+}
diff --git a/template/yoga/index.tpl b/template/public/yoga/index.tpl
index becf011ce..becf011ce 100644
--- a/template/yoga/index.tpl
+++ b/template/public/yoga/index.tpl
diff --git a/template/public/yoga/install.tpl b/template/public/yoga/install.tpl
new file mode 100644
index 000000000..2332910e2
--- /dev/null
+++ b/template/public/yoga/install.tpl
@@ -0,0 +1,204 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+"http://www.w3.org/TR/html4/strict.dtd">
+<html lang="fr">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset={T_CONTENT_ENCODING}">
+<meta http-equiv="Content-script-type" content="text/javascript">
+<meta http-equiv="Content-Style-Type" content="text/css">
+<title>PhpWebGallery {RELEASE}</title>
+<style type="text/css">
+a, a:hover {
+color:#006699;
+}
+
+body,table,input,form,select {
+font-family:arial,verdana,sans-serif;
+font-size:12px;
+color:#000000;
+text-align:left;
+}
+table 
+{
+border-collapse:separate;
+}
+body {
+background-color:#E5E5E5;
+margin:5px;
+}
+
+.contenucellule {
+background-color:#EEEEEE;
+border:2px solid #006699;
+}
+
+th {
+font-weight:bold;
+background-color:#D3DCE3;
+margin-bottom:10px;
+text-align: center;
+}
+td.row1 {
+background-color:#E6E4E4;
+}
+td.row2
+{
+background-color:#E8E8E8;
+}
+
+.info {
+color:darkblue;
+text-align:center;
+}
+.errors {
+  text-align:left;
+  margin:25px;
+  background-color:#ffe1e1;
+  border:1px solid red;
+  color:black;
+}
+.grostitre {
+  text-align : center;
+  font-size : 20px;
+   margin-bottom : 20px;
+}
+</style>
+</head>
+<body>
+    <table style="width:100%;height:100%">
+      <tr align="center" valign="middle">
+        <td>
+	  <div class="grostitre">PhpWebGallery {RELEASE}</div>
+          <table class="table1">
+		  <!-- BEGIN errors -->
+		  <tr>
+			<td class="contenucellule" colspan="3">
+			  <div class="errors">
+				<ul>
+				  <!-- BEGIN error -->
+				  <li>{errors.error.ERROR}</li>
+				  <!-- END error -->
+				</ul>
+			  </div>
+			</td>
+		  </tr>
+		  <!-- END errors -->
+		  <!-- BEGIN infos -->
+		  <tr>
+			<td class="contenucellule" colspan="3">
+			  <div class="infos">
+				<ul>
+				  <!-- BEGIN info -->
+				  <li>{infos.info.INFO}</li>
+				  <!-- END info -->
+				</ul>
+			  </div>
+			</td>
+		  </tr>
+		  <!-- END infos -->
+			 <tr>
+              <td class="contenucellule">
+
+<!-- BEGIN error_copy -->
+{L_ERR_COPY} :
+<br />-----------------------------------------------------<br />
+<div style="color:blue;">{error_copy.FILE_CONTENT}</div>
+-----------------------------------------------------<br />
+<!-- END error_copy -->
+<!-- BEGIN install -->
+<form method="POST" action="{F_ACTION}" name="install_form">
+  <table width="100%">
+  	<tr>
+      <th colspan="3">{L_BASE_TITLE}</th>
+    </tr>
+    <tr>
+      <td style="width:30%;">{L_LANG_TITLE}</td>
+      <td colspan="2" align="left">
+	  {F_LANG_SELECT}
+      </td>
+    </tr>
+    <tr>
+      <th colspan="3">{L_DB_TITLE}</th>
+    </tr>
+    <tr>
+      <td colspan="3">&nbsp;</td>
+    </tr>
+    <tr>
+      <td>{L_DB_HOST}</td>
+      <td align=center><input type="text" name="dbhost" value="{F_DB_HOST}" /></td>
+      <td class="row2">{L_DB_HOST_INFO}</td>
+    </tr>
+    <tr>
+      <td>{L_DB_USER}</td>
+      <td align=center><input type="text" name="dbuser" value="{F_DB_USER}" /></td>
+      <td class="row2">{L_DB_USER_INFO}</td>
+    </tr>
+    <tr>
+      <td>{L_DB_PASS}</td>
+      <td align=center><input type="password" name="dbpasswd" value="" /></td>
+      <td class="row2">{L_DB_PASS_INFO}</td>
+    </tr>
+    <tr>
+      <td>{L_DB_NAME}</td>
+      <td align=center><input type="text" name="dbname" value="{F_DB_NAME}" /></td>
+      <td class="row2">{L_DB_NAME_INFO}</td>
+    </tr>
+    <tr>
+      <td>{L_DB_PREFIX}</td>
+      <td align=center><input type="text" name="prefix" value="{F_DB_PREFIX}" /></td>
+      <td class="row2">{L_DB_PREFIX_INFO}</td>
+    </tr>
+    <tr>
+     <td colspan="3">&nbsp;</td>
+    </tr>
+    <tr>
+      <th colspan="3">{L_ADMIN_TITLE}</th>
+    </tr>
+    <tr>
+      <td colspan="3">&nbsp;</td>
+    </tr>
+    <tr>
+      <td>{L_ADMIN}</td>
+      <td align="center"><input type="text" name="admin_name" value="{F_ADMIN}" /></td>
+      <td class="row2">{L_ADMIN_INFO}</td>
+    </tr>
+    <tr>
+      <td>{L_ADMIN_PASSWORD}</td>
+      <td align="center"><input type="password" name="admin_pass1" value="" /></td>
+      <td class="row2">{L_ADMIN_PASSWORD_INFO}</td>
+    </tr>
+    <tr>
+      <td>{L_ADMIN_CONFIRM_PASSWORD}</td>
+      <td align="center"><input type="password" name="admin_pass2" value="" /></td>
+      <td class="row2">{L_ADMIN_CONFIRM_PASSWORD_INFO}</td>
+    </tr>
+    <tr>
+      <td>{L_ADMIN_EMAIL}</td>
+      <td align="center"><input type="text" name="admin_mail" value="{F_ADMIN_EMAIL}" /></td>
+      <td class="row2">{L_ADMIN_EMAIL_INFO}</td>
+    </tr>
+    <tr>
+      <td colspan="3">&nbsp;</td>
+    </tr>
+    <tr>
+      <td colspan="3" align="center">
+        <input type="submit" name="install" value="{L_SUBMIT}" />
+      </td>
+    </tr>
+  </table>
+</form>
+<!-- END install -->
+
+<!-- BEGIN install_end -->
+<div class="infos_title">{L_END_TITLE}</div>
+<div style="padding:5px;">{L_END_MESSAGE}</div>
+<!-- END install_end -->
+
+              </td>
+            </tr>
+          </table>
+          <div style="text-align:center;margin:20px;">{L_INSTALL_HELP}</div>
+        </td>
+      </tr>
+    </table>
+  </body>
+</html>
diff --git a/template/public/yoga/layout.css b/template/public/yoga/layout.css
new file mode 100644
index 000000000..1f6c6f4e3
--- /dev/null
+++ b/template/public/yoga/layout.css
@@ -0,0 +1,13 @@
+/* $Id: layout.css 1131 2006-04-06 02:23:54Z rvelices $ */
+
+/* template css */
+@import "menubar.css";
+@import "content.css";
+@import "image.css";
+@import "popuphelp.css";
+@import "default-layout.css";
+/* Override properties with import local file */
+@import "local-layout.css";
+/* common css */
+@import "../../../template-common/layout.css";
+
diff --git a/template/yoga/mainpage_categories.tpl b/template/public/yoga/mainpage_categories.tpl
index 8c00b433e..8c00b433e 100644
--- a/template/yoga/mainpage_categories.tpl
+++ b/template/public/yoga/mainpage_categories.tpl
diff --git a/template/public/yoga/menubar.css b/template/public/yoga/menubar.css
new file mode 100644
index 000000000..f8fbdf914
--- /dev/null
+++ b/template/public/yoga/menubar.css
@@ -0,0 +1,108 @@
+#menubar {
+    float: left;
+    margin: 0 0 10px 1em;
+    padding: 0;
+    /* Fix against the "double margin of a floated item" IE bug */
+    /* Damned: that screws up top_navbar in opera 7.54/Linux! */
+    display: inline;
+    text-align: left; /* follow-up of the "be nice to IE5" rule */
+}
+
+#menubar DL, #menubar DT, #menubar DD {
+    margin: 0; padding: 0; display: block;
+}
+
+/* H2 properties copied here */
+#menubar DT {
+    font-weight: bold; /* default for h2 */
+    margin: 0;
+    padding: 5px 5px 5px 5px;
+    font-size: 120%;
+    text-align: center;
+}
+
+#menubar UL,
+#menubar HR,
+#menubar FORM,
+#menubar P, /* ooh, careful... */
+#menubar .totalImages {
+    font-size: 92%;
+    margin: 10px 0 10px 10px;
+}
+#menubar UL {
+    list-style-type: square;
+    list-style-position: inside;
+    padding: 0 0 0 2px;
+}
+#menubar UL UL {
+    font-size: 100%;
+    margin-top: 0;
+}
+
+#menubar LI.selected A {
+  font-weight: bold;
+}
+
+#menubar LI.selected LI A {
+  font-weight: normal;
+}
+
+#menubar HR {
+    display: block;
+    margin: 10px auto;
+    width: 90%;
+}
+#menubar FORM P {
+    margin: 5px;
+    font-size: 100%;
+}
+#menubar INPUT {
+    text-indent: 2px;
+}
+
+/* quickconnect form */
+FORM#quickconnect { 
+  margin: 0;
+  padding: 5px;
+}
+
+FORM#quickconnect FIELDSET {
+  margin: 0;
+  padding: 0 0 0.5em 0;
+  overflow: hidden;	/* Correct float issue with Opera 7.5 */
+  width: 100%;		/*        //			      */
+}
+
+FORM#quickconnect P {
+  float: left;
+  clear: left;
+}
+
+FORM#quickconnect P INPUT {
+  margin: 0;
+}
+
+FORM#quickconnect UL.actions {
+  display: inline;
+  float: right;
+  padding: 0;
+  text-align: right;	/* Opera 7.5 */
+  width: 40%;		/* Opera 7.5 cannot find why width:auto fails :-( */
+}
+
+FORM#quickconnect UL.actions,
+FORM#quickconnect P, 
+FORM#quickconnect LABEL {
+  margin: 0 0.5em 0 0.5em;
+}
+
+#menubar #menuTagCloud {
+  text-align: center;
+  margin: 5px 0;
+}
+
+#menubar #menuTagCloud LI
+{
+  display: inline;
+  white-space: nowrap;
+}
diff --git a/template/yoga/month_calendar.tpl b/template/public/yoga/month_calendar.tpl
index 7e531e7c7..7e531e7c7 100644
--- a/template/yoga/month_calendar.tpl
+++ b/template/public/yoga/month_calendar.tpl
diff --git a/template/public/yoga/nbm.tpl b/template/public/yoga/nbm.tpl
new file mode 100644
index 000000000..a22744e5b
--- /dev/null
+++ b/template/public/yoga/nbm.tpl
@@ -0,0 +1,31 @@
+<!-- $Id: admin.tpl 1091 2006-03-21 22:58:59Z rub $ -->
+
+<div id="content">
+  <div class="titrePage">
+    <ul class="categoryActions">
+      <li><a href="{U_HOME}" title="{lang:Go through the gallery as a visitor}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+    </ul>
+    <h2>{lang:nbm_item_notification}</h2>
+  </div>
+
+  <!-- BEGIN errors -->
+  <div class="errors">
+    <ul>
+      <!-- BEGIN error -->
+      <li>{errors.error.ERROR}</li>
+      <!-- END error -->
+    </ul>
+  </div>
+  <!-- END errors -->
+
+  <!-- BEGIN infos -->
+  <div class="infos">
+    <ul>
+      <!-- BEGIN info -->
+      <li>{infos.info.INFO}</li>
+      <!-- END info -->
+    </ul>
+  </div>
+  <!-- END infos -->
+
+</div>
diff --git a/template/public/yoga/notification.tpl b/template/public/yoga/notification.tpl
new file mode 100644
index 000000000..d4b178b42
--- /dev/null
+++ b/template/public/yoga/notification.tpl
@@ -0,0 +1,13 @@
+<div id="content">
+
+  <div class="titrePage">
+    <ul class="categoryActions">
+      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+    </ul>
+    <h2>{lang:Notification}</h2>
+  </div>
+
+  <p>{lang:The RSS notification feed provides notification on news from this website : new pictures, updated categories, new comments. Use a RSS feed reader.}</p>
+
+  <p><a href="{FEED_URL}">{lang:RSS feed}</a></p>
+</div>
diff --git a/template/yoga/password.tpl b/template/public/yoga/password.tpl
index f581507e2..f581507e2 100644
--- a/template/yoga/password.tpl
+++ b/template/public/yoga/password.tpl
diff --git a/template/public/yoga/picture.tpl b/template/public/yoga/picture.tpl
new file mode 100644
index 000000000..cdeeaf4a8
--- /dev/null
+++ b/template/public/yoga/picture.tpl
@@ -0,0 +1,211 @@
+<!-- BEGIN information -->
+<div class="pleaseNote">{information.INFORMATION}</div>
+<!-- END information -->
+
+<div id="imageHeaderBar">
+  <div class="browsePath">
+    <a href="{U_HOME}" rel="home">{L_HOME}</a>
+    {LEVEL_SEPARATOR}{SECTION_TITLE}
+    {LEVEL_SEPARATOR}{PICTURE_TITLE}
+  </div>
+  <div class="imageNumber">{PHOTO}</div>
+  <!-- BEGIN title -->
+  <h2>{TITLE}</h2>
+  <!-- END title -->
+</div>
+
+<div id="imageToolBar">
+
+<div class="randomButtons">
+  <a href="{U_SLIDESHOW}" title="{L_SLIDESHOW}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/slideshow.png" class="button" alt="{L_SLIDESHOW}"></a>
+  <a href="{U_METADATA}" title="{L_PICTURE_METADATA}"><img src="{pwg_root}{themeconf:icon_dir}/metadata.png" class="button" alt="{L_PICTURE_METADATA}"></a>
+<!-- BEGIN representative -->
+  <a href="{representative.URL}" title="{lang:set as category representative}"><img src="{pwg_root}{themeconf:icon_dir}/representative.png" class="button" alt="{lang:representative}"/></a>
+<!-- END representative -->
+<!-- BEGIN favorite -->
+  <a href="{favorite.U_FAVORITE}" title="{favorite.FAVORITE_HINT}"><img src="{favorite.FAVORITE_IMG}" class="button" alt="{favorite.FAVORITE_ALT}"></a>
+<!-- END favorite -->
+<!-- BEGIN download -->
+  <a href="{download.U_DOWNLOAD}" title="{L_DOWNLOAD}"><img src="{pwg_root}{themeconf:icon_dir}/save.png" class="button" alt="{L_DOWNLOAD}"></a>
+<!-- END download -->
+<!-- BEGIN admin -->
+  <a href="{U_ADMIN}" title="{L_ADMIN}"><img src="{pwg_root}{themeconf:icon_dir}/preferences.png" class="button" alt="{L_ADMIN}"></a>
+<!-- END admin -->
+<!-- BEGIN caddie -->
+  <a href="{caddie.URL}" title="{lang:add to caddie}"><img src="{pwg_root}{themeconf:icon_dir}/caddie_add.png" class="button" alt="{lang:caddie}"/></a>
+<!-- END caddie -->
+</div>
+
+<div class="navButtons">
+<!-- BEGIN last -->
+  <a class="navButton prev" href="{last.U_IMG}" title="{lang:last_page} : {last.TITLE_IMG}" rel="last"><img src="{pwg_root}{themeconf:icon_dir}/last.png" class="button" alt="{lang:last_page}"></a>
+<!-- END last -->
+<!-- BEGIN next -->
+  <a class="navButton next" href="{next.U_IMG}" title="{L_NEXT_IMG}{next.TITLE_IMG}" rel="next"><img src="{pwg_root}{themeconf:icon_dir}/right.png" class="button" alt="{lang:next_page}"></a>
+<!-- END next -->
+  <a class="navButton up" href="{U_UP}" title="{lang:thumbnails}" rel="up"><img src="{pwg_root}{themeconf:icon_dir}/up.png" class="button" alt="{L_UP_ALT}"></a>
+<!-- BEGIN previous -->
+  <a class="navButton prev" href="{previous.U_IMG}" title="{L_PREV_IMG}{previous.TITLE_IMG}" rel="prev"><img src="{pwg_root}{themeconf:icon_dir}/left.png" class="button" alt="{lang:previous_page}"></a>
+<!-- END previous -->
+<!-- BEGIN first -->
+  <a class="navButton prev" href="{first.U_IMG}" title="{lang:first_page} : {first.TITLE_IMG}" rel="first"><img src="{pwg_root}{themeconf:icon_dir}/first.png" class="button" alt="{lang:first_page}"></a>
+<!-- END first -->
+</div>
+
+</div> <!-- imageToolBar -->
+
+<div id="theImage">
+<!-- BEGIN high -->
+<a href="javascript:phpWGOpenWindow('{high.U_HIGH}','{high.UUID}','scrollbars=yes,toolbar=no,status=no,resizable=yes')">
+<!-- END high -->
+  <img src="{SRC_IMG}" style="width:{WIDTH_IMG}px;height:{HEIGHT_IMG}px;" alt="{ALT_IMG}">
+<!-- BEGIN high -->
+</a>
+  <p>{L_PICTURE_HIGH}</p>
+<!-- END high -->
+<!-- BEGIN legend -->
+<p>{legend.COMMENT_IMG}</p>
+<!-- END legend -->
+<!-- BEGIN stop_slideshow -->
+<p>
+  [ <a href="{stop_slideshow.U_SLIDESHOW}">{L_STOP_SLIDESHOW}</a> ]
+</p>
+<!-- END stop_slideshow -->
+</div>
+
+<!-- BEGIN previous -->
+<a class="navThumb" id="thumbPrev" href="{previous.U_IMG}" title="{L_PREV_IMG}{previous.TITLE_IMG}" rel="prev">
+  <img src="{previous.IMG}" class="thumbLink" id="linkPrev" alt="{previous.TITLE_IMG}">
+</a>
+<!-- END previous -->
+<!-- BEGIN next -->
+<a class="navThumb" id="thumbNext" href="{next.U_IMG}" title="{L_NEXT_IMG}{next.TITLE_IMG}" rel="next">
+  <img src="{next.IMG}" class="thumbLink" id="linkNext" alt="{next.TITLE_IMG}">
+</a>
+<!-- END next -->
+
+<table class="infoTable" summary="Some info about this picture">
+  <tr>
+    <td class="label">{lang:Author}</td>
+    <td class="value">{INFO_AUTHOR}</td>
+  </tr>
+  <tr>
+    <td class="label">{lang:Created on}</td>
+    <td class="value">{INFO_CREATION_DATE}</td>
+  </tr>
+  <tr>
+    <td class="label">{lang:Posted on}</td>
+    <td class="value">{INFO_POSTED_DATE}</td>
+  </tr>
+  <tr>
+    <td class="label">{lang:Dimensions}</td>
+    <td class="value">{INFO_DIMENSIONS}</td>
+  </tr>
+  <tr>
+    <td class="label">{lang:File}</td>
+    <td class="value">{INFO_FILE}</td>
+  </tr>
+  <tr>
+    <td class="label">{lang:Filesize}</td>
+    <td class="value">{INFO_FILESIZE}</td>
+  </tr>
+  <tr>
+    <td class="label">{lang:Tags}</td>
+    <td class="value">{INFO_TAGS}</td>
+  </tr>
+  <tr>
+    <td class="label">{lang:Categories}</td>
+    <td class="value">
+      <ul>
+        <!-- BEGIN category -->
+        <li>{category.LINE}</li>
+        <!-- END category -->
+      </ul>
+    </td>
+  </tr>
+  <tr>
+    <td class="label">{lang:Visits}</td>
+    <td class="value">{INFO_VISITS}</td>
+  </tr>
+  <!-- BEGIN info_rate -->
+  <tr>
+    <td class="label">{lang:Average rate}</td>
+    <td class="value">{info_rate.CONTENT}</td>
+  </tr>
+  <!-- END info_rate -->
+</table>
+
+<!-- BEGIN metadata -->
+<table class="infoTable" summary="Some more (technical) info about this picture">
+  <!-- BEGIN headline -->
+  <tr>
+    <th colspan="2">{metadata.headline.TITLE}</th>
+  </tr>
+  <!-- END headline -->
+  <!-- BEGIN line -->
+  <tr>
+    <td class="label">{metadata.line.KEY}</td>
+    <td class="value">{metadata.line.VALUE}</td>
+  </tr>
+  <!-- END line -->
+</table>
+<!-- END metadata -->
+
+<!-- BEGIN rate -->
+<form action="{rate.F_ACTION}" method="post">
+<div>{rate.SENTENCE} :
+<!-- BEGIN rate_option -->
+{rate.rate_option.SEPARATOR}
+<!-- BEGIN my_rate -->
+<input type="button" name="rate" value="{rate.rate_option.OPTION}" class="rateButtonSelected" />
+<!-- END my_rate -->
+<!-- BEGIN not_my_rate -->
+<input type="submit" name="rate" value="{rate.rate_option.OPTION}" class="rateButton" />
+<!-- END not_my_rate -->
+<!-- END rate_option -->
+</div>
+</form>
+<!-- END rate -->
+
+<hr class="separation">
+
+<!-- BEGIN comments -->
+<div id="comments">
+  <h2>[{comments.NB_COMMENT}] {L_COMMENT_TITLE}</h2>
+
+  <div class="navigationBar">{comments.NAV_BAR}</div>
+
+  <!-- BEGIN comment -->
+  <div class="comment">
+    <!-- BEGIN delete -->
+    <p class="userCommentDelete">
+    <a href="{comments.comment.delete.U_COMMENT_DELETE}" title="{L_DELETE_COMMENT}">
+      <img src="{pwg_root}{themeconf:icon_dir}/delete.png" class="button" style="border:none;vertical-align:middle; margin-left:5px;" alt="[{L_DELETE}]"/>
+    </a>
+    </p>
+    <!-- END delete -->
+    <p class="commentInfo"><span class="author">{comments.comment.COMMENT_AUTHOR}</span> - {comments.comment.COMMENT_DATE}</p>
+    <blockquote>{comments.comment.COMMENT}</blockquote>
+  </div>
+  <!-- END comment -->
+
+  <!-- BEGIN add_comment -->
+  <form  method="post" action="{U_ADD_COMMENT}" class="filter" id="addComment">
+    <fieldset>
+      <legend>{L_ADD_COMMENT}</legend>
+      <!-- BEGIN author_field -->
+      <label>{L_AUTHOR}<input type="text" name="author"></label>
+      <!-- END author_field -->
+      <!-- BEGIN author_known -->
+      <input type="hidden" name="author"  value="{comments.add_comment.author_known.KNOWN_AUTHOR}">
+      <!-- END author_known -->
+      <label>{L_COMMENT}<textarea name="content" rows="10" cols="80"></textarea></label>
+      <input type="submit" value="{L_SUBMIT}" {TAG_INPUT_ENABLED}>
+    </fieldset>
+  </form>
+  <!-- END add_comment -->
+
+</div>
+<!-- END comments -->
+
+
diff --git a/template/public/yoga/popuphelp.css b/template/public/yoga/popuphelp.css
new file mode 100644
index 000000000..b61b7952d
--- /dev/null
+++ b/template/public/yoga/popuphelp.css
@@ -0,0 +1,22 @@
+BODY#thePopuphelpPage #copyright {
+  display: none;
+}
+
+BODY#thePopuphelpPage #theHeader P {
+  display: none;
+}
+
+BODY#thePopuphelpPage #content P {
+  text-align: justify;
+  padding: 0.5em;
+}
+
+BODY#thePopuphelpPage #content OL LI,
+BODY#thePopuphelpPage #content UL LI
+{
+  margin-bottom: 0.5em;
+}
+
+BODY#thePopuphelpPage P#pageBottomActions A {
+  border: none;
+}
diff --git a/template/public/yoga/popuphelp.tpl b/template/public/yoga/popuphelp.tpl
new file mode 100644
index 000000000..3b3e27328
--- /dev/null
+++ b/template/public/yoga/popuphelp.tpl
@@ -0,0 +1,5 @@
+<div id="content">
+{HELP_CONTENT}
+</div> <!-- content -->
+
+<p id="pageBottomActions"><a href="#" onclick="window.close();" title="{lang:Close this window}"><img src="{themeconf:icon_dir}/exit.png" class="button" alt="close"></a></p>
diff --git a/template/public/yoga/print.css b/template/public/yoga/print.css
new file mode 100644
index 000000000..bb564378d
--- /dev/null
+++ b/template/public/yoga/print.css
@@ -0,0 +1,14 @@
+#menubar, #content .navigationBar, UL.categoryActions, #content DIV.calendarViews, .calendarBar,
+#imageToolBar, .navThumb, #addComment {
+    display: none;
+}
+
+BODY {
+    margin: 0;
+    color: #000000;
+    background: #ffffff;
+}
+
+#content {
+    margin: 0;
+}
diff --git a/template/public/yoga/profile.tpl b/template/public/yoga/profile.tpl
new file mode 100644
index 000000000..b3837f454
--- /dev/null
+++ b/template/public/yoga/profile.tpl
@@ -0,0 +1,148 @@
+<div id="content">
+
+<!-- BEGIN errors -->
+<div class="errors">
+  <ul>
+    <!-- BEGIN error -->
+    <li>{errors.error.ERROR}</li>
+    <!-- END error -->
+  </ul>
+</div>
+<!-- END errors -->
+
+  <div class="titrePage">
+    <ul class="categoryActions">
+      <li><a href="{U_RETURN}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+    </ul>
+    <h2>{lang:Profile}</h2>
+  </div>
+
+<form method="post" name="profile" action="{F_ACTION}" id="profile" class="properties">
+
+  <fieldset>
+    <legend>{L_REGISTRATION_INFO}</legend>
+    <input type="hidden" name="userid" value="{USERID}" />
+    <ul>
+      <li>
+        <span class="property">{lang:Username}</span>
+        {USERNAME}
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="mail_address">{lang:Email address}</label>
+        </span>
+        <input type="text" name="mail_address" id="mail_address" value="{EMAIL}" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="password">{L_CURRENT_PASSWORD}</label>
+        </span>
+        <input type="password" name="password" id="password" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="use_new_pwd">{L_NEW_PASSWORD}</label>
+        </span>
+        <input type="password" name="use_new_pwd" id="use_new_pwd" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="passwordConf">{L_CONFIRM_PASSWORD}</label>
+        </span>
+        <input type="password" name="passwordConf" id="passwordConf" value="" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+      </li>
+    </ul>
+  </fieldset>
+
+  <fieldset>
+    <legend>{L_PREFERENCES}</legend>
+
+    <ul>
+      <li>
+        <span class="property">
+          <label for="nb_image_line">{L_NB_IMAGE_LINE}</label>
+        </span>
+        <input type="text" size="3" maxlength="2" name="nb_image_line" id="nb_image_line" value="{NB_IMAGE_LINE}"
+               onfocus="this.className='focus';" onblur="this.className='nofocus';">
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="nb_line_page">{L_NB_ROW_PAGE}</label>
+        </span>
+        <input type="text" size="3" maxlength="2" name="nb_line_page" id="nb_line_page" value="{NB_ROW_PAGE}"
+               onfocus="this.className='focus';" onblur="this.className='nofocus';">
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="template">{L_STYLE_SELECT}</label>
+        </span>
+        <select name="template" id="template" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+          <!-- BEGIN template_option -->
+          <option value="{template_option.VALUE}" {template_option.SELECTED}>{template_option.CONTENT}</option>
+          <!-- END template_option -->
+        </select>
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="language">{L_LANG_SELECT}</label>
+        </span>
+        <select name="language" id="language" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+          <!-- BEGIN language_option -->
+          <option value="{language_option.VALUE}" {language_option.SELECTED}>{language_option.CONTENT}</option>
+          <!-- END language_option -->
+        </select>
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="recent_period">{L_RECENT_PERIOD}</label>
+        </span>
+        <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{RECENT_PERIOD}"
+               onfocus="this.className='focus';" onblur="this.className='nofocus';">
+      </li>
+
+      <li>
+        <span class="property">{L_EXPAND_TREE}</span>
+        <label><input type="radio" class="radio" name="expand" value="true" {EXPAND_TREE_YES}> {L_YES}</label>
+        <label><input type="radio" class="radio" name="expand" value="false" {EXPAND_TREE_NO}> {L_NO}</label>
+      </li>
+
+      <li>
+        <span class="property">{L_NB_COMMENTS}</span>
+        <label><input type="radio" class="radio" name="show_nb_comments" value="true" {NB_COMMENTS_YES}> {L_YES}</label>
+        <label><input type="radio" class="radio" name="show_nb_comments" value="false" {NB_COMMENTS_NO}> {L_NO}</label>
+      </li>
+ 
+      <li>
+        <span class="property">
+          <label for="maxwidth">{L_MAXWIDTH}</label>
+        </span>
+        <input type="text" size="4" maxlength="4" name="maxwidth" id="maxwidth" value="{MAXWIDTH}"
+               onfocus="this.className='focus';" onblur="this.className='nofocus';">
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="maxheight">{L_MAXHEIGHT}</label>
+        </span>
+        <input type="text" size="4" maxlength="4" name="maxheight" id="maxheight" value="{MAXHEIGHT}"
+               onfocus="this.className='focus';" onblur="this.className='nofocus';">
+      </li>
+    </ul>
+  </fieldset>
+
+  <p class="bottomButtons">
+    <input type="submit" name="validate" value="{L_SUBMIT}">
+    <input type="reset" name="reset" value="{L_RESET}">
+  </p>
+
+</form>
+
+</div> <!-- content -->
diff --git a/template/public/yoga/redirect.tpl b/template/public/yoga/redirect.tpl
new file mode 100644
index 000000000..446f187a3
--- /dev/null
+++ b/template/public/yoga/redirect.tpl
@@ -0,0 +1,2 @@
+<p>{U_REDIRECT_MSG}</p>
+<p><a href="{U_REFRESH}">{lang:click_to_redirect}</a></p>
diff --git a/template/public/yoga/register.tpl b/template/public/yoga/register.tpl
new file mode 100644
index 000000000..be3fb4a79
--- /dev/null
+++ b/template/public/yoga/register.tpl
@@ -0,0 +1,71 @@
+<div id="registerPage">
+
+<div id="content">
+
+  <div class="titrePage">
+    <ul class="categoryActions">
+      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+    </ul>
+    <h2>{lang:Registration}</h2>
+  </div>
+
+  <!-- BEGIN errors -->
+  <div class="errors">
+    <ul>
+      <!-- BEGIN error -->
+      <li>{errors.error.ERROR}</li>
+      <!-- END error -->
+    </ul>
+  </div>
+  <!-- END errors -->
+
+<form method="post" action="{F_ACTION}" class="properties" name="register_form">
+  <fieldset>
+    <legend>{lang:Enter your personnal informations}</legend>
+
+    <ul>
+      <li>
+        <span class="property">
+          <label for="login">* {lang:Username}</label>
+        </span>
+        <input type="text" name="login" id="login" value="{F_LOGIN}" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="password">* {lang:Password}</label>
+        </span>
+        <input type="password" name="password" id="password" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="password_conf">* {lang:Confirm Password}</label>
+        </span>
+        <input type="password" name="password_conf" id="password_conf" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="mail_address">{lang:Mail address}</label>
+        </span>
+        <input type="text" name="mail_address" id="mail_address" value="{F_EMAIL}" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+        ({lang:useful when password forgotten})
+      </li>
+    </ul>
+
+  </fieldset>
+
+  <p class="bottomButtons">
+    <input type="submit" name="submit" value="{lang:Register}">
+    <input type="reset" value="{lang:Reset}">
+  </p>
+
+</form>
+
+<script type="text/javascript"><!--
+document.register_form.login.focus();
+//--></script>
+
+</div> <!-- content -->
+</div> <!-- registerPage -->
diff --git a/template/yoga/search.tpl b/template/public/yoga/search.tpl
index 1e3c9be2d..1e3c9be2d 100644
--- a/template/yoga/search.tpl
+++ b/template/public/yoga/search.tpl
diff --git a/template/public/yoga/search_rules.tpl b/template/public/yoga/search_rules.tpl
new file mode 100644
index 000000000..921df4a12
--- /dev/null
+++ b/template/public/yoga/search_rules.tpl
@@ -0,0 +1,56 @@
+<div id="content">
+<h2>{lang:Search rules}</h2>
+
+<p>{INTRODUCTION}</p>
+
+<ul>
+
+  <!-- BEGIN words -->
+  <li>{words.CONTENT}</li>
+  <!-- END words -->
+
+  <!-- BEGIN tags -->
+  <li>
+    <p>{tags.LIST_INTRO}</p>
+
+    <ul>
+      <!-- BEGIN tag -->
+      <li>{tags.tag.NAME}</li>
+      <!-- END tag -->
+    </ul>
+  </li>
+  <!-- END tags -->
+  
+  <!-- BEGIN author -->
+  <li>{author.CONTENT}</li>
+  <!-- END author -->
+
+  <!-- BEGIN date_creation -->
+  <li>{date_creation.CONTENT}</li>
+  <!-- END date_creation -->
+
+  <!-- BEGIN date_available -->
+  <li>{date_available.CONTENT}</li>
+  <!-- END date_available -->
+
+  <!-- BEGIN categories -->
+  <li>
+    <p>{categories.LIST_INTRO}</p>
+
+    <ul>
+      <!-- BEGIN category -->
+      <li>{categories.category.NAME}</li>
+      <!-- END category -->
+    </ul>
+  </li>
+  <!-- END categories -->
+  
+</ul>
+
+</div> <!-- content -->
+
+<p id="pageBottomActions">
+  <a href="#" onclick="window.close();" title="{lang:Close this window}">
+    <img src="{themeconf:icon_dir}/exit.png" class="button" alt="close">
+  </a>
+</p>
diff --git a/template/public/yoga/tags.tpl b/template/public/yoga/tags.tpl
new file mode 100644
index 000000000..33f69ca69
--- /dev/null
+++ b/template/public/yoga/tags.tpl
@@ -0,0 +1,17 @@
+<!-- $Id: comments.tpl 960 2005-12-03 17:33:38Z chrisaga $ -->
+<div id="content">
+
+  <div class="titrePage">
+    <ul class="categoryActions">
+      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+    </ul>
+    <h2>{lang:Tags}</h2>
+  </div>
+
+  <ul id="fullTagCloud">
+    <!-- BEGIN tag -->
+    <li><a href="{tag.URL}" class="{tag.CLASS}" title="{tag.TITLE}">{tag.NAME}</a></li>
+    <!-- END tag -->
+  </ul>
+
+</div> <!-- content -->
diff --git a/template/yoga/theme/clear/theme.css b/template/public/yoga/theme/clear/theme.css
index 56da48326..56da48326 100644
--- a/template/yoga/theme/clear/theme.css
+++ b/template/public/yoga/theme/clear/theme.css
diff --git a/template/public/yoga/theme/clear/themeconf.inc.php b/template/public/yoga/theme/clear/themeconf.inc.php
new file mode 100644
index 000000000..ef23e2d0e
--- /dev/null
+++ b/template/public/yoga/theme/clear/themeconf.inc.php
@@ -0,0 +1,9 @@
+<?php
+$themeconf = array(
+  'template' => 'yoga',
+  'theme' => 'clear',
+  'icon_dir' => 'template/public/yoga/icon',
+  'admin_icon_dir' => 'template/public/yoga/icon/admin',
+  'mime_icon_dir' => 'template/public/yoga/icon/mimetypes/'
+);
+?>
diff --git a/template/public/yoga/theme/dark/images/tableh1_bg.png b/template/public/yoga/theme/dark/images/tableh1_bg.png
new file mode 100644
index 000000000..c7785d0f6
--- /dev/null
+++ b/template/public/yoga/theme/dark/images/tableh1_bg.png
diff --git a/template/public/yoga/theme/dark/images/tableh2_bg.png b/template/public/yoga/theme/dark/images/tableh2_bg.png
new file mode 100644
index 000000000..d8c29f93d
--- /dev/null
+++ b/template/public/yoga/theme/dark/images/tableh2_bg.png
diff --git a/template/yoga/theme/dark/theme.css b/template/public/yoga/theme/dark/theme.css
index 854cc48dd..854cc48dd 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/public/yoga/theme/dark/theme.css
diff --git a/template/public/yoga/theme/dark/themeconf.inc.php b/template/public/yoga/theme/dark/themeconf.inc.php
new file mode 100644
index 000000000..5cf6b03f1
--- /dev/null
+++ b/template/public/yoga/theme/dark/themeconf.inc.php
@@ -0,0 +1,9 @@
+<?php
+$themeconf = array(
+  'template' => 'yoga',
+  'theme' => 'dark',
+  'icon_dir' => 'template/public/yoga/icon',
+  'admin_icon_dir' => 'template/public/yoga/icon/admin',
+  'mime_icon_dir' => 'template/public/yoga/icon/mimetypes/'
+);
+?>
diff --git a/template/public/yoga/upload.tpl b/template/public/yoga/upload.tpl
new file mode 100644
index 000000000..fcf27b543
--- /dev/null
+++ b/template/public/yoga/upload.tpl
@@ -0,0 +1,93 @@
+<h2>{L_TITLE}</h2>
+<!-- BEGIN upload_not_successful -->
+<form enctype="multipart/form-data" method="post" action="{F_ACTION}">
+  <table style="width:80%;margin-left:auto;margin-right:auto;">
+	<!-- BEGIN errors -->
+		  <tr>
+			<td colspan="2">
+			  <div class="errors">
+				<ul>
+				  <!-- BEGIN error -->
+				  <li>{upload_not_successful.errors.error.ERROR}</li>
+				  <!-- END error -->
+				</ul>
+			  </div>
+			</td>
+		  </tr>
+		  <!-- END errors -->
+	<tr>
+	  <td colspan="2" class="menu">
+		<div style="text-align:center;">{ADVISE_TITLE}</div>
+		<ul>
+		  <!-- BEGIN advise -->
+		  <li>{upload_not_successful.advise.ADVISE}</li>
+		  <!-- END advise -->
+		</ul>
+	  </td>
+	</tr>
+	<tr>
+	  <td colspan="2" align="center" style="padding:10px;">
+		<input name="picture" type="file" value="" />
+	  </td>
+	</tr>
+	<!-- BEGIN fields -->
+	<!-- username  -->
+	<tr>
+	  <td class="menu">{L_USERNAME} <span style="color:red;">*</span></td>
+	  <td align="center" style="padding:10px;">
+		<input name="username" type="text" value="{NAME}" />
+	  </td>
+	</tr>
+	<!-- mail address  -->
+	<tr>
+	  <td class="menu">{L_EMAIL} <span style="color:red;">*</span></td>
+	  <td align="center" style="padding:10px;">
+		<input name="mail_address" type="text" value="{EMAIL}" />
+	  </td>
+	</tr>
+	<!-- name of the picture  -->
+	<tr>
+	  <td class="menu">{L_NAME_IMG}</td>
+	  <td align="center" style="padding:10px;">
+		<input name="name" type="text" value="{NAME_IMG}" />
+	  </td>
+	</tr>
+	<!-- author  -->
+	<tr>
+	  <td class="menu">{L_AUTHOR}</td>
+	  <td align="center" style="padding:10px;">
+		<input name="author" type="text" value="{AUTHOR_IMG}" />
+	  </td>
+	</tr>
+	<!-- date of creation  -->
+	<tr>
+	  <td class="menu">{L_CREATION_DATE}</td>
+	  <td align="center" style="padding:10px;">
+		<input name="date_creation" type="text" value="{DATE_IMG}" />
+	  </td>
+	</tr>
+	<!-- comment  -->
+	<tr>
+	  <td class="menu">{L_COMMENT}</td>
+	  <td align="center" style="padding:10px;">
+	   <textarea name="comment" rows="3" cols="40" style="overflow:auto">{COMMENT_IMG}</textarea>
+	  </td>
+	</tr>
+	<!-- END fields -->
+	<tr>
+	  <td colspan="2" align="center">
+		<input name="submit" type="submit" value="{L_SUBMIT}" class="bouton" />
+	  </td>
+	</tr>
+  </table>
+</form>
+<!-- END upload_not_successful -->
+<!-- BEGIN upload_successful -->
+{L_UPLOAD_DONE}<br />
+<!-- END upload_successful -->
+<div style="text-align:center;">
+  <a href="{U_RETURN}">[ {L_RETURN} ]</a>
+</div>
+<!-- BEGIN note -->
+<div style="text-align:left;"><span style="color:red;">*</span> : {L_MANDATORY}</div>
+<!-- END note -->