issue 426 step 1 reverted:

svn merge -r1466:1465 .
svn merge -r1463:1462 .


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

25 files changed, 2088 insertions, 0 deletions

diff --git a/template/yoga/admin/cat_list.tpl b/template/yoga/admin/cat_list.tpl
new file mode 100644
index 000000000..ec4b66d43
--- /dev/null
+++ b/template/yoga/admin/cat_list.tpl
@@ -0,0 +1,55 @@
+<!-- $Id$ -->
+<h2>{lang:title_categories}</h2>
+
+<h3>{CATEGORIES_NAV}</h3>
+
+<!-- BEGIN categories -->
+<form id="categoryOrdering" action="{F_ACTION}" method="post">
+
+  <ul class="categoryUl">
+
+    <!-- BEGIN category -->
+    <li class="categoryLi"> <!-- category {category.ID} -->
+
+      <ul class="categoryActions">
+        <li><a href="{categories.category.U_JUMPTO}" title="{lang:jump to category}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to}" /></a></li> 
+        <li><a href="{categories.category.U_EDIT}" title="{lang:edit category informations}"><img src="{themeconf:icon_dir}/category_edit.png" class="button" alt="{lang:edit}"/></a></li>
+        <!-- BEGIN elements -->
+        <li><a href="{categories.category.elements.URL}" title="{lang:manage category elements}"><img src="{themeconf:icon_dir}/category_elements.png" class="button" alt="{lang:elements}" /></a></li>
+        <!-- END elements -->
+        <li><a href="{categories.category.U_CHILDREN}" title="{lang:manage sub-categories}"><img src="{themeconf:icon_dir}/category_children.png" class="button" alt="{lang:sub-categories}" /></a></li> 
+        <!-- BEGIN permissions -->
+        <li><a href="{categories.category.permissions.URL}" title="{lang:edit category permissions}" ><img src="{themeconf:icon_dir}/category_permissions.png" class="button" alt="{lang:permissions}" /></a></li>
+        <!-- END permissions -->
+        <!-- BEGIN delete -->
+        <li><a href="{categories.category.delete.URL}" title="{lang:delete category}" onclick="return confirm('{lang:Are you sure?}');"><img src="{themeconf:icon_dir}/category_delete.png" class="button" alt="{lang:delete}" /></a></li>
+        <!-- END delete -->
+      </ul>
+
+      <p><strong><a href="{categories.category.U_CHILDREN}" title="{lang:manage sub-categories}">{categories.category.NAME}</a></strong></p>
+
+      <p>
+        <label>
+          {lang:Position} :
+          <input type="text" size="4" name="catOrd[{categories.category.ID}]" maxlength="4" value="{categories.category.RANK}" />
+        </label>
+      </p>
+
+    </li>
+    <!-- END category -->
+
+  </ul>
+  <p>
+    <input name="submitOrder" type="submit" value="{lang:Save order}" {TAG_INPUT_ENABLED} />
+    <input name="submitOrderAlphaNum" type="submit" value="{lang:Order alphanumerically}" {TAG_INPUT_ENABLED} />
+  </p>
+
+</form>
+<!-- END categories -->
+
+<form id="addVirtual" action="{F_ACTION}" method="post">
+  <p>
+    {L_ADD_VIRTUAL} : <input type="text" name="virtual_name" />
+    <input type="submit" value="{L_SUBMIT}" name="submitAdd" {TAG_INPUT_ENABLED} />
+  </p>
+</form>
diff --git a/template/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
new file mode 100644
index 000000000..ed8861d84
--- /dev/null
+++ b/template/yoga/admin/cat_modify.tpl
@@ -0,0 +1,193 @@
+<!-- $Id$ -->
+<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_edit_cat}</h2>
+</div>
+
+<h3>{CATEGORIES_NAV}</h3>
+
+<ul class="categoryActions">
+  <li><a href="{U_JUMPTO}" title="{lang:jump to category}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to}" /></a></li>
+  <!-- BEGIN elements -->
+  <li><a href="{elements.URL}" title="{lang:manage category elements}"><img src="{themeconf:icon_dir}/category_elements.png" class="button" alt="{lang:elements}" /></a></li>
+  <!-- END elements -->
+  <li><a href="{U_CHILDREN}" title="{lang:manage sub-categories}"><img src="{themeconf:icon_dir}/category_children.png" class="button" alt="{lang:sub-categories}" /></a></li>
+  <!-- BEGIN permissions -->
+  <li><a href="{permissions.URL}" title="{lang:edit category permissions}" ><img src="{themeconf:icon_dir}/category_permissions.png" class="button" alt="{lang:permissions}" /></a></li>
+  <!-- END permissions -->
+  <!-- BEGIN delete -->
+  <li><a href="{delete.URL}" title="{lang:delete category}" onclick="return confirm('{lang:Are you sure?}');"><img src="{themeconf:icon_dir}/category_delete.png" class="button" alt="{lang:delete}" /></a></li>
+  <!-- END delete -->
+</ul>
+
+<form action="{F_ACTION}" method="POST" id="cat_modify">
+
+<fieldset>
+  <legend>{lang:Informations}</legend>
+  <table>
+    <!-- BEGIN server -->
+    <tr>
+      <td><strong>{L_REMOTE_SITE}</strong></td>
+      <td>{server.SITE_URL}</td>
+    </tr>
+    <!-- END server -->
+    <!-- BEGIN storage -->
+    <tr>
+      <td><strong>{L_STORAGE}</strong></td>
+      <td class="row1">{storage.CATEGORY_DIR}</td>
+    </tr>
+    <!-- END storage -->
+    <tr>
+      <td><strong>{L_EDIT_NAME}</strong></td>
+      <td>
+        <input type="text" name="name" value="{CAT_NAME}" maxlength="60"/>
+      </td>
+    </tr>
+    <tr>
+      <td><strong>{L_EDIT_COMMENT}</strong></td>
+      <td>
+        <textarea cols="50" rows="5" name="comment" class="description">{CAT_COMMENT}</textarea>
+      </td>
+    </tr>
+  </table>
+</fieldset>
+
+<!-- BEGIN move -->
+<fieldset>
+  <legend>{lang:Move}</legend>
+  {lang:Parent category}
+  <select name="parent">
+    <!-- BEGIN parent_option -->
+    <option class="{move.parent_option.CLASS}" {move.parent_option.SELECTED} value="{move.parent_option.VALUE}">{move.parent_option.OPTION}</option>
+    <!-- END parent_option -->
+  </select>  
+</fieldset>
+<!-- END move -->
+
+<fieldset>
+  <legend>{lang:Options}</legend>
+  <table>
+    <tr>
+      <td><strong>{L_EDIT_STATUS}</strong>
+      <td>
+	  <input type="radio" name="status" value="public" {STATUS_PUBLIC} />{L_STATUS_PUBLIC}
+	  <input type="radio" name="status" value="private" {STATUS_PRIVATE} />{L_STATUS_PRIVATE}
+      </td>
+    </tr>
+    <tr>
+      <td><strong>{L_EDIT_LOCK}</strong>
+      <td>
+	  <input type="radio" name="visible" value="false" {LOCKED} />{L_YES}
+	  <input type="radio" name="visible" value="true" {UNLOCKED} />{L_NO}
+      </td>
+    </tr>
+    <tr>
+      <td><strong>{L_EDIT_COMMENTABLE}</strong>
+      <td>
+          <input type="radio" name="commentable" value="true" {COMMENTABLE_TRUE} />{L_YES}
+          <input type="radio"  name="commentable" value="false" {COMMENTABLE_FALSE} />{L_NO}
+      </td>
+    </tr>
+    <!-- BEGIN upload -->
+    <tr>
+      <td><strong>{L_EDIT_UPLOADABLE}</strong>
+      <td>
+          <input type="radio" name="uploadable" value="true" {UPLOADABLE_TRUE} />{L_YES}
+          <input type="radio" name="uploadable" value="false" {UPLOADABLE_FALSE} />{L_NO}
+      </td>
+    </tr>
+    <!-- END upload -->
+  </table>
+</fieldset>
+
+<p style="text-align:center;">
+  <input type="submit" value="{L_SUBMIT}" name="submit" {TAG_INPUT_ENABLED}/>
+  <input type="reset" value="{lang:Reset}" name="reset" />
+</p>
+
+<!-- BEGIN representant -->
+<fieldset>
+  <legend>{lang:Representant}</legend>
+  <table>
+    <tr>
+      <td align="center">
+        <!-- BEGIN picture -->
+        <a href="{representant.picture.URL}"><img src="{representant.picture.SRC}" alt="" class="miniature" /></a>
+        <!-- END picture -->
+
+        <!-- BEGIN random -->
+        <img src="{themeconf:icon_dir}/category_representant_random.png" class="button" alt="{lang:Random picture}" class="miniature" />
+        <!-- END random -->
+      </td>
+      <td>
+        <!-- BEGIN set_random --> 
+        <p><input type="submit" name="set_random_representant" value="{L_SET_RANDOM_REPRESENTANT}" {TAG_INPUT_ENABLED}/></p>
+        <!-- END set_random -->
+
+        <!-- BEGIN delete_representant -->
+        <p><input type="submit" name="delete_representant" value="{lang:Delete Representant}" /></p>
+        <!-- END delete_representant -->
+      </td>
+    </tr>
+  </table>
+</fieldset>
+<!-- END representant -->
+
+</form>
+
+<form action="{F_ACTION}" method="POST" id="links">
+  
+<fieldset>
+  <legend>{lang:Link all category elements to a new category}</legend>
+
+  <table>
+    <tr>
+      <td>{lang:Virtual category name}</td>
+      <td><input type="text" name="virtual_name"></td>
+    </tr>
+
+    <tr>
+      <td>{lang:Parent category}</td>
+      <td>
+        <select class="categoryList" name="parent">
+          <!-- BEGIN category_option_parent -->
+          <option {category_option_parent.SELECTED} value="{category_option_parent.VALUE}">{category_option_parent.OPTION}</option>
+          <!-- END category_option_parent -->
+        </select>
+      </td>
+    </tr>
+  </table>
+
+  <p>
+    <input type="submit" value="{lang:Submit}" name="submitAdd" {TAG_INPUT_ENABLED}/>
+    <input type="reset" value="{lang:Reset}" name="reset" />
+  </p>  
+
+</fieldset>
+
+<fieldset>
+  <legend>{lang:Link all category elements to some existing categories}</legend>
+
+  <table>
+    <tr>
+      <td>{lang:Categories}</td>
+      <td>
+        <select class="categoryList" name="destinations[]" multiple="multiple" size="5">
+          <!-- BEGIN category_option_destination -->
+          <option {category_option_destination.SELECTED} value="{category_option_destination.VALUE}">{category_option_destination.OPTION}</option>
+          <!-- END category_option_destination -->
+        </select>
+      </td>
+    </tr>
+  </table>
+
+  <p>
+    <input type="submit" value="{lang:Submit}" name="submitDestinations" {TAG_INPUT_ENABLED}/>
+    <input type="reset" value="{lang:Reset}" name="reset" />
+  </p>  
+
+</fieldset>
+
+</form>
diff --git a/template/yoga/admin/cat_move.tpl b/template/yoga/admin/cat_move.tpl
new file mode 100644
index 000000000..5d5247f2f
--- /dev/null
+++ b/template/yoga/admin/cat_move.tpl
@@ -0,0 +1,40 @@
+<!-- $Id$ -->
+<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:Move categories}</h2>
+</div>
+
+<form method="post" action="{F_ACTION}">
+  <fieldset>
+    <legend>{lang:Virtual categories movement}</legend>
+
+    <label>
+      {lang:Virtual categories to move}
+
+      <select class="categoryList" name="selection[]" multiple="multiple" size="30">
+        <!-- BEGIN category_option_selection -->
+        <option {category_option_selection.SELECTED} value="{category_option_selection.VALUE}">{category_option_selection.OPTION}</option>
+        <!-- END category_option_selection -->
+      </select>
+    </label>
+
+    <label>
+      {lang:New parent category}
+
+      <select class="categoryList" name="parent">
+        <!-- BEGIN category_option_parent -->
+        <option {category_option_parent.SELECTED} value="{category_option_parent.VALUE}">{category_option_parent.OPTION}</option>
+        <!-- END category_option_parent -->
+      </select>
+    </label>
+
+  </fieldset>
+
+  <p>
+    <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}>
+    <input type="reset" name="reset" value="{lang:Reset}">
+  </p>
+
+</form>
diff --git a/template/yoga/admin/cat_options.tpl b/template/yoga/admin/cat_options.tpl
new file mode 100644
index 000000000..891dc37d4
--- /dev/null
+++ b/template/yoga/admin/cat_options.tpl
@@ -0,0 +1,17 @@
+<!-- $Id$ -->
+<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_cat_options}</h2>
+</div>
+
+<form method="post" action="{F_ACTION}" id="cat_options">
+  <fieldset>
+    <legend>{L_SECTION}</legend>
+    {DOUBLE_SELECT}
+  </fieldset>
+</form>
+
+<p class="information">{L_CAT_OPTIONS_INFO}</p>
+
diff --git a/template/yoga/admin/cat_perm.tpl b/template/yoga/admin/cat_perm.tpl
new file mode 100644
index 000000000..9c8fafa69
--- /dev/null
+++ b/template/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/yoga/admin/comments.tpl b/template/yoga/admin/comments.tpl
new file mode 100644
index 000000000..065a1c8ee
--- /dev/null
+++ b/template/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/yoga/admin/configuration.tpl
new file mode 100644
index 000000000..a0578692d
--- /dev/null
+++ b/template/yoga/admin/configuration.tpl
@@ -0,0 +1,167 @@
+<!-- $Id$ -->
+<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_configuration}</h2>
+</div>
+
+<form method="post" action="{F_ACTION}" class="properties">
+
+<fieldset>
+<!-- BEGIN general -->
+  <legend>{lang:conf_general_title}</legend>
+
+  <ul>
+    <li>
+      <span class="property">
+        <label for="gallery_title">{lang:Gallery title}</label>
+      </span>
+      <input type="text" maxlength="255" size="50" name="gallery_title" id="gallery_title" value="{general.CONF_GALLERY_TITLE}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
+    </li>
+
+    <li>
+      <span class="property">
+        <label for="page_banner">{lang:Page banner}</label>
+      </span>
+      <textarea cols="50" rows="5" name="page_banner" id="page_banner" onfocus="this.className='focus';" onblur="this.className='nofocus';">{general.CONF_PAGE_BANNER}</textarea>
+    </li>
+
+    <li>
+      <span class="property">
+        <label for="gallery_url">{lang:Gallery URL}</label>
+      </span>
+      <input type="text" maxlength="255" size="50" name="gallery_url" id="gallery_url" value="{general.CONF_GALLERY_URL}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
+    </li>
+
+    <li>
+      <span class="property">{lang:History}</span>
+      <label><input type="radio" class="radio" name="log" value="true" {general.HISTORY_YES} />{lang:Yes}</label>
+      <label><input type="radio" class="radio" name="log" value="false" {general.HISTORY_NO} />{lang:No}</label>
+    </li>
+
+    <li>
+      <span class="property">{lang:Lock gallery}</span>
+      <label><input type="radio" class="radio" name="gallery_locked" value="true" {general.GALLERY_LOCKED_YES} />{lang:Yes}</label>
+      <label><input type="radio" class="radio" name="gallery_locked" value="false" {general.GALLERY_LOCKED_NO} />{lang:No}</label>
+    </li>
+    
+    <li>
+      <span class="property">{lang:Rating}</span>
+      <label><input type="radio" class="radio" name="rate" value="true" {general.RATE_YES} />{lang:Yes}</label>
+      <label><input type="radio" class="radio" name="rate" value="false" {general.RATE_NO} />{lang:No}</label>
+    </li>
+
+    <li>
+      <span class="property">{lang:Rating by guests}</span>
+      <label><input type="radio" class="radio" name="rate_anonymous" value="true" {general.RATE_ANONYMOUS_YES} />{lang:Yes}</label>
+      <label><input type="radio" class="radio" name="rate_anonymous" value="false" {general.RATE_ANONYMOUS_NO} />{lang:No}</label>
+    </li>
+  </ul>
+<!-- END general -->
+
+<!-- BEGIN comments -->
+  <legend>{lang:conf_comments_title}</legend>
+
+  <ul>
+    <li>
+      <span class="property">{lang:Comments for all}</span>
+      <label><input type="radio" class="radio" name="comments_forall" value="true" {comments.COMMENTS_ALL_YES} />{lang:Yes}</label>
+      <label><input type="radio" class="radio" name="comments_forall" value="false" {comments.COMMENTS_ALL_NO} />{lang:No}</label>
+    </li>
+
+    <li>
+      <span class="property">
+        <label for="nb_comment_page">{lang:Number of comments per page}</label>
+      </span>
+      <input type="text" size="3" maxlength="4" name="nb_comment_page" id="nb_comment_page" value="{comments.NB_COMMENTS_PAGE}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
+    </li>
+
+    <li>
+      <span class="property">{lang:Validation}</span>
+      <label><input type="radio" class="radio" name="comments_validation" value="true" {comments.VALIDATE_YES} />{lang:Yes}</label>
+      <label><input type="radio" class="radio" name="comments_validation" value="false" {comments.VALIDATE_NO} />{lang:No}</label>
+    </li>
+  </ul>
+<!-- END comments -->
+<!-- BEGIN default -->
+  <legend>{lang:conf_default_title}</legend>
+
+  <ul>
+    <li>
+      <span class="property">
+        <label for="default_language">{lang:Language}</label>
+      </span>
+      <select name="default_language" id="default_language" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+        <!-- BEGIN language_option -->
+        <option value="{default.language_option.VALUE}" {default.language_option.SELECTED}>{default.language_option.CONTENT}</option>
+        <!-- END language_option -->
+      </select>
+    </li>
+
+    <li>
+      <span class="property">
+        <label for="nb_image_line">{lang:Number of images per row}</label>
+      </span>
+      <input type="text" size="3" maxlength="2" id="nb_image_line" name="nb_image_line" value="{default.NB_IMAGE_LINE}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
+    </li>
+
+    <li>
+      <span class="property">
+        <label for="nb_line_page">{lang:Number of rows per page}</label>
+      </span>
+      <input type="text" size="3" maxlength="2" id="nb_line_page" name="nb_line_page" value="{default.NB_ROW_PAGE}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
+    </li>
+
+    <li>
+      <span class="property">
+        <label for="default_template">{lang:Interface theme}</label>
+      </span>
+      <select name="default_template" id="default_template" onfocus="this.className='focus';" onblur="this.className='nofocus';">
+        <!-- BEGIN template_option -->
+        <option value="{default.template_option.VALUE}" {default.template_option.SELECTED}>{default.template_option.CONTENT}</option>
+        <!-- END template_option -->
+      </select>
+    </li>
+
+    <li>
+      <span class="property">
+        <label for="recent_period">{lang:Recent period}</label>
+      </span>
+      <input type="text" size="3" maxlength="2" name="recent_period" id="recent_period" value="{default.CONF_RECENT}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
+    </li>
+
+    <li>
+      <span class="property">{lang:Expand all categories}</span>
+      <label><input type="radio" class="radio" name="auto_expand" value="true" {default.EXPAND_YES} />{lang:Yes}</label>
+      <label><input type="radio" class="radio" name="auto_expand" value="false" {default.EXPAND_NO} />{lang:No}</label>
+    </li>
+
+    <li>
+      <span class="property">{lang:Show number of comments}</span>
+      <label><input type="radio" class="radio" name="show_nb_comments" value="true" {default.SHOW_COMMENTS_YES} />{lang:Yes}</label>
+      <label><input type="radio" class="radio" name="show_nb_comments" value="false" {default.SHOW_COMMENTS_NO} />{lang:No}</label>
+    </li>
+
+    <li>
+      <span class="property">
+        <label for="default_maxwidth">{lang:Maximum width of the pictures}</label>
+      </span>
+      <input type="text" size="4" maxlength="4" id="default_maxwidth" name="default_maxwidth" value="{default.MAXWIDTH}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
+    </li>
+
+    <li>
+      <span class="property">
+        <label for="default_maxheight">{lang:Maximum height of the pictures}</label>
+      </span>
+      <input type="text" size="4" maxlength="4" id="default_maxheight" name="default_maxheight" value="{default.MAXHEIGHT}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
+    </li>
+  </ul>
+<!-- END default -->
+  </fieldset>
+
+  <p>
+    <input type="submit" name="submit" value="{lang:Submit}" {TAG_INPUT_ENABLED}>
+    <input type="reset" name="reset" value="{lang:Reset}">
+  </p>
+</form>
diff --git a/template/yoga/admin/double_select.tpl b/template/yoga/admin/double_select.tpl
new file mode 100644
index 000000000..2bfa28072
--- /dev/null
+++ b/template/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/yoga/admin/element_set_global.tpl
new file mode 100644
index 000000000..7bb9d7006
--- /dev/null
+++ b/template/yoga/admin/element_set_global.tpl
@@ -0,0 +1,166 @@
+<!-- $Id$ -->
+<h2>{lang:Batch management}</h2>
+
+<h3>{CATEGORIES_NAV}</h3>
+
+<p style="text-align:center;">
+  {lang:global mode}
+  | <a href="{U_UNIT_MODE}">{lang:unit mode}</a>
+</p>
+
+<fieldset>
+
+  <legend>{lang:Display options}</legend>
+
+  <p>{lang:elements per page}:
+      <a href="{U_DISPLAY}&amp;display=20">20</a>
+    | <a href="{U_DISPLAY}&amp;display=50">50</a>
+    | <a href="{U_DISPLAY}&amp;display=100">100</a>
+    | <a href="{U_DISPLAY}&amp;display=all">{lang:all}</a>
+  </p>
+
+</fieldset>
+
+<form action="{F_ACTION}" method="post">
+
+<fieldset>
+
+  <legend>{lang:Elements}</legend>
+<!--
+  <div class="navigationBar">{NAV_BAR}</div>
+-->
+  <!-- BEGIN thumbnails -->
+  <ul class="thumbnails">
+    <!-- BEGIN thumbnail -->
+    <li><span class="wrap1"><span class="wrap2">
+        <label>
+        <img src="{thumbnails.thumbnail.SRC}"
+             alt="{thumbnails.thumbnail.ALT}"
+             title="{thumbnails.thumbnail.TITLE}"
+             class="thumbnail" />
+        <input type="checkbox" name="selection[]" value="{thumbnails.thumbnail.ID}" />
+        </label></span></span>
+    </li>
+    <!-- END thumbnail -->
+  </ul>
+  <!-- END thumbnails -->
+
+</fieldset>
+
+<fieldset>
+
+  <legend>{lang:Form}</legend>
+
+  <table>
+
+    <tr>
+      <td>{lang:associate to category}</td>
+      <td>
+       <select style="width:400px" name="associate" size="1">
+         <!-- BEGIN associate_option -->
+         <option {associate_option.SELECTED} value="{associate_option.VALUE}">{associate_option.OPTION}</option>
+         <!-- END associate_option -->
+       </select>
+      </td>
+    </tr>
+
+    <tr>
+      <td>{lang:dissociate from category}</td>
+      <td>
+        <select style="width:400px" name="dissociate" size="1">
+          <!-- BEGIN dissociate_option -->
+          <option {dissociate_option.SELECTED} value="{dissociate_option.VALUE}">{dissociate_option.OPTION}</option>
+          <!-- END dissociate_option -->
+        </select>
+      </td>
+    </tr>
+
+    <tr>
+      <td>{lang:add tags}</td>
+      <td>{ADD_TAG_SELECTION}</td>
+    </tr>
+
+    <tr>
+      <td>{lang:remove tags}</td>
+      <td>{DEL_TAG_SELECTION}</td>
+    </tr>
+    
+    <tr>
+      <td>{lang:author}</td>
+      <td>
+        <input type="radio" name="author_action" value="leave" checked="checked" /> {lang:leave}
+        <input type="radio" name="author_action" value="unset" /> {lang:unset}
+        <input type="radio" name="author_action" value="set" id="author_action_set" /> {lang:set to}
+        <input onmousedown="document.getElementById('author_action_set').checked = true;" type="text" name="author" value="" />
+      </td>
+    </tr>
+
+    <tr>
+      <td>{lang:title}</td>
+      <td>
+        <input type="radio" name="name_action" value="leave" checked="checked" /> {lang:leave}
+        <input type="radio" name="name_action" value="unset" /> {lang:unset}
+        <input type="radio" name="name_action" value="set" id="name_action_set" /> {lang:set to}
+        <input onmousedown="document.getElementById('name_action_set').checked = true;" type="text" name="name" value="" />
+      </td>
+    </tr>
+
+    <tr>
+      <td>{lang:creation date}</td>
+      <td>
+        <input type="radio" name="date_creation_action" value="leave" checked="checked" /> {lang:leave}
+        <input type="radio" name="date_creation_action" value="unset" /> {lang:unset}
+        <input type="radio" name="date_creation_action" value="set" id="date_creation_action_set" /> {lang:set to}
+        <select onmousedown="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_day">
+          <!-- BEGIN date_creation_day -->
+          <option {date_creation_day.SELECTED} value="{date_creation_day.VALUE}">{date_creation_day.OPTION}</option>
+          <!-- END date_creation_day -->
+        </select>
+        <select onmousedown="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_month">
+          <!-- BEGIN date_creation_month -->
+          <option {date_creation_month.SELECTED} value="{date_creation_month.VALUE}">{date_creation_month.OPTION}</option>
+          <!-- END date_creation_month -->
+        </select>
+        <input onmousedown="document.getElementById('date_creation_action_set').checked = true;"
+               name="date_creation_year"
+               type="text"
+               size="4"
+               maxlength="4"
+               value="{DATE_CREATION_YEAR_VALUE}" />
+      </td>
+    </tr>
+
+  </table>
+
+  <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="submit" {TAG_INPUT_ENABLED}/></p>
+
+</fieldset>
+
+<fieldset>
+
+  <legend>{lang:Caddie management}</legend>
+
+  <ul style="list-style-type:none;">
+    <!-- BEGIN in_caddie -->
+    <li><label><input type="radio" name="caddie_action" value="empty_all" /> {lang:Empty caddie}</label></li>
+    <li><label><input type="radio" name="caddie_action" value="empty_selected" /> {lang:Take selected elements out of caddie}</label></li>
+    <!-- END in_caddie -->
+
+    <!-- BEGIN not_in_caddie -->
+    <li><label><input type="radio" name="caddie_action" value="add_selected" /> {lang:Add selected elements to caddie}</label></li>
+    <!-- END not_in_caddie -->
+  
+  </ul>
+
+  <p><input type="submit" value="{L_SUBMIT}" name="submit_caddie" {TAG_INPUT_ENABLED}/></p>
+
+</fieldset>
+
+</form>
diff --git a/template/yoga/admin/element_set_unit.tpl b/template/yoga/admin/element_set_unit.tpl
new file mode 100644
index 000000000..5adce8833
--- /dev/null
+++ b/template/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/yoga/admin/group_list.tpl
new file mode 100644
index 000000000..7b7dd67eb
--- /dev/null
+++ b/template/yoga/admin/group_list.tpl
@@ -0,0 +1,35 @@
+<!-- $Id$ -->
+<h2>{lang:title_groups}</h2>
+
+<form method="post" name="add_user" action="{F_ADD_ACTION}" class="properties">
+  <fieldset>
+    <legend>{lang:Add group}</legend>
+
+    <span class="property">
+      <label for="groupname">{lang:Group name}</label>
+    </span>
+    <input type="text" id="groupname" name="groupname" maxlength="50" size="20" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
+
+    <p>
+      <input type="submit" name="submit_add" value="{lang:Add}" {TAG_INPUT_ENABLED}/>
+    </p>
+  </fieldset>
+</form>
+
+<table class="table2">
+  <tr class="throw">
+    <th>{lang:Group name}</th>
+    <th>{lang:Members}</th>
+    <th>{lang:Actions}</th>
+  </tr>
+  <!-- BEGIN group -->
+  <tr class="{group.CLASS}">
+    <td>{group.NAME}</td>
+    <td><a href="{group.U_MEMBERS}">{group.MEMBERS}</a></td>
+    <td style="text-align:center;">
+      <a href="{group.U_PERM}"><img src="{themeconf:icon_dir}/permissions.png" class="button" style="border:none" alt="permissions" title="{lang:permissions}" /></a>
+      <a href="{group.U_DELETE}" onclick="return confirm('{lang:Are you sure?}');"><img src="{themeconf:icon_dir}/delete.png" class="button" style="border:none" alt="delete" title="{lang:delete}" {TAG_INPUT_ENABLED}/></a>
+    </td>
+  </tr>
+  <!-- END group -->
+</table>
diff --git a/template/yoga/admin/group_perm.tpl b/template/yoga/admin/group_perm.tpl
new file mode 100644
index 000000000..91c2f637a
--- /dev/null
+++ b/template/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/yoga/admin/intro.tpl
new file mode 100644
index 000000000..58c6b2510
--- /dev/null
+++ b/template/yoga/admin/intro.tpl
@@ -0,0 +1,47 @@
+<!-- $Id$ -->
+<h2>{lang:title_default}</h2>
+
+<dl>
+  <dt>{lang:PhpWebGallery version}</dt>
+  <dd>
+    <ul>
+      <li>PhpWebGallery {PWG_VERSION}</li>
+      <li><a href="{U_CHECK_UPGRADE}">{lang:Check for upgrade}</a></li>
+    </ul>
+  </dd>
+
+  <dt>{lang:Environment}</dt>
+  <dd>
+    <ul>
+      <li>{lang:Operating system}: {OS}</li>
+      <li>PHP: {PHP_VERSION} (<a href="{U_PHPINFO}">{lang:Show info}</a>)</li>
+      <li>MySQL: {MYSQL_VERSION}</li>
+    </ul>
+  </dd>
+
+  <dt>{lang:Database}</dt>
+  <dd>
+    <ul>
+      <li>
+        {DB_ELEMENTS}
+        <!-- BEGIN waiting -->
+        (<a href="{waiting.URL}">{waiting.INFO}</a>)
+        <!-- END waiting -->
+
+        <!-- BEGIN first_added -->
+        ({first_added.DB_DATE})
+        <!-- END first_added -->
+      </li>
+      <li>{DB_CATEGORIES}</li>
+      <li>{DB_USERS}</li>
+      <li>{DB_GROUPS}</li>
+      <li>
+        {DB_COMMENTS}
+        <!-- BEGIN unvalidated -->
+        (<a href="{unvalidated.URL}">{unvalidated.INFO}</a>)
+        <!-- END unvalidated -->
+      </li>
+    </ul>
+  </dd>
+
+</dl>
diff --git a/template/yoga/admin/maintenance.tpl b/template/yoga/admin/maintenance.tpl
new file mode 100644
index 000000000..697e0954b
--- /dev/null
+++ b/template/yoga/admin/maintenance.tpl
@@ -0,0 +1,16 @@
+<!-- $Id$ -->
+<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:Maintenance}</h2>
+</div>
+
+<ul>
+  <li><a href="{U_MAINT_CATEGORIES}" {TAG_INPUT_ENABLED}>{lang:update categories informations}</a></li>
+  <li><a href="{U_MAINT_IMAGES}" {TAG_INPUT_ENABLED}>{lang:update images informations}</a></li>
+  <li><a href="{U_MAINT_HISTORY}" {TAG_INPUT_ENABLED}>{lang:purge history}</a></li>
+  <li><a href="{U_MAINT_SESSIONS}" {TAG_INPUT_ENABLED}>{lang:purge sessions}</a></li>
+  <li><a href="{U_MAINT_FEEDS}" {TAG_INPUT_ENABLED}>{lang:purge never used notification feeds}</a></li>
+  <li><a href="{U_MAINT_DATABASE}" {TAG_INPUT_ENABLED}>{lang:repair and optimize database}</a></li>
+</ul>
diff --git a/template/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl
new file mode 100644
index 000000000..22309e96d
--- /dev/null
+++ b/template/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/yoga/admin/picture_modify.tpl
new file mode 100644
index 000000000..c10e7744e
--- /dev/null
+++ b/template/yoga/admin/picture_modify.tpl
@@ -0,0 +1,183 @@
+<!-- $Id$ -->
+<h2>{lang:title_picmod}</h2>
+
+<img src="{TN_SRC}" alt="{lang:thumbnail}" class="thumbnail" />
+
+<ul class="categoryActions">
+  <!-- BEGIN jumpto -->
+  <li><a href="{jumpto.URL}" title="{lang:jump to image}"><img src="{themeconf:icon_dir}/category_jump-to.png" class="button" alt="{lang:jump to}" /></a></li>
+  <!-- END jumpto -->
+  <li><a href="{U_SYNC}" title="{lang:synchronize metadata}" {TAG_INPUT_ENABLED}><img src="{themeconf:icon_dir}/sync_metadata.png" class="button" alt="{lang:synchronize}" /></a></li>
+</ul>
+
+<form action="{F_ACTION}" method="post" id="properties">
+
+  <fieldset>
+    <legend>{lang:Informations}</legend>
+
+    <table>
+
+      <tr>
+        <td><strong>{lang:Path}</strong></td>
+        <td>{PATH}</td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Registration date}</strong></td>
+        <td>{REGISTRATION_DATE}</td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Dimensions}</strong></td>
+        <td>{DIMENSIONS}</td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Filesize}</strong></td>
+        <td>{FILESIZE}</td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Storage category}</strong></td>
+        <td>{STORAGE_CATEGORY}</td>
+      </tr>
+
+      <!-- BEGIN links -->
+      <tr>
+        <td><strong>{lang:Linked categories}</strong></td>
+        <td>
+          <ul>
+            <!-- BEGIN category -->
+            <li>{links.category.NAME}</li>
+            <!-- END category -->
+          </ul>
+        </td>
+      </tr>
+      <!-- END links -->
+
+    </table>
+
+  </fieldset>
+
+  <fieldset>
+    <legend>{lang:Properties}</legend>
+
+    <table>
+
+      <tr>
+        <td><strong>{lang:Name}</strong></td>
+        <td><input type="text" name="name" value="{NAME}" /></td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Author}</strong></td>
+        <td><input type="text" name="author" value="{AUTHOR}" /></td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Creation date}</strong></td>
+        <td>
+          <label><input type="radio" name="date_creation_action" value="unset" /> {lang:unset}</label>
+          <input type="radio" name="date_creation_action" value="set" id="date_creation_action_set" /> {lang:set to}
+          <select onmousedown="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_day">
+            <!-- BEGIN date_creation_day -->
+            <option {date_creation_day.SELECTED} value="{date_creation_day.VALUE}">{date_creation_day.OPTION}</option>
+            <!-- END date_creation_day -->
+          </select>
+          <select onmousedown="document.getElementById('date_creation_action_set').checked = true;" name="date_creation_month">
+            <!-- BEGIN date_creation_month -->
+            <option {date_creation_month.SELECTED} value="{date_creation_month.VALUE}">{date_creation_month.OPTION}</option>
+            <!-- END date_creation_month -->
+          </select>
+          <input onmousedown="document.getElementById('date_creation_action_set').checked = true;"
+                 name="date_creation_year"
+                 type="text"
+                 size="4"
+                 maxlength="4"
+                 value="{DATE_CREATION_YEAR_VALUE}" />
+        </td>
+      </tr>
+
+      <tr>
+        <td><strong>{lang:Tags}</strong></td>
+        <td>{TAG_SELECTION}</td>
+      </tr>
+
+      
+      <tr>
+        <td><strong>{lang:Description}</strong></td>
+        <td><textarea name="description" class="description">{DESCRIPTION}</textarea></td>
+      </tr>
+
+    </table>
+
+    <p style="text-align:center;">
+      <input type="submit" value="{lang:Submit}" name="submit" {TAG_INPUT_ENABLED}/>
+      <input type="reset" value="{lang:Reset}" name="reset" />
+    </p>
+
+  </fieldset>
+
+</form>
+
+<form id="associations" method="post" action="{F_ACTION}#associations">
+  <fieldset>
+    <legend>{lang:Association to categories}</legend>
+
+    <table class="doubleSelect">
+      <tr>
+        <td>
+          <h3>{lang:Associated}</h3>
+          <select class="categoryList" name="cat_associated[]" multiple="multiple" size="30">
+            <!-- BEGIN associated_option -->
+            <option {associated_option.SELECTED} value="{associated_option.VALUE}">{associated_option.OPTION}</option>
+            <!-- END associated_option -->
+          </select>
+          <p><input type="submit" value="&raquo;" name="dissociate" style="font-size:15px;" {TAG_INPUT_ENABLED}/></p>
+        </td>
+
+        <td>
+          <h3>{lang:Dissociated}</h3>
+          <select class="categoryList" name="cat_dissociated[]" multiple="multiple" size="30">
+            <!-- BEGIN dissociated_option -->
+            <option {dissociated_option.SELECTED} value="{dissociated_option.VALUE}">{dissociated_option.OPTION}</option>
+            <!-- END dissociated_option -->
+          </select>
+          <p><input type="submit" value="&laquo;" name="associate" style="font-size:15px;" {TAG_INPUT_ENABLED}/></p>
+        </td>
+      </tr>
+    </table>
+
+  </fieldset>
+</form>
+
+<form id="representation" method="post" action="{F_ACTION}#representation">
+  <fieldset>
+    <legend>{lang:Representation of categories}</legend>
+
+    <table class="doubleSelect">
+      <tr>
+        <td>
+          <h3>{lang:Represents}</h3>
+          <select class="categoryList" name="cat_elected[]" multiple="multiple" size="30">
+            <!-- BEGIN elected_option -->
+            <option {elected_option.SELECTED} value="{elected_option.VALUE}">{elected_option.OPTION}</option>
+            <!-- END elected_option -->
+          </select>
+          <p><input type="submit" value="&raquo;" name="dismiss" style="font-size:15px;" {TAG_INPUT_ENABLED}/></p>
+        </td>
+
+        <td>
+          <h3>{lang:Does not represent}</h3>
+          <select class="categoryList" name="cat_dismissed[]" multiple="multiple" size="30">
+            <!-- BEGIN dismissed_option -->
+            <option {dismissed_option.SELECTED} value="{dismissed_option.VALUE}">{dismissed_option.OPTION}</option>
+            <!-- END dismissed_option -->
+          </select>
+          <p><input type="submit" value="&laquo;" name="elect" style="font-size:15px;" {TAG_INPUT_ENABLED}/></p>
+        </td>
+      </tr>
+    </table>
+
+  </fieldset>
+</form>
diff --git a/template/yoga/admin/rating.tpl b/template/yoga/admin/rating.tpl
new file mode 100644
index 000000000..ac78bf419
--- /dev/null
+++ b/template/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/yoga/admin/site_manager.tpl
new file mode 100644
index 000000000..88b77a362
--- /dev/null
+++ b/template/yoga/admin/site_manager.tpl
@@ -0,0 +1,66 @@
+<!-- $Id$ -->
+<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:Site manager}</h2>
+</div>
+
+<!-- BEGIN remote_output -->
+<div class="remoteOutput">
+  <ul>
+    <!-- BEGIN remote_line -->
+    <li class="{remote_output.remote_line.CLASS}">{remote_output.remote_line.CONTENT}</li>
+    <!-- END remote_line -->
+  </ul>
+</div>
+<!-- END remote_output -->
+
+<!-- BEGIN local_listing -->
+{lang:remote_site_local_found} {local_listing.URL}
+<!-- BEGIN create -->
+<form action="" method="post">
+  <p>
+    {lang:remote_site_local_create}:
+    <input type="hidden" name="no_check" value="1"/>
+    <input type="hidden" name="galleries_url" value="{local_listing.URL}" />
+    <input type="submit" name="submit" value="{lang:submit}"/>
+  </p>
+</form>
+<!-- END create -->
+<!-- BEGIN update -->
+<a href="{local_listing.update.U_SYNCHRONIZE}" title="{lang:remote_site_local_update}">{lang:site_synchronize}</a>
+<!-- END update -->
+<!-- END local_listing -->
+
+<!-- BEGIN sites -->
+<table border="1" cellpadding="0" cellspacing="0">
+  <!-- BEGIN site -->
+  <tr align="left"><td>
+    <a href="{sites.site.NAME}">{sites.site.NAME}</a><br>({sites.site.TYPE}, {sites.site.CATEGORIES} {lang:Categories}, {sites.site.IMAGES} {lang:picture}s)
+  </td><td>
+    [<a href="{sites.site.U_SYNCHRONIZE}" title="{lang:site_synchronize_hint}">{lang:site_synchronize}</a>]
+    <!-- BEGIN delete -->
+      [<a href="{sites.site.delete.U_DELETE}" onclick="return confirm('{lang:Are you sure?}');"
+                title="{lang:site_delete_hint}">{lang:site_delete}</a>]
+    <!-- END delete -->
+    <!-- BEGIN remote -->
+      <br>
+      [<a href="{sites.site.remote.U_TEST}" title="{lang:remote_site_test_hint}">{lang:remote_site_test}</a>]
+      [<a href="{sites.site.remote.U_GENERATE}" title="{lang:remote_site_generate_hint}">{lang:remote_site_generate}</a>]
+      [<a href="{sites.site.remote.U_CLEAN}" title="{lang:remote_site_clean_hint}">{lang:remote_site_clean}</a>]
+    <!-- END remote -->
+  </td></tr>
+  <!-- END site -->
+</table>
+<!-- END sites -->
+
+<form action="{F_ACTION}" method="post">
+  <p>
+    <label for="galleries_url" >{lang:site_create}</label>
+    <input type="text" name="galleries_url" id="galleries_url" />
+  </p>
+  <p>
+    <input type="submit" name="submit" value="{lang:submit}" {TAG_INPUT_ENABLED} />
+  </p>
+</form>
diff --git a/template/yoga/admin/site_update.tpl b/template/yoga/admin/site_update.tpl
new file mode 100644
index 000000000..d3d0221ca
--- /dev/null
+++ b/template/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/yoga/admin/stats.tpl
new file mode 100644
index 000000000..75de81f79
--- /dev/null
+++ b/template/yoga/admin/stats.tpl
@@ -0,0 +1,51 @@
+<!-- $Id$ -->
+<h2>{lang:title_history}</h2>
+
+<h3>{L_STAT_TITLE}</h3>
+<img class="image" src="{IMG_REPORT}" alt="{L_STAT_MONTHLY_ALT}" />
+
+<h3>{L_STAT_DETAIL_TITLE}</h3>
+<table class="table2" id="dailyStats">
+  <tr class="throw">
+    <th>{L_VALUE}</th>
+    <th>{L_PAGES_SEEN}</th>
+    <th>{L_VISITORS}</th>
+    <th>{L_PICTURES}</th>
+  </tr>
+<!-- BEGIN statrow -->
+  <tr class="{statrow.T_CLASS}">
+    <td>{statrow.VALUE}</td>
+    <td class="number">{statrow.PAGES}</td>
+    <td class="number">{statrow.VISITORS}</td>
+    <td class="number">{statrow.IMAGES}</td>
+  </tr>
+<!-- END statrow -->
+</table>
+
+<h3>{L_DATE_TITLE}</h3>
+<table class="table2" id="detailedStats">
+  <tr class="throw">
+    <th>{L_STAT_HOUR}</th>
+    <th>{L_STAT_LOGIN}</th>
+    <th>{L_STAT_ADDR}</th>
+    <th>{L_STAT_CATEGORY}</th>
+    <th>{L_STAT_FILE}</th>
+    <th>{L_STAT_PICTURE}</th> 
+  </tr>
+<!-- BEGIN detail -->
+  <tr class="{detail.T_CLASS}">
+    <td class="hour">{detail.HOUR}</td>
+    <td>{detail.LOGIN}</td>
+    <td>{detail.IP}</td>
+    <td>{detail.CATEGORY}</td>
+    <td>{detail.FILE}</td>
+    <td>{detail.PICTURE}</td>
+  </tr>
+<!-- END detail -->
+</table>
+
+<!-- BEGIN navigation -->
+<div class="admin">
+{navigation.NAV_BAR}
+</div>
+<!-- END navigation -->
diff --git a/template/yoga/admin/tags.tpl b/template/yoga/admin/tags.tpl
new file mode 100644
index 000000000..8fe666b59
--- /dev/null
+++ b/template/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/yoga/admin/thumbnail.tpl
new file mode 100644
index 000000000..cf5345d43
--- /dev/null
+++ b/template/yoga/admin/thumbnail.tpl
@@ -0,0 +1,129 @@
+<!-- $Id$ -->
+<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_thumbnails}</h2>
+</div>
+
+<!-- BEGIN results -->
+<div class="admin">{L_RESULTS}</div>
+<table style="width:100%;">
+  <tr class="throw">
+    <td>{L_PATH}</td>
+    <td>{L_THUMBNAIL}</td>
+    <td>{L_GENERATED}</td>
+    <td>{L_FILESIZE}</td>
+    <td>{L_WIDTH}</td>
+    <td>{L_HEIGHT}</td>
+  </tr>
+  <!-- BEGIN picture -->
+  <tr class="{results.picture.T_CLASS}">
+    <td>{results.picture.PATH}</td>
+    <td><img src="{results.picture.TN_FILE_IMG}" /></td>
+    <td style="text-align:right;" class="{results.picture.T_CLASS}">{results.picture.GEN_TIME}</td>
+    <td style="text-align:right;">{results.picture.TN_FILESIZE_IMG}</td>
+    <td style="text-align:right;">{results.picture.TN_WIDTH_IMG}</td>
+    <td style="text-align:right;">{results.picture.TN_HEIGHT_IMG}</td>
+  </tr>
+  <!-- END picture -->
+</table>
+
+<table class="table2">
+  <tr class="throw">
+    <td colspan="2">{L_TN_STATS}</td>
+  </tr>
+  <tr>
+    <td>{L_TN_NB_STATS}</td>
+    <td style="text-align:center;">{results.TN_NB}</td>
+  </tr>
+  <tr>
+    <td>{L_TN_TOTAL}</td>
+    <td style="text-align:right;">{results.TN_TOTAL}</td>
+  </tr>
+  <tr>
+    <td>{L_TN_MAX}</td>
+    <td style="text-align:right;" class="worst_gen_time">{results.TN_MAX}</td>
+  </tr>
+  <tr>
+    <td>{L_TN_MIN}</td>
+    <td style="text-align:right;" class="best_gen_time">{results.TN_MIN}</td>
+  </tr>
+  <tr>
+    <td>{L_TN_AVERAGE}</td>
+    <td style="text-align:right;">{results.TN_AVERAGE}</td>
+  </tr>
+</table>
+<br />
+<!-- END results -->
+
+<!-- BEGIN params -->
+<form method="post" action="{params.F_ACTION}" class="properties">
+
+  <fieldset>
+    <legend>{L_PARAMS}</legend>
+
+    <ul>
+      <li>
+        <span class="property">{L_GD}</span>
+	<label>
+          <input type="radio" name="gd" value="2" {params.GD2_CHECKED} />2.x
+        </label>
+        <label>
+          <input type="radio" name="gd" value="1" {params.GD1_CHECKED} />1.x
+        </label>
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="width">{lang:maximum width}</label>
+        </span>
+	<input type="text" id="width" name="width" value="{params.WIDTH_TN}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
+      </li>
+
+      <li>
+        <span class="property">
+          <label for="height">{lang:maximum height}</label>
+        </span>
+	<input type="text" id="height" name="height" value="{params.HEIGHT_TN}" onfocus="this.className='focus';" onblur="this.className='nofocus';" />
+      </li>
+
+      <li>
+        <span class="property">{lang:Number of thumbnails to create}</span>
+	<label><input type="radio" name="n" value="5"   {params.n_5_CHECKED} /> 5</label>
+	<label><input type="radio" name="n" value="10"  {params.n_10_CHECKED} /> 10</label>
+	<label><input type="radio" name="n" value="20"  {params.n_20_CHECKED} /> 20</label>
+	<label><input type="radio" name="n" value="all" {params.n_all_CHECKED} /> {L_ALL}</label>
+      </li>
+    </ul>
+  </fieldset>
+
+  <p><input type="submit" name="submit" value="{L_SUBMIT}" {TAG_INPUT_ENABLED}/></p>
+</form>
+<!-- END params -->
+
+<!-- BEGIN warning -->
+<div style="text-align:center;font-weight:bold;margin:10px;"> [ {L_UNLINK} ]</div>
+<!-- END warning -->
+
+<!-- BEGIN remainings -->
+<div class="admin">{remainings.TOTAL_IMG} {L_REMAINING}</div>
+<table style="width:100%;">
+  <tr class="throw">
+    <td>&nbsp;</td>
+    <td style="width:60%;">{L_PATH}</td>
+    <td>{L_FILESIZE}</td>
+    <td>{L_WIDTH}</td>
+    <td>{L_HEIGHT}</td>
+  </tr>
+  <!-- BEGIN remaining -->
+  <tr class="{remainings.remaining.T_CLASS}">
+    <td>{remainings.remaining.NB_IMG}</td>
+    <td><div style="margin-left:10px;">{remainings.remaining.PATH}</div></td>
+    <td><div style="margin-left:10px;">{remainings.remaining.FILESIZE_IMG}</div></td>
+    <td><div style="margin-left:10px;">{remainings.remaining.WIDTH_IMG}</div></td>
+    <td><div style="margin-left:10px;">{remainings.remaining.HEIGHT_IMG}</div></td>
+  </tr>
+  <!-- END remaining -->
+</table>
+<!-- END remainings -->
diff --git a/template/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl
new file mode 100644
index 000000000..e6c1e81b6
--- /dev/null
+++ b/template/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/yoga/admin/user_perm.tpl b/template/yoga/admin/user_perm.tpl
new file mode 100644
index 000000000..a24fd9096
--- /dev/null
+++ b/template/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/yoga/admin/waiting.tpl
new file mode 100644
index 000000000..b48aa314b
--- /dev/null
+++ b/template/yoga/admin/waiting.tpl
@@ -0,0 +1,45 @@
+<!-- $Id$ -->
+<h2>{lang:title_waiting}</h2>
+
+<form action="{F_ACTION}" method="post" id="waiting">
+  <table style="width:100%;" >
+    <tr class="throw">
+      <th style="width:20%;">{L_CATEGORY}</th>
+      <th style="width:20%;">{L_DATE}</th>
+      <th style="width:20%;">{L_FILE}</th>
+      <th style="width:20%;">{L_THUMBNAIL}</th>
+      <th style="width:20%;">{L_AUTHOR}</th>
+      <th style="width:1px;">&nbsp;</th>
+    </tr>
+    <!-- BEGIN picture -->
+    <tr>
+      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">{picture.CATEGORY_IMG}</td>
+      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">{picture.DATE_IMG}</td>
+      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
+        <a href="{picture.PREVIEW_URL_IMG}" title="{picture.FILE_TITLE}">{picture.FILE_IMG}</a>
+      </td>
+      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
+        <!-- BEGIN thumbnail -->
+        <a href="{picture.thumbnail.PREVIEW_URL_TN_IMG}" title="{picture.thumbnail.FILE_TN_TITLE}">{picture.thumbnail.FILE_TN_IMG}</a>
+        <!-- END thumbnail -->
+      </td>
+      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
+        <a href="mailto:{picture.UPLOAD_EMAIL}">{picture.UPLOAD_USERNAME}</a>
+      </td>
+      <td class="{picture.WAITING_CLASS}" style="white-space:nowrap;">
+        <label><input type="radio" name="action-{picture.ID_IMG}" value="validate" /> {lang:Validate}</label>
+        <label><input type="radio" name="action-{picture.ID_IMG}" value="reject" /> {lang:Reject}</label>
+      </td>
+    </tr>
+    <!-- END picture -->
+  </table>
+
+  <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}" {TAG_INPUT_ENABLED}/>
+    <input type="submit" name="reject-all" value="{lang:Reject All}" {TAG_INPUT_ENABLED}/>
+    <input type="reset" value="{lang:Reset}" />
+  </p>
+
+</form>